diff --git a/.gitignore b/.gitignore index 37a105d..9394a98 100644 --- a/.gitignore +++ b/.gitignore @@ -39,15 +39,15 @@ wxwidgets-clean/ /tests/test-results/ /tests/.test-port /test-results/ -/tests/wasm-app/*.js -/tests/wasm-app/*.html -/tests/wasm-app/minimal_test.wasm -/tests/wasm-app/standalone/*/*.js -/tests/wasm-app/standalone/*/*.html -/tests/wasm-app/standalone/*/*.wasm -/tests/wasm-app/kicad/*.js -/tests/wasm-app/kicad/*.wasm -!tests/wasm-app/kicad/pcbnew.html +/tests/apps/*.js +/tests/apps/*.html +/tests/apps/minimal_test.wasm +/tests/apps/standalone/*/*.js +/tests/apps/standalone/*/*.html +/tests/apps/standalone/*/*.wasm +/tests/apps/kicad/*.js +/tests/apps/kicad/*.wasm +!tests/apps/kicad/pcbnew.html /temp/ *.log *.tmp diff --git a/README.md b/README.md index f4e9017..4347bf3 100644 --- a/README.md +++ b/README.md @@ -9,22 +9,25 @@ kicad-wasm/ ├── kicad/ # KiCad source (git submodule) ├── wxwidgets/ # wxWidgets source (git submodule) ├── wasm/ # WASM compatibility layer +│ ├── bindings/ # Embind bindings for JavaScript +│ ├── cmake/ # CMake find modules │ ├── kiplatform/ # Platform abstraction (app, UI, printing) │ ├── libcontext/ # Coroutine/fiber implementation -│ ├── stubs/ # Stub implementations (libgit2, curl) -│ └── config/ # Build configuration headers -├── patches/ # KiCad source patches +│ ├── shims/ # Runtime JavaScript shims +│ └── stubs/ # Stub implementations (libgit2, curl) ├── scripts/ # Build scripts │ ├── build-wxuniversal-wasm.sh # Build wxWidgets for WASM │ ├── build-wasm-test.sh # Build wxWidgets test apps │ ├── deps/ # Dependency build scripts │ ├── kicad/ # KiCad build scripts -│ ├── common/ # Shared utilities and config -│ └── config/ # Build configuration +│ ├── common/ # Shared utilities +│ └── config/ # Build config wrappers ├── docker/ # Docker build environment ├── tests/ # Playwright E2E tests -├── output/ # Build output (pcbnew.js, pcbnew.wasm) -└── docs/ # Research documentation +│ ├── e2e/ # Test specs +│ └── apps/ # WASM test applications +├── tools/ # External tools (binaryen) +└── output/ # Build output (pcbnew.js, pcbnew.wasm) ``` ## Two Build Workflows @@ -63,7 +66,7 @@ Build standalone wxWidgets test apps for feature testing: cd tests && npm install && npm test ``` -Output: `tests/wasm-app/standalone/` +Output: `tests/apps/standalone/` ## Prerequisites @@ -110,7 +113,6 @@ See [tests/README.md](tests/README.md) for test documentation. - [Build System](build.md) - Docker build details - [Docker README](docker/README.md) - Container setup - [Tests README](tests/README.md) - Test infrastructure -- [Research Docs](docs/) - Original research notes ## License diff --git a/docs/00-OVERVIEW.md b/docs/00-OVERVIEW.md deleted file mode 100644 index 6c0475d..0000000 --- a/docs/00-OVERVIEW.md +++ /dev/null @@ -1,335 +0,0 @@ -# KiCad Wasm Port - Implementation Plan - -## Goal - -Run KiCad with native wxWidgets GUI, but with core logic (file parsing, geometry, DRC, routing) executing in a WebAssembly module. This validates the Wasm build before tackling the browser UI. - ---- - -## Phase 1: Minimal Build with Stubs - -**Objective**: Get KiCad compiling with optional deps disabled via preprocessor guards. - -### 1.1 Create Project Structure - -``` -kicad-wasm/ -├── kicad/ # Git submodule → upstream KiCad -├── patches/ -│ └── 0001-optional-deps.patch -├── stubs/ -│ └── include/ -│ ├── git2.h # Minimal stub headers -│ └── curl/curl.h -├── cmake/ -│ └── KicadWasmOptions.cmake -├── CMakeLists.txt -└── scripts/ - ├── prepare.sh # Apply patches - └── update-kicad.sh # Update to new KiCad version -``` - -### 1.2 Create the Patch - -Add CMake options to `CMakeLists.txt` (after line 107): - -```cmake -option( KICAD_USE_CURL "Enable network features" ON ) -option( KICAD_USE_GIT "Enable git integration" ON ) -option( KICAD_USE_OCC "Enable OpenCASCADE for STEP" ON ) -option( KICAD_USE_NGSPICE "Enable SPICE simulation" ON ) -option( KICAD_USE_DATABASE "Enable database libraries" ON ) -``` - -Wrap `find_package` calls conditionally: - -```cmake -if( KICAD_USE_CURL ) - find_package( CURL REQUIRED ) - add_compile_definitions( KICAD_USE_CURL ) -else() - add_library( CURL::libcurl INTERFACE IMPORTED ) -endif() -``` - -### 1.3 Create Stub Headers - -Minimal headers that let code compile without the actual libraries: - -```cpp -// stubs/include/git2.h -#pragma once -typedef struct git_repository git_repository; -// Stub functions return error codes -``` - -### 1.4 Add Preprocessor Guards to Source - -Wrap implementations in `common/git/*.cpp`, `common/kicad_curl/*.cpp`: - -```cpp -#ifdef KICAD_USE_GIT -// actual implementation -#else -// return error or throw "feature disabled" -#endif -``` - -### 1.5 Verify Native Build - -```bash -cd kicad-wasm -./scripts/prepare.sh -mkdir build && cd build -cmake .. -DKICAD_USE_CURL=OFF -DKICAD_USE_GIT=OFF -DKICAD_USE_OCC=OFF -make -j$(nproc) -``` - -Confirm KiCad launches and can open/edit PCB files (without git/network/STEP features). - ---- - -## Phase 2: Extract Core Library - -**Objective**: Build core computation code as a standalone library that can be compiled to both native and Wasm. - -### 2.1 Identify Core Components - -Create `kicad-wasm/core/CMakeLists.txt` targeting: - -| Component | Source Location | Notes | -|-----------|-----------------|-------| -| Math/Geometry | `libs/kimath/` | Pure C++, no deps | -| Core utilities | `libs/core/` | Pure C++ | -| KiCad file parser | `common/io/kicad/` | Needs minimal deps | -| S-expression parser | `libs/sexpr/` | Pure C++ | -| Board data model | `pcbnew/board*.cpp` | Extract carefully | - -### 2.2 Define API Boundary - -Create a C API for the core (easier Wasm interop than C++): - -```cpp -// kicad-wasm/core/include/kicad_core_api.h -extern "C" { - // File operations - void* kicad_load_pcb(const char* data, size_t len); - void kicad_free_pcb(void* board); - char* kicad_serialize_pcb(void* board); - - // Query - int kicad_get_track_count(void* board); - - // Modification - void kicad_add_track(void* board, /* params */); -} -``` - -### 2.3 Build Core as Static Library - -```cmake -# kicad-wasm/core/CMakeLists.txt -add_library(kicad_core STATIC - ${KIMATH_SOURCES} - ${SEXPR_SOURCES} - ${IO_KICAD_SOURCES} - api/kicad_core_api.cpp -) - -target_compile_definitions(kicad_core PRIVATE - KICAD_CORE_ONLY=1 -) -``` - ---- - -## Phase 3: Compile Core to WebAssembly - -**Objective**: Build `kicad_core.wasm` using Emscripten. - -### 3.1 Emscripten Build - -```bash -source /path/to/emsdk/emsdk_env.sh - -cd kicad-wasm -mkdir build-wasm && cd build-wasm - -emcmake cmake ../core \ - -DCMAKE_BUILD_TYPE=Release \ - -DKICAD_WASM_BUILD=ON - -emmake make -``` - -### 3.2 Export Functions - -```cmake -# For Emscripten -if(EMSCRIPTEN) - set_target_properties(kicad_core PROPERTIES - LINK_FLAGS "-s EXPORTED_FUNCTIONS='[_kicad_load_pcb,_kicad_free_pcb,...]' \ - -s EXPORTED_RUNTIME_METHODS='[ccall,cwrap]' \ - -s MODULARIZE=1 \ - -s EXPORT_NAME='KicadCore'" - ) -endif() -``` - -### 3.3 Test Wasm Module - -Create a simple test that loads a `.kicad_pcb` file: - -```javascript -// test/test_core.mjs -import KicadCore from './kicad_core.js'; - -const core = await KicadCore(); -const pcbData = fs.readFileSync('test.kicad_pcb', 'utf8'); -const board = core.ccall('kicad_load_pcb', 'number', ['string', 'number'], - [pcbData, pcbData.length]); -console.log('Track count:', core.ccall('kicad_get_track_count', 'number', ['number'], [board])); -``` - ---- - -## Phase 4: Native App with Wasm Worker - -**Objective**: Run native KiCad GUI but delegate core operations to the Wasm module. - -### 4.1 Choose Wasm Runtime - -Options for running Wasm in native app: -- **Wasmtime** - Rust-based, mature, good C API -- **wasm3** - Small, fast interpreter -- **WAMR** - WebAssembly Micro Runtime, lightweight - -Recommend: **Wasmtime** for development (better debugging), **wasm3** for size. - -### 4.2 Create Wasm Bridge - -```cpp -// kicad-wasm/bridge/wasm_bridge.h -class WasmBridge { -public: - WasmBridge(const std::string& wasmPath); - - BOARD* LoadPCB(const std::string& data); - std::string SerializePCB(BOARD* board); - void RunDRC(BOARD* board); - -private: - wasmtime_instance_t* m_instance; -}; -``` - -### 4.3 Integrate with KiCad - -Modify KiCad to optionally use the Wasm bridge: - -```cpp -// In pcbnew loading code -#ifdef USE_WASM_CORE - auto board = WasmBridge::Get().LoadPCB(fileContent); -#else - auto board = IO_KICAD::Load(filename); -#endif -``` - -### 4.4 Validate Correctness - -1. Load same PCB file via native code and via Wasm bridge -2. Compare serialized output (should be identical) -3. Run DRC via both paths, compare results -4. Profile performance difference - ---- - -## Phase 5: Incremental Migration - -**Objective**: Move more functionality to Wasm core, validate stability. - -### Priority Order - -1. **File I/O** - parsing and serialization -2. **DRC engine** - computationally intensive, isolated -3. **Router** - Push & Shove algorithms -4. **ERC** - schematic checks - -### Validation Strategy - -For each migrated component: -1. Keep both native and Wasm implementations -2. Add flag to switch between them -3. Run test suite with both -4. Benchmark performance -5. Remove native implementation once confident - ---- - -## Milestones - -| Milestone | Deliverable | Validation | -|-----------|-------------|------------| -| M1 | KiCad builds with deps disabled | Opens PCB files, basic editing works | -| M2 | Core library extracts cleanly | Compiles as standalone static lib | -| M3 | Core compiles to Wasm | Passes unit tests via Node.js | -| M4 | Native app loads Wasm worker | Can load/save PCB via Wasm bridge | -| M5 | DRC runs in Wasm | Results match native DRC | - ---- - -## Design Decisions - -### Memory Management - -**Decision**: Serialize/deserialize on every operation - -- Proof of concept - simplicity over performance -- Clean interface between GUI and Wasm core -- Easy to debug -- Browser-friendly (no shared memory complexity) -- Can optimize later if needed - -``` -GUI Wasm Core - │ │ - │──serialize(board)─────────────▶│ - │ │──process - │◀─────────────serialize(board)──│ - │ │ -``` - -### Threading Model - -**Decision**: Web Workers - -- Target is browser, design for it from the start -- Each heavy operation (DRC, routing) runs in dedicated worker -- Clean message-passing interface -- No shared memory complexity - -```javascript -// Main thread spawns workers for heavy operations -const drcWorker = new Worker('drc-worker.js'); -drcWorker.postMessage({ board: serializedBoard }); -drcWorker.onmessage = (e) => updateUI(e.data.violations); -``` - -### Incremental Updates - -**Decision**: Re-serialize entire board - -- Simple for proof of concept -- Board files typically <10MB, acceptable latency -- Can add delta operations later if performance requires it - ---- - -## Next Steps - -1. Fork KiCad repo, set up as submodule -2. Write the minimal patch for optional deps -3. Create stub headers -4. Verify native build with features disabled -5. Begin core library extraction \ No newline at end of file diff --git a/docs/01-KNOWLEDGE-BASE-FULL.md b/docs/01-KNOWLEDGE-BASE-FULL.md deleted file mode 100644 index 35634f6..0000000 --- a/docs/01-KNOWLEDGE-BASE-FULL.md +++ /dev/null @@ -1,846 +0,0 @@ -# KiCad WebAssembly Port - Complete Knowledge Base - -## Table of Contents -1. [Architecture Overview](#architecture-overview) -2. [Dependencies Deep Dive](#dependencies-deep-dive) -3. [Graphics System (GAL)](#graphics-system-gal) -4. [File I/O System](#file-io-system) -5. [Python Scripting](#python-scripting) -6. [Build System](#build-system) -7. [Features to Disable](#features-to-disable) -8. [Code Extraction Candidates](#code-extraction-candidates) -9. [Technical Challenges](#technical-challenges) -10. [Design Decisions](#design-decisions) -11. [File Reference](#file-reference) - ---- - -## Architecture Overview - -### Main Applications - -| Application | Directory | Purpose | -|-------------|-----------|---------| -| `kicad` | `kicad/` | Project manager, launcher | -| `pcbnew` | `pcbnew/` | PCB layout editor | -| `eeschema` | `eeschema/` | Schematic capture | -| `gerbview` | `gerbview/` | Gerber file viewer | -| `cvpcb` | `cvpcb/` | Component-footprint association | -| `bitmap2component` | `bitmap2component/` | Image to footprint converter | -| `pcb_calculator` | `pcb_calculator/` | Engineering calculators | -| `pagelayout_editor` | `pagelayout_editor/` | Drawing sheet editor | -| `kicad-cli` | `kicad/cli/` | Command-line interface | - -### Shared Libraries - -| Library | Location | Purpose | -|---------|----------|---------| -| `kicommon` | `common/` | Shared UI, I/O, utilities (SHARED lib) | -| `kigal` | `common/gal/` | Graphics Abstraction Layer (SHARED lib) | -| `kimath` | `libs/kimath/` | Geometry and math (STATIC lib) | -| `core` | `libs/core/` | Base utilities (STATIC lib) | -| `sexpr` | `libs/sexpr/` | S-expression parser (STATIC lib) | -| `kiplatform` | `libs/kiplatform/` | Platform abstraction | - -### Plugin Architecture (KIFACE) - -Each major application is built as both: -- Standalone executable -- KIFACE module (`.kiface` on Linux/Mac, `.dll` on Windows) - -This allows: -- Standalone operation -- Project manager integration via dynamic loading - -Key files: -- `include/kiway.h` - KIWAY system for inter-module communication -- `include/kiway_holder.h` - Mixin for frames that participate in KIWAY -- `include/kiway_player.h` - Frame base class (`KIWAY_PLAYER : public wxFrame`) - -### Frame Hierarchy - -``` -wxFrame - └── KIWAY_PLAYER (include/kiway_player.h) - └── EDA_BASE_FRAME (include/eda_base_frame.h) - ├── PCB_BASE_FRAME (pcbnew/) - │ └── PCB_EDIT_FRAME - ├── SCH_BASE_FRAME (eeschema/) - │ └── SCH_EDIT_FRAME - └── ...other frames -``` - ---- - -## Dependencies Deep Dive - -### wxWidgets (GUI Framework) - -**Version**: 3.2.0+ -**Components used**: `gl aui adv html core net base propgrid xml stc richtext webview` -**Location**: Found via `find_package(wxWidgets)` in `CMakeLists.txt:1089` - -KiCad requires GTK3 port on Linux. All GUI code depends on wxWidgets. - -Key wxWidgets classes used: -- `wxFrame`, `wxDialog`, `wxPanel` - windows -- `wxGLCanvas` - OpenGL context -- `wxFileDialog` - file selection -- `wxAuiManager` - dockable panes -- `wxPropertyGrid` - property editors - -**Wasm strategy**: Keep native initially. Eventually replace with web framework (React/Vue/Svelte). - -### OpenGL / GLEW - -**Purpose**: Hardware-accelerated 2D rendering via GAL -**Location**: `common/gal/opengl/` - -Uses OpenGL 2.1+ with shaders. GLEW handles extension loading. - -**Wasm strategy**: Emscripten maps OpenGL ES to WebGL automatically. Need to: -- Use OpenGL ES subset -- Convert shaders to GLSL ES (remove `#version`, add `precision` qualifiers) - -### Cairo - -**Version**: 1.12+ -**Purpose**: Software 2D rendering fallback, printing, PDF export -**Location**: `common/gal/cairo/` - -**Wasm strategy**: Can compile Cairo with Emscripten. Or skip for MVP (OpenGL-only). - -### OpenCASCADE (OCC/OCCT) - -**Version**: 7.5.0+ -**Purpose**: -- STEP file import/export (mechanical CAD interchange) -- 3D model loading for component visualization -- Boolean operations on 3D geometry - -**Files using OCC**: -- `pcbnew/exporters/step/step_pcb_model.cpp` - STEP export -- `pcbnew/exporters/step/exporter_step.cpp` - Export orchestration -- `plugins/3d/oce/loadmodel.cpp` - 3D model loading -- `plugins/3d/oce/oce.cpp` - Plugin entry point - -**Headers imported** (from `step_pcb_model.cpp`): -```cpp -#include -#include -#include -#include -#include -// ... ~30 more OCC headers -``` - -**Wasm strategy**: Disable for MVP. OCC is huge (~40MB compiled). Alternative: [opencascade.js](https://github.com/nicholaseasmith/opencascade.js) exists but experimental. - -### libcurl - -**Purpose**: HTTP requests for: -1. Plugin Content Manager (PCM) - `kicad/pcm/pcm.cpp` -2. Update checker - `kicad/update_manager.cpp` -3. HTTP component libraries - `common/http_lib/http_lib_connection.cpp` - -**Wrapper**: `common/kicad_curl/kicad_curl_easy.cpp` (~400 lines) - -**Key class**: `KICAD_CURL_EASY` -```cpp -class KICAD_CURL_EASY { - void SetURL(const std::string& url); - void Perform(); - std::string GetBuffer(); -}; -``` - -**Wasm strategy**: Stub out. Replace with Emscripten Fetch API or JavaScript fetch via embind. - -### libgit2 - -**Version**: 1.5+ -**Purpose**: Built-in version control for projects - -**Files** (`common/git/`): -| File | Purpose | -|------|---------| -| `git_clone_handler.cpp` | Clone repositories | -| `git_commit_handler.cpp` | Create commits | -| `git_push_handler.cpp` | Push to remote | -| `git_pull_handler.cpp` | Pull from remote | -| `git_branch_handler.cpp` | Branch management | -| `git_status_handler.cpp` | Status display | -| `git_revert_handler.cpp` | Revert changes | -| `kicad_git_common.cpp` | Common utilities | -| `kigit_pcb_merge.cpp` | Custom PCB merge driver | - -**UI integration**: -- Project tree shows git status icons -- Menus for git operations -- Conflict resolution dialogs - -**Wasm strategy**: Stub out entirely. Optional feature. Could use isomorphic-git in browser later. - -### ngspice - -**Purpose**: SPICE circuit simulation in eeschema -**Location**: `eeschema/sim/` - -**Wasm strategy**: Stub out. Simulation is a separate concern. Could compile ngspice to Wasm later. - -### nanoodbc (ODBC) - -**Purpose**: Database Libraries feature - fetch component data from SQL databases -**Location**: `common/database/database_connection.cpp` - -**What it does**: Connects to external databases (MySQL, PostgreSQL, SQLite, SQL Server) to fetch component information instead of using local `.kicad_sym` files. - -**Enterprise feature** - most users don't use this. - -**Wasm strategy**: Stub out. Would need REST API backend in browser. - -### Boost - -**Version**: 1.71.0+ -**Components**: `locale`, `unit_test_framework` - -`boost::locale` is used by nanoodbc for Unicode handling. - -**Wasm strategy**: Minimize. If we disable database libraries, we may not need boost::locale. - -### Freetype / HarfBuzz / Fontconfig - -**Purpose**: Text rendering with outline fonts -**Versions**: Freetype 2.11.1+, HarfBuzz (any), Fontconfig (any) - -**Location**: `common/font/` - -**Wasm strategy**: Compile with Emscripten. These work. May need to bundle fonts or use browser fonts. - -### Protobuf - -**Purpose**: IPC API for external tool integration -**Location**: `api/` - -**Wasm strategy**: Can compile Protobuf to Wasm. Or stub out IPC API for MVP. - ---- - -## Graphics System (GAL) - -### Architecture - -``` -┌─────────────────────────────────────────┐ -│ VIEW (common/view/) │ -│ Manages what's visible, handles zoom │ -└─────────────────────────────────────────┘ - │ - ▼ -┌─────────────────────────────────────────┐ -│ PAINTER (include/gal/painter.h) │ -│ Converts board objects to draw calls │ -└─────────────────────────────────────────┘ - │ - ▼ -┌─────────────────────────────────────────┐ -│ GAL (graphics_abstraction_layer) │ -│ Abstract interface for drawing │ -└─────────────────────────────────────────┘ - │ │ - ▼ ▼ -┌─────────────────┐ ┌─────────────────┐ -│ OPENGL_GAL │ │ CAIRO_GAL │ -│ (Hardware accel)│ │ (Software/print)│ -└─────────────────┘ └─────────────────┘ -``` - -### GAL Base Class - -**File**: `include/gal/graphics_abstraction_layer.h` - -```cpp -namespace KIGFX { -class GAL : public GAL_DISPLAY_OPTIONS_OBSERVER { - // Primitives - virtual void DrawLine(const VECTOR2D& start, const VECTOR2D& end); - virtual void DrawCircle(const VECTOR2D& center, double radius); - virtual void DrawArc(const VECTOR2D& center, double radius, ...); - virtual void DrawRectangle(const VECTOR2D& start, const VECTOR2D& end); - virtual void DrawPolygon(const std::deque& points); - - // State - virtual void SetFillColor(const COLOR4D& color); - virtual void SetStrokeColor(const COLOR4D& color); - virtual void SetLineWidth(float width); - - // Transformations - virtual void Transform(const MATRIX3x3D& matrix); - virtual void Translate(const VECTOR2D& translation); - virtual void Scale(const VECTOR2D& scale); - virtual void Rotate(double angle); - - // Layers - virtual void SetLayerDepth(double depth); -}; -} -``` - -### OpenGL GAL - -**Files**: -- `include/gal/opengl/opengl_gal.h` -- `common/gal/opengl/opengl_gal.cpp` -- `common/gal/opengl/shader.cpp` - GLSL shader management -- `common/gal/opengl/vertex_manager.cpp` - Vertex buffer management -- `common/gal/opengl/gpu_manager.cpp` - GPU memory management -- `common/gal/opengl/cached_container.cpp` - Geometry caching - -**Canvas**: `HIDPI_GL_CANVAS` wraps `wxGLCanvas` - -**Shader files** (`common/gal/shaders/`): -| File | Purpose | -|------|---------| -| `kicad_vert.glsl` | Main vertex shader | -| `kicad_frag.glsl` | Main fragment shader | -| `smaa_base.glsl` | SMAA antialiasing base | -| `smaa_pass_1_frag.glsl` | SMAA edge detection | -| `smaa_pass_2_frag.glsl` | SMAA blending weights | -| `smaa_pass_3_frag.glsl` | SMAA neighborhood blending | - -Shaders are embedded as C strings at build time. - -**For WebGL**: Need to convert shaders: -```glsl -// Before (desktop GLSL) -#version 120 -varying vec4 color; - -// After (WebGL/GLSL ES) -precision mediump float; -varying vec4 color; -``` - -### Cairo GAL - -**Files**: -- `include/gal/cairo/cairo_gal.h` -- `common/gal/cairo/cairo_gal.cpp` -- `common/gal/cairo/cairo_compositor.cpp` - Layer compositing -- `common/gal/cairo/cairo_print.cpp` - Printing support - -Used for: -- Software rendering fallback -- Printing -- PDF/SVG export - -### Draw Panel - -**File**: `include/class_draw_panel_gal.h` - -`EDA_DRAW_PANEL_GAL` wraps GAL and handles: -- Mouse events -- Keyboard events -- Tool dispatching -- View management - ---- - -## File I/O System - -### Architecture - -Plugin-based system with base class `IO_BASE`: - -**File**: `include/io/io_base.h` - -```cpp -class IO_BASE { - struct IO_FILE_DESC { - wxString m_Description; - std::vector m_FileExtensions; - bool m_CanRead; - bool m_CanWrite; - }; - - virtual std::vector GetFileDescriptors(); - virtual void SetReporter(REPORTER* reporter); - virtual void SetProgressReporter(PROGRESS_REPORTER* reporter); -}; -``` - -### Format Plugins - -**KiCad Native** (`common/io/kicad/`): -- S-expression based format -- `.kicad_pcb`, `.kicad_sch`, `.kicad_sym`, `.kicad_mod` - -**Import Plugins** (`common/io/`): -| Plugin | Location | Formats | -|--------|----------|---------| -| Eagle | `common/io/eagle/` | `.brd`, `.sch` | -| Altium | `common/io/altium/` | `.PcbDoc`, `.SchDoc` | -| CADSTAR | `common/io/cadstar/` | `.cpa`, `.csa` | -| EasyEDA | `common/io/easyeda/` | `.json` | -| EasyEDA Pro | `common/io/easyedapro/` | `.epro` | - -### S-Expression Parser - -**Location**: `libs/sexpr/` - -KiCad native files use S-expressions: -```lisp -(kicad_pcb (version 20221018) - (generator pcbnew) - (layers - (0 "F.Cu" signal) - (31 "B.Cu" signal)) - (footprint "Package_SO:SOIC-8" - (at 100 100) - (pad "1" smd rect (at -1.905 -2.475) (size 0.6 1.5)))) -``` - -Parser is pure C++, good candidate for Wasm. - -### PCB Data Model - -**Key classes** (in `pcbnew/`): - -| Class | File | Purpose | -|-------|------|---------| -| `BOARD` | `board.h` | Top-level PCB container | -| `FOOTPRINT` | `footprint.h` | Component footprint | -| `PAD` | `pad.h` | Footprint pad | -| `PCB_TRACK` | `pcb_track.h` | Trace segment | -| `PCB_VIA` | `pcb_track.h` | Via | -| `ZONE` | `zone.h` | Copper pour | -| `PCB_SHAPE` | `pcb_shape.h` | Graphical shape | -| `PCB_TEXT` | `pcb_text.h` | Text | - -**Hierarchy**: -``` -BOARD -├── FOOTPRINT[] -│ ├── PAD[] -│ ├── PCB_SHAPE[] -│ └── PCB_TEXT[] -├── PCB_TRACK[] -├── PCB_VIA[] -├── ZONE[] -├── PCB_SHAPE[] -└── PCB_TEXT[] -``` - ---- - -## Python Scripting - -### SWIG Bindings - -**Location**: `scripting/`, `common/swig/`, `pcbnew/python/swig/` - -**Interface files** (`.i`): -| File | Lines | Purpose | -|------|-------|---------| -| `kicadplugins.i` | 695 | Plugin framework | -| `wx.i` | 348 | wxWidgets types | -| `board.i` | 201 | BOARD class | -| `board_item.i` | 222 | Base item class | -| `footprint.i` | 200 | FOOTPRINT class | -| `pad.i` | 128 | PAD class | -| `pcbnew.i` | 148 | Main pcbnew module | -| Others | ~1600 | Various classes | -| **Total** | ~3500 | | - -### How SWIG Works - -1. SWIG reads `.i` interface files -2. Generates C++ wrapper code for CPython -3. Wrapper compiled to shared library (`_pcbnew.so`) -4. Python imports the module - -```python -import pcbnew -board = pcbnew.GetBoard() -for track in board.GetTracks(): - print(track.GetStart(), track.GetEnd()) -``` - -### Plugin Types - -| Type | Purpose | Interface | -|------|---------|-----------| -| FootprintWizard | Generate footprints programmatically | `FootprintWizardPlugin` | -| ActionPlugin | Custom toolbar actions | `ActionPlugin` | -| FilePlugin | Custom file formats | `FilePlugin` | - -### Wasm Strategy - -SWIG generates CPython-specific code. Options for Wasm: - -1. **Emscripten embind**: Rewrite bindings (~3500 lines to port) - ```cpp - #include - EMSCRIPTEN_BINDINGS(pcbnew) { - class_("Board") - .function("GetTracks", &BOARD::Tracks); - } - ``` - -2. **Pyodide**: If we want Python in browser, use Pyodide with custom FFI - -3. **Skip for MVP**: Python scripting is optional for basic editing - ---- - -## Build System - -### Main CMakeLists.txt Structure - -``` -CMakeLists.txt -├── Project setup (lines 1-100) -├── Options (lines 110-290) -│ ├── KICAD_SPICE_QA -│ ├── KICAD_USE_SENTRY -│ ├── KICAD_BUILD_I18N -│ ├── KICAD_BUILD_QA_TESTS -│ ├── KICAD_SCRIPTING_WXPYTHON -│ ├── KICAD_UPDATE_CHECK -│ └── ... more options -├── Compiler setup (lines 300-800) -├── Dependencies (lines 800-1200) -│ ├── find_package(ZLIB) -│ ├── find_package(CURL) # Line 825 - REQUIRED -│ ├── find_package(libgit2) # Line 842 - REQUIRED -│ ├── find_package(ngspice) # Line 877 - REQUIRED -│ ├── find_package(OCC) # Line 880 - FATAL if not found -│ └── ... more deps -├── wxWidgets setup (lines 1080-1140) -└── Subdirectories (lines 1250+) -``` - -### Common Library Build - -**File**: `common/CMakeLists.txt` - -```cmake -# KICOMMON_SRCS includes: -# - git/*.cpp (lines 75-95) -# - kicad_curl/*.cpp (lines 140-141) -# - database/*.cpp -# - All UI code - -target_link_libraries(kicommon - CURL::libcurl # Line 325 - ${LIBGIT2_LIBRARIES} # Line 330 - # ... -) -``` - -### Adding CMake Options for Optional Deps - -Need to add after line 107: -```cmake -option( KICAD_USE_CURL "Enable network features" ON ) -option( KICAD_USE_GIT "Enable git integration" ON ) -option( KICAD_USE_OCC "Enable STEP/3D via OpenCASCADE" ON ) -option( KICAD_USE_NGSPICE "Enable SPICE simulation" ON ) -option( KICAD_USE_DATABASE "Enable database libraries" ON ) -``` - -Then wrap find_package calls: -```cmake -if( KICAD_USE_CURL ) - find_package( CURL REQUIRED ) - add_compile_definitions( KICAD_USE_CURL ) -else() - add_library( CURL::libcurl INTERFACE IMPORTED ) -endif() -``` - ---- - -## Features to Disable - -### Git Integration - -**Files to stub** (`common/git/`): -- `git_add_to_index_handler.cpp` -- `git_branch_handler.cpp` -- `git_clone_handler.cpp` -- `git_commit_handler.cpp` -- `git_config_handler.cpp` -- `git_compare_handler.cpp` -- `git_init_handler.cpp` -- `git_pull_handler.cpp` -- `git_push_handler.cpp` -- `git_remove_from_index_handler.cpp` -- `git_remove_vcs_handler.cpp` -- `git_resolve_conflict_handler.cpp` -- `git_revert_handler.cpp` -- `git_status_handler.cpp` -- `git_switch_branch_handler.cpp` -- `git_sync_handler.cpp` -- `kicad_git_common.cpp` -- `git_backend.cpp` -- `libgit_backend.cpp` -- `project_git_utils.cpp` - -**Stub header needed**: `stubs/include/git2.h` - -### Network Features (curl) - -**Files to stub** (`common/kicad_curl/`): -- `kicad_curl.cpp` -- `kicad_curl_easy.cpp` - -**Files to stub** (`common/http_lib/`): -- `http_lib_connection.cpp` - -**Files affected** (`kicad/`): -- `pcm/pcm.cpp` - Plugin Content Manager -- `pcm/pcm_task_manager.cpp` -- `update_manager.cpp` - -**Stub header needed**: `stubs/include/curl/curl.h` - -### OpenCASCADE (STEP/3D) - -**Files to exclude**: -- `pcbnew/exporters/step/*.cpp` -- `plugins/3d/oce/*.cpp` - -**Approach**: Don't build these targets rather than stubbing. - -### SPICE Simulation - -**Files affected**: `eeschema/sim/` - -**Approach**: Disable simulator UI, don't build sim targets. - -### Database Libraries - -**Files to stub** (`common/database/`): -- `database_connection.cpp` -- `database_cache.cpp` - ---- - -## Code Extraction Candidates - -### Tier 1: Pure Computation (No Dependencies) - -| Component | Location | Lines (approx) | Notes | -|-----------|----------|----------------|-------| -| Math library | `libs/kimath/src/` | ~5000 | Vectors, matrices, geometry | -| Core utilities | `libs/core/src/` | ~2000 | String utils, exceptions | -| S-expr parser | `libs/sexpr/` | ~1500 | Pure parsing | - -### Tier 2: File I/O (Minimal Dependencies) - -| Component | Location | Notes | -|-----------|----------|-------| -| KiCad PCB parser | `common/io/kicad/` | Needs kimath, sexpr | -| Board data model | `pcbnew/*.cpp` | Core classes only | -| Schematic parser | `common/io/eeschema/` | Needs kimath | - -### Tier 3: Algorithms (May Need Adaptation) - -| Component | Location | Notes | -|-----------|----------|-------| -| DRC engine | `pcbnew/drc/` | May use threading | -| Router | `pcbnew/router/` | Push & Shove | -| ERC | `eeschema/erc/` | Electrical checks | -| Connectivity | `pcbnew/connectivity/` | Net analysis | - ---- - -## Technical Challenges - -### Threading - -**Current usage**: -- DRC runs checks in parallel -- Router uses threading for optimization -- Background jobs system - -**Wasm limitation**: Single-threaded by default. - -**Solutions**: -1. **Web Workers**: Spawn separate Wasm instances -2. **Wasm threads** (experimental): SharedArrayBuffer + pthreads -3. **Sequential fallback**: Slower but works - -**Decision**: Use Web Workers. Design for async message-passing. - -### Memory Management - -**Challenge**: Need to share board state between native GUI and Wasm core. - -**Options**: -1. **Serialize/deserialize**: Simple, proof of concept -2. **Shared memory**: Complex, requires careful synchronization -3. **Authoritative Wasm copy**: GUI requests views - -**Decision**: Serialize/deserialize. Proof of concept, simplicity over performance. - -### File Access - -**Native**: Direct filesystem, `wxFileDialog` - -**Browser**: No filesystem access without user interaction - -**Solutions**: -- Emscripten virtual filesystem (MEMFS, IDBFS) -- File System Access API (Chrome) -- IndexedDB for persistence -- Drag & drop / file picker - -### Clipboard - -**Native**: `wxClipboard`, platform integration - -**Browser**: Async Clipboard API (permissions required) - -### Fonts - -**Native**: System fonts via Fontconfig - -**Browser**: Bundle fonts or use CSS fonts - ---- - -## Design Decisions - -### Memory Management - -**Decision**: Serialize/deserialize on every operation - -**Rationale**: -- Proof of concept phase -- Simplicity over performance -- Clean interface between GUI and core -- Easy to debug -- Browser-friendly (no shared memory complexity) - -**Implementation**: -```cpp -// GUI → Wasm: Send operation + serialized state -std::string boardJson = SerializeBoard(board); -wasmCore.ApplyOperation(boardJson, operation); -std::string newBoardJson = wasmCore.GetBoardState(); -board = DeserializeBoard(newBoardJson); -``` - -### Threading Model - -**Decision**: Web Workers - -**Rationale**: -- Target is browser -- Clean message-passing interface -- Each worker is isolated Wasm instance -- No shared memory complexity - -**Implementation**: -```javascript -// Main thread -const worker = new Worker('kicad-core-worker.js'); -worker.postMessage({ type: 'runDRC', board: boardData }); -worker.onmessage = (e) => { handleDRCResults(e.data); }; - -// Worker -importScripts('kicad_core.js'); -onmessage = async (e) => { - const core = await KicadCore(); - if (e.data.type === 'runDRC') { - const results = core.runDRC(e.data.board); - postMessage(results); - } -}; -``` - -### Incremental Updates - -**Decision**: Re-serialize entire board (for now) - -**Rationale**: -- Simple implementation -- Board files are typically <10MB -- Performance acceptable for proof of concept -- Can optimize later with deltas if needed - ---- - -## File Reference - -### Core Headers - -| Purpose | File | -|---------|------| -| GAL interface | `include/gal/graphics_abstraction_layer.h` | -| OpenGL GAL | `include/gal/opengl/opengl_gal.h` | -| Cairo GAL | `include/gal/cairo/cairo_gal.h` | -| Draw panel | `include/class_draw_panel_gal.h` | -| Base frame | `include/eda_base_frame.h` | -| KIWAY | `include/kiway.h` | -| KIWAY holder | `include/kiway_holder.h` | -| I/O base | `include/io/io_base.h` | -| Board | `pcbnew/board.h` | -| Footprint | `pcbnew/footprint.h` | -| Track | `pcbnew/pcb_track.h` | - -### Build Files - -| Purpose | File | -|---------|------| -| Main build | `CMakeLists.txt` | -| Common lib | `common/CMakeLists.txt` | -| GAL lib | `common/gal/CMakeLists.txt` | -| PCBnew | `pcbnew/CMakeLists.txt` | -| Eeschema | `eeschema/CMakeLists.txt` | -| 3D viewer | `3d-viewer/CMakeLists.txt` | - -### SWIG Bindings - -| Purpose | File | -|---------|------| -| Main entry | `scripting/kicadplugins.i` | -| Common | `common/swig/kicad.i` | -| wxWidgets | `common/swig/wx.i` | -| Math | `common/swig/math.i` | -| Shapes | `common/swig/shape.i` | -| Board | `pcbnew/python/swig/board.i` | -| PCBnew main | `pcbnew/python/swig/pcbnew.i` | - -### Git Integration - -| Purpose | File | -|---------|------| -| Common class | `common/git/kicad_git_common.cpp` | -| Clone | `common/git/git_clone_handler.cpp` | -| Commit | `common/git/git_commit_handler.cpp` | -| Push | `common/git/git_push_handler.cpp` | -| Pull | `common/git/git_pull_handler.cpp` | -| Status | `common/git/git_status_handler.cpp` | -| PCB merge | `pcbnew/git/kigit_pcb_merge.cpp` | - -### Curl/Network - -| Purpose | File | -|---------|------| -| Curl wrapper | `common/kicad_curl/kicad_curl_easy.cpp` | -| Curl init | `common/kicad_curl/kicad_curl.cpp` | -| HTTP lib | `common/http_lib/http_lib_connection.cpp` | -| PCM | `kicad/pcm/pcm.cpp` | -| Updates | `kicad/update_manager.cpp` | - -### OpenCASCADE/STEP - -| Purpose | File | -|---------|------| -| STEP model | `pcbnew/exporters/step/step_pcb_model.cpp` | -| STEP export | `pcbnew/exporters/step/exporter_step.cpp` | -| OCC plugin | `plugins/3d/oce/oce.cpp` | -| Model loader | `plugins/3d/oce/loadmodel.cpp` | diff --git a/docs/01-KNOWLEDGE-BASE.md b/docs/01-KNOWLEDGE-BASE.md deleted file mode 100644 index c3dadfd..0000000 --- a/docs/01-KNOWLEDGE-BASE.md +++ /dev/null @@ -1,136 +0,0 @@ -# KiCad WebAssembly Port - Knowledge Base - -## Architecture Overview - -KiCad is a modular EDA suite with these main components: -- **Project Manager** (`kicad/`) - launches other tools -- **PCB Editor** (`pcbnew/`) - board layout -- **Schematic Editor** (`eeschema/`) - circuit design -- **3D Viewer** (`3d-viewer/`) - 3D visualization - -Shared code lives in: -- `common/` - shared library (kicommon), includes GUI, I/O, git, curl -- `libs/core/` - utilities -- `libs/kimath/` - geometry and math (pure C++, no deps) - -## Key Dependencies - -| Dependency | Purpose | Wasm Strategy | -|------------|---------|---------------| -| **wxWidgets** | All GUI | Keep native initially; replace with web UI later | -| **OpenGL** | 2D rendering via GAL | WebGL (Emscripten handles this) | -| **Cairo** | Fallback 2D rendering | Compile with Emscripten or skip | -| **OpenCASCADE** | STEP import/export, 3D | Disable for MVP; huge (~40MB) | -| **libcurl** | PCM, update check, HTTP libs | Stub out; replace with Fetch API | -| **libgit2** | Version control integration | Stub out; optional feature | -| **ngspice** | Circuit simulation | Stub out; separate concern | -| **nanoodbc** | Database libraries | Stub out; enterprise feature | -| **Freetype/HarfBuzz** | Font rendering | Compile with Emscripten (works) | -| **Boost** | Locale, unit tests | Minimize; locale needed for nanoodbc only | - -## Graphics Abstraction Layer (GAL) - -Location: `common/gal/`, `include/gal/` - -KiCad abstracts rendering through GAL with two backends: -- `OPENGL_GAL` (`common/gal/opengl/`) - primary, uses GLSL shaders -- `CAIRO_GAL` (`common/gal/cairo/`) - fallback, vector graphics - -Key files: -- `include/gal/graphics_abstraction_layer.h` - base interface -- `common/gal/opengl/opengl_gal.cpp` - OpenGL implementation -- `common/gal/shaders/` - GLSL shaders (need ES conversion for WebGL) - -For Wasm: OpenGL ES subset via Emscripten maps to WebGL. Shaders need `#version` removal and precision qualifiers. - -## File I/O System - -Location: `common/io/`, `include/io/` - -Plugin-based architecture supporting multiple formats: -- KiCad native (`.kicad_pcb`, `.kicad_sch`) -- Eagle, Altium, CADSTAR, EasyEDA imports - -Key class: `IO_BASE` in `include/io/io_base.h` - -Parsers are mostly pure C++ - good candidates for Wasm core. - -## Python Scripting - -Location: `scripting/`, `pcbnew/python/` - -Uses SWIG to generate CPython bindings (~3,500 lines of `.i` files). - -For Wasm: SWIG bindings won't work. Options: -1. Use Emscripten's `embind` instead -2. Use Pyodide with custom FFI -3. Skip Python for MVP - -## Optional Features to Disable - -These have minimal impact on core editing functionality: - -| Feature | CMake Area | Files | -|---------|-----------|-------| -| Git integration | `common/git/` | 15 handler files | -| Network (PCM, updates) | `common/kicad_curl/`, `common/http_lib/` | ~5 files | -| Database libraries | `common/database/` | 2-3 files | -| STEP/3D export | `pcbnew/exporters/step/`, `plugins/3d/oce/` | Isolated | -| SPICE simulation | `eeschema/sim/` | Isolated subsystem | - -## Build System Notes - -Main CMake: `CMakeLists.txt` - -Currently all deps are REQUIRED (lines 820-892). No options exist to disable curl/git/OCC. - -Libraries link in `common/CMakeLists.txt:316-343`: -```cmake -target_link_libraries( kicommon - CURL::libcurl - ${LIBGIT2_LIBRARIES} - ... -) -``` - -## IPC/Communication - -`KIWAY` system (`include/kiway.h`, `include/kiway_holder.h`) handles inter-frame communication. Frames inherit from `KIWAY_PLAYER`. - -For Wasm worker architecture: This could be adapted for message-passing between native GUI and Wasm worker. - -## Potential Problem Areas - -1. **Threading**: KiCad uses threads for DRC, rendering. Wasm has Web Workers but different threading model. - -2. **File dialogs**: `wxFileDialog` throughout - needs abstraction for browser File API. - -3. **Memory**: Large boards can use 1GB+. Wasm has 4GB limit, but browser tabs may have lower practical limits. - -4. **Clipboard**: Native clipboard integration in multiple places. - -5. **Printing**: Cairo-based printing system won't work in browser. - -## Files of Interest for Core Extraction - -Pure computation, no GUI deps - good Wasm candidates: -- `libs/kimath/` - all geometry code -- `libs/core/` - utilities -- `common/io/kicad/` - native format parser -- `pcbnew/router/` - Push & Shove routing algorithms -- `pcbnew/drc/` - Design Rule Check engine -- `eeschema/erc/` - Electrical Rule Check - -## Reference Paths - -| Component | Path | -|-----------|------| -| Main CMake | `CMakeLists.txt` | -| Common library | `common/CMakeLists.txt` | -| GAL system | `common/gal/`, `include/gal/` | -| File I/O | `common/io/` | -| PCB data model | `pcbnew/board.h`, `pcbnew/footprint.h` | -| Git integration | `common/git/` | -| Curl wrapper | `common/kicad_curl/` | -| Python bindings | `scripting/`, `pcbnew/python/swig/` | -| 3D/STEP | `pcbnew/exporters/step/`, `3d-viewer/` | diff --git a/docs/02-PHASE2-CORE-EXTRACTION.md b/docs/02-PHASE2-CORE-EXTRACTION.md deleted file mode 100644 index 3202368..0000000 --- a/docs/02-PHASE2-CORE-EXTRACTION.md +++ /dev/null @@ -1,395 +0,0 @@ -# Phase 2: Core Library Extraction - -## Overview - -Extract KiCad's core computation code into a standalone library that compiles to both native and WebAssembly. This enables running the native wxWidgets GUI while delegating computation to a WASM module. - -## Architecture: Native GUI + WASM Core - -``` -┌─────────────────────────────────────────────────────────┐ -│ Native GUI (wxWidgets) │ -│ - PCB Editor canvas, menus, dialogs │ -│ - File dialogs, clipboard │ -│ - User interaction │ -└─────────────────────┬───────────────────────────────────┘ - │ S-expression serialization - ▼ -┌─────────────────────────────────────────────────────────┐ -│ WASM Bridge │ -│ - Wasmtime/wasm3 runtime (future) │ -│ - Serialize board → S-expr → WASM │ -│ - Deserialize results ← S-expr ← WASM │ -└─────────────────────┬───────────────────────────────────┘ - │ - ▼ -┌─────────────────────────────────────────────────────────┐ -│ kicad_core.wasm │ -│ - libs/kimath (geometry) │ -│ - libs/sexpr (parsing) │ -│ - Board data model │ -│ - DRC engine │ -│ - Router (Push & Shove) │ -└─────────────────────────────────────────────────────────┘ -``` - -## Why This Works: wxWidgets is NOT Required for Core - -**Important**: The core libs don't use wxWidgets for GUI - they just use utility macros that happen to come from wx. We provide drop-in replacements via a ~50 line shim header: - -| Library | wx Usage | Count | Shim Solution | -|---------|----------|-------|---------------| -| libs/kimath | wxASSERT, wxLogTrace | ~34 | Macros → assert/no-op | -| libs/sexpr | wxFFile, wxString | ~4 | Classes → std equivalents | -| libs/core | wxString | ~17 | typedef → std::string | - -### wx_shim.h - -```cpp -// core/include/wx_shim.h -#ifndef KICAD_WX_SHIM_H -#define KICAD_WX_SHIM_H - -#include -#include -#include - -// Assertions - just use standard assert -#define wxASSERT(x) assert(x) -#define wxASSERT_MSG(x, msg) assert((x) && (msg)) -#define wxCHECK(x, ret) do { if(!(x)) return ret; } while(0) -#define wxCHECK_MSG(x, ret, msg) do { if(!(x)) return ret; } while(0) -#define wxFAIL_MSG(msg) assert(false && (msg)) - -// Logging - no-op or stderr -#define wxLogTrace(...) ((void)0) -#define wxLogDebug(...) ((void)0) -#define wxLogWarning(...) fprintf(stderr, __VA_ARGS__) - -// String - just use std::string -using wxString = std::string; -using wxChar = char; - -// File I/O - use standard C++ -#include -class wxFFile { - std::ifstream m_file; -public: - bool Open(const std::string& name) { m_file.open(name); return m_file.is_open(); } - bool IsOpened() const { return m_file.is_open(); } - size_t Read(void* buf, size_t count) { m_file.read((char*)buf, count); return m_file.gcount(); } - bool Eof() const { return m_file.eof(); } -}; - -#endif -``` - -## Directory Structure - -``` -kicad-wasm/ -├── core/ -│ ├── CMakeLists.txt # Standalone build without wxWidgets -│ ├── include/ -│ │ ├── wx_shim.h # wx compatibility layer (~50 lines) -│ │ └── kicad_core_api.h # C API for WASM -│ ├── src/ -│ │ └── api.cpp # API implementation -│ └── wasm/ -│ └── CMakeLists.txt # Emscripten-specific settings -├── test/ -│ ├── test_geometry.cpp # Test kimath without wx -│ ├── test_board_io.cpp # Test board load/save -│ └── test.kicad_pcb # Sample board file -``` - -## Implementation Steps - -### Step 1: Foundation + Shim Layer - -- Create `core/` directory structure -- Create `wx_shim.h` with standard C++ replacements -- Create CMakeLists.txt that builds kimath, core, sexpr -- **Test**: Compiles without wxWidgets - -### Step 2: Board Model Extraction - -- Identify minimal BOARD dependencies -- Create C API: `kicad_load_board()`, `kicad_save_board()` -- Handle S-expression serialization -- **Test**: Load a .kicad_pcb file via API - -### Step 3: DRC Engine Extraction - -- Extract DRC_ENGINE and test providers -- Create C API: `kicad_drc_run()` returns violations as JSON -- **Test**: Run DRC on test board - -### Step 4: Router Extraction - -- Extract PNS::ROUTER and supporting classes -- Create minimal ROUTER_IFACE implementation -- Create C API: `kicad_router_start()`, `_move()`, `_commit()` -- **Test**: Route traces via API - -### Step 5: Emscripten Build - -- Set up emsdk toolchain -- Build `kicad_core.wasm` -- Create JavaScript bindings -- **Test**: Load board in Node.js, run DRC, route traces - -### Step 6: Browser Demo (Future) - -- Simple HTML page with file upload -- Load .kicad_pcb, display stats -- Run DRC, show violations - -## C API Design - -### Board I/O - -```cpp -extern "C" { - // Load board from S-expression string - void* kicad_load_board(const char* sexpr_data, size_t len); - - // Serialize board to S-expression - char* kicad_save_board(void* board); - - // Free memory - void kicad_free_board(void* board); - void kicad_free_string(char* str); - - // Query operations - int kicad_get_track_count(void* board); - int kicad_get_footprint_count(void* board); -} -``` - -### DRC Engine - -```cpp -extern "C" { - // Initialize DRC with rules - void* kicad_drc_create(void* board, const char* rules_sexpr); - - // Run DRC, returns JSON array of violations - char* kicad_drc_run(void* drc_engine); - - // Query specific clearance - int kicad_drc_query_clearance(void* drc, int item_a, int item_b); - - void kicad_drc_free(void* drc); -} -``` - -### Router - -```cpp -extern "C" { - // Create router with board data - void* kicad_router_create(void* board); - - // Start routing from point - int kicad_router_start(void* router, int x, int y, int layer); - - // Move to point, returns preview geometry as S-expr - char* kicad_router_move(void* router, int x, int y); - - // Commit route - char* kicad_router_commit(void* router); - - void kicad_router_free(void* router); -} -``` - -## Emscripten Build - -```bash -source /path/to/emsdk/emsdk_env.sh - -cd kicad-wasm -mkdir build-wasm && cd build-wasm - -emcmake cmake ../core \ - -DCMAKE_BUILD_TYPE=Release \ - -DKICAD_WASM_BUILD=ON - -emmake make -``` - -### Emscripten CMake Settings - -```cmake -if(EMSCRIPTEN) - set_target_properties(kicad_core PROPERTIES - LINK_FLAGS "-s EXPORTED_FUNCTIONS='[_kicad_load_board,_kicad_save_board,...]' \ - -s EXPORTED_RUNTIME_METHODS='[ccall,cwrap,UTF8ToString]' \ - -s MODULARIZE=1 \ - -s EXPORT_NAME='KicadCore' \ - -s ALLOW_MEMORY_GROWTH=1" - ) -endif() -``` - -## Key KiCad Source Files - -**Libraries to include (via shim, no modification):** -- `kicad/libs/kimath/src/**/*.cpp` - 17.5k lines, geometry -- `kicad/libs/core/*.cpp` - 870 lines, utilities -- `kicad/libs/sexpr/*.cpp` - 734 lines, parser -- `kicad/pcbnew/board*.cpp` - Board data model -- `kicad/pcbnew/pcb_io/kicad_sexpr/*.cpp` - S-expr I/O -- `kicad/pcbnew/drc/*.cpp` - DRC engine -- `kicad/pcbnew/router/pns_*.cpp` - Router - -**Key headers:** -- `kicad/libs/kimath/include/geometry/shape_poly_set.h` - Polygon ops -- `kicad/pcbnew/board.h` - BOARD class (1510 lines) -- `kicad/pcbnew/drc/drc_engine.h` - DRC entry point -- `kicad/pcbnew/router/pns_router.h` - Router entry point - -## Progress - -### ✅ Step 1: Foundation + Shim Layer (COMPLETE) - -**Date**: 2025-11-26 - -Successfully compiled kimath standalone without wxWidgets: - -``` -core/ -├── include/ -│ ├── wx_shim.h # ~170 lines (more than expected, but still minimal) -│ ├── config.h # Platform configuration -│ ├── advanced_config.h # Default values for triangulation etc. -│ └── wx/ # Stub wx headers -│ ├── debug.h -│ ├── log.h -│ ├── string.h -│ └── confbase.h -├── src/ -│ └── test_kimath.cpp -├── CMakeLists.txt -└── build/ - ├── libkimath.a # 1.4 MB static library - ├── libclipper2.a - ├── libkicad_core_utils.a - └── test_kimath # Working test executable -``` - -**Key learnings:** -- wx_shim.h needed to be ~170 lines, not ~50, due to: - - `wxString::Format()` with varargs required a proper class with template Format method - - `FormatArg` template needed to convert string args to `c_str()` for snprintf - - `wxLog::EnableLogging()` used in polygon_triangulation.h - - `wxString::RemoveLast()` used for string manipulation - - `ADVANCED_CFG` class needed for triangulation settings -- C++20 required (not C++17) due to KiCad's use of concepts -- Build order: Our `core/include/` must come FIRST in include paths - -**Test output:** -``` -Testing kimath standalone build... -Created VECTOR2I: (0,0) and (100,100) -SEG length: 141 -Created polygon with 1 outline(s) -Polygon area: 1e+06 -kimath standalone build: SUCCESS! -``` - ---- - -### ✅ Step 5 (partial): Emscripten Build (COMPLETE) - -**Date**: 2025-11-26 - -Successfully compiled kimath to WebAssembly: - -```bash -$ emcmake cmake .. && emmake make -$ node test_kimath.js - -Testing kimath standalone build... -Created VECTOR2I: (0,0) and (100,100) -SEG length: 141 -Created polygon with 1 outline(s) -Polygon area: 1e+06 -kimath standalone build: SUCCESS! -``` - -**Build artifacts:** -``` -build-wasm/ -├── test_kimath.wasm # 845KB - WASM module -├── test_kimath.js # 154KB - JS glue code -├── libkimath.a # 5.1MB - Static WASM library -├── libclipper2.a # 1.2MB -└── libkicad_core_utils.a # 106KB -``` - -**Key findings:** -- No code changes needed between native and WASM builds -- Same wx_shim.h works for both targets -- WASM module runs identically to native in Node.js - ---- - -### ✅ Step 2 (partial): S-expression Parser (COMPLETE) - -**Date**: 2025-11-26 - -Added libs/sexpr to the standalone build: - -**Additional stubs needed:** -- `wx/file.h`, `wx/ffile.h` - file I/O stubs -- `wxFFile` class in wx_shim.h (~80 lines) -- `string_utils.h` - minimal stub for `From_UTF8()` - -**Test output (both native and WASM):** -``` -Testing S-expression parser... -Parsed S-expr with 4 elements -Root element: kicad_pcb -``` - -**WASM sizes:** -``` -test_kimath.wasm - 867KB (geometry + sexpr parser) -libkimath.a - 5.1MB -libsexpr.a - 159KB -libclipper2.a - 1.2MB -``` - ---- - -## Success Criteria - -- [x] wx_shim.h provides all needed wx replacements -- [x] libs/kimath compiles with shim (no wxWidgets linked) -- [x] kicad_core.wasm builds with Emscripten (kimath portion) -- [x] libs/sexpr compiles with shim (added wxFFile, string_utils stubs) -- [x] S-expression parser can parse .kicad_pcb format strings -- [ ] S-expression parser can load .kicad_pcb from string -- [ ] Board data model extracts cleanly -- [ ] C API wrapper builds as native static library -- [ ] kicad_core.wasm builds with Emscripten -- [ ] Node.js can load a .kicad_pcb file via WASM -- [ ] DRC runs in WASM, outputs violation list -- [ ] Router API works in WASM - -## First Concrete Step - -Start with Step 1: Create `core/` directory with `wx_shim.h` and attempt to compile just `libs/kimath` standalone. This proves the shim approach works before tackling the larger board model. - -## Dependencies - -**Must include in WASM build:** -- Clipper2 library (polygon boolean operations) - pure C++ -- RTree (spatial indexing) - header-only - -**Not needed:** -- wxWidgets (replaced by shim) -- Boost (only header-only templates used) -- OpenCASCADE, ngspice, curl, libgit2 (already disabled in Phase 1) diff --git a/docs/03-PHASE3-WXWIDGETS-WASM.md b/docs/03-PHASE3-WXWIDGETS-WASM.md deleted file mode 100644 index 3356fc2..0000000 --- a/docs/03-PHASE3-WXWIDGETS-WASM.md +++ /dev/null @@ -1,597 +0,0 @@ -# Phase 3: wxWidgets wxUniversal for WebAssembly - -## Overview - -Port wxWidgets with wxUniversal backend to WebAssembly, enabling the full KiCad GUI to run in browsers. This builds on the core library already compiled to WASM (kimath, sexpr). - -## Current State (from Phase 2) - -Already working in WASM: -- `libkimath.a` - Geometry library (5.1MB) -- `libsexpr.a` - S-expression parser (159KB) -- `libclipper2.a` - Polygon operations (1.2MB) -- `libkicad_core_utils.a` - Core utilities (106KB) -- wxBase (non-GUI utilities) - via existing build script - -## Goal - -Build wxWidgets with **wxUniversal** backend for Emscripten, enabling: -- Full wxWidgets GUI rendered to HTML5 canvas -- wxGLCanvas for KiCad's GAL (Graphics Abstraction Layer) -- Event handling (mouse, keyboard, touch) - -**First Milestone**: Any .kicad_pcb file renders in browser - ---- - -## Architecture - -``` -┌─────────────────────────────────────────────────────────────┐ -│ Browser │ -│ ┌─────────────┐ ┌─────────────┐ ┌─────────────┐ │ -│ │ HTML5 Canvas│ │ WebGL │ │ DOM Events │ │ -│ └──────┬──────┘ └──────┬──────┘ └──────┬──────┘ │ -└─────────┼────────────────┼────────────────┼─────────────────┘ - │ │ │ - ▼ ▼ ▼ -┌─────────────────────────────────────────────────────────────┐ -│ wxWidgets (wxUniversal backend) │ -│ - Draws all widgets to canvas (no native widgets) │ -│ - wxGLCanvas → WebGL context │ -│ - Event translation (browser → wx events) │ -└─────────────────────────────────────────────────────────────┘ - │ - ▼ -┌─────────────────────────────────────────────────────────────┐ -│ KiCad Application │ -│ - GAL (Graphics Abstraction Layer) → uses wxGLCanvas │ -│ - Board data model (already in WASM) │ -│ - PCB Painter │ -└─────────────────────────────────────────────────────────────┘ -``` - ---- - -## Strategy: Create Your Own wxWidgets Fork - -Rather than using the abandoned wxWidgets-wasm fork (based on old wx 3.0.x), create a fresh fork from modern wxWidgets 3.2.6 and apply the ~10 required patches. - -### Reference: wxWidgets-wasm Commits - -From [ahilss/wxWidgets-wasm](https://github.com/ahilss/wxWidgets-wasm): - -| Commit | Purpose | Likely Files | -|--------|---------|--------------| -| Suppress locale warnings | Browser env | `src/common/intl.cpp` | -| Touch → mouse events | Web input | `src/univ/topluniv.cpp` | -| Font size in pixels | Web rendering | `src/univ/themes/*.cpp` | -| Size top window before run | WASM init | `src/univ/topluniv.cpp` | -| Mouse window crash fix | Event stability | `src/common/wincmn.cpp` | - -### Configure Flags (from wxWidgets-wasm) - -```bash ---host=emscripten \ ---with-cxx=17 \ ---enable-utf8 \ ---enable-universal \ # Key: Use wxUniversal backend ---disable-shared \ ---disable-exceptions \ ---disable-richtext \ ---without-libtiff \ ---disable-xlocale \ ---with-opengl # Enable wxGLCanvas for WebGL -``` - ---- - -## Implementation Steps - -### Step 1: Fork wxWidgets - -1. Fork wxWidgets on GitHub (e.g., `VV-EE/wxWidgets`) -2. Clone locally -3. Checkout tag `v3.2.6` -4. Create branch `wasm-port` - -```bash -git clone git@github.com:VV-EE/wxWidgets.git -cd wxWidgets -git checkout v3.2.6 -git checkout -b wasm-port -``` - -### Step 2: Study wxWidgets-wasm Patches - -Clone wxWidgets-wasm and identify the specific changes: - -```bash -git clone https://github.com/ahilss/wxWidgets-wasm.git wxwidgets-wasm-ref -cd wxwidgets-wasm-ref - -# Find commits that differ from upstream -git log --oneline | head -20 -``` - -For each WASM-specific commit: -1. Identify changed files -2. Understand the change -3. Create equivalent patch for 3.2.6 - -### Step 3: Apply Patches to Your Fork - -Create patch files and apply: - -```bash -# In your wxWidgets fork -git apply ../patches/0001-suppress-locale-warnings.patch -git apply ../patches/0002-touch-to-mouse-events.patch -# etc. -git commit -m "Add Emscripten/WASM support" -``` - -### Step 4: Submodule Setup After Cloning - -The wxwidgets submodule is a fork (`VV-EE/wxWidgets`) with all WASM changes already committed. However, wxWidgets has **nested submodules** (pcre, expat, jpeg, png, tiff, zlib) that need config.sub modifications for Emscripten support. These nested submodules are separate repositories, so their changes are NOT tracked by the wxwidgets fork. - -**After cloning kicad-wasm, you must:** - -```bash -git clone -cd kicad-wasm - -# 1. Initialize wxwidgets submodule -git submodule update --init wxwidgets - -# 2. Initialize wxwidgets' nested submodules -cd wxwidgets -git submodule update --init --recursive - -# 3. Copy config.sub to nested submodules (required for Emscripten) -# The main wxwidgets/config.sub already has emscripten/wasm32 support. -# Copy it to all nested submodule locations: -cp config.sub 3rdparty/pcre/config.sub -cp config.sub src/expat/expat/conftools/config.sub -cp config.sub src/jpeg/config.sub -cp config.sub src/png/config.sub -cp config.sub src/tiff/config/config.sub - -cd .. -``` - -**Why is this needed?** -- wxWidgets bundles libraries (pcre, expat, jpeg, png, tiff) as git submodules -- Each submodule has its own `config.sub` that must recognize `emscripten` and `wasm32` hosts -- These submodules point to upstream repos, so we can't commit changes to them -- The same modified config.sub must be copied to all 5 locations after every fresh clone - -**Reproducibility Testing** (optional): - -A patch-based build system exists for validation: -```bash -# Generate patches from current wxwidgets state -./scripts/generate-wxwidgets-patches.sh - -# Build from clean clone + patches (validates reproducibility) -./scripts/build-wxwidgets-wasm-clean.sh --clean -``` - -### Step 5: Create Build Script - -Create `scripts/build-wxuniversal-wasm.sh`: - -```bash -#!/bin/bash -set -e - -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PROJECT_ROOT="$(dirname "$SCRIPT_DIR")" -BUILD_DIR="$PROJECT_ROOT/build-wasm/wxwidgets-universal" -WX_SOURCE="$PROJECT_ROOT/wxwidgets" - -# Environment setup -export CFLAGS="-I$EMSDK/upstream/emscripten/system/local/include" -export CXXFLAGS="-I$EMSDK/upstream/emscripten/system/local/include" -export LDFLAGS="-L$EMSDK/upstream/emscripten/system/local/lib -sERROR_ON_UNDEFINED_SYMBOLS=0" - -CONFIGURE_ARGS="--host=emscripten \ - --with-cxx=17 \ - --enable-utf8 \ - --enable-universal \ - --disable-shared \ - --disable-exceptions \ - --disable-richtext \ - --without-libtiff \ - --disable-xlocale \ - --with-opengl" - -if [ "$1" = "--clean" ]; then - rm -rf "$BUILD_DIR" -fi - -mkdir -p "$BUILD_DIR" -cd "$BUILD_DIR" - -# Initialize submodules if needed -cd "$WX_SOURCE" -git submodule update --init src/jpeg 2>/dev/null || true -git submodule update --init 3rdparty/catch 2>/dev/null || true -cd "$BUILD_DIR" - -# Configure and build -emconfigure "$WX_SOURCE/configure" $CONFIGURE_ARGS -emmake make -j$(sysctl -n hw.ncpu 2>/dev/null || nproc) - -echo "" -echo "=== Build complete ===" -ls -lh "$BUILD_DIR"/lib/*.a 2>/dev/null || echo "Libraries in $BUILD_DIR/lib/" -``` - -### Step 5: Verify wxUniversal Build - -Expected output libraries: -``` -lib/ -├── libwx_baseu-3.2.a # Base utilities (strings, files, etc.) -├── libwx_coreu-3.2.a # wxUniversal core (widgets, events) -├── libwx_glu-3.2.a # OpenGL/WebGL support -└── libwxregexu-3.2.a # Regex support -``` - -Verify `setup.h` contains: -```c -#define wxUSE_UNIVERSAL 1 -#define __WXUNIVERSAL__ 1 -#define wxUSE_GLCANVAS 1 -``` - ---- - -## Phase 3.1: Minimal wxApp Test - -### Test Application - -Create `test/wx_minimal/main.cpp`: - -```cpp -#include - -class MinimalApp : public wxApp { -public: - bool OnInit() override { - wxFrame* frame = new wxFrame(nullptr, wxID_ANY, - "KiCad WASM Test", wxDefaultPosition, wxSize(800, 600)); - - // Add a simple panel with text - wxPanel* panel = new wxPanel(frame); - new wxStaticText(panel, wxID_ANY, "wxWidgets in WebAssembly!", - wxPoint(10, 10)); - - frame->Show(true); - return true; - } -}; - -wxIMPLEMENT_APP(MinimalApp); -``` - -### Build Command - -```bash -emcc main.cpp \ - -I$WX_BUILD/lib/wx/include/emscripten-unicode-static-3.2 \ - -I$WX_SOURCE/include \ - -L$WX_BUILD/lib \ - -lwx_baseu-3.2 \ - -lwx_coreu-3.2 \ - -o minimal.html \ - -s ASYNCIFY=1 \ - -s ALLOW_MEMORY_GROWTH=1 -``` - -### Verification - -- [ ] HTML file loads in browser -- [ ] wxFrame window appears (rendered to canvas) -- [ ] Text displays -- [ ] No JavaScript errors in console - ---- - -## Phase 3.2: wxGLCanvas + WebGL - -### Test Application - -Create `test/wx_glcanvas/main.cpp`: - -```cpp -#include -#include - -#ifdef __EMSCRIPTEN__ -#include -#else -#include -#endif - -class GLFrame : public wxFrame { - wxGLCanvas* m_canvas; - wxGLContext* m_context; - -public: - GLFrame() : wxFrame(nullptr, wxID_ANY, "WebGL Test", - wxDefaultPosition, wxSize(800, 600)) { - wxGLAttributes attrs; - attrs.RGBA().DoubleBuffer().Depth(16).EndList(); - - m_canvas = new wxGLCanvas(this, attrs); - m_context = new wxGLContext(m_canvas); - - m_canvas->Bind(wxEVT_PAINT, &GLFrame::OnPaint, this); - m_canvas->Bind(wxEVT_SIZE, &GLFrame::OnSize, this); - } - - void OnPaint(wxPaintEvent& evt) { - wxPaintDC dc(m_canvas); - m_context->SetCurrent(*m_canvas); - - glClearColor(0.2f, 0.3f, 0.3f, 1.0f); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - - // Draw a simple triangle - // (shader code omitted for brevity) - - m_canvas->SwapBuffers(); - } - - void OnSize(wxSizeEvent& evt) { - m_canvas->Refresh(); - } -}; - -class GLApp : public wxApp { -public: - bool OnInit() override { - GLFrame* frame = new GLFrame(); - frame->Show(true); - return true; - } -}; - -wxIMPLEMENT_APP(GLApp); -``` - -### Build Command (with WebGL) - -```bash -emcc main.cpp \ - -I$WX_BUILD/lib/wx/include/emscripten-unicode-static-3.2 \ - -I$WX_SOURCE/include \ - -L$WX_BUILD/lib \ - -lwx_baseu-3.2 \ - -lwx_coreu-3.2 \ - -lwx_glu-3.2 \ - -o glcanvas.html \ - -s ASYNCIFY=1 \ - -s ALLOW_MEMORY_GROWTH=1 \ - -s USE_WEBGL2=1 \ - -s FULL_ES3=1 -``` - -### Verification - -- [ ] WebGL context created successfully -- [ ] Canvas clears to specified color -- [ ] No WebGL errors in console -- [ ] Window resizing works - ---- - -## Phase 3.3: KiCad GAL Integration - -### Shader Conversion (GLSL 1.2 → GLSL ES 3.0) - -KiCad shaders need conversion for WebGL 2.0: - -**Vertex Shader:** -```glsl -// Before (GLSL 1.2) -#version 120 -attribute vec4 a_position; -varying vec4 v_color; - -// After (GLSL ES 3.0) -#version 300 es -precision highp float; -in vec4 a_position; -out vec4 v_color; -``` - -**Fragment Shader:** -```glsl -// Before (GLSL 1.2) -#version 120 -varying vec4 v_color; -void main() { - gl_FragColor = v_color; -} - -// After (GLSL ES 3.0) -#version 300 es -precision highp float; -in vec4 v_color; -out vec4 fragColor; -void main() { - fragColor = v_color; -} -``` - -### Files to Convert - -- `kicad/common/gal/shaders/kicad_frag.glsl` -- `kicad/common/gal/shaders/kicad_vert.glsl` -- `kicad/common/gal/shaders/smaa_*.glsl` (anti-aliasing, optional) - -### WebGL GAL Adapter - -Create `core/gal-wasm/webgl_gal.h`: - -```cpp -// Adapter for OPENGL_GAL to work with Emscripten WebGL -class WEBGL_GAL : public OPENGL_GAL { -public: - WEBGL_GAL(...); - - // Override shader loading to use GLSL ES - void loadShaders() override; - - // Skip GLEW initialization (not needed in Emscripten) - void initGLEW() override { /* no-op */ } -}; -``` - ---- - -## Phase 3.4: PCB Viewer - -### Application Structure - -``` -viewer/ -├── main.cpp # wxApp entry point -├── pcb_view_frame.cpp # Main frame with canvas -├── pcb_view_canvas.cpp # wxGLCanvas + GAL + VIEW -├── index.html # HTML shell -└── CMakeLists.txt -``` - -### PCB View Canvas - -```cpp -class PCB_VIEW_CANVAS : public wxGLCanvas { - std::unique_ptr m_gal; - std::unique_ptr m_view; - std::unique_ptr m_painter; - BOARD* m_board = nullptr; - -public: - PCB_VIEW_CANVAS(wxWindow* parent); - - void LoadBoard(const std::string& sexpr); - -protected: - void OnPaint(wxPaintEvent& evt); - void OnMouseWheel(wxMouseEvent& evt); // Zoom - void OnMouseMove(wxMouseEvent& evt); // Pan -}; -``` - -### JavaScript Integration - -```javascript -// Load PCB file via fetch and pass to WASM -async function loadPCB(url) { - const response = await fetch(url); - const content = await response.text(); - - // Call WASM function - Module.ccall('loadPCBContent', 'void', ['string'], [content]); -} - -// File input handler -document.getElementById('fileInput').addEventListener('change', async (e) => { - const file = e.target.files[0]; - const content = await file.text(); - Module.ccall('loadPCBContent', 'void', ['string'], [content]); -}); -``` - ---- - -## Directory Structure - -``` -kicad-wasm/ -├── wxwidgets/ # Your wxWidgets fork (with WASM patches) -├── kicad/ # KiCad source (submodule) -├── core/ -│ ├── CMakeLists.txt # Existing: kimath, sexpr, etc. -│ ├── wasm-config/ # WASM config.h -│ └── gal-wasm/ # NEW: WebGL GAL -│ ├── webgl_gal.h -│ ├── webgl_gal.cpp -│ └── shaders/ -│ ├── kicad_frag_es.glsl -│ └── kicad_vert_es.glsl -├── viewer/ # NEW: PCB Viewer app -│ ├── CMakeLists.txt -│ ├── main.cpp -│ ├── pcb_view_frame.cpp -│ ├── pcb_view_canvas.cpp -│ └── index.html -├── scripts/ -│ ├── build-wxbase-wasm.sh # Existing -│ ├── build-wxuniversal-wasm.sh # NEW -│ ├── build-core-wasm.sh # Existing -│ └── build-viewer.sh # NEW -├── test/ -│ ├── wx_minimal/ # NEW: Test wxApp -│ └── wx_glcanvas/ # NEW: Test WebGL -└── docs/ - ├── 00-OVERVIEW.md - ├── 01-KNOWLEDGE-BASE.md - ├── 02-PHASE2-CORE-EXTRACTION.md - └── 03-PHASE3-WXWIDGETS-WASM.md # This file -``` - ---- - -## Success Criteria - -### Phase 3.1: wxUniversal Build -- [ ] wxWidgets fork created with WASM patches -- [ ] `./configure` completes with `--enable-universal` -- [ ] `libwx_baseu-3.2.a`, `libwx_coreu-3.2.a`, `libwx_glu-3.2.a` built - -### Phase 3.2: Minimal wxApp -- [ ] wxFrame renders in browser -- [ ] Text/widgets display correctly -- [ ] Events (click, resize) work - -### Phase 3.3: wxGLCanvas -- [ ] WebGL context created -- [ ] Basic OpenGL rendering works -- [ ] Canvas clears and draws - -### Phase 3.4: KiCad GAL -- [ ] Shaders converted to GLSL ES -- [ ] WEBGL_GAL draws basic shapes -- [ ] Lines, circles, polygons render - -### Phase 3.5: PCB Viewer (First Milestone!) -- [ ] .kicad_pcb file loads -- [ ] Board outline visible -- [ ] Tracks visible -- [ ] Pads visible -- [ ] Pan/zoom works - ---- - -## Risk Mitigation - -| Risk | Impact | Mitigation | -|------|--------|------------| -| wxWidgets 3.2 vs old wx patches | High | Patches are small (~10 commits), review carefully | -| GLSL shader incompatibility | Medium | Use WebGL 2.0 (GLSL ES 3.0), test incrementally | -| Performance with large boards | Medium | Accept slow initially, optimize later | -| Event handling differences | Medium | Test thoroughly, refer to wxWidgets-wasm solutions | - ---- - -## References - -- [wxWidgets-wasm Repository](https://github.com/ahilss/wxWidgets-wasm) -- [Wavacity (Audacity WASM port)](https://github.com/ahilss/wavacity) -- [wxWidgets WebAssembly Discussion](https://forums.wxwidgets.org/viewtopic.php?t=51463) -- [Emscripten wxWidgets Issue](https://github.com/emscripten-core/emscripten/issues/13983) \ No newline at end of file diff --git a/docs/04-COMPREHENSIVE-WASM-TEST.md b/docs/04-COMPREHENSIVE-WASM-TEST.md deleted file mode 100644 index 9f69850..0000000 --- a/docs/04-COMPREHENSIVE-WASM-TEST.md +++ /dev/null @@ -1,347 +0,0 @@ -# Phase 4: Comprehensive wxWidgets WASM Test Application - -## Overview - -Create a multi-widget showcase test application for the wxWidgets WASM port that thoroughly exercises wxUniversal controls and event handling. This validates the WASM port before integrating KiCad components. - -## Goal - -1. Display various wxUniversal controls in a tabbed interface -2. Support full interaction: mouse clicks, keyboard input, mouse drag/draw, hover effects -3. Show an on-screen event log panel for visual verification -4. Have corresponding Playwright tests to verify all interactions work - ---- - -## Application Architecture - -``` -+-------------------------------------------------------+ -| Menu: File | Edit | Help | -+-------------------------------------------------------+ -| [Controls Tab] [Text Tab] [Drawing Tab] [Lists Tab] | -+-------------------------------------------------------+ -| | -| Tab Content Area | -| (varies by tab) | -| | -+-------------------------------------------------------+ -| Event Log Panel (wxListBox) | -| - "Button 'Test' clicked" | -| - "Checkbox toggled: checked" | -| - "Mouse moved to (123, 456)" | -+-------------------------------------------------------+ -| Status Bar: Ready | -+-------------------------------------------------------+ -``` - ---- - -## Files to Modify - -| File | Action | Description | -|------|--------|-------------| -| `tests/wasm-app/minimal_test.cpp` | Replace | Comprehensive widget showcase | -| `tests/e2e/wxwidgets.spec.ts` | Update | Add interaction tests | - ---- - -## Test Application Structure - -### Control IDs - -```cpp -enum { - ID_BTN_TEST = wxID_HIGHEST + 1, - ID_BTN_TOGGLE, - ID_CHK_FEATURE, - ID_RADIO_OPTIONS, - ID_SLIDER, - ID_GAUGE, - ID_TEXT_SINGLE, - ID_TEXT_MULTI, - ID_TEXT_PASSWORD, - ID_COMBO, - ID_LISTBOX, - ID_CHOICE, - ID_BTN_CLEAR, - ID_EVENT_LOG, - ID_DRAWING_PANEL -}; -``` - -### Main Classes - -```cpp -class TestApp : public wxApp; // Application entry point -class TestFrame : public wxFrame; // Main frame with notebook and event log -class ControlsPage : public wxPanel; // Tab 1: Buttons, checkboxes, sliders -class TextPage : public wxPanel; // Tab 2: Text controls -class DrawingPage : public wxPanel; // Tab 3: Mouse drawing canvas -class ListsPage : public wxPanel; // Tab 4: Lists and dropdowns -class DrawingPanel : public wxPanel; // Custom drawing canvas -``` - ---- - -## Tab Contents - -### Tab 1: Controls - -| Control | ID | Purpose | -|---------|-----|---------| -| wxButton ("Click Me") | `ID_BTN_TEST` | Basic click event | -| wxToggleButton ("Toggle") | `ID_BTN_TOGGLE` | Two-state button | -| wxCheckBox ("Enable feature") | `ID_CHK_FEATURE` | Boolean toggle | -| wxRadioBox ("Options": A/B/C) | `ID_RADIO_OPTIONS` | Exclusive selection | -| wxSlider (0-100) | `ID_SLIDER` | Range selection | -| wxGauge | `ID_GAUGE` | Shows slider value | - -### Tab 2: Text Input - -| Control | ID | Purpose | -|---------|-----|---------| -| wxTextCtrl (single-line) | `ID_TEXT_SINGLE` | Basic text input | -| wxTextCtrl (multi-line) | `ID_TEXT_MULTI` | Multi-line text | -| wxTextCtrl (password) | `ID_TEXT_PASSWORD` | Masked input | -| wxComboBox | `ID_COMBO` | Dropdown with text | - -### Tab 3: Drawing Canvas - -| Control | ID | Purpose | -|---------|-----|---------| -| DrawingPanel | `ID_DRAWING_PANEL` | Custom painting | -| wxButton ("Clear") | `ID_BTN_CLEAR` | Reset canvas | - -Mouse interactions: -- `wxEVT_LEFT_DOWN` - Start drawing -- `wxEVT_MOTION` - Draw line segments -- `wxEVT_LEFT_UP` - End drawing - -### Tab 4: Lists - -| Control | ID | Purpose | -|---------|-----|---------| -| wxListBox | `ID_LISTBOX` | Multi-item selection | -| wxChoice | `ID_CHOICE` | Dropdown selection | -| Add/Remove buttons | - | Modify list contents | - ---- - -## Event Log Panel - -- `wxListBox` at bottom of frame -- ID: `ID_EVENT_LOG` -- Max 100 entries (older entries removed) -- Auto-scrolls to bottom -- Format: `"[HH:MM:SS] Event description"` - -Events also logged to browser console for Playwright verification. - ---- - -## Event Types to Test - -| Event | Control | Test Method | -|-------|---------|-------------| -| `wxEVT_BUTTON` | Button | Click canvas coordinates | -| `wxEVT_TOGGLEBUTTON` | ToggleButton | Click and verify state | -| `wxEVT_CHECKBOX` | CheckBox | Click and verify checked | -| `wxEVT_RADIOBOX` | RadioBox | Click option and verify | -| `wxEVT_SLIDER` | Slider | Drag and verify value | -| `wxEVT_TEXT` | TextCtrl | Type and verify content | -| `wxEVT_TEXT_ENTER` | TextCtrl | Press Enter | -| `wxEVT_LISTBOX` | ListBox | Click item and verify | -| `wxEVT_CHOICE` | Choice | Click and select | -| `wxEVT_LEFT_DOWN` | Panel | Mouse down | -| `wxEVT_MOTION` | Panel | Mouse move | -| `wxEVT_LEFT_UP` | Panel | Mouse up | -| `wxEVT_PAINT` | Panel | Automatic on invalidate | - ---- - -## Playwright Test Structure - -```typescript -test.describe('wxWidgets WASM Comprehensive', () => { - // Existing loading tests... - - test.describe('Controls Tab', () => { - test('button click logs event'); - test('checkbox toggle works'); - test('slider interaction'); - test('radio button selection'); - }); - - test.describe('Text Input Tab', () => { - test('text input accepts keyboard'); - test('multiline text input'); - test('password field masks input'); - }); - - test.describe('Drawing Tab', () => { - test('mouse drag draws on canvas'); - test('clear button resets canvas'); - }); - - test.describe('Lists Tab', () => { - test('listbox selection'); - test('choice dropdown'); - }); - - test.describe('Event Log', () => { - test('events are logged visually'); - }); -}); -``` - -### Test Helpers - -```typescript -// Wait for app to be ready -async function waitForApp(page: Page) { - await page.waitForSelector('canvas', { state: 'visible', timeout: 30000 }); - await page.waitForTimeout(500); // Let UI settle -} - -// Simulate click at canvas coordinates -async function clickAt(page: Page, x: number, y: number) { - const canvas = page.locator('canvas'); - await canvas.click({ position: { x, y } }); -} - -// Check console for event log entries -async function getConsoleEvents(page: Page): Promise { - // Capture console.log messages with [EVENT] prefix -} -``` - ---- - -## Testing Challenges & Solutions - -### Challenge 1: Canvas Coordinate Mapping - -wxUniversal renders all widgets to a single HTML5 canvas. Tests need to know widget positions. - -**Solution**: Use consistent layout with predictable positions. Log control bounds to console on startup. - -### Challenge 2: Verifying Event Log Content - -The event log is inside the WASM app, not directly accessible from JavaScript. - -**Solution**: Log events to browser console with `[EVENT]` prefix. Playwright captures via `page.on('console')`. - -### Challenge 3: Keyboard Input - -Need to route keyboard events to the correct wxWidgets control. - -**Solution**: Focus canvas first, then use `page.keyboard.type()`. wxWidgets handles focus internally. - ---- - -## wxUniversal Controls Reference - -Available controls in wxUniversal (verified in `wxwidgets/include/wx/univ/`): - -**Buttons:** -- wxButton, wxBitmapButton, wxToggleButton - -**Input Controls:** -- wxCheckBox, wxRadioButton, wxRadioBox -- wxTextCtrl (single/multi-line) -- wxComboBox, wxChoice - -**Lists:** -- wxListBox, wxCheckListBox - -**Range Controls:** -- wxSlider, wxGauge, wxSpinButton - -**Containers:** -- wxNotebook (tabbed container) -- wxPanel, wxScrolledWindow - -**Static Controls:** -- wxStaticText, wxStaticBox, wxStaticLine - -**Frame Elements:** -- wxMenu, wxMenuBar, wxStatusBar - ---- - -## Implementation Steps - -### Step 1: Update minimal_test.cpp - -Replace current minimal test with comprehensive widget showcase. - -Key components: -1. `TestFrame` constructor creates notebook, tabs, and event log -2. Each tab page creates its controls with appropriate sizers -3. Event handlers call `LogEvent()` to record actions -4. `LogEvent()` adds to wxListBox AND prints to console - -### Step 2: Update Playwright Tests - -Extend `tests/e2e/wxwidgets.spec.ts`: -1. Keep existing loading tests -2. Add test groups for each tab -3. Add console event capture -4. Add canvas interaction helpers - -### Step 3: Build and Test - -```bash -# Rebuild test app -./scripts/build-wasm-test.sh - -# Run tests -cd tests && npm test - -# Visual debugging -npm run test:ui -# or -cd wasm-app && npx serve . -``` - ---- - -## Success Criteria - -### Visual Verification -- [ ] App displays with menu bar -- [ ] Four tabs visible and switchable -- [ ] Controls visible on each tab -- [ ] Event log panel at bottom - -### Interaction Tests -- [ ] Button click logs "Button clicked" -- [ ] Checkbox toggle logs state change -- [ ] Slider drag updates gauge and logs value -- [ ] Text input shows typed text and logs changes -- [ ] Drawing canvas responds to mouse drag -- [ ] ListBox/Choice selection works - -### Playwright Tests -- [ ] All existing loading tests pass -- [ ] Button interaction test passes -- [ ] Checkbox interaction test passes -- [ ] Text input test passes -- [ ] Drawing interaction test passes - ---- - -## Dependencies - -Before implementation: -- wxWidgets WASM build complete (`./scripts/build-wxuniversal-wasm.sh`) -- Existing Playwright tests passing (`cd tests && npm test`) - ---- - -## References - -- wxWidgets Samples: `wxwidgets/samples/widgets/` - Multi-widget showcase pattern -- wxWidgets Samples: `wxwidgets/samples/drawing/` - Custom painting pattern -- wxUniversal Headers: `wxwidgets/include/wx/univ/` - Available controls \ No newline at end of file diff --git a/docs/05-WXGLCANVAS-WASM-IMPLEMENTATION.md b/docs/05-WXGLCANVAS-WASM-IMPLEMENTATION.md deleted file mode 100644 index 579d501..0000000 --- a/docs/05-WXGLCANVAS-WASM-IMPLEMENTATION.md +++ /dev/null @@ -1,324 +0,0 @@ -# 05 - wxGLCanvas WASM Implementation - -This document outlines the plan to implement wxGLCanvas (OpenGL/WebGL support) for the wxWidgets WASM port, enabling KiCad's OpenGL-based rendering in the browser. - -## Current Status: Completed ✅ - -**wxGLCanvas implementation is complete.** The GL library builds successfully: -``` -libwx_wasmunivu_gl-3.2-emscripten.a -``` - -### Build Command -```bash -./scripts/build-wxuniversal-wasm.sh # Incremental build -./scripts/build-wxuniversal-wasm.sh --clean # Clean build -``` - -### Implementation Summary -- Created `wxwidgets/include/wx/wasm/glcanvas.h` -- Created `wxwidgets/src/wasm/glcanvas.cpp` -- Updated `wxwidgets/configure.in` for WASM OpenGL support -- Updated `wxwidgets/build/bakefiles/files.bkl` -- Added empty stubs for legacy wxGLAPI functions in `glcmn.cpp` (KiCad doesn't use these) - ---- - -## Phase 1: Fix wxWidgets Build (PCRE2 Issue) ✅ Completed - -### Problem -``` -fatal error: 'pcre2.h' file not found -``` - -### Root Cause -Build race condition during parallel make. With `-j` parallel builds, `regex.cpp` can compile before PCRE generates its headers. - -### Solution -Modify `scripts/build-wxuniversal-wasm.sh` to build PCRE first: - -```bash -# After configure section, add: -echo "" -echo "=== Building PCRE first (dependency) ===" -emmake make -C 3rdparty/pcre - -# Then existing make: -echo "" -echo "=== Building ===" -emmake make -j$(nproc 2>/dev/null || sysctl -n hw.ncpu) -``` - ---- - -## Phase 2: Implement wxGLCanvas for WASM ✅ Completed - -### Estimated Effort: 18-27 hours (Actual: ~8 hours) - -| Component | Files | Effort | -|-----------|-------|--------| -| Header file | `include/wx/wasm/glcanvas.h` | 2-3 hours | -| Implementation | `src/wasm/glcanvas.cpp` | 8-12 hours | -| Configure updates | `configure.in` | 1-2 hours | -| Build system | `build/files.bkl` | 1 hour | -| Testing & debug | - | 6-10 hours | - -### Implementation Approach: Direct WebGL via Emscripten - -Use Emscripten's HTML5 API (`emscripten/html5.h`) for WebGL context management. - -#### 1. Create `include/wx/wasm/glcanvas.h` (~100-150 lines) - -```cpp -#ifndef _WX_WASM_GLCANVAS_H_ -#define _WX_WASM_GLCANVAS_H_ - -#include "wx/glcanvas.h" -#include - -class WXDLLIMPEXP_GL wxGLContext : public wxGLContextBase -{ -public: - wxGLContext(wxGLCanvas *win, const wxGLContext *other = NULL, - const wxGLContextAttrs *ctxAttrs = NULL); - virtual ~wxGLContext(); - - virtual bool SetCurrent(const wxGLCanvas& win) const wxOVERRIDE; - -private: - EMSCRIPTEN_WEBGL_CONTEXT_HANDLE m_context; - - wxDECLARE_CLASS(wxGLContext); -}; - -class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasBase -{ -public: - wxGLCanvas(wxWindow *parent, - const wxGLAttributes& dispAttrs, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const wxPalette& palette = wxNullPalette); - - virtual ~wxGLCanvas(); - - virtual bool SwapBuffers() wxOVERRIDE; - - // Get the canvas element ID for Emscripten - const char* GetCanvasId() const { return m_canvasId.c_str(); } - -private: - bool CreateWindow(wxWindow *parent, const wxGLAttributes& dispAttrs, - wxWindowID id, const wxPoint& pos, const wxSize& size, - long style, const wxString& name); - - std::string m_canvasId; - - wxDECLARE_CLASS(wxGLCanvas); -}; - -#endif // _WX_WASM_GLCANVAS_H_ -``` - -#### 2. Create `src/wasm/glcanvas.cpp` (~500-700 lines) - -Key implementation tasks: -- Parse wxGL_* attributes → WebGL context attributes -- Create WebGL context using `emscripten_webgl_create_context()` -- Implement `SetCurrent()` using `emscripten_webgl_make_context_current()` -- Handle canvas resize events -- `SwapBuffers()` - typically no-op for WebGL (auto-swaps) - -#### 3. Update `configure.in` (line ~3890) - -```autoconf -elif test "$wxUSE_WASM" = 1; then - dnl WASM uses WebGL through Emscripten - OPENGL_LIBS="" - wxUSE_OPENGL="yes" -``` - -#### 4. Update `build/files.bkl` - -Add `glcanvas.cpp` to WASM sources list. - -### Reference Files -- `src/unix/glegl.cpp` - EGL implementation (922 lines) -- `src/gtk/glcanvas.cpp` - GTK implementation (303 lines) -- `src/common/glcmn.cpp` - Base implementation shared by all ports - ---- - -## Phase 3: Legacy OpenGL Emulation for KiCad - -### The Problem - -**KiCad uses legacy OpenGL immediate mode** which is **NOT supported in WebGL**. KiCad does NOT use wxGLAPI (wxWidgets' wrapper), but calls raw OpenGL directly: - -| Function Category | Count | Examples | -|---|---|---| -| glBegin/glEnd | 70 | Immediate mode drawing | -| glVertex2f/3f/2d/3d | 112 | Vertex specification | -| glMatrixMode/glPushMatrix/glPopMatrix | 88 | Matrix stack operations | -| glEnableClientState/glDisableClientState | 43 | Legacy vertex arrays | -| glColor3f/4f/3d/4d | 34 | Per-vertex colors | -| glTranslatef/glRotatef/glScalef | 26 | Matrix transforms | -| glTexCoord2f/2d | 19 | Texture coordinates | -| glVertexPointer/glColorPointer | 18 | Legacy vertex arrays | -| glNormal3f/3d | 12 | Normal vectors | -| **TOTAL** | **423+** | **Must be emulated** | - -### Most Affected KiCad Files - -**3D Viewer (heaviest usage):** -- `opengl_utils.cpp` - 88+ calls (bounding boxes, debug geometry) -- `render_3d_opengl.cpp` - 50+ calls (core 3D board rendering) -- `3d_spheres_gizmo.cpp` - 48+ calls (interactive gizmos) -- `layer_triangles.cpp` - 34 calls (layer mesh rendering) - -**2D PCB Viewer:** -- `opengl_gal.cpp` - 39+ calls (bitmap text, cursor) -- `antialiasing.cpp` - 37+ calls (fullscreen AA post-processing) -- `opengl_compositor.cpp` - 19+ calls (screen compositing) - -### Solution: Emscripten Legacy GL Emulation - -**Link flag:** `-sLEGACY_GL_EMULATION` - -This built-in Emscripten feature emulates legacy OpenGL (immediate mode, matrix stack, etc.) on top of WebGL. It was used to port the Sauerbraten 3D game (BananaBread). - -**Optional performance flags:** -- `-sGL_UNSAFE_OPTS` - Skip redundant GL work -- `-sGL_FFP_ONLY` - Disable programmable pipeline detection - -**Alternatives (if needed later):** -- [gl4es](https://github.com/ptitSeb/gl4es) - OpenGL 2.1 → GLES 2.0 translation -- [Regal](https://github.com/emscripten-ports/regal) - Used by D3Wasm (Doom 3 port) - ---- - -## Phase 4: Test Graphics - -### Goal - -Create tests that exercise **all GL functions KiCad uses** to verify emulation works. - -### GL Functions to Test (Based on KiCad Usage) - -#### Immediate Mode Drawing -```cpp -glBegin(GL_TRIANGLES); -glBegin(GL_QUADS); -glBegin(GL_LINE_STRIP); -glBegin(GL_LINE_LOOP); -glBegin(GL_LINES); -glEnd(); -``` - -#### Vertex Specification -```cpp -glVertex2f(x, y); -glVertex3f(x, y, z); -glVertex2d(x, y); -glVertex3d(x, y, z); -``` - -#### Color Specification -```cpp -glColor3f(r, g, b); -glColor4f(r, g, b, a); -glColor3ub(r, g, b); -glColor4ub(r, g, b, a); -``` - -#### Matrix Operations -```cpp -glMatrixMode(GL_PROJECTION); -glMatrixMode(GL_MODELVIEW); -glLoadIdentity(); -glPushMatrix(); -glPopMatrix(); -glTranslatef(x, y, z); -glRotatef(angle, x, y, z); -glScalef(x, y, z); -glOrtho(...); -gluPerspective(...); -``` - -#### Texture Coordinates -```cpp -glTexCoord2f(s, t); -glTexCoord2d(s, t); -``` - -#### Normal Vectors -```cpp -glNormal3f(nx, ny, nz); -glNormal3d(nx, ny, nz); -``` - -#### Legacy Vertex Arrays -```cpp -glEnableClientState(GL_VERTEX_ARRAY); -glEnableClientState(GL_COLOR_ARRAY); -glDisableClientState(...); -glVertexPointer(...); -glColorPointer(...); -glDrawArrays(...); -``` - -#### State Management -```cpp -glEnable(GL_BLEND); -glEnable(GL_DEPTH_TEST); -glEnable(GL_TEXTURE_2D); -glDisable(...); -glBlendFunc(...); -``` - -### Test File: `tests/wasm-app/gl_test.cpp` - -Create test application that: -1. Creates wxGLCanvas with WebGL context -2. Tests each category of GL functions -3. Renders a known pattern (e.g., colored shapes) -4. Logs results to console - -### Playwright Tests: `tests/e2e/gl.spec.ts` - -Automated tests: -- WebGL context creation succeeds -- Each GL function category executes without errors -- Visual verification of rendered output (screenshot comparison) - ---- - -## Files to Create/Modify - -| File | Action | -|------|--------| -| `scripts/build-wxuniversal-wasm.sh` | Modify - fix PCRE build order | -| `wxwidgets/include/wx/wasm/glcanvas.h` | Create - wxGLCanvas header | -| `wxwidgets/src/wasm/glcanvas.cpp` | Create - wxGLCanvas implementation | -| `wxwidgets/configure.in` | Modify - add WASM OpenGL support | -| `wxwidgets/build/files.bkl` | Modify - add source file | -| `tests/wasm-app/gl_test.cpp` | Create - test application | -| `tests/e2e/gl.spec.ts` | Create - Playwright tests | - ---- - -## Why This Matters for KiCad - -KiCad uses a Graphics Abstraction Layer (GAL) with two backends: -- **Cairo backend**: Uses wxDC (2D) - works with existing wxUniversal WASM -- **OpenGL backend**: Uses wxGLCanvas - **requires this implementation** - -KiCad's OpenGL GAL provides: -- Hardware-accelerated rendering -- Better performance for complex PCBs -- 3D viewer support - -Without wxGLCanvas, KiCad would be limited to Cairo rendering only. diff --git a/docs/06-WXGLCANVAS-CANVAS-ELEMENT-FIX.md b/docs/06-WXGLCANVAS-CANVAS-ELEMENT-FIX.md deleted file mode 100644 index 636fe38..0000000 --- a/docs/06-WXGLCANVAS-CANVAS-ELEMENT-FIX.md +++ /dev/null @@ -1,146 +0,0 @@ -# 06 - wxGLCanvas WASM Canvas Element Integration - -This document describes how to fix wxGLCanvas to render visibly in WASM by creating its own canvas element. - -## Problem - -wxGLCanvas currently hardcodes `m_canvasTarget = "#canvas"` which creates WebGL context on the main wxUniversal 2D canvas, causing a conflict. The GL rendering doesn't appear because it's overwritten by 2D UI rendering. - -## Key Discovery - -The WASM port already supports **multiple canvas elements per window**: -- Main window uses `#canvas` for 2D rendering -- Child windows can each get their own canvas element via `createWindow(id, needsCanvas=true)` -- Windows are positioned absolutely with z-index layering -- JavaScript (wx.js) manages canvas creation, positioning, and context stacking - -## How KiCad Uses wxGLCanvas - -``` -wxFrame (EDA_DRAW_FRAME) - └── EDA_DRAW_PANEL_GAL (wxScrolledCanvas) - └── OPENGL_GAL (inherits from wxGLCanvas) - - Sized to match parent - - Child window positioned within parent - - Has its own GL context -``` - -Key KiCad files: -- `kicad/common/gal/opengl/opengl_gal.cpp` - GL rendering implementation -- `kicad/common/draw_panel_gal.cpp` - Creates OPENGL_GAL as child: `new OPENGL_GAL(..., this, ...)` -- `kicad/include/gal/hidpi_gl_canvas.h` - wxGLCanvas wrapper class - ---- - -## Solution - -wxGLCanvas should integrate with the existing WASM window system: - -1. **Create its own canvas element** - Use `createWindow(id, needsCanvas=true)` in JavaScript -2. **Create WebGL context on that canvas** - Use selector `#window-{id} canvas` -3. **Handle positioning via window system** - `setWindowRect()` positions the canvas - -### Key JavaScript Functions (already exist in wx.js) - -```javascript -createWindow(id, needsCanvas, isVisible, classList) -setWindowRect(id, x, y, width, height) -setWindowVisibility(id, isVisible) -destroyWindow(id) -``` - ---- - -## Implementation - -### Step 1: Modify Create() to create canvas element - -In `wxwidgets/src/wasm/glcanvas.cpp`: - -```cpp -bool wxGLCanvas::Create(wxWindow *parent, ...) -{ - if ( !wxWindow::Create(parent, id, pos, size, style, name) ) - return false; - - // Create a window with canvas element in JavaScript - int cssId = GetCSSId(); - EM_ASM({ - createWindow($0, true, true, "glcanvas"); - }, cssId); - - // Position the canvas - wxPoint screenPos = GetScreenPosition(); - wxSize clientSize = GetClientSize(); - EM_ASM({ - setWindowRect($0, $1, $2, $3, $4); - }, cssId, screenPos.x, screenPos.y, clientSize.GetWidth(), clientSize.GetHeight()); - - // Set dynamic canvas selector - m_canvasTarget = wxString::Format("#window-%d canvas", cssId).ToStdString(); - - return CreateWebGLContext(dispAttrs); -} -``` - -### Step 2: Override DoSetSize for resize handling - -```cpp -void wxGLCanvas::DoSetSize(int x, int y, int width, int height, int sizeFlags) -{ - wxWindow::DoSetSize(x, y, width, height, sizeFlags); - - wxPoint screenPos = GetScreenPosition(); - wxSize clientSize = GetClientSize(); - EM_ASM({ - setWindowRect($0, $1, $2, $3, $4); - }, GetCSSId(), screenPos.x, screenPos.y, clientSize.GetWidth(), clientSize.GetHeight()); -} -``` - -### Step 3: Handle visibility - -```cpp -void wxGLCanvas::DoShow(bool show) -{ - wxWindow::DoShow(show); - EM_ASM({ - setWindowVisibility($0, $1); - }, GetCSSId(), show); -} -``` - -### Step 4: Clean up in destructor - -```cpp -wxGLCanvas::~wxGLCanvas() -{ - if ( m_webglContext > 0 ) - { - emscripten_webgl_destroy_context(m_webglContext); - m_webglContext = 0; - } - EM_ASM({ - destroyWindow($0); - }, GetCSSId()); -} -``` - ---- - -## Files to Modify - -| File | Changes | -|------|---------| -| `wxwidgets/src/wasm/glcanvas.cpp` | Main implementation - create own canvas, dynamic selector, resize/visibility handling | -| `wxwidgets/include/wx/wasm/glcanvas.h` | Add DoSetSize, DoShow declarations if needed | - ---- - -## Testing - -The existing test app in `tests/wasm-app/` with the OpenGL tab will verify: -1. Canvas element is created in DOM -2. WebGL context is on the correct canvas -3. GL rendering appears in the canvas area -4. Legacy GL emulation works (via `-sLEGACY_GL_EMULATION`) diff --git a/docs/07-KICAD-WASM-BUILD-PLAN.md b/docs/07-KICAD-WASM-BUILD-PLAN.md deleted file mode 100644 index 25cbe73..0000000 --- a/docs/07-KICAD-WASM-BUILD-PLAN.md +++ /dev/null @@ -1,546 +0,0 @@ -# KiCad PCBnew WASM Build Plan - -## Goal - -Build the full KiCad PCBnew application for WebAssembly with all major features: -- **Target**: PCBnew (PCB Editor) -- **3D/STEP**: OpenCASCADE ported to WASM -- **Simulation**: ngspice ported to WASM -- **Threading**: Emscripten pthreads (true parallelism) -- **Coroutines**: Emscripten Asyncify fibers for libcontext -- **Stub only**: nanodbc (ODBC not available in browser) - -## Core Principles - -### 1. No Source Modifications to KiCad or wxWidgets - -**CRITICAL**: All WASM-specific code must go into compatibility layers, NOT into the KiCad or wxWidgets source trees. - -``` -kicad-wasm/ -├── kicad/ # Git submodule - DO NOT MODIFY -├── wxwidgets/ # Git submodule - DO NOT MODIFY (except WASM platform) -├── wasm/ # NEW: All WASM compatibility layers -│ ├── kiplatform/ # Platform layer implementations -│ ├── libcontext/ # Fiber implementation -│ ├── shims/ # Header shims and wrappers -│ └── stubs/ # Feature stubs -├── stubs/ # (existing) Stub headers/implementations -├── cmake/ # (existing) CMake find modules -└── patches/ # Minimal patches ONLY if absolutely necessary -``` - -### 2. Compatibility Layer Strategy - -Instead of patching KiCad source, we: -1. **Override include paths** - Put our headers first in include path -2. **Provide stub libraries** - Link our stubs instead of real libraries -3. **CMake module overrides** - Replace find_package results with our targets -4. **Platform implementations** - Provide WASM versions of platform-specific code - -### 3. Dependencies First Approach - -Build all dependencies (including OpenCASCADE and ngspice) BEFORE building KiCad to ensure a clean build. - ---- - -## KiCad Submodule Version - -``` -Commit: 4bfed3f1746e8cc0a7d942767770f56fa28b393c -Version: 8.99 (development) -``` - ---- - -## Exact Dependency Versions - -These versions are from KiCad's `CMakeLists.txt` and `vcpkg.json`: - -### Required Dependencies - -| Dependency | Min Version | Pinned Version | Source | -|------------|-------------|----------------|--------| -| wxWidgets | 3.2.0 | 3.3.1 | vcpkg override | -| GLM | 0.9.8 | 0.9.9.8 | vcpkg override | -| Boost | 1.71.0 | latest | CMakeLists.txt | -| FreeType | 2.11.1 | latest | CMakeLists.txt | -| HarfBuzz | - | latest | CMakeLists.txt | -| Fontconfig | - | latest | CMakeLists.txt | -| Cairo | 1.12 | latest | CMakeLists.txt | -| Pixman | 0.30 | latest | CMakeLists.txt | -| zlib | - | latest | CMakeLists.txt | -| Zstd | - | latest | CMakeLists.txt | -| OpenCASCADE | 7.5.0+ | 7.8.0+ preferred | CMakeLists.txt | -| ngspice | - | 45.2 | vcpkg override | -| Protobuf | 3.21.12 | 3.21.12 | vcpkg override | -| libgit2 | 1.5 | latest | CMakeLists.txt | -| CURL | - | latest | CMakeLists.txt | -| Python | 3.6+ | 3.11.5 | vcpkg override | - -### What We Build vs Stub - -| Dependency | Action | Reason | -|------------|--------|--------| -| wxWidgets | Already ported | WASM platform in wxwidgets submodule | -| GLM | Header-only | Just include | -| Boost | Header-only subset | Only need headers for most parts | -| FreeType | Emscripten port | `-sUSE_FREETYPE=1` | -| HarfBuzz | Build for WASM | Text shaping needed | -| zlib | Emscripten port | `-sUSE_ZLIB=1` | -| Zstd | Build for WASM | Compression needed | -| OpenCASCADE | Build for WASM | 3D/STEP support | -| ngspice | Build for WASM | Simulation support | -| Cairo | Build for WASM | 2D rendering fallback | -| Pixman | Build for WASM | Cairo dependency | -| libgit2 | **STUB** | No git in browser | -| CURL | **STUB** | Use fetch API instead | -| nanodbc | **STUB** | No ODBC in browser | -| Python/SWIG | **DISABLE** | No Python scripting | -| nng | **STUB** | No IPC in browser | -| SPNAV | **STUB** | No 3D mouse in browser | - ---- - -## Compatibility Layer Structure - -### Directory Layout - -``` -wasm/ -├── CMakeLists.txt # Master WASM compat build -├── kiplatform/ # Platform layer for WASM -│ ├── CMakeLists.txt -│ ├── app.cpp # App lifecycle -│ ├── drivers.cpp # GPU detection ("WebGL") -│ ├── environment.cpp # Env vars via localStorage -│ ├── io.cpp # Virtual filesystem -│ ├── policy.cpp # Permissions (always allow) -│ ├── secrets.cpp # Credentials (localStorage) -│ ├── sysinfo.cpp # System info -│ └── printing.cpp # Browser print() -├── libcontext/ # Coroutine implementation -│ ├── CMakeLists.txt -│ └── fcontext_wasm.cpp # Asyncify fiber impl -├── shims/ # Header overrides -│ ├── CMakeLists.txt -│ ├── kiplatform_redirect.h # Redirect to our impl -│ └── libcontext_redirect.h # Redirect to our impl -└── config/ # Build configuration - ├── kicad_wasm_config.h # Version/feature config - └── setup.h # Platform setup -``` - -### Existing Stubs (Already Done) - -``` -stubs/ -├── include/ -│ ├── curl/curl.h, easy.h # CURL stubs -│ ├── git2.h # libgit2 stub -│ ├── git2/sys/errors.h, merge.h # libgit2 internals -│ ├── ngspice/sharedspice.h # ngspice header (for stub build) -│ └── Standard_Version.hxx # OCC version stub -└── src/ - ├── disabled_features_stubs.cpp # CURL/git function stubs - ├── kicad_git_stubs.cpp # Git feature stubs - ├── kicad_git_all_stubs.cpp # Complete git stubs - ├── occ_stubs.cpp # OpenCASCADE stubs - └── panel_git_repos_stub.cpp # Git UI stubs -``` - -### CMake Overrides (Already Done) - -``` -cmake/ -├── FindCURL.cmake # Returns stub target -├── FindOCC.cmake # Configurable real/stub -├── Findlibgit2.cmake # Returns stub target -├── Findngspice.cmake # Configurable real/stub -└── KicadWasmOptions.cmake # Feature flags -``` - ---- - -## Build Phases - -### Phase 1: Build Infrastructure - -Create common utilities: - -```bash -scripts/ -├── common/ -│ ├── env.sh # Emscripten environment, paths -│ ├── functions.sh # Error handling, logging -│ └── versions.sh # Dependency versions (from above table) -├── build-kicad-wasm.sh # Master orchestrator -└── build-deps/ # Per-dependency scripts -``` - -**versions.sh** - Pin to KiCad's required versions: -```bash -#!/bin/bash -# Versions matching KiCad 8.99 requirements - -export KICAD_COMMIT="4bfed3f1746e8cc0a7d942767770f56fa28b393c" - -# From vcpkg.json overrides -export GLM_VERSION="0.9.9.8" -export NGSPICE_VERSION="45.2" -export PROTOBUF_VERSION="3.21.12" - -# From CMakeLists.txt minimums -export WXWIDGETS_MIN="3.2.0" -export GLM_MIN="0.9.8" -export BOOST_MIN="1.71.0" -export FREETYPE_MIN="2.11.1" -export CAIRO_MIN="1.12" -export PIXMAN_MIN="0.30" -export LIBGIT2_MIN="1.5" -export OCC_MIN="7.5.0" - -# Recommended versions for WASM build -export OCC_VERSION="7.8.0" -export ZSTD_VERSION="1.5.5" -export HARFBUZZ_VERSION="8.3.0" -``` - -### Phase 2: Dependencies (In Order) - -Build these BEFORE KiCad: - -| Order | Dependency | Script | Notes | -|-------|------------|--------|-------| -| 1 | zlib | Emscripten port | `-sUSE_ZLIB=1` | -| 2 | Zstd | `build-zstd-wasm.sh` | Compression | -| 3 | FreeType | Emscripten port | `-sUSE_FREETYPE=1` | -| 4 | HarfBuzz | `build-harfbuzz-wasm.sh` | Text shaping | -| 5 | Pixman | `build-pixman-wasm.sh` | Cairo dep | -| 6 | Cairo | `build-cairo-wasm.sh` | 2D rendering | -| 7 | Boost | Headers only | Copy headers | -| 8 | Protobuf | `build-protobuf-wasm.sh` | If IPC needed | -| 9 | OpenCASCADE | `build-occ-wasm.sh` | 3D/STEP (large) | -| 10 | ngspice | `build-ngspice-wasm.sh` | Simulation | -| 11 | wxWidgets | Already done | `build-wxuniversal-wasm.sh` | - -### Phase 3: WASM Compatibility Layer - -Create `wasm/` directory with platform implementations. - -#### kiplatform WASM (wasm/kiplatform/) - -These files provide WASM implementations of KiCad's platform abstraction: - -```cpp -// wasm/kiplatform/app.cpp -#include - -namespace KIPLATFORM::APP { - bool Init() { return true; } - wxString GetUserConfigPath() { return "/home/kicad"; } - wxString GetUserDataPath() { return "/home/kicad"; } - // ... etc -} -``` - -```cpp -// wasm/kiplatform/environment.cpp -#include -#include - -namespace KIPLATFORM::ENV { - wxString GetEnv(const wxString& var) { - // Use localStorage via JS - char* val = (char*)EM_ASM_PTR({ - var key = UTF8ToString($0); - var val = localStorage.getItem('env_' + key) || ''; - return stringToNewUTF8(val); - }, var.c_str()); - wxString result(val); - free(val); - return result; - } -} -``` - -#### libcontext Asyncify Fibers (wasm/libcontext/) - -```cpp -// wasm/libcontext/fcontext_wasm.cpp -#ifdef __EMSCRIPTEN__ -#include - -// Provide same interface as libcontext but using Emscripten fibers -struct fcontext_transfer { - void* fctx; - void* data; -}; - -static emscripten_fiber_t main_fiber; -static bool main_fiber_initialized = false; - -extern "C" { - fcontext_transfer jump_fcontext(void* to, void* vp); - void* make_fcontext(void* sp, size_t size, void (*fn)(fcontext_transfer)); -} - -// Implementation using emscripten_fiber_* APIs -#endif -``` - -### Phase 4: KiCad Build - -**Script**: `scripts/build-pcbnew-wasm.sh` - -```bash -#!/bin/bash -set -e - -source "$(dirname "$0")/common/env.sh" - -# Key: Override include paths to use our compatibility layers FIRST -WASM_INCLUDES="-I$PROJECT_ROOT/wasm/kiplatform" -WASM_INCLUDES="$WASM_INCLUDES -I$PROJECT_ROOT/wasm/libcontext" -WASM_INCLUDES="$WASM_INCLUDES -I$PROJECT_ROOT/wasm/shims" -WASM_INCLUDES="$WASM_INCLUDES -I$PROJECT_ROOT/stubs/include" - -emcmake cmake ../kicad \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_CXX_FLAGS="$WASM_INCLUDES" \ - \ - # Use our CMake modules for stubs - -DCMAKE_MODULE_PATH="$PROJECT_ROOT/cmake" \ - \ - # Feature flags - -DKICAD_USE_OCC=ON \ - -DKICAD_USE_NGSPICE=ON \ - -DKICAD_USE_GIT=OFF \ - -DKICAD_USE_CURL=OFF \ - -DKICAD_SCRIPTING_WXPYTHON=OFF \ - -DKICAD_IPC_API=OFF \ - -DKICAD_BUILD_QA_TESTS=OFF \ - -DKICAD_BUILD_I18N=OFF \ - \ - # Point to our builds - -DwxWidgets_CONFIG_EXECUTABLE="$WX_BUILD/wx-config" \ - -DOCC_INCLUDE_DIR="$SYSROOT/include/opencascade" \ - -DNGSPICE_LIBRARY="$SYSROOT/lib/libngspice.a" - -emmake make pcbnew -j$(nproc) -``` - -### Phase 5: Testing - -Follow existing patterns in `tests/`: - -``` -tests/wasm-app/standalone/pcbnew/ -├── pcbnew_test.cpp # Minimal PCBnew test app -├── pcbnew_test.html # Generated -├── pcbnew_test.js # Generated -└── pcbnew_test.wasm # Generated - -tests/e2e/ -└── pcbnew.spec.ts # Playwright E2E tests -``` - ---- - -## Link Flags - -```bash -# Core flags --sALLOW_MEMORY_GROWTH=1 --sINITIAL_MEMORY=256MB --sSTACK_SIZE=5MB - -# Async/modal support --sASYNCIFY=1 --sASYNCIFY_STACK_SIZE=16384 - -# OpenGL/WebGL --sLEGACY_GL_EMULATION --sMAX_WEBGL_VERSION=2 - -# Threading --pthread --sPROXY_TO_PTHREAD=1 --sPTHREAD_POOL_SIZE=navigator.hardwareConcurrency --sOFFSCREENCANVAS_SUPPORT=1 -``` - -Server headers for pthreads: -``` -Cross-Origin-Embedder-Policy: require-corp -Cross-Origin-Opener-Policy: same-origin -``` - ---- - -## File Organization Summary - -### What Goes Where - -| Code Type | Location | Reason | -|-----------|----------|--------| -| WASM platform impl | `wasm/kiplatform/` | Don't touch kicad/ | -| Fiber implementation | `wasm/libcontext/` | Don't touch kicad/ | -| Header overrides | `wasm/shims/` | Include path override | -| Stub headers | `stubs/include/` | Already exists | -| Stub implementations | `stubs/src/` | Already exists | -| CMake finders | `cmake/` | Already exists | -| Build scripts | `scripts/` | Reproducible | -| Test apps | `tests/wasm-app/` | Existing pattern | -| E2E tests | `tests/e2e/` | Existing pattern | - -### Files to Create - -``` -NEW: -├── wasm/ -│ ├── CMakeLists.txt -│ ├── kiplatform/*.cpp (8 files) -│ ├── libcontext/fcontext_wasm.cpp -│ ├── shims/*.h -│ └── config/*.h -├── scripts/ -│ ├── common/{env,functions,versions}.sh -│ ├── build-kicad-wasm.sh -│ ├── build-pcbnew-wasm.sh -│ └── build-deps/*.sh -├── stubs/src/nanodbc_stub.cpp -└── tests/ - ├── wasm-app/standalone/pcbnew/* - └── e2e/pcbnew.spec.ts -``` - -### Files NOT to Modify - -``` -DO NOT MODIFY: -├── kicad/ # Git submodule - use compatibility layers instead -└── wxwidgets/ # Git submodule - WASM platform already added -``` - ---- - -## Patches (Only If Absolutely Necessary) - -If patches are unavoidable, they go in `patches/` with clear documentation: - -``` -patches/ -├── kicad/ -│ ├── 0001-*.patch -│ ├── checksums.sha256 -│ └── README.md # Explain WHY each patch is needed -├── opencascade/ -│ └── *.patch # OCC WASM compatibility -└── ngspice/ - └── *.patch # Remove fork/exec -``` - -**Rule**: Before creating a patch, ask "Can this be done with a compatibility layer instead?" - ---- - -## Success Criteria - -### MVP (Milestone 1) -- [ ] All dependencies built for WASM -- [ ] PCBnew window opens in browser -- [ ] Menu bar and toolbars visible -- [ ] Can load .kicad_pcb file -- [ ] Board renders in WebGL -- [ ] Pan/zoom works - -### Full Features (Milestone 2) -- [ ] All editing tools work -- [ ] Interactive router works (via Asyncify fibers) -- [ ] Zone filling works (via pthreads) -- [ ] DRC runs -- [ ] Save/export works -- [ ] 3D viewer works (OCC) -- [ ] Simulation works (ngspice) - ---- - -## Quick Start - -```bash -# 1. Set up Emscripten (already available via homebrew) -# Emscripten is at /opt/homebrew/bin/emcc - -# 2. Build wxWidgets (if not already done) -./scripts/build-wxuniversal-wasm.sh - -# 3. Build all dependencies -./scripts/deps/build-all-deps.sh --all - -# 4. Build PCBnew for WASM -./scripts/build-pcbnew-wasm.sh - -# 5. Test -cd tests && npm test - -# 6. Serve (with COOP/COEP headers for SharedArrayBuffer) -cd build-wasm && npx serve -p 8080 -``` - ---- - -## Implementation Status - -### Created Files - -#### Build Infrastructure (`scripts/common/`) -- `env.sh` - Environment setup (paths, Emscripten config) -- `functions.sh` - Utility functions (logging, downloads, stamps) -- `versions.sh` - Pinned dependency versions from KiCad - -#### Dependency Build Scripts (`scripts/deps/`) -- `build-all-deps.sh` - Master dependency builder -- `build-zstd.sh` - Compression library -- `build-freetype.sh` - Font rendering -- `build-harfbuzz.sh` - Text shaping -- `build-pixman.sh` - Pixel manipulation -- `build-cairo.sh` - 2D graphics -- `build-glm.sh` - Math library (header-only) -- `build-protobuf.sh` - Protocol buffers -- `build-opencascade.sh` - 3D geometry/STEP -- `build-ngspice.sh` - SPICE simulation - -#### WASM Compatibility Layer (`wasm/`) -- `CMakeLists.txt` - Main CMake configuration -- `README.md` - Documentation -- `kiplatform/CMakeLists.txt` -- `kiplatform/app.cpp` - Application lifecycle -- `kiplatform/drivers.cpp` - 3D mouse (stub) -- `kiplatform/environment.cpp` - Environment/paths with localStorage -- `kiplatform/io.cpp` - File I/O for virtual filesystem -- `kiplatform/policy.cpp` - Enterprise policies (stub) -- `kiplatform/secrets.cpp` - Credential storage via localStorage -- `kiplatform/sysinfo.cpp` - System info via WebGL/navigator -- `kiplatform/ui.cpp` - UI utilities (theme detection, etc.) -- `libcontext/CMakeLists.txt` -- `libcontext/libcontext_wasm.h` - Asyncify fiber header -- `libcontext/libcontext_wasm.cpp` - Asyncify fiber implementation -- `cmake/KiCadWASMConfig.cmake` - CMake config for WASM -- `cmake/FindKiplatformWASM.cmake` - Find module for kiplatform -- `cmake/FindLibcontextWASM.cmake` - Find module for libcontext - -#### PCBnew Build -- `scripts/build-pcbnew-wasm.sh` - Main PCBnew build script - -#### Tests (`tests/kicad/`) -- `pcbnew.html` - Test app HTML -- `pcbnew.spec.ts` - Playwright E2E tests - -### Known Issues - -1. **CMake Policy**: Zstd and some older libraries need `-DCMAKE_POLICY_VERSION_MINIMUM=3.5` - to work with modern CMake - -2. **Shell Environment**: When sourcing scripts, use a fresh bash (`bash -c '...'`) to avoid - conflicts with existing environment variables diff --git a/docs/KICAD_WASM_BUILD.md b/docs/KICAD_WASM_BUILD.md deleted file mode 100644 index d95fb3d..0000000 --- a/docs/KICAD_WASM_BUILD.md +++ /dev/null @@ -1,198 +0,0 @@ -# KiCad WASM Build State - -## Build Output - -| File | Size | Description | -|------|------|-------------| -| `pcbnew.wasm` | 15MB | WebAssembly binary | -| `pcbnew.js` | 146KB | JS loader/glue | - -Location: `build-wasm/kicad-pcbnew/pcbnew/` - -## Build Command - -```bash -# Full build (clean) -./scripts/kicad/build-pcbnew.sh - -# Incremental build -./scripts/kicad/build-pcbnew.sh --no-clean --skip-deps - -# Inside Docker -docker compose -f docker/docker-compose.yml exec kicad-wasm-builder \ - /workspace/scripts/kicad/build-pcbnew.sh -``` - -## Build Configuration - -``` -Memory: 256MB initial, 4GB max (ALLOW_MEMORY_GROWTH) -Threads: pthreads with pool of 4 -Async: ASYNCIFY enabled (64KB stack) -Graphics: wxUniversal + Cairo GAL -``` - ---- - -## KiCad Fork Modifications (`/kicad`) - -68 files modified. Grouped by category: - -### CMake Find Modules (`cmake/Find*.cmake`) - -Cross-compilation support - `find_library()` fails in WASM, need direct paths. - -| File | Change | -|------|--------| -| `FindCairo.cmake` | Direct path lookup for WASM | -| `FindFontconfig.cmake` | Mark unavailable (no system fonts in browser) | -| `FindGLEW.cmake` | Mark not needed (WebGL handles extensions) | -| `FindGLM.cmake` | Direct path lookup | -| `FindOCC.cmake` | OpenCASCADE direct path | -| `FindPixman.cmake` | Direct path lookup | -| `FindSPNAV.cmake` | 3D mouse not available in browser | -| `FindZSTD.cmake` | Direct path for cross-compilation | -| `Findlibgit2.cmake` | Headers only (functions stubbed) | -| `Findngspice.cmake` | SPICE not available | -| `Findnng.cmake` | IPC not supported in browser | -| `FindwxWidgets.cmake` | Skip library existence checks for WASM | - -### Main CMakeLists.txt - -- WASM port detection (`if(EMSCRIPTEN)`) -- `KICAD_SCRIPTING` OFF by default for EMSCRIPTEN -- `KICAD_IPC_API` OFF by default for EMSCRIPTEN -- Fontconfig disabled, sets `KICAD_USE_FONTCONFIG=0` -- Python/SWIG only when `KICAD_SCRIPTING` enabled -- 3D viewer subdirectory excluded for WASM - -### IPC API Guards (`#ifdef KICAD_IPC_API`) - -Protobuf serialization code disabled when IPC API off. - -**Headers:** -- `include/api/api_utils.h` -- `pcbnew/api/api_pcb_utils.h` - -**Common:** -- `common/eda_shape.cpp` - Serialize/Deserialize methods -- `common/eda_text.cpp` - Serialize/Deserialize methods -- `common/netclass.cpp` - Protobuf includes - -**PCBnew objects:** -- `pcbnew/board_connected_item.cpp` -- `pcbnew/board_item.cpp` -- `pcbnew/board_stackup_manager/board_stackup.cpp` -- `pcbnew/footprint.cpp` -- `pcbnew/pad.cpp` -- `pcbnew/padstack.cpp` -- `pcbnew/pcb_dimension.cpp` -- `pcbnew/pcb_field.cpp` -- `pcbnew/pcb_group.cpp` -- `pcbnew/pcb_shape.cpp` -- `pcbnew/pcb_text.cpp` -- `pcbnew/pcb_textbox.cpp` -- `pcbnew/pcb_track.cpp` -- `pcbnew/zone.cpp` - -### Python Scripting Guards (`#ifdef KICAD_SCRIPTING`) - -Python.h and pybind11 not available in WASM. - -- `pcbnew/pcbnew.cpp` - PyInit, KIFACE_SCRIPTING_LEGACY -- `pcbnew/pcbnew_settings.cpp` - pybind11 include -- `pcbnew/pcb_edit_frame.cpp` - Python sync functions, scripting includes -- `pcbnew/menubar_pcb_editor.cpp` - Scripting menu items -- `pcbnew/toolbars_pcb_editor.cpp` - Scripting toolbar - -### Altium Plugin Disabled (`#ifndef __EMSCRIPTEN__`) - -`char_traits` specialization issue in Emscripten. - -- `pcbnew/CMakeLists.txt` - `add_subdirectory(pcb_io/altium)` conditional -- `pcbnew/pcb_io/pcb_io_mgr.cpp` - Altium includes and plugin registration - -### 3D Viewer Disabled - -Requires GLU and OpenGL fixed-function pipeline (not in WebGL). - -- `CMakeLists.txt` - `add_subdirectory(3d-viewer)` conditional -- `pcbnew/CMakeLists.txt` - `3d-viewer` library link conditional - -### Fontconfig - -No system font access in browser. - -- `common/font/fontconfig.cpp` - Wrapped with `#if KICAD_USE_FONTCONFIG` -- `include/font/fontconfig.h` - Conditional compilation - -### Third-party Libraries - -- `thirdparty/libcontext/libcontext.cpp` - WASM stub for coroutines (returns nullptr) -- `thirdparty/libcontext/libcontext.h` - `LIBCONTEXT_PLATFORM_wasm32` detection -- `thirdparty/lemon/CMakeLists.txt` - Build fixes - -### Other Fixes - -- `pcbnew/dialogs/panel_setup_layers.cpp` - `GetCurrentSelection()` → `GetSelection()` (wxUniversal) -- `include/gal/opengl/kiglew.h` - GLEW version stub for WASM -- `common/gal/CMakeLists.txt` - GAL library adjustments -- `common/CMakeLists.txt` - Common library adjustments -- `libs/kiplatform/CMakeLists.txt` - WASM platform support -- `scripting/CMakeLists.txt` - Conditional on KICAD_SCRIPTING - ---- - -## wxWidgets Fork Modifications (`/wxwidgets`) - -| File | Change | Reason | -|------|--------|--------| -| `include/wx/wasm/glcanvas.h` | Moved `Show()` from protected to public | KiCad calls `Show()` on wxGLCanvas | -| `src/wasm/utils.cpp` | Added `wxFindWindowAtPointer()` | Missing function used by cshelp | - ---- - -## Stub Libraries (`/wasm/stubs/`) - -| File | Symbols | Reason | -|------|---------|--------| -| `libgit2_stub.c` | `git_libgit2_init`, `git_repository_*`, `git_reference_*`, `git_oid_*`, `git_error_last` | Git not available in browser | -| `curl_stub.c` | `curl_global_init`, `curl_global_cleanup` | Network via JS fetch instead | - -wxWidgets stubs (created by build script): -- `libwx_wasmunivu_richtext-3.2.a` - Empty, not used by KiCad -- `libwx_wasmunivu_webview-3.2.a` - Empty, not used by KiCad - ---- - -## Disabled Features Summary - -| Feature | Reason | -|---------|--------| -| Python Scripting | pybind11/Python.h not available in WASM | -| 3D Viewer | GLU and OpenGL fixed-function pipeline not in WebGL | -| Altium Plugin | `char_traits` Emscripten issue | -| SPICE | ngspice not ported | -| IPC API | IPC not supported in browser | -| GitHub Plugin | Network needs JS bridge | -| Fontconfig | No system font access | -| 3D Mouse (SPNAV) | Hardware not accessible | - ---- - -## Dependencies - -Built via `scripts/deps/build-all-deps.sh`: -- zstd, glm, freetype, harfbuzz, pixman, cairo -- OpenCASCADE (geometry kernel) -- Protobuf (headers only) -- Boost (headers only) - ---- - -## Next Steps - -1. Create HTML wrapper to load pcbnew.js -2. Implement file system access (MEMFS or IDBFS) -3. Test basic UI rendering -4. Bridge network operations to JS fetch diff --git a/docs/PTHREADS.md b/docs/PTHREADS.md deleted file mode 100644 index 1e5fba8..0000000 --- a/docs/PTHREADS.md +++ /dev/null @@ -1,301 +0,0 @@ -# Emscripten pthreads for KiCad WASM - -## Overview - -Emscripten can compile C++ threading code to WebAssembly using Web Workers and SharedArrayBuffer. This allows KiCad's existing `BS::thread_pool` code to work **unchanged** in the browser. - -## How It Works - -``` -┌──────────────────────────────────────────────────────────────┐ -│ Browser Environment │ -│ │ -│ ┌────────────────────────────────────────────────────┐ │ -│ │ SharedArrayBuffer (Shared Memory) │ │ -│ │ │ │ -│ │ ┌─────────┐ ┌─────────┐ ┌─────────┐ │ │ -│ │ │ Main │ │ Worker │ │ Worker │ ... │ │ -│ │ │ Thread │ │ Thread │ │ Thread │ │ │ -│ │ │ │ │ │ │ │ │ │ -│ │ │ BOARD* │ │ BOARD* │ │ BOARD* │ │ │ -│ │ │ (same!) │ │ (same!) │ │ (same!) │ │ │ -│ │ └─────────┘ └─────────┘ └─────────┘ │ │ -│ └────────────────────────────────────────────────────┘ │ -│ │ -│ All threads share memory - C++ pointers work normally │ -└──────────────────────────────────────────────────────────────┘ -``` - -Emscripten: -1. Creates Web Workers for each pthread -2. Uses SharedArrayBuffer for shared memory between workers -3. Implements pthread synchronization primitives (mutex, condition variables) -4. Existing C++ thread code compiles without modification - -## Build Configuration - -### Minimal Flags - -```bash -emcc main.cpp -o app.js \ - -pthread \ - -sPROXY_TO_PTHREAD=1 -``` - -### Recommended Full Configuration - -```bash -emcc main.cpp -o app.js \ - -pthread \ - -sPROXY_TO_PTHREAD=1 \ - -sPTHREAD_POOL_SIZE="Math.min(navigator.hardwareConcurrency, 8)" \ - -sALLOW_BLOCKING_ON_MAIN_THREAD=0 \ - -sOFFSCREENCANVAS_SUPPORT=1 \ - -sOFFSCREEN_FRAMEBUFFER=1 \ - -sMALLOC=mimalloc \ - -sINITIAL_MEMORY=512MB \ - -sSTACK_SIZE=5MB \ - -sPTHREAD_POOL_SIZE_STRICT=0 -``` - -### Flag Explanations - -| Flag | Purpose | -|------|---------| -| `-pthread` | Enable pthread support (required) | -| `-sPROXY_TO_PTHREAD=1` | Move main() to worker thread, keeps browser responsive | -| `-sPTHREAD_POOL_SIZE=N` | Pre-create N worker threads (avoids async creation delay) | -| `-sALLOW_BLOCKING_ON_MAIN_THREAD=0` | Error if main thread blocks (catches bugs) | -| `-sOFFSCREENCANVAS_SUPPORT=1` | WebGL rendering in worker threads | -| `-sOFFSCREEN_FRAMEBUFFER=1` | Fallback if OffscreenCanvas unavailable | -| `-sMALLOC=mimalloc` | Better allocator for multithreaded code | -| `-sPTHREAD_POOL_SIZE_STRICT=0` | Allow pool to grow beyond initial size | - -### Dynamic Thread Pool Size - -Use JavaScript expression for dynamic sizing: -```bash --sPTHREAD_POOL_SIZE="Math.min(navigator.hardwareConcurrency, 8)" -``` - -This creates threads based on available CPU cores (max 8). - -## Required HTTP Headers - -**CRITICAL**: SharedArrayBuffer requires these headers or it won't be available. - -```http -Cross-Origin-Embedder-Policy: require-corp -Cross-Origin-Opener-Policy: same-origin -``` - -### Server Configuration Examples - -**Nginx:** -```nginx -location / { - add_header Cross-Origin-Embedder-Policy "require-corp" always; - add_header Cross-Origin-Opener-Policy "same-origin" always; -} -``` - -**Apache (.htaccess):** -```apache -Header set Cross-Origin-Embedder-Policy "require-corp" -Header set Cross-Origin-Opener-Policy "same-origin" -``` - -**Express.js:** -```javascript -app.use((req, res, next) => { - res.setHeader('Cross-Origin-Embedder-Policy', 'require-corp'); - res.setHeader('Cross-Origin-Opener-Policy', 'same-origin'); - next(); -}); -``` - -**Vercel (vercel.json):** -```json -{ - "headers": [ - { - "source": "/(.*)", - "headers": [ - { "key": "Cross-Origin-Embedder-Policy", "value": "require-corp" }, - { "key": "Cross-Origin-Opener-Policy", "value": "same-origin" } - ] - } - ] -} -``` - -**CloudFlare Pages (_headers):** -``` -/* - Cross-Origin-Embedder-Policy: require-corp - Cross-Origin-Opener-Policy: same-origin -``` - -## Browser Support - -| Browser | Version | Status | -|---------|---------|--------| -| Chrome | 92+ | ✅ Full support | -| Firefox | 79+ | ✅ Full support | -| Safari | 16.4+ | ✅ Full support | -| Edge | 92+ | ✅ Full support (Chromium) | - -All modern browsers support SharedArrayBuffer with proper headers. - -## Feature Detection - -Check if threading is available at runtime: - -```javascript -function checkThreadingSupport() { - const hasSharedArrayBuffer = typeof SharedArrayBuffer !== 'undefined'; - const isCrossOriginIsolated = crossOriginIsolated; - - console.log('SharedArrayBuffer available:', hasSharedArrayBuffer); - console.log('Cross-origin isolated:', isCrossOriginIsolated); - - if (!hasSharedArrayBuffer) { - console.error('SharedArrayBuffer not available - check HTTPS'); - } - if (!isCrossOriginIsolated) { - console.error('Not cross-origin isolated - check COOP/COEP headers'); - } - - return hasSharedArrayBuffer && isCrossOriginIsolated; -} -``` - -## PROXY_TO_PTHREAD Explained - -Without `PROXY_TO_PTHREAD`: -- main() runs on browser's main thread -- Any blocking call (mutex, sleep, join) freezes the browser -- User can't interact while computation runs - -With `PROXY_TO_PTHREAD`: -- Emscripten creates a new main() that spawns a worker -- Your original main() runs entirely in that worker -- Browser main thread stays responsive -- Blocking calls work normally - -**Always use PROXY_TO_PTHREAD for applications with UI.** - -## Memory Considerations - -Each worker thread loads: -- Complete JavaScript glue code -- Complete WASM module - -Memory usage scales with thread count: -- 2 threads: ~200MB typical -- 8 threads: ~400MB typical -- 20 threads: ~600MB+ typical - -Keep thread pool size reasonable (4-8 threads recommended). - -## Debugging - -### Check if pthreads are working - -```cpp -#include -#include - -int main() { - printf("Main thread: %d\n", emscripten_is_main_runtime_thread()); - printf("Hardware concurrency: %d\n", std::thread::hardware_concurrency()); - - std::thread t([]() { - printf("Worker thread: %d\n", emscripten_is_main_runtime_thread()); - }); - t.join(); - - return 0; -} -``` - -### Common Issues - -**"SharedArrayBuffer is not defined"** -- Missing COOP/COEP headers -- Not served over HTTPS (except localhost) - -**"pthread_create failed"** -- Thread pool exhausted, increase PTHREAD_POOL_SIZE -- Or use PTHREAD_POOL_SIZE_STRICT=0 to allow growth - -**Browser hangs/freezes** -- Missing PROXY_TO_PTHREAD flag -- Blocking on main thread - -**Memory errors** -- Increase INITIAL_MEMORY -- Increase STACK_SIZE (each thread needs stack space) - -## Comparison with Alternatives - -| Approach | KiCad Changes | Deployment | Performance | -|----------|---------------|------------|-------------| -| **Emscripten pthreads** | None | Needs headers | Best | -| Synchronous stub | None (stub only) | Works everywhere | Slowest | -| Manual Web Workers | Significant | Works everywhere | Good | - -## KiCad-Specific Notes - -KiCad uses `BS::thread_pool` (Barak Shoshany's thread pool): -- Location: `kicad/thirdparty/thread-pool/bs_thread_pool.hpp` -- Uses standard C++ threads internally -- Works unchanged with Emscripten pthreads - -Heavy threading usage in: -- DRC (Design Rule Check) - `pcbnew/drc/` -- Zone filling - `pcbnew/zone_filler.cpp` -- 3D raytracing - `3d-viewer/3d_rendering/raytracing/` -- Library loading - background tasks - -With pthreads enabled, all these run in parallel as they do natively. - -## Hosting Compatibility - -| Host | Headers Configurable | pthreads Work | -|------|---------------------|---------------| -| GitHub Pages | ❌ No | ❌ No | -| Netlify Free | ❌ No | ❌ No | -| Netlify Pro | ✅ Yes | ✅ Yes | -| Vercel | ✅ Yes | ✅ Yes | -| CloudFlare Pages | ✅ Yes | ✅ Yes | -| AWS S3 + CloudFront | ✅ Yes | ✅ Yes | -| Your own server | ✅ Yes | ✅ Yes | -| localhost | ✅ N/A | ✅ Yes | - -## Quick Start - -1. **Add build flags:** -```bash --pthread -sPROXY_TO_PTHREAD=1 -sPTHREAD_POOL_SIZE=4 -``` - -2. **Configure server headers:** -``` -Cross-Origin-Embedder-Policy: require-corp -Cross-Origin-Opener-Policy: same-origin -``` - -3. **Test in browser:** -```javascript -console.log('Threading:', crossOriginIsolated && typeof SharedArrayBuffer !== 'undefined'); -``` - -4. **Done.** Existing C++ threading code works. - -## References - -- [Emscripten pthreads documentation](https://emscripten.org/docs/porting/pthreads.html) -- [MDN SharedArrayBuffer](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer) -- [Chrome SharedArrayBuffer update](https://developer.chrome.com/blog/enabling-shared-array-buffer) -- [web.dev WebAssembly threads guide](https://web.dev/articles/webassembly-threads) \ No newline at end of file diff --git a/docs/THREADING_RESEARCH.md b/docs/THREADING_RESEARCH.md deleted file mode 100644 index 236f334..0000000 --- a/docs/THREADING_RESEARCH.md +++ /dev/null @@ -1,270 +0,0 @@ -# KiCad Threading Analysis for WebAssembly Migration - -> **See also:** [PTHREADS.md](./PTHREADS.md) for Emscripten pthreads implementation details. - -## Executive Summary - -KiCad relies **heavily** on multithreading for performance and UI responsiveness. Moving to single-threaded WASM will cause **significant performance degradation** in specific features, but the application will remain **functional**. The wxWidgets WASM layer already stubs out threading APIs, proving the approach is viable. - ---- - -## 1. Threading Infrastructure Overview - -### Core Thread Pool System -- **Implementation**: `BS::priority_thread_pool` (Barak Shoshany's library) -- **Location**: `kicad/include/thread_pool.h`, `kicad/thirdparty/thread-pool/bs_thread_pool.hpp` -- **Access**: Global `GetKiCadThreadPool()` function -- **Configuration**: Thread count via `ADVANCED_CFG::GetCfg().m_MaximumThreads` - -### Synchronization Primitives Used -| Primitive | Usage Count | Purpose | -|-----------|-------------|---------| -| `std::mutex` | ~50+ files | Shared data protection | -| `std::atomic` | 192 files | Lock-free counters/flags | -| `KISPINLOCK` | Core connectivity | Low-contention locking | -| `SYNC_QUEUE` | PCM, tasks | Thread-safe queues | -| `std::condition_variable` | ~10 files | Thread signaling | - ---- - -## 2. Features Using Threading (Impact Analysis) - -### CRITICAL IMPACT (Will be noticeably slower) - -#### DRC (Design Rule Check) -- **Files**: `pcbnew/drc/drc_test_provider_*.cpp` (10+ test providers) -- **Pattern**: `tp.submit_loop(0, items.size(), check_lambda)` -- **Why threads?**: Thousands of items, O(n²) clearance checks -- **Without threads**: - - 4-8x slower (proportional to CPU cores) - - UI freeze for 30 seconds to several minutes on large boards - - **Workaround**: Must add progress reporting + time-slicing - -#### Zone Filling -- **File**: `pcbnew/zone_filler.cpp` (lines 609-697) -- **Pattern**: Two-stage parallel queue (fill → tessellate) -- **Why threads?**: Complex polygon operations (Clipper library), GPU tessellation -- **Without threads**: - - 5-30 second freeze per zone refill - - **Workaround**: Chunked processing with progress callbacks - -#### 3D Viewer Raytracing -- **File**: `3d-viewer/3d_rendering/raytracing/render_3d_raytrace_base.cpp` -- **Pattern**: Work-stealing with `atomic` counter, screen divided into blocks -- **Why threads?**: Embarrassingly parallel (each pixel independent) -- **Without threads**: - - 10-40 seconds per frame (unusable for interaction) - - **Workaround**: Progressive rendering, lower resolution, skip raytracing in WASM - -### MEDIUM IMPACT (Noticeable but manageable) - -#### Library Loading (Symbols/Footprints) -- **Files**: `eeschema/libraries/symbol_library_adapter.cpp`, `pcbnew/footprint_library_adapter.cpp` -- **Pattern**: Low-priority background tasks (`BS::pr::lowest`) -- **Why threads?**: Hundreds of libraries, file I/O blocking -- **Without threads**: - - 10+ second startup hang - - **Workaround**: Progressive loading with Asyncify, show loading indicator - -#### Connectivity Graph -- **Files**: `eeschema/connection_graph.cpp`, `pcbnew/connectivity/connectivity_algo.cpp` -- **Pattern**: `submit_loop()` for parallel subgraph updates -- **Why threads?**: Large schematics have thousands of connections -- **Without threads**: - - 2-10 second lag on large schematics after edits - - **Workaround**: Incremental updates, defer full recalculation - -#### 3D Layer Creation -- **File**: `3d-viewer/3d_canvas/create_layer_items.cpp` -- **Pattern**: Per-layer mutexes, parallel zone processing -- **Without threads**: Slower initial 3D view load - -### LOW IMPACT (Acceptable degradation) - -| Feature | File | Impact | -|---------|------|--------| -| Font polling | `common/widgets/font_choice.cpp` | 30s poll just runs on main thread | -| Git status | `kicad/project_tree_pane.cpp` | Slower git operations | -| Update checker | `kicad/update_manager.cpp` | Blocks during check | -| PCM downloads | `kicad/pcm/pcm_task_manager.cpp` | Sequential downloads | -| Python plugins | `scripting/python_manager.cpp` | Slower plugin load | -| STEP export | `pcbnew/dialogs/dialog_export_step_process.cpp` | Blocking export | - ---- - -## 3. Current WASM Threading Status - -### wxWidgets WASM Layer (Already Implemented) - -``` -wxUSE_THREADS = 1 (API available, but stubbed) -``` - -**Pthread Shim** (`wxwidgets/include/wx/wasm/pthread.h`): -- `pthread_attr_getschedpolicy()` → no-op -- `pthread_attr_setschedparam()` → no-op -- `pthread_setschedparam()` → no-op -- `sched_get_priority_*()` → returns 0 - -**Event Loop** (`wxwidgets/src/wasm/evtloop.cpp`): -- Uses `emscripten_set_main_loop()` - browser's requestAnimationFrame -- Single-threaded cooperative scheduler -- ~16ms per frame at 60fps - -### Proven Async Patterns - -| Pattern | File | Status | -|---------|------|--------| -| Modal dialogs | `wxwidgets/src/wasm/dialog.cpp` | Working via Asyncify | -| Clipboard | `wxwidgets/src/wasm/clipbrd.cpp` | Working via Asyncify | -| Timers | `wxwidgets/src/wasm/timer.cpp` | Working via `emscripten_async_call` | - -**Asyncify Configuration** (`tests/wasm-app/Makefile.wasm`): -```makefile --sASYNCIFY=1 --sASYNCIFY_STACK_SIZE=8192 --sASYNCIFY_IMPORTS=['startModal','js_writeTextToClipboard',...] -``` - ---- - -## 4. Migration Strategies - -### Option A: Sequential with Progress Feedback (Recommended for MVP) - -**Approach**: Let all operations run sequentially, add progress UI - -```cpp -#ifdef __EMSCRIPTEN__ - // Run sequentially with progress updates - for (size_t i = 0; i < items.size(); i++) { - checkItem(items[i]); - if (i % 100 == 0) { - reporter.SetCurrentProgress(i, items.size()); - emscripten_sleep(0); // Yield to browser - } - } -#else - // Original threaded code - tp.submit_loop(0, items.size(), check_lambda); -#endif -``` - -**Pros**: Simple, predictable, works everywhere -**Cons**: Slower, UI shows "working" frequently - -### Option B: Asyncify Time-Slicing - -**Approach**: Break operations into 10-50ms chunks, yield between - -```cpp -class TimeSlicedDRC { - void RunChunk() { - auto start = std::chrono::steady_clock::now(); - while (m_currentItem < m_items.size()) { - checkItem(m_items[m_currentItem++]); - if (elapsed(start) > 16ms) { // One frame - emscripten_async_call(RunChunk, this, 0); - return; // Yield to browser - } - } - OnComplete(); - } -}; -``` - -**Pros**: Responsive UI during long operations -**Cons**: More complex, requires state machine refactoring - -### Option C: Web Workers (Heavy Operations Only) - -**Approach**: Run DRC/Router in separate WASM instance - -```javascript -// Main thread -const drcWorker = new Worker('kicad-drc-worker.js'); -drcWorker.postMessage({ type: 'runDRC', boardData: serializedBoard }); -drcWorker.onmessage = (e) => updateDRCResults(e.data); -``` - -**Pros**: True parallelism, responsive UI -**Cons**: -- Requires `SharedArrayBuffer` (security headers) -- Memory duplication (can't share pointers) -- Complex serialization/deserialization -- Separate WASM binary for worker - ---- - -## 5. Severity Assessment - -| Severity | Features | User Experience | -|----------|----------|-----------------| -| **Blocking** | None | KiCad will run | -| **Degraded** | DRC, Zone Fill, 3D Raytrace | Slower, may need UI changes | -| **Minor** | Library loading, connectivity | Slight delays | -| **Unaffected** | Most editing, viewing | Normal operation | - -### What Users Will Notice - -1. **DRC takes 4-8x longer** - Was 5 seconds, now 20-40 seconds -2. **Zone fills freeze UI** - Need progress indicator -3. **3D raytracing unusable** - Should default to OpenGL mode -4. **Startup slightly slower** - Library preloading blocks - -### What Won't Change - -- Schematic editing responsiveness -- PCB editing (non-DRC operations) -- File save/load (already uses Asyncify patterns) -- Symbol/footprint placement -- Most dialogs and UI interactions - ---- - -## 6. Recommended Approach - -### Phase 1: Stub Threading (Immediate) -- Ensure `GetKiCadThreadPool()` returns a functional single-threaded shim -- All `submit_loop()` calls execute sequentially -- All `submit_task()` calls execute immediately -- Remove mutex locks (single-threaded guarantee) - -### Phase 2: Add Progress Reporting (Short-term) -- DRC: Report progress every N items, add cancel button -- Zone fill: Report per-zone progress -- Library loading: Show loading indicator - -### Phase 3: Time-Slicing (If Needed) -- Only if Phase 2 results in unacceptable UI freezes -- Prioritize DRC and zone filling -- Use Asyncify + `emscripten_sleep(0)` pattern - -### Phase 4: Web Workers (Future/Optional) -- Only if WASM threading becomes critical -- Would require significant architecture changes -- Consider for heavy features like autorouter - ---- - -## 7. Key Files to Modify - -| File | Change Required | -|------|-----------------| -| `kicad/include/thread_pool.h` | Add WASM single-threaded shim | -| `kicad/common/thread_pool.cpp` | Implement sequential fallback | -| `kicad/pcbnew/drc/drc_engine.cpp` | Add progress reporting for WASM | -| `kicad/pcbnew/zone_filler.cpp` | Add chunked processing option | -| `kicad/3d-viewer/3d_rendering/raytracing/render_3d_raytrace_base.cpp` | Disable raytracing or make progressive | - ---- - -## 8. Conclusion - -**Is threading a blocker for WASM?** No. - -**Will it impact performance?** Yes, significantly for DRC, zone filling, and 3D raytracing. - -**Is it manageable?** Yes, with proper progress reporting and potentially disabling raytracing. - -The wxWidgets WASM port already proves that threading can be stubbed out. KiCad will run slower for certain operations but remain fully functional. The recommended approach is to start simple (sequential with progress feedback) and only add complexity (time-slicing, Web Workers) if user experience demands it. diff --git a/docs/WXWIDGETS-WASM-PORT-PROGRESS.md b/docs/WXWIDGETS-WASM-PORT-PROGRESS.md deleted file mode 100644 index 927ae64..0000000 --- a/docs/WXWIDGETS-WASM-PORT-PROGRESS.md +++ /dev/null @@ -1,310 +0,0 @@ -# wxWidgets 3.2.6 WASM Port Progress - -## Build Command -```bash -cd /Users/V/IdeaProjects/kicad-wasm/build-wasm/wxwidgets-universal -emmake make -j1 2>&1 | tail -30 -``` - -## Current Status: BUILD PASSING - -Last verified: Build completes successfully with all libraries generated. - ---- - -## COMPLETED CHANGES - -### 1. build/wasm/ directory (DONE) -Copied from reference: -- `wxwidgets/build/wasm/common.mk` -- `wxwidgets/build/wasm/wxwasm.mk` -- `wxwidgets/build/wasm/wx.js` (JavaScript glue layer - critical!) -- `wxwidgets/build/wasm/template.html` -- `wxwidgets/build/wasm/httpd.py` - -### 2. Locale warning fix (DONE) -**src/common/intl.cpp** - Added `#ifndef __WXWASM__` guard around locale warning at line ~394 - -**src/common/wxcrt.cpp** - Added `#ifdef __WXWASM__` to return NULL from wxSetlocale at line ~121 - -### 3. src/common/ modifications (DONE) -**include/wx/config.h** - Added WASM case to include wx/wasm/config.h and define wxConfig as wxLocalStorageConfig - -**src/common/config.cpp** - Added WASM case to use wxLocalStorageConfig - -**src/common/event.cpp** - Added `m_clickCount = event.m_clickCount;` in wxMouseEvent::Assign() at line ~615 - -**src/common/fontcmn.cpp** - Multiple changes: -- Added `#if !defined(__WXWASM__)` guard around FromString()/ToString() (lines 735-827) -- Added `m_isRendered = false;` in Init() for WASM (line 839-841) -- Added `#if !defined(__WXWASM__)` guard around setter functions (lines 884-927) - -**include/wx/fontutil.h** - Added WASM-specific members at line ~222: -```cpp -#if defined(__WXWASM__) - mutable bool m_isRendered; - mutable wxString m_renderedString; -#endif -``` - -**src/common/combocmn.cpp** - Added WASM configuration block at line ~165: -```cpp -#elif defined(__WXWASM__) -#include "wx/dialog.h" -#define wxComboCtrlGenericTLW wxDialog -#define USE_TRANSIENT_POPUP 1 -#define TRANSIENT_POPUPWIN_IS_PERFECT 1 -#define POPUPWIN_IS_PERFECT 1 -#define TEXTCTRL_TEXT_CENTERED 0 -#define FOCUS_RING 0 -``` - -### 4. src/univ/ Dialog async modal support (DONE) -**include/wx/univ/dialog.h** - Added: -- `#include ` at top -- `virtual void ShowModal(std::function callback) wxOVERRIDE;` declaration -- `std::function m_modalCallback;` member - -**include/wx/dialog.h** (base class) - Added: -- `#include ` at top -- `virtual void ShowModal(std::function callback) = 0;` declaration -- Public `PopupMenu()` callback overloads - -**include/wx/window.h** - Added: -- `#include ` -- Public `PopupMenu()` callback overloads -- `virtual void DoPopupMenu(wxMenu *menu, int x, int y, std::function callback) = 0;` - -**src/univ/dialog.cpp** - Added: -- `#include ` -- `m_modalCallback = NULL;` in Init() -- `EM_JS(int, startModal, ...)` JavaScript bridge function -- Modified ShowModal() to use async approach (returns wxID_CANCEL for now) -- Added `ShowModal(callback)` overload -- Modified EndModal() to call callback when present - -### 5. src/univ/ Window modifications (DONE) -**include/wx/univ/window.h** - Added: -- `#include ` at top -- WASM case for wxWindowNative (already present) -- `virtual void DoPopupMenu(wxMenu *menu, int x, int y, std::function callback) wxOVERRIDE;` -- `std::function m_popupCallback;` member - -**src/univ/winuniv.cpp** - Added: -- WASM case in `wxIMPLEMENT_DYNAMIC_CLASS` -- Commented out `EVT_KEY_DOWN(wxWindow::OnKeyDown)` -- `m_popupCallback = NULL;` in Init() -- SetScrollbar assertion already updated - -### 6. src/univ/ Control rendering (DONE) -**src/univ/ctrlrend.cpp** - Changed GetLabel() to GetLabelText() in: -- DrawLabel() -- DrawButtonLabel() -- DrawFrame() - -**src/univ/stdrend.cpp** - Changed wxBORDER_SIMPLE to use DrawStaticBorder() - -### 7. src/univ/ Widget fixes (DONE) -**src/univ/anybutton.cpp** - Fixed: -- Moved Refresh() before Click() in Toggle() -- Changed GetLabel() to GetLabelText() in DoGetBestClientSize() - -**src/univ/checkbox.cpp** - Changed GetLabel() to GetLabelText() in: -- DrawCheckButton() call -- GetMultiLineTextExtent() call - -**src/univ/stattext.cpp** - Added: -- AutoResizeIfNecessary() call after WXSetVisibleLabel() -- Changed GetLabel() to GetLabelText() in WXGetVisibleLabel() - -**src/univ/radiobut.cpp** - Added: -- Toggle() method -- PerformAction() override -- Changed GetLabel() to GetLabelText() in DoDraw() - -**include/wx/univ/radiobut.h** - Added: -- Toggle() declaration -- PerformAction() override declaration - -**src/univ/textctrl.cpp** - Added: -- SetBackgroundColour(*wxWHITE) in Create() -- DoGetSizeFromTextSize() method - -**include/wx/univ/textctrl.h** - Changed: -- GetDefaultBorder() returns wxBORDER_STATIC instead of wxBORDER_SUNKEN -- Added DoGetSizeFromTextSize() declaration - -### 8. GetScrollbarArrowSize signature + slider/spinbutt changes (DONE) -**include/wx/univ/renderer.h** - Changed: -- `GetScrollbarArrowSize()` to `GetScrollbarArrowSize(wxOrientation orientation)` -- `DrawSliderShaft` to add `double fracValue` parameter -- Added `GetOverflowHeight()` to wxMenuGeometryInfo -- Added `DrawMenuOverflowArrow()` method -- Updated wxDelegateRenderer wrappers - -**src/univ/themes/gtk.cpp, mono.cpp, win32.cpp** - Updated: -- `GetScrollbarArrowSize(wxOrientation WXUNUSED(orientation))` signature -- `DrawSliderShaft` signature with `double WXUNUSED(fracValue)` parameter - -**src/univ/scrolbar.cpp** - Added: -- `thumbSize = wxMax(wxMin(thumbSize, range), 0);` in SetScrollbar -- `GetScrollbarArrowSize()` helper method that calls renderer with orientation -- Changed all `m_renderer->GetScrollbarArrowSize()` to `GetScrollbarArrowSize()` -- Changed `size.x = SIZE` to `size.y = 15` for horizontal scrollbar - -**include/wx/univ/scrolbar.h** - Added: -- `wxSize GetScrollbarArrowSize() const;` declaration - -**src/univ/spinbutt.cpp** - Updated: -- `DoGetBestClientSize()` calls renderer with orientation -- `CalcArrowRects()` rewritten with hardcoded ARROW_WIDTH/HEIGHT - -**src/univ/settingsuniv.cpp** - Updated: -- `GetMetric()` calls use orientation parameter - -**src/univ/slider.cpp** - Updated: -- Added `IsInverted()` logic in CalcThumbRect -- Added fracValue calculation in DoDraw -- Updated PixelToThumbPos with IsInverted logic -- Simplified OnThumbDragStart/OnThumbDrag/OnThumbDragEnd - -**include/wx/univ/slider.h** - Added: -- `bool IsInverted() const { return IsVert() != HasFlag(wxSL_INVERSE); }` - ---- - -### 9. src/univ/menu.cpp (DONE) - -Complete rewrite of popup menu handling for WASM: - -**Timer-based submenu opening** - In browsers, no modal event loops. Timer allows diagonal mouse movement toward submenus without accidentally closing them. -- `m_subMenuTimer` - delays submenu opening (50ms) -- `m_subMenuPoint` - tracks mouse position when starting submenu tracking -- `IsPointTrackingToSubMenu()` - geometry check if mouse moving toward submenu -- `OnSubMenuTimer()` - timer callback - -**Overflow handling** - Browser windows can be smaller than desktop. Menus need to scroll. -- `m_offsetY` - scroll offset -- `m_overflowTimer` - continuous scrolling when hovering arrows -- `HasOverflow()`, `HasOverflowArrowUp()`, `HasOverflowArrowDown()` -- `GetOverflowArrowUpRect()`, `GetOverflowArrowDownRect()` -- `OverflowArrowHitTest()` -- `GetMaxClientHeight()` - available screen height -- `SetOffsetY()` - set scroll and refresh -- `OnOverflowTimer()`, `OnMouseWheel()` - -**Async popup menus** - DoPopupMenu skips blocking event loop for WASM -- Wrap blocking code in `#ifndef __WXWASM__` -- Add callback-based overload -- DismissPopupMenu calls callback - -**Other changes:** -- Border from `wxBORDER_RAISED` to `wxBORDER_STATIC` -- ClickItem BEFORE DismissAndNotify (was after) -- GetRootWindow uses GetWindow() instead of GetInvokingWindow() -- Detach adds GetParent()->RemoveChild(this) -- OnLeftDown uses IsShowingMenu()/DismissMenu() instead of HasCapture()/OnDismiss() - ---- - -### 10. src/generic/ modifications (DONE - partial) - -**src/generic/spinctlg.cpp** - MARGIN=0, null check for m_spinButton in DoMoveWindow -**src/generic/msgdlgg.cpp** - Async ShowModal overload added -**include/wx/generic/msgdlgg.h** - ShowModal callback declaration added -**src/generic/renderg.cpp** - Visual tweaks (3DLIGHT color, transparent pen, highlight color) -**src/generic/treectlg.cpp** - Smaller indent/spacing (10 instead of 15/18), transparent pen -**src/generic/vlbox.cpp** - SetBackgroundColour(*wxWHITE) - -Not yet applied (may not be needed for wxWidgets 3.2.6): -- **src/generic/caret.cpp** - Different API in 3.2.6 -- **src/generic/grid.cpp** - Visual tweaks (low priority) -- **src/generic/gridctrl.cpp** - 4 lines (low priority) -- **src/generic/filedlgg.cpp** - 2 lines -- **src/generic/listctrl.cpp** - 2 lines -- **src/generic/stattextg.cpp** - 2 lines - ---- - -## REMAINING CHANGES (NOT YET APPLIED) - -### Priority 1: include/wx/ header modifications (Low priority - complex) - -**include/wx/platinfo.h** - 77 lines (browser detection, wxBrowserInfo class, wxPORT_WASM) -**src/common/platinfo.cpp** - 6 lines (browser info init) -**src/common/utilscmn.cpp** - 57 lines (async wxMessageBox, wxPORT_WASM check) -**src/common/wincmn.cpp** - 19 lines (async popup menu) - -Many other headers need `#elif defined(__WXWASM__)` or `#ifdef __WXWASM__` additions. - -### Priority 4: Build system files - -**Makefile.in** - 897 lines of changes -**autoconf_inc.m4** - 13 lines -**build/bakefiles/files.bkl** - 74 lines -**build/bakefiles/wx.bkl** - 2 lines -**build/cmake/files.cmake** - 71 lines -**build/cmake/setup.cmake** - 2 lines -**build/cmake/toolkit.cmake** - 6 lines -**build/files** - 71 lines - ---- - -## HOW TO CHECK REFERENCE CHANGES - -To see what a file changed in the reference: -```bash -cd /Users/V/IdeaProjects/kicad-wasm/wxWidgets-wasm-reference -git show d262364a0a -- path/to/file -``` - -The last 10 commits in reference (oldest to newest): -1. d262364a0a - Initial commit of wasm sources (main changes) -2. 595b16b855 - Add wasm files (theme, demo makefiles) -3. 0dbfab6b4c - Update README.md -4. 31a467a173 - Update README.md -5. 3c0f3b1954 - Update link to wavacity -6. 57ea7c9a04 - Fix crash if mouse window reset in event handler -7. ae94f56bd3 - Size top window before run -8. 255970e5e2 - Support font size in pixels -9. b44707a19a - Translate touch events to mouse events -10. 293bd9feba - Suppress locale warnings - -Bug fixes 6-10 are already applied in wxwidgets/src/wasm/ files. - ---- - -## KEY INSIGHT: Why config.sub in Submodules - -wxWidgets 3.2.6 uses git submodules for bundled libraries (pcre, expat, jpeg, png, tiff). Each has its own config.sub that must recognize wasm32. The reference (older ~3.0.x) had libraries directly in-tree without submodules. - -Current submodule config.sub files are already updated (showing `m` modified status in git). - ---- - -## SKIPPED CHANGES (Low Priority or Complex) - -- **src/common/appcmn.cpp** - Just debug printf (not needed) -- **src/common/init.cpp** - Just debug printf (not needed) -- **src/common/dcbufcmn.cpp** - Different API in 3.2.6 (already correct) -- **Browser info in platinfo.h/cpp** - Complex, adds wxBrowserInfo class (not critical) -- **Async wxMessageBox** - Changes function signature (complex) - ---- - -## NEXT STEPS - -1. **Complete menu.cpp changes** - Follow the 20-step list above -2. Apply src/generic/ changes -3. Apply remaining include/wx/ header changes -4. Test with a minimal WASM app - ---- - -## FILES IN wxwidgets/ FOLDER - -Key WASM-specific directories already present: -- `wxwidgets/src/wasm/` - 29 source files -- `wxwidgets/include/wx/wasm/` - 31 header files -- `wxwidgets/src/univ/themes/wasm.cpp` - WASM theme (98KB) -- `wxwidgets/build/wasm/` - Build support files (copied from reference) diff --git a/docs/ccache-benchmark.md b/docs/ccache-benchmark.md deleted file mode 100644 index 344513d..0000000 --- a/docs/ccache-benchmark.md +++ /dev/null @@ -1,63 +0,0 @@ -# ccache Build Performance Benchmark - -Testing build times before and after adding ccache to measure the impact. - -## Test Environment -- Machine: Apple Silicon (M4 Max) -- Docker resources: 10 CPUs, 32GB RAM -- Build command: `./docker/build.sh` (defaults to incremental build) - -## Results - -### Step 1: Baseline (before ccache) -Command: `./docker/build.sh --skip-deps` (forces KiCad rebuild, old default) -**Time: 7:34.93** (7 min 35 sec) - -### Step 2: First build with ccache (populating cache) -Command: `./docker/build.sh --skip-deps` (old default) -**Time: 9:35.52** (9 min 35 sec) -Note: Slower than baseline due to ccache overhead when populating cache -Cache stats: 1335 misses, 0 hits, 1.39GB cached - -### Step 3: Single KiCad file change (incremental build) -Changed: `kicad/pcbnew/board.cpp` (added one line) -Command: `./docker/build.sh` (new incremental default) -**Time: 1:45.97** (1 min 46 sec) -- Only `board.cpp` recompiled -- Rest of compilation: instant (CMake detected no changes) -- Most time spent on post-processing (asyncify ~1 min) -- ccache hit rate: 25% (some preprocessed source matched) - -### Step 4: wxWidgets incremental build baseline (configure ran) -Command: `./docker/build.sh` (after implementing skip-configure logic) -**Time: 7:43.87** (7 min 44 sec) -- First build after script changes, so configure ran -- This populates the wxWidgets build state for incremental builds - -### Step 5: No-change rebuild (configure skipped) -Command: `./docker/build.sh` (no changes to any source files) -**Time: 1:31.13** (1 min 31 sec) -- wxWidgets configure skipped (Makefile exists, configure.in unchanged) -- wxWidgets make: instant (nothing to rebuild) -- KiCad CMake/make: instant (nothing changed) -- All time spent on post-processing (asyncify ~1 min) - -### Step 6: Single wxWidgets file change (incremental build) -Changed: `wxwidgets/src/common/memory.cpp` (added one line) -Command: `./docker/build.sh` -**Time: 1:33.99** (1 min 34 sec) -- wxWidgets configure skipped -- Only `memory.cpp` recompiled, library re-archived -- KiCad links against updated wxWidgets -- Most time spent on post-processing (asyncify ~1 min) - -## Summary - -| Scenario | Before | After | Speedup | -|----------|--------|-------|---------| -| Full rebuild (baseline) | 7:35 | 9:35 | -27% (cache populating) | -| KiCad single file change | 7:35 | 1:46 | **4.3x faster** | -| wxWidgets single file change | ~7:35 | 1:34 | **4.8x faster** | -| No changes | ~7:35 | 1:31 | **5x faster** | - -**Note**: Asyncify post-processing takes ~1 min and runs every build. This is the irreducible minimum build time. diff --git a/patches/0001-wasm-optional-deps.patch b/patches/0001-wasm-optional-deps.patch deleted file mode 100644 index af81193..0000000 --- a/patches/0001-wasm-optional-deps.patch +++ /dev/null @@ -1,358 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fd20af211f..a8e2ea34b2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -64,7 +64,13 @@ set( CMAKE_EXPORT_COMPILE_COMMANDS ON ) - - # Path to KiCad's CMake modules. - set( KICAD_CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ) --set( CMAKE_MODULE_PATH "${KICAD_CMAKE_MODULE_PATH}" ) -+ -+# Preserve any user-provided CMAKE_MODULE_PATH (e.g. for kicad-wasm overrides) -+if(CMAKE_MODULE_PATH) -+ set( CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${KICAD_CMAKE_MODULE_PATH}" ) -+else() -+ set( CMAKE_MODULE_PATH "${KICAD_CMAKE_MODULE_PATH}" ) -+endif() - - include( ConfigurePlatform ) - -diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt -index 56e516acad..f29ae853ef 100644 ---- a/common/CMakeLists.txt -+++ b/common/CMakeLists.txt -@@ -71,29 +71,6 @@ set( KICOMMON_SRCS - gal/color4d.cpp - gal/opengl/gl_context_mgr.cpp - -- # Git -- git/git_add_to_index_handler.cpp -- git/git_branch_handler.cpp -- git/git_clone_handler.cpp -- git/git_commit_handler.cpp -- git/git_config_handler.cpp -- git/git_compare_handler.cpp -- git/git_init_handler.cpp -- git/project_git_utils.cpp -- git/git_pull_handler.cpp -- git/git_push_handler.cpp -- git/git_remove_from_index_handler.cpp -- git/git_remove_vcs_handler.cpp -- git/git_resolve_conflict_handler.cpp -- git/git_revert_handler.cpp -- git/git_status_handler.cpp -- git/git_switch_branch_handler.cpp -- git/git_sync_handler.cpp -- git/kicad_git_common.cpp -- git/kicad_git_errors.cpp -- git/git_backend.cpp -- git/libgit_backend.cpp -- - # Jobs - jobs/job.cpp - jobs/job_dispatcher.cpp -@@ -134,12 +111,6 @@ set( KICOMMON_SRCS - jobs/job_pcb_upgrade.cpp - jobs/job_sch_upgrade.cpp - -- local_history.cpp -- history_lock.cpp -- -- kicad_curl/kicad_curl.cpp -- kicad_curl/kicad_curl_easy.cpp -- - libraries/library_manager.cpp - libraries/library_table.cpp - libraries/library_table_parser.cpp -@@ -280,6 +251,54 @@ if( UNIX AND NOT APPLE ) - ) - endif() - -+# Git files - only include when git support is enabled -+if( KICAD_USE_GIT ) -+ list( APPEND KICOMMON_SRCS -+ local_history.cpp -+ history_lock.cpp -+ git/git_add_to_index_handler.cpp -+ git/git_branch_handler.cpp -+ git/git_clone_handler.cpp -+ git/git_commit_handler.cpp -+ git/git_config_handler.cpp -+ git/git_compare_handler.cpp -+ git/git_init_handler.cpp -+ git/project_git_utils.cpp -+ git/git_pull_handler.cpp -+ git/git_push_handler.cpp -+ git/git_remove_from_index_handler.cpp -+ git/git_remove_vcs_handler.cpp -+ git/git_resolve_conflict_handler.cpp -+ git/git_revert_handler.cpp -+ git/git_status_handler.cpp -+ git/git_switch_branch_handler.cpp -+ git/git_sync_handler.cpp -+ git/kicad_git_common.cpp -+ git/kicad_git_errors.cpp -+ git/git_backend.cpp -+ git/libgit_backend.cpp -+ ) -+endif() -+ -+# CURL files - only include when curl support is enabled -+if( KICAD_USE_CURL ) -+ list( APPEND KICOMMON_SRCS -+ kicad_curl/kicad_curl.cpp -+ kicad_curl/kicad_curl_easy.cpp -+ ) -+endif() -+ -+# Stub implementations for disabled features -+if( NOT KICAD_USE_GIT OR NOT KICAD_USE_CURL ) -+ # Use absolute path to stub implementations -+ set( STUBS_SRC_DIR "${CMAKE_SOURCE_DIR}/../stubs/src" ) -+ if( EXISTS "${STUBS_SRC_DIR}/disabled_features_stubs.cpp" ) -+ list( APPEND KICOMMON_SRCS -+ "${STUBS_SRC_DIR}/disabled_features_stubs.cpp" -+ ) -+ endif() -+endif() -+ - if( KICAD_IPC_API ) - set( KICOMMON_SRCS - ${KICOMMON_SRCS} -@@ -322,12 +341,10 @@ target_link_libraries( kicommon - nlohmann_json_schema_validator - FastFloat::fast_float - fmt::fmt -- CURL::libcurl - picosha2 - rapidcsv - ${ZSTD_LIBRARY} - ${wxWidgets_LIBRARIES} -- ${LIBGIT2_LIBRARIES} - ${SPNAV_LIBRARIES} - - # needed by kiid to allow linking for Boost for the UUID against bcrypt (msys2 only) -@@ -342,6 +359,15 @@ target_link_libraries( kicommon - ${PYTHON_LIBRARIES} - ) - -+# Conditional library links for optional features -+if( KICAD_USE_CURL ) -+ target_link_libraries( kicommon CURL::libcurl ) -+endif() -+ -+if( KICAD_USE_GIT ) -+ target_link_libraries( kicommon ${LIBGIT2_LIBRARIES} ) -+endif() -+ - - if( KICAD_USE_SENTRY ) - target_link_libraries( kicommon -@@ -417,16 +443,30 @@ set( COMMON_ABOUT_DLG_SRCS - dialog_about/dialog_about_base.cpp - ) - -+# Git dialog sources - only include when git support is enabled -+# panel_git_repos_base.cpp has no git dependencies, so it's always compiled - set( COMMON_GIT_DLG_SRCS -- dialogs/git/dialog_git_commit.cpp -- dialogs/git/dialog_git_switch.cpp -- dialogs/git/dialog_git_auth.cpp -- dialogs/git/dialog_git_repository.cpp -- dialogs/git/dialog_git_repository_base.cpp -- dialogs/git/panel_git_repos.cpp - dialogs/git/panel_git_repos_base.cpp -+) - -+if( KICAD_USE_GIT ) -+ list( APPEND COMMON_GIT_DLG_SRCS -+ dialogs/git/dialog_git_commit.cpp -+ dialogs/git/dialog_git_switch.cpp -+ dialogs/git/dialog_git_auth.cpp -+ dialogs/git/dialog_git_repository.cpp -+ dialogs/git/dialog_git_repository_base.cpp -+ dialogs/git/panel_git_repos.cpp - ) -+else() -+ # Add stub implementation for PANEL_GIT_REPOS when git is disabled -+ set( STUBS_SRC_DIR "${CMAKE_SOURCE_DIR}/../stubs/src" ) -+ if( EXISTS "${STUBS_SRC_DIR}/panel_git_repos_stub.cpp" ) -+ list( APPEND COMMON_GIT_DLG_SRCS -+ "${STUBS_SRC_DIR}/panel_git_repos_stub.cpp" -+ ) -+ endif() -+endif() - - set( COMMON_DLG_SRCS - ${COMMON_GIT_DLG_SRCS} -diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt -index 1be2c291d1..bca563201a 100644 ---- a/eeschema/CMakeLists.txt -+++ b/eeschema/CMakeLists.txt -@@ -697,15 +697,17 @@ if( APPLE ) - set( OSX_BUNDLE_BUILD_KIFACE_DIR \"${OSX_BUNDLE_BUILD_KIFACE_DIR}\" ) - " ) - -- # bundle libngspice and codemodels -- get_filename_component( ABS_LIBNGSPICE ${NGSPICE_LIBRARY} ABSOLUTE ) -- get_filename_component( LIBNGSPICE_PATH ${ABS_LIBNGSPICE} DIRECTORY ) -- -- install( DIRECTORY "${LIBNGSPICE_PATH}/" -- DESTINATION "${OSX_BUNDLE_INSTALL_PLUGIN_DIR}/sim" -- FILES_MATCHING PATTERN "*.dylib") -- install( DIRECTORY "${LIBNGSPICE_PATH}/ngspice" -- DESTINATION "${OSX_BUNDLE_INSTALL_PLUGIN_DIR}/sim" ) -+ # bundle libngspice and codemodels (only when ngspice is enabled) -+ if( KICAD_USE_NGSPICE AND NGSPICE_LIBRARY ) -+ get_filename_component( ABS_LIBNGSPICE ${NGSPICE_LIBRARY} ABSOLUTE ) -+ get_filename_component( LIBNGSPICE_PATH ${ABS_LIBNGSPICE} DIRECTORY ) -+ -+ install( DIRECTORY "${LIBNGSPICE_PATH}/" -+ DESTINATION "${OSX_BUNDLE_INSTALL_PLUGIN_DIR}/sim" -+ FILES_MATCHING PATTERN "*.dylib") -+ install( DIRECTORY "${LIBNGSPICE_PATH}/ngspice" -+ DESTINATION "${OSX_BUNDLE_INSTALL_PLUGIN_DIR}/sim" ) -+ endif() - - install( CODE [[ - include( ${KICAD_CMAKE_MODULE_PATH}/InstallSteps/InstallMacOS.cmake ) -diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt -index b7e78725d0..c615c9022c 100644 ---- a/kicad/CMakeLists.txt -+++ b/kicad/CMakeLists.txt -@@ -37,7 +37,6 @@ set( KICAD_SRCS - import_proj.cpp - import_project.cpp - kicad_manager_frame.cpp -- local_history_pane.cpp - menubar.cpp - project_template.cpp - project_tree_pane.cpp -@@ -50,6 +49,21 @@ set( KICAD_SRCS - tools/kicad_manager_control.cpp - ) - -+# Local history pane requires git support -+if( KICAD_USE_GIT ) -+ list( APPEND KICAD_SRCS -+ local_history_pane.cpp -+ ) -+else() -+ # Add comprehensive git stubs when git is disabled -+ set( STUBS_SRC_DIR "${CMAKE_SOURCE_DIR}/../stubs/src" ) -+ if( EXISTS "${STUBS_SRC_DIR}/kicad_git_all_stubs.cpp" ) -+ list( APPEND KICAD_SRCS -+ "${STUBS_SRC_DIR}/kicad_git_all_stubs.cpp" -+ ) -+ endif() -+endif() -+ - set( KICAD_CLI_SRCS - cli/command.cpp - cli/command_jobset_run.cpp -diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt -index 7ea9bdcda5..ba0be19156 100644 ---- a/pcbnew/CMakeLists.txt -+++ b/pcbnew/CMakeLists.txt -@@ -248,15 +248,6 @@ set( PCBNEW_EXPORTERS - exporters/export_gencad.cpp - exporters/export_gencad_writer.cpp - exporters/export_idf.cpp -- exporters/step/exporter_step.cpp -- exporters/step/kicad3d_info.cpp -- exporters/step/step_pcb_model.cpp -- exporters/step/KI_XCAFDoc_AssemblyGraph.cxx -- exporters/u3d/bit_stream_writer.cpp -- exporters/u3d/constants.cpp -- exporters/u3d/context_manager.cpp -- exporters/u3d/data_block.cpp -- exporters/u3d/writer.cpp - exporters/exporter_vrml.cpp - exporters/place_file_exporter.cpp - exporters/gen_drill_report_files.cpp -@@ -267,6 +258,24 @@ set( PCBNEW_EXPORTERS - exporters/gerber_placefile_writer.cpp - ) - -+# STEP and U3D exporter files - require OpenCASCADE -+if( KICAD_USE_OCC ) -+ list( APPEND PCBNEW_SRCS -+ exporters/step/exporter_step.cpp -+ exporters/step/kicad3d_info.cpp -+ exporters/step/step_pcb_model.cpp -+ exporters/step/KI_XCAFDoc_AssemblyGraph.cxx -+ exporters/u3d/bit_stream_writer.cpp -+ exporters/u3d/constants.cpp -+ exporters/u3d/context_manager.cpp -+ exporters/u3d/data_block.cpp -+ exporters/u3d/writer.cpp -+ ) -+else() -+ # OCC is disabled - stubs will be added to PCBNEW_SRCS after it is defined (around line 491) -+ message(STATUS "PCBNEW: KICAD_USE_OCC is OFF") -+endif() -+ - set( PCBNEW_MICROWAVE_SRCS - microwave/microwave_footprint.cpp - microwave/microwave_inductor.cpp -@@ -459,9 +468,14 @@ set( PCBNEW_CLASS_SRCS - - ) - --set( PCBNEW_GIT_SRCS -- git/kigit_pcb_merge.cpp -+# Git sources - only include when git support is enabled -+if( KICAD_USE_GIT ) -+ set( PCBNEW_GIT_SRCS -+ git/kigit_pcb_merge.cpp - ) -+else() -+ set( PCBNEW_GIT_SRCS "" ) -+endif() - - set( PCBNEW_SRCS - ${PCBNEW_MICROWAVE_SRCS} -@@ -480,10 +494,27 @@ set( PCBNEW_SCRIPTING_PYTHON_HELPERS - python/scripting/pcbnew_footprint_wizards.cpp - python/scripting/pcbnew_scripting_helpers.cpp - python/scripting/pcbnew_scripting.cpp -- python/scripting/pcbnew_utils_3d.cpp - python/scripting/pcb_scripting_tool.cpp - ) - -+# 3D utils require OpenCASCADE -+if( KICAD_USE_OCC ) -+ list( APPEND PCBNEW_SCRIPTING_PYTHON_HELPERS -+ python/scripting/pcbnew_utils_3d.cpp -+ ) -+else() -+ # Add OCC stub implementations when OCC is disabled -+ set( STUBS_SRC_DIR "${CMAKE_SOURCE_DIR}/../stubs/src" ) -+ if( EXISTS "${STUBS_SRC_DIR}/occ_stubs.cpp" ) -+ message(STATUS "PCBNEW: Adding occ_stubs.cpp to PCBNEW_SRCS") -+ list( APPEND PCBNEW_SRCS -+ "${STUBS_SRC_DIR}/occ_stubs.cpp" -+ ) -+ else() -+ message(WARNING "PCBNEW: occ_stubs.cpp NOT FOUND at ${STUBS_SRC_DIR}/occ_stubs.cpp") -+ endif() -+endif() -+ - if( KICAD_IPC_API ) - set( PCBNEW_SRCS ${PCBNEW_SRCS} - api/api_handler_pcb.cpp -diff --git a/plugins/3d/CMakeLists.txt b/plugins/3d/CMakeLists.txt -index 9c5e4095ae..ceda7f3aae 100644 ---- a/plugins/3d/CMakeLists.txt -+++ b/plugins/3d/CMakeLists.txt -@@ -1,3 +1,7 @@ - add_subdirectory( idf ) - add_subdirectory( vrml ) --add_subdirectory( oce ) -\ No newline at end of file -+ -+# OCC plugin requires OpenCASCADE -+if( KICAD_USE_OCC ) -+ add_subdirectory( oce ) -+endif() -\ No newline at end of file diff --git a/patches/0002-wxbase-wasm-integration.patch b/patches/0002-wxbase-wasm-integration.patch deleted file mode 100644 index ea4e496..0000000 --- a/patches/0002-wxbase-wasm-integration.patch +++ /dev/null @@ -1,319 +0,0 @@ -From d6e946b101a872d1aaea0fedd8393ddaee091277 Mon Sep 17 00:00:00 2001 -From: Viktor Vaczi -Date: Thu, 27 Nov 2025 08:32:40 +0100 -Subject: [PATCH 1/2] Add wxWidgets 3.2.6 submodule and wxBase WASM build - script -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- Add wxWidgets v3.2.6 as git submodule for wxBase utilities -- Create build-wxbase-wasm.sh script to compile wxBase for Emscripten -- Disable WASM-incompatible features: zlib, expat, xlocale, fswatcher -- Successfully builds libwx_baseu-3.2-Emscripten.a (3.1MB) - -This provides wxString, wxFile, wxDateTime and other base utilities -needed for the KiCad board data model without GUI dependencies. - -🤖 Generated with [Claude Code](https://claude.com/claude-code) - -Co-Authored-By: Claude ---- - .gitmodules | 3 ++ - scripts/build-wxbase-wasm.sh | 67 ++++++++++++++++++++++++++++++++++++ - wxwidgets | 1 + - 3 files changed, 71 insertions(+) - create mode 100755 scripts/build-wxbase-wasm.sh - create mode 160000 wxwidgets - -diff --git a/.gitmodules b/.gitmodules -index 55e859a..7e8d09f 100644 ---- a/.gitmodules -+++ b/.gitmodules -@@ -1,3 +1,6 @@ - [submodule "kicad"] - path = kicad - url = git@github.com:VV-EE/kicad-source-mirror.git -+[submodule "wxwidgets"] -+ path = wxwidgets -+ url = https://github.com/wxWidgets/wxWidgets.git -diff --git a/scripts/build-wxbase-wasm.sh b/scripts/build-wxbase-wasm.sh -new file mode 100755 -index 0000000..f74293f ---- /dev/null -+++ b/scripts/build-wxbase-wasm.sh -@@ -0,0 +1,67 @@ -+#!/bin/bash -+# Build wxBase (non-GUI wxWidgets) for WebAssembly -+# This builds only the base utilities needed by KiCad core (wxString, wxFile, etc.) -+ -+set -e -+ -+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")" -+BUILD_DIR="$PROJECT_ROOT/build-wasm/wxwidgets" -+WX_SOURCE="$PROJECT_ROOT/wxwidgets" -+ -+echo "=== Building wxBase for WASM ===" -+echo "Project root: $PROJECT_ROOT" -+echo "Build dir: $BUILD_DIR" -+echo "wxWidgets source: $WX_SOURCE" -+ -+# Verify we're in the right place -+if [ ! -f "$WX_SOURCE/CMakeLists.txt" ]; then -+ echo "ERROR: wxWidgets source not found at $WX_SOURCE" -+ echo "Make sure the wxwidgets submodule is initialized" -+ exit 1 -+fi -+ -+# Clean if requested (must be before mkdir to properly reset CMake cache) -+if [ "$1" = "--clean" ]; then -+ echo "Cleaning build directory..." -+ rm -rf "$BUILD_DIR" -+fi -+ -+# Create build directory -+mkdir -p "$BUILD_DIR" -+cd "$BUILD_DIR" -+ -+# Configure with emcmake -+# Disable all GUI and most optional features - we only need wxBase utilities -+# Note: zlib/expat "builtin" versions use POSIX file descriptors not available in WASM, -+# so we disable them. We'll use Emscripten's ports if compression is needed. -+emcmake cmake "$WX_SOURCE" \ -+ -DwxUSE_GUI=OFF \ -+ -DwxBUILD_SHARED=OFF \ -+ -DwxBUILD_SAMPLES=OFF \ -+ -DwxBUILD_TESTS=OFF \ -+ -DwxBUILD_DEMOS=OFF \ -+ -DwxBUILD_BENCHMARKS=OFF \ -+ -DwxUSE_REGEX=OFF \ -+ -DwxUSE_ZLIB=OFF \ -+ -DwxUSE_EXPAT=OFF \ -+ -DwxUSE_LIBJPEG=OFF \ -+ -DwxUSE_LIBPNG=OFF \ -+ -DwxUSE_LIBTIFF=OFF \ -+ -DwxUSE_WEBREQUEST=OFF \ -+ -DwxUSE_SECRETSTORE=OFF \ -+ -DwxUSE_LIBSDL=OFF \ -+ -DwxUSE_LIBMSPACK=OFF \ -+ -DwxUSE_FSWATCHER=OFF \ -+ -DwxUSE_XLOCALE=OFF \ -+ -DCMAKE_BUILD_TYPE=Release \ -+ -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -+ -+# Build -+echo "" -+echo "=== Building ===" -+emmake make -j$(nproc 2>/dev/null || sysctl -n hw.ncpu) -+ -+echo "" -+echo "=== Build complete ===" -+ls -lh "$BUILD_DIR"/lib/*.a 2>/dev/null || echo "Libraries built in $BUILD_DIR" -\ No newline at end of file -diff --git a/wxwidgets b/wxwidgets -new file mode 160000 -index 0000000..5ff2532 ---- /dev/null -+++ b/wxwidgets -@@ -0,0 +1 @@ -+Subproject commit 5ff25322553c1870cf20a2e1ba6f20ed50d9fe9a --- -2.50.1 (Apple Git-155) - - -From 9305aa5afbbc9a3085c4e73e5469fa7e64616418 Mon Sep 17 00:00:00 2001 -From: Viktor Vaczi -Date: Thu, 27 Nov 2025 08:39:22 +0100 -Subject: [PATCH 2/2] Update core library to use real wxBase instead of wx_shim -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- Update CMakeLists.txt to link against wxBase WASM build -- Move config.h to wasm-config/ to avoid conflicts with wx headers -- Add build-core-wasm.sh script for reproducible builds -- Core now compiles with actual wxString, wxFile, etc. from wxWidgets - -Libraries built: -- libkicad_core_utils.a (34K) -- libkimath.a (969K) -- libsexpr.a (45K) -- libclipper2.a (169K) - -🤖 Generated with [Claude Code](https://claude.com/claude-code) - -Co-Authored-By: Claude ---- - core/CMakeLists.txt | 42 +++++++++++++++++--- - core/{include => wasm-config}/config.h | 2 +- - scripts/build-core-wasm.sh | 53 ++++++++++++++++++++++++++ - 3 files changed, 91 insertions(+), 6 deletions(-) - rename core/{include => wasm-config}/config.h (88%) - create mode 100755 scripts/build-core-wasm.sh - -diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index 3b53175..5556c7e 100644 ---- a/core/CMakeLists.txt -+++ b/core/CMakeLists.txt -@@ -14,6 +14,32 @@ endif() - - message(STATUS "Using KiCad source at: ${KICAD_SOURCE}") - -+# ============================================================================= -+# wxWidgets Base (pre-built for WASM) -+# ============================================================================= -+set(WXWIDGETS_SOURCE "${CMAKE_SOURCE_DIR}/../wxwidgets" CACHE PATH "Path to wxWidgets source") -+set(WXWIDGETS_BUILD "${CMAKE_SOURCE_DIR}/../build-wasm/wxwidgets" CACHE PATH "Path to wxWidgets WASM build") -+ -+# Verify wxWidgets build exists -+if(NOT EXISTS "${WXWIDGETS_BUILD}/lib/libwx_baseu-3.2-Emscripten.a") -+ message(FATAL_ERROR "wxBase WASM build not found. Run scripts/build-wxbase-wasm.sh first") -+endif() -+ -+# Create imported wxBase library -+add_library(wxbase STATIC IMPORTED) -+set_target_properties(wxbase PROPERTIES -+ IMPORTED_LOCATION "${WXWIDGETS_BUILD}/lib/libwx_baseu-3.2-Emscripten.a" -+) -+ -+# wxWidgets include directories -+set(WX_INCLUDE_DIRS -+ "${WXWIDGETS_BUILD}/lib/wx/include/base-unicode-static-3.2" # Platform setup.h -+ "${WXWIDGETS_SOURCE}/include" # Main wx headers -+) -+ -+message(STATUS "Using wxWidgets source at: ${WXWIDGETS_SOURCE}") -+message(STATUS "Using wxWidgets build at: ${WXWIDGETS_BUILD}") -+ - # ============================================================================= - # Options - # ============================================================================= -@@ -45,20 +71,24 @@ target_include_directories(rtree INTERFACE - ) - - # ============================================================================= --# Core utilities library (minimal version without wx_stl_compat) -+# Core utilities library (with wxBase support) - # ============================================================================= - add_library(kicad_core_utils STATIC - ${KICAD_SOURCE}/libs/core/base64.cpp - ${KICAD_SOURCE}/libs/core/observable.cpp - ${KICAD_SOURCE}/libs/core/profile.cpp -- # Skip utf8.cpp and wx_stl_compat.cpp - they have heavy wx dependencies -+ ${KICAD_SOURCE}/libs/core/utf8.cpp -+ ${KICAD_SOURCE}/libs/core/wx_stl_compat.cpp - ) - - target_include_directories(kicad_core_utils PUBLIC -+ ${CMAKE_CURRENT_SOURCE_DIR}/wasm-config # config.h for WASM build -+ ${WX_INCLUDE_DIRS} - ${KICAD_SOURCE}/libs/core/include -- ${CMAKE_CURRENT_SOURCE_DIR}/include # For wx_shim.h - ) - -+target_link_libraries(kicad_core_utils PUBLIC wxbase) -+ - # ============================================================================= - # S-expression library (parser for .kicad_pcb files) - # ============================================================================= -@@ -68,9 +98,11 @@ add_library(sexpr STATIC - ) - - target_include_directories(sexpr PUBLIC -- ${CMAKE_CURRENT_SOURCE_DIR}/include # wx_shim.h - FIRST! -+ ${CMAKE_CURRENT_SOURCE_DIR}/wasm-config # config.h for WASM build -+ ${WX_INCLUDE_DIRS} - ${KICAD_SOURCE}/libs/sexpr/include - ${KICAD_SOURCE}/libs/core/include -+ ${KICAD_SOURCE}/include # string_utils.h, etc. - ) - - target_link_libraries(sexpr PUBLIC kicad_core_utils) -@@ -121,7 +153,7 @@ set(KIMATH_SRCS - add_library(kimath STATIC ${KIMATH_SRCS}) - - target_include_directories(kimath PUBLIC -- ${CMAKE_CURRENT_SOURCE_DIR}/include # wx_shim.h and wx/ stubs - FIRST! -+ ${WX_INCLUDE_DIRS} - ${KICAD_SOURCE}/libs/kimath/include - ${KICAD_SOURCE}/libs/core/include - ${KICAD_SOURCE}/include # Main KiCad includes (units, etc.) -diff --git a/core/include/config.h b/core/wasm-config/config.h -similarity index 88% -rename from core/include/config.h -rename to core/wasm-config/config.h -index d40b4e1..fdcec80 100644 ---- a/core/include/config.h -+++ b/core/wasm-config/config.h -@@ -10,7 +10,7 @@ - // Platform detection for timing functions - #if defined(_WIN32) - // Windows uses GetSystemTimeAsFileTime --#elif defined(__APPLE__) || defined(__linux__) || defined(__unix__) -+#elif defined(__EMSCRIPTEN__) || defined(__APPLE__) || defined(__linux__) || defined(__unix__) - #define HAVE_CLOCK_GETTIME 1 - #else - #define HAVE_GETTIMEOFDAY_FUNC 1 -diff --git a/scripts/build-core-wasm.sh b/scripts/build-core-wasm.sh -new file mode 100755 -index 0000000..8155ad4 ---- /dev/null -+++ b/scripts/build-core-wasm.sh -@@ -0,0 +1,53 @@ -+#!/bin/bash -+# Build KiCad core library for WebAssembly -+# This builds kimath, sexpr, and core utilities with wxBase -+ -+set -e -+ -+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")" -+BUILD_DIR="$PROJECT_ROOT/build-wasm/core" -+CORE_SOURCE="$PROJECT_ROOT/core" -+ -+echo "=== Building KiCad Core for WASM ===" -+echo "Project root: $PROJECT_ROOT" -+echo "Build dir: $BUILD_DIR" -+echo "Core source: $CORE_SOURCE" -+ -+# Verify core source exists -+if [ ! -f "$CORE_SOURCE/CMakeLists.txt" ]; then -+ echo "ERROR: Core source not found at $CORE_SOURCE" -+ exit 1 -+fi -+ -+# Verify wxBase was built -+if [ ! -f "$PROJECT_ROOT/build-wasm/wxwidgets/lib/libwx_baseu-3.2-Emscripten.a" ]; then -+ echo "ERROR: wxBase not built. Run scripts/build-wxbase-wasm.sh first" -+ exit 1 -+fi -+ -+# Clean if requested (must be before mkdir to properly reset CMake cache) -+if [ "$1" = "--clean" ]; then -+ echo "Cleaning build directory..." -+ rm -rf "$BUILD_DIR" -+fi -+ -+# Create build directory -+mkdir -p "$BUILD_DIR" -+cd "$BUILD_DIR" -+ -+# Configure with emcmake -+echo "" -+echo "=== Configuring ===" -+emcmake cmake "$CORE_SOURCE" \ -+ -DCMAKE_BUILD_TYPE=Release \ -+ -DBUILD_TESTS=OFF -+ -+# Build -+echo "" -+echo "=== Building ===" -+emmake make -j$(nproc 2>/dev/null || sysctl -n hw.ncpu) -+ -+echo "" -+echo "=== Build complete ===" -+ls -lh "$BUILD_DIR"/*.a 2>/dev/null || echo "Libraries built in $BUILD_DIR" --- -2.50.1 (Apple Git-155) - diff --git a/patches/wxwidgets-wasm/README.md b/patches/wxwidgets-wasm/README.md deleted file mode 100644 index 1cee7ce..0000000 --- a/patches/wxwidgets-wasm/README.md +++ /dev/null @@ -1,47 +0,0 @@ -# wxWidgets WASM Port Patch - -Single unified patch that transforms wxWidgets into a WASM-capable build. - -## Base Version - -- Repository: git@github.com:VV-EE/wxWidgets.git -- Commit: 5ff25322553c1870cf20a2e1ba6f20ed50d9fe9a -- Generated: 2025-11-27 14:10:12 UTC - -## Patch Contents - -This single patch includes: -- Main wxWidgets modifications (config.sub, configure.in, headers, sources) -- New WASM platform: src/wasm/, include/wx/wasm/ -- New build files: build/wasm/ -- WASM theme renderer: src/univ/themes/wasm.cpp -- Submodule config.sub updates for emscripten/wasm32 support: - - 3rdparty/pcre/config.sub - - src/expat/expat/conftools/config.sub - - src/jpeg/config.sub - - src/png/config.sub - - src/tiff/config/config.sub - -## Apply Instructions - -```bash -# Clone wxWidgets fork at the base commit -git clone git@github.com:VV-EE/wxWidgets.git wxwidgets-clean -cd wxwidgets-clean -git checkout 5ff25322553c1870cf20a2e1ba6f20ed50d9fe9a -git submodule update --init --recursive - -# Apply the unified patch -patch -p1 < /path/to/patches/wxwidgets-wasm/wxwidgets-wasm.patch - -# Build -mkdir build && cd build -emconfigure ../configure --host=emscripten --enable-universal ... -emmake make -``` - -## Verification - -```bash -shasum -a 256 -c checksums.sha256 -``` diff --git a/patches/wxwidgets-wasm/checksums.sha256 b/patches/wxwidgets-wasm/checksums.sha256 deleted file mode 100644 index 227b1c8..0000000 --- a/patches/wxwidgets-wasm/checksums.sha256 +++ /dev/null @@ -1 +0,0 @@ -bc0e065e90bd8ef278532d972e74e975e968e9c3cb0b4f50b989ca4bf2bc48ee wxwidgets-wasm.patch diff --git a/patches/wxwidgets-wasm/wxwidgets-wasm.patch b/patches/wxwidgets-wasm/wxwidgets-wasm.patch deleted file mode 100644 index 558fe6b..0000000 --- a/patches/wxwidgets-wasm/wxwidgets-wasm.patch +++ /dev/null @@ -1,122330 +0,0 @@ -diff --git a/build/aclocal/bakefile.m4 b/build/aclocal/bakefile.m4 -index 240f037a0c..1cc455e1e3 100644 ---- a/build/aclocal/bakefile.m4 -+++ b/build/aclocal/bakefile.m4 -@@ -355,7 +355,8 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD], - *-*-sunos4* | \ - *-*-osf* | \ - *-*-dgux5* | \ -- *-*-sysv5* ) -+ *-*-sysv5* | \ -+ *-*-emscripten ) - dnl defaults are ok - ;; - -diff --git a/build/wasm/common.mk b/build/wasm/common.mk -new file mode 100644 -index 0000000000..6b6545ff40 ---- /dev/null -+++ b/build/wasm/common.mk -@@ -0,0 +1,228 @@ -+WASM_ARCH ?= wasm32 -+ARCH = $(WASM_ARCH) -+CONFIG ?= Release -+EMSCRIPTEN := $(HOME)/emsdk/$(EMSCRIPTEN_VERSION)-$(ARCH)/emscripten -+ -+HOST_CC ?= clang -+HOST_CFLAGS ?= -W -+HOST_CXX ?= clang++ -+HOST_CXXFLAGS ?= -W -+ -+CC = $(EMSCRIPTEN)/emcc -+CXX = $(EMSCRIPTEN)/em++ -+AR = $(EMSCRIPTEN)/emar -+RANLIB = $(EMSCRIPTEN)/emranlib -+LD = $(EMSCRIPTEN)/emcc -+ -+RM ?= rm -+CP ?= cp -+MKDIR ?= mkdir -+MV ?= mv -+ -+# -+# Top Make file, which we want to trigger a rebuild on if it changes -+# -+TOP_MAKE := $(word 1,$(MAKEFILE_LIST)) -+ -+ -+# -+# The default target -+# -+# If no targets are specified on the command-line, the first target listed in -+# the makefile becomes the default target. By convention this is usually called -+# the 'all' target. Here we leave it blank to be first, but define it later -+# -+all: -+.PHONY: all -+ -+ -+# -+# The install target is used to install built libraries to thier final destination. -+# -+install: -+.PHONY: install -+ -+ -+OUTBASE ?= . -+CONFIG_DIR := $(ARCH)/$(CONFIG) -+OUTDIR := $(OUTBASE)/$(CONFIG_DIR) -+STAMPDIR ?= $(OUTDIR) -+LIBDIR ?= $(EMSCRIPTEN)/lib -+ -+ -+# -+# Target to remove temporary files -+# -+.PHONY: clean -+clean: -+ $(RM) -rf $(OUTDIR) -+ -+ -+# -+# Rules for output directories. -+# -+# Output will be places in a directory name based on Toolchain and configuration -+# be default this will be "newlib/Debug". We use a python wrapped MKDIR to -+# proivde a cross platform solution. The use of '|' checks for existance instead -+# of timestamp, since the directory can update when files change. -+# -+%dir.stamp : -+ $(call LOG,MKDIR,$@,$(MKDIR) -p $(dir $@)) -+ @echo Directory Stamp > $@ -+ -+ -+# -+# Common Compile Options -+# -+ -+ifeq ($(CONFIG),Release) -+EMSCRIPTEN_CFLAGS ?= -O3 -I${EMSCRIPTEN}/system/local/include -+EMSCRIPTEN_CXXFLAGS ?= -O3 -I${EMSCRIPTEN}/system/local/include -+EMSCRIPTEN_LDFLAGS ?= -O1 -L$(EMSCRIPTEN)/system/local/lib -+else -+EMSCRIPTEN_CFLAGS ?= -O0 -g -+EMSCRIPTEN_CXXFLAGS ?= -O0 -g -+EMSCRIPTEN_LDFLAGS ?= -O0 -g -+endif -+ -+EMSCRIPTEN_LDFLAGS += -s ERROR_ON_UNDEFINED_SYMBOLS=0 -+ -+# -+# Default Paths -+# -+INC_PATHS := $(EXTRA_INC_PATHS) -+LIB_PATHS := $(NACL_SDK_ROOT)/lib $(EXTRA_LIB_PATHS) -+ -+ -+# Define a LOG macro that allow a command to be run in quiet mode where -+# the command echoed is not the same as the actual command executed. -+# The primary use case for this is to avoid echoing the full compiler -+# and linker command in the default case. Defining V=1 will restore -+# the verbose behavior -+# -+# $1 = The name of the tool being run -+# $2 = The target file being built -+# $3 = The full command to run -+# -+ifdef V -+define LOG -+$(3) -+endef -+else -+ifeq ($(OSNAME),win) -+define LOG -+@echo $(1) $(2) && $(3) -+endef -+else -+define LOG -+@echo " $(1) $(2)" && $(3) -+endef -+endif -+endif -+ -+ -+# -+# Convert a source path to a object file path. -+# If source path is absolute then just use the basename of for the object -+# file name (absolute sources paths with the same basename are not allowed). -+# For relative paths use the full path to the source in the object file path -+# name. -+# -+# $1 = Source Name -+# $2 = Arch suffix -+# -+define SRC_TO_OBJ -+$(if $(filter /%,$(1)), $(OUTDIR)/$(basename $(notdir $(1)))$(2).o, $(OUTDIR)/$(basename $(subst ..,__,$(1)))$(2).o) -+endef -+ -+ -+# -+# Convert a source path to a dependency file path. -+# We use the .deps extension for dependencies. These files are generated by -+# fix_deps.py based on the .d files which gcc generates. We don't reference -+# the .d files directly so that we can avoid the the case where the compile -+# failed but still generated a .d file (in that case the .d file would not -+# be processed by fix_deps.py) -+# -+# $1 = Source Name -+# $2 = Arch suffix -+# -+define SRC_TO_DEP -+$(patsubst %.o,%.deps,$(call SRC_TO_OBJ,$(1),$(2))) -+endef -+ -+# -+# Copy Macro -+# -+# $1 = Source file name -+# -+define COPY_RULE -+$(OUTDIR)/$(1): $(1) $(OUTDIR)/$(dir $(1))dir.stamp -+ $(call LOG,CP ,$$@,$(CP) $(1) $$@) -+endef -+ -+# -+# Compile Macro -+# -+# $1 = Source name -+# $2 = Compile flags -+# $3 = Include directories -+# -+define C_COMPILER_RULE -+-include $(call SRC_TO_DEP,$(1)) -+$(call SRC_TO_OBJ,$(1)): $(1) $(TOP_MAKE) | $(dir $(call SRC_TO_OBJ,$(1)))dir.stamp -+ $(call LOG,CC ,$$@,$(CC) -o $$@ -c $$< $(EMSCRIPTEN_CFLAGS) $(CFLAGS) $(2)) -+endef -+ -+define CXX_COMPILER_RULE -+-include $(call SRC_TO_DEP,$(1)) -+$(call SRC_TO_OBJ,$(1)): $(1) $(TOP_MAKE) | $(dir $(call SRC_TO_OBJ,$(1)))dir.stamp -+ $(call LOG,CXX ,$$@,$(CXX) -o $$@ -c $$< $(EMSCRIPTEN_CFLAGS) $(CXXFLAGS) $(2)) -+endef -+ -+ -+# $1 = Source Name -+# $2 = POSIX Compile Flags -+# $3 = Include Directories -+define COMPILE_RULE -+ifeq ($(suffix $(1)),.c) -+$(call C_COMPILER_RULE,$(1),$(2) $(foreach inc,$(INC_PATHS),-I$(inc)) $(3)) -+else -+$(call CXX_COMPILER_RULE,$(1),$(2) $(foreach inc,$(INC_PATHS),-I$(inc)) $(3)) -+endif -+endef -+ -+ -+# -+# Specific Link Macro -+# -+# $1 = Target Name -+# $2 = List of inputs -+# $3 = List of libs -+# $4 = List of lib dirs -+# $5 = Other Linker Args -+# $6 = List of pre-js files -+# $7 = List of files to copy -+# $8 = HTML template -+# -+define LINKER_RULE -+all: $(1).html -+$(1).html: $(2) $(foreach file,$(7),$(OUTDIR)/$(file)) -+ $(call LOG,LD ,$$@,$(CC) -o $$@ -o $$@ $(2) $(EMSCRIPTEN_LDFLAGS) $(LDFLAGS) $(foreach path,$(5),-L$(path)) $(foreach lib,$(3),-l$(lib)) $(4) $(foreach js,$(6),--pre-js $(js)) --shell-file $(8)) -+endef -+ -+# -+# Generalized Target Macro -+# -+# $1 = Target Name -+# $2 = List of Sources -+# $3 = List of LIBS -+# $4 = POSIX Linker Switches -+# $5 - List of pre-js files -+# $6 - HTML template -+# -+define TARGET_RULE -+$(foreach src,$(2),$(eval $(call COMPILE_RULE,$(src),$(CXXFLAGS),$(EXTRA_INC_PATHS)))) -+$(foreach asset,$(6),$(eval $(call COPY_RULE,$(asset)))) -+$(call LINKER_RULE,$(OUTDIR)/$(1),$(foreach src,$(2),$(call SRC_TO_OBJ,$(src))),$(3),$(4),$(LIB_PATHS),$(5),,$(6)) -+endef -diff --git a/build/wasm/httpd.py b/build/wasm/httpd.py -new file mode 100644 -index 0000000000..04745b411a ---- /dev/null -+++ b/build/wasm/httpd.py -@@ -0,0 +1,324 @@ -+#!/usr/bin/env python2 -+# Copyright (c) 2012 The Chromium Authors. All rights reserved. -+# Use of this source code is governed by a BSD-style license that can be -+# found in the LICENSE file. -+ -+import BaseHTTPServer -+import imp -+import logging -+import mimetypes -+import multiprocessing -+import optparse -+import os -+import posixpath -+import SimpleHTTPServer # pylint: disable=W0611 -+import socket -+import sys -+import time -+import urlparse -+ -+if sys.version_info < (2, 6, 0): -+ sys.stderr.write("python 2.6 or later is required run this script\n") -+ sys.exit(1) -+ -+ -+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) -+ -+ -+class PluggableHTTPServer(BaseHTTPServer.HTTPServer): -+ def __init__(self, *args, **kwargs): -+ BaseHTTPServer.HTTPServer.__init__(self, *args) -+ self.serve_dir = kwargs.get('serve_dir', '.') -+ self.test_mode = kwargs.get('test_mode', False) -+ self.delegate_map = {} -+ self.running = True -+ self.result = 0 -+ -+ def Shutdown(self, result=0): -+ self.running = False -+ self.result = result -+ -+ -+class PluggableHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): -+ if not mimetypes.inited: -+ mimetypes.init() # try to read system mime.types -+ extensions_map = mimetypes.types_map.copy() -+ extensions_map.update({ -+ '': 'application/octet-stream', # Default -+ '.wasm': 'application/wasm', -+ '.py': 'text/plain', -+ '.c': 'text/plain', -+ '.h': 'text/plain', -+ }) -+ -+ def guess_type(self, path): -+ base, ext = posixpath.splitext(path) -+ if ext in self.extensions_map: -+ return self.extensions_map[ext] -+ ext = ext.lower() -+ if ext in self.extensions_map: -+ return self.extensions_map[ext] -+ else: -+ return self.extensions_map[''] -+ -+ def _FindDelegateAtPath(self, dirname): -+ # First check the cache... -+ logging.debug('Looking for cached delegate in %s...' % dirname) -+ handler_script = os.path.join(dirname, 'handler.py') -+ -+ if dirname in self.server.delegate_map: -+ result = self.server.delegate_map[dirname] -+ if result is None: -+ logging.debug('Found None.') -+ else: -+ logging.debug('Found delegate.') -+ return result -+ -+ # Don't have one yet, look for one. -+ delegate = None -+ logging.debug('Testing file %s for existence...' % handler_script) -+ if os.path.exists(handler_script): -+ logging.debug( -+ 'File %s exists, looking for HTTPRequestHandlerDelegate.' % -+ handler_script) -+ -+ module = imp.load_source('handler', handler_script) -+ delegate_class = getattr(module, 'HTTPRequestHandlerDelegate', None) -+ delegate = delegate_class() -+ if not delegate: -+ logging.warn( -+ 'Unable to find symbol HTTPRequestHandlerDelegate in module %s.' % -+ handler_script) -+ -+ return delegate -+ -+ def _FindDelegateForURLRecurse(self, cur_dir, abs_root): -+ delegate = self._FindDelegateAtPath(cur_dir) -+ if not delegate: -+ # Didn't find it, try the parent directory, but stop if this is the server -+ # root. -+ if cur_dir != abs_root: -+ parent_dir = os.path.dirname(cur_dir) -+ delegate = self._FindDelegateForURLRecurse(parent_dir, abs_root) -+ -+ logging.debug('Adding delegate to cache for %s.' % cur_dir) -+ self.server.delegate_map[cur_dir] = delegate -+ return delegate -+ -+ def _FindDelegateForURL(self, url_path): -+ path = self.translate_path(url_path) -+ if os.path.isdir(path): -+ dirname = path -+ else: -+ dirname = os.path.dirname(path) -+ -+ abs_serve_dir = os.path.abspath(self.server.serve_dir) -+ delegate = self._FindDelegateForURLRecurse(dirname, abs_serve_dir) -+ if not delegate: -+ print('No handler found for path %s. Using default.' % url_path) -+ logging.info('No handler found for path %s. Using default.' % url_path) -+ return delegate -+ -+ def _SendNothingAndDie(self, result=0): -+ self.send_response(200, 'OK') -+ self.send_header('Content-type', 'text/html') -+ self.send_header('Content-length', '0') -+ self.end_headers() -+ self.server.Shutdown(result) -+ -+ def end_headers(self): -+ self.send_header('Cross-Origin-Opener-Policy', 'same-origin') -+ self.send_header('Cross-Origin-Embedder-Policy', 'require-corp') -+ -+ SimpleHTTPServer.SimpleHTTPRequestHandler.end_headers(self) -+ -+ def send_head(self): -+ delegate = self._FindDelegateForURL(self.path) -+ if delegate: -+ return delegate.send_head(self) -+ return self.base_send_head() -+ -+ def base_send_head(self): -+ return SimpleHTTPServer.SimpleHTTPRequestHandler.send_head(self) -+ -+ def do_GET(self): -+ # TODO(binji): pyauto tests use the ?quit=1 method to kill the server. -+ # Remove this when we kill the pyauto tests. -+ _, _, _, query, _ = urlparse.urlsplit(self.path) -+ if query: -+ params = urlparse.parse_qs(query) -+ if '1' in params.get('quit', []): -+ self._SendNothingAndDie() -+ return -+ -+ delegate = self._FindDelegateForURL(self.path) -+ if delegate: -+ return delegate.do_GET(self) -+ return self.base_do_GET() -+ -+ def base_do_GET(self): -+ return SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self) -+ -+ def do_POST(self): -+ delegate = self._FindDelegateForURL(self.path) -+ if delegate: -+ return delegate.do_POST(self) -+ return self.base_do_POST() -+ -+ def base_do_POST(self): -+ if self.server.test_mode: -+ if self.path == '/ok': -+ self._SendNothingAndDie(0) -+ elif self.path == '/fail': -+ self._SendNothingAndDie(1) -+ -+ -+class LocalHTTPServer(object): -+ """Class to start a local HTTP server as a child process.""" -+ -+ def __init__(self, dirname, port, test_mode): -+ parent_conn, child_conn = multiprocessing.Pipe() -+ self.process = multiprocessing.Process( -+ target=_HTTPServerProcess, -+ args=(child_conn, dirname, port, { -+ 'serve_dir': dirname, -+ 'test_mode': test_mode, -+ })) -+ self.process.start() -+ if parent_conn.poll(10): # wait 10 seconds -+ self.port = parent_conn.recv() -+ else: -+ raise Exception('Unable to launch HTTP server.') -+ -+ self.conn = parent_conn -+ -+ def ServeForever(self): -+ """Serve until the child HTTP process tells us to stop. -+ -+ Returns: -+ The result from the child (as an errorcode), or 0 if the server was -+ killed not by the child (by KeyboardInterrupt for example). -+ """ -+ child_result = 0 -+ try: -+ # Block on this pipe, waiting for a response from the child process. -+ child_result = self.conn.recv() -+ except KeyboardInterrupt: -+ pass -+ finally: -+ self.Shutdown() -+ return child_result -+ -+ def ServeUntilSubprocessDies(self, process): -+ """Serve until the child HTTP process tells us to stop or |subprocess| dies. -+ -+ Returns: -+ The result from the child (as an errorcode), or 0 if |subprocess| died, -+ or the server was killed some other way (by KeyboardInterrupt for -+ example). -+ """ -+ child_result = 0 -+ try: -+ while True: -+ if process.poll() is not None: -+ child_result = 0 -+ break -+ if self.conn.poll(): -+ child_result = self.conn.recv() -+ break -+ time.sleep(0) -+ except KeyboardInterrupt: -+ pass -+ finally: -+ self.Shutdown() -+ return child_result -+ -+ def Shutdown(self): -+ """Send a message to the child HTTP server process and wait for it to -+ finish.""" -+ self.conn.send(False) -+ self.process.join() -+ -+ def GetURL(self, rel_url): -+ """Get the full url for a file on the local HTTP server. -+ -+ Args: -+ rel_url: A URL fragment to convert to a full URL. For example, -+ GetURL('foobar.baz') -> 'http://localhost:1234/foobar.baz' -+ """ -+ return 'http://localhost:%d/%s' % (self.port, rel_url) -+ -+ -+def _HTTPServerProcess(conn, dirname, port, server_kwargs): -+ """Run a local httpserver with the given port or an ephemeral port. -+ -+ This function assumes it is run as a child process using multiprocessing. -+ -+ Args: -+ conn: A connection to the parent process. The child process sends -+ the local port, and waits for a message from the parent to -+ stop serving. It also sends a "result" back to the parent -- this can -+ be used to allow a client-side test to notify the server of results. -+ dirname: The directory to serve. All files are accessible through -+ http://localhost:/path/to/filename. -+ port: The port to serve on. If 0, an ephemeral port will be chosen. -+ server_kwargs: A dict that will be passed as kwargs to the server. -+ """ -+ try: -+ os.chdir(dirname) -+ httpd = PluggableHTTPServer(('', port), PluggableHTTPRequestHandler, -+ **server_kwargs) -+ except socket.error as e: -+ sys.stderr.write('Error creating HTTPServer: %s\n' % e) -+ sys.exit(1) -+ -+ try: -+ conn.send(httpd.server_address[1]) # the chosen port number -+ httpd.timeout = 0.5 # seconds -+ while httpd.running: -+ # Flush output for MSVS Add-In. -+ sys.stdout.flush() -+ sys.stderr.flush() -+ httpd.handle_request() -+ if conn.poll(): -+ httpd.running = conn.recv() -+ except KeyboardInterrupt: -+ pass -+ finally: -+ conn.send(httpd.result) -+ conn.close() -+ -+ -+def main(args): -+ parser = optparse.OptionParser() -+ parser.add_option('-C', '--serve-dir', -+ help='Serve files out of this directory.', -+ default=os.path.abspath('.')) -+ parser.add_option('-p', '--port', -+ help='Run server on this port.', default=5103) -+ parser.add_option('--test-mode', -+ help='Listen for posts to /ok or /fail and shut down the server with ' -+ ' errorcodes 0 and 1 respectively.', -+ action='store_true') -+ -+ # To enable bash completion for this command first install optcomplete -+ # and then add this line to your .bashrc: -+ # complete -F _optcomplete httpd.py -+ try: -+ import optcomplete -+ optcomplete.autocomplete(parser) -+ except ImportError: -+ pass -+ -+ options, args = parser.parse_args(args) -+ -+ server = LocalHTTPServer(options.serve_dir, int(options.port), -+ options.test_mode) -+ -+ # Serve until the client tells us to stop. When it does, it will give us an -+ # errorcode. -+ print 'Serving %s on %s...' % (options.serve_dir, server.GetURL('')) -+ return server.ServeForever() -+ -+if __name__ == '__main__': -+ sys.exit(main(sys.argv[1:])) -diff --git a/build/wasm/template.html b/build/wasm/template.html -new file mode 100644 -index 0000000000..a92c327cf7 ---- /dev/null -+++ b/build/wasm/template.html -@@ -0,0 +1,114 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+
Loading...
-+
-+
-+
-+
-+
-+ -+
-+ -+ -+ {{{ SCRIPT }}} -+ -+ -diff --git a/build/wasm/wx.js b/build/wasm/wx.js -new file mode 100644 -index 0000000000..8c38383d20 ---- /dev/null -+++ b/build/wasm/wx.js -@@ -0,0 +1,1253 @@ -+if (typeof navigator !== 'undefined') { -+ var browserInfo = (function () { -+ var ua = navigator.userAgent; -+ -+ var match = -+ /(Opera)(?:.*version|)[ \/]([\w.]+)/.exec(ua) || -+ /(OPR)[ \/]([\w.]+)/.exec(ua) || -+ /(Edge)[ \/]([\w.]+)/.exec(ua) || -+ /(MSIE) ([\w.]+)/.exec(ua) || -+ /(Chrome)[ \/]([\w.]+)/.exec(ua) || -+ /Version[ \/]([\w.]+) (Safari)/.exec(ua) || -+ /(Safari)[ \/]([\w.]+)/.exec(ua) || -+ /(Firefox)[ \/]([\w.]+)/.exec(ua) || -+ ua.indexOf('compatible') < 0 && -+ /(Mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua) || -+ []; -+ -+ if (match[2] === 'Safari') { -+ return { -+ browser: match[2], -+ version: match[1] -+ }; -+ } else { -+ return { -+ browser: match[1] || '', -+ version: match[2] || '0' -+ }; -+ } -+ })(); -+ -+ var isWebkit = function () { -+ return browserInfo.name === 'Chrome' || browserInfo.name === 'Safari'; -+ } -+ -+ var platformInfo = (function () { -+ var ua = navigator.userAgent; -+ -+ var match = -+ /(Windows NT) ([\w.]+)/.exec(ua) || -+ /(Mac OS X) ([\w.]+)/.exec(ua) || -+ /(CrOS) \w+ ([\w.]+)/.exec(ua) || -+ /(iPhone); .* OS ([\d_]+)/.exec(ua) || -+ /(iPad); .* OS ([\d_]+)/.exec(ua); -+ -+ var name = 'unknown'; -+ var version = ''; -+ -+ if (match) { -+ name = match[1]; -+ version = match[2]; -+ } else { -+ var PLATFORMS = ['Android', 'iPhone', 'iPad', 'Windows', 'Macintosh', 'Linux', 'CrOs', 'NetBSD', 'OpenBSD', 'FreeBSD']; -+ -+ for (var i = 0; i < PLATFORMS.length; i++) { -+ if (ua.indexOf(PLATFORMS[i]) !== -1) { -+ name = PLATFORMS[i]; -+ } -+ } -+ } -+ -+ return { -+ name: name, -+ version: version -+ }; -+ })(); -+} -+ -+ var openUrl = function(url) { -+ if (typeof window !== 'undefined') { -+ window.open(url, '_blank'); -+ } -+ }; -+ -+ var setIcon = function(id) { -+ var bitmap = bitmapMap.get(id); -+ -+ var canvas = document.createElement('canvas'); -+ var ctx = canvas.getContext('2d'); -+ canvas.width = bitmap.width; -+ canvas.height = bitmap.height; -+ -+ drawImage(ctx, bitmap, 0, 0); -+ -+ var link = document.querySelector("link[rel*='icon']") || document.createElement('link'); -+ link.type = 'image/png'; -+ link.rel = 'shortcut icon'; -+ link.href = canvas.toDataURL('image/png'); -+ document.getElementsByTagName('head')[0].appendChild(link); -+ }; -+ -+ var displayScaleFactor = null; -+ -+ var getDisplayScaleFactor = function () { -+ if (displayScaleFactor === null) { -+ displayScaleFactor = window.devicePixelRatio >= 1.5 ? 2.0 : 1.0; -+ } -+ return displayScaleFactor; -+ }; -+ -+ /* wxNonOwnedWindow */ -+ -+ var nextWindowId = 0; -+ var windowMap = new Map(); -+ -+ var createWindow = function (id, needsCanvas, isVisible, classList) { -+ //console.log('createWindow: ' + id + ' ' + needsCanvas + ' ' + isVisible); -+ -+ if (id === -1) { -+ id = nextWindowId++; -+ } -+ -+ var window = null; -+ var canvas = null; -+ -+ if (id === 0) { -+ window = document.getElementById('main-window'); -+ canvas = document.getElementById('canvas'); -+ } else { -+ window = document.createElement('div'); -+ window.className = classList; -+ window.id = 'window-' + id; -+ window.style.display = isVisible ? 'block' : 'none'; -+ -+ if (needsCanvas) { -+ canvas = document.createElement('canvas'); -+ canvas.className = 'window-canvas'; -+ window.appendChild(canvas); -+ } -+ -+ document.getElementById('window-container').appendChild(window); -+ } -+ -+ windowMap.set(id, { -+ window: window, -+ canvas: canvas, -+ width: 0, -+ height: 0, -+ imageData: null, -+ context: null -+ }); -+ -+ return id; -+ }; -+ -+ var destroyWindow = function (id) { -+ var windowData = windowMap.get(id); -+ -+ document.getElementById('window-container').removeChild(windowData.window); -+ windowMap.delete(id); -+ }; -+ -+ var setWindowVisibility = function (id, isVisible) { -+ //console.log('setWindowVisibility: ' + id + ': ' + isVisible); -+ -+ var windowData = windowMap.get(id); -+ windowData.window.style.display = isVisible ? 'block' : 'none'; -+ }; -+ -+ var setWindowRect = function (id, x, y, width, height) { -+ //console.log('setWindowRect: ' + id + ' (' + x + ', ' + y + ', ' + width + ', ' + height + ')'); -+ -+ var windowData = windowMap.get(id); -+ -+ var header = document.getElementsByClassName('header')[0]; -+ var headerHeight = header ? header.offsetHeight : 0; -+ -+ var window = windowData.window; -+ window.style.left = x + 'px'; -+ window.style.top = y + headerHeight + 'px'; -+ window.style.width = width + 'px'; -+ window.style.height = height + 'px'; -+ -+ var canvas = windowData.canvas; -+ -+ if (canvas) { -+ var scaleFactor = getDisplayScaleFactor(); -+ -+ canvas.width = width * scaleFactor; -+ canvas.height = height * scaleFactor; -+ canvas.style.width = width + 'px'; -+ canvas.style.height = height + 'px'; -+ -+ windowData.width = canvas.width; -+ windowData.height = canvas.height; -+ -+ if (windowData.width > 0 && windowData.height > 0) { -+ windowData.imageData = new ImageData(windowData.width, windowData.height); -+ } else { -+ windowData.imageData = null; -+ } -+ -+ var ctx = canvas.getContext('2d'); -+ ctx.lineJoin = "round"; -+ ctx.lineCap = "round"; -+ ctx.imageSmoothingEnabled = false; -+ ctx.textBaseline = 'alphabetic'; -+ ctx.depth = 0; -+ ctx.stack = []; -+ -+ windowData.context = ctx; -+ } -+ }; -+ -+ var setWindowZIndex = function (id, zIndex) { -+ //console.log('setWindowZIndex: ' + id + ': ' + zIndex); -+ -+ var windowData = windowMap.get(id); -+ windowData.window.style.zIndex = zIndex; -+ }; -+ -+ var raiseWindow = function (id) { -+ var maxZ = 0; -+ -+ for (const windowId of windowMap.keys()) { -+ var windowData = windowMap[windowId]; -+ if (windowId !== id && windowData) { -+ var style = document.defaultView.getComputedStyle(windowData.window); -+ var zIndex = parseInt(style.getPropertyValue('z-index'), 10); -+ if (!isNaN(zIndex)) { -+ maxZ = Math.max(maxZ, zIndex); -+ } -+ } -+ } -+ -+ setWindowZIndex(id, maxZ + 1); -+ }; -+ -+ var lowerWindow = function (id) { -+ var minZ = 0; -+ -+ for (const windowId of windowMap.keys()) { -+ var windowData = windowMap[windowId]; -+ if (windowId !== id && windowData) { -+ var style = document.defaultView.getComputedStyle(windowData.window); -+ var zIndex = parseInt(style.getPropertyValue('z-index'), 10); -+ if (!isNaN(zIndex)) { -+ minZ = Math.min(minZ, zIndex); -+ } -+ } -+ } -+ -+ setWindowZIndex(id, minZ - 1); -+ }; -+ -+ /* wxColour */ -+ -+ var formatHexString = function (n) { -+ var hexString = n.toString(16); -+ while (hexString.length < 8) { -+ hexString = '0' + hexString; -+ } -+ return hexString; -+ }; -+ -+ var makeColorString = function (color) { -+ var a = (color >> 24) & 0xff; -+ var b = (color >> 16) & 0xff; -+ var g = (color >> 8) & 0xff; -+ var r = color & 0xff; -+ return 'rgba(' + r + ',' + g + ',' + b + ',' + a / 255.0 + ')'; -+ //return '#' + formatHexString(color); -+ }; -+ -+ /* wxBitmap */ -+ -+ var nextBitmapId = 0; -+ var bitmapMap = new Map(); -+ -+ var createBitmap = function (x, y, width, height, data, scaleFactor) { -+ //console.log('setWindowImageData: ' + id + ': ' + '(' + x + ', ' + y + ') ' + width + 'x' + height); -+ -+ var id = nextBitmapId++; -+ setBitmapData(id, x, y, width, height, data, scaleFactor); -+ -+ return id; -+ }; -+ -+ var destroyBitmap = function (id) { -+ bitmapMap.delete(id); -+ }; -+ -+ var getBitmapData = function (id, data) { -+ var bitmap = bitmapMap.get(id); -+ -+ var imageData; -+ -+ if (bitmap.context) { -+ imageData = bitmap.context.getImageData(0, 0, bitmap.width, bitmap.height); -+ bitmap.context = null; -+ } else { -+ imageData = bitmap.imageData; -+ } -+ -+ bitmap.imageBitmap = null; -+ -+ Module.HEAPU8.set(imageData.data, data); -+ }; -+ -+ var setBitmapData = function (id, width, height, data, scaleFactor) { -+ var size = 4 * width * height; -+ var array = new Uint8ClampedArray(Module.HEAPU8.buffer, data, size); -+ var imageData = new ImageData(width, height); -+ imageData.data.set(array); -+ -+ var bitmap = { -+ data: data, -+ size: size, -+ width: width, -+ height: height, -+ scaleFactor: scaleFactor, -+ imageData: imageData, -+ imageBitmap: null, -+ context: null -+ }; -+ -+ bitmapMap.set(id, bitmap); -+ -+ createImageBitmap(imageData, 0, 0, width, height).then(function (imageBitmap) { -+ // TODO: fix race condition -+ var bitmap = bitmapMap.get(id); -+ if (bitmap && !bitmap.context) { -+ bitmap.imageBitmap = imageBitmap; -+ } -+ }) -+ }; -+ -+ /* wxDC */ -+ -+ var nextContextId = 0; -+ var contextMap = new Map(); -+ -+ var createOffscreenContext = function (width, height) { -+ var canvas = null; -+ -+ if (typeof OffscreenCanvas !== 'undefined') { -+ canvas = new OffscreenCanvas(width, height); -+ } else if (typeof document !== 'undefined' && 'createElement' in document) { -+ canvas = document.createElement('canvas'); -+ canvas.width = width; -+ canvas.height = height; -+ } -+ -+ if (canvas !== null) { -+ var ctx = canvas.getContext('2d'); -+ ctx.lineJoin = "round"; -+ ctx.lineCap = "round"; -+ ctx.imageSmoothingEnabled = false; -+ ctx.textBaseline = 'alphabetic'; -+ return ctx; -+ } else { -+ return null; -+ } -+ }; -+ -+ var offscreenContext = createOffscreenContext(1, 1); -+ -+ var pushContext = function (ctx) { -+ var saveCtx = { -+ x: ctx.x, -+ y: ctx.y, -+ width: ctx.width, -+ height: ctx.height, -+ scaleFactor: ctx.scaleFactor, -+ isInitialized: ctx.isInitialized -+ }; -+ -+ if (ctx.isInitialized) { -+ saveCtx.font = ctx.font, -+ saveCtx.lineWidth = ctx.lineWidth, -+ saveCtx.lineJoin = ctx.lineJoin, -+ saveCtx.lineCap = ctx.lineCap, -+ saveCtx.fillStyle = ctx.fillStyle, -+ saveCtx.strokeStyle = ctx.strokeStyle -+ saveCtx.dashCount = ctx.dashCount; -+ -+ if (saveCtx.dashCount > 0) { -+ saveCtx.setLineDash(ctx.getLineDash()); -+ } -+ -+ ctx.restore(); -+ ctx.save(); -+ } -+ -+ ctx.stack.push(saveCtx); -+ }; -+ -+ var popContext = function (ctx) { -+ var restoreCtx = ctx.stack.pop(); -+ -+ ctx.x = restoreCtx.x; -+ ctx.y = restoreCtx.y; -+ ctx.width = restoreCtx.width; -+ ctx.height = restoreCtx.height; -+ ctx.scaleFactor = restoreCtx.scaleFactor; -+ ctx.isInitialized = restoreCtx.isInitialized; -+ -+ if (ctx.isInitialized) { -+ ctx.restore(); -+ ctx.save(); -+ -+ ctx.font = restoreCtx.font; -+ ctx.lineWidth = restoreCtx.lineWidth; -+ ctx.lineJoin = restoreCtx.lineJoin; -+ ctx.lineCap = restoreCtx.lineCap; -+ ctx.fillStyle = restoreCtx.fillStyle; -+ ctx.strokeStyle = restoreCtx.strokeStyle; -+ ctx.dashCount = restoreCtx.dashCount; -+ -+ if (ctx.dashCount > 0) { -+ ctx.setLineDash(restoreCtx.getLineDash()); -+ } -+ -+ // TODO: save/restore clip -+ ctx.beginPath(); -+ ctx.rect(0, 0, ctx.width, ctx.height); -+ ctx.clip(); -+ } -+ }; -+ -+ var createWindowContext = function (windowId, x, y, width, height, scaleFactor) { -+ var id = nextContextId++; -+ //console.log('createWindowContext: ' + windowId + ' ' + x + ' ' + y + ' ' + width + ' ' + height); -+ -+ var windowData = windowMap.get(windowId); -+ var ctx = windowData.context; -+ -+ if (ctx.depth > 0) { -+ pushContext(ctx); -+ } -+ -+ ctx.x = x; -+ ctx.y = y; -+ ctx.width = width; -+ ctx.height = height; -+ ctx.scaleFactor = scaleFactor; -+ ctx.isInitialized = false; -+ ctx.depth++; -+ -+ contextMap.set(id, ctx); -+ -+ return id; -+ }; -+ -+ var destroyWindowContext = function (id) { -+ var ctx = contextMap.get(id); -+ -+ if (ctx.isInitialized) { -+ ctx.restore(); -+ } -+ -+ if (ctx.depth > 1) { -+ popContext(ctx); -+ } -+ -+ ctx.depth--; -+ -+ //console.log('destroyContext: ' + id + ' ' + ctx.width + ' ' + ctx.height); -+ contextMap.delete(id); -+ }; -+ -+ var createMemoryContext = function (bitmapId, scaleFactor) { -+ var contextId = nextContextId++; -+ var bitmap = bitmapMap.get(bitmapId); -+ -+ var ctx = createOffscreenContext(bitmap.width, bitmap.height); -+ -+ ctx.x = 0; -+ ctx.y = 0; -+ ctx.width = bitmap.width / scaleFactor; -+ ctx.height = bitmap.height / scaleFactor; -+ ctx.scaleFactor = scaleFactor; -+ ctx.dashCount = 0; -+ ctx.isInitialized = true; -+ ctx.depth = 0; -+ ctx.stack = []; -+ -+ ctx.scale(scaleFactor, scaleFactor); -+ -+ contextMap.set(contextId, ctx); -+ -+ drawImage(ctx, bitmap, 0, 0); -+ -+ bitmap.imageData = null; -+ bitmap.imageBitmap = null; -+ bitmap.context = ctx; -+ -+ return contextId; -+ }; -+ -+ var destroyMemoryContext = function (contextId) { -+ //console.log('deselectBitmap: ' + contextId); -+ contextMap.delete(contextId); -+ }; -+ -+ var getContext = function (id) { -+ var ctx = contextMap.get(id); -+ -+ if (!ctx.isInitialized) { -+ // scale and translate(x, y) -+ var x = ctx.x; -+ var y = ctx.y; -+ var scaleFactor = ctx.scaleFactor; -+ -+ -+ ctx.setTransform(scaleFactor, 0, 0, scaleFactor, scaleFactor * x, scaleFactor * y); -+ -+ ctx.save(); -+ -+ ctx.beginPath(); -+ ctx.rect(0, 0, ctx.width, ctx.height); -+ ctx.clip() -+ -+ ctx.dashCount = 0; -+ ctx.isInitialized = true; -+ } -+ -+ return ctx; -+ }; -+ -+ var setFont = function (id, font) { -+ var ctx = getContext(id); -+ ctx.font = font; -+ }; -+ -+ var createPattern = function (contextId, bitmapId) { -+ var ctx = getContext(contextId); -+ var bitmap = bitmapMap.get(bitmapId); -+ var source; -+ -+ if (bitmap.imageBitmap) { -+ source = bitmap.imageBitmap; -+ } else if (bitmap.context) { -+ source = bitmap.context.canvas; -+ } else { -+ offscreenContext.canvas.width = bitmap.width; -+ offscreenContext.canvas.height = bitmap.height; -+ offscreenContext.putImageData(bitmap.imageData, 0, 0); -+ source = offscreenContext.canvas; -+ } -+ -+ return ctx.createPattern(source, 'repeat'); -+ }; -+ -+ var setBrush = function (contextId, color, bitmapId) { -+ var ctx = getContext(contextId); -+ -+ if (bitmapId === -1 || typeof bitmapId === 'undefined') { -+ ctx.fillStyle = makeColorString(color); -+ } else { -+ ctx.fillStyle = createPattern(contextId, bitmapId); -+ } -+ }; -+ -+ var lineJoinMap = [ -+ 'round', -+ 'bevel', -+ 'miter' -+ ]; -+ -+ var lineCapMap = [ -+ 'butt', -+ 'round', -+ 'square' -+ ]; -+ -+ var setPen = function (contextId, color, lineWidth, lineJoin, lineCap, dashCount, dashPtr, bitmapId) { -+ var ctx = getContext(contextId); -+ -+ ctx.lineWidth = lineWidth; -+ ctx.lineJoin = lineJoinMap[lineJoin]; -+ ctx.lineCap = lineCapMap[lineCap]; -+ -+ if (bitmapId === -1 || typeof bitmapId === 'undefined') { -+ ctx.strokeStyle = makeColorString(color); -+ } else { -+ ctx.strokeStyle = createPattern(contextId, bitmapId); -+ } -+ -+ ctx.dashCount = dashCount; -+ var dashes = []; -+ for (var i = 0; i < dashCount; i++) { -+ dashes.push(Module.HEAP8[dashPtr + i]); -+ } -+ ctx.setLineDash(dashes); -+ }; -+ -+ var resetClip = function (ctx) { -+ var font = ctx.font; -+ var lineWidth = ctx.lineWidth; -+ var lineJoin = ctx.lineJoin; -+ var lineCap = ctx.lineCap; -+ var fillStyle = ctx.fillStyle; -+ var strokeStyle = ctx.strokeStyle; -+ -+ ctx.restore(); -+ ctx.save(); -+ -+ ctx.font = font; -+ ctx.lineWidth = lineWidth; -+ ctx.lineJoin = lineJoin; -+ ctx.lineCap = lineCap; -+ ctx.fillStyle = fillStyle; -+ ctx.strokeStyle = strokeStyle; -+ }; -+ -+ var clipRect = function (id, x, y, width, height) { -+ //console.log('clipRect: ' + x + ' ' + y + ' ' + width + ' ' + height); -+ var ctx = getContext(id); -+ -+ resetClip(ctx); -+ -+ ctx.beginPath(); -+ ctx.rect(x, y, width, height); -+ ctx.clip(); -+ }; -+ -+ var destroyClip = function (id) { -+ var ctx = getContext(id); -+ -+ resetClip(ctx); -+ -+ ctx.beginPath(); -+ ctx.rect(0, 0, ctx.width, ctx.height); -+ ctx.clip(); -+ }; -+ -+ var clearRect = function (id, width, height, color) { -+ var ctx = getContext(id); -+ -+ var saveFillStyle = ctx.fillStyle; -+ ctx.fillStyle = makeColorString(color); -+ // TODO: save/restore clip -+ -+ ctx.fillRect(0, 0, width, height); -+ ctx.fillStyle = saveFillStyle; -+ }; -+ -+ var drawRect = function (id, x, y, width, height, fill, stroke) { -+ var ctx = getContext(id); -+ -+ if (fill) { -+ ctx.fillRect(x, y, width, height); -+ } -+ -+ if (stroke) { -+ ctx.strokeRect(x, y, width, height); -+ } -+ }; -+ -+ var drawRoundedRect = function (id, x, y, width, height, radius, fill, stroke) { -+ var ctx = getContext(id); -+ -+ ctx.beginPath(); -+ ctx.moveTo(x + radius, y); -+ ctx.lineTo(x + width - radius, y); -+ ctx.arcTo(x + width, y, x + width, y + radius, radius); -+ ctx.lineTo(x + width, y + height - radius); -+ ctx.arcTo(x + width, y + height, x + width - radius, y + height, radius); -+ ctx.lineTo(x + radius, y + height); -+ ctx.arcTo(x, y + height, x, y + height - radius, radius); -+ ctx.lineTo(x, y + radius); -+ ctx.arcTo(x, y, x + radius, y, radius); -+ ctx.closePath(); -+ -+ if (fill) { -+ ctx.fill(); -+ } -+ -+ if (stroke) { -+ ctx.stroke(); -+ } -+ }; -+ -+ var drawEllipse = function (id, x, y, width, height, fill, stroke) { -+ var ctx = getContext(id); -+ -+ var radiusX = width / 2.0; -+ var radiusY = height / 2.0; -+ var cx = x + radiusX; -+ var cy = y + radiusY -+ -+ ctx.beginPath(); -+ ctx.ellipse(cx, cy, radiusX, radiusY, 0.0, 0.0, 2 * Math.PI); -+ -+ if (fill) { -+ ctx.fill(); -+ } -+ -+ if (stroke) { -+ ctx.stroke(); -+ } -+ }; -+ -+ var drawArc = function (id, x, y, radius, startAngle, endAngle, fill, stroke) { -+ var ctx = getContext(id); -+ -+ ctx.beginPath(); -+ ctx.moveTo(x, y); -+ ctx.arc(x, y, radius, startAngle, endAngle, true); -+ -+ if (fill) { -+ ctx.fill(); -+ } -+ -+ if (stroke) { -+ ctx.stroke(); -+ } -+ }; -+ -+ var drawEllipticArc = function (id, x, y, width, height, startDegrees, endDegrees, fill, stroke) { -+ var ctx = getContext(id); -+ -+ var radiusX = width / 2.0; -+ var radiusY = height / 2.0; -+ var cx = x + radiusX; -+ var cy = y + radiusY; -+ var startRadians = -startDegrees * (Math.PI / 180.0); -+ var endRadians = -endDegrees * (Math.PI / 180.0); -+ -+ if (fill) { -+ ctx.beginPath(); -+ ctx.ellipse(cx, cy, radiusX, radiusY, 0.0, startRadians, endRadians, true); -+ ctx.lineTo(cx, cy); -+ ctx.fill(); -+ } -+ -+ if (stroke) { -+ ctx.beginPath(); -+ ctx.ellipse(cx, cy, radiusX, radiusY, 0.0, startRadians, endRadians, true); -+ ctx.stroke(); -+ } -+ }; -+ -+ var drawPoint = function (id, x, y) { -+ var ctx = getContext(id); -+ ctx.strokeRect(x, y, 1e-6, 1e-6); -+ }; -+ -+ var drawLine = function (id, x1, y1, x2, y2) { -+ var ctx = getContext(id); -+ -+ ctx.beginPath(); -+ ctx.moveTo(x1, y1); -+ ctx.lineTo(x2, y2); -+ -+ ctx.stroke(); -+ }; -+ -+ var drawLines = function (id, n, ptr) { -+ var ctx = getContext(id); -+ -+ if (n > 0) { -+ var index = ptr >> 2; -+ var x = Module.HEAP32[index++]; -+ var y = Module.HEAP32[index++]; -+ -+ ctx.beginPath(); -+ ctx.moveTo(x, y); -+ -+ for (var i = 1; i < n; i++) { -+ x = Module.HEAP32[index++]; -+ y = Module.HEAP32[index++]; -+ ctx.lineTo(x, y); -+ } -+ -+ ctx.stroke(); -+ } -+ }; -+ -+ var drawPolygon = function (id, n, ptr, fillEvenOdd, fill, stroke) { -+ var ctx = getContext(id); -+ -+ if (n > 0) { -+ var index = ptr >> 2; -+ var x = Module.HEAP32[index++]; -+ var y = Module.HEAP32[index++]; -+ -+ ctx.beginPath(); -+ ctx.moveTo(x, y); -+ -+ for (var i = 1; i < n; i++) { -+ x = Module.HEAP32[index++]; -+ y = Module.HEAP32[index++]; -+ ctx.lineTo(x, y); -+ } -+ -+ ctx.closePath(); -+ -+ if (fill) { -+ ctx.fill(fillEvenOdd ? 'evenodd' : 'nonzero'); -+ } -+ -+ if (stroke) { -+ ctx.stroke(); -+ } -+ } -+ }; -+ -+ var drawImage = function (ctx, bitmap, x, y) { -+ var w = bitmap.width; -+ var h = bitmap.height; -+ var sf = bitmap.scaleFactor; -+ var source; -+ -+ // console.log('drawImage: ' + bitmap.id + ' ' + x + ' ' + y + ' ' + w + ' ' + h + ' ' + sf); -+ -+ if (bitmap.imageBitmap) { -+ source = bitmap.imageBitmap; -+ } else if (bitmap.context) { -+ source = bitmap.context.canvas; -+ } else { -+ offscreenContext.canvas.width = bitmap.width; -+ offscreenContext.canvas.height = bitmap.height; -+ offscreenContext.putImageData(bitmap.imageData, 0, 0); -+ source = offscreenContext.canvas; -+ } -+ -+ if (bitmap.scaleFactor == 1.0) { -+ ctx.drawImage(source, x, y); -+ } else { -+ var sf = 1.0 / bitmap.scaleFactor; -+ ctx.drawImage(source, 0, 0, w, h, x, y, w * sf, h * sf); -+ } -+ }; -+ -+ var drawBitmap = function (contextId, bitmapId, x, y) { -+ var ctx = getContext(contextId); -+ var bitmap = bitmapMap.get(bitmapId); -+ -+ //console.log('drawBitmap: ' + contextId + ' ' + bitmapId + ' (' + x + ', ' + y + ')' + ' (' + bitmap.width + ', ' + bitmap.height + ')'); -+ -+ drawImage(ctx, bitmap, x, y); -+ }; -+ -+ var blit = function (srcId, dstId, sx, sy, width, height, dx, dy) { -+ var srcCtx = getContext(srcId); -+ var dstCtx = getContext(dstId); -+ -+ //console.log('blit: ' + sx + ' ' + sy + ' ' + dx + ' ' + dy + ' ' + width + ' ' + height + ' ' + srcCtx.scaleFactor + ' ' + dstCtx.scaleFactor); -+ -+ var sf = srcCtx.scaleFactor -+ dstCtx.drawImage(srcCtx.canvas, sx * sf, sy * sf, width * sf, height * sf, dx, dy, width, height); -+ }; -+ -+ var drawText = function (id, text, x, y, textColor) { -+ var ctx = getContext(id); -+ //console.log('drawText: ' + text + ' ' + id + ' ' + ctx.width + ' ' + ctx.height); -+ -+ var fillStyle = ctx.fillStyle; -+ -+ ctx.fillStyle = makeColorString(textColor); -+ ctx.fillText(text, x, y); -+ -+ ctx.fillStyle = fillStyle; -+ }; -+ -+ var measureText = function (text, font) { -+ offscreenContext.font = font; -+ -+ var textMetrics = offscreenContext.measureText(text); -+ return Math.round(textMetrics.width); -+ }; -+ -+ var rotateAtPoint = function (id, x, y, angle) { -+ var ctx = getContext(id); -+ -+ ctx.save(); -+ ctx.translate(x, y); -+ ctx.rotate(-angle * (Math.PI / 180.0)); -+ }; -+ -+ var clearRotation = function (id) { -+ var ctx = getContext(id); -+ ctx.restore(); -+ }; -+ -+ /* wxCursor */ -+ -+ var cursorMap = [ -+ 'default', -+ 'crosshair', -+ 'hand', -+ 'text', -+ 'wait', -+ 'help', -+ 'e-resize', -+ 'n-resize', -+ 'ne-resize', -+ 'nw-resize', -+ 's-resize', -+ 'se-resize', -+ 'sw-resize', -+ 'w-resize', -+ 'ns-resize', -+ 'ew-resize', -+ 'nesw-resize', -+ 'nwse-resize', -+ 'col-resize', -+ 'row-resize', -+ 'move', -+ 'vertical-text', -+ 'cell', -+ 'context-menu', -+ 'alias', -+ 'progress', -+ 'no-drop', -+ 'copy', -+ 'none', -+ 'not-allowed', -+ 'zoom-in', -+ 'zoom-out', -+ 'grab', -+ 'grabbing' -+ ]; -+ -+ var setCursor = function (cursorIndex, bitmapId, hotSpotX, hotSpotY) { -+ if (cursorIndex >= 0 && cursorIndex < cursorMap.length) { -+ var cursor = cursorMap[cursorIndex]; -+ if (cursor.startsWith('grab') && isWebkit()) { -+ cursor = '-webkit-' + cursor; -+ } -+ Module.canvas.style.cursor = cursor; -+ } else { -+ var bitmap = bitmapMap.get(bitmapId); -+ -+ var canvas = document.createElement('canvas'); -+ var ctx = canvas.getContext('2d'); -+ canvas.width = bitmap.width; -+ canvas.height = bitmap.height; -+ -+ drawImage(ctx, bitmap, 0, 0); -+ var dataUrl = 'url(' + canvas.toDataURL('image/png') + ')'; -+ -+ Module.canvas.style.cursor = dataUrl + ' ' + hotSpotX + ' ' + hotSpotY + ', auto'; -+ } -+ }; -+ -+ var showFullscreen = function (enable) { -+ if (enable) { -+ if (document.body.requestFullscreen) { -+ document.body.requestFullscreen(); -+ } else if (document.body.webkitRequestFullscreen()) { -+ document.body.webkitRequestFullscreen(); -+ } -+ } else { -+ if (document.exitFullscreen) { -+ document.exitFullscreen(); -+ } else if (document.webkitExitFullscreen) { -+ document.webkitExitFullscreen(); -+ } -+ } -+ }; -+ -+ var showFileDialog = function (multiple) { -+ var input = document.createElement('input'); -+ if (multiple) { -+ input.setAttribute('multiple', ''); -+ } -+ input.type = 'file'; -+ input.onchange = function () { -+ for (var i = 0; i < input.files.length; i++) { -+ var file = input.files[i]; -+ console.log('file selected: ' + file.name); -+ file.arrayBuffer().then(function (arrayBuffer) { -+ var array = new Uint8Array(arrayBuffer); -+ var path = '/tmp/' + file.name; -+ -+ var stream = FS.open(path, 'w+'); -+ var retCode = 0; -+ -+ if (stream) { -+ FS.write(stream, array, 0, file.size); -+ FS.close(stream); -+ } else { -+ retCode = 1; -+ } -+ -+ ccall('OpenFileCallback', 'void', ['string', 'number'], [path, retCode]); -+ }); -+ } -+ }; -+ input.click(); -+ }; -+ -+ var downloadFile = function (filename, size, data) { -+ var link = document.createElement('a'); -+ -+ var sharedArray = new Uint8Array(Module.HEAPU8.buffer, data, size); -+ // Blob fails when passed SharedArrayBuffer -+ var array = new Uint8Array(sharedArray); -+ var blob = new Blob([array], {type: 'application/octet-stream'}); -+ -+ link.href = URL.createObjectURL(blob); -+ link.download = filename; -+ link.click(); -+ }; -+ -+ var endModal = null; -+/* -+ var startModal = async function () { -+ Asyncify.handleAsync(async () => { -+ console.log('startModal'); -+ const result = await new Promise((resolve, reject) => { -+ endModal = resolve; -+ }); -+ console.log('modal result: ' + result); -+ }); -+ }; -+ */ -+ -+ /* wxLocalStorageConfig */ -+ -+ var hasConfigEntry = function (key) { -+ try { -+ return localStorage.getItem(key) !== null; -+ } catch (error) { -+ console.error(error); -+ return false; -+ } -+ }; -+ -+ var hasConfigGroup = function (key) { -+ try { -+ for (var i = 0; i < localStorage.length; i++) { -+ if (localStorage.key(i).startsWith(key)) { -+ return true; -+ } -+ } -+ return false; -+ } catch (error) { -+ console.error(error); -+ return false; -+ } -+ }; -+ -+ var getConfigEntryCount = function (prefix, recurse) { -+ var entryCount = 0; -+ -+ try { -+ for (var i = 0; i < localStorage.length; i++) { -+ var key = localStorage.key(i); -+ if (key.startsWith(prefix)) { -+ var end = key.indexOf('/', prefix.length); -+ if (end == -1 || recurse) { -+ ++entryCount; -+ } -+ } -+ } -+ } catch (error) { -+ console.error(error); -+ } -+ return entryCount; -+ }; -+ -+ var getConfigEntryIndex = function (prefix, index) { -+ var entryCount = 0; -+ -+ try { -+ for (var i = 0; i < localStorage.length; i++) { -+ var key = localStorage.key(i); -+ if (key.startsWith(prefix)) { -+ var end = key.indexOf('/', prefix.length); -+ if (end == -1) { -+ if (entryCount >= index) { -+ return i; -+ } else { -+ ++entryCount; -+ } -+ } -+ } -+ } -+ } catch (error) { -+ console.error(error); -+ } -+ return -1; -+ }; -+ -+ var getConfigGroupCount = function (prefix, recurse) { -+ var children = new Set(); -+ -+ try { -+ for (var i = 0; i < localStorage.length; i++) { -+ var key = localStorage.key(i); -+ if (key.startsWith(prefix)) { -+ var end = key.indexOf('/', prefix.length); -+ if (end != -1) { -+ if (recurse) { -+ end = key.lastIndexOf('/'); -+ } -+ var child = key.substring(prefix.length, end); -+ if (!children.has(child)) { -+ children.add(child); -+ } -+ } -+ } -+ } -+ } catch (error) { -+ console.error(error); -+ } -+ return children.size; -+ }; -+ -+ var getConfigGroupIndex = function (prefix, index) { -+ var children = new Set(); -+ -+ try { -+ for (var i = 0; i < localStorage.length; i++) { -+ var key = localStorage.key(i); -+ if (key.startsWith(prefix)) { -+ var end = key.indexOf('/', prefix.length); -+ if (end != -1) { -+ var child = key.substring(prefix.length, end); -+ if (!children.has(child)) { -+ if (children.size >= index) { -+ return i; -+ } else { -+ children.add(child); -+ } -+ } -+ } -+ } -+ } -+ } catch (error) { -+ console.error(error); -+ } -+ return -1; -+ }; -+ -+ var getConfigKeyLength = function (index) { -+ try { -+ return localStorage.key(index).length; -+ } catch (error) { -+ console.error(error); -+ return 0; -+ } -+ }; -+ -+ var getConfigKey = function (index, keyBuffer, length) { -+ try { -+ var key = localStorage.key(index); -+ stringToUTF8(key, keyBuffer, length); -+ } catch (error) { -+ console.error(error); -+ } -+ }; -+ -+ var getConfigEntryLength = function (key) { -+ var value = null; -+ try { -+ value = localStorage.getItem(key); -+ } catch (error) { -+ //console.error(error); -+ } -+ -+ if (value === null) { -+ return -1; -+ } else { -+ return value.length -+ } -+ }; -+ -+ var getConfigEntry = function (key, valueBuffer, length) { -+ try { -+ var value = localStorage.getItem(key); -+ if (value !== null) { -+ stringToUTF8(value, valueBuffer, length); -+ return true; -+ } else { -+ return false; -+ } -+ } catch (error) { -+ console.error(error); -+ return false; -+ } -+ }; -+ -+ var setConfigEntry = function (key, value) { -+ try { -+ localStorage.setItem(key, value); -+ } catch (error) { -+ console.error(error); -+ } -+ }; -+ -+ var removeConfigEntry = function (key) { -+ try { -+ localStorage.removeItem(key); -+ } catch (error) { -+ console.error(error); -+ } -+ }; -+ -+ var removeConfigGroup = function (group) { -+ try { -+ var keysToRemove = []; -+ -+ for (var i = 0; i < localStorage.length; i++) { -+ var key = localStorage.key(i); -+ if (key.startsWith(group)) { -+ keysToRemove.push(key); -+ } -+ } -+ for (var i = 0; i < keysToRemove.length; i++) { -+ localStorage.removeItem(keysToRemove[i]); -+ } -+ return keysToRemove.length > 0; -+ } catch (error) { -+ console.error(error); -+ return false; -+ } -+ }; -+ -+ var clearConfig = function () { -+ try { -+ localStorage.clear(); -+ } catch (error) { -+ console.error(error); -+ } -+ }; -+ -+ var renameConfigGroup = function (oldGroup, newGroup) { -+ try { -+ var keysToRename = []; -+ -+ for (var i = 0; i < localStorage.length; i++) { -+ var key = localStorage.key(i); -+ if (key.startsWith(oldGroup)) { -+ keysToRename.push(key); -+ } else if (key.startsWith(newGroup)) { -+ return false; -+ } -+ } -+ -+ if (keysToRename.length > 0) { -+ for (var i = 0; i < keysToRename.length; i++) { -+ var oldKey = keysToRename[i]; -+ var newKey = newGroup + oldKey.substring(oldGroup.length); -+ -+ var value = localStorage.getItem(oldKey); -+ localStorage.setItem(newKey, value); -+ localStorage.removeItem(oldKey); -+ } -+ return true; -+ } else { -+ return false; -+ } -+ } catch (error) { -+ console.error(error); -+ return false; -+ } -+ -+ }; -+ -diff --git a/build/wasm/wxwasm.mk b/build/wasm/wxwasm.mk -new file mode 100644 -index 0000000000..5392e967a8 ---- /dev/null -+++ b/build/wasm/wxwasm.mk -@@ -0,0 +1,4 @@ -+WXCONFIG=$(EMSCRIPTEN)/system/local/bin/wx-config -+ -+WX_CXXFLAGS:=$(shell $(WXCONFIG) --cxxflags) -+WX_LDFLAGS:=$(shell $(WXCONFIG) --libs base,core,html) -diff --git a/config.sub b/config.sub -index 7f7d0b055a..f1bee4ef73 100755 ---- a/config.sub -+++ b/config.sub -@@ -412,6 +412,10 @@ case $1 in - basic_machine=le32-unknown - basic_os=nacl - ;; -+ emscripten) -+ basic_machine=asmjs-unknown -+ basic_os=emscripten -+ ;; - ncr3000) - basic_machine=i486-ncr - basic_os=sysv4 -@@ -624,6 +628,9 @@ case $1 in - basic_machine=a29k-wrs - basic_os=vxworks - ;; -+ wasm32 | wasm32_simd128) -+ basic_machine=wasm32-unknown -+ ;; - xbox) - basic_machine=i686-pc - basic_os=mingw32 -@@ -1250,7 +1257,7 @@ case $cpu-$vendor in - | vax \ - | visium \ - | w65 \ -- | wasm32 | wasm64 \ -+ | wasm32 | wasm32_simd128 | wasm64 \ - | we32k \ - | x86 | x86_64 | xc16x | xgate | xps100 \ - | xstormy16 | xtensa* \ -diff --git a/configure b/configure -index cb08494066..fdfed5b3b3 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 wxWidgets 3.2.6. -+# Generated by GNU Autoconf 2.72 for wxWidgets 3.2.6. - # - # Report bugs to . - # - # --# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. -+# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, -+# Inc. - # - # - # This configure script is free software; the Free Software Foundation -@@ -16,63 +17,65 @@ - - # Be more Bourne compatible - DUALCASE=1; export DUALCASE # for MKS sh --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : -+if test ${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 -- case `(set -o) 2>/dev/null` in #( -+else case e in #( -+ e) case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -+esac ;; - 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,43 +92,27 @@ 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 - - ;; - esac --# We did not find ourselves, most probably we were run as `sh COMMAND' -+# We did not find ourselves, most probably we were run as 'sh COMMAND' - # in which case we are not to be found in the path. - 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. -@@ -153,26 +133,28 @@ case $- in # (((( - 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 -+# out after a failed 'exec'. -+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="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 -- case \`(set -o) 2>/dev/null\` in #( -+else case e in #( -+ e) case \`(set -o) 2>/dev/null\` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -+esac ;; - esac - fi - " -@@ -187,42 +169,55 @@ 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 -- exitcode=1; echo positional parameters were not saved. -+else case e in #( -+ e) exitcode=1; echo positional parameters were not saved. ;; -+esac - 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 - eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && - test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 - test \$(( 1 + 1 )) = 2 || exit 1" -- if (eval "$as_required") 2>/dev/null; then : -+ if (eval "$as_required") 2>/dev/null -+then : - as_have_required=yes --else -- as_have_required=no -+else case e in #( -+ e) as_have_required=no ;; -+esac - 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 -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+else case e in #( -+ e) 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 -@@ -230,14 +225,22 @@ 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 case e in #( -+ e) 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 ;; -+esac -+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 -@@ -254,26 +257,28 @@ case $- in # (((( - 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 -+# out after a failed 'exec'. -+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 -+ printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and - $0: wx-dev@googlegroups.com about your system, including - $0: any error possibly output before this message. Then - $0: install a modern shell, or manually run the script - $0: under such a shell if you do have one." - fi - exit 1 --fi -+fi ;; -+esac - fi - fi - SHELL=${CONFIG_SHELL-/bin/sh} -@@ -294,6 +299,7 @@ as_fn_unset () - } - as_unset=as_fn_unset - -+ - # as_fn_set_status STATUS - # ----------------------- - # Set $? to STATUS, without forking. -@@ -325,7 +331,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" -@@ -334,7 +340,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 -@@ -373,16 +379,18 @@ 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 -- as_fn_append () -+else case e in #( -+ e) as_fn_append () - { - eval $1=\$$1\$2 -- } -+ } ;; -+esac - fi # as_fn_append - - # as_fn_arith ARG... -@@ -390,16 +398,18 @@ 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 -- as_fn_arith () -+else case e in #( -+ e) as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` -- } -+ } ;; -+esac - fi # as_fn_arith - - -@@ -413,9 +423,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 - -@@ -442,7 +452,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 -@@ -475,6 +485,8 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits - /[$]LINENO/= - ' <$as_myself | - sed ' -+ t clear -+ :clear - s/[$]LINENO.*/&-/ - t lineno - b -@@ -486,7 +498,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 -@@ -500,6 +512,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*) -@@ -513,6 +529,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 -@@ -524,9 +546,9 @@ if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: -- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -pR'. -+ # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. -+ # In both cases, we have to default to 'cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then -@@ -551,10 +573,12 @@ as_test_x='test -x' - as_executable_p=as_fn_executable_p - - # Sed expression to map a string onto a valid CPP name. --as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -+as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -+as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated - - # Sed expression to map a string onto a valid variable name. --as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -+as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -+as_tr_sh="eval sed '$as_sed_sh'" # deprecated - - - test -n "$DJDIR" || exec 7<&0 /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" -@@ -1598,9 +1615,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" -@@ -1811,9 +1828,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" -@@ -1827,9 +1844,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" -@@ -1857,8 +1874,8 @@ do - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - -- -*) as_fn_error $? "unrecognized option: \`$ac_option' --Try \`$0 --help' for more information" -+ -*) as_fn_error $? "unrecognized option: '$ac_option' -+Try '$0 --help' for more information" - ;; - - *=*) -@@ -1866,16 +1883,16 @@ Try \`$0 --help' for more information" - # Reject names that are not valid shell variable names. - case $ac_envvar in #( - '' | [0-9]* | *[!_$as_cr_alnum]* ) -- as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; -+ as_fn_error $? "invalid variable name: '$ac_envvar'" ;; - esac - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # 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}" - ;; - -@@ -1891,7 +1908,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 - -@@ -1916,7 +1933,7 @@ do - as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" - done - --# There might be people who depend on the old broken behavior: `$host' -+# There might be people who depend on the old broken behavior: '$host' - # used to hold the argument of --host etc. - # FIXME: To remove some day. - build=$build_alias -@@ -1955,7 +1972,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 -@@ -1984,7 +2001,7 @@ if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" - fi --ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -+ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work" - ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" - pwd)` -@@ -2012,7 +2029,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 wxWidgets 3.2.6 to adapt to many kinds of systems. -+'configure' configures wxWidgets 3.2.6 to adapt to many kinds of systems. - - Usage: $0 [OPTION]... [VAR=VALUE]... - -@@ -2026,11 +2043,11 @@ Configuration: - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit -- -q, --quiet, --silent do not print \`checking ...' messages -+ -q, --quiet, --silent do not print 'checking ...' messages - --cache-file=FILE cache test results in FILE [disabled] -- -C, --config-cache alias for \`--cache-file=config.cache' -+ -C, --config-cache alias for '--cache-file=config.cache' - -n, --no-create do not create output files -- --srcdir=DIR find the sources in DIR [configure dir or \`..'] -+ --srcdir=DIR find the sources in DIR [configure dir or '..'] - - Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX -@@ -2038,10 +2055,10 @@ Installation directories: - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - --By default, \`make install' will install all the files in --\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify --an installation prefix other than \`$ac_default_prefix' using \`--prefix', --for instance \`--prefix=\$HOME'. -+By default, 'make install' will install all the files in -+'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify -+an installation prefix other than '$ac_default_prefix' using '--prefix', -+for instance '--prefix=\$HOME'. - - For better control, use the options below. - -@@ -2387,6 +2404,7 @@ Optional Packages: - --with-directfb use DirectFB - --with-x11 use X11 - --with-qt use Qt -+ --with-wasm use WebAssembly - --with-libpng use libpng (PNG image format) - --with-libjpeg use libjpeg (JPEG file format) - --with-libtiff use libtiff (TIFF file format) -@@ -2428,7 +2446,6 @@ Some influential environment variables: - LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if - you have headers in a nonstandard directory -- CPP C preprocessor - CXX C++ compiler command - CXXFLAGS C++ compiler flags - PKG_CONFIG path to pkg-config utility -@@ -2449,6 +2466,7 @@ Some influential environment variables: - DIRECTFB_LIBS - linker flags for DIRECTFB, overriding pkg-config - XMKMF Path to xmkmf, Makefile generator for X Window System -+ CPP C preprocessor - PANGOXFT_CFLAGS - C compiler flags for PANGOXFT, overriding pkg-config - PANGOXFT_LIBS -@@ -2522,7 +2540,7 @@ Some influential environment variables: - GST_CFLAGS C compiler flags for GST, overriding pkg-config - GST_LIBS linker flags for GST, overriding pkg-config - --Use these variables to override the choices made by `configure' or to help -+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 . -@@ -2541,9 +2559,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/ ;; -@@ -2571,7 +2589,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 -@@ -2579,7 +2598,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 -@@ -2589,9 +2608,9 @@ test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF - wxWidgets configure 3.2.6 --generated by GNU Autoconf 2.69 -+generated by GNU Autoconf 2.72 - --Copyright (C) 2012 Free Software Foundation, Inc. -+Copyright (C) 2023 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -@@ -2608,14 +2627,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 -@@ -2623,59 +2642,24 @@ $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 case e in #( -+ e) printf "%s\n" "$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_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;; -+ ac_retval=1 ;; - 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_compile - - # ac_fn_cxx_try_compile LINENO - # ---------------------------- -@@ -2683,14 +2667,14 @@ fi - 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 -@@ -2698,17 +2682,19 @@ $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 case e in #( -+ e) printf "%s\n" "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_retval=1 -+ ac_retval=1 ;; -+esac - fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval -@@ -2721,14 +2707,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 -@@ -2736,20 +2722,22 @@ $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 case e in #( -+ e) printf "%s\n" "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_retval=1 -+ ac_retval=1 ;; -+esac - fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would -@@ -2767,14 +2755,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 -@@ -2782,20 +2770,22 @@ $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 case e in #( -+ e) printf "%s\n" "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_retval=1 -+ ac_retval=1 ;; -+esac - fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would -@@ -2814,34 +2804,73 @@ 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 -- 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 case e in #( -+ e) 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 -- eval "$3=no" -+else case e in #( -+ e) eval "$3=no" ;; -+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 ;; -+esac - 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_cxx_check_header_compile LINENO HEADER VAR INCLUDES -+# --------------------------------------------------------- -+# Tests whether HEADER exists and can be compiled using the include files in -+# INCLUDES, setting the cache variable VAR accordingly. -+ac_fn_cxx_check_header_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { 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 case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ eval "$3=yes" -+else case e in #( -+ e) eval "$3=no" ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+eval ac_res=\$$3 -+ { 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_compile -+ - # ac_fn_c_try_run LINENO - # ---------------------- --# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes --# that executables *can* be run. -+# 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 -@@ -2851,28 +2880,30 @@ 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; } && { 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 -+printf "%s\n" "$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 : -+ printf "%s\n" "$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 -+else case e in #( -+ e) 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 -+ ac_retval=$ac_status ;; -+esac - fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -@@ -2880,37 +2911,6 @@ fi - - } # ac_fn_c_try_run - --# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES --# --------------------------------------------------------- --# Tests whether HEADER exists and can be compiled using the include files in --# INCLUDES, setting the cache variable VAR accordingly. --ac_fn_cxx_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 -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --$4 --#include <$2> --_ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -- eval "$3=yes" --else -- eval "$3=no" --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --eval ac_res=\$$3 -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -- --} # ac_fn_cxx_check_header_compile -- - # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES - # -------------------------------------------- - # Tries to find the compile-time value of EXPR in a program that includes -@@ -2925,7 +2925,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - $4 - int --main () -+main (void) - { - static int test_array [1 - 2 * !(($2) >= 0)]; - test_array [0] = 0; -@@ -2935,14 +2935,15 @@ return test_array [0]; - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - ac_lo=0 ac_mid=0 - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - $4 - int --main () -+main (void) - { - static int test_array [1 - 2 * !(($2) <= $ac_mid)]; - test_array [0] = 0; -@@ -2952,24 +2953,26 @@ return test_array [0]; - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - ac_hi=$ac_mid; break --else -- as_fn_arith $ac_mid + 1 && ac_lo=$as_val -+else case e in #( -+ e) as_fn_arith $ac_mid + 1 && ac_lo=$as_val - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi -- as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val -+ as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val ;; -+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 - done --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - $4 - int --main () -+main (void) - { - static int test_array [1 - 2 * !(($2) < 0)]; - test_array [0] = 0; -@@ -2979,14 +2982,15 @@ return test_array [0]; - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - ac_hi=-1 ac_mid=-1 - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - $4 - int --main () -+main (void) - { - static int test_array [1 - 2 * !(($2) >= $ac_mid)]; - test_array [0] = 0; -@@ -2996,24 +3000,28 @@ return test_array [0]; - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - ac_lo=$ac_mid; break --else -- as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val -+else case e in #( -+ e) as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi -- as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val -+ as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val ;; -+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 - done --else -- ac_lo= ac_hi= -+else case e in #( -+ e) ac_lo= ac_hi= ;; -+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 ;; -+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 - # Binary search between lo and hi bounds. - while test "x$ac_lo" != "x$ac_hi"; do - as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val -@@ -3021,7 +3029,7 @@ while test "x$ac_lo" != "x$ac_hi"; do - /* end confdefs.h. */ - $4 - int --main () -+main (void) - { - static int test_array [1 - 2 * !(($2) <= $ac_mid)]; - test_array [0] = 0; -@@ -3031,12 +3039,14 @@ return test_array [0]; - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - ac_hi=$ac_mid --else -- as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val -+else case e in #( -+ e) as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val ;; -+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 - done - case $ac_lo in #(( - ?*) eval "$3=\$ac_lo"; ac_retval=0 ;; -@@ -3046,12 +3056,12 @@ esac - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - $4 --static long int longval () { return $2; } --static unsigned long int ulongval () { return $2; } -+static long int longval (void) { return $2; } -+static unsigned long int ulongval (void) { return $2; } - #include - #include - int --main () -+main (void) - { - - FILE *f = fopen ("conftest.val", "w"); -@@ -3079,10 +3089,12 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_run "$LINENO"; then : -+if ac_fn_c_try_run "$LINENO" -+then : - echo >>conftest.val; read $3 &5 --$as_echo_n "checking for $2... " >&6; } --if eval \${$3+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- eval "$3=no" -+ { 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 case e in #( -+ e) eval "$3=no" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - $4 - int --main () -+main (void) - { - if (sizeof ($2)) - return 0; -@@ -3119,12 +3132,13 @@ if (sizeof ($2)) - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - $4 - int --main () -+main (void) - { - if (sizeof (($2))) - return 0; -@@ -3132,18 +3146,21 @@ if (sizeof (($2))) - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - --else -- eval "$3=yes" -+else case e in #( -+ e) eval "$3=yes" ;; -+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 -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac - 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_cxx_check_type -@@ -3154,28 +3171,22 @@ $as_echo "$ac_res" >&6; } - 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 -- 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 case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - /* Define $2 to an innocuous variant, in case declares $2. - For example, HP-UX 11i declares gettimeofday. */ - #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 (void); below. */ - -+#include - #undef $2 - - /* Override any GCC internal prototype to avoid an error. -@@ -3184,7 +3195,7 @@ else - #ifdef __cplusplus - extern "C" - #endif --char $2 (); -+char $2 (void); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -@@ -3193,24 +3204,27 @@ 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 -- eval "$3=no" -+else case e in #( -+ e) eval "$3=no" ;; -+esac - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext ;; -+esac - 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 -@@ -3222,17 +3236,18 @@ $as_echo "$ac_res" >&6; } - 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 -- eval "$3=no" -+ { 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 case e in #( -+ e) eval "$3=no" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - $4 - int --main () -+main (void) - { - if (sizeof ($2)) - return 0; -@@ -3240,12 +3255,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; -@@ -3253,117 +3269,68 @@ if (sizeof (($2))) - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - --else -- eval "$3=yes" -+else case e in #( -+ e) eval "$3=yes" ;; -+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 -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac - 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 - --# 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 () -+# 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 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; } -+ 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\"" -+printf "%s\n" "$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 -+ printf "%s\n" "$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 case e in #( -+ e) printf "%s\n" "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# 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 wx-dev@googlegroups.com ## --## -------------------------------------- ##" -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; -+ ac_retval=1 ;; - 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 -+ as_fn_set_status $ac_retval - --} # ac_fn_c_check_header_mongrel -+} # ac_fn_c_try_cpp - - # ac_fn_cxx_try_run LINENO - # ------------------------ --# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes --# that executables *can* be run. -+# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that -+# executables *can* be run. - ac_fn_cxx_try_run () - { - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -@@ -3373,42 +3340,64 @@ 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; } && { 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 -+printf "%s\n" "$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 : -+ printf "%s\n" "$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 -+else case e in #( -+ e) 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 -+ ac_retval=$ac_status ;; -+esac - 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_cxx_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 wxWidgets $as_me 3.2.6, which was --generated by GNU Autoconf 2.69. Invocation command line was -+generated by GNU Autoconf 2.72. Invocation command line was - -- $ $0 $@ -+ $ $0$ac_configure_args_raw - - _ACEOF - exec 5>>config.log -@@ -3441,8 +3430,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 - -@@ -3477,7 +3470,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'" ;; -@@ -3512,11 +3505,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 -@@ -3527,8 +3522,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) ;; #( -@@ -3552,7 +3547,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - ) - echo - -- $as_echo "## ----------------- ## -+ printf "%s\n" "## ----------------- ## - ## Output variables. ## - ## ----------------- ##" - echo -@@ -3560,14 +3555,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 -@@ -3575,15 +3570,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 -@@ -3591,8 +3586,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 && -@@ -3606,65 +3601,50 @@ 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; } -+See 'config.log' for more details" "$LINENO" 5; } - fi - done - -@@ -3672,19 +3652,668 @@ 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 - -+# 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 (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; -+} -+ -+/* C89 style stringification. */ -+#define noexpand_stringify(a) #a -+const char *stringified = noexpand_stringify(arbitrary+token=sequence); -+ -+/* C89 style token pasting. Exercises some of the corner cases that -+ e.g. old MSVC gets wrong, but not very hard. */ -+#define noexpand_concat(a,b) a##b -+#define expand_concat(a,b) noexpand_concat(a,b) -+extern int vA; -+extern int vbee; -+#define aye A -+#define bee B -+int *pvA = &expand_concat(v,aye); -+int *pvbee = &noexpand_concat(v,bee); -+ -+/* 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 -+ -+// See if C++-style comments work. -+ -+#include -+extern int puts (const char *); -+extern int printf (const char *, ...); -+extern int dprintf (int, const char *, ...); -+extern void *malloc (size_t); -+extern void free (void *); -+ -+// 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) -+{ -+ // 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; -+ // Work around memory leak warnings. -+ free (ia); -+ -+ // 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; -+} -+" -+ -+# 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 " 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" -+ -+# Auxiliary files required by this configure script. -+ac_aux_files="install-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 case e in #( -+ e) as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 ;; -+esac -+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 -@@ -3695,12 +4324,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=: ;; - ,);; - *) -@@ -3709,24 +4338,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 -@@ -3736,11 +4365,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. ## -@@ -3756,55 +4386,31 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - --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 -- ac_build_alias=$build_alias -+{ 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 case e in #( -+ e) 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 -+ ;; -+esac - 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;; -@@ -3823,21 +4429,23 @@ 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 -- if test "x$host_alias" = x; then -+{ 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 case e in #( -+ e) 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 -- -+ ;; -+esac - 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;; -@@ -3893,6 +4501,7 @@ USE_WIN32=0 - USE_DOS=0 - USE_BEOS=0 - USE_MAC=0 -+USE_WASM=0 - - USE_AIX= - USE_BSD= USE_DARWIN= USE_FREEBSD= -@@ -3910,7 +4519,7 @@ USE_ALPHA= - - NEEDS_D_REENTRANT_FOR_R_FUNCS=0 - --ALL_TOOLKITS="GTK OSX_COCOA OSX_IPHONE MOTIF MSW X11 DFB QT" -+ALL_TOOLKITS="GTK OSX_COCOA OSX_IPHONE MOTIF MSW X11 DFB QT WASM" - - DEFAULT_wxUSE_GTK=0 - DEFAULT_wxUSE_OSX_COCOA=0 -@@ -3920,6 +4529,7 @@ DEFAULT_wxUSE_MSW=0 - DEFAULT_wxUSE_X11=0 - DEFAULT_wxUSE_DFB=0 - DEFAULT_wxUSE_QT=0 -+DEFAULT_wxUSE_WASM=0 - - DEFAULT_DEFAULT_wxUSE_GTK=0 - DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0 -@@ -3929,6 +4539,7 @@ DEFAULT_DEFAULT_wxUSE_MSW=0 - DEFAULT_DEFAULT_wxUSE_X11=0 - DEFAULT_DEFAULT_wxUSE_DFB=0 - DEFAULT_DEFAULT_wxUSE_QT=0 -+DEFAULT_DEFAULT_wxUSE_WASM=0 - - PROGRAM_EXT= - SAMPLES_CXXFLAGS= -@@ -3943,19 +4554,19 @@ case "${host}" in - USE_HPUX=1 - DEFAULT_DEFAULT_wxUSE_GTK=1 - NEEDS_D_REENTRANT_FOR_R_FUNCS=1 -- $as_echo "#define __HPUX__ 1" >>confdefs.h -+ printf "%s\n" "#define __HPUX__ 1" >>confdefs.h - - - CPPFLAGS="-D_HPUX_SOURCE $CPPFLAGS" - ;; - *-*-linux* ) - USE_LINUX=1 -- $as_echo "#define __LINUX__ 1" >>confdefs.h -+ printf "%s\n" "#define __LINUX__ 1" >>confdefs.h - - TMP=`uname -m` - if test "x$TMP" = "xalpha"; then - USE_ALPHA=1 -- $as_echo "#define __ALPHA__ 1" >>confdefs.h -+ printf "%s\n" "#define __ALPHA__ 1" >>confdefs.h - - fi - DEFAULT_DEFAULT_wxUSE_GTK=1 -@@ -3965,7 +4576,7 @@ case "${host}" in - TMP=`uname -m` - if test "x$TMP" = "xalpha"; then - USE_ALPHA=1 -- $as_echo "#define __ALPHA__ 1" >>confdefs.h -+ printf "%s\n" "#define __ALPHA__ 1" >>confdefs.h - - fi - DEFAULT_DEFAULT_wxUSE_GTK=1 -@@ -3973,15 +4584,15 @@ case "${host}" in - *-*-irix5* | *-*-irix6* ) - USE_SGI=1 - USE_SVR4=1 -- $as_echo "#define __SGI__ 1" >>confdefs.h -+ printf "%s\n" "#define __SGI__ 1" >>confdefs.h - -- $as_echo "#define __SVR4__ 1" >>confdefs.h -+ printf "%s\n" "#define __SVR4__ 1" >>confdefs.h - - DEFAULT_DEFAULT_wxUSE_GTK=1 - ;; - *-*-qnx*) - USE_QNX=1 -- $as_echo "#define __QNX__ 1" >>confdefs.h -+ printf "%s\n" "#define __QNX__ 1" >>confdefs.h - - DEFAULT_DEFAULT_wxUSE_X11=1 - ;; -@@ -3989,11 +4600,11 @@ case "${host}" in - USE_SUN=1 - USE_SOLARIS=1 - USE_SVR4=1 -- $as_echo "#define __SUN__ 1" >>confdefs.h -+ printf "%s\n" "#define __SUN__ 1" >>confdefs.h - -- $as_echo "#define __SOLARIS__ 1" >>confdefs.h -+ printf "%s\n" "#define __SOLARIS__ 1" >>confdefs.h - -- $as_echo "#define __SVR4__ 1" >>confdefs.h -+ printf "%s\n" "#define __SVR4__ 1" >>confdefs.h - - DEFAULT_DEFAULT_wxUSE_GTK=1 - NEEDS_D_REENTRANT_FOR_R_FUNCS=1 -@@ -4002,38 +4613,38 @@ case "${host}" in - USE_SUN=1 - USE_SUNOS=1 - USE_BSD=1 -- $as_echo "#define __SUN__ 1" >>confdefs.h -+ printf "%s\n" "#define __SUN__ 1" >>confdefs.h - -- $as_echo "#define __SUNOS__ 1" >>confdefs.h -+ printf "%s\n" "#define __SUNOS__ 1" >>confdefs.h - -- $as_echo "#define __BSD__ 1" >>confdefs.h -+ printf "%s\n" "#define __BSD__ 1" >>confdefs.h - - DEFAULT_DEFAULT_wxUSE_GTK=1 - ;; - *-*-freebsd*) - USE_BSD=1 - USE_FREEBSD=1 -- $as_echo "#define __FREEBSD__ 1" >>confdefs.h -+ printf "%s\n" "#define __FREEBSD__ 1" >>confdefs.h - -- $as_echo "#define __BSD__ 1" >>confdefs.h -+ printf "%s\n" "#define __BSD__ 1" >>confdefs.h - - DEFAULT_DEFAULT_wxUSE_GTK=1 - ;; - *-*-openbsd*|*-*-mirbsd*) - USE_BSD=1 - USE_OPENBSD=1 -- $as_echo "#define __OPENBSD__ 1" >>confdefs.h -+ printf "%s\n" "#define __OPENBSD__ 1" >>confdefs.h - -- $as_echo "#define __BSD__ 1" >>confdefs.h -+ printf "%s\n" "#define __BSD__ 1" >>confdefs.h - - DEFAULT_DEFAULT_wxUSE_GTK=1 - ;; - *-*-netbsd*) - USE_BSD=1 - USE_NETBSD=1 -- $as_echo "#define __NETBSD__ 1" >>confdefs.h -+ printf "%s\n" "#define __NETBSD__ 1" >>confdefs.h - -- $as_echo "#define __BSD__ 1" >>confdefs.h -+ printf "%s\n" "#define __BSD__ 1" >>confdefs.h - - DEFAULT_DEFAULT_wxUSE_GTK=1 - NEEDS_D_REENTRANT_FOR_R_FUNCS=1 -@@ -4043,9 +4654,9 @@ case "${host}" in - *-*-osf* ) - USE_ALPHA=1 - USE_OSF=1 -- $as_echo "#define __ALPHA__ 1" >>confdefs.h -+ printf "%s\n" "#define __ALPHA__ 1" >>confdefs.h - -- $as_echo "#define __OSF__ 1" >>confdefs.h -+ printf "%s\n" "#define __OSF__ 1" >>confdefs.h - - DEFAULT_DEFAULT_wxUSE_GTK=1 - NEEDS_D_REENTRANT_FOR_R_FUNCS=1 -@@ -4053,18 +4664,18 @@ case "${host}" in - *-*-dgux5* ) - USE_ALPHA=1 - USE_SVR4=1 -- $as_echo "#define __ALPHA__ 1" >>confdefs.h -+ printf "%s\n" "#define __ALPHA__ 1" >>confdefs.h - -- $as_echo "#define __SVR4__ 1" >>confdefs.h -+ printf "%s\n" "#define __SVR4__ 1" >>confdefs.h - - DEFAULT_DEFAULT_wxUSE_GTK=1 - ;; - *-*-sysv5* ) - USE_SYSV=1 - USE_SVR4=1 -- $as_echo "#define __SYSV__ 1" >>confdefs.h -+ printf "%s\n" "#define __SYSV__ 1" >>confdefs.h - -- $as_echo "#define __SVR4__ 1" >>confdefs.h -+ printf "%s\n" "#define __SVR4__ 1" >>confdefs.h - - DEFAULT_DEFAULT_wxUSE_GTK=1 - ;; -@@ -4072,11 +4683,11 @@ case "${host}" in - USE_AIX=1 - USE_SYSV=1 - USE_SVR4=1 -- $as_echo "#define __AIX__ 1" >>confdefs.h -+ printf "%s\n" "#define __AIX__ 1" >>confdefs.h - -- $as_echo "#define __SYSV__ 1" >>confdefs.h -+ printf "%s\n" "#define __SYSV__ 1" >>confdefs.h - -- $as_echo "#define __SVR4__ 1" >>confdefs.h -+ printf "%s\n" "#define __SVR4__ 1" >>confdefs.h - - DEFAULT_DEFAULT_wxUSE_GTK=1 - ;; -@@ -4085,7 +4696,7 @@ case "${host}" in - USE_SYSV=1 - USE_SVR4=1 - USE_UNIXWARE=1 -- $as_echo "#define __UNIXWARE__ 1" >>confdefs.h -+ printf "%s\n" "#define __UNIXWARE__ 1" >>confdefs.h - - ;; - -@@ -4097,31 +4708,39 @@ case "${host}" in - *-*-darwin* ) - USE_BSD=1 - USE_DARWIN=1 -- $as_echo "#define __BSD__ 1" >>confdefs.h -+ printf "%s\n" "#define __BSD__ 1" >>confdefs.h - -- $as_echo "#define __DARWIN__ 1" >>confdefs.h -+ printf "%s\n" "#define __DARWIN__ 1" >>confdefs.h - - DEFAULT_DEFAULT_wxUSE_OSX_COCOA=1 - ;; - - *-*-beos* ) - USE_BEOS=1 -- $as_echo "#define __BEOS__ 1" >>confdefs.h -+ printf "%s\n" "#define __BEOS__ 1" >>confdefs.h - - ;; - - *-*-haiku* ) - USE_HAIKU=1 -- $as_echo "#define __HAIKU__ 1" >>confdefs.h -+ printf "%s\n" "#define __HAIKU__ 1" >>confdefs.h - - DEFAULT_DEFAULT_wxUSE_QT=1 - ;; - -+ *-*-emscripten* ) -+ USE_WASM=1 -+ printf "%s\n" "#define __WASM__ 1" >>confdefs.h -+ -+ DEFAULT_DEFAULT_wxUSE_WASM=1 -+ PROGRAM_EXT=".js" -+ ;; -+ - *) -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** System type ${host} is unknown, assuming generic Unix and continuing nevertheless." >&5 --$as_echo "$as_me: WARNING: *** System type ${host} is unknown, assuming generic Unix and continuing nevertheless." >&2;} -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Please report the build results to wx-dev@googlegroups.com." >&5 --$as_echo "$as_me: WARNING: *** Please report the build results to wx-dev@googlegroups.com." >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** System type ${host} is unknown, assuming generic Unix and continuing nevertheless." >&5 -+printf "%s\n" "$as_me: WARNING: *** System type ${host} is unknown, assuming generic Unix and continuing nevertheless." >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** Please report the build results to wx-dev@googlegroups.com." >&5 -+printf "%s\n" "$as_me: WARNING: *** Please report the build results to wx-dev@googlegroups.com." >&2;} - - DEFAULT_DEFAULT_wxUSE_X11=1 - DEFAULT_wxUSE_SHARED=no -@@ -4178,7 +4797,8 @@ DEFAULT_wxUSE_OBJC_UNIQUIFYING=no - fi - - # Check whether --enable-gui was given. --if test "${enable_gui+set}" = set; then : -+if test ${enable_gui+y} -+then : - enableval=$enable_gui; - if test "$enableval" = yes; then - wx_cv_use_gui='wxUSE_GUI=yes' -@@ -4186,10 +4806,11 @@ if test "${enable_gui+set}" = set; then : - wx_cv_use_gui='wxUSE_GUI=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -4207,7 +4828,8 @@ fi - fi - - # Check whether --enable-monolithic was given. --if test "${enable_monolithic+set}" = set; then : -+if test ${enable_monolithic+y} -+then : - enableval=$enable_monolithic; - if test "$enableval" = yes; then - wx_cv_use_monolithic='wxUSE_MONOLITHIC=yes' -@@ -4215,10 +4837,11 @@ if test "${enable_monolithic+set}" = set; then : - wx_cv_use_monolithic='wxUSE_MONOLITHIC=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -4236,7 +4859,8 @@ fi - fi - - # Check whether --enable-plugins was given. --if test "${enable_plugins+set}" = set; then : -+if test ${enable_plugins+y} -+then : - enableval=$enable_plugins; - if test "$enableval" = yes; then - wx_cv_use_plugins='wxUSE_PLUGINS=yes' -@@ -4244,10 +4868,11 @@ if test "${enable_plugins+set}" = set; then : - wx_cv_use_plugins='wxUSE_PLUGINS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -4265,7 +4890,8 @@ fi - fi - - # Check whether --with-subdirs was given. --if test "${with_subdirs+set}" = set; then : -+if test ${with_subdirs+y} -+then : - withval=$with_subdirs; - if test "$withval" = yes; then - wx_cv_use_subdirs='wxWITH_SUBDIRS=yes' -@@ -4273,10 +4899,11 @@ if test "${with_subdirs+set}" = set; then : - wx_cv_use_subdirs='wxWITH_SUBDIRS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -4284,7 +4911,8 @@ fi - - - # Check whether --with-flavour was given. --if test "${with_flavour+set}" = set; then : -+if test ${with_flavour+y} -+then : - withval=$with_flavour; WX_FLAVOUR="$withval" - fi - -@@ -4300,7 +4928,8 @@ fi - fi - - # Check whether --enable-official_build was given. --if test "${enable_official_build+set}" = set; then : -+if test ${enable_official_build+y} -+then : - enableval=$enable_official_build; - if test "$enableval" = yes; then - wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=yes' -@@ -4308,17 +4937,19 @@ if test "${enable_official_build+set}" = set; then : - wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=${'DEFAULT_wxUSE_OFFICIAL_BUILD":-$defaultval}" -- -+ ;; -+esac - fi - - - eval "$wx_cv_use_official_build" - - # Check whether --enable-vendor was given. --if test "${enable_vendor+set}" = set; then : -+if test ${enable_vendor+y} -+then : - enableval=$enable_vendor; VENDOR="$enableval" - fi - -@@ -4338,7 +4969,8 @@ fi - fi - - # Check whether --enable-all-features was given. --if test "${enable_all_features+set}" = set; then : -+if test ${enable_all_features+y} -+then : - enableval=$enable_all_features; - if test "$enableval" = yes; then - wx_cv_use_all_features='wxUSE_ALL_FEATURES=yes' -@@ -4346,10 +4978,11 @@ if test "${enable_all_features+set}" = set; then : - wx_cv_use_all_features='wxUSE_ALL_FEATURES=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -4367,7 +5000,8 @@ fi - fi - - # Check whether --enable-sys-libs was given. --if test "${enable_sys_libs+set}" = set; then : -+if test ${enable_sys_libs+y} -+then : - enableval=$enable_sys_libs; - if test "$enableval" = yes; then - wx_cv_use_sys_libs='wxUSE_SYS_LIBS=yes' -@@ -4375,10 +5009,11 @@ if test "${enable_sys_libs+set}" = set; then : - wx_cv_use_sys_libs='wxUSE_SYS_LIBS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_sys_libs='wxUSE_SYS_LIBS=${'DEFAULT_wxUSE_SYS_LIBS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -4396,7 +5031,8 @@ fi - fi - - # Check whether --enable-tests was given. --if test "${enable_tests+set}" = set; then : -+if test ${enable_tests+y} -+then : - enableval=$enable_tests; - if test "$enableval" = yes; then - wx_cv_use_tests='wxUSE_TESTS_SUBDIR=yes' -@@ -4404,10 +5040,11 @@ if test "${enable_tests+set}" = set; then : - wx_cv_use_tests='wxUSE_TESTS_SUBDIR=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_tests='wxUSE_TESTS_SUBDIR=${'DEFAULT_wxUSE_TESTS_SUBDIR":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -4421,7 +5058,8 @@ fi - - - # Check whether --with-dpi was given. --if test "${with_dpi+set}" = set; then : -+if test ${with_dpi+y} -+then : - withval=$with_dpi; wxWITH_DPI_MANIFEST="$withval" - fi - -@@ -4441,7 +5079,8 @@ if test "$wxUSE_GUI" = "yes"; then - fi - - # Check whether --enable-universal was given. --if test "${enable_universal+set}" = set; then : -+if test ${enable_universal+y} -+then : - enableval=$enable_universal; - if test "$enableval" = yes; then - wx_cv_use_universal='wxUSE_UNIVERSAL=yes' -@@ -4449,10 +5088,11 @@ if test "${enable_universal+set}" = set; then : - wx_cv_use_universal='wxUSE_UNIVERSAL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -4461,7 +5101,8 @@ fi - if test "$wxUSE_UNIVERSAL" = "yes"; then - - # Check whether --with-themes was given. --if test "${with_themes+set}" = set; then : -+if test ${with_themes+y} -+then : - withval=$with_themes; wxUNIV_THEMES="$withval" - fi - -@@ -4469,14 +5110,16 @@ fi - - - # Check whether --with-gtk was given. --if test "${with_gtk+set}" = set; then : -+if test ${with_gtk+y} -+then : - withval=$with_gtk; wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1 - fi - - - - # Check whether --with-motif was given. --if test "${with_motif+set}" = set; then : -+if test ${with_motif+y} -+then : - withval=$with_motif; - if test "$withval" != yes; then - as_fn_error $? "Option --with-motif doesn't accept any arguments" "$LINENO" 5 -@@ -4489,7 +5132,8 @@ fi - - - # Check whether --with-osx_cocoa was given. --if test "${with_osx_cocoa+set}" = set; then : -+if test ${with_osx_cocoa+y} -+then : - withval=$with_osx_cocoa; - if test "$withval" != yes; then - as_fn_error $? "Option --with-osx_cocoa doesn't accept any arguments" "$LINENO" 5 -@@ -4502,7 +5146,8 @@ fi - - - # Check whether --with-osx_iphone was given. --if test "${with_osx_iphone+set}" = set; then : -+if test ${with_osx_iphone+y} -+then : - withval=$with_osx_iphone; - if test "$withval" != yes; then - as_fn_error $? "Option --with-osx_iphone doesn't accept any arguments" "$LINENO" 5 -@@ -4515,7 +5160,8 @@ fi - - - # Check whether --with-osx was given. --if test "${with_osx+set}" = set; then : -+if test ${with_osx+y} -+then : - withval=$with_osx; - if test "$withval" != yes; then - as_fn_error $? "Option --with-osx doesn't accept any arguments" "$LINENO" 5 -@@ -4528,7 +5174,8 @@ fi - - - # Check whether --with-cocoa was given. --if test "${with_cocoa+set}" = set; then : -+if test ${with_cocoa+y} -+then : - withval=$with_cocoa; - if test "$withval" != yes; then - as_fn_error $? "Option --with-cocoa doesn't accept any arguments" "$LINENO" 5 -@@ -4541,7 +5188,8 @@ fi - - - # Check whether --with-iphone was given. --if test "${with_iphone+set}" = set; then : -+if test ${with_iphone+y} -+then : - withval=$with_iphone; - if test "$withval" != yes; then - as_fn_error $? "Option --with-iphone doesn't accept any arguments" "$LINENO" 5 -@@ -4554,7 +5202,8 @@ fi - - - # Check whether --with-mac was given. --if test "${with_mac+set}" = set; then : -+if test ${with_mac+y} -+then : - withval=$with_mac; - if test "$withval" != yes; then - as_fn_error $? "Option --with-mac doesn't accept any arguments" "$LINENO" 5 -@@ -4567,7 +5216,8 @@ fi - - - # Check whether --with-wine was given. --if test "${with_wine+set}" = set; then : -+if test ${with_wine+y} -+then : - withval=$with_wine; - if test "$withval" != yes; then - as_fn_error $? "Option --with-wine doesn't accept any arguments" "$LINENO" 5 -@@ -4580,7 +5230,8 @@ fi - - - # Check whether --with-msw was given. --if test "${with_msw+set}" = set; then : -+if test ${with_msw+y} -+then : - withval=$with_msw; - if test "$withval" != yes; then - as_fn_error $? "Option --with-msw doesn't accept any arguments" "$LINENO" 5 -@@ -4593,7 +5244,8 @@ fi - - - # Check whether --with-directfb was given. --if test "${with_directfb+set}" = set; then : -+if test ${with_directfb+y} -+then : - withval=$with_directfb; - if test "$withval" != yes; then - as_fn_error $? "Option --with-directfb doesn't accept any arguments" "$LINENO" 5 -@@ -4606,7 +5258,8 @@ fi - - - # Check whether --with-x11 was given. --if test "${with_x11+set}" = set; then : -+if test ${with_x11+y} -+then : - withval=$with_x11; - if test "$withval" != yes; then - as_fn_error $? "Option --with-x11 doesn't accept any arguments" "$LINENO" 5 -@@ -4619,7 +5272,8 @@ fi - - - # Check whether --with-qt was given. --if test "${with_qt+set}" = set; then : -+if test ${with_qt+y} -+then : - withval=$with_qt; - if test "$withval" != yes; then - as_fn_error $? "Option --with-qt doesn't accept any arguments" "$LINENO" 5 -@@ -4630,6 +5284,20 @@ fi - - - -+ -+# Check whether --with-wasm was given. -+if test ${with_wasm+y} -+then : -+ withval=$with_wasm; -+ if test "$withval" != yes; then -+ as_fn_error $? "Option --with-wasm doesn't accept any arguments" "$LINENO" 5 -+ fi -+ wxUSE_WASM="$withval" CACHE_WASM=1 TOOLKIT_GIVEN=1 -+ -+fi -+ -+ -+ - enablestring= - defaultval= - if test -z "$defaultval"; then -@@ -4641,7 +5309,8 @@ fi - fi - - # Check whether --enable-nanox was given. --if test "${enable_nanox+set}" = set; then : -+if test ${enable_nanox+y} -+then : - enableval=$enable_nanox; - if test "$enableval" = yes; then - wx_cv_use_nanox='wxUSE_NANOX=yes' -@@ -4649,10 +5318,11 @@ if test "${enable_nanox+set}" = set; then : - wx_cv_use_nanox='wxUSE_NANOX=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -4670,7 +5340,8 @@ fi - fi - - # Check whether --enable-gpe was given. --if test "${enable_gpe+set}" = set; then : -+if test ${enable_gpe+y} -+then : - enableval=$enable_gpe; - if test "$enableval" = yes; then - wx_cv_use_gpe='wxUSE_GPE=yes' -@@ -4678,10 +5349,11 @@ if test "${enable_gpe+set}" = set; then : - wx_cv_use_gpe='wxUSE_GPE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -4689,8 +5361,8 @@ fi - - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for toolkit" >&5 --$as_echo_n "checking for toolkit... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for toolkit" >&5 -+printf %s "checking for toolkit... " >&6; } - - - -@@ -4735,7 +5407,7 @@ if test "$wxUSE_GUI" = "yes"; then - NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} \ - + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_DFB:-0} \ - + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} \ -- + ${wxUSE_X11:-0} + ${wxUSE_QT:-0}` -+ + ${wxUSE_X11:-0} + ${wxUSE_QT:-0} + ${wxUSE_WASM:-0}` - - - case "$NUM_TOOLKITS" in -@@ -4753,17 +5425,17 @@ if test "$wxUSE_GUI" = "yes"; then - eval "value=\$${var}" - if test "$value" = 1; then - toolkit_echo=`echo $toolkit | tr '[A-Z]' '[a-z]'` -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $toolkit_echo" >&5 --$as_echo "$toolkit_echo" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $toolkit_echo" >&5 -+printf "%s\n" "$toolkit_echo" >&6; } - fi - done - else - if test "x$host_alias" != "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: base ($host_alias hosted) only" >&5 --$as_echo "base ($host_alias hosted) only" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: base ($host_alias hosted) only" >&5 -+printf "%s\n" "base ($host_alias hosted) only" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: base only" >&5 --$as_echo "base only" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: base only" >&5 -+printf "%s\n" "base only" >&6; } - fi - fi - -@@ -4777,7 +5449,8 @@ fi - - - # Check whether --with-libpng was given. --if test "${with_libpng+set}" = set; then : -+if test ${with_libpng+y} -+then : - withval=$with_libpng; - if test "$withval" = yes; then - wx_cv_use_libpng='wxUSE_LIBPNG=yes' -@@ -4791,8 +5464,8 @@ if test "${with_libpng+set}" = set; then : - as_fn_error $? "Invalid value for --with-libpng: should be yes, no, sys, or builtin" "$LINENO" 5 - fi - --else -- -+else case e in #( -+ e) - if test "DEFAULT_wxUSE_LIBPNG" = no; then - value=no - elif test "$wxUSE_ALL_FEATURES" = no; then -@@ -4804,7 +5477,8 @@ else - fi - - wx_cv_use_libpng="wxUSE_LIBPNG=$value" -- -+ ;; -+esac - fi - - -@@ -4813,7 +5487,8 @@ fi - - - # Check whether --with-libjpeg was given. --if test "${with_libjpeg+set}" = set; then : -+if test ${with_libjpeg+y} -+then : - withval=$with_libjpeg; - if test "$withval" = yes; then - wx_cv_use_libjpeg='wxUSE_LIBJPEG=yes' -@@ -4827,8 +5502,8 @@ if test "${with_libjpeg+set}" = set; then : - as_fn_error $? "Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" "$LINENO" 5 - fi - --else -- -+else case e in #( -+ e) - if test "DEFAULT_wxUSE_LIBJPEG" = no; then - value=no - elif test "$wxUSE_ALL_FEATURES" = no; then -@@ -4840,7 +5515,8 @@ else - fi - - wx_cv_use_libjpeg="wxUSE_LIBJPEG=$value" -- -+ ;; -+esac - fi - - -@@ -4849,7 +5525,8 @@ fi - - - # Check whether --with-libtiff was given. --if test "${with_libtiff+set}" = set; then : -+if test ${with_libtiff+y} -+then : - withval=$with_libtiff; - if test "$withval" = yes; then - wx_cv_use_libtiff='wxUSE_LIBTIFF=yes' -@@ -4863,8 +5540,8 @@ if test "${with_libtiff+set}" = set; then : - as_fn_error $? "Invalid value for --with-libtiff: should be yes, no, sys, or builtin" "$LINENO" 5 - fi - --else -- -+else case e in #( -+ e) - if test "DEFAULT_wxUSE_LIBTIFF" = no; then - value=no - elif test "$wxUSE_ALL_FEATURES" = no; then -@@ -4876,7 +5553,8 @@ else - fi - - wx_cv_use_libtiff="wxUSE_LIBTIFF=$value" -- -+ ;; -+esac - fi - - -@@ -4898,7 +5576,8 @@ else - fi - - # Check whether --with-libjbig was given. --if test "${with_libjbig+set}" = set; then : -+if test ${with_libjbig+y} -+then : - withval=$with_libjbig; - if test "$withval" = yes; then - wx_cv_use_libjbig='wxUSE_LIBJBIG=yes' -@@ -4906,10 +5585,11 @@ if test "${with_libjbig+set}" = set; then : - wx_cv_use_libjbig='wxUSE_LIBJBIG=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_libjbig='wxUSE_LIBJBIG=${'DEFAULT_wxUSE_LIBJBIG":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -4920,7 +5600,8 @@ fi - - - # Check whether --with-libxpm was given. --if test "${with_libxpm+set}" = set; then : -+if test ${with_libxpm+y} -+then : - withval=$with_libxpm; - if test "$withval" = yes; then - wx_cv_use_libxpm='wxUSE_LIBXPM=yes' -@@ -4934,8 +5615,8 @@ if test "${with_libxpm+set}" = set; then : - as_fn_error $? "Invalid value for --with-libxpm: should be yes, no, sys, or builtin" "$LINENO" 5 - fi - --else -- -+else case e in #( -+ e) - if test "DEFAULT_wxUSE_LIBXPM" = no; then - value=no - elif test "$wxUSE_ALL_FEATURES" = no; then -@@ -4947,7 +5628,8 @@ else - fi - - wx_cv_use_libxpm="wxUSE_LIBXPM=$value" -- -+ ;; -+esac - fi - - -@@ -4965,7 +5647,8 @@ fi - fi - - # Check whether --with-libiconv was given. --if test "${with_libiconv+set}" = set; then : -+if test ${with_libiconv+y} -+then : - withval=$with_libiconv; - if test "$withval" = yes; then - wx_cv_use_libiconv='wxUSE_LIBICONV=yes' -@@ -4973,10 +5656,11 @@ if test "${with_libiconv+set}" = set; then : - wx_cv_use_libiconv='wxUSE_LIBICONV=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_libiconv='wxUSE_LIBICONV=${'DEFAULT_wxUSE_LIBICONV":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -4994,7 +5678,8 @@ fi - fi - - # Check whether --with-libmspack was given. --if test "${with_libmspack+set}" = set; then : -+if test ${with_libmspack+y} -+then : - withval=$with_libmspack; - if test "$withval" = yes; then - wx_cv_use_libmspack='wxUSE_LIBMSPACK=yes' -@@ -5002,10 +5687,11 @@ if test "${with_libmspack+set}" = set; then : - wx_cv_use_libmspack='wxUSE_LIBMSPACK=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5023,7 +5709,8 @@ fi - fi - - # Check whether --with-gtkprint was given. --if test "${with_gtkprint+set}" = set; then : -+if test ${with_gtkprint+y} -+then : - withval=$with_gtkprint; - if test "$withval" = yes; then - wx_cv_use_gtkprint='wxUSE_GTKPRINT=yes' -@@ -5031,10 +5718,11 @@ if test "${with_gtkprint+set}" = set; then : - wx_cv_use_gtkprint='wxUSE_GTKPRINT=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_gtkprint='wxUSE_GTKPRINT=${'DEFAULT_wxUSE_GTKPRINT":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5052,7 +5740,8 @@ fi - fi - - # Check whether --with-gnomevfs was given. --if test "${with_gnomevfs+set}" = set; then : -+if test ${with_gnomevfs+y} -+then : - withval=$with_gnomevfs; - if test "$withval" = yes; then - wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=yes' -@@ -5060,10 +5749,11 @@ if test "${with_gnomevfs+set}" = set; then : - wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5081,7 +5771,8 @@ fi - fi - - # Check whether --with-libnotify was given. --if test "${with_libnotify+set}" = set; then : -+if test ${with_libnotify+y} -+then : - withval=$with_libnotify; - if test "$withval" = yes; then - wx_cv_use_libnotify='wxUSE_LIBNOTIFY=yes' -@@ -5089,10 +5780,11 @@ if test "${with_libnotify+set}" = set; then : - wx_cv_use_libnotify='wxUSE_LIBNOTIFY=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_libnotify='wxUSE_LIBNOTIFY=${'DEFAULT_wxUSE_LIBNOTIFY":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5110,7 +5802,8 @@ fi - fi - - # Check whether --with-opengl was given. --if test "${with_opengl+set}" = set; then : -+if test ${with_opengl+y} -+then : - withval=$with_opengl; - if test "$withval" = yes; then - wx_cv_use_opengl='wxUSE_OPENGL=yes' -@@ -5118,10 +5811,11 @@ if test "${with_opengl+set}" = set; then : - wx_cv_use_opengl='wxUSE_OPENGL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5139,7 +5833,8 @@ fi - fi - - # Check whether --with-xtest was given. --if test "${with_xtest+set}" = set; then : -+if test ${with_xtest+y} -+then : - withval=$with_xtest; - if test "$withval" = yes; then - wx_cv_use_xtest='wxUSE_XTEST=yes' -@@ -5147,10 +5842,11 @@ if test "${with_xtest+set}" = set; then : - wx_cv_use_xtest='wxUSE_XTEST=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_xtest='wxUSE_XTEST=${'DEFAULT_wxUSE_XTEST":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5168,7 +5864,8 @@ fi - fi - - # Check whether --with-nanosvg was given. --if test "${with_nanosvg+set}" = set; then : -+if test ${with_nanosvg+y} -+then : - withval=$with_nanosvg; - if test "$withval" = yes; then - wx_cv_use_nanosvg='wxUSE_NANOSVG=yes' -@@ -5176,10 +5873,11 @@ if test "${with_nanosvg+set}" = set; then : - wx_cv_use_nanosvg='wxUSE_NANOSVG=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_nanosvg='wxUSE_NANOSVG=${'DEFAULT_wxUSE_NANOSVG":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5203,7 +5901,8 @@ if test "$wx_needs_cairo_for_gc" != 1; then - fi - - # Check whether --with-cairo was given. --if test "${with_cairo+set}" = set; then : -+if test ${with_cairo+y} -+then : - withval=$with_cairo; - if test "$withval" = yes; then - wx_cv_use_cairo='wxUSE_CAIRO=yes' -@@ -5211,10 +5910,11 @@ if test "${with_cairo+set}" = set; then : - wx_cv_use_cairo='wxUSE_CAIRO=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_cairo='wxUSE_CAIRO=${'DEFAULT_wxUSE_CAIRO":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5236,7 +5936,8 @@ fi - fi - - # Check whether --with-dmalloc was given. --if test "${with_dmalloc+set}" = set; then : -+if test ${with_dmalloc+y} -+then : - withval=$with_dmalloc; - if test "$withval" = yes; then - wx_cv_use_dmalloc='wxUSE_DMALLOC=yes' -@@ -5244,10 +5945,11 @@ if test "${with_dmalloc+set}" = set; then : - wx_cv_use_dmalloc='wxUSE_DMALLOC=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5265,7 +5967,8 @@ fi - fi - - # Check whether --with-sdl was given. --if test "${with_sdl+set}" = set; then : -+if test ${with_sdl+y} -+then : - withval=$with_sdl; - if test "$withval" = yes; then - wx_cv_use_sdl='wxUSE_LIBSDL=yes' -@@ -5273,10 +5976,11 @@ if test "${with_sdl+set}" = set; then : - wx_cv_use_sdl='wxUSE_LIBSDL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5285,7 +5989,8 @@ fi - - - # Check whether --with-regex was given. --if test "${with_regex+set}" = set; then : -+if test ${with_regex+y} -+then : - withval=$with_regex; - if test "$withval" = yes; then - wx_cv_use_regex='wxUSE_REGEX=yes' -@@ -5299,8 +6004,8 @@ if test "${with_regex+set}" = set; then : - as_fn_error $? "Invalid value for --with-regex: should be yes, no, sys, or builtin" "$LINENO" 5 - fi - --else -- -+else case e in #( -+ e) - if test "DEFAULT_wxUSE_REGEX" = no; then - value=no - elif test "$wxUSE_ALL_FEATURES" = no; then -@@ -5312,7 +6017,8 @@ else - fi - - wx_cv_use_regex="wxUSE_REGEX=$value" -- -+ ;; -+esac - fi - - -@@ -5330,7 +6036,8 @@ fi - fi - - # Check whether --with-liblzma was given. --if test "${with_liblzma+set}" = set; then : -+if test ${with_liblzma+y} -+then : - withval=$with_liblzma; - if test "$withval" = yes; then - wx_cv_use_liblzma='wxUSE_LIBLZMA=yes' -@@ -5338,10 +6045,11 @@ if test "${with_liblzma+set}" = set; then : - wx_cv_use_liblzma='wxUSE_LIBLZMA=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_liblzma='wxUSE_LIBLZMA=${'DEFAULT_wxUSE_LIBLZMA":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5350,7 +6058,8 @@ fi - - - # Check whether --with-zlib was given. --if test "${with_zlib+set}" = set; then : -+if test ${with_zlib+y} -+then : - withval=$with_zlib; - if test "$withval" = yes; then - wx_cv_use_zlib='wxUSE_ZLIB=yes' -@@ -5364,8 +6073,8 @@ if test "${with_zlib+set}" = set; then : - as_fn_error $? "Invalid value for --with-zlib: should be yes, no, sys, or builtin" "$LINENO" 5 - fi - --else -- -+else case e in #( -+ e) - if test "DEFAULT_wxUSE_ZLIB" = no; then - value=no - elif test "$wxUSE_ALL_FEATURES" = no; then -@@ -5377,7 +6086,8 @@ else - fi - - wx_cv_use_zlib="wxUSE_ZLIB=$value" -- -+ ;; -+esac - fi - - -@@ -5386,7 +6096,8 @@ fi - - - # Check whether --with-expat was given. --if test "${with_expat+set}" = set; then : -+if test ${with_expat+y} -+then : - withval=$with_expat; - if test "$withval" = yes; then - wx_cv_use_expat='wxUSE_EXPAT=yes' -@@ -5400,8 +6111,8 @@ if test "${with_expat+set}" = set; then : - as_fn_error $? "Invalid value for --with-expat: should be yes, no, sys, or builtin" "$LINENO" 5 - fi - --else -- -+else case e in #( -+ e) - if test "DEFAULT_wxUSE_EXPAT" = no; then - value=no - elif test "$wxUSE_ALL_FEATURES" = no; then -@@ -5413,7 +6124,8 @@ else - fi - - wx_cv_use_expat="wxUSE_EXPAT=$value" -- -+ ;; -+esac - fi - - -@@ -5432,7 +6144,8 @@ fi - fi - - # Check whether --with-libcurl was given. --if test "${with_libcurl+set}" = set; then : -+if test ${with_libcurl+y} -+then : - withval=$with_libcurl; - if test "$withval" = yes; then - wx_cv_use_libcurl='wxUSE_LIBCURL=yes' -@@ -5440,10 +6153,11 @@ if test "${with_libcurl+set}" = set; then : - wx_cv_use_libcurl='wxUSE_LIBCURL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_libcurl='wxUSE_LIBCURL=${'DEFAULT_wxUSE_LIBCURL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5461,7 +6175,8 @@ fi - fi - - # Check whether --with-winhttp was given. --if test "${with_winhttp+set}" = set; then : -+if test ${with_winhttp+y} -+then : - withval=$with_winhttp; - if test "$withval" = yes; then - wx_cv_use_winhttp='wxUSE_WINHTTP=yes' -@@ -5469,10 +6184,11 @@ if test "${with_winhttp+set}" = set; then : - wx_cv_use_winhttp='wxUSE_WINHTTP=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_winhttp='wxUSE_WINHTTP=${'DEFAULT_wxUSE_WINHTTP":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5491,7 +6207,8 @@ if test "$USE_DARWIN" = 1; then - fi - - # Check whether --with-urlsession was given. --if test "${with_urlsession+set}" = set; then : -+if test ${with_urlsession+y} -+then : - withval=$with_urlsession; - if test "$withval" = yes; then - wx_cv_use_urlsession='wxUSE_URLSESSION=yes' -@@ -5499,10 +6216,11 @@ if test "${with_urlsession+set}" = set; then : - wx_cv_use_urlsession='wxUSE_URLSESSION=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_urlsession='wxUSE_URLSESSION=${'DEFAULT_wxUSE_URLSESSION":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5514,7 +6232,8 @@ if test "$USE_DARWIN" = 1; then - - - # Check whether --with-macosx-sdk was given. --if test "${with_macosx_sdk+set}" = set; then : -+if test ${with_macosx_sdk+y} -+then : - withval=$with_macosx_sdk; - wxUSE_MACOSX_SDK=$withval - wx_cv_use_macosx_sdk="wxUSE_MACOSX_SDK=$withval" -@@ -5524,7 +6243,8 @@ fi - - - # Check whether --with-macosx-version-min was given. --if test "${with_macosx_version_min+set}" = set; then : -+if test ${with_macosx_version_min+y} -+then : - withval=$with_macosx_version_min; - wxUSE_MACOSX_VERSION_MIN=$withval - wx_cv_use_macosx_version_min="wxUSE_MACOSX_VERSION_MIN=$withval" -@@ -5535,7 +6255,8 @@ fi - fi - - # Check whether --enable-debug was given. --if test "${enable_debug+set}" = set; then : -+if test ${enable_debug+y} -+then : - enableval=$enable_debug; - if test "$enableval" = yes; then - wxUSE_DEBUG=yes -@@ -5548,9 +6269,10 @@ if test "${enable_debug+set}" = set; then : - as_fn_error $? "Invalid --enable-debug value, must be yes, no or max" "$LINENO" 5 - fi - --else -- wxUSE_DEBUG=default -- -+else case e in #( -+ e) wxUSE_DEBUG=default -+ ;; -+esac - fi - - -@@ -5585,7 +6307,8 @@ esac - fi - - # Check whether --enable-debug_flag was given. --if test "${enable_debug_flag+set}" = set; then : -+if test ${enable_debug_flag+y} -+then : - enableval=$enable_debug_flag; - if test "$enableval" = yes; then - wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes' -@@ -5593,10 +6316,11 @@ if test "${enable_debug_flag+set}" = set; then : - wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5614,7 +6338,8 @@ fi - fi - - # Check whether --enable-debug_info was given. --if test "${enable_debug_info+set}" = set; then : -+if test ${enable_debug_info+y} -+then : - enableval=$enable_debug_info; - if test "$enableval" = yes; then - wx_cv_use_debug_info='wxUSE_DEBUG_INFO=yes' -@@ -5622,10 +6347,11 @@ if test "${enable_debug_info+set}" = set; then : - wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5645,7 +6371,8 @@ fi - fi - - # Check whether --enable-debug_gdb was given. --if test "${enable_debug_gdb+set}" = set; then : -+if test ${enable_debug_gdb+y} -+then : - enableval=$enable_debug_gdb; - if test "$enableval" = yes; then - wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes' -@@ -5653,10 +6380,11 @@ if test "${enable_debug_gdb+set}" = set; then : - wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5674,7 +6402,8 @@ fi - fi - - # Check whether --enable-debug_cntxt was given. --if test "${enable_debug_cntxt+set}" = set; then : -+if test ${enable_debug_cntxt+y} -+then : - enableval=$enable_debug_cntxt; - if test "$enableval" = yes; then - wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes' -@@ -5682,10 +6411,11 @@ if test "${enable_debug_cntxt+set}" = set; then : - wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5703,7 +6433,8 @@ fi - fi - - # Check whether --enable-mem_tracing was given. --if test "${enable_mem_tracing+set}" = set; then : -+if test ${enable_mem_tracing+y} -+then : - enableval=$enable_mem_tracing; - if test "$enableval" = yes; then - wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes' -@@ -5711,10 +6442,11 @@ if test "${enable_mem_tracing+set}" = set; then : - wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5734,7 +6466,8 @@ fi - fi - - # Check whether --enable-shared was given. --if test "${enable_shared+set}" = set; then : -+if test ${enable_shared+y} -+then : - enableval=$enable_shared; - if test "$enableval" = yes; then - wx_cv_use_shared='wxUSE_SHARED=yes' -@@ -5742,23 +6475,26 @@ if test "${enable_shared+set}" = set; then : - wx_cv_use_shared='wxUSE_SHARED=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}" -- -+ ;; -+esac - fi - - - eval "$wx_cv_use_shared" - - # Check whether --enable-cxx11 was given. --if test "${enable_cxx11+set}" = set; then : -+if test ${enable_cxx11+y} -+then : - enableval=$enable_cxx11; wxWITH_CXX=11 wxWITH_CXX_IS_OPTIONAL=1 - fi - - - # Check whether --with-cxx was given. --if test "${with_cxx+set}" = set; then : -+if test ${with_cxx+y} -+then : - withval=$with_cxx; wxWITH_CXX="$withval" - fi - -@@ -5774,7 +6510,8 @@ fi - fi - - # Check whether --enable-stl was given. --if test "${enable_stl+set}" = set; then : -+if test ${enable_stl+y} -+then : - enableval=$enable_stl; - if test "$enableval" = yes; then - wx_cv_use_stl='wxUSE_STL=yes' -@@ -5782,10 +6519,11 @@ if test "${enable_stl+set}" = set; then : - wx_cv_use_stl='wxUSE_STL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5809,7 +6547,8 @@ fi - fi - - # Check whether --enable-std_containers was given. --if test "${enable_std_containers+set}" = set; then : -+if test ${enable_std_containers+y} -+then : - enableval=$enable_std_containers; - if test "$enableval" = yes; then - wx_cv_use_std_containers='wxUSE_STD_CONTAINERS=yes' -@@ -5817,10 +6556,11 @@ if test "${enable_std_containers+set}" = set; then : - wx_cv_use_std_containers='wxUSE_STD_CONTAINERS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_std_containers='wxUSE_STD_CONTAINERS=${'DEFAULT_wxUSE_STD_CONTAINERS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5838,7 +6578,8 @@ fi - fi - - # Check whether --enable-std_containers_compat was given. --if test "${enable_std_containers_compat+set}" = set; then : -+if test ${enable_std_containers_compat+y} -+then : - enableval=$enable_std_containers_compat; - if test "$enableval" = yes; then - wx_cv_use_std_containers_compat='wxUSE_STD_CONTAINERS_COMPATIBLY=yes' -@@ -5846,10 +6587,11 @@ if test "${enable_std_containers_compat+set}" = set; then : - wx_cv_use_std_containers_compat='wxUSE_STD_CONTAINERS_COMPATIBLY=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_std_containers_compat='wxUSE_STD_CONTAINERS_COMPATIBLY=${'DEFAULT_wxUSE_STD_CONTAINERS_COMPATIBLY":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5867,7 +6609,8 @@ fi - fi - - # Check whether --enable-std_iostreams was given. --if test "${enable_std_iostreams+set}" = set; then : -+if test ${enable_std_iostreams+y} -+then : - enableval=$enable_std_iostreams; - if test "$enableval" = yes; then - wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes' -@@ -5875,10 +6618,11 @@ if test "${enable_std_iostreams+set}" = set; then : - wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5896,7 +6640,8 @@ fi - fi - - # Check whether --enable-std_string was given. --if test "${enable_std_string+set}" = set; then : -+if test ${enable_std_string+y} -+then : - enableval=$enable_std_string; - if test "$enableval" = yes; then - wx_cv_use_std_string='wxUSE_STD_STRING=yes' -@@ -5904,10 +6649,11 @@ if test "${enable_std_string+set}" = set; then : - wx_cv_use_std_string='wxUSE_STD_STRING=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5925,7 +6671,8 @@ fi - fi - - # Check whether --enable-std_string_conv_in_wxstring was given. --if test "${enable_std_string_conv_in_wxstring+set}" = set; then : -+if test ${enable_std_string_conv_in_wxstring+y} -+then : - enableval=$enable_std_string_conv_in_wxstring; - if test "$enableval" = yes; then - wx_cv_use_std_string_conv_in_wxstring='wxUSE_STD_STRING_CONV_IN_WXSTRING=yes' -@@ -5933,10 +6680,11 @@ if test "${enable_std_string_conv_in_wxstring+set}" = set; then : - wx_cv_use_std_string_conv_in_wxstring='wxUSE_STD_STRING_CONV_IN_WXSTRING=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_std_string_conv_in_wxstring='wxUSE_STD_STRING_CONV_IN_WXSTRING=${'DEFAULT_wxUSE_STD_STRING_CONV_IN_WXSTRING":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5954,7 +6702,8 @@ fi - fi - - # Check whether --enable-unsafe_conv_in_wxstring was given. --if test "${enable_unsafe_conv_in_wxstring+set}" = set; then : -+if test ${enable_unsafe_conv_in_wxstring+y} -+then : - enableval=$enable_unsafe_conv_in_wxstring; - if test "$enableval" = yes; then - wx_cv_use_unsafe_conv_in_wxstring='wxUSE_UNSAFE_WXSTRING_CONV=yes' -@@ -5962,10 +6711,11 @@ if test "${enable_unsafe_conv_in_wxstring+set}" = set; then : - wx_cv_use_unsafe_conv_in_wxstring='wxUSE_UNSAFE_WXSTRING_CONV=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_unsafe_conv_in_wxstring='wxUSE_UNSAFE_WXSTRING_CONV=${'DEFAULT_wxUSE_UNSAFE_WXSTRING_CONV":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -5983,7 +6733,8 @@ fi - fi - - # Check whether --enable-unicode was given. --if test "${enable_unicode+set}" = set; then : -+if test ${enable_unicode+y} -+then : - enableval=$enable_unicode; - if test "$enableval" = yes; then - wx_cv_use_unicode='wxUSE_UNICODE=yes' -@@ -5991,10 +6742,11 @@ if test "${enable_unicode+set}" = set; then : - wx_cv_use_unicode='wxUSE_UNICODE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6003,14 +6755,16 @@ fi - - enablestring= - # Check whether --enable-utf8 was given. --if test "${enable_utf8+set}" = set; then : -+if test ${enable_utf8+y} -+then : - enableval=$enable_utf8; - wx_cv_use_utf8="wxUSE_UNICODE_UTF8='$enableval'" - --else -- -+else case e in #( -+ e) - wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8 -- -+ ;; -+esac - fi - - -@@ -6028,7 +6782,8 @@ fi - fi - - # Check whether --enable-utf8only was given. --if test "${enable_utf8only+set}" = set; then : -+if test ${enable_utf8only+y} -+then : - enableval=$enable_utf8only; - if test "$enableval" = yes; then - wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=yes' -@@ -6036,10 +6791,11 @@ if test "${enable_utf8only+set}" = set; then : - wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6057,7 +6813,8 @@ fi - fi - - # Check whether --enable-extended_rtti was given. --if test "${enable_extended_rtti+set}" = set; then : -+if test ${enable_extended_rtti+y} -+then : - enableval=$enable_extended_rtti; - if test "$enableval" = yes; then - wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=yes' -@@ -6065,10 +6822,11 @@ if test "${enable_extended_rtti+set}" = set; then : - wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6087,7 +6845,8 @@ fi - fi - - # Check whether --enable-optimise was given. --if test "${enable_optimise+set}" = set; then : -+if test ${enable_optimise+y} -+then : - enableval=$enable_optimise; - if test "$enableval" = yes; then - wx_cv_use_optimise='wxUSE_OPTIMISE=yes' -@@ -6095,10 +6854,11 @@ if test "${enable_optimise+set}" = set; then : - wx_cv_use_optimise='wxUSE_OPTIMISE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6117,7 +6877,8 @@ fi - fi - - # Check whether --enable-profile was given. --if test "${enable_profile+set}" = set; then : -+if test ${enable_profile+y} -+then : - enableval=$enable_profile; - if test "$enableval" = yes; then - wx_cv_use_profile='wxUSE_PROFILE=yes' -@@ -6125,10 +6886,11 @@ if test "${enable_profile+set}" = set; then : - wx_cv_use_profile='wxUSE_PROFILE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6146,7 +6908,8 @@ fi - fi - - # Check whether --enable-pic was given. --if test "${enable_pic+set}" = set; then : -+if test ${enable_pic+y} -+then : - enableval=$enable_pic; - if test "$enableval" = yes; then - wx_cv_use_pic='wxUSE_PIC=yes' -@@ -6154,10 +6917,11 @@ if test "${enable_pic+set}" = set; then : - wx_cv_use_pic='wxUSE_PIC=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_pic='wxUSE_PIC=${'DEFAULT_wxUSE_PIC":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6175,7 +6939,8 @@ fi - fi - - # Check whether --enable-no_rtti was given. --if test "${enable_no_rtti+set}" = set; then : -+if test ${enable_no_rtti+y} -+then : - enableval=$enable_no_rtti; - if test "$enableval" = yes; then - wx_cv_use_no_rtti='wxUSE_NO_RTTI=yes' -@@ -6183,10 +6948,11 @@ if test "${enable_no_rtti+set}" = set; then : - wx_cv_use_no_rtti='wxUSE_NO_RTTI=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6204,7 +6970,8 @@ fi - fi - - # Check whether --enable-no_exceptions was given. --if test "${enable_no_exceptions+set}" = set; then : -+if test ${enable_no_exceptions+y} -+then : - enableval=$enable_no_exceptions; - if test "$enableval" = yes; then - wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=yes' -@@ -6212,10 +6979,11 @@ if test "${enable_no_exceptions+set}" = set; then : - wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6233,7 +7001,8 @@ fi - fi - - # Check whether --enable-permissive was given. --if test "${enable_permissive+set}" = set; then : -+if test ${enable_permissive+y} -+then : - enableval=$enable_permissive; - if test "$enableval" = yes; then - wx_cv_use_permissive='wxUSE_PERMISSIVE=yes' -@@ -6241,10 +7010,11 @@ if test "${enable_permissive+set}" = set; then : - wx_cv_use_permissive='wxUSE_PERMISSIVE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6262,7 +7032,8 @@ fi - fi - - # Check whether --enable-vararg_macros was given. --if test "${enable_vararg_macros+set}" = set; then : -+if test ${enable_vararg_macros+y} -+then : - enableval=$enable_vararg_macros; - if test "$enableval" = yes; then - wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=yes' -@@ -6270,10 +7041,11 @@ if test "${enable_vararg_macros+set}" = set; then : - wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6284,14 +7056,16 @@ if test "$USE_DARWIN" = 1; then - - enablestring= - # Check whether --enable-universal_binary was given. --if test "${enable_universal_binary+set}" = set; then : -+if test ${enable_universal_binary+y} -+then : - enableval=$enable_universal_binary; - wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY='$enableval'" - --else -- -+else case e in #( -+ e) - wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY -- -+ ;; -+esac - fi - - -@@ -6300,14 +7074,16 @@ fi - - enablestring= - # Check whether --enable-macosx_arch was given. --if test "${enable_macosx_arch+set}" = set; then : -+if test ${enable_macosx_arch+y} -+then : - enableval=$enable_macosx_arch; - wx_cv_use_macosx_arch="wxUSE_MAC_ARCH='$enableval'" - --else -- -+else case e in #( -+ e) - wx_cv_use_macosx_arch='wxUSE_MAC_ARCH='$DEFAULT_wxUSE_MAC_ARCH -- -+ ;; -+esac - fi - - -@@ -6326,7 +7102,8 @@ fi - fi - - # Check whether --enable-compat28 was given. --if test "${enable_compat28+set}" = set; then : -+if test ${enable_compat28+y} -+then : - enableval=$enable_compat28; - if test "$enableval" = yes; then - wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=yes' -@@ -6334,10 +7111,11 @@ if test "${enable_compat28+set}" = set; then : - wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6355,7 +7133,8 @@ fi - fi - - # Check whether --enable-compat30 was given. --if test "${enable_compat30+set}" = set; then : -+if test ${enable_compat30+y} -+then : - enableval=$enable_compat30; - if test "$enableval" = yes; then - wx_cv_use_compat30='WXWIN_COMPATIBILITY_3_0=yes' -@@ -6363,10 +7142,11 @@ if test "${enable_compat30+set}" = set; then : - wx_cv_use_compat30='WXWIN_COMPATIBILITY_3_0=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_compat30='WXWIN_COMPATIBILITY_3_0=${'DEFAULT_WXWIN_COMPATIBILITY_3_0":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6385,7 +7165,8 @@ fi - fi - - # Check whether --enable-rpath was given. --if test "${enable_rpath+set}" = set; then : -+if test ${enable_rpath+y} -+then : - enableval=$enable_rpath; - if test "$enableval" = yes; then - wx_cv_use_rpath='wxUSE_RPATH=yes' -@@ -6393,10 +7174,11 @@ if test "${enable_rpath+set}" = set; then : - wx_cv_use_rpath='wxUSE_RPATH=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6415,7 +7197,8 @@ fi - fi - - # Check whether --enable-visibility was given. --if test "${enable_visibility+set}" = set; then : -+if test ${enable_visibility+y} -+then : - enableval=$enable_visibility; - if test "$enableval" = yes; then - wx_cv_use_visibility='wxUSE_VISIBILITY=yes' -@@ -6423,10 +7206,11 @@ if test "${enable_visibility+set}" = set; then : - wx_cv_use_visibility='wxUSE_VISIBILITY=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6444,7 +7228,8 @@ fi - fi - - # Check whether --enable-tls was given. --if test "${enable_tls+set}" = set; then : -+if test ${enable_tls+y} -+then : - enableval=$enable_tls; - if test "$enableval" = yes; then - wx_cv_use_tls='wxUSE_COMPILER_TLS=yes' -@@ -6452,10 +7237,11 @@ if test "${enable_tls+set}" = set; then : - wx_cv_use_tls='wxUSE_COMPILER_TLS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_tls='wxUSE_COMPILER_TLS=${'DEFAULT_wxUSE_COMPILER_TLS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6474,7 +7260,8 @@ fi - fi - - # Check whether --enable-repro_build was given. --if test "${enable_repro_build+set}" = set; then : -+if test ${enable_repro_build+y} -+then : - enableval=$enable_repro_build; - if test "$enableval" = yes; then - wx_cv_use_repro_build='wxUSE_REPRODUCIBLE_BUILD=yes' -@@ -6482,10 +7269,11 @@ if test "${enable_repro_build+set}" = set; then : - wx_cv_use_repro_build='wxUSE_REPRODUCIBLE_BUILD=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_repro_build='wxUSE_REPRODUCIBLE_BUILD=${'DEFAULT_wxUSE_REPRODUCIBLE_BUILD":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6503,7 +7291,8 @@ fi - fi - - # Check whether --enable-pch was given. --if test "${enable_pch+set}" = set; then : -+if test ${enable_pch+y} -+then : - enableval=$enable_pch; - if test "$enableval" = yes; then - wx_cv_use_pch='wxUSE_PCH=yes' -@@ -6511,10 +7300,11 @@ if test "${enable_pch+set}" = set; then : - wx_cv_use_pch='wxUSE_PCH=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_pch='wxUSE_PCH=${'DEFAULT_wxUSE_PCH":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6534,7 +7324,8 @@ fi - fi - - # Check whether --enable-intl was given. --if test "${enable_intl+set}" = set; then : -+if test ${enable_intl+y} -+then : - enableval=$enable_intl; - if test "$enableval" = yes; then - wx_cv_use_intl='wxUSE_INTL=yes' -@@ -6542,10 +7333,11 @@ if test "${enable_intl+set}" = set; then : - wx_cv_use_intl='wxUSE_INTL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6563,7 +7355,8 @@ fi - fi - - # Check whether --enable-xlocale was given. --if test "${enable_xlocale+set}" = set; then : -+if test ${enable_xlocale+y} -+then : - enableval=$enable_xlocale; - if test "$enableval" = yes; then - wx_cv_use_xlocale='wxUSE_XLOCALE=yes' -@@ -6571,10 +7364,11 @@ if test "${enable_xlocale+set}" = set; then : - wx_cv_use_xlocale='wxUSE_XLOCALE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_xlocale='wxUSE_XLOCALE=${'DEFAULT_wxUSE_XLOCALE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6592,7 +7386,8 @@ fi - fi - - # Check whether --enable-config was given. --if test "${enable_config+set}" = set; then : -+if test ${enable_config+y} -+then : - enableval=$enable_config; - if test "$enableval" = yes; then - wx_cv_use_config='wxUSE_CONFIG=yes' -@@ -6600,10 +7395,11 @@ if test "${enable_config+set}" = set; then : - wx_cv_use_config='wxUSE_CONFIG=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6622,7 +7418,8 @@ fi - fi - - # Check whether --enable-protocols was given. --if test "${enable_protocols+set}" = set; then : -+if test ${enable_protocols+y} -+then : - enableval=$enable_protocols; - if test "$enableval" = yes; then - wx_cv_use_protocols='wxUSE_PROTOCOL=yes' -@@ -6630,10 +7427,11 @@ if test "${enable_protocols+set}" = set; then : - wx_cv_use_protocols='wxUSE_PROTOCOL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6651,7 +7449,8 @@ fi - fi - - # Check whether --enable-ftp was given. --if test "${enable_ftp+set}" = set; then : -+if test ${enable_ftp+y} -+then : - enableval=$enable_ftp; - if test "$enableval" = yes; then - wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=yes' -@@ -6659,10 +7458,11 @@ if test "${enable_ftp+set}" = set; then : - wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6680,7 +7480,8 @@ fi - fi - - # Check whether --enable-http was given. --if test "${enable_http+set}" = set; then : -+if test ${enable_http+y} -+then : - enableval=$enable_http; - if test "$enableval" = yes; then - wx_cv_use_http='wxUSE_PROTOCOL_HTTP=yes' -@@ -6688,10 +7489,11 @@ if test "${enable_http+set}" = set; then : - wx_cv_use_http='wxUSE_PROTOCOL_HTTP=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6709,7 +7511,8 @@ fi - fi - - # Check whether --enable-fileproto was given. --if test "${enable_fileproto+set}" = set; then : -+if test ${enable_fileproto+y} -+then : - enableval=$enable_fileproto; - if test "$enableval" = yes; then - wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=yes' -@@ -6717,10 +7520,11 @@ if test "${enable_fileproto+set}" = set; then : - wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6738,7 +7542,8 @@ fi - fi - - # Check whether --enable-sockets was given. --if test "${enable_sockets+set}" = set; then : -+if test ${enable_sockets+y} -+then : - enableval=$enable_sockets; - if test "$enableval" = yes; then - wx_cv_use_sockets='wxUSE_SOCKETS=yes' -@@ -6746,10 +7551,11 @@ if test "${enable_sockets+set}" = set; then : - wx_cv_use_sockets='wxUSE_SOCKETS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6767,7 +7573,8 @@ fi - fi - - # Check whether --enable-ipv6 was given. --if test "${enable_ipv6+set}" = set; then : -+if test ${enable_ipv6+y} -+then : - enableval=$enable_ipv6; - if test "$enableval" = yes; then - wx_cv_use_ipv6='wxUSE_IPV6=yes' -@@ -6775,10 +7582,11 @@ if test "${enable_ipv6+set}" = set; then : - wx_cv_use_ipv6='wxUSE_IPV6=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_ipv6='wxUSE_IPV6=${'DEFAULT_wxUSE_IPV6":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6796,7 +7604,8 @@ fi - fi - - # Check whether --enable-ole was given. --if test "${enable_ole+set}" = set; then : -+if test ${enable_ole+y} -+then : - enableval=$enable_ole; - if test "$enableval" = yes; then - wx_cv_use_ole='wxUSE_OLE=yes' -@@ -6804,10 +7613,11 @@ if test "${enable_ole+set}" = set; then : - wx_cv_use_ole='wxUSE_OLE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6825,7 +7635,8 @@ fi - fi - - # Check whether --enable-dataobj was given. --if test "${enable_dataobj+set}" = set; then : -+if test ${enable_dataobj+y} -+then : - enableval=$enable_dataobj; - if test "$enableval" = yes; then - wx_cv_use_dataobj='wxUSE_DATAOBJ=yes' -@@ -6833,10 +7644,11 @@ if test "${enable_dataobj+set}" = set; then : - wx_cv_use_dataobj='wxUSE_DATAOBJ=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6854,7 +7666,8 @@ fi - fi - - # Check whether --enable-webrequest was given. --if test "${enable_webrequest+set}" = set; then : -+if test ${enable_webrequest+y} -+then : - enableval=$enable_webrequest; - if test "$enableval" = yes; then - wx_cv_use_webrequest='wxUSE_WEBREQUEST=yes' -@@ -6862,10 +7675,11 @@ if test "${enable_webrequest+set}" = set; then : - wx_cv_use_webrequest='wxUSE_WEBREQUEST=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_webrequest='wxUSE_WEBREQUEST=${'DEFAULT_wxUSE_WEBREQUEST":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6884,7 +7698,8 @@ fi - fi - - # Check whether --enable-ipc was given. --if test "${enable_ipc+set}" = set; then : -+if test ${enable_ipc+y} -+then : - enableval=$enable_ipc; - if test "$enableval" = yes; then - wx_cv_use_ipc='wxUSE_IPC=yes' -@@ -6892,10 +7707,11 @@ if test "${enable_ipc+set}" = set; then : - wx_cv_use_ipc='wxUSE_IPC=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6914,7 +7730,8 @@ fi - fi - - # Check whether --enable-baseevtloop was given. --if test "${enable_baseevtloop+set}" = set; then : -+if test ${enable_baseevtloop+y} -+then : - enableval=$enable_baseevtloop; - if test "$enableval" = yes; then - wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=yes' -@@ -6922,10 +7739,11 @@ if test "${enable_baseevtloop+set}" = set; then : - wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=${'DEFAULT_wxUSE_CONSOLE_EVENTLOOP":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6943,7 +7761,8 @@ fi - fi - - # Check whether --enable-epollloop was given. --if test "${enable_epollloop+set}" = set; then : -+if test ${enable_epollloop+y} -+then : - enableval=$enable_epollloop; - if test "$enableval" = yes; then - wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=yes' -@@ -6951,10 +7770,11 @@ if test "${enable_epollloop+set}" = set; then : - wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -6972,7 +7792,8 @@ fi - fi - - # Check whether --enable-selectloop was given. --if test "${enable_selectloop+set}" = set; then : -+if test ${enable_selectloop+y} -+then : - enableval=$enable_selectloop; - if test "$enableval" = yes; then - wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=yes' -@@ -6980,10 +7801,11 @@ if test "${enable_selectloop+set}" = set; then : - wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=${'DEFAULT_wxUSE_SELECT_DISPATCHER":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7002,7 +7824,8 @@ fi - fi - - # Check whether --enable-any was given. --if test "${enable_any+set}" = set; then : -+if test ${enable_any+y} -+then : - enableval=$enable_any; - if test "$enableval" = yes; then - wx_cv_use_any='wxUSE_ANY=yes' -@@ -7010,10 +7833,11 @@ if test "${enable_any+set}" = set; then : - wx_cv_use_any='wxUSE_ANY=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_any='wxUSE_ANY=${'DEFAULT_wxUSE_ANY":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7031,7 +7855,8 @@ fi - fi - - # Check whether --enable-apple_ieee was given. --if test "${enable_apple_ieee+set}" = set; then : -+if test ${enable_apple_ieee+y} -+then : - enableval=$enable_apple_ieee; - if test "$enableval" = yes; then - wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes' -@@ -7039,10 +7864,11 @@ if test "${enable_apple_ieee+set}" = set; then : - wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7060,7 +7886,8 @@ fi - fi - - # Check whether --enable-arcstream was given. --if test "${enable_arcstream+set}" = set; then : -+if test ${enable_arcstream+y} -+then : - enableval=$enable_arcstream; - if test "$enableval" = yes; then - wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=yes' -@@ -7068,10 +7895,11 @@ if test "${enable_arcstream+set}" = set; then : - wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7089,7 +7917,8 @@ fi - fi - - # Check whether --enable-base64 was given. --if test "${enable_base64+set}" = set; then : -+if test ${enable_base64+y} -+then : - enableval=$enable_base64; - if test "$enableval" = yes; then - wx_cv_use_base64='wxUSE_BASE64=yes' -@@ -7097,10 +7926,11 @@ if test "${enable_base64+set}" = set; then : - wx_cv_use_base64='wxUSE_BASE64=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7118,7 +7948,8 @@ fi - fi - - # Check whether --enable-backtrace was given. --if test "${enable_backtrace+set}" = set; then : -+if test ${enable_backtrace+y} -+then : - enableval=$enable_backtrace; - if test "$enableval" = yes; then - wx_cv_use_backtrace='wxUSE_STACKWALKER=yes' -@@ -7126,10 +7957,11 @@ if test "${enable_backtrace+set}" = set; then : - wx_cv_use_backtrace='wxUSE_STACKWALKER=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7147,7 +7979,8 @@ fi - fi - - # Check whether --enable-catch_segvs was given. --if test "${enable_catch_segvs+set}" = set; then : -+if test ${enable_catch_segvs+y} -+then : - enableval=$enable_catch_segvs; - if test "$enableval" = yes; then - wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes' -@@ -7155,10 +7988,11 @@ if test "${enable_catch_segvs+set}" = set; then : - wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7176,7 +8010,8 @@ fi - fi - - # Check whether --enable-cmdline was given. --if test "${enable_cmdline+set}" = set; then : -+if test ${enable_cmdline+y} -+then : - enableval=$enable_cmdline; - if test "$enableval" = yes; then - wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes' -@@ -7184,10 +8019,11 @@ if test "${enable_cmdline+set}" = set; then : - wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7205,7 +8041,8 @@ fi - fi - - # Check whether --enable-datetime was given. --if test "${enable_datetime+set}" = set; then : -+if test ${enable_datetime+y} -+then : - enableval=$enable_datetime; - if test "$enableval" = yes; then - wx_cv_use_datetime='wxUSE_DATETIME=yes' -@@ -7213,10 +8050,11 @@ if test "${enable_datetime+set}" = set; then : - wx_cv_use_datetime='wxUSE_DATETIME=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7234,7 +8072,8 @@ fi - fi - - # Check whether --enable-debugreport was given. --if test "${enable_debugreport+set}" = set; then : -+if test ${enable_debugreport+y} -+then : - enableval=$enable_debugreport; - if test "$enableval" = yes; then - wx_cv_use_debugreport='wxUSE_DEBUGREPORT=yes' -@@ -7242,10 +8081,11 @@ if test "${enable_debugreport+set}" = set; then : - wx_cv_use_debugreport='wxUSE_DEBUGREPORT=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7263,7 +8103,8 @@ fi - fi - - # Check whether --enable-dialupman was given. --if test "${enable_dialupman+set}" = set; then : -+if test ${enable_dialupman+y} -+then : - enableval=$enable_dialupman; - if test "$enableval" = yes; then - wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes' -@@ -7271,10 +8112,11 @@ if test "${enable_dialupman+set}" = set; then : - wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7292,7 +8134,8 @@ fi - fi - - # Check whether --enable-dynlib was given. --if test "${enable_dynlib+set}" = set; then : -+if test ${enable_dynlib+y} -+then : - enableval=$enable_dynlib; - if test "$enableval" = yes; then - wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=yes' -@@ -7300,10 +8143,11 @@ if test "${enable_dynlib+set}" = set; then : - wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7321,7 +8165,8 @@ fi - fi - - # Check whether --enable-dynamicloader was given. --if test "${enable_dynamicloader+set}" = set; then : -+if test ${enable_dynamicloader+y} -+then : - enableval=$enable_dynamicloader; - if test "$enableval" = yes; then - wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=yes' -@@ -7329,10 +8174,11 @@ if test "${enable_dynamicloader+set}" = set; then : - wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7350,7 +8196,8 @@ fi - fi - - # Check whether --enable-exceptions was given. --if test "${enable_exceptions+set}" = set; then : -+if test ${enable_exceptions+y} -+then : - enableval=$enable_exceptions; - if test "$enableval" = yes; then - wx_cv_use_exceptions='wxUSE_EXCEPTIONS=yes' -@@ -7358,10 +8205,11 @@ if test "${enable_exceptions+set}" = set; then : - wx_cv_use_exceptions='wxUSE_EXCEPTIONS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7379,7 +8227,8 @@ fi - fi - - # Check whether --enable-ffile was given. --if test "${enable_ffile+set}" = set; then : -+if test ${enable_ffile+y} -+then : - enableval=$enable_ffile; - if test "$enableval" = yes; then - wx_cv_use_ffile='wxUSE_FFILE=yes' -@@ -7387,10 +8236,11 @@ if test "${enable_ffile+set}" = set; then : - wx_cv_use_ffile='wxUSE_FFILE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7408,7 +8258,8 @@ fi - fi - - # Check whether --enable-file was given. --if test "${enable_file+set}" = set; then : -+if test ${enable_file+y} -+then : - enableval=$enable_file; - if test "$enableval" = yes; then - wx_cv_use_file='wxUSE_FILE=yes' -@@ -7416,10 +8267,11 @@ if test "${enable_file+set}" = set; then : - wx_cv_use_file='wxUSE_FILE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7437,7 +8289,8 @@ fi - fi - - # Check whether --enable-filehistory was given. --if test "${enable_filehistory+set}" = set; then : -+if test ${enable_filehistory+y} -+then : - enableval=$enable_filehistory; - if test "$enableval" = yes; then - wx_cv_use_filehistory='wxUSE_FILE_HISTORY=yes' -@@ -7445,10 +8298,11 @@ if test "${enable_filehistory+set}" = set; then : - wx_cv_use_filehistory='wxUSE_FILE_HISTORY=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_filehistory='wxUSE_FILE_HISTORY=${'DEFAULT_wxUSE_FILE_HISTORY":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7466,7 +8320,8 @@ fi - fi - - # Check whether --enable-filesystem was given. --if test "${enable_filesystem+set}" = set; then : -+if test ${enable_filesystem+y} -+then : - enableval=$enable_filesystem; - if test "$enableval" = yes; then - wx_cv_use_filesystem='wxUSE_FILESYSTEM=yes' -@@ -7474,10 +8329,11 @@ if test "${enable_filesystem+set}" = set; then : - wx_cv_use_filesystem='wxUSE_FILESYSTEM=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7495,7 +8351,8 @@ fi - fi - - # Check whether --enable-fontenum was given. --if test "${enable_fontenum+set}" = set; then : -+if test ${enable_fontenum+y} -+then : - enableval=$enable_fontenum; - if test "$enableval" = yes; then - wx_cv_use_fontenum='wxUSE_FONTENUM=yes' -@@ -7503,10 +8360,11 @@ if test "${enable_fontenum+set}" = set; then : - wx_cv_use_fontenum='wxUSE_FONTENUM=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_fontenum='wxUSE_FONTENUM=${'DEFAULT_wxUSE_FONTENUM":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7524,7 +8382,8 @@ fi - fi - - # Check whether --enable-fontmap was given. --if test "${enable_fontmap+set}" = set; then : -+if test ${enable_fontmap+y} -+then : - enableval=$enable_fontmap; - if test "$enableval" = yes; then - wx_cv_use_fontmap='wxUSE_FONTMAP=yes' -@@ -7532,10 +8391,11 @@ if test "${enable_fontmap+set}" = set; then : - wx_cv_use_fontmap='wxUSE_FONTMAP=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7553,7 +8413,8 @@ fi - fi - - # Check whether --enable-fs_archive was given. --if test "${enable_fs_archive+set}" = set; then : -+if test ${enable_fs_archive+y} -+then : - enableval=$enable_fs_archive; - if test "$enableval" = yes; then - wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=yes' -@@ -7561,10 +8422,11 @@ if test "${enable_fs_archive+set}" = set; then : - wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7582,7 +8444,8 @@ fi - fi - - # Check whether --enable-fs_inet was given. --if test "${enable_fs_inet+set}" = set; then : -+if test ${enable_fs_inet+y} -+then : - enableval=$enable_fs_inet; - if test "$enableval" = yes; then - wx_cv_use_fs_inet='wxUSE_FS_INET=yes' -@@ -7590,10 +8453,11 @@ if test "${enable_fs_inet+set}" = set; then : - wx_cv_use_fs_inet='wxUSE_FS_INET=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7611,7 +8475,8 @@ fi - fi - - # Check whether --enable-fs_zip was given. --if test "${enable_fs_zip+set}" = set; then : -+if test ${enable_fs_zip+y} -+then : - enableval=$enable_fs_zip; - if test "$enableval" = yes; then - wx_cv_use_fs_zip='wxUSE_FS_ZIP=yes' -@@ -7619,10 +8484,11 @@ if test "${enable_fs_zip+set}" = set; then : - wx_cv_use_fs_zip='wxUSE_FS_ZIP=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7640,7 +8506,8 @@ fi - fi - - # Check whether --enable-fsvolume was given. --if test "${enable_fsvolume+set}" = set; then : -+if test ${enable_fsvolume+y} -+then : - enableval=$enable_fsvolume; - if test "$enableval" = yes; then - wx_cv_use_fsvolume='wxUSE_FSVOLUME=yes' -@@ -7648,10 +8515,11 @@ if test "${enable_fsvolume+set}" = set; then : - wx_cv_use_fsvolume='wxUSE_FSVOLUME=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_fsvolume='wxUSE_FSVOLUME=${'DEFAULT_wxUSE_FSVOLUME":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7669,7 +8537,8 @@ fi - fi - - # Check whether --enable-fswatcher was given. --if test "${enable_fswatcher+set}" = set; then : -+if test ${enable_fswatcher+y} -+then : - enableval=$enable_fswatcher; - if test "$enableval" = yes; then - wx_cv_use_fswatcher='wxUSE_FSWATCHER=yes' -@@ -7677,10 +8546,11 @@ if test "${enable_fswatcher+set}" = set; then : - wx_cv_use_fswatcher='wxUSE_FSWATCHER=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_fswatcher='wxUSE_FSWATCHER=${'DEFAULT_wxUSE_FSWATCHER":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7698,7 +8568,8 @@ fi - fi - - # Check whether --enable-geometry was given. --if test "${enable_geometry+set}" = set; then : -+if test ${enable_geometry+y} -+then : - enableval=$enable_geometry; - if test "$enableval" = yes; then - wx_cv_use_geometry='wxUSE_GEOMETRY=yes' -@@ -7706,10 +8577,11 @@ if test "${enable_geometry+set}" = set; then : - wx_cv_use_geometry='wxUSE_GEOMETRY=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7727,7 +8599,8 @@ fi - fi - - # Check whether --enable-log was given. --if test "${enable_log+set}" = set; then : -+if test ${enable_log+y} -+then : - enableval=$enable_log; - if test "$enableval" = yes; then - wx_cv_use_log='wxUSE_LOG=yes' -@@ -7735,10 +8608,11 @@ if test "${enable_log+set}" = set; then : - wx_cv_use_log='wxUSE_LOG=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7756,7 +8630,8 @@ fi - fi - - # Check whether --enable-longlong was given. --if test "${enable_longlong+set}" = set; then : -+if test ${enable_longlong+y} -+then : - enableval=$enable_longlong; - if test "$enableval" = yes; then - wx_cv_use_longlong='wxUSE_LONGLONG=yes' -@@ -7764,10 +8639,11 @@ if test "${enable_longlong+set}" = set; then : - wx_cv_use_longlong='wxUSE_LONGLONG=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7785,7 +8661,8 @@ fi - fi - - # Check whether --enable-mimetype was given. --if test "${enable_mimetype+set}" = set; then : -+if test ${enable_mimetype+y} -+then : - enableval=$enable_mimetype; - if test "$enableval" = yes; then - wx_cv_use_mimetype='wxUSE_MIMETYPE=yes' -@@ -7793,10 +8670,11 @@ if test "${enable_mimetype+set}" = set; then : - wx_cv_use_mimetype='wxUSE_MIMETYPE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7814,7 +8692,8 @@ fi - fi - - # Check whether --enable-printfposparam was given. --if test "${enable_printfposparam+set}" = set; then : -+if test ${enable_printfposparam+y} -+then : - enableval=$enable_printfposparam; - if test "$enableval" = yes; then - wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=yes' -@@ -7822,10 +8701,11 @@ if test "${enable_printfposparam+set}" = set; then : - wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7843,7 +8723,8 @@ fi - fi - - # Check whether --enable-secretstore was given. --if test "${enable_secretstore+set}" = set; then : -+if test ${enable_secretstore+y} -+then : - enableval=$enable_secretstore; - if test "$enableval" = yes; then - wx_cv_use_secretstore='wxUSE_SECRETSTORE=yes' -@@ -7851,10 +8732,11 @@ if test "${enable_secretstore+set}" = set; then : - wx_cv_use_secretstore='wxUSE_SECRETSTORE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_secretstore='wxUSE_SECRETSTORE=${'DEFAULT_wxUSE_SECRETSTORE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7872,7 +8754,8 @@ fi - fi - - # Check whether --enable-snglinst was given. --if test "${enable_snglinst+set}" = set; then : -+if test ${enable_snglinst+y} -+then : - enableval=$enable_snglinst; - if test "$enableval" = yes; then - wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes' -@@ -7880,10 +8763,11 @@ if test "${enable_snglinst+set}" = set; then : - wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7901,7 +8785,8 @@ fi - fi - - # Check whether --enable-sound was given. --if test "${enable_sound+set}" = set; then : -+if test ${enable_sound+y} -+then : - enableval=$enable_sound; - if test "$enableval" = yes; then - wx_cv_use_sound='wxUSE_SOUND=yes' -@@ -7909,10 +8794,11 @@ if test "${enable_sound+set}" = set; then : - wx_cv_use_sound='wxUSE_SOUND=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7930,7 +8816,8 @@ fi - fi - - # Check whether --enable-spellcheck was given. --if test "${enable_spellcheck+set}" = set; then : -+if test ${enable_spellcheck+y} -+then : - enableval=$enable_spellcheck; - if test "$enableval" = yes; then - wx_cv_use_spellcheck='wxUSE_SPELLCHECK=yes' -@@ -7938,10 +8825,11 @@ if test "${enable_spellcheck+set}" = set; then : - wx_cv_use_spellcheck='wxUSE_SPELLCHECK=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_spellcheck='wxUSE_SPELLCHECK=${'DEFAULT_wxUSE_SPELLCHECK":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7959,7 +8847,8 @@ fi - fi - - # Check whether --enable-stdpaths was given. --if test "${enable_stdpaths+set}" = set; then : -+if test ${enable_stdpaths+y} -+then : - enableval=$enable_stdpaths; - if test "$enableval" = yes; then - wx_cv_use_stdpaths='wxUSE_STDPATHS=yes' -@@ -7967,10 +8856,11 @@ if test "${enable_stdpaths+set}" = set; then : - wx_cv_use_stdpaths='wxUSE_STDPATHS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -7988,7 +8878,8 @@ fi - fi - - # Check whether --enable-stopwatch was given. --if test "${enable_stopwatch+set}" = set; then : -+if test ${enable_stopwatch+y} -+then : - enableval=$enable_stopwatch; - if test "$enableval" = yes; then - wx_cv_use_stopwatch='wxUSE_STOPWATCH=yes' -@@ -7996,10 +8887,11 @@ if test "${enable_stopwatch+set}" = set; then : - wx_cv_use_stopwatch='wxUSE_STOPWATCH=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8017,7 +8909,8 @@ fi - fi - - # Check whether --enable-streams was given. --if test "${enable_streams+set}" = set; then : -+if test ${enable_streams+y} -+then : - enableval=$enable_streams; - if test "$enableval" = yes; then - wx_cv_use_streams='wxUSE_STREAMS=yes' -@@ -8025,10 +8918,11 @@ if test "${enable_streams+set}" = set; then : - wx_cv_use_streams='wxUSE_STREAMS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8046,7 +8940,8 @@ fi - fi - - # Check whether --enable-sysoptions was given. --if test "${enable_sysoptions+set}" = set; then : -+if test ${enable_sysoptions+y} -+then : - enableval=$enable_sysoptions; - if test "$enableval" = yes; then - wx_cv_use_sysoptions='wxUSE_SYSTEM_OPTIONS=yes' -@@ -8054,10 +8949,11 @@ if test "${enable_sysoptions+set}" = set; then : - wx_cv_use_sysoptions='wxUSE_SYSTEM_OPTIONS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_sysoptions='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8075,7 +8971,8 @@ fi - fi - - # Check whether --enable-tarstream was given. --if test "${enable_tarstream+set}" = set; then : -+if test ${enable_tarstream+y} -+then : - enableval=$enable_tarstream; - if test "$enableval" = yes; then - wx_cv_use_tarstream='wxUSE_TARSTREAM=yes' -@@ -8083,10 +8980,11 @@ if test "${enable_tarstream+set}" = set; then : - wx_cv_use_tarstream='wxUSE_TARSTREAM=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8104,7 +9002,8 @@ fi - fi - - # Check whether --enable-textbuf was given. --if test "${enable_textbuf+set}" = set; then : -+if test ${enable_textbuf+y} -+then : - enableval=$enable_textbuf; - if test "$enableval" = yes; then - wx_cv_use_textbuf='wxUSE_TEXTBUFFER=yes' -@@ -8112,10 +9011,11 @@ if test "${enable_textbuf+set}" = set; then : - wx_cv_use_textbuf='wxUSE_TEXTBUFFER=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8133,7 +9033,8 @@ fi - fi - - # Check whether --enable-textfile was given. --if test "${enable_textfile+set}" = set; then : -+if test ${enable_textfile+y} -+then : - enableval=$enable_textfile; - if test "$enableval" = yes; then - wx_cv_use_textfile='wxUSE_TEXTFILE=yes' -@@ -8141,10 +9042,11 @@ if test "${enable_textfile+set}" = set; then : - wx_cv_use_textfile='wxUSE_TEXTFILE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8162,7 +9064,8 @@ fi - fi - - # Check whether --enable-timer was given. --if test "${enable_timer+set}" = set; then : -+if test ${enable_timer+y} -+then : - enableval=$enable_timer; - if test "$enableval" = yes; then - wx_cv_use_timer='wxUSE_TIMER=yes' -@@ -8170,10 +9073,11 @@ if test "${enable_timer+set}" = set; then : - wx_cv_use_timer='wxUSE_TIMER=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8191,7 +9095,8 @@ fi - fi - - # Check whether --enable-variant was given. --if test "${enable_variant+set}" = set; then : -+if test ${enable_variant+y} -+then : - enableval=$enable_variant; - if test "$enableval" = yes; then - wx_cv_use_variant='wxUSE_VARIANT=yes' -@@ -8199,10 +9104,11 @@ if test "${enable_variant+set}" = set; then : - wx_cv_use_variant='wxUSE_VARIANT=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8220,7 +9126,8 @@ fi - fi - - # Check whether --enable-zipstream was given. --if test "${enable_zipstream+set}" = set; then : -+if test ${enable_zipstream+y} -+then : - enableval=$enable_zipstream; - if test "$enableval" = yes; then - wx_cv_use_zipstream='wxUSE_ZIPSTREAM=yes' -@@ -8228,10 +9135,11 @@ if test "${enable_zipstream+set}" = set; then : - wx_cv_use_zipstream='wxUSE_ZIPSTREAM=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8250,7 +9158,8 @@ fi - fi - - # Check whether --enable-url was given. --if test "${enable_url+set}" = set; then : -+if test ${enable_url+y} -+then : - enableval=$enable_url; - if test "$enableval" = yes; then - wx_cv_use_url='wxUSE_URL=yes' -@@ -8258,10 +9167,11 @@ if test "${enable_url+set}" = set; then : - wx_cv_use_url='wxUSE_URL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8279,7 +9189,8 @@ fi - fi - - # Check whether --enable-protocol was given. --if test "${enable_protocol+set}" = set; then : -+if test ${enable_protocol+y} -+then : - enableval=$enable_protocol; - if test "$enableval" = yes; then - wx_cv_use_protocol='wxUSE_PROTOCOL=yes' -@@ -8287,10 +9198,11 @@ if test "${enable_protocol+set}" = set; then : - wx_cv_use_protocol='wxUSE_PROTOCOL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8308,7 +9220,8 @@ fi - fi - - # Check whether --enable-protocol_http was given. --if test "${enable_protocol_http+set}" = set; then : -+if test ${enable_protocol_http+y} -+then : - enableval=$enable_protocol_http; - if test "$enableval" = yes; then - wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=yes' -@@ -8316,10 +9229,11 @@ if test "${enable_protocol_http+set}" = set; then : - wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8337,7 +9251,8 @@ fi - fi - - # Check whether --enable-protocol_ftp was given. --if test "${enable_protocol_ftp+set}" = set; then : -+if test ${enable_protocol_ftp+y} -+then : - enableval=$enable_protocol_ftp; - if test "$enableval" = yes; then - wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=yes' -@@ -8345,10 +9260,11 @@ if test "${enable_protocol_ftp+set}" = set; then : - wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8366,7 +9282,8 @@ fi - fi - - # Check whether --enable-protocol_file was given. --if test "${enable_protocol_file+set}" = set; then : -+if test ${enable_protocol_file+y} -+then : - enableval=$enable_protocol_file; - if test "$enableval" = yes; then - wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=yes' -@@ -8374,10 +9291,11 @@ if test "${enable_protocol_file+set}" = set; then : - wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8396,7 +9314,8 @@ fi - fi - - # Check whether --enable-threads was given. --if test "${enable_threads+set}" = set; then : -+if test ${enable_threads+y} -+then : - enableval=$enable_threads; - if test "$enableval" = yes; then - wx_cv_use_threads='wxUSE_THREADS=yes' -@@ -8404,10 +9323,11 @@ if test "${enable_threads+set}" = set; then : - wx_cv_use_threads='wxUSE_THREADS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8427,7 +9347,8 @@ if test "$wxUSE_MSW" = 1 ; then - fi - - # Check whether --enable-dbghelp was given. --if test "${enable_dbghelp+set}" = set; then : -+if test ${enable_dbghelp+y} -+then : - enableval=$enable_dbghelp; - if test "$enableval" = yes; then - wx_cv_use_dbghelp='wxUSE_DBGHELP=yes' -@@ -8435,10 +9356,11 @@ if test "${enable_dbghelp+set}" = set; then : - wx_cv_use_dbghelp='wxUSE_DBGHELP=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_dbghelp='wxUSE_DBGHELP=${'DEFAULT_wxUSE_DBGHELP":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8456,7 +9378,8 @@ fi - fi - - # Check whether --enable-iniconf was given. --if test "${enable_iniconf+set}" = set; then : -+if test ${enable_iniconf+y} -+then : - enableval=$enable_iniconf; - if test "$enableval" = yes; then - wx_cv_use_iniconf='wxUSE_INICONF=yes' -@@ -8464,10 +9387,11 @@ if test "${enable_iniconf+set}" = set; then : - wx_cv_use_iniconf='wxUSE_INICONF=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_iniconf='wxUSE_INICONF=${'DEFAULT_wxUSE_INICONF":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8487,7 +9411,8 @@ fi - fi - - # Check whether --enable-regkey was given. --if test "${enable_regkey+set}" = set; then : -+if test ${enable_regkey+y} -+then : - enableval=$enable_regkey; - if test "$enableval" = yes; then - wx_cv_use_regkey='wxUSE_REGKEY=yes' -@@ -8495,10 +9420,11 @@ if test "${enable_regkey+set}" = set; then : - wx_cv_use_regkey='wxUSE_REGKEY=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_regkey='wxUSE_REGKEY=${'DEFAULT_wxUSE_REGKEY":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8520,7 +9446,8 @@ if test "$wxUSE_GUI" = "yes"; then - fi - - # Check whether --enable-docview was given. --if test "${enable_docview+set}" = set; then : -+if test ${enable_docview+y} -+then : - enableval=$enable_docview; - if test "$enableval" = yes; then - wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes' -@@ -8528,10 +9455,11 @@ if test "${enable_docview+set}" = set; then : - wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8549,7 +9477,8 @@ fi - fi - - # Check whether --enable-help was given. --if test "${enable_help+set}" = set; then : -+if test ${enable_help+y} -+then : - enableval=$enable_help; - if test "$enableval" = yes; then - wx_cv_use_help='wxUSE_HELP=yes' -@@ -8557,10 +9486,11 @@ if test "${enable_help+set}" = set; then : - wx_cv_use_help='wxUSE_HELP=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8578,7 +9508,8 @@ fi - fi - - # Check whether --enable-mshtmlhelp was given. --if test "${enable_mshtmlhelp+set}" = set; then : -+if test ${enable_mshtmlhelp+y} -+then : - enableval=$enable_mshtmlhelp; - if test "$enableval" = yes; then - wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes' -@@ -8586,10 +9517,11 @@ if test "${enable_mshtmlhelp+set}" = set; then : - wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8607,7 +9539,8 @@ fi - fi - - # Check whether --enable-html was given. --if test "${enable_html+set}" = set; then : -+if test ${enable_html+y} -+then : - enableval=$enable_html; - if test "$enableval" = yes; then - wx_cv_use_html='wxUSE_HTML=yes' -@@ -8615,10 +9548,11 @@ if test "${enable_html+set}" = set; then : - wx_cv_use_html='wxUSE_HTML=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8636,7 +9570,8 @@ fi - fi - - # Check whether --enable-htmlhelp was given. --if test "${enable_htmlhelp+set}" = set; then : -+if test ${enable_htmlhelp+y} -+then : - enableval=$enable_htmlhelp; - if test "$enableval" = yes; then - wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes' -@@ -8644,10 +9579,11 @@ if test "${enable_htmlhelp+set}" = set; then : - wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8665,7 +9601,8 @@ fi - fi - - # Check whether --enable-xrc was given. --if test "${enable_xrc+set}" = set; then : -+if test ${enable_xrc+y} -+then : - enableval=$enable_xrc; - if test "$enableval" = yes; then - wx_cv_use_xrc='wxUSE_XRC=yes' -@@ -8673,10 +9610,11 @@ if test "${enable_xrc+set}" = set; then : - wx_cv_use_xrc='wxUSE_XRC=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8694,7 +9632,8 @@ fi - fi - - # Check whether --enable-aui was given. --if test "${enable_aui+set}" = set; then : -+if test ${enable_aui+y} -+then : - enableval=$enable_aui; - if test "$enableval" = yes; then - wx_cv_use_aui='wxUSE_AUI=yes' -@@ -8702,10 +9641,11 @@ if test "${enable_aui+set}" = set; then : - wx_cv_use_aui='wxUSE_AUI=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8723,7 +9663,8 @@ fi - fi - - # Check whether --enable-propgrid was given. --if test "${enable_propgrid+set}" = set; then : -+if test ${enable_propgrid+y} -+then : - enableval=$enable_propgrid; - if test "$enableval" = yes; then - wx_cv_use_propgrid='wxUSE_PROPGRID=yes' -@@ -8731,10 +9672,11 @@ if test "${enable_propgrid+set}" = set; then : - wx_cv_use_propgrid='wxUSE_PROPGRID=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_propgrid='wxUSE_PROPGRID=${'DEFAULT_wxUSE_PROPGRID":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8752,7 +9694,8 @@ fi - fi - - # Check whether --enable-ribbon was given. --if test "${enable_ribbon+set}" = set; then : -+if test ${enable_ribbon+y} -+then : - enableval=$enable_ribbon; - if test "$enableval" = yes; then - wx_cv_use_ribbon='wxUSE_RIBBON=yes' -@@ -8760,10 +9703,11 @@ if test "${enable_ribbon+set}" = set; then : - wx_cv_use_ribbon='wxUSE_RIBBON=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_ribbon='wxUSE_RIBBON=${'DEFAULT_wxUSE_RIBBON":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8781,7 +9725,8 @@ fi - fi - - # Check whether --enable-stc was given. --if test "${enable_stc+set}" = set; then : -+if test ${enable_stc+y} -+then : - enableval=$enable_stc; - if test "$enableval" = yes; then - wx_cv_use_stc='wxUSE_STC=yes' -@@ -8789,10 +9734,11 @@ if test "${enable_stc+set}" = set; then : - wx_cv_use_stc='wxUSE_STC=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8810,7 +9756,8 @@ fi - fi - - # Check whether --enable-constraints was given. --if test "${enable_constraints+set}" = set; then : -+if test ${enable_constraints+y} -+then : - enableval=$enable_constraints; - if test "$enableval" = yes; then - wx_cv_use_constraints='wxUSE_CONSTRAINTS=yes' -@@ -8818,10 +9765,11 @@ if test "${enable_constraints+set}" = set; then : - wx_cv_use_constraints='wxUSE_CONSTRAINTS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8839,7 +9787,8 @@ fi - fi - - # Check whether --enable-loggui was given. --if test "${enable_loggui+set}" = set; then : -+if test ${enable_loggui+y} -+then : - enableval=$enable_loggui; - if test "$enableval" = yes; then - wx_cv_use_loggui='wxUSE_LOGGUI=yes' -@@ -8847,10 +9796,11 @@ if test "${enable_loggui+set}" = set; then : - wx_cv_use_loggui='wxUSE_LOGGUI=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8868,7 +9818,8 @@ fi - fi - - # Check whether --enable-logwin was given. --if test "${enable_logwin+set}" = set; then : -+if test ${enable_logwin+y} -+then : - enableval=$enable_logwin; - if test "$enableval" = yes; then - wx_cv_use_logwin='wxUSE_LOGWINDOW=yes' -@@ -8876,10 +9827,11 @@ if test "${enable_logwin+set}" = set; then : - wx_cv_use_logwin='wxUSE_LOGWINDOW=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8897,7 +9849,8 @@ fi - fi - - # Check whether --enable-logdialog was given. --if test "${enable_logdialog+set}" = set; then : -+if test ${enable_logdialog+y} -+then : - enableval=$enable_logdialog; - if test "$enableval" = yes; then - wx_cv_use_logdialog='wxUSE_LOGDIALOG=yes' -@@ -8905,10 +9858,11 @@ if test "${enable_logdialog+set}" = set; then : - wx_cv_use_logdialog='wxUSE_LOGDIALOG=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8926,7 +9880,8 @@ fi - fi - - # Check whether --enable-mdi was given. --if test "${enable_mdi+set}" = set; then : -+if test ${enable_mdi+y} -+then : - enableval=$enable_mdi; - if test "$enableval" = yes; then - wx_cv_use_mdi='wxUSE_MDI=yes' -@@ -8934,10 +9889,11 @@ if test "${enable_mdi+set}" = set; then : - wx_cv_use_mdi='wxUSE_MDI=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8955,7 +9911,8 @@ fi - fi - - # Check whether --enable-mdidoc was given. --if test "${enable_mdidoc+set}" = set; then : -+if test ${enable_mdidoc+y} -+then : - enableval=$enable_mdidoc; - if test "$enableval" = yes; then - wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=yes' -@@ -8963,10 +9920,11 @@ if test "${enable_mdidoc+set}" = set; then : - wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -8984,7 +9942,8 @@ fi - fi - - # Check whether --enable-mediactrl was given. --if test "${enable_mediactrl+set}" = set; then : -+if test ${enable_mediactrl+y} -+then : - enableval=$enable_mediactrl; - if test "$enableval" = yes; then - wx_cv_use_mediactrl='wxUSE_MEDIACTRL=yes' -@@ -8992,10 +9951,11 @@ if test "${enable_mediactrl+set}" = set; then : - wx_cv_use_mediactrl='wxUSE_MEDIACTRL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9013,7 +9973,8 @@ fi - fi - - # Check whether --enable-richtext was given. --if test "${enable_richtext+set}" = set; then : -+if test ${enable_richtext+y} -+then : - enableval=$enable_richtext; - if test "$enableval" = yes; then - wx_cv_use_richtext='wxUSE_RICHTEXT=yes' -@@ -9021,10 +9982,11 @@ if test "${enable_richtext+set}" = set; then : - wx_cv_use_richtext='wxUSE_RICHTEXT=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9042,7 +10004,8 @@ fi - fi - - # Check whether --enable-postscript was given. --if test "${enable_postscript+set}" = set; then : -+if test ${enable_postscript+y} -+then : - enableval=$enable_postscript; - if test "$enableval" = yes; then - wx_cv_use_postscript='wxUSE_POSTSCRIPT=yes' -@@ -9050,10 +10013,11 @@ if test "${enable_postscript+set}" = set; then : - wx_cv_use_postscript='wxUSE_POSTSCRIPT=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9071,7 +10035,8 @@ fi - fi - - # Check whether --enable-printarch was given. --if test "${enable_printarch+set}" = set; then : -+if test ${enable_printarch+y} -+then : - enableval=$enable_printarch; - if test "$enableval" = yes; then - wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes' -@@ -9079,10 +10044,11 @@ if test "${enable_printarch+set}" = set; then : - wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9100,7 +10066,8 @@ fi - fi - - # Check whether --enable-svg was given. --if test "${enable_svg+set}" = set; then : -+if test ${enable_svg+y} -+then : - enableval=$enable_svg; - if test "$enableval" = yes; then - wx_cv_use_svg='wxUSE_SVG=yes' -@@ -9108,10 +10075,11 @@ if test "${enable_svg+set}" = set; then : - wx_cv_use_svg='wxUSE_SVG=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9129,7 +10097,8 @@ fi - fi - - # Check whether --enable-webview was given. --if test "${enable_webview+set}" = set; then : -+if test ${enable_webview+y} -+then : - enableval=$enable_webview; - if test "$enableval" = yes; then - wx_cv_use_webview='wxUSE_WEBVIEW=yes' -@@ -9137,10 +10106,11 @@ if test "${enable_webview+set}" = set; then : - wx_cv_use_webview='wxUSE_WEBVIEW=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_webview='wxUSE_WEBVIEW=${'DEFAULT_wxUSE_WEBVIEW":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9160,7 +10130,8 @@ if test "$wxUSE_MAC" != 1; then - fi - - # Check whether --enable-graphics_ctx was given. --if test "${enable_graphics_ctx+set}" = set; then : -+if test ${enable_graphics_ctx+y} -+then : - enableval=$enable_graphics_ctx; - if test "$enableval" = yes; then - wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=yes' -@@ -9168,10 +10139,11 @@ if test "${enable_graphics_ctx+set}" = set; then : - wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9192,7 +10164,8 @@ if test "$wxUSE_MSW" = 1 ; then - fi - - # Check whether --enable-graphics_d2d was given. --if test "${enable_graphics_d2d+set}" = set; then : -+if test ${enable_graphics_d2d+y} -+then : - enableval=$enable_graphics_d2d; - if test "$enableval" = yes; then - wx_cv_use_graphics_d2d='wxUSE_GRAPHICS_DIRECT2D=yes' -@@ -9200,10 +10173,11 @@ if test "${enable_graphics_d2d+set}" = set; then : - wx_cv_use_graphics_d2d='wxUSE_GRAPHICS_DIRECT2D=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_graphics_d2d='wxUSE_GRAPHICS_DIRECT2D=${'DEFAULT_wxUSE_GRAPHICS_DIRECT2D":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9224,7 +10198,8 @@ fi - fi - - # Check whether --enable-clipboard was given. --if test "${enable_clipboard+set}" = set; then : -+if test ${enable_clipboard+y} -+then : - enableval=$enable_clipboard; - if test "$enableval" = yes; then - wx_cv_use_clipboard='wxUSE_CLIPBOARD=yes' -@@ -9232,10 +10207,11 @@ if test "${enable_clipboard+set}" = set; then : - wx_cv_use_clipboard='wxUSE_CLIPBOARD=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9253,7 +10229,8 @@ fi - fi - - # Check whether --enable-dnd was given. --if test "${enable_dnd+set}" = set; then : -+if test ${enable_dnd+y} -+then : - enableval=$enable_dnd; - if test "$enableval" = yes; then - wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=yes' -@@ -9261,10 +10238,11 @@ if test "${enable_dnd+set}" = set; then : - wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9285,7 +10263,8 @@ DEFAULT_wxUSE_CONTROLS=none - fi - - # Check whether --enable-controls was given. --if test "${enable_controls+set}" = set; then : -+if test ${enable_controls+y} -+then : - enableval=$enable_controls; - if test "$enableval" = yes; then - wx_cv_use_controls='wxUSE_CONTROLS=yes' -@@ -9293,10 +10272,11 @@ if test "${enable_controls+set}" = set; then : - wx_cv_use_controls='wxUSE_CONTROLS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9379,7 +10359,8 @@ fi - fi - - # Check whether --enable-markup was given. --if test "${enable_markup+set}" = set; then : -+if test ${enable_markup+y} -+then : - enableval=$enable_markup; - if test "$enableval" = yes; then - wx_cv_use_markup='wxUSE_MARKUP=yes' -@@ -9387,10 +10368,11 @@ if test "${enable_markup+set}" = set; then : - wx_cv_use_markup='wxUSE_MARKUP=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_markup='wxUSE_MARKUP=${'DEFAULT_wxUSE_MARKUP":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9409,7 +10391,8 @@ fi - fi - - # Check whether --enable-accel was given. --if test "${enable_accel+set}" = set; then : -+if test ${enable_accel+y} -+then : - enableval=$enable_accel; - if test "$enableval" = yes; then - wx_cv_use_accel='wxUSE_ACCEL=yes' -@@ -9417,10 +10400,11 @@ if test "${enable_accel+set}" = set; then : - wx_cv_use_accel='wxUSE_ACCEL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9438,7 +10422,8 @@ fi - fi - - # Check whether --enable-actindicator was given. --if test "${enable_actindicator+set}" = set; then : -+if test ${enable_actindicator+y} -+then : - enableval=$enable_actindicator; - if test "$enableval" = yes; then - wx_cv_use_actindicator='wxUSE_ACTIVITYINDICATOR=yes' -@@ -9446,10 +10431,11 @@ if test "${enable_actindicator+set}" = set; then : - wx_cv_use_actindicator='wxUSE_ACTIVITYINDICATOR=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_actindicator='wxUSE_ACTIVITYINDICATOR=${'DEFAULT_wxUSE_ACTIVITYINDICATOR":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9467,7 +10453,8 @@ fi - fi - - # Check whether --enable-addremovectrl was given. --if test "${enable_addremovectrl+set}" = set; then : -+if test ${enable_addremovectrl+y} -+then : - enableval=$enable_addremovectrl; - if test "$enableval" = yes; then - wx_cv_use_addremovectrl='wxUSE_ADDREMOVECTRL=yes' -@@ -9475,10 +10462,11 @@ if test "${enable_addremovectrl+set}" = set; then : - wx_cv_use_addremovectrl='wxUSE_ADDREMOVECTRL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_addremovectrl='wxUSE_ADDREMOVECTRL=${'DEFAULT_wxUSE_ADDREMOVECTRL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9496,7 +10484,8 @@ fi - fi - - # Check whether --enable-animatectrl was given. --if test "${enable_animatectrl+set}" = set; then : -+if test ${enable_animatectrl+y} -+then : - enableval=$enable_animatectrl; - if test "$enableval" = yes; then - wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=yes' -@@ -9504,10 +10493,11 @@ if test "${enable_animatectrl+set}" = set; then : - wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9525,7 +10515,8 @@ fi - fi - - # Check whether --enable-bannerwindow was given. --if test "${enable_bannerwindow+set}" = set; then : -+if test ${enable_bannerwindow+y} -+then : - enableval=$enable_bannerwindow; - if test "$enableval" = yes; then - wx_cv_use_bannerwindow='wxUSE_BANNERWINDOW=yes' -@@ -9533,10 +10524,11 @@ if test "${enable_bannerwindow+set}" = set; then : - wx_cv_use_bannerwindow='wxUSE_BANNERWINDOW=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_bannerwindow='wxUSE_BANNERWINDOW=${'DEFAULT_wxUSE_BANNERWINDOW":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9554,7 +10546,8 @@ fi - fi - - # Check whether --enable-artstd was given. --if test "${enable_artstd+set}" = set; then : -+if test ${enable_artstd+y} -+then : - enableval=$enable_artstd; - if test "$enableval" = yes; then - wx_cv_use_artstd='wxUSE_ARTPROVIDER_STD=yes' -@@ -9562,10 +10555,11 @@ if test "${enable_artstd+set}" = set; then : - wx_cv_use_artstd='wxUSE_ARTPROVIDER_STD=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_artstd='wxUSE_ARTPROVIDER_STD=${'DEFAULT_wxUSE_ARTPROVIDER_STD":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9583,7 +10577,8 @@ fi - fi - - # Check whether --enable-arttango was given. --if test "${enable_arttango+set}" = set; then : -+if test ${enable_arttango+y} -+then : - enableval=$enable_arttango; - if test "$enableval" = yes; then - wx_cv_use_arttango='wxUSE_ARTPROVIDER_TANGO=yes' -@@ -9591,10 +10586,11 @@ if test "${enable_arttango+set}" = set; then : - wx_cv_use_arttango='wxUSE_ARTPROVIDER_TANGO=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_arttango='wxUSE_ARTPROVIDER_TANGO=${'DEFAULT_wxUSE_ARTPROVIDER_TANGO":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9612,7 +10608,8 @@ fi - fi - - # Check whether --enable-bmpbutton was given. --if test "${enable_bmpbutton+set}" = set; then : -+if test ${enable_bmpbutton+y} -+then : - enableval=$enable_bmpbutton; - if test "$enableval" = yes; then - wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes' -@@ -9620,10 +10617,11 @@ if test "${enable_bmpbutton+set}" = set; then : - wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9641,7 +10639,8 @@ fi - fi - - # Check whether --enable-bmpcombobox was given. --if test "${enable_bmpcombobox+set}" = set; then : -+if test ${enable_bmpcombobox+y} -+then : - enableval=$enable_bmpcombobox; - if test "$enableval" = yes; then - wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=yes' -@@ -9649,10 +10648,11 @@ if test "${enable_bmpcombobox+set}" = set; then : - wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9670,7 +10670,8 @@ fi - fi - - # Check whether --enable-button was given. --if test "${enable_button+set}" = set; then : -+if test ${enable_button+y} -+then : - enableval=$enable_button; - if test "$enableval" = yes; then - wx_cv_use_button='wxUSE_BUTTON=yes' -@@ -9678,10 +10679,11 @@ if test "${enable_button+set}" = set; then : - wx_cv_use_button='wxUSE_BUTTON=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9699,7 +10701,8 @@ fi - fi - - # Check whether --enable-calendar was given. --if test "${enable_calendar+set}" = set; then : -+if test ${enable_calendar+y} -+then : - enableval=$enable_calendar; - if test "$enableval" = yes; then - wx_cv_use_calendar='wxUSE_CALCTRL=yes' -@@ -9707,10 +10710,11 @@ if test "${enable_calendar+set}" = set; then : - wx_cv_use_calendar='wxUSE_CALCTRL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9728,7 +10732,8 @@ fi - fi - - # Check whether --enable-caret was given. --if test "${enable_caret+set}" = set; then : -+if test ${enable_caret+y} -+then : - enableval=$enable_caret; - if test "$enableval" = yes; then - wx_cv_use_caret='wxUSE_CARET=yes' -@@ -9736,10 +10741,11 @@ if test "${enable_caret+set}" = set; then : - wx_cv_use_caret='wxUSE_CARET=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9757,7 +10763,8 @@ fi - fi - - # Check whether --enable-checkbox was given. --if test "${enable_checkbox+set}" = set; then : -+if test ${enable_checkbox+y} -+then : - enableval=$enable_checkbox; - if test "$enableval" = yes; then - wx_cv_use_checkbox='wxUSE_CHECKBOX=yes' -@@ -9765,10 +10772,11 @@ if test "${enable_checkbox+set}" = set; then : - wx_cv_use_checkbox='wxUSE_CHECKBOX=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9786,7 +10794,8 @@ fi - fi - - # Check whether --enable-checklst was given. --if test "${enable_checklst+set}" = set; then : -+if test ${enable_checklst+y} -+then : - enableval=$enable_checklst; - if test "$enableval" = yes; then - wx_cv_use_checklst='wxUSE_CHECKLST=yes' -@@ -9794,10 +10803,11 @@ if test "${enable_checklst+set}" = set; then : - wx_cv_use_checklst='wxUSE_CHECKLST=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9815,7 +10825,8 @@ fi - fi - - # Check whether --enable-choice was given. --if test "${enable_choice+set}" = set; then : -+if test ${enable_choice+y} -+then : - enableval=$enable_choice; - if test "$enableval" = yes; then - wx_cv_use_choice='wxUSE_CHOICE=yes' -@@ -9823,10 +10834,11 @@ if test "${enable_choice+set}" = set; then : - wx_cv_use_choice='wxUSE_CHOICE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9844,7 +10856,8 @@ fi - fi - - # Check whether --enable-choicebook was given. --if test "${enable_choicebook+set}" = set; then : -+if test ${enable_choicebook+y} -+then : - enableval=$enable_choicebook; - if test "$enableval" = yes; then - wx_cv_use_choicebook='wxUSE_CHOICEBOOK=yes' -@@ -9852,10 +10865,11 @@ if test "${enable_choicebook+set}" = set; then : - wx_cv_use_choicebook='wxUSE_CHOICEBOOK=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9873,7 +10887,8 @@ fi - fi - - # Check whether --enable-collpane was given. --if test "${enable_collpane+set}" = set; then : -+if test ${enable_collpane+y} -+then : - enableval=$enable_collpane; - if test "$enableval" = yes; then - wx_cv_use_collpane='wxUSE_COLLPANE=yes' -@@ -9881,10 +10896,11 @@ if test "${enable_collpane+set}" = set; then : - wx_cv_use_collpane='wxUSE_COLLPANE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9902,7 +10918,8 @@ fi - fi - - # Check whether --enable-colourpicker was given. --if test "${enable_colourpicker+set}" = set; then : -+if test ${enable_colourpicker+y} -+then : - enableval=$enable_colourpicker; - if test "$enableval" = yes; then - wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=yes' -@@ -9910,10 +10927,11 @@ if test "${enable_colourpicker+set}" = set; then : - wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9931,7 +10949,8 @@ fi - fi - - # Check whether --enable-combobox was given. --if test "${enable_combobox+set}" = set; then : -+if test ${enable_combobox+y} -+then : - enableval=$enable_combobox; - if test "$enableval" = yes; then - wx_cv_use_combobox='wxUSE_COMBOBOX=yes' -@@ -9939,10 +10958,11 @@ if test "${enable_combobox+set}" = set; then : - wx_cv_use_combobox='wxUSE_COMBOBOX=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9960,7 +10980,8 @@ fi - fi - - # Check whether --enable-comboctrl was given. --if test "${enable_comboctrl+set}" = set; then : -+if test ${enable_comboctrl+y} -+then : - enableval=$enable_comboctrl; - if test "$enableval" = yes; then - wx_cv_use_comboctrl='wxUSE_COMBOCTRL=yes' -@@ -9968,10 +10989,11 @@ if test "${enable_comboctrl+set}" = set; then : - wx_cv_use_comboctrl='wxUSE_COMBOCTRL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -9989,7 +11011,8 @@ fi - fi - - # Check whether --enable-commandlinkbutton was given. --if test "${enable_commandlinkbutton+set}" = set; then : -+if test ${enable_commandlinkbutton+y} -+then : - enableval=$enable_commandlinkbutton; - if test "$enableval" = yes; then - wx_cv_use_commandlinkbutton='wxUSE_COMMANDLINKBUTTON=yes' -@@ -9997,10 +11020,11 @@ if test "${enable_commandlinkbutton+set}" = set; then : - wx_cv_use_commandlinkbutton='wxUSE_COMMANDLINKBUTTON=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_commandlinkbutton='wxUSE_COMMANDLINKBUTTON=${'DEFAULT_wxUSE_COMMANDLINKBUTTON":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10018,7 +11042,8 @@ fi - fi - - # Check whether --enable-dataviewctrl was given. --if test "${enable_dataviewctrl+set}" = set; then : -+if test ${enable_dataviewctrl+y} -+then : - enableval=$enable_dataviewctrl; - if test "$enableval" = yes; then - wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=yes' -@@ -10026,10 +11051,11 @@ if test "${enable_dataviewctrl+set}" = set; then : - wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10047,7 +11073,8 @@ fi - fi - - # Check whether --enable-nativedvc was given. --if test "${enable_nativedvc+set}" = set; then : -+if test ${enable_nativedvc+y} -+then : - enableval=$enable_nativedvc; - if test "$enableval" = yes; then - wx_cv_use_nativedvc='wxUSE_NATIVE_DATAVIEWCTRL=yes' -@@ -10055,10 +11082,11 @@ if test "${enable_nativedvc+set}" = set; then : - wx_cv_use_nativedvc='wxUSE_NATIVE_DATAVIEWCTRL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_nativedvc='wxUSE_NATIVE_DATAVIEWCTRL=${'DEFAULT_wxUSE_NATIVE_DATAVIEWCTRL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10076,7 +11104,8 @@ fi - fi - - # Check whether --enable-datepick was given. --if test "${enable_datepick+set}" = set; then : -+if test ${enable_datepick+y} -+then : - enableval=$enable_datepick; - if test "$enableval" = yes; then - wx_cv_use_datepick='wxUSE_DATEPICKCTRL=yes' -@@ -10084,10 +11113,11 @@ if test "${enable_datepick+set}" = set; then : - wx_cv_use_datepick='wxUSE_DATEPICKCTRL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10105,7 +11135,8 @@ fi - fi - - # Check whether --enable-detect_sm was given. --if test "${enable_detect_sm+set}" = set; then : -+if test ${enable_detect_sm+y} -+then : - enableval=$enable_detect_sm; - if test "$enableval" = yes; then - wx_cv_use_detect_sm='wxUSE_DETECT_SM=yes' -@@ -10113,10 +11144,11 @@ if test "${enable_detect_sm+set}" = set; then : - wx_cv_use_detect_sm='wxUSE_DETECT_SM=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10134,7 +11166,8 @@ fi - fi - - # Check whether --enable-dirpicker was given. --if test "${enable_dirpicker+set}" = set; then : -+if test ${enable_dirpicker+y} -+then : - enableval=$enable_dirpicker; - if test "$enableval" = yes; then - wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=yes' -@@ -10142,10 +11175,11 @@ if test "${enable_dirpicker+set}" = set; then : - wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10163,7 +11197,8 @@ fi - fi - - # Check whether --enable-display was given. --if test "${enable_display+set}" = set; then : -+if test ${enable_display+y} -+then : - enableval=$enable_display; - if test "$enableval" = yes; then - wx_cv_use_display='wxUSE_DISPLAY=yes' -@@ -10171,10 +11206,11 @@ if test "${enable_display+set}" = set; then : - wx_cv_use_display='wxUSE_DISPLAY=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10192,7 +11228,8 @@ fi - fi - - # Check whether --enable-editablebox was given. --if test "${enable_editablebox+set}" = set; then : -+if test ${enable_editablebox+y} -+then : - enableval=$enable_editablebox; - if test "$enableval" = yes; then - wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=yes' -@@ -10200,10 +11237,11 @@ if test "${enable_editablebox+set}" = set; then : - wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10221,7 +11259,8 @@ fi - fi - - # Check whether --enable-filectrl was given. --if test "${enable_filectrl+set}" = set; then : -+if test ${enable_filectrl+y} -+then : - enableval=$enable_filectrl; - if test "$enableval" = yes; then - wx_cv_use_filectrl='wxUSE_FILECTRL=yes' -@@ -10229,10 +11268,11 @@ if test "${enable_filectrl+set}" = set; then : - wx_cv_use_filectrl='wxUSE_FILECTRL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_filectrl='wxUSE_FILECTRL=${'DEFAULT_wxUSE_FILECTRL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10250,7 +11290,8 @@ fi - fi - - # Check whether --enable-filepicker was given. --if test "${enable_filepicker+set}" = set; then : -+if test ${enable_filepicker+y} -+then : - enableval=$enable_filepicker; - if test "$enableval" = yes; then - wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=yes' -@@ -10258,10 +11299,11 @@ if test "${enable_filepicker+set}" = set; then : - wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10279,7 +11321,8 @@ fi - fi - - # Check whether --enable-fontpicker was given. --if test "${enable_fontpicker+set}" = set; then : -+if test ${enable_fontpicker+y} -+then : - enableval=$enable_fontpicker; - if test "$enableval" = yes; then - wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=yes' -@@ -10287,10 +11330,11 @@ if test "${enable_fontpicker+set}" = set; then : - wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10308,7 +11352,8 @@ fi - fi - - # Check whether --enable-gauge was given. --if test "${enable_gauge+set}" = set; then : -+if test ${enable_gauge+y} -+then : - enableval=$enable_gauge; - if test "$enableval" = yes; then - wx_cv_use_gauge='wxUSE_GAUGE=yes' -@@ -10316,10 +11361,11 @@ if test "${enable_gauge+set}" = set; then : - wx_cv_use_gauge='wxUSE_GAUGE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10337,7 +11383,8 @@ fi - fi - - # Check whether --enable-grid was given. --if test "${enable_grid+set}" = set; then : -+if test ${enable_grid+y} -+then : - enableval=$enable_grid; - if test "$enableval" = yes; then - wx_cv_use_grid='wxUSE_GRID=yes' -@@ -10345,10 +11392,11 @@ if test "${enable_grid+set}" = set; then : - wx_cv_use_grid='wxUSE_GRID=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10366,7 +11414,8 @@ fi - fi - - # Check whether --enable-headerctrl was given. --if test "${enable_headerctrl+set}" = set; then : -+if test ${enable_headerctrl+y} -+then : - enableval=$enable_headerctrl; - if test "$enableval" = yes; then - wx_cv_use_headerctrl='wxUSE_HEADERCTRL=yes' -@@ -10374,10 +11423,11 @@ if test "${enable_headerctrl+set}" = set; then : - wx_cv_use_headerctrl='wxUSE_HEADERCTRL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_headerctrl='wxUSE_HEADERCTRL=${'DEFAULT_wxUSE_HEADERCTRL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10395,7 +11445,8 @@ fi - fi - - # Check whether --enable-hyperlink was given. --if test "${enable_hyperlink+set}" = set; then : -+if test ${enable_hyperlink+y} -+then : - enableval=$enable_hyperlink; - if test "$enableval" = yes; then - wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=yes' -@@ -10403,10 +11454,11 @@ if test "${enable_hyperlink+set}" = set; then : - wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10424,7 +11476,8 @@ fi - fi - - # Check whether --enable-imaglist was given. --if test "${enable_imaglist+set}" = set; then : -+if test ${enable_imaglist+y} -+then : - enableval=$enable_imaglist; - if test "$enableval" = yes; then - wx_cv_use_imaglist='wxUSE_IMAGLIST=yes' -@@ -10432,10 +11485,11 @@ if test "${enable_imaglist+set}" = set; then : - wx_cv_use_imaglist='wxUSE_IMAGLIST=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10453,7 +11507,8 @@ fi - fi - - # Check whether --enable-infobar was given. --if test "${enable_infobar+set}" = set; then : -+if test ${enable_infobar+y} -+then : - enableval=$enable_infobar; - if test "$enableval" = yes; then - wx_cv_use_infobar='wxUSE_INFOBAR=yes' -@@ -10461,10 +11516,11 @@ if test "${enable_infobar+set}" = set; then : - wx_cv_use_infobar='wxUSE_INFOBAR=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_infobar='wxUSE_INFOBAR=${'DEFAULT_wxUSE_INFOBAR":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10482,7 +11538,8 @@ fi - fi - - # Check whether --enable-listbook was given. --if test "${enable_listbook+set}" = set; then : -+if test ${enable_listbook+y} -+then : - enableval=$enable_listbook; - if test "$enableval" = yes; then - wx_cv_use_listbook='wxUSE_LISTBOOK=yes' -@@ -10490,10 +11547,11 @@ if test "${enable_listbook+set}" = set; then : - wx_cv_use_listbook='wxUSE_LISTBOOK=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10511,7 +11569,8 @@ fi - fi - - # Check whether --enable-listbox was given. --if test "${enable_listbox+set}" = set; then : -+if test ${enable_listbox+y} -+then : - enableval=$enable_listbox; - if test "$enableval" = yes; then - wx_cv_use_listbox='wxUSE_LISTBOX=yes' -@@ -10519,10 +11578,11 @@ if test "${enable_listbox+set}" = set; then : - wx_cv_use_listbox='wxUSE_LISTBOX=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10540,7 +11600,8 @@ fi - fi - - # Check whether --enable-listctrl was given. --if test "${enable_listctrl+set}" = set; then : -+if test ${enable_listctrl+y} -+then : - enableval=$enable_listctrl; - if test "$enableval" = yes; then - wx_cv_use_listctrl='wxUSE_LISTCTRL=yes' -@@ -10548,10 +11609,11 @@ if test "${enable_listctrl+set}" = set; then : - wx_cv_use_listctrl='wxUSE_LISTCTRL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10569,7 +11631,8 @@ fi - fi - - # Check whether --enable-notebook was given. --if test "${enable_notebook+set}" = set; then : -+if test ${enable_notebook+y} -+then : - enableval=$enable_notebook; - if test "$enableval" = yes; then - wx_cv_use_notebook='wxUSE_NOTEBOOK=yes' -@@ -10577,10 +11640,11 @@ if test "${enable_notebook+set}" = set; then : - wx_cv_use_notebook='wxUSE_NOTEBOOK=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10598,7 +11662,8 @@ fi - fi - - # Check whether --enable-notifmsg was given. --if test "${enable_notifmsg+set}" = set; then : -+if test ${enable_notifmsg+y} -+then : - enableval=$enable_notifmsg; - if test "$enableval" = yes; then - wx_cv_use_notifmsg='wxUSE_NOTIFICATION_MESSAGE=yes' -@@ -10606,10 +11671,11 @@ if test "${enable_notifmsg+set}" = set; then : - wx_cv_use_notifmsg='wxUSE_NOTIFICATION_MESSAGE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_notifmsg='wxUSE_NOTIFICATION_MESSAGE=${'DEFAULT_wxUSE_NOTIFICATION_MESSAGE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10627,7 +11693,8 @@ fi - fi - - # Check whether --enable-odcombobox was given. --if test "${enable_odcombobox+set}" = set; then : -+if test ${enable_odcombobox+y} -+then : - enableval=$enable_odcombobox; - if test "$enableval" = yes; then - wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=yes' -@@ -10635,10 +11702,11 @@ if test "${enable_odcombobox+set}" = set; then : - wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10656,7 +11724,8 @@ fi - fi - - # Check whether --enable-popupwin was given. --if test "${enable_popupwin+set}" = set; then : -+if test ${enable_popupwin+y} -+then : - enableval=$enable_popupwin; - if test "$enableval" = yes; then - wx_cv_use_popupwin='wxUSE_POPUPWIN=yes' -@@ -10664,10 +11733,11 @@ if test "${enable_popupwin+set}" = set; then : - wx_cv_use_popupwin='wxUSE_POPUPWIN=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10685,7 +11755,8 @@ fi - fi - - # Check whether --enable-prefseditor was given. --if test "${enable_prefseditor+set}" = set; then : -+if test ${enable_prefseditor+y} -+then : - enableval=$enable_prefseditor; - if test "$enableval" = yes; then - wx_cv_use_prefseditor='wxUSE_PREFERENCES_EDITOR=yes' -@@ -10693,10 +11764,11 @@ if test "${enable_prefseditor+set}" = set; then : - wx_cv_use_prefseditor='wxUSE_PREFERENCES_EDITOR=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_prefseditor='wxUSE_PREFERENCES_EDITOR=${'DEFAULT_wxUSE_PREFERENCES_EDITOR":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10714,7 +11786,8 @@ fi - fi - - # Check whether --enable-privatefonts was given. --if test "${enable_privatefonts+set}" = set; then : -+if test ${enable_privatefonts+y} -+then : - enableval=$enable_privatefonts; - if test "$enableval" = yes; then - wx_cv_use_privatefonts='wxUSE_PRIVATE_FONTS=yes' -@@ -10722,10 +11795,11 @@ if test "${enable_privatefonts+set}" = set; then : - wx_cv_use_privatefonts='wxUSE_PRIVATE_FONTS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_privatefonts='wxUSE_PRIVATE_FONTS=${'DEFAULT_wxUSE_PRIVATE_FONTS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10743,7 +11817,8 @@ fi - fi - - # Check whether --enable-radiobox was given. --if test "${enable_radiobox+set}" = set; then : -+if test ${enable_radiobox+y} -+then : - enableval=$enable_radiobox; - if test "$enableval" = yes; then - wx_cv_use_radiobox='wxUSE_RADIOBOX=yes' -@@ -10751,10 +11826,11 @@ if test "${enable_radiobox+set}" = set; then : - wx_cv_use_radiobox='wxUSE_RADIOBOX=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10772,7 +11848,8 @@ fi - fi - - # Check whether --enable-radiobtn was given. --if test "${enable_radiobtn+set}" = set; then : -+if test ${enable_radiobtn+y} -+then : - enableval=$enable_radiobtn; - if test "$enableval" = yes; then - wx_cv_use_radiobtn='wxUSE_RADIOBTN=yes' -@@ -10780,10 +11857,11 @@ if test "${enable_radiobtn+set}" = set; then : - wx_cv_use_radiobtn='wxUSE_RADIOBTN=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10801,7 +11879,8 @@ fi - fi - - # Check whether --enable-richmsgdlg was given. --if test "${enable_richmsgdlg+set}" = set; then : -+if test ${enable_richmsgdlg+y} -+then : - enableval=$enable_richmsgdlg; - if test "$enableval" = yes; then - wx_cv_use_richmsgdlg='wxUSE_RICHMSGDLG=yes' -@@ -10809,10 +11888,11 @@ if test "${enable_richmsgdlg+set}" = set; then : - wx_cv_use_richmsgdlg='wxUSE_RICHMSGDLG=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_richmsgdlg='wxUSE_RICHMSGDLG=${'DEFAULT_wxUSE_RICHMSGDLG":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10830,7 +11910,8 @@ fi - fi - - # Check whether --enable-richtooltip was given. --if test "${enable_richtooltip+set}" = set; then : -+if test ${enable_richtooltip+y} -+then : - enableval=$enable_richtooltip; - if test "$enableval" = yes; then - wx_cv_use_richtooltip='wxUSE_RICHTOOLTIP=yes' -@@ -10838,10 +11919,11 @@ if test "${enable_richtooltip+set}" = set; then : - wx_cv_use_richtooltip='wxUSE_RICHTOOLTIP=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_richtooltip='wxUSE_RICHTOOLTIP=${'DEFAULT_wxUSE_RICHTOOLTIP":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10859,7 +11941,8 @@ fi - fi - - # Check whether --enable-rearrangectrl was given. --if test "${enable_rearrangectrl+set}" = set; then : -+if test ${enable_rearrangectrl+y} -+then : - enableval=$enable_rearrangectrl; - if test "$enableval" = yes; then - wx_cv_use_rearrangectrl='wxUSE_REARRANGECTRL=yes' -@@ -10867,10 +11950,11 @@ if test "${enable_rearrangectrl+set}" = set; then : - wx_cv_use_rearrangectrl='wxUSE_REARRANGECTRL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_rearrangectrl='wxUSE_REARRANGECTRL=${'DEFAULT_wxUSE_REARRANGECTRL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10888,7 +11972,8 @@ fi - fi - - # Check whether --enable-sash was given. --if test "${enable_sash+set}" = set; then : -+if test ${enable_sash+y} -+then : - enableval=$enable_sash; - if test "$enableval" = yes; then - wx_cv_use_sash='wxUSE_SASH=yes' -@@ -10896,10 +11981,11 @@ if test "${enable_sash+set}" = set; then : - wx_cv_use_sash='wxUSE_SASH=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10917,7 +12003,8 @@ fi - fi - - # Check whether --enable-scrollbar was given. --if test "${enable_scrollbar+set}" = set; then : -+if test ${enable_scrollbar+y} -+then : - enableval=$enable_scrollbar; - if test "$enableval" = yes; then - wx_cv_use_scrollbar='wxUSE_SCROLLBAR=yes' -@@ -10925,10 +12012,11 @@ if test "${enable_scrollbar+set}" = set; then : - wx_cv_use_scrollbar='wxUSE_SCROLLBAR=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10946,7 +12034,8 @@ fi - fi - - # Check whether --enable-searchctrl was given. --if test "${enable_searchctrl+set}" = set; then : -+if test ${enable_searchctrl+y} -+then : - enableval=$enable_searchctrl; - if test "$enableval" = yes; then - wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=yes' -@@ -10954,10 +12043,11 @@ if test "${enable_searchctrl+set}" = set; then : - wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -10975,7 +12065,8 @@ fi - fi - - # Check whether --enable-slider was given. --if test "${enable_slider+set}" = set; then : -+if test ${enable_slider+y} -+then : - enableval=$enable_slider; - if test "$enableval" = yes; then - wx_cv_use_slider='wxUSE_SLIDER=yes' -@@ -10983,10 +12074,11 @@ if test "${enable_slider+set}" = set; then : - wx_cv_use_slider='wxUSE_SLIDER=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11004,7 +12096,8 @@ fi - fi - - # Check whether --enable-spinbtn was given. --if test "${enable_spinbtn+set}" = set; then : -+if test ${enable_spinbtn+y} -+then : - enableval=$enable_spinbtn; - if test "$enableval" = yes; then - wx_cv_use_spinbtn='wxUSE_SPINBTN=yes' -@@ -11012,10 +12105,11 @@ if test "${enable_spinbtn+set}" = set; then : - wx_cv_use_spinbtn='wxUSE_SPINBTN=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11033,7 +12127,8 @@ fi - fi - - # Check whether --enable-spinctrl was given. --if test "${enable_spinctrl+set}" = set; then : -+if test ${enable_spinctrl+y} -+then : - enableval=$enable_spinctrl; - if test "$enableval" = yes; then - wx_cv_use_spinctrl='wxUSE_SPINCTRL=yes' -@@ -11041,10 +12136,11 @@ if test "${enable_spinctrl+set}" = set; then : - wx_cv_use_spinctrl='wxUSE_SPINCTRL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11062,7 +12158,8 @@ fi - fi - - # Check whether --enable-splitter was given. --if test "${enable_splitter+set}" = set; then : -+if test ${enable_splitter+y} -+then : - enableval=$enable_splitter; - if test "$enableval" = yes; then - wx_cv_use_splitter='wxUSE_SPLITTER=yes' -@@ -11070,10 +12167,11 @@ if test "${enable_splitter+set}" = set; then : - wx_cv_use_splitter='wxUSE_SPLITTER=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11091,7 +12189,8 @@ fi - fi - - # Check whether --enable-statbmp was given. --if test "${enable_statbmp+set}" = set; then : -+if test ${enable_statbmp+y} -+then : - enableval=$enable_statbmp; - if test "$enableval" = yes; then - wx_cv_use_statbmp='wxUSE_STATBMP=yes' -@@ -11099,10 +12198,11 @@ if test "${enable_statbmp+set}" = set; then : - wx_cv_use_statbmp='wxUSE_STATBMP=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11120,7 +12220,8 @@ fi - fi - - # Check whether --enable-statbox was given. --if test "${enable_statbox+set}" = set; then : -+if test ${enable_statbox+y} -+then : - enableval=$enable_statbox; - if test "$enableval" = yes; then - wx_cv_use_statbox='wxUSE_STATBOX=yes' -@@ -11128,10 +12229,11 @@ if test "${enable_statbox+set}" = set; then : - wx_cv_use_statbox='wxUSE_STATBOX=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11149,7 +12251,8 @@ fi - fi - - # Check whether --enable-statline was given. --if test "${enable_statline+set}" = set; then : -+if test ${enable_statline+y} -+then : - enableval=$enable_statline; - if test "$enableval" = yes; then - wx_cv_use_statline='wxUSE_STATLINE=yes' -@@ -11157,10 +12260,11 @@ if test "${enable_statline+set}" = set; then : - wx_cv_use_statline='wxUSE_STATLINE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11178,7 +12282,8 @@ fi - fi - - # Check whether --enable-stattext was given. --if test "${enable_stattext+set}" = set; then : -+if test ${enable_stattext+y} -+then : - enableval=$enable_stattext; - if test "$enableval" = yes; then - wx_cv_use_stattext='wxUSE_STATTEXT=yes' -@@ -11186,10 +12291,11 @@ if test "${enable_stattext+set}" = set; then : - wx_cv_use_stattext='wxUSE_STATTEXT=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11207,7 +12313,8 @@ fi - fi - - # Check whether --enable-statusbar was given. --if test "${enable_statusbar+set}" = set; then : -+if test ${enable_statusbar+y} -+then : - enableval=$enable_statusbar; - if test "$enableval" = yes; then - wx_cv_use_statusbar='wxUSE_STATUSBAR=yes' -@@ -11215,10 +12322,11 @@ if test "${enable_statusbar+set}" = set; then : - wx_cv_use_statusbar='wxUSE_STATUSBAR=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11236,7 +12344,8 @@ fi - fi - - # Check whether --enable-taskbaricon was given. --if test "${enable_taskbaricon+set}" = set; then : -+if test ${enable_taskbaricon+y} -+then : - enableval=$enable_taskbaricon; - if test "$enableval" = yes; then - wx_cv_use_taskbaricon='wxUSE_TASKBARICON=yes' -@@ -11244,10 +12353,11 @@ if test "${enable_taskbaricon+set}" = set; then : - wx_cv_use_taskbaricon='wxUSE_TASKBARICON=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_taskbaricon='wxUSE_TASKBARICON=${'DEFAULT_wxUSE_TASKBARICON":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11265,7 +12375,8 @@ fi - fi - - # Check whether --enable-tbarnative was given. --if test "${enable_tbarnative+set}" = set; then : -+if test ${enable_tbarnative+y} -+then : - enableval=$enable_tbarnative; - if test "$enableval" = yes; then - wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes' -@@ -11273,10 +12384,11 @@ if test "${enable_tbarnative+set}" = set; then : - wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11294,7 +12406,8 @@ fi - fi - - # Check whether --enable-textctrl was given. --if test "${enable_textctrl+set}" = set; then : -+if test ${enable_textctrl+y} -+then : - enableval=$enable_textctrl; - if test "$enableval" = yes; then - wx_cv_use_textctrl='wxUSE_TEXTCTRL=yes' -@@ -11302,10 +12415,11 @@ if test "${enable_textctrl+set}" = set; then : - wx_cv_use_textctrl='wxUSE_TEXTCTRL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11323,7 +12437,8 @@ fi - fi - - # Check whether --enable-timepick was given. --if test "${enable_timepick+set}" = set; then : -+if test ${enable_timepick+y} -+then : - enableval=$enable_timepick; - if test "$enableval" = yes; then - wx_cv_use_timepick='wxUSE_TIMEPICKCTRL=yes' -@@ -11331,10 +12446,11 @@ if test "${enable_timepick+set}" = set; then : - wx_cv_use_timepick='wxUSE_TIMEPICKCTRL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_timepick='wxUSE_TIMEPICKCTRL=${'DEFAULT_wxUSE_TIMEPICKCTRL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11352,7 +12468,8 @@ fi - fi - - # Check whether --enable-tipwindow was given. --if test "${enable_tipwindow+set}" = set; then : -+if test ${enable_tipwindow+y} -+then : - enableval=$enable_tipwindow; - if test "$enableval" = yes; then - wx_cv_use_tipwindow='wxUSE_TIPWINDOW=yes' -@@ -11360,10 +12477,11 @@ if test "${enable_tipwindow+set}" = set; then : - wx_cv_use_tipwindow='wxUSE_TIPWINDOW=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11381,7 +12499,8 @@ fi - fi - - # Check whether --enable-togglebtn was given. --if test "${enable_togglebtn+set}" = set; then : -+if test ${enable_togglebtn+y} -+then : - enableval=$enable_togglebtn; - if test "$enableval" = yes; then - wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes' -@@ -11389,10 +12508,11 @@ if test "${enable_togglebtn+set}" = set; then : - wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11410,7 +12530,8 @@ fi - fi - - # Check whether --enable-toolbar was given. --if test "${enable_toolbar+set}" = set; then : -+if test ${enable_toolbar+y} -+then : - enableval=$enable_toolbar; - if test "$enableval" = yes; then - wx_cv_use_toolbar='wxUSE_TOOLBAR=yes' -@@ -11418,10 +12539,11 @@ if test "${enable_toolbar+set}" = set; then : - wx_cv_use_toolbar='wxUSE_TOOLBAR=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11439,7 +12561,8 @@ fi - fi - - # Check whether --enable-toolbook was given. --if test "${enable_toolbook+set}" = set; then : -+if test ${enable_toolbook+y} -+then : - enableval=$enable_toolbook; - if test "$enableval" = yes; then - wx_cv_use_toolbook='wxUSE_TOOLBOOK=yes' -@@ -11447,10 +12570,11 @@ if test "${enable_toolbook+set}" = set; then : - wx_cv_use_toolbook='wxUSE_TOOLBOOK=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11468,7 +12592,8 @@ fi - fi - - # Check whether --enable-treebook was given. --if test "${enable_treebook+set}" = set; then : -+if test ${enable_treebook+y} -+then : - enableval=$enable_treebook; - if test "$enableval" = yes; then - wx_cv_use_treebook='wxUSE_TREEBOOK=yes' -@@ -11476,10 +12601,11 @@ if test "${enable_treebook+set}" = set; then : - wx_cv_use_treebook='wxUSE_TREEBOOK=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11497,7 +12623,8 @@ fi - fi - - # Check whether --enable-treectrl was given. --if test "${enable_treectrl+set}" = set; then : -+if test ${enable_treectrl+y} -+then : - enableval=$enable_treectrl; - if test "$enableval" = yes; then - wx_cv_use_treectrl='wxUSE_TREECTRL=yes' -@@ -11505,10 +12632,11 @@ if test "${enable_treectrl+set}" = set; then : - wx_cv_use_treectrl='wxUSE_TREECTRL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11526,7 +12654,8 @@ fi - fi - - # Check whether --enable-treelist was given. --if test "${enable_treelist+set}" = set; then : -+if test ${enable_treelist+y} -+then : - enableval=$enable_treelist; - if test "$enableval" = yes; then - wx_cv_use_treelist='wxUSE_TREELISTCTRL=yes' -@@ -11534,10 +12663,11 @@ if test "${enable_treelist+set}" = set; then : - wx_cv_use_treelist='wxUSE_TREELISTCTRL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_treelist='wxUSE_TREELISTCTRL=${'DEFAULT_wxUSE_TREELISTCTRL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11557,7 +12687,8 @@ fi - fi - - # Check whether --enable-commondlg was given. --if test "${enable_commondlg+set}" = set; then : -+if test ${enable_commondlg+y} -+then : - enableval=$enable_commondlg; - if test "$enableval" = yes; then - wx_cv_use_commondlg='wxUSE_COMMONDLGS=yes' -@@ -11565,10 +12696,11 @@ if test "${enable_commondlg+set}" = set; then : - wx_cv_use_commondlg='wxUSE_COMMONDLGS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11586,7 +12718,8 @@ fi - fi - - # Check whether --enable-aboutdlg was given. --if test "${enable_aboutdlg+set}" = set; then : -+if test ${enable_aboutdlg+y} -+then : - enableval=$enable_aboutdlg; - if test "$enableval" = yes; then - wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=yes' -@@ -11594,10 +12727,11 @@ if test "${enable_aboutdlg+set}" = set; then : - wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11615,7 +12749,8 @@ fi - fi - - # Check whether --enable-choicedlg was given. --if test "${enable_choicedlg+set}" = set; then : -+if test ${enable_choicedlg+y} -+then : - enableval=$enable_choicedlg; - if test "$enableval" = yes; then - wx_cv_use_choicedlg='wxUSE_CHOICEDLG=yes' -@@ -11623,10 +12758,11 @@ if test "${enable_choicedlg+set}" = set; then : - wx_cv_use_choicedlg='wxUSE_CHOICEDLG=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11644,7 +12780,8 @@ fi - fi - - # Check whether --enable-coldlg was given. --if test "${enable_coldlg+set}" = set; then : -+if test ${enable_coldlg+y} -+then : - enableval=$enable_coldlg; - if test "$enableval" = yes; then - wx_cv_use_coldlg='wxUSE_COLOURDLG=yes' -@@ -11652,10 +12789,11 @@ if test "${enable_coldlg+set}" = set; then : - wx_cv_use_coldlg='wxUSE_COLOURDLG=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11673,7 +12811,8 @@ fi - fi - - # Check whether --enable-creddlg was given. --if test "${enable_creddlg+set}" = set; then : -+if test ${enable_creddlg+y} -+then : - enableval=$enable_creddlg; - if test "$enableval" = yes; then - wx_cv_use_creddlg='wxUSE_CREDENTIALDLG=yes' -@@ -11681,10 +12820,11 @@ if test "${enable_creddlg+set}" = set; then : - wx_cv_use_creddlg='wxUSE_CREDENTIALDLG=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_creddlg='wxUSE_CREDENTIALDLG=${'DEFAULT_wxUSE_CREDENTIALDLG":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11702,7 +12842,8 @@ fi - fi - - # Check whether --enable-filedlg was given. --if test "${enable_filedlg+set}" = set; then : -+if test ${enable_filedlg+y} -+then : - enableval=$enable_filedlg; - if test "$enableval" = yes; then - wx_cv_use_filedlg='wxUSE_FILEDLG=yes' -@@ -11710,10 +12851,11 @@ if test "${enable_filedlg+set}" = set; then : - wx_cv_use_filedlg='wxUSE_FILEDLG=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11731,7 +12873,8 @@ fi - fi - - # Check whether --enable-finddlg was given. --if test "${enable_finddlg+set}" = set; then : -+if test ${enable_finddlg+y} -+then : - enableval=$enable_finddlg; - if test "$enableval" = yes; then - wx_cv_use_finddlg='wxUSE_FINDREPLDLG=yes' -@@ -11739,10 +12882,11 @@ if test "${enable_finddlg+set}" = set; then : - wx_cv_use_finddlg='wxUSE_FINDREPLDLG=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11760,7 +12904,8 @@ fi - fi - - # Check whether --enable-fontdlg was given. --if test "${enable_fontdlg+set}" = set; then : -+if test ${enable_fontdlg+y} -+then : - enableval=$enable_fontdlg; - if test "$enableval" = yes; then - wx_cv_use_fontdlg='wxUSE_FONTDLG=yes' -@@ -11768,10 +12913,11 @@ if test "${enable_fontdlg+set}" = set; then : - wx_cv_use_fontdlg='wxUSE_FONTDLG=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11789,7 +12935,8 @@ fi - fi - - # Check whether --enable-dirdlg was given. --if test "${enable_dirdlg+set}" = set; then : -+if test ${enable_dirdlg+y} -+then : - enableval=$enable_dirdlg; - if test "$enableval" = yes; then - wx_cv_use_dirdlg='wxUSE_DIRDLG=yes' -@@ -11797,10 +12944,11 @@ if test "${enable_dirdlg+set}" = set; then : - wx_cv_use_dirdlg='wxUSE_DIRDLG=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11818,7 +12966,8 @@ fi - fi - - # Check whether --enable-msgdlg was given. --if test "${enable_msgdlg+set}" = set; then : -+if test ${enable_msgdlg+y} -+then : - enableval=$enable_msgdlg; - if test "$enableval" = yes; then - wx_cv_use_msgdlg='wxUSE_MSGDLG=yes' -@@ -11826,10 +12975,11 @@ if test "${enable_msgdlg+set}" = set; then : - wx_cv_use_msgdlg='wxUSE_MSGDLG=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11847,7 +12997,8 @@ fi - fi - - # Check whether --enable-numberdlg was given. --if test "${enable_numberdlg+set}" = set; then : -+if test ${enable_numberdlg+y} -+then : - enableval=$enable_numberdlg; - if test "$enableval" = yes; then - wx_cv_use_numberdlg='wxUSE_NUMBERDLG=yes' -@@ -11855,10 +13006,11 @@ if test "${enable_numberdlg+set}" = set; then : - wx_cv_use_numberdlg='wxUSE_NUMBERDLG=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11876,7 +13028,8 @@ fi - fi - - # Check whether --enable-splash was given. --if test "${enable_splash+set}" = set; then : -+if test ${enable_splash+y} -+then : - enableval=$enable_splash; - if test "$enableval" = yes; then - wx_cv_use_splash='wxUSE_SPLASH=yes' -@@ -11884,10 +13037,11 @@ if test "${enable_splash+set}" = set; then : - wx_cv_use_splash='wxUSE_SPLASH=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11905,7 +13059,8 @@ fi - fi - - # Check whether --enable-textdlg was given. --if test "${enable_textdlg+set}" = set; then : -+if test ${enable_textdlg+y} -+then : - enableval=$enable_textdlg; - if test "$enableval" = yes; then - wx_cv_use_textdlg='wxUSE_TEXTDLG=yes' -@@ -11913,10 +13068,11 @@ if test "${enable_textdlg+set}" = set; then : - wx_cv_use_textdlg='wxUSE_TEXTDLG=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11934,7 +13090,8 @@ fi - fi - - # Check whether --enable-tipdlg was given. --if test "${enable_tipdlg+set}" = set; then : -+if test ${enable_tipdlg+y} -+then : - enableval=$enable_tipdlg; - if test "$enableval" = yes; then - wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes' -@@ -11942,10 +13099,11 @@ if test "${enable_tipdlg+set}" = set; then : - wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11963,7 +13121,8 @@ fi - fi - - # Check whether --enable-progressdlg was given. --if test "${enable_progressdlg+set}" = set; then : -+if test ${enable_progressdlg+y} -+then : - enableval=$enable_progressdlg; - if test "$enableval" = yes; then - wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes' -@@ -11971,10 +13130,11 @@ if test "${enable_progressdlg+set}" = set; then : - wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -11992,7 +13152,8 @@ fi - fi - - # Check whether --enable-wizarddlg was given. --if test "${enable_wizarddlg+set}" = set; then : -+if test ${enable_wizarddlg+y} -+then : - enableval=$enable_wizarddlg; - if test "$enableval" = yes; then - wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=yes' -@@ -12000,10 +13161,11 @@ if test "${enable_wizarddlg+set}" = set; then : - wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12027,7 +13189,8 @@ fi - fi - - # Check whether --enable-menus was given. --if test "${enable_menus+set}" = set; then : -+if test ${enable_menus+y} -+then : - enableval=$enable_menus; - if test "$enableval" = yes; then - wx_cv_use_menus='wxUSE_MENUS=yes' -@@ -12035,10 +13198,11 @@ if test "${enable_menus+set}" = set; then : - wx_cv_use_menus='wxUSE_MENUS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12056,7 +13220,8 @@ fi - fi - - # Check whether --enable-menubar was given. --if test "${enable_menubar+set}" = set; then : -+if test ${enable_menubar+y} -+then : - enableval=$enable_menubar; - if test "$enableval" = yes; then - wx_cv_use_menubar='wxUSE_MENUBAR=yes' -@@ -12064,10 +13229,11 @@ if test "${enable_menubar+set}" = set; then : - wx_cv_use_menubar='wxUSE_MENUBAR=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_menubar='wxUSE_MENUBAR=${'DEFAULT_wxUSE_MENUBAR":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12085,7 +13251,8 @@ fi - fi - - # Check whether --enable-miniframe was given. --if test "${enable_miniframe+set}" = set; then : -+if test ${enable_miniframe+y} -+then : - enableval=$enable_miniframe; - if test "$enableval" = yes; then - wx_cv_use_miniframe='wxUSE_MINIFRAME=yes' -@@ -12093,10 +13260,11 @@ if test "${enable_miniframe+set}" = set; then : - wx_cv_use_miniframe='wxUSE_MINIFRAME=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12114,7 +13282,8 @@ fi - fi - - # Check whether --enable-tooltips was given. --if test "${enable_tooltips+set}" = set; then : -+if test ${enable_tooltips+y} -+then : - enableval=$enable_tooltips; - if test "$enableval" = yes; then - wx_cv_use_tooltips='wxUSE_TOOLTIPS=yes' -@@ -12122,10 +13291,11 @@ if test "${enable_tooltips+set}" = set; then : - wx_cv_use_tooltips='wxUSE_TOOLTIPS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12143,7 +13313,8 @@ fi - fi - - # Check whether --enable-splines was given. --if test "${enable_splines+set}" = set; then : -+if test ${enable_splines+y} -+then : - enableval=$enable_splines; - if test "$enableval" = yes; then - wx_cv_use_splines='wxUSE_SPLINES=yes' -@@ -12151,10 +13322,11 @@ if test "${enable_splines+set}" = set; then : - wx_cv_use_splines='wxUSE_SPLINES=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12172,7 +13344,8 @@ fi - fi - - # Check whether --enable-mousewheel was given. --if test "${enable_mousewheel+set}" = set; then : -+if test ${enable_mousewheel+y} -+then : - enableval=$enable_mousewheel; - if test "$enableval" = yes; then - wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=yes' -@@ -12180,10 +13353,11 @@ if test "${enable_mousewheel+set}" = set; then : - wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12201,7 +13375,8 @@ fi - fi - - # Check whether --enable-validators was given. --if test "${enable_validators+set}" = set; then : -+if test ${enable_validators+y} -+then : - enableval=$enable_validators; - if test "$enableval" = yes; then - wx_cv_use_validators='wxUSE_VALIDATORS=yes' -@@ -12209,10 +13384,11 @@ if test "${enable_validators+set}" = set; then : - wx_cv_use_validators='wxUSE_VALIDATORS=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12230,7 +13406,8 @@ fi - fi - - # Check whether --enable-busyinfo was given. --if test "${enable_busyinfo+set}" = set; then : -+if test ${enable_busyinfo+y} -+then : - enableval=$enable_busyinfo; - if test "$enableval" = yes; then - wx_cv_use_busyinfo='wxUSE_BUSYINFO=yes' -@@ -12238,10 +13415,11 @@ if test "${enable_busyinfo+set}" = set; then : - wx_cv_use_busyinfo='wxUSE_BUSYINFO=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12259,7 +13437,8 @@ fi - fi - - # Check whether --enable-hotkey was given. --if test "${enable_hotkey+set}" = set; then : -+if test ${enable_hotkey+y} -+then : - enableval=$enable_hotkey; - if test "$enableval" = yes; then - wx_cv_use_hotkey='wxUSE_HOTKEY=yes' -@@ -12267,10 +13446,11 @@ if test "${enable_hotkey+set}" = set; then : - wx_cv_use_hotkey='wxUSE_HOTKEY=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_hotkey='wxUSE_HOTKEY=${'DEFAULT_wxUSE_HOTKEY":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12288,7 +13468,8 @@ fi - fi - - # Check whether --enable-joystick was given. --if test "${enable_joystick+set}" = set; then : -+if test ${enable_joystick+y} -+then : - enableval=$enable_joystick; - if test "$enableval" = yes; then - wx_cv_use_joystick='wxUSE_JOYSTICK=yes' -@@ -12296,10 +13477,11 @@ if test "${enable_joystick+set}" = set; then : - wx_cv_use_joystick='wxUSE_JOYSTICK=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_joystick='wxUSE_JOYSTICK=${'DEFAULT_wxUSE_JOYSTICK":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12317,7 +13499,8 @@ fi - fi - - # Check whether --enable-metafile was given. --if test "${enable_metafile+set}" = set; then : -+if test ${enable_metafile+y} -+then : - enableval=$enable_metafile; - if test "$enableval" = yes; then - wx_cv_use_metafile='wxUSE_METAFILE=yes' -@@ -12325,10 +13508,11 @@ if test "${enable_metafile+set}" = set; then : - wx_cv_use_metafile='wxUSE_METAFILE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12346,7 +13530,8 @@ fi - fi - - # Check whether --enable-dragimage was given. --if test "${enable_dragimage+set}" = set; then : -+if test ${enable_dragimage+y} -+then : - enableval=$enable_dragimage; - if test "$enableval" = yes; then - wx_cv_use_dragimage='wxUSE_DRAGIMAGE=yes' -@@ -12354,10 +13539,11 @@ if test "${enable_dragimage+set}" = set; then : - wx_cv_use_dragimage='wxUSE_DRAGIMAGE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_dragimage='wxUSE_DRAGIMAGE=${'DEFAULT_wxUSE_DRAGIMAGE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12375,7 +13561,8 @@ fi - fi - - # Check whether --enable-accessibility was given. --if test "${enable_accessibility+set}" = set; then : -+if test ${enable_accessibility+y} -+then : - enableval=$enable_accessibility; - if test "$enableval" = yes; then - wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=yes' -@@ -12383,10 +13570,11 @@ if test "${enable_accessibility+set}" = set; then : - wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=${'DEFAULT_wxUSE_ACCESSIBILITY":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12404,7 +13592,8 @@ fi - fi - - # Check whether --enable-uiactionsim was given. --if test "${enable_uiactionsim+set}" = set; then : -+if test ${enable_uiactionsim+y} -+then : - enableval=$enable_uiactionsim; - if test "$enableval" = yes; then - wx_cv_use_uiactionsim='wxUSE_UIACTIONSIMULATOR=yes' -@@ -12412,10 +13601,11 @@ if test "${enable_uiactionsim+set}" = set; then : - wx_cv_use_uiactionsim='wxUSE_UIACTIONSIMULATOR=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_uiactionsim='wxUSE_UIACTIONSIMULATOR=${'DEFAULT_wxUSE_UIACTIONSIMULATOR":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12433,7 +13623,8 @@ fi - fi - - # Check whether --enable-dctransform was given. --if test "${enable_dctransform+set}" = set; then : -+if test ${enable_dctransform+y} -+then : - enableval=$enable_dctransform; - if test "$enableval" = yes; then - wx_cv_use_dctransform='wxUSE_DC_TRANSFORM_MATRIX=yes' -@@ -12441,10 +13632,11 @@ if test "${enable_dctransform+set}" = set; then : - wx_cv_use_dctransform='wxUSE_DC_TRANSFORM_MATRIX=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_dctransform='wxUSE_DC_TRANSFORM_MATRIX=${'DEFAULT_wxUSE_DC_TRANSFORM_MATRIX":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12462,7 +13654,8 @@ fi - fi - - # Check whether --enable-webviewwebkit was given. --if test "${enable_webviewwebkit+set}" = set; then : -+if test ${enable_webviewwebkit+y} -+then : - enableval=$enable_webviewwebkit; - if test "$enableval" = yes; then - wx_cv_use_webviewwebkit='wxUSE_WEBVIEW_WEBKIT=yes' -@@ -12470,10 +13663,11 @@ if test "${enable_webviewwebkit+set}" = set; then : - wx_cv_use_webviewwebkit='wxUSE_WEBVIEW_WEBKIT=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_webviewwebkit='wxUSE_WEBVIEW_WEBKIT=${'DEFAULT_wxUSE_WEBVIEW_WEBKIT":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12491,7 +13685,8 @@ fi - fi - - # Check whether --enable-glcanvasegl was given. --if test "${enable_glcanvasegl+set}" = set; then : -+if test ${enable_glcanvasegl+y} -+then : - enableval=$enable_glcanvasegl; - if test "$enableval" = yes; then - wx_cv_use_glcanvasegl='wxUSE_GLCANVAS_EGL=yes' -@@ -12499,10 +13694,11 @@ if test "${enable_glcanvasegl+set}" = set; then : - wx_cv_use_glcanvasegl='wxUSE_GLCANVAS_EGL=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_glcanvasegl='wxUSE_GLCANVAS_EGL=${'DEFAULT_wxUSE_GLCANVAS_EGL":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12522,7 +13718,8 @@ fi - fi - - # Check whether --enable-palette was given. --if test "${enable_palette+set}" = set; then : -+if test ${enable_palette+y} -+then : - enableval=$enable_palette; - if test "$enableval" = yes; then - wx_cv_use_palette='wxUSE_PALETTE=yes' -@@ -12530,10 +13727,11 @@ if test "${enable_palette+set}" = set; then : - wx_cv_use_palette='wxUSE_PALETTE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_palette='wxUSE_PALETTE=${'DEFAULT_wxUSE_PALETTE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12551,7 +13749,8 @@ fi - fi - - # Check whether --enable-image was given. --if test "${enable_image+set}" = set; then : -+if test ${enable_image+y} -+then : - enableval=$enable_image; - if test "$enableval" = yes; then - wx_cv_use_image='wxUSE_IMAGE=yes' -@@ -12559,10 +13758,11 @@ if test "${enable_image+set}" = set; then : - wx_cv_use_image='wxUSE_IMAGE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_image='wxUSE_IMAGE=${'DEFAULT_wxUSE_IMAGE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12580,7 +13780,8 @@ fi - fi - - # Check whether --enable-gif was given. --if test "${enable_gif+set}" = set; then : -+if test ${enable_gif+y} -+then : - enableval=$enable_gif; - if test "$enableval" = yes; then - wx_cv_use_gif='wxUSE_GIF=yes' -@@ -12588,10 +13789,11 @@ if test "${enable_gif+set}" = set; then : - wx_cv_use_gif='wxUSE_GIF=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_gif='wxUSE_GIF=${'DEFAULT_wxUSE_GIF":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12609,7 +13811,8 @@ fi - fi - - # Check whether --enable-pcx was given. --if test "${enable_pcx+set}" = set; then : -+if test ${enable_pcx+y} -+then : - enableval=$enable_pcx; - if test "$enableval" = yes; then - wx_cv_use_pcx='wxUSE_PCX=yes' -@@ -12617,10 +13820,11 @@ if test "${enable_pcx+set}" = set; then : - wx_cv_use_pcx='wxUSE_PCX=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_pcx='wxUSE_PCX=${'DEFAULT_wxUSE_PCX":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12638,7 +13842,8 @@ fi - fi - - # Check whether --enable-tga was given. --if test "${enable_tga+set}" = set; then : -+if test ${enable_tga+y} -+then : - enableval=$enable_tga; - if test "$enableval" = yes; then - wx_cv_use_tga='wxUSE_TGA=yes' -@@ -12646,10 +13851,11 @@ if test "${enable_tga+set}" = set; then : - wx_cv_use_tga='wxUSE_TGA=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_tga='wxUSE_TGA=${'DEFAULT_wxUSE_TGA":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12667,7 +13873,8 @@ fi - fi - - # Check whether --enable-iff was given. --if test "${enable_iff+set}" = set; then : -+if test ${enable_iff+y} -+then : - enableval=$enable_iff; - if test "$enableval" = yes; then - wx_cv_use_iff='wxUSE_IFF=yes' -@@ -12675,10 +13882,11 @@ if test "${enable_iff+set}" = set; then : - wx_cv_use_iff='wxUSE_IFF=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_iff='wxUSE_IFF=${'DEFAULT_wxUSE_IFF":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12696,7 +13904,8 @@ fi - fi - - # Check whether --enable-pnm was given. --if test "${enable_pnm+set}" = set; then : -+if test ${enable_pnm+y} -+then : - enableval=$enable_pnm; - if test "$enableval" = yes; then - wx_cv_use_pnm='wxUSE_PNM=yes' -@@ -12704,10 +13913,11 @@ if test "${enable_pnm+set}" = set; then : - wx_cv_use_pnm='wxUSE_PNM=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_pnm='wxUSE_PNM=${'DEFAULT_wxUSE_PNM":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12725,7 +13935,8 @@ fi - fi - - # Check whether --enable-xpm was given. --if test "${enable_xpm+set}" = set; then : -+if test ${enable_xpm+y} -+then : - enableval=$enable_xpm; - if test "$enableval" = yes; then - wx_cv_use_xpm='wxUSE_XPM=yes' -@@ -12733,10 +13944,11 @@ if test "${enable_xpm+set}" = set; then : - wx_cv_use_xpm='wxUSE_XPM=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_xpm='wxUSE_XPM=${'DEFAULT_wxUSE_XPM":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12754,7 +13966,8 @@ fi - fi - - # Check whether --enable-ico_cur was given. --if test "${enable_ico_cur+set}" = set; then : -+if test ${enable_ico_cur+y} -+then : - enableval=$enable_ico_cur; - if test "$enableval" = yes; then - wx_cv_use_ico_cur='wxUSE_ICO_CUR=yes' -@@ -12762,10 +13975,11 @@ if test "${enable_ico_cur+set}" = set; then : - wx_cv_use_ico_cur='wxUSE_ICO_CUR=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_ico_cur='wxUSE_ICO_CUR=${'DEFAULT_wxUSE_ICO_CUR":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12785,7 +13999,8 @@ fi - fi - - # Check whether --enable-dccache was given. --if test "${enable_dccache+set}" = set; then : -+if test ${enable_dccache+y} -+then : - enableval=$enable_dccache; - if test "$enableval" = yes; then - wx_cv_use_dccache='wxUSE_DC_CACHEING=yes' -@@ -12793,10 +14008,11 @@ if test "${enable_dccache+set}" = set; then : - wx_cv_use_dccache='wxUSE_DC_CACHEING=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12814,7 +14030,8 @@ fi - fi - - # Check whether --enable-ps-in-msw was given. --if test "${enable_ps_in_msw+set}" = set; then : -+if test ${enable_ps_in_msw+y} -+then : - enableval=$enable_ps_in_msw; - if test "$enableval" = yes; then - wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=yes' -@@ -12822,10 +14039,11 @@ if test "${enable_ps_in_msw+set}" = set; then : - wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=${'DEFAULT_wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12843,7 +14061,8 @@ fi - fi - - # Check whether --enable-ownerdrawn was given. --if test "${enable_ownerdrawn+set}" = set; then : -+if test ${enable_ownerdrawn+y} -+then : - enableval=$enable_ownerdrawn; - if test "$enableval" = yes; then - wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=yes' -@@ -12851,10 +14070,11 @@ if test "${enable_ownerdrawn+set}" = set; then : - wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=${'DEFAULT_wxUSE_OWNER_DRAWN":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12872,7 +14092,8 @@ fi - fi - - # Check whether --enable-taskbarbutton was given. --if test "${enable_taskbarbutton+set}" = set; then : -+if test ${enable_taskbarbutton+y} -+then : - enableval=$enable_taskbarbutton; - if test "$enableval" = yes; then - wx_cv_use_taskbarbutton='wxUSE_TASKBARBUTTON=yes' -@@ -12880,10 +14101,11 @@ if test "${enable_taskbarbutton+set}" = set; then : - wx_cv_use_taskbarbutton='wxUSE_TASKBARBUTTON=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_taskbarbutton='wxUSE_TASKBARBUTTON=${'DEFAULT_wxUSE_TASKBARBUTTON":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12901,7 +14123,8 @@ fi - fi - - # Check whether --enable-uxtheme was given. --if test "${enable_uxtheme+set}" = set; then : -+if test ${enable_uxtheme+y} -+then : - enableval=$enable_uxtheme; - if test "$enableval" = yes; then - wx_cv_use_uxtheme='wxUSE_UXTHEME=yes' -@@ -12909,10 +14132,11 @@ if test "${enable_uxtheme+set}" = set; then : - wx_cv_use_uxtheme='wxUSE_UXTHEME=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_uxtheme='wxUSE_UXTHEME=${'DEFAULT_wxUSE_UXTHEME":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12930,7 +14154,8 @@ fi - fi - - # Check whether --enable-wxdib was given. --if test "${enable_wxdib+set}" = set; then : -+if test ${enable_wxdib+y} -+then : - enableval=$enable_wxdib; - if test "$enableval" = yes; then - wx_cv_use_wxdib='wxUSE_DIB=yes' -@@ -12938,10 +14163,11 @@ if test "${enable_wxdib+set}" = set; then : - wx_cv_use_wxdib='wxUSE_DIB=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_wxdib='wxUSE_DIB=${'DEFAULT_wxUSE_DIB":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12959,7 +14185,8 @@ fi - fi - - # Check whether --enable-webviewie was given. --if test "${enable_webviewie+set}" = set; then : -+if test ${enable_webviewie+y} -+then : - enableval=$enable_webviewie; - if test "$enableval" = yes; then - wx_cv_use_webviewie='wxUSE_WEBVIEW_IE=yes' -@@ -12967,10 +14194,11 @@ if test "${enable_webviewie+set}" = set; then : - wx_cv_use_webviewie='wxUSE_WEBVIEW_IE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_webviewie='wxUSE_WEBVIEW_IE=${'DEFAULT_wxUSE_WEBVIEW_IE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -12988,7 +14216,8 @@ fi - fi - - # Check whether --enable-webviewedge was given. --if test "${enable_webviewedge+set}" = set; then : -+if test ${enable_webviewedge+y} -+then : - enableval=$enable_webviewedge; - if test "$enableval" = yes; then - wx_cv_use_webviewedge='wxUSE_WEBVIEW_EDGE=yes' -@@ -12996,10 +14225,11 @@ if test "${enable_webviewedge+set}" = set; then : - wx_cv_use_webviewedge='wxUSE_WEBVIEW_EDGE=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_webviewedge='wxUSE_WEBVIEW_EDGE=${'DEFAULT_wxUSE_WEBVIEW_EDGE":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -13022,7 +14252,8 @@ fi - fi - - # Check whether --enable-autoidman was given. --if test "${enable_autoidman+set}" = set; then : -+if test ${enable_autoidman+y} -+then : - enableval=$enable_autoidman; - if test "$enableval" = yes; then - wx_cv_use_autoidman='wxUSE_AUTOID_MANAGEMENT=yes' -@@ -13030,10 +14261,11 @@ if test "${enable_autoidman+set}" = set; then : - wx_cv_use_autoidman='wxUSE_AUTOID_MANAGEMENT=no' - fi - --else -- -+else case e in #( -+ e) - wx_cv_use_autoidman='wxUSE_AUTOID_MANAGEMENT=${'DEFAULT_wxUSE_AUTOID_MANAGEMENT":-$defaultval}" -- -+ ;; -+esac - fi - - -@@ -13053,8 +14285,8 @@ cat >confcache <<\_ACEOF - # config.status only pays attention to the cache file if you give it - # the --recheck option to rerun configure. - # --# `ac_cv_env_foo' variables (set or unset) will be overridden when --# loading this file, other *unset* `ac_cv_foo' will be assigned the -+# 'ac_cv_env_foo' variables (set or unset) will be overridden when -+# loading this file, other *unset* 'ac_cv_foo' will be assigned the - # following values. - - _ACEOF -@@ -13070,8 +14302,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) ;; #( -@@ -13084,14 +14316,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) -- # `set' does not quote correctly, so add quotes: double-quote -+ # 'set' does not quote correctly, so add quotes: double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( - *) -- # `set' quotes correctly as required by POSIX, so do not add quotes. -+ # 'set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | -@@ -13101,15 +14333,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 -@@ -13123,13 +14355,22 @@ $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 - - CFLAGS=${CFLAGS:=} -+ -+ -+ -+ -+ -+ -+ -+ -+ - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -13138,38 +14379,44 @@ 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 -- if test -n "$CC"; then -+{ 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 case e in #( -+ e) 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 -- 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 - done - IFS=$as_save_IFS - --fi -+fi ;; -+esac - 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 - - -@@ -13178,38 +14425,44 @@ 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 -- if test -n "$ac_ct_CC"; then -+{ 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 case e in #( -+ e) 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 -- 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 - done - IFS=$as_save_IFS - --fi -+fi ;; -+esac - 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 -@@ -13217,8 +14470,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 -@@ -13231,38 +14484,44 @@ 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 -- if test -n "$CC"; then -+{ 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 case e in #( -+ e) 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 -- 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 - done - IFS=$as_save_IFS - --fi -+fi ;; -+esac - 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 - - -@@ -13271,12 +14530,13 @@ 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 -- if test -n "$CC"; then -+{ 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 case e in #( -+ e) if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else - ac_prog_rejected=no -@@ -13284,15 +14544,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 -@@ -13308,18 +14572,19 @@ 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 ;; -+esac - 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 - - -@@ -13330,38 +14595,44 @@ 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 -- if test -n "$CC"; then -+{ 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 case e in #( -+ e) 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 -- 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 - done - IFS=$as_save_IFS - --fi -+fi ;; -+esac - 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 - - -@@ -13374,38 +14645,44 @@ 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 -- if test -n "$ac_ct_CC"; then -+{ 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 case e in #( -+ e) 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 -- 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 - done - IFS=$as_save_IFS - --fi -+fi ;; -+esac - 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 - - -@@ -13417,8 +14694,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 - CC=$ac_ct_CC -@@ -13426,25 +14703,131 @@ esac - 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 case e in #( -+ e) 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 ;; -+esac -+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 case e in #( -+ e) 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 ;; -+esac -+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 - --test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+ 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" && { { 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; } -+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 -@@ -13454,7 +14837,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 - -@@ -13462,7 +14845,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - ; -@@ -13474,9 +14857,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.*" -@@ -13497,13 +14880,14 @@ 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 : -- # 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' -+ 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, - # so that the user can short-circuit this test for compilers unknown to - # Autoconf. -@@ -13518,12 +14902,12 @@ 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 - # We set ac_cv_exeext here because the later test for it is not -- # safe: cross compilers may not add the suffix if given an `-o' -+ # safe: cross compilers may not add the suffix if given an '-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. -@@ -13534,48 +14918,52 @@ do - done - test "$ac_cv_exeext" = no && ac_cv_exeext= - --else -- ac_file='' -+else case e in #( -+ e) ac_file='' ;; -+esac - 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; } -+See 'config.log' for more details" "$LINENO" 5; } -+else case e in #( -+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } ;; -+esac - 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; } -+{ 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 : -- # 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 --# `rm'. -+ 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 -+# 'rm'. - for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in -@@ -13585,15 +14973,16 @@ 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 case e in #( -+ e) { { 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; } -+See 'config.log' for more details" "$LINENO" 5; } ;; -+esac - 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 -@@ -13602,9 +14991,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - FILE *f = fopen ("conftest.out", "w"); -+ if (!f) -+ return 1; - return ferror (f) || fclose (f) != 0; - - ; -@@ -13614,8 +15005,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 -@@ -13623,10 +15014,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 -@@ -13634,39 +15025,41 @@ $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. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details" "$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;} -+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 -+rm -f conftest.$ac_ext conftest$ac_cv_exeext \ -+ conftest.o conftest.obj 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 -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+{ 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 case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - ; -@@ -13680,11 +15073,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 -@@ -13693,31 +15087,34 @@ $as_echo "$ac_try_echo"; } >&5 - break;; - esac - done --else -- $as_echo "$as_me: failed program was:" >&5 -+else case e in #( -+ e) 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; } -+See 'config.log' for more details" "$LINENO" 5; } ;; -+esac - fi --rm -f conftest.$ac_cv_objext conftest.$ac_ext -+rm -f conftest.$ac_cv_objext conftest.$ac_ext ;; -+esac - 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 -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+{ 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 case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - #ifndef __GNUC__ - choke me -@@ -13727,30 +15124,36 @@ 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 -- ac_compiler_gnu=no -+else case e in #( -+ e) ac_compiler_gnu=no ;; -+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 - ac_cv_c_compiler_gnu=$ac_compiler_gnu -- -+ ;; -+esac - 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 -- ac_save_c_werror_flag=$ac_c_werror_flag -+{ 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 case e in #( -+ e) ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" -@@ -13758,57 +15161,63 @@ 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 -- CFLAGS="" -+else case e in #( -+ e) 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 -- ac_c_werror_flag=$ac_save_c_werror_flag -+else case e in #( -+ e) 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 ;; -+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 ;; -+esac - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- ac_c_werror_flag=$ac_save_c_werror_flag -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ac_c_werror_flag=$ac_save_c_werror_flag ;; -+esac - 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 -@@ -13823,94 +15232,153 @@ 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 case e in #( -+ e) 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 ;; -+esac -+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 case e in #( -+ e) 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 case e in #( -+ e) { 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" ;; -+esac -+fi -+ ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 -+ ac_prog_cc_stdc=c11 ;; -+esac -+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 case e in #( -+ e) 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 ;; -+esac -+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 case e in #( -+ e) 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 case e in #( -+ e) { 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" ;; -+esac -+fi -+ ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 -+ ac_prog_cc_stdc=c99 ;; -+esac -+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 case e in #( -+ e) 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 -+CC=$ac_save_CC ;; -+esac -+fi - -+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 case e in #( -+ e) 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 case e in #( -+ e) { 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" ;; -+esac - 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; } ;; -+ ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 -+ ac_prog_cc_stdc=c89 ;; - esac --if test "x$ac_cv_prog_cc_c89" != xno; then : -- -+fi - fi - - ac_ext=c -@@ -13932,16 +15400,17 @@ 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 we are using the Intel C compiler" >&5 --$as_echo_n "checking whether we are using the Intel C compiler... " >&6; } --if ${bakefile_cv_c_compiler___INTEL_COMPILER+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the Intel C compiler" >&5 -+printf %s "checking whether we are using the Intel C compiler... " >&6; } -+if test ${bakefile_cv_c_compiler___INTEL_COMPILER+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #ifndef __INTEL_COMPILER -@@ -13952,18 +15421,21 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - bakefile_cv_c_compiler___INTEL_COMPILER=yes --else -- bakefile_cv_c_compiler___INTEL_COMPILER=no -- -+else case e in #( -+ e) bakefile_cv_c_compiler___INTEL_COMPILER=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___INTEL_COMPILER" >&5 --$as_echo "$bakefile_cv_c_compiler___INTEL_COMPILER" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___INTEL_COMPILER" >&5 -+printf "%s\n" "$bakefile_cv_c_compiler___INTEL_COMPILER" >&6; } - if test "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then - :; INTELCC=yes - else -@@ -13987,16 +15459,17 @@ 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 we are using Intel C compiler v8 or later" >&5 --$as_echo_n "checking whether we are using Intel C compiler v8 or later... " >&6; } --if ${bakefile_cv_c_compiler___INTEL_COMPILER_lt_800+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using Intel C compiler v8 or later" >&5 -+printf %s "checking whether we are using Intel C compiler v8 or later... " >&6; } -+if test ${bakefile_cv_c_compiler___INTEL_COMPILER_lt_800+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #ifndef __INTEL_COMPILER || __INTEL_COMPILER < 800 -@@ -14007,18 +15480,21 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - bakefile_cv_c_compiler___INTEL_COMPILER_lt_800=yes --else -- bakefile_cv_c_compiler___INTEL_COMPILER_lt_800=no -- -+else case e in #( -+ e) bakefile_cv_c_compiler___INTEL_COMPILER_lt_800=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___INTEL_COMPILER_lt_800" >&5 --$as_echo "$bakefile_cv_c_compiler___INTEL_COMPILER_lt_800" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___INTEL_COMPILER_lt_800" >&5 -+printf "%s\n" "$bakefile_cv_c_compiler___INTEL_COMPILER_lt_800" >&6; } - if test "x$bakefile_cv_c_compiler___INTEL_COMPILER_lt_800" = "xyes"; then - :; INTELCC8=yes - else -@@ -14040,16 +15516,17 @@ 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 we are using Intel C compiler v10 or later" >&5 --$as_echo_n "checking whether we are using Intel C compiler v10 or later... " >&6; } --if ${bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using Intel C compiler v10 or later" >&5 -+printf %s "checking whether we are using Intel C compiler v10 or later... " >&6; } -+if test ${bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #ifndef __INTEL_COMPILER || __INTEL_COMPILER < 1000 -@@ -14060,18 +15537,21 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000=yes --else -- bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000=no -- -+else case e in #( -+ e) bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000" >&5 --$as_echo "$bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000" >&5 -+printf "%s\n" "$bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000" >&6; } - if test "x$bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000" = "xyes"; then - :; INTELCC10=yes - else -@@ -14098,16 +15578,17 @@ 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 we are using the IBM xlC C compiler" >&5 --$as_echo_n "checking whether we are using the IBM xlC C compiler... " >&6; } --if ${bakefile_cv_c_compiler___xlC__+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the IBM xlC C compiler" >&5 -+printf %s "checking whether we are using the IBM xlC C compiler... " >&6; } -+if test ${bakefile_cv_c_compiler___xlC__+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #ifndef __xlC__ -@@ -14118,18 +15599,21 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - bakefile_cv_c_compiler___xlC__=yes --else -- bakefile_cv_c_compiler___xlC__=no -- -+else case e in #( -+ e) bakefile_cv_c_compiler___xlC__=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___xlC__" >&5 --$as_echo "$bakefile_cv_c_compiler___xlC__" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___xlC__" >&5 -+printf "%s\n" "$bakefile_cv_c_compiler___xlC__" >&6; } - if test "x$bakefile_cv_c_compiler___xlC__" = "xyes"; then - :; XLCC=yes - else -@@ -14154,16 +15638,17 @@ 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 we are using the IBM xlC C compiler" >&5 --$as_echo_n "checking whether we are using the IBM xlC C compiler... " >&6; } --if ${bakefile_cv_c_compiler___xlC__+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the IBM xlC C compiler" >&5 -+printf %s "checking whether we are using the IBM xlC C compiler... " >&6; } -+if test ${bakefile_cv_c_compiler___xlC__+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #ifndef __xlC__ -@@ -14174,18 +15659,21 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - bakefile_cv_c_compiler___xlC__=yes --else -- bakefile_cv_c_compiler___xlC__=no -- -+else case e in #( -+ e) bakefile_cv_c_compiler___xlC__=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___xlC__" >&5 --$as_echo "$bakefile_cv_c_compiler___xlC__" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___xlC__" >&5 -+printf "%s\n" "$bakefile_cv_c_compiler___xlC__" >&6; } - if test "x$bakefile_cv_c_compiler___xlC__" = "xyes"; then - :; XLCC=yes - else -@@ -14210,16 +15698,17 @@ 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 we are using the SGI C compiler" >&5 --$as_echo_n "checking whether we are using the SGI C compiler... " >&6; } --if ${bakefile_cv_c_compiler__SGI_COMPILER_VERSION+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the SGI C compiler" >&5 -+printf %s "checking whether we are using the SGI C compiler... " >&6; } -+if test ${bakefile_cv_c_compiler__SGI_COMPILER_VERSION+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #ifndef _SGI_COMPILER_VERSION -@@ -14230,18 +15719,21 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - bakefile_cv_c_compiler__SGI_COMPILER_VERSION=yes --else -- bakefile_cv_c_compiler__SGI_COMPILER_VERSION=no -- -+else case e in #( -+ e) bakefile_cv_c_compiler__SGI_COMPILER_VERSION=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&5 --$as_echo "$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&5 -+printf "%s\n" "$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&6; } - if test "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then - :; SGICC=yes - else -@@ -14267,16 +15759,17 @@ 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 we are using the Sun C compiler" >&5 --$as_echo_n "checking whether we are using the Sun C compiler... " >&6; } --if ${bakefile_cv_c_compiler___SUNPRO_C+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the Sun C compiler" >&5 -+printf %s "checking whether we are using the Sun C compiler... " >&6; } -+if test ${bakefile_cv_c_compiler___SUNPRO_C+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #ifndef __SUNPRO_C -@@ -14287,18 +15780,21 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - bakefile_cv_c_compiler___SUNPRO_C=yes --else -- bakefile_cv_c_compiler___SUNPRO_C=no -- -+else case e in #( -+ e) bakefile_cv_c_compiler___SUNPRO_C=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5 --$as_echo "$bakefile_cv_c_compiler___SUNPRO_C" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5 -+printf "%s\n" "$bakefile_cv_c_compiler___SUNPRO_C" >&6; } - if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then - :; SUNCC=yes - else -@@ -14324,16 +15820,17 @@ 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 we are using the HP C compiler" >&5 --$as_echo_n "checking whether we are using the HP C compiler... " >&6; } --if ${bakefile_cv_c_compiler___HP_cc+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the HP C compiler" >&5 -+printf %s "checking whether we are using the HP C compiler... " >&6; } -+if test ${bakefile_cv_c_compiler___HP_cc+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #ifndef __HP_cc -@@ -14344,18 +15841,21 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - bakefile_cv_c_compiler___HP_cc=yes --else -- bakefile_cv_c_compiler___HP_cc=no -- -+else case e in #( -+ e) bakefile_cv_c_compiler___HP_cc=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___HP_cc" >&5 --$as_echo "$bakefile_cv_c_compiler___HP_cc" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___HP_cc" >&5 -+printf "%s\n" "$bakefile_cv_c_compiler___HP_cc" >&6; } - if test "x$bakefile_cv_c_compiler___HP_cc" = "xyes"; then - :; HPCC=yes - else -@@ -14380,16 +15880,17 @@ 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 we are using the Compaq C compiler" >&5 --$as_echo_n "checking whether we are using the Compaq C compiler... " >&6; } --if ${bakefile_cv_c_compiler___DECC+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the Compaq C compiler" >&5 -+printf %s "checking whether we are using the Compaq C compiler... " >&6; } -+if test ${bakefile_cv_c_compiler___DECC+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #ifndef __DECC -@@ -14400,18 +15901,21 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - bakefile_cv_c_compiler___DECC=yes --else -- bakefile_cv_c_compiler___DECC=no -- -+else case e in #( -+ e) bakefile_cv_c_compiler___DECC=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___DECC" >&5 --$as_echo "$bakefile_cv_c_compiler___DECC" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___DECC" >&5 -+printf "%s\n" "$bakefile_cv_c_compiler___DECC" >&6; } - if test "x$bakefile_cv_c_compiler___DECC" = "xyes"; then - :; COMPAQCC=yes - else -@@ -14436,16 +15940,17 @@ 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 we are using the Sun C compiler" >&5 --$as_echo_n "checking whether we are using the Sun C compiler... " >&6; } --if ${bakefile_cv_c_compiler___SUNPRO_C+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the Sun C compiler" >&5 -+printf %s "checking whether we are using the Sun C compiler... " >&6; } -+if test ${bakefile_cv_c_compiler___SUNPRO_C+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #ifndef __SUNPRO_C -@@ -14456,18 +15961,21 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - bakefile_cv_c_compiler___SUNPRO_C=yes --else -- bakefile_cv_c_compiler___SUNPRO_C=no -- -+else case e in #( -+ e) bakefile_cv_c_compiler___SUNPRO_C=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5 --$as_echo "$bakefile_cv_c_compiler___SUNPRO_C" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5 -+printf "%s\n" "$bakefile_cv_c_compiler___SUNPRO_C" >&6; } - if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then - :; SUNCC=yes - else -@@ -14487,318 +15995,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - --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 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 -- if test -z "$GREP"; then -- ac_path_GREP_found=false -- # Loop through the user's path and test for each of PROGNAME-LIST -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_prog in grep ggrep; do -- for ac_exec_ext in '' $ac_executable_extensions; do -- 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 --case `"$ac_path_GREP" --version 2>&1` in --*GNU*) -- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; --*) -- ac_count=0 -- $as_echo_n 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" -- "$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 -- if test $ac_count -gt ${ac_path_GREP_max-0}; then -- # Best one so far, save it but keep looking for a better one -- ac_cv_path_GREP="$ac_path_GREP" -- ac_path_GREP_max=$ac_count -- fi -- # 10*(2^10) chars as input seems more than enough -- test $ac_count -gt 10 && break -- done -- rm -f conftest.in conftest.tmp conftest.nl conftest.out;; --esac -- -- $ac_path_GREP_found && break 3 -- done -- done -- done --IFS=$as_save_IFS -- if test -z "$ac_cv_path_GREP"; then -- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -- fi --else -- ac_cv_path_GREP=$GREP --fi -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 --$as_echo "$ac_cv_path_GREP" >&6; } -- GREP="$ac_cv_path_GREP" -- -- --{ $as_echo "$as_me:${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 -- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -- then ac_cv_path_EGREP="$GREP -E" -- else -- if test -z "$EGREP"; then -- ac_path_EGREP_found=false -- # Loop through the user's path and test for each of PROGNAME-LIST -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_prog in egrep; do -- for ac_exec_ext in '' $ac_executable_extensions; do -- 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 --case `"$ac_path_EGREP" --version 2>&1` in --*GNU*) -- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; --*) -- ac_count=0 -- $as_echo_n 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" -- "$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 -- if test $ac_count -gt ${ac_path_EGREP_max-0}; then -- # Best one so far, save it but keep looking for a better one -- ac_cv_path_EGREP="$ac_path_EGREP" -- ac_path_EGREP_max=$ac_count -- fi -- # 10*(2^10) chars as input seems more than enough -- test $ac_count -gt 10 && break -- done -- rm -f conftest.in conftest.tmp conftest.nl conftest.out;; --esac -- -- $ac_path_EGREP_found && break 3 -- done -- done -- done --IFS=$as_save_IFS -- if test -z "$ac_cv_path_EGREP"; then -- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -- fi --else -- ac_cv_path_EGREP=$EGREP --fi -- -- fi --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 --$as_echo "$ac_cv_path_EGREP" >&6; } -- EGREP="$ac_cv_path_EGREP" -+CXXFLAGS=${CXXFLAGS:=} - - --if test $ac_cv_c_compiler_gnu = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5 --$as_echo_n "checking whether $CC needs -traditional... " >&6; } --if ${ac_cv_prog_gcc_traditional+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_pattern="Autoconf.*'x'" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include --Autoconf TIOCGETP --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "$ac_pattern" >/dev/null 2>&1; then : -- ac_cv_prog_gcc_traditional=yes --else -- ac_cv_prog_gcc_traditional=no --fi --rm -f conftest* - - -- if test $ac_cv_prog_gcc_traditional = no; then -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include --Autoconf TCGETA --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "$ac_pattern" >/dev/null 2>&1; then : -- ac_cv_prog_gcc_traditional=yes --fi --rm -f conftest* -- -- fi --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5 --$as_echo "$ac_cv_prog_gcc_traditional" >&6; } -- if test $ac_cv_prog_gcc_traditional = yes; then -- CC="$CC -traditional" -- fi --fi - - --CXXFLAGS=${CXXFLAGS:=} - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -14809,42 +16014,48 @@ 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 -- if test -n "$CXX"; then -+{ 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 case e in #( -+ e) if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. - else - 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 - done - IFS=$as_save_IFS - --fi -+fi ;; -+esac - 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 - - -@@ -14853,42 +16064,48 @@ 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 -- if test -n "$ac_ct_CXX"; then -+{ 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 case e in #( -+ e) if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. - else - 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 - done - IFS=$as_save_IFS - --fi -+fi ;; -+esac - 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 - - -@@ -14900,8 +16117,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 -@@ -14911,7 +16128,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 -@@ -14921,7 +16138,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 -@@ -14931,20 +16148,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 -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+{ 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 case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - #ifndef __GNUC__ - choke me -@@ -14954,30 +16172,36 @@ 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 -- ac_compiler_gnu=no -+else case e in #( -+ e) ac_compiler_gnu=no ;; -+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 - ac_cv_cxx_compiler_gnu=$ac_compiler_gnu -- -+ ;; -+esac - 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 -- ac_save_cxx_werror_flag=$ac_cxx_werror_flag -+{ 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 case e in #( -+ e) ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" -@@ -14985,57 +16209,63 @@ 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 -- CXXFLAGS="" -+else case e in #( -+ e) 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 -- ac_cxx_werror_flag=$ac_save_cxx_werror_flag -+else case e in #( -+ e) 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 ;; -+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 ;; -+esac - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- ac_cxx_werror_flag=$ac_save_cxx_werror_flag -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ;; -+esac - 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 -+{ 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 -@@ -15050,6 +16280,106 @@ 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_cxx11+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_cv_prog_cxx_cxx11=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 ;; -+esac -+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 case e in #( -+ e) 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 case e in #( -+ e) { 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" ;; -+esac -+fi -+ ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 -+ ac_prog_cxx_stdcxx=cxx11 ;; -+esac -+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_cxx98+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_cv_prog_cxx_cxx98=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 ;; -+esac -+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 case e in #( -+ e) 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 case e in #( -+ e) { 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" ;; -+esac -+fi -+ ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 -+ ac_prog_cxx_stdcxx=cxx98 ;; -+esac -+fi -+fi -+ - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -15069,16 +16399,17 @@ 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 whether we are using the Intel C++ compiler" >&5 --$as_echo_n "checking whether we are using the Intel C++ compiler... " >&6; } --if ${bakefile_cv_cxx_compiler___INTEL_COMPILER+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the Intel C++ compiler" >&5 -+printf %s "checking whether we are using the Intel C++ compiler... " >&6; } -+if test ${bakefile_cv_cxx_compiler___INTEL_COMPILER+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #ifndef __INTEL_COMPILER -@@ -15089,18 +16420,21 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - bakefile_cv_cxx_compiler___INTEL_COMPILER=yes --else -- bakefile_cv_cxx_compiler___INTEL_COMPILER=no -- -+else case e in #( -+ e) bakefile_cv_cxx_compiler___INTEL_COMPILER=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER" >&5 --$as_echo "$bakefile_cv_cxx_compiler___INTEL_COMPILER" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER" >&5 -+printf "%s\n" "$bakefile_cv_cxx_compiler___INTEL_COMPILER" >&6; } - if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER" = "xyes"; then - :; INTELCXX=yes - else -@@ -15124,16 +16458,17 @@ 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 whether we are using Intel C++ compiler v8 or later" >&5 --$as_echo_n "checking whether we are using Intel C++ compiler v8 or later... " >&6; } --if ${bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using Intel C++ compiler v8 or later" >&5 -+printf %s "checking whether we are using Intel C++ compiler v8 or later... " >&6; } -+if test ${bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #ifndef __INTEL_COMPILER || __INTEL_COMPILER < 800 -@@ -15144,18 +16479,21 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800=yes --else -- bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800=no -- -+else case e in #( -+ e) bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800" >&5 --$as_echo "$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800" >&5 -+printf "%s\n" "$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800" >&6; } - if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800" = "xyes"; then - :; INTELCXX8=yes - else -@@ -15177,16 +16515,17 @@ 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 whether we are using Intel C++ compiler v10 or later" >&5 --$as_echo_n "checking whether we are using Intel C++ compiler v10 or later... " >&6; } --if ${bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using Intel C++ compiler v10 or later" >&5 -+printf %s "checking whether we are using Intel C++ compiler v10 or later... " >&6; } -+if test ${bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #ifndef __INTEL_COMPILER || __INTEL_COMPILER < 1000 -@@ -15197,18 +16536,21 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000=yes --else -- bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000=no -- -+else case e in #( -+ e) bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000" >&5 --$as_echo "$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000" >&5 -+printf "%s\n" "$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000" >&6; } - if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000" = "xyes"; then - :; INTELCXX10=yes - else -@@ -15235,16 +16577,17 @@ 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 whether we are using the IBM xlC C++ compiler" >&5 --$as_echo_n "checking whether we are using the IBM xlC C++ compiler... " >&6; } --if ${bakefile_cv_cxx_compiler___xlC__+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the IBM xlC C++ compiler" >&5 -+printf %s "checking whether we are using the IBM xlC C++ compiler... " >&6; } -+if test ${bakefile_cv_cxx_compiler___xlC__+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #ifndef __xlC__ -@@ -15255,18 +16598,21 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - bakefile_cv_cxx_compiler___xlC__=yes --else -- bakefile_cv_cxx_compiler___xlC__=no -- -+else case e in #( -+ e) bakefile_cv_cxx_compiler___xlC__=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___xlC__" >&5 --$as_echo "$bakefile_cv_cxx_compiler___xlC__" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___xlC__" >&5 -+printf "%s\n" "$bakefile_cv_cxx_compiler___xlC__" >&6; } - if test "x$bakefile_cv_cxx_compiler___xlC__" = "xyes"; then - :; XLCXX=yes - else -@@ -15291,16 +16637,17 @@ 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 whether we are using the IBM xlC C++ compiler" >&5 --$as_echo_n "checking whether we are using the IBM xlC C++ compiler... " >&6; } --if ${bakefile_cv_cxx_compiler___xlC__+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the IBM xlC C++ compiler" >&5 -+printf %s "checking whether we are using the IBM xlC C++ compiler... " >&6; } -+if test ${bakefile_cv_cxx_compiler___xlC__+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #ifndef __xlC__ -@@ -15311,18 +16658,21 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - bakefile_cv_cxx_compiler___xlC__=yes --else -- bakefile_cv_cxx_compiler___xlC__=no -- -+else case e in #( -+ e) bakefile_cv_cxx_compiler___xlC__=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___xlC__" >&5 --$as_echo "$bakefile_cv_cxx_compiler___xlC__" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___xlC__" >&5 -+printf "%s\n" "$bakefile_cv_cxx_compiler___xlC__" >&6; } - if test "x$bakefile_cv_cxx_compiler___xlC__" = "xyes"; then - :; XLCXX=yes - else -@@ -15347,16 +16697,17 @@ 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 whether we are using the SGI C++ compiler" >&5 --$as_echo_n "checking whether we are using the SGI C++ compiler... " >&6; } --if ${bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the SGI C++ compiler" >&5 -+printf %s "checking whether we are using the SGI C++ compiler... " >&6; } -+if test ${bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #ifndef _SGI_COMPILER_VERSION -@@ -15367,18 +16718,21 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION=yes --else -- bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION=no -- -+else case e in #( -+ e) bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&5 --$as_echo "$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&5 -+printf "%s\n" "$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&6; } - if test "x$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" = "xyes"; then - :; SGICXX=yes - else -@@ -15404,16 +16758,17 @@ 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 whether we are using the Sun C++ compiler" >&5 --$as_echo_n "checking whether we are using the Sun C++ compiler... " >&6; } --if ${bakefile_cv_cxx_compiler___SUNPRO_CC+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the Sun C++ compiler" >&5 -+printf %s "checking whether we are using the Sun C++ compiler... " >&6; } -+if test ${bakefile_cv_cxx_compiler___SUNPRO_CC+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #ifndef __SUNPRO_CC -@@ -15424,18 +16779,21 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - bakefile_cv_cxx_compiler___SUNPRO_CC=yes --else -- bakefile_cv_cxx_compiler___SUNPRO_CC=no -- -+else case e in #( -+ e) bakefile_cv_cxx_compiler___SUNPRO_CC=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5 --$as_echo "$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5 -+printf "%s\n" "$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6; } - if test "x$bakefile_cv_cxx_compiler___SUNPRO_CC" = "xyes"; then - :; SUNCXX=yes - else -@@ -15461,16 +16819,17 @@ 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 whether we are using the HP C++ compiler" >&5 --$as_echo_n "checking whether we are using the HP C++ compiler... " >&6; } --if ${bakefile_cv_cxx_compiler___HP_aCC+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the HP C++ compiler" >&5 -+printf %s "checking whether we are using the HP C++ compiler... " >&6; } -+if test ${bakefile_cv_cxx_compiler___HP_aCC+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #ifndef __HP_aCC -@@ -15481,18 +16840,21 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - bakefile_cv_cxx_compiler___HP_aCC=yes --else -- bakefile_cv_cxx_compiler___HP_aCC=no -- -+else case e in #( -+ e) bakefile_cv_cxx_compiler___HP_aCC=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___HP_aCC" >&5 --$as_echo "$bakefile_cv_cxx_compiler___HP_aCC" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___HP_aCC" >&5 -+printf "%s\n" "$bakefile_cv_cxx_compiler___HP_aCC" >&6; } - if test "x$bakefile_cv_cxx_compiler___HP_aCC" = "xyes"; then - :; HPCXX=yes - else -@@ -15517,16 +16879,17 @@ 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 whether we are using the Compaq C++ compiler" >&5 --$as_echo_n "checking whether we are using the Compaq C++ compiler... " >&6; } --if ${bakefile_cv_cxx_compiler___DECCXX+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the Compaq C++ compiler" >&5 -+printf %s "checking whether we are using the Compaq C++ compiler... " >&6; } -+if test ${bakefile_cv_cxx_compiler___DECCXX+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #ifndef __DECCXX -@@ -15537,18 +16900,21 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - bakefile_cv_cxx_compiler___DECCXX=yes --else -- bakefile_cv_cxx_compiler___DECCXX=no -- -+else case e in #( -+ e) bakefile_cv_cxx_compiler___DECCXX=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___DECCXX" >&5 --$as_echo "$bakefile_cv_cxx_compiler___DECCXX" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___DECCXX" >&5 -+printf "%s\n" "$bakefile_cv_cxx_compiler___DECCXX" >&6; } - if test "x$bakefile_cv_cxx_compiler___DECCXX" = "xyes"; then - :; COMPAQCXX=yes - else -@@ -15573,16 +16939,17 @@ 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 whether we are using the Sun C++ compiler" >&5 --$as_echo_n "checking whether we are using the Sun C++ compiler... " >&6; } --if ${bakefile_cv_cxx_compiler___SUNPRO_CC+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the Sun C++ compiler" >&5 -+printf %s "checking whether we are using the Sun C++ compiler... " >&6; } -+if test ${bakefile_cv_cxx_compiler___SUNPRO_CC+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #ifndef __SUNPRO_CC -@@ -15593,18 +16960,21 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - bakefile_cv_cxx_compiler___SUNPRO_CC=yes --else -- bakefile_cv_cxx_compiler___SUNPRO_CC=no -- -+else case e in #( -+ e) bakefile_cv_cxx_compiler___SUNPRO_CC=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5 --$as_echo "$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5 -+printf "%s\n" "$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6; } - if test "x$bakefile_cv_cxx_compiler___SUNPRO_CC" = "xyes"; then - :; SUNCXX=yes - else -@@ -15643,12 +17013,13 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex - 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 -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { 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 case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - -@@ -15939,15 +17310,18 @@ namespace cxx11 - - - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - ax_cv_cxx_compile_cxx11=yes --else -- ax_cv_cxx_compile_cxx11=no -+else case e in #( -+ e) ax_cv_cxx_compile_cxx11=no ;; -+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 ;; -+esac - 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 -@@ -15955,13 +17329,14 @@ $as_echo "$ax_cv_cxx_compile_cxx11" >&6; } - if test x$ac_success = xno; then - for alternative in ${ax_cxx_compile_alternatives}; do - switch="-std=gnu++${alternative}" -- 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 -- ac_save_CXX="$CXX" -+ cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx11_$switch" | sed "$as_sed_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 case e in #( -+ e) ac_save_CXX="$CXX" - CXX="$CXX $switch" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -@@ -16254,17 +17629,20 @@ namespace cxx11 - - - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - eval $cachevar=yes --else -- eval $cachevar=no -+else case e in #( -+ e) eval $cachevar=no ;; -+esac - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- CXX="$ac_save_CXX" -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ CXX="$ac_save_CXX" ;; -+esac - 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 - CXX="$CXX $switch" - if test -n "$CXXCPP" ; then -@@ -16279,13 +17657,14 @@ $as_echo "$ac_res" >&6; } - if test x$ac_success = xno; then - for alternative in ${ax_cxx_compile_alternatives}; do - for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; 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 -- ac_save_CXX="$CXX" -+ cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx11_$switch" | sed "$as_sed_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 case e in #( -+ e) ac_save_CXX="$CXX" - CXX="$CXX $switch" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -@@ -16578,17 +17957,20 @@ namespace cxx11 - - - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - eval $cachevar=yes --else -- eval $cachevar=no -+else case e in #( -+ e) eval $cachevar=no ;; -+esac - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- CXX="$ac_save_CXX" -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ CXX="$ac_save_CXX" ;; -+esac - 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 - CXX="$CXX $switch" - if test -n "$CXXCPP" ; then -@@ -16616,22 +17998,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - fi - 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 - - - if test -n "$wxWITH_CXX_IS_OPTIONAL"; then - if test "$HAVE_CXX11" != 1; then -- { { $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 $? "C++11 support was requested but is not available --See \`config.log' for more details" "$LINENO" 5; } -+See 'config.log' for more details" "$LINENO" 5; } - fi - fi - ;; -@@ -16645,12 +18027,13 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - ac_success=no - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++14 features by default" >&5 --$as_echo_n "checking whether $CXX supports C++14 features by default... " >&6; } --if ${ax_cv_cxx_compile_cxx14+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++14 features by default" >&5 -+printf %s "checking whether $CXX supports C++14 features by default... " >&6; } -+if test ${ax_cv_cxx_compile_cxx14+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - -@@ -17061,15 +18444,18 @@ namespace cxx14 - - - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - ax_cv_cxx_compile_cxx14=yes --else -- ax_cv_cxx_compile_cxx14=no -+else case e in #( -+ e) ax_cv_cxx_compile_cxx14=no ;; -+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 ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx14" >&5 --$as_echo "$ax_cv_cxx_compile_cxx14" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx14" >&5 -+printf "%s\n" "$ax_cv_cxx_compile_cxx14" >&6; } - if test x$ax_cv_cxx_compile_cxx14 = xyes; then - ac_success=yes - fi -@@ -17077,13 +18463,14 @@ $as_echo "$ax_cv_cxx_compile_cxx14" >&6; } - if test x$ac_success = xno; then - for alternative in ${ax_cxx_compile_alternatives}; do - switch="-std=gnu++${alternative}" -- cachevar=`$as_echo "ax_cv_cxx_compile_cxx14_$switch" | $as_tr_sh` -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++14 features with $switch" >&5 --$as_echo_n "checking whether $CXX supports C++14 features with $switch... " >&6; } --if eval \${$cachevar+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_save_CXX="$CXX" -+ cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx14_$switch" | sed "$as_sed_sh"` -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++14 features with $switch" >&5 -+printf %s "checking whether $CXX supports C++14 features with $switch... " >&6; } -+if eval test \${$cachevar+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_save_CXX="$CXX" - CXX="$CXX $switch" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -@@ -17496,17 +18883,20 @@ namespace cxx14 - - - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - eval $cachevar=yes --else -- eval $cachevar=no -+else case e in #( -+ e) eval $cachevar=no ;; -+esac - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- CXX="$ac_save_CXX" -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ CXX="$ac_save_CXX" ;; -+esac - 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 - CXX="$CXX $switch" - if test -n "$CXXCPP" ; then -@@ -17521,13 +18911,14 @@ $as_echo "$ac_res" >&6; } - if test x$ac_success = xno; then - for alternative in ${ax_cxx_compile_alternatives}; do - for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do -- cachevar=`$as_echo "ax_cv_cxx_compile_cxx14_$switch" | $as_tr_sh` -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++14 features with $switch" >&5 --$as_echo_n "checking whether $CXX supports C++14 features with $switch... " >&6; } --if eval \${$cachevar+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_save_CXX="$CXX" -+ cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx14_$switch" | sed "$as_sed_sh"` -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++14 features with $switch" >&5 -+printf %s "checking whether $CXX supports C++14 features with $switch... " >&6; } -+if eval test \${$cachevar+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_save_CXX="$CXX" - CXX="$CXX $switch" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -@@ -17940,17 +19331,20 @@ namespace cxx14 - - - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - eval $cachevar=yes --else -- eval $cachevar=no -+else case e in #( -+ e) eval $cachevar=no ;; -+esac - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- CXX="$ac_save_CXX" -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ CXX="$ac_save_CXX" ;; -+esac - 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 - CXX="$CXX $switch" - if test -n "$CXXCPP" ; then -@@ -17978,12 +19372,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - fi - if test x$ac_success = xno; then - HAVE_CXX14=0 -- { $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++14 support was found" >&5 --$as_echo "$as_me: No compiler with C++14 support was found" >&6;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: No compiler with C++14 support was found" >&5 -+printf "%s\n" "$as_me: No compiler with C++14 support was found" >&6;} - else - HAVE_CXX14=1 - --$as_echo "#define HAVE_CXX14 1" >>confdefs.h -+printf "%s\n" "#define HAVE_CXX14 1" >>confdefs.h - - fi - -@@ -18002,12 +19396,13 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - ac_success=no - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features by default" >&5 --$as_echo_n "checking whether $CXX supports C++17 features by default... " >&6; } --if ${ax_cv_cxx_compile_cxx17+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features by default" >&5 -+printf %s "checking whether $CXX supports C++17 features by default... " >&6; } -+if test ${ax_cv_cxx_compile_cxx17+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - -@@ -18796,15 +20191,18 @@ namespace cxx17 - - - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - ax_cv_cxx_compile_cxx17=yes --else -- ax_cv_cxx_compile_cxx17=no -+else case e in #( -+ e) ax_cv_cxx_compile_cxx17=no ;; -+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 ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx17" >&5 --$as_echo "$ax_cv_cxx_compile_cxx17" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx17" >&5 -+printf "%s\n" "$ax_cv_cxx_compile_cxx17" >&6; } - if test x$ax_cv_cxx_compile_cxx17 = xyes; then - ac_success=yes - fi -@@ -18812,13 +20210,14 @@ $as_echo "$ax_cv_cxx_compile_cxx17" >&6; } - if test x$ac_success = xno; then - for alternative in ${ax_cxx_compile_alternatives}; do - switch="-std=gnu++${alternative}" -- cachevar=`$as_echo "ax_cv_cxx_compile_cxx17_$switch" | $as_tr_sh` -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features with $switch" >&5 --$as_echo_n "checking whether $CXX supports C++17 features with $switch... " >&6; } --if eval \${$cachevar+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_save_CXX="$CXX" -+ cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx17_$switch" | sed "$as_sed_sh"` -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features with $switch" >&5 -+printf %s "checking whether $CXX supports C++17 features with $switch... " >&6; } -+if eval test \${$cachevar+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_save_CXX="$CXX" - CXX="$CXX $switch" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -@@ -19609,17 +21008,20 @@ namespace cxx17 - - - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - eval $cachevar=yes --else -- eval $cachevar=no -+else case e in #( -+ e) eval $cachevar=no ;; -+esac - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- CXX="$ac_save_CXX" -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ CXX="$ac_save_CXX" ;; -+esac - 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 - CXX="$CXX $switch" - if test -n "$CXXCPP" ; then -@@ -19634,13 +21036,14 @@ $as_echo "$ac_res" >&6; } - if test x$ac_success = xno; then - for alternative in ${ax_cxx_compile_alternatives}; do - for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do -- cachevar=`$as_echo "ax_cv_cxx_compile_cxx17_$switch" | $as_tr_sh` -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features with $switch" >&5 --$as_echo_n "checking whether $CXX supports C++17 features with $switch... " >&6; } --if eval \${$cachevar+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_save_CXX="$CXX" -+ cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx17_$switch" | sed "$as_sed_sh"` -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features with $switch" >&5 -+printf %s "checking whether $CXX supports C++17 features with $switch... " >&6; } -+if eval test \${$cachevar+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_save_CXX="$CXX" - CXX="$CXX $switch" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -@@ -20431,17 +21834,20 @@ namespace cxx17 - - - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - eval $cachevar=yes --else -- eval $cachevar=no -+else case e in #( -+ e) eval $cachevar=no ;; -+esac - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- CXX="$ac_save_CXX" -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ CXX="$ac_save_CXX" ;; -+esac - 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 - CXX="$CXX $switch" - if test -n "$CXXCPP" ; then -@@ -20469,12 +21875,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - fi - if test x$ac_success = xno; then - HAVE_CXX17=0 -- { $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++17 support was found" >&5 --$as_echo "$as_me: No compiler with C++17 support was found" >&6;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: No compiler with C++17 support was found" >&5 -+printf "%s\n" "$as_me: No compiler with C++17 support was found" >&6;} - else - HAVE_CXX17=1 - --$as_echo "#define HAVE_CXX17 1" >>confdefs.h -+printf "%s\n" "#define HAVE_CXX17 1" >>confdefs.h - - fi - -@@ -20491,12 +21897,13 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - ac_success=no - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++20 features by default" >&5 --$as_echo_n "checking whether $CXX supports C++20 features by default... " >&6; } --if ${ax_cv_cxx_compile_cxx20+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++20 features by default" >&5 -+printf %s "checking whether $CXX supports C++20 features by default... " >&6; } -+if test ${ax_cv_cxx_compile_cxx20+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - -@@ -21311,15 +22718,18 @@ namespace cxx20 - - - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - ax_cv_cxx_compile_cxx20=yes --else -- ax_cv_cxx_compile_cxx20=no -+else case e in #( -+ e) ax_cv_cxx_compile_cxx20=no ;; -+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 ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx20" >&5 --$as_echo "$ax_cv_cxx_compile_cxx20" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx20" >&5 -+printf "%s\n" "$ax_cv_cxx_compile_cxx20" >&6; } - if test x$ax_cv_cxx_compile_cxx20 = xyes; then - ac_success=yes - fi -@@ -21327,13 +22737,14 @@ $as_echo "$ax_cv_cxx_compile_cxx20" >&6; } - if test x$ac_success = xno; then - for alternative in ${ax_cxx_compile_alternatives}; do - switch="-std=gnu++${alternative}" -- cachevar=`$as_echo "ax_cv_cxx_compile_cxx20_$switch" | $as_tr_sh` -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++20 features with $switch" >&5 --$as_echo_n "checking whether $CXX supports C++20 features with $switch... " >&6; } --if eval \${$cachevar+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_save_CXX="$CXX" -+ cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx20_$switch" | sed "$as_sed_sh"` -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++20 features with $switch" >&5 -+printf %s "checking whether $CXX supports C++20 features with $switch... " >&6; } -+if eval test \${$cachevar+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_save_CXX="$CXX" - CXX="$CXX $switch" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -@@ -22150,17 +23561,20 @@ namespace cxx20 - - - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - eval $cachevar=yes --else -- eval $cachevar=no -+else case e in #( -+ e) eval $cachevar=no ;; -+esac - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- CXX="$ac_save_CXX" -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ CXX="$ac_save_CXX" ;; -+esac - 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 - CXX="$CXX $switch" - if test -n "$CXXCPP" ; then -@@ -22175,13 +23589,14 @@ $as_echo "$ac_res" >&6; } - if test x$ac_success = xno; then - for alternative in ${ax_cxx_compile_alternatives}; do - for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do -- cachevar=`$as_echo "ax_cv_cxx_compile_cxx20_$switch" | $as_tr_sh` -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++20 features with $switch" >&5 --$as_echo_n "checking whether $CXX supports C++20 features with $switch... " >&6; } --if eval \${$cachevar+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_save_CXX="$CXX" -+ cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx20_$switch" | sed "$as_sed_sh"` -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++20 features with $switch" >&5 -+printf %s "checking whether $CXX supports C++20 features with $switch... " >&6; } -+if eval test \${$cachevar+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_save_CXX="$CXX" - CXX="$CXX $switch" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -@@ -22998,17 +24413,20 @@ namespace cxx20 - - - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - eval $cachevar=yes --else -- eval $cachevar=no -+else case e in #( -+ e) eval $cachevar=no ;; -+esac - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- CXX="$ac_save_CXX" -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ CXX="$ac_save_CXX" ;; -+esac - 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 - CXX="$CXX $switch" - if test -n "$CXXCPP" ; then -@@ -23036,12 +24454,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - fi - if test x$ac_success = xno; then - HAVE_CXX20=0 -- { $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++20 support was found" >&5 --$as_echo "$as_me: No compiler with C++20 support was found" >&6;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: No compiler with C++20 support was found" >&5 -+printf "%s\n" "$as_me: No compiler with C++20 support was found" >&6;} - else - HAVE_CXX20=1 - --$as_echo "#define HAVE_CXX20 1" >>confdefs.h -+printf "%s\n" "#define HAVE_CXX20 1" >>confdefs.h - - fi - -@@ -23067,46 +24485,52 @@ case "$wxWITH_DPI_MANIFEST" in - USE_DPI_AWARE_MANIFEST=2 ;; - *) - USE_DPI_AWARE_MANIFEST=0 -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unsupported DPI awareness value \"$wxWITH_DPI_MANIFEST\" ignored." >&5 --$as_echo "$as_me: WARNING: Unsupported DPI awareness value \"$wxWITH_DPI_MANIFEST\" ignored." >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Unsupported DPI awareness value \"$wxWITH_DPI_MANIFEST\" ignored." >&5 -+printf "%s\n" "$as_me: WARNING: Unsupported DPI awareness value \"$wxWITH_DPI_MANIFEST\" ignored." >&2;} - esac - - if test "x$SUNCXX" != xyes; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. - set dummy ${ac_tool_prefix}ar; ac_word=$2 --{ $as_echo "$as_me:${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 -- if test -n "$AR"; then -+{ 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 case e in #( -+ e) if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. - else - 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}ar" -- $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 - done - IFS=$as_save_IFS - --fi -+fi ;; -+esac - 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 - - -@@ -23115,38 +24539,44 @@ if test -z "$ac_cv_prog_AR"; then - ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. - set dummy ar; ac_word=$2 --{ $as_echo "$as_me:${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 -- if test -n "$ac_ct_AR"; then -+{ 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 case e in #( -+ e) if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. - else - 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="ar" -- $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 - done - IFS=$as_save_IFS - --fi -+fi ;; -+esac - 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 - - if test "x$ac_ct_AR" = x; then -@@ -23154,8 +24584,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 - AR=$ac_ct_AR -@@ -23180,8 +24610,8 @@ OSX_ARCH_OPTS="" - - if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then - if test "x$wxUSE_MAC_ARCH" != xno; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --enable-macosx_arch is ignored when --enable-universal_binary is used." >&5 --$as_echo "$as_me: WARNING: --enable-macosx_arch is ignored when --enable-universal_binary is used." >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: --enable-macosx_arch is ignored when --enable-universal_binary is used." >&5 -+printf "%s\n" "$as_me: WARNING: --enable-macosx_arch is ignored when --enable-universal_binary is used." >&2;} - fi - - if test "x$wxUSE_UNIVERSAL_BINARY" != xyes; then -@@ -23192,10 +24622,10 @@ $as_echo "$as_me: WARNING: --enable-macosx_arch is ignored when --enable-univers - fi - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for architectures to use in universal binary" >&5 --$as_echo_n "checking for architectures to use in universal binary... " >&6; } -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OSX_ARCH_OPTS" >&5 --$as_echo "$OSX_ARCH_OPTS" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for architectures to use in universal binary" >&5 -+printf %s "checking for architectures to use in universal binary... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OSX_ARCH_OPTS" >&5 -+printf "%s\n" "$OSX_ARCH_OPTS" >&6; } - - retest_macosx_linking=yes - else -@@ -23206,13 +24636,13 @@ fi - - if test "x$OSX_ARCH_OPTS" != "x"; then - if echo $OSX_ARCH_OPTS | grep -q ","; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling dependency tracking due to universal binary build." >&5 --$as_echo "$as_me: WARNING: Disabling dependency tracking due to universal binary build." >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Disabling dependency tracking due to universal binary build." >&5 -+printf "%s\n" "$as_me: WARNING: Disabling dependency tracking due to universal binary build." >&2;} - disable_macosx_deps=yes - - if test "x$wxUSE_PCH" = "xyes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling precompiled headers due to universal binary build." >&5 --$as_echo "$as_me: WARNING: Disabling precompiled headers due to universal binary build." >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Disabling precompiled headers due to universal binary build." >&5 -+printf "%s\n" "$as_me: WARNING: Disabling precompiled headers due to universal binary build." >&2;} - wxUSE_PCH=no - fi - fi -@@ -23240,16 +24670,16 @@ fi - - - if test "x$wxUSE_MACOSX_SDK" != "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDK directory $wxUSE_MACOSX_SDK" >&5 --$as_echo_n "checking for SDK directory $wxUSE_MACOSX_SDK... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SDK directory $wxUSE_MACOSX_SDK" >&5 -+printf %s "checking for SDK directory $wxUSE_MACOSX_SDK... " >&6; } - if ! test -d "$wxUSE_MACOSX_SDK"; then -- { { $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 $? "not found --See \`config.log' for more details" "$LINENO" 5; } -+See 'config.log' for more details" "$LINENO" 5; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: exists" >&5 --$as_echo "exists" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: exists" >&5 -+printf "%s\n" "exists" >&6; } - fi - MACOSX_SDK_OPTS="-isysroot $wxUSE_MACOSX_SDK" - retest_macosx_linking=yes -@@ -23260,8 +24690,8 @@ if test "x$wxUSE_MACOSX_VERSION_MIN" = "xno"; then - wxUSE_MACOSX_VERSION_MIN= - elif test "x$wxUSE_MACOSX_VERSION_MIN" = "xyes"; then - if test "x$wxUSE_MACOSX_SDK" != "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking SDK deployment version" >&5 --$as_echo_n "checking SDK deployment version... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking SDK deployment version" >&5 -+printf %s "checking SDK deployment version... " >&6; } - - MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" buildSettings | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'` - -@@ -23274,11 +24704,11 @@ $as_echo_n "checking SDK deployment version... " >&6; } - - if test "x$MACOSX_SDK_PLIST_VERSION_MIN" != "x"; then - wxUSE_MACOSX_VERSION_MIN=$MACOSX_SDK_PLIST_VERSION_MIN -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wxUSE_MACOSX_VERSION_MIN" >&5 --$as_echo "$wxUSE_MACOSX_VERSION_MIN" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wxUSE_MACOSX_VERSION_MIN" >&5 -+printf "%s\n" "$wxUSE_MACOSX_VERSION_MIN" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not determine deployment target from SDKSettings.plist" >&5 --$as_echo "$as_me: WARNING: Could not determine deployment target from SDKSettings.plist" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Could not determine deployment target from SDKSettings.plist" >&5 -+printf "%s\n" "$as_me: WARNING: Could not determine deployment target from SDKSettings.plist" >&2;} - wxUSE_MACOSX_VERSION_MIN= - fi - else -@@ -23330,29 +24760,31 @@ 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 if C compiler ($CC) works with SDK/version options" >&5 --$as_echo_n "checking if C compiler ($CC) works with SDK/version options... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if C compiler ($CC) works with SDK/version options" >&5 -+printf %s "checking if C compiler ($CC) works with SDK/version options... " >&6; } - 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 : -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } --else -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+if ac_fn_c_try_link "$LINENO" -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+else case e in #( -+ e) { { 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 $? "$error_message --See \`config.log' for more details" "$LINENO" 5; } -+See 'config.log' for more details" "$LINENO" 5; } ;; -+esac - 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' -@@ -23367,15 +24799,15 @@ 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 if C++ compiler ($CXX) works with SDK/version options" >&5 --$as_echo_n "checking if C++ compiler ($CXX) works with SDK/version options... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if C++ compiler ($CXX) works with SDK/version options" >&5 -+printf %s "checking if C++ compiler ($CXX) works with SDK/version options... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include - - int --main () -+main (void) - { - - #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) -@@ -23393,17 +24825,19 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_link "$LINENO"; then : -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } --else -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+if ac_fn_cxx_try_link "$LINENO" -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+else case e in #( -+ e) { { 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 $? "$error_message --See \`config.log' for more details" "$LINENO" 5; } -- -+See 'config.log' for more details" "$LINENO" 5; } -+ ;; -+esac - 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' -@@ -23428,7 +24862,7 @@ esac - - - if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then -- $as_echo "#define _GNU_SOURCE 1" >>confdefs.h -+ printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h - - - GNU_SOURCE_FLAG="-D_GNU_SOURCE" -@@ -23445,13 +24879,13 @@ fi - - case "${host}" in - powerpc-*-darwin* ) -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if __POWERPC__ is already defined" >&5 --$as_echo_n "checking if __POWERPC__ is already defined... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if __POWERPC__ is already defined" >&5 -+printf %s "checking if __POWERPC__ is already defined... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - #ifndef __POWERPC__ - choke me for lack of PowerPC -@@ -23461,73 +24895,79 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- $as_echo "#define __POWERPC__ 1" >>confdefs.h -- -+if ac_fn_c_try_compile "$LINENO" -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+else case e in #( -+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ printf "%s\n" "#define __POWERPC__ 1" >>confdefs.h - -+ ;; -+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 - ;; - esac - - case "${host}" in - *-*-darwin* ) -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if CoreFoundation/CFBase.h is usable" >&5 --$as_echo_n "checking if CoreFoundation/CFBase.h is usable... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if CoreFoundation/CFBase.h is usable" >&5 -+printf %s "checking if CoreFoundation/CFBase.h is usable... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - - int --main () -+main (void) - { - - ; - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if __CF_USE_FRAMEWORK_INCLUDES__ is required" >&5 --$as_echo_n "checking if __CF_USE_FRAMEWORK_INCLUDES__ is required... " >&6; } -+if ac_fn_c_try_compile "$LINENO" -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+else case e in #( -+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if __CF_USE_FRAMEWORK_INCLUDES__ is required" >&5 -+printf %s "checking if __CF_USE_FRAMEWORK_INCLUDES__ is required... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #define __CF_USE_FRAMEWORK_INCLUDES__ - #include - - int --main () -+main (void) - { - - ; - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -+if ac_fn_c_try_compile "$LINENO" -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } - CPPFLAGS="-D__CF_USE_FRAMEWORK_INCLUDES__ $CPPFLAGS" --else -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+else case e in #( -+ e) { { 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. CoreFoundation not available. --See \`config.log' for more details" "$LINENO" 5; } -- -+See 'config.log' for more details" "$LINENO" 5; } -+ ;; -+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 - -+ ;; -+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 - ;; - esac - -@@ -23538,17 +24978,18 @@ case "${host}" in - if test "$wxUSE_MSW" = 1 ; then - wants_win32=1 - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -mno-cygwin is in effect" >&5 --$as_echo_n "checking if -mno-cygwin is in effect... " >&6; } --if ${wx_cv_nocygwin+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if -mno-cygwin is in effect" >&5 -+printf %s "checking if -mno-cygwin is in effect... " >&6; } -+if test ${wx_cv_nocygwin+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #ifdef __MINGW32__ -@@ -23559,18 +25000,21 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - wx_cv_nocygwin=no --else -- wx_cv_nocygwin=yes -- -+else case e in #( -+ e) wx_cv_nocygwin=yes -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_nocygwin" >&5 --$as_echo "$wx_cv_nocygwin" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_nocygwin" >&5 -+printf "%s\n" "$wx_cv_nocygwin" >&6; } - - if test "$wx_cv_nocygwin" = "yes"; then - wants_win32=1 -@@ -23595,13 +25039,13 @@ fi - if test "$wants_win32" = 1 ; then - USE_UNIX=0 - USE_WIN32=1 -- $as_echo "#define __WIN32__ 1" >>confdefs.h -+ printf "%s\n" "#define __WIN32__ 1" >>confdefs.h - -- $as_echo "#define __WINDOWS__ 1" >>confdefs.h -+ printf "%s\n" "#define __WINDOWS__ 1" >>confdefs.h - -- $as_echo "#define __GNUWIN32__ 1" >>confdefs.h -+ printf "%s\n" "#define __GNUWIN32__ 1" >>confdefs.h - -- $as_echo "#define STRICT 1" >>confdefs.h -+ printf "%s\n" "#define STRICT 1" >>confdefs.h - - fi - if test "$doesnt_want_win32" = 1 ; then -@@ -23611,7 +25055,7 @@ fi - - if test "$USE_UNIX" = 1 ; then - wxUSE_UNIX=yes -- $as_echo "#define __UNIX__ 1" >>confdefs.h -+ printf "%s\n" "#define __UNIX__ 1" >>confdefs.h - - fi - -@@ -23619,187 +25063,78 @@ if test "$export_compiler_flags" = "yes"; then - export CC CFLAGS CPP CPPFLAGS CXX CXXFLAGS LDD LDFLAGS OBJCFLAGS OBJCXXFLAGS - - if test "$cache_file" != "/dev/null"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling caching due to a change in compiler options." >&5 --$as_echo "$as_me: WARNING: Disabling caching due to a change in compiler options." >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Disabling caching due to a change in compiler options." >&5 -+printf "%s\n" "$as_me: WARNING: Disabling caching due to a change in compiler options." >&2;} - cache_file="/dev/null" - fi - fi - - --{ $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 -+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 - --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 --/* 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 () --{ -- 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 --fi - --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 -+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -+then : - --$as_echo "#define STDC_HEADERS 1" >>confdefs.h -+printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - - fi -- --# On IRIX 5.3, sys/types and inttypes.h are conflicting. --for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ -- inttypes.h stdint.h unistd.h --do : -- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -+ac_fn_c_check_header_compile "$LINENO" "langinfo.h" "ac_cv_header_langinfo_h" "$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 -+if test "x$ac_cv_header_langinfo_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_LANGINFO_H 1" >>confdefs.h - - fi -- --done -- -- --for ac_header in langinfo.h wchar.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 -+ac_fn_c_check_header_compile "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$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 -+if test "x$ac_cv_header_wchar_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_WCHAR_H 1" >>confdefs.h - - fi - --done -- - - if test "$ac_cv_header_wchar_h" != "yes"; then -- for ac_header in wcstr.h --do : -- ac_fn_c_check_header_compile "$LINENO" "wcstr.h" "ac_cv_header_wcstr_h" "$ac_includes_default -+ ac_fn_c_check_header_compile "$LINENO" "wcstr.h" "ac_cv_header_wcstr_h" "$ac_includes_default - " --if test "x$ac_cv_header_wcstr_h" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_WCSTR_H 1 --_ACEOF -+if test "x$ac_cv_header_wcstr_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_WCSTR_H 1" >>confdefs.h - - fi - --done -- - fi - - if test "$USE_UNIX" = 1 ; then -- for ac_header in sys/select.h --do : -- ac_fn_c_check_header_compile "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default -+ ac_fn_c_check_header_compile "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default - " --if test "x$ac_cv_header_sys_select_h" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_SYS_SELECT_H 1 --_ACEOF -+if test "x$ac_cv_header_sys_select_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_SYS_SELECT_H 1" >>confdefs.h - - fi - --done -- - - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' -@@ -23807,19 +25142,14 @@ 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 - -- for ac_header in cxxabi.h --do : -- ac_fn_cxx_check_header_compile "$LINENO" "cxxabi.h" "ac_cv_header_cxxabi_h" "$ac_includes_default -+ ac_fn_cxx_check_header_compile "$LINENO" "cxxabi.h" "ac_cv_header_cxxabi_h" "$ac_includes_default - " --if test "x$ac_cv_header_cxxabi_h" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_CXXABI_H 1 --_ACEOF -+if test "x$ac_cv_header_cxxabi_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_CXXABI_H 1" >>confdefs.h - - fi - --done -- - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -23829,16 +25159,17 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - fi - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 --$as_echo_n "checking for an ANSI C-conforming const... " >&6; } --if ${ac_cv_c_const+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 -+printf %s "checking for an ANSI C-conforming const... " >&6; } -+if test ${ac_cv_c_const+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #ifndef __cplusplus -@@ -23851,7 +25182,7 @@ main () - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; -- /* AIX XL C 1.02.0.0 rejects this. -+ /* IBM XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in - an arm of an if-expression whose if-part is not a constant - expression */ -@@ -23879,7 +25210,7 @@ main () - iptr p = 0; - ++p; - } -- { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying -+ { /* IBM XL C 1.02.0.0 rejects this sort of thing, saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; } bx; - struct s *b = &bx; b->j = 5; -@@ -23895,47 +25226,53 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - ac_cv_c_const=yes --else -- ac_cv_c_const=no -+else case e in #( -+ e) ac_cv_c_const=no ;; -+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 ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 --$as_echo "$ac_cv_c_const" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 -+printf "%s\n" "$ac_cv_c_const" >&6; } - if test $ac_cv_c_const = no; then - --$as_echo "#define const /**/" >>confdefs.h -+printf "%s\n" "#define const /**/" >>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 -- ac_cv_c_inline=no -+{ 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 case e in #( -+ e) 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 -- -+ ;; -+esac - 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) ;; -@@ -23955,167 +25292,177 @@ esac - - # The cast to long int works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects --# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 --$as_echo_n "checking size of short... " >&6; } --if ${ac_cv_sizeof_short+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then : -- --else -- if test "$ac_cv_type_short" = yes; then -- { { $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}: checking size of short" >&5 -+printf %s "checking size of short... " >&6; } -+if test ${ac_cv_sizeof_short+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default" -+then : -+ -+else case e in #( -+ e) if test "$ac_cv_type_short" = yes; 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 77 "cannot compute sizeof (short) --See \`config.log' for more details" "$LINENO" 5; } -+See 'config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_short=0 -- fi -+ fi ;; -+esac - fi -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5 --$as_echo "$ac_cv_sizeof_short" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5 -+printf "%s\n" "$ac_cv_sizeof_short" >&6; } - - - --cat >>confdefs.h <<_ACEOF --#define SIZEOF_SHORT $ac_cv_sizeof_short --_ACEOF -+printf "%s\n" "#define SIZEOF_SHORT $ac_cv_sizeof_short" >>confdefs.h - - - # The cast to long int works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects --# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 --$as_echo_n "checking size of void *... " >&6; } --if ${ac_cv_sizeof_void_p+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then : -- --else -- if test "$ac_cv_type_void_p" = yes; then -- { { $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}: checking size of void *" >&5 -+printf %s "checking size of void *... " >&6; } -+if test ${ac_cv_sizeof_void_p+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default" -+then : -+ -+else case e in #( -+ e) if test "$ac_cv_type_void_p" = yes; 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 77 "cannot compute sizeof (void *) --See \`config.log' for more details" "$LINENO" 5; } -+See 'config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_void_p=0 -- fi -+ fi ;; -+esac - fi -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5 --$as_echo "$ac_cv_sizeof_void_p" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5 -+printf "%s\n" "$ac_cv_sizeof_void_p" >&6; } - - - --cat >>confdefs.h <<_ACEOF --#define SIZEOF_VOID_P $ac_cv_sizeof_void_p --_ACEOF -+printf "%s\n" "#define SIZEOF_VOID_P $ac_cv_sizeof_void_p" >>confdefs.h - - - # The cast to long int works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects --# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 --$as_echo_n "checking size of int... " >&6; } --if ${ac_cv_sizeof_int+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : -- --else -- if test "$ac_cv_type_int" = yes; then -- { { $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}: checking size of int" >&5 -+printf %s "checking size of int... " >&6; } -+if test ${ac_cv_sizeof_int+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default" -+then : -+ -+else case e in #( -+ e) if test "$ac_cv_type_int" = yes; 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 77 "cannot compute sizeof (int) --See \`config.log' for more details" "$LINENO" 5; } -+See 'config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_int=0 -- fi -+ fi ;; -+esac - fi -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 --$as_echo "$ac_cv_sizeof_int" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 -+printf "%s\n" "$ac_cv_sizeof_int" >&6; } - - - --cat >>confdefs.h <<_ACEOF --#define SIZEOF_INT $ac_cv_sizeof_int --_ACEOF -+printf "%s\n" "#define SIZEOF_INT $ac_cv_sizeof_int" >>confdefs.h - - - # The cast to long int works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects --# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 --$as_echo_n "checking size of long... " >&6; } --if ${ac_cv_sizeof_long+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : -- --else -- if test "$ac_cv_type_long" = yes; then -- { { $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}: checking size of long" >&5 -+printf %s "checking size of long... " >&6; } -+if test ${ac_cv_sizeof_long+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default" -+then : -+ -+else case e in #( -+ e) if test "$ac_cv_type_long" = yes; 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 77 "cannot compute sizeof (long) --See \`config.log' for more details" "$LINENO" 5; } -+See 'config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_long=0 -- fi -+ fi ;; -+esac - fi -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 --$as_echo "$ac_cv_sizeof_long" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 -+printf "%s\n" "$ac_cv_sizeof_long" >&6; } - - - --cat >>confdefs.h <<_ACEOF --#define SIZEOF_LONG $ac_cv_sizeof_long --_ACEOF -+printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h - - - # The cast to long int works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects --# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5 --$as_echo_n "checking size of size_t... " >&6; } --if ${ac_cv_sizeof_size_t+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then : -- --else -- if test "$ac_cv_type_size_t" = yes; then -- { { $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}: checking size of size_t" >&5 -+printf %s "checking size of size_t... " >&6; } -+if test ${ac_cv_sizeof_size_t+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default" -+then : -+ -+else case e in #( -+ e) if test "$ac_cv_type_size_t" = yes; 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 77 "cannot compute sizeof (size_t) --See \`config.log' for more details" "$LINENO" 5; } -+See 'config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_size_t=0 -- fi -+ fi ;; -+esac - fi -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5 --$as_echo "$ac_cv_sizeof_size_t" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5 -+printf "%s\n" "$ac_cv_sizeof_size_t" >&6; } - - - --cat >>confdefs.h <<_ACEOF --#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t --_ACEOF -+printf "%s\n" "#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t" >>confdefs.h - - - -@@ -24123,70 +25470,74 @@ case "${host}" in - arm-*-linux* ) - # The cast to long int works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects --# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 --$as_echo_n "checking size of long long... " >&6; } --if ${ac_cv_sizeof_long_long+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then : -- --else -- if test "$ac_cv_type_long_long" = yes; then -- { { $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}: checking size of long long" >&5 -+printf %s "checking size of long long... " >&6; } -+if test ${ac_cv_sizeof_long_long+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default" -+then : -+ -+else case e in #( -+ e) if test "$ac_cv_type_long_long" = yes; 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 77 "cannot compute sizeof (long long) --See \`config.log' for more details" "$LINENO" 5; } -+See 'config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_long_long=0 -- fi -+ fi ;; -+esac - fi -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 --$as_echo "$ac_cv_sizeof_long_long" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 -+printf "%s\n" "$ac_cv_sizeof_long_long" >&6; } - - - --cat >>confdefs.h <<_ACEOF --#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long --_ACEOF -+printf "%s\n" "#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long" >>confdefs.h - - - ;; - *-hp-hpux* ) - # The cast to long int works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects --# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 --$as_echo_n "checking size of long long... " >&6; } --if ${ac_cv_sizeof_long_long+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then : -- --else -- if test "$ac_cv_type_long_long" = yes; then -- { { $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}: checking size of long long" >&5 -+printf %s "checking size of long long... " >&6; } -+if test ${ac_cv_sizeof_long_long+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default" -+then : -+ -+else case e in #( -+ e) if test "$ac_cv_type_long_long" = yes; 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 77 "cannot compute sizeof (long long) --See \`config.log' for more details" "$LINENO" 5; } -+See 'config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_long_long=0 -- fi -+ fi ;; -+esac - fi -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 --$as_echo "$ac_cv_sizeof_long_long" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 -+printf "%s\n" "$ac_cv_sizeof_long_long" >&6; } - - - --cat >>confdefs.h <<_ACEOF --#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long --_ACEOF -+printf "%s\n" "#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long" >>confdefs.h - - - if test "$ac_cv_sizeof_long_long" != 0; then -@@ -24196,49 +25547,52 @@ _ACEOF - * ) - # The cast to long int works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects --# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 --$as_echo_n "checking size of long long... " >&6; } --if ${ac_cv_sizeof_long_long+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then : -- --else -- if test "$ac_cv_type_long_long" = yes; then -- { { $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}: checking size of long long" >&5 -+printf %s "checking size of long long... " >&6; } -+if test ${ac_cv_sizeof_long_long+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default" -+then : -+ -+else case e in #( -+ e) if test "$ac_cv_type_long_long" = yes; 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 77 "cannot compute sizeof (long long) --See \`config.log' for more details" "$LINENO" 5; } -+See 'config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_long_long=0 -- fi -+ fi ;; -+esac - fi -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 --$as_echo "$ac_cv_sizeof_long_long" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 -+printf "%s\n" "$ac_cv_sizeof_long_long" >&6; } - - - --cat >>confdefs.h <<_ACEOF --#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long --_ACEOF -+printf "%s\n" "#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long" >>confdefs.h - - - esac - - # The cast to long int works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects --# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of wchar_t" >&5 --$as_echo_n "checking size of wchar_t... " >&6; } --if ${ac_cv_sizeof_wchar_t+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (wchar_t))" "ac_cv_sizeof_wchar_t" " -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of wchar_t" >&5 -+printf %s "checking size of wchar_t... " >&6; } -+if test ${ac_cv_sizeof_wchar_t+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (wchar_t))" "ac_cv_sizeof_wchar_t" " - /* DJGPP's wchar_t is now a keyword in C++ (still not C though) */ - #if defined(__DJGPP__) && !( (__GNUC_MINOR__ >= 8 && __GNUC__ == 2 ) || __GNUC__ >= 3 ) - # error \"fake wchar_t\" -@@ -24255,40 +25609,42 @@ else - #include - - --"; then : -+" -+then : - --else -- if test "$ac_cv_type_wchar_t" = yes; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+else case e in #( -+ e) if test "$ac_cv_type_wchar_t" = yes; 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 77 "cannot compute sizeof (wchar_t) --See \`config.log' for more details" "$LINENO" 5; } -+See 'config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_wchar_t=0 -- fi -+ fi ;; -+esac - fi -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_wchar_t" >&5 --$as_echo "$ac_cv_sizeof_wchar_t" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_wchar_t" >&5 -+printf "%s\n" "$ac_cv_sizeof_wchar_t" >&6; } - - - --cat >>confdefs.h <<_ACEOF --#define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t --_ACEOF -+printf "%s\n" "#define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t" >>confdefs.h - - - if test "$ac_cv_sizeof_wchar_t" = 0; then - as_fn_error $? "wxWidgets requires wchar_t support." "$LINENO" 5 - fi - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5 --$as_echo_n "checking for va_copy... " >&6; } --if ${wx_cv_func_va_copy+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5 -+printf %s "checking for va_copy... " >&6; } -+if test ${wx_cv_func_va_copy+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -24315,13 +25671,15 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - } - - _ACEOF --if ac_fn_cxx_try_link "$LINENO"; then : -+if ac_fn_cxx_try_link "$LINENO" -+then : - wx_cv_func_va_copy=yes --else -- wx_cv_func_va_copy=no -- -+else case e in #( -+ e) wx_cv_func_va_copy=no -+ ;; -+esac - 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' -@@ -24330,26 +25688,29 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_va_copy" >&5 --$as_echo "$wx_cv_func_va_copy" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_va_copy" >&5 -+printf "%s\n" "$wx_cv_func_va_copy" >&6; } - - if test $wx_cv_func_va_copy = "yes"; then -- $as_echo "#define HAVE_VA_COPY 1" >>confdefs.h -- --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if va_list can be copied by value" >&5 --$as_echo_n "checking if va_list can be copied by value... " >&6; } --if ${wx_cv_type_va_list_lvalue+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -- if test "$cross_compiling" = yes; then : -+ printf "%s\n" "#define HAVE_VA_COPY 1" >>confdefs.h -+ -+else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if va_list can be copied by value" >&5 -+printf %s "checking if va_list can be copied by value... " >&6; } -+if test ${wx_cv_type_va_list_lvalue+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ if test "$cross_compiling" = yes -+then : - wx_cv_type_va_list_lvalue=yes - --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - -@@ -24371,53 +25732,59 @@ else - } - - _ACEOF --if ac_fn_c_try_run "$LINENO"; then : -+if ac_fn_c_try_run "$LINENO" -+then : - wx_cv_type_va_list_lvalue=yes --else -- wx_cv_type_va_list_lvalue=no -+else case e in #( -+ e) wx_cv_type_va_list_lvalue=no ;; -+esac - fi - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac - fi - - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_va_list_lvalue" >&5 --$as_echo "$wx_cv_type_va_list_lvalue" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_va_list_lvalue" >&5 -+printf "%s\n" "$wx_cv_type_va_list_lvalue" >&6; } - - if test $wx_cv_type_va_list_lvalue != "yes"; then -- $as_echo "#define VA_LIST_IS_ARRAY 1" >>confdefs.h -+ printf "%s\n" "#define VA_LIST_IS_ARRAY 1" >>confdefs.h - - fi - fi - - if test "$wxUSE_VARARG_MACROS" != "yes"; then -- $as_echo "#define wxNO_VARIADIC_MACROS 1" >>confdefs.h -+ printf "%s\n" "#define wxNO_VARIADIC_MACROS 1" >>confdefs.h - - fi - - LARGEFILE_CPPFLAGS= - # Check whether --enable-largefile was given. --if test "${enable_largefile+set}" = set; then : -+if test ${enable_largefile+y} -+then : - enableval=$enable_largefile; - fi - - if test "$enable_largefile" != no; then - wx_largefile=no - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 --$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } --if ${ac_cv_sys_file_offset_bits+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -+printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -+if test ${ac_cv_sys_file_offset_bits+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #define _FILE_OFFSET_BITS 64 - #include - int --main () -+main (void) - { - typedef struct { - unsigned int field: sizeof(off_t) == 8; -@@ -24427,40 +25794,42 @@ typedef struct { - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - ac_cv_sys_file_offset_bits=64 --else -- ac_cv_sys_file_offset_bits=no -+else case e in #( -+ e) ac_cv_sys_file_offset_bits=no ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 --$as_echo "$ac_cv_sys_file_offset_bits" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 -+printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; } - - if test "$ac_cv_sys_file_offset_bits" != no; then - wx_largefile=yes -- cat >>confdefs.h <<_ACEOF --#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits --_ACEOF -+ printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h - - fi - - if test "x$wx_largefile" != "xyes"; then - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 --$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } --if ${ac_cv_sys_large_files+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 -+printf %s "checking for _LARGE_FILES value needed for large files... " >&6; } -+if test ${ac_cv_sys_large_files+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #define _LARGE_FILES 1 - #include - int --main () -+main (void) - { - typedef struct { - unsigned int field: sizeof(off_t) == 8; -@@ -24470,36 +25839,37 @@ typedef struct { - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - ac_cv_sys_large_files=1 --else -- ac_cv_sys_large_files=no -+else case e in #( -+ e) ac_cv_sys_large_files=no ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 --$as_echo "$ac_cv_sys_large_files" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 -+printf "%s\n" "$ac_cv_sys_large_files" >&6; } - - if test "$ac_cv_sys_large_files" != no; then - wx_largefile=yes -- cat >>confdefs.h <<_ACEOF --#define _LARGE_FILES $ac_cv_sys_large_files --_ACEOF -+ printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h - - fi - - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if large file support is available" >&5 --$as_echo_n "checking if large file support is available... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if large file support is available" >&5 -+printf %s "checking if large file support is available... " >&6; } - if test "x$wx_largefile" = "xyes"; then -- $as_echo "#define HAVE_LARGEFILE_SUPPORT 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_LARGEFILE_SUPPORT 1" >>confdefs.h - - fi -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_largefile" >&5 --$as_echo "$wx_largefile" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_largefile" >&5 -+printf "%s\n" "$wx_largefile" >&6; } - fi - - if test "$ac_cv_sys_file_offset_bits" = "64"; then -@@ -24512,12 +25882,13 @@ if test -n "$LARGEFILE_CPPFLAGS"; then - WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $LARGEFILE_CPPFLAGS" - - if test "$USE_HPUX" = 1 -a "$GXX" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -D__STDC_EXT__ is required" >&5 --$as_echo_n "checking if -D__STDC_EXT__ is required... " >&6; } --if ${wx_cv_STDC_EXT_required+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if -D__STDC_EXT__ is required" >&5 -+printf %s "checking if -D__STDC_EXT__ is required... " >&6; } -+if test ${wx_cv_STDC_EXT_required+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -24528,7 +25899,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #ifndef __STDC_EXT__ -@@ -24539,13 +25910,15 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_STDC_EXT_required=no --else -- wx_cv_STDC_EXT_required=yes -- -+else case e in #( -+ e) wx_cv_STDC_EXT_required=yes -+ ;; -+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 - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -24553,10 +25926,11 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_STDC_EXT_required" >&5 --$as_echo "$wx_cv_STDC_EXT_required" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_STDC_EXT_required" >&5 -+printf "%s\n" "$wx_cv_STDC_EXT_required" >&6; } - if test "x$wx_cv_STDC_EXT_required" = "xyes"; then - WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -D__STDC_EXT__" - fi -@@ -24571,71 +25945,97 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - old_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $LARGEFILE_CPPFLAGS" --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 --$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } --if ${ac_cv_sys_largefile_source+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- while :; do -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for declarations of fseeko and ftello" >&5 -+printf %s "checking for declarations of fseeko and ftello... " >&6; } -+if test ${ac_cv_func_fseeko_ftello+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -+ -+#if defined __hpux && !defined _LARGEFILE_SOURCE -+# include -+# if LONG_MAX >> 31 == 0 -+# error "32-bit HP-UX 11/ia64 needs _LARGEFILE_SOURCE for fseeko in C++" -+# endif -+#endif - #include /* for off_t */ -- #include -+#include -+ - int --main () -+main (void) - { --int (*fp) (FILE *, off_t, int) = fseeko; -- return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); -+ -+ int (*fp1) (FILE *, off_t, int) = fseeko; -+ off_t (*fp2) (FILE *) = ftello; -+ return fseeko (stdin, 0, 0) -+ && fp1 (stdin, 0, 0) -+ && ftello (stdin) >= 0 -+ && fp2 (stdin) >= 0; -+ - ; - return 0; - } - _ACEOF --if ac_fn_cxx_try_link "$LINENO"; then : -- ac_cv_sys_largefile_source=no; break --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ ac_cv_func_fseeko_ftello=yes -+else case e in #( -+ e) ac_save_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE=1" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#define _LARGEFILE_SOURCE 1 -+ -+#if defined __hpux && !defined _LARGEFILE_SOURCE -+# include -+# if LONG_MAX >> 31 == 0 -+# error "32-bit HP-UX 11/ia64 needs _LARGEFILE_SOURCE for fseeko in C++" -+# endif -+#endif - #include /* for off_t */ -- #include -+#include -+ - int --main () -+main (void) - { --int (*fp) (FILE *, off_t, int) = fseeko; -- return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); -+ -+ int (*fp1) (FILE *, off_t, int) = fseeko; -+ off_t (*fp2) (FILE *) = ftello; -+ return fseeko (stdin, 0, 0) -+ && fp1 (stdin, 0, 0) -+ && ftello (stdin) >= 0 -+ && fp2 (stdin) >= 0; -+ - ; - return 0; - } - _ACEOF --if ac_fn_cxx_try_link "$LINENO"; then : -- ac_cv_sys_largefile_source=1; break -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ ac_cv_func_fseeko_ftello="need _LARGEFILE_SOURCE" -+else case e in #( -+ e) ac_cv_func_fseeko_ftello=no ;; -+esac - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- ac_cv_sys_largefile_source=unknown -- break --done -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 --$as_echo "$ac_cv_sys_largefile_source" >&6; } --case $ac_cv_sys_largefile_source in #( -- no | unknown) ;; -- *) --cat >>confdefs.h <<_ACEOF --#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source --_ACEOF --;; -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; - esac --rm -rf conftest* -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fseeko_ftello" >&5 -+printf "%s\n" "$ac_cv_func_fseeko_ftello" >&6; } -+if test "$ac_cv_func_fseeko_ftello" != no -+then : -+ -+printf "%s\n" "#define HAVE_FSEEKO 1" >>confdefs.h - --# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug --# in glibc 2.1.3, but that breaks too many other things. --# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. --if test $ac_cv_sys_largefile_source != unknown; then -+fi -+if test "$ac_cv_func_fseeko_ftello" = "need _LARGEFILE_SOURCE" -+then : - --$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h -+printf "%s\n" "#define _LARGEFILE_SOURCE 1" >>confdefs.h - - fi - -@@ -24650,19 +26050,20 @@ if test "$ac_cv_sys_largefile_source" != no; then - WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_LARGEFILE_SOURCE=$ac_cv_sys_largefile_source" - fi - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 --$as_echo_n "checking whether byte ordering is bigendian... " >&6; } --if ${ac_cv_c_bigendian+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_cv_c_bigendian=unknown -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 -+printf %s "checking whether byte ordering is bigendian... " >&6; } -+if test ${ac_cv_c_bigendian+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_cv_c_bigendian=unknown - # See if sys/param.h defines the BYTE_ORDER macro. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include - int --main () -+main (void) - { - - #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN -@@ -24672,14 +26073,15 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - # It does; now see whether it defined to BIG_ENDIAN or not. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include - int --main () -+main (void) - { - - #if BYTE_ORDER != BIG_ENDIAN -@@ -24689,19 +26091,22 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - ac_cv_c_bigendian=yes --else -- ac_cv_c_bigendian=no -+else case e in #( -+ e) ac_cv_c_bigendian=no ;; -+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 -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - if test $ac_cv_c_bigendian = unknown; then --if test "$cross_compiling" = yes; then : -+if test "$cross_compiling" = yes -+then : - ac_cv_c_bigendian=unknown --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - main () { - /* Are we little or big endian? From Harbison&Steele. */ -@@ -24714,25 +26119,29 @@ main () { - exit (u.c[sizeof (long) - 1] == 1); - } - _ACEOF --if ac_fn_c_try_run "$LINENO"; then : -+if ac_fn_c_try_run "$LINENO" -+then : - ac_cv_c_bigendian=no --else -- ac_cv_c_bigendian=yes -+else case e in #( -+ e) ac_cv_c_bigendian=yes ;; -+esac - fi - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac - fi - -+fi ;; -+esac - fi --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 --$as_echo "$ac_cv_c_bigendian" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 -+printf "%s\n" "$ac_cv_c_bigendian" >&6; } - if test $ac_cv_c_bigendian = unknown; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming little-endian target machine - this may be overridden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&5 --$as_echo "$as_me: WARNING: Assuming little-endian target machine - this may be overridden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Assuming little-endian target machine - this may be overridden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&5 -+printf "%s\n" "$as_me: WARNING: Assuming little-endian target machine - this may be overridden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&2;} - fi - if test $ac_cv_c_bigendian = yes; then -- $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h -+ printf "%s\n" "#define WORDS_BIGENDIAN 1" >>confdefs.h - - fi - -@@ -24746,17 +26155,18 @@ if test "x$SUNCC" = xyes; then - fi - - if test "x$SGICC" = "xyes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if cc version is 7.4.4 or greater" >&5 --$as_echo_n "checking if cc version is 7.4.4 or greater... " >&6; } --if ${wx_cv_prog_sgicc744+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if cc version is 7.4.4 or greater" >&5 -+printf %s "checking if cc version is 7.4.4 or greater... " >&6; } -+if test ${wx_cv_prog_sgicc744+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #if _SGI_COMPILER_VERSION >= 744 -@@ -24767,30 +26177,34 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - wx_cv_prog_sgicc744=no --else -- wx_cv_prog_sgicc744=yes -- -+else case e in #( -+ e) wx_cv_prog_sgicc744=yes -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_prog_sgicc744" >&5 --$as_echo "$wx_cv_prog_sgicc744" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_prog_sgicc744" >&5 -+printf "%s\n" "$wx_cv_prog_sgicc744" >&6; } - - if test "x$wx_cv_prog_sgicc744" = "xyes"; then - CFLAGS="-woff 3970 $CFLAGS" - fi - fi - if test "x$SGICXX" = "xyes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if CC version is 7.4.4 or greater" >&5 --$as_echo_n "checking if CC version is 7.4.4 or greater... " >&6; } --if ${wx_cv_prog_sgicxx744+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if CC version is 7.4.4 or greater" >&5 -+printf %s "checking if CC version is 7.4.4 or greater... " >&6; } -+if test ${wx_cv_prog_sgicxx744+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -24801,7 +26215,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #if _SGI_COMPILER_VERSION >= 744 -@@ -24812,13 +26226,15 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_prog_sgicxx744=no --else -- wx_cv_prog_sgicxx744=yes -- -+else case e in #( -+ e) wx_cv_prog_sgicxx744=yes -+ ;; -+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 - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -24826,10 +26242,11 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_prog_sgicxx744" >&5 --$as_echo "$wx_cv_prog_sgicxx744" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_prog_sgicxx744" >&5 -+printf "%s\n" "$wx_cv_prog_sgicxx744" >&6; } - - if test "x$wx_cv_prog_sgicxx744" = "xyes"; then - CXXFLAGS="-woff 3970 $CXXFLAGS" -@@ -24849,15 +26266,15 @@ fi - - if test "$HAVE_CXX11" = "1" ; then - --$as_echo "#define HAVE_STD_WSTRING 1" >>confdefs.h -+printf "%s\n" "#define HAVE_STD_WSTRING 1" >>confdefs.h - --$as_echo "#define HAVE_STD_STRING_COMPARE 1" >>confdefs.h -+printf "%s\n" "#define HAVE_STD_STRING_COMPARE 1" >>confdefs.h - --$as_echo "#define HAVE_STD_UNORDERED_MAP 1" >>confdefs.h -+printf "%s\n" "#define HAVE_STD_UNORDERED_MAP 1" >>confdefs.h - --$as_echo "#define HAVE_STD_UNORDERED_SET 1" >>confdefs.h -+printf "%s\n" "#define HAVE_STD_UNORDERED_SET 1" >>confdefs.h - --$as_echo "#define HAVE_TYPE_TRAITS 1" >>confdefs.h -+printf "%s\n" "#define HAVE_TYPE_TRAITS 1" >>confdefs.h - - - else -@@ -24877,48 +26294,53 @@ if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then - char_type="char" - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $std_string in " >&5 --$as_echo_n "checking for $std_string in ... " >&6; } --if ${wx_cv_class_stdstring+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $std_string in " >&5 -+printf %s "checking for $std_string in ... " >&6; } -+if test ${wx_cv_class_stdstring+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - $std_string foo; - ; - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_class_stdstring=yes --else -- wx_cv_class_stdstring=no -- -+else case e in #( -+ e) wx_cv_class_stdstring=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_class_stdstring" >&5 --$as_echo "$wx_cv_class_stdstring" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_class_stdstring" >&5 -+printf "%s\n" "$wx_cv_class_stdstring" >&6; } - - if test "$wx_cv_class_stdstring" = yes; then - if test "$wxUSE_UNICODE" = "yes"; then -- $as_echo "#define HAVE_STD_WSTRING 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_STD_WSTRING 1" >>confdefs.h - - fi - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if std::basic_string<$char_type> works" >&5 --$as_echo_n "checking if std::basic_string<$char_type> works... " >&6; } --if ${wx_cv_class_stdbasicstring+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if std::basic_string<$char_type> works" >&5 -+printf %s "checking if std::basic_string<$char_type> works... " >&6; } -+if test ${wx_cv_class_stdbasicstring+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -24935,7 +26357,7 @@ else - #include - - int --main () -+main (void) - { - std::basic_string<$char_type> foo; - const $char_type* dummy = foo.c_str(); -@@ -24943,18 +26365,21 @@ std::basic_string<$char_type> foo; - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_class_stdbasicstring=yes --else -- wx_cv_class_stdbasicstring=no -- -+else case e in #( -+ e) wx_cv_class_stdbasicstring=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_class_stdbasicstring" >&5 --$as_echo "$wx_cv_class_stdbasicstring" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_class_stdbasicstring" >&5 -+printf "%s\n" "$wx_cv_class_stdbasicstring" >&6; } - - if test "$wx_cv_class_stdbasicstring" != yes; then - if test "$wxUSE_STL" = "yes"; then -@@ -24962,8 +26387,8 @@ $as_echo "$wx_cv_class_stdbasicstring" >&6; } - elif test "$wxUSE_STD_STRING" = "yes"; then - as_fn_error $? "Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" "$LINENO" 5 - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&5 --$as_echo "$as_me: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&5 -+printf "%s\n" "$as_me: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&2;} - wxUSE_STD_STRING=no - fi - fi -@@ -24973,27 +26398,27 @@ fi - if test "$wxUSE_STD_IOSTREAM" = "yes"; then - ac_fn_cxx_check_type "$LINENO" "std::istream" "ac_cv_type_std__istream" "#include - " --if test "x$ac_cv_type_std__istream" = xyes; then : -+if test "x$ac_cv_type_std__istream" = xyes -+then : - --cat >>confdefs.h <<_ACEOF --#define HAVE_STD__ISTREAM 1 --_ACEOF -+printf "%s\n" "#define HAVE_STD__ISTREAM 1" >>confdefs.h - - --else -- wxUSE_STD_IOSTREAM=no -+else case e in #( -+ e) wxUSE_STD_IOSTREAM=no ;; -+esac - fi - ac_fn_cxx_check_type "$LINENO" "std::ostream" "ac_cv_type_std__ostream" "#include - " --if test "x$ac_cv_type_std__ostream" = xyes; then : -+if test "x$ac_cv_type_std__ostream" = xyes -+then : - --cat >>confdefs.h <<_ACEOF --#define HAVE_STD__OSTREAM 1 --_ACEOF -+printf "%s\n" "#define HAVE_STD__OSTREAM 1" >>confdefs.h - - --else -- wxUSE_STD_IOSTREAM=no -+else case e in #( -+ e) wxUSE_STD_IOSTREAM=no ;; -+esac - fi - - -@@ -25001,23 +26426,24 @@ fi - if test "$wxUSE_STD_IOSTREAM" = "yes"; then - as_fn_error $? "Can't use --enable-std_iostreams without std::istream and std::ostream" "$LINENO" 5 - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&5 --$as_echo "$as_me: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&5 -+printf "%s\n" "$as_me: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&2;} - fi - fi - fi - - if test "$wxUSE_STL" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compliant std::string::compare" >&5 --$as_echo_n "checking for compliant std::string::compare... " >&6; } --if ${wx_cv_func_stdstring_compare+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compliant std::string::compare" >&5 -+printf %s "checking for compliant std::string::compare... " >&6; } -+if test ${wx_cv_func_stdstring_compare+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - std::string foo, bar; - foo.compare(bar); -@@ -25030,45 +26456,50 @@ std::string foo, bar; - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_func_stdstring_compare=yes --else -- wx_cv_func_stdstring_compare=no -- -+else case e in #( -+ e) wx_cv_func_stdstring_compare=no -+ ;; -+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 -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_stdstring_compare" >&5 --$as_echo "$wx_cv_func_stdstring_compare" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_stdstring_compare" >&5 -+printf "%s\n" "$wx_cv_func_stdstring_compare" >&6; } - - if test "$wx_cv_func_stdstring_compare" = yes; then -- $as_echo "#define HAVE_STD_STRING_COMPARE 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_STD_STRING_COMPARE 1" >>confdefs.h - - fi - - if test "$wx_cv_class_gnuhashmapset" = yes; then -- $as_echo "#define HAVE_EXT_HASH_MAP 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_EXT_HASH_MAP 1" >>confdefs.h - -- $as_echo "#define HAVE_GNU_CXX_HASH_MAP 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_GNU_CXX_HASH_MAP 1" >>confdefs.h - - fi - - ac_fn_cxx_check_header_compile "$LINENO" "unordered_map" "ac_cv_header_unordered_map" " - - " --if test "x$ac_cv_header_unordered_map" = xyes; then : -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unordered_map and unordered_set in std" >&5 --$as_echo_n "checking for unordered_map and unordered_set in std... " >&6; } --if ${wx_cv_class_stdunorderedmapset+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+if test "x$ac_cv_header_unordered_map" = xyes -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for unordered_map and unordered_set in std" >&5 -+printf %s "checking for unordered_map and unordered_set in std... " >&6; } -+if test ${wx_cv_class_stdunorderedmapset+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include - int --main () -+main (void) - { - std::unordered_map test1; - std::unordered_set test2; -@@ -25076,42 +26507,46 @@ std::unordered_map test1; - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_class_stdunorderedmapset=yes --else -- wx_cv_class_stdunorderedmapset=no -+else case e in #( -+ e) wx_cv_class_stdunorderedmapset=no ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_class_stdunorderedmapset" >&5 --$as_echo "$wx_cv_class_stdunorderedmapset" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_class_stdunorderedmapset" >&5 -+printf "%s\n" "$wx_cv_class_stdunorderedmapset" >&6; } - fi - - -- - if test "$wx_cv_class_stdunorderedmapset" = yes; then -- $as_echo "#define HAVE_STD_UNORDERED_MAP 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_STD_UNORDERED_MAP 1" >>confdefs.h - -- $as_echo "#define HAVE_STD_UNORDERED_SET 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_STD_UNORDERED_SET 1" >>confdefs.h - - else - ac_fn_cxx_check_header_compile "$LINENO" "tr1/unordered_map" "ac_cv_header_tr1_unordered_map" " - - " --if test "x$ac_cv_header_tr1_unordered_map" = xyes; then : -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unordered_map and unordered_set in std::tr1" >&5 --$as_echo_n "checking for unordered_map and unordered_set in std::tr1... " >&6; } --if ${wx_cv_class_tr1unorderedmapset+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+if test "x$ac_cv_header_tr1_unordered_map" = xyes -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for unordered_map and unordered_set in std::tr1" >&5 -+printf %s "checking for unordered_map and unordered_set in std::tr1... " >&6; } -+if test ${wx_cv_class_tr1unorderedmapset+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include - int --main () -+main (void) - { - std::tr1::unordered_map test1; - std::tr1::unordered_set test2; -@@ -25122,42 +26557,46 @@ std::tr1::unordered_map test1; - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_class_tr1unorderedmapset=yes --else -- wx_cv_class_tr1unorderedmapset=no -+else case e in #( -+ e) wx_cv_class_tr1unorderedmapset=no ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_class_tr1unorderedmapset" >&5 --$as_echo "$wx_cv_class_tr1unorderedmapset" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_class_tr1unorderedmapset" >&5 -+printf "%s\n" "$wx_cv_class_tr1unorderedmapset" >&6; } - fi - - -- - if test "$wx_cv_class_tr1unorderedmapset" = yes; then -- $as_echo "#define HAVE_TR1_UNORDERED_MAP 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_TR1_UNORDERED_MAP 1" >>confdefs.h - -- $as_echo "#define HAVE_TR1_UNORDERED_SET 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_TR1_UNORDERED_SET 1" >>confdefs.h - - else - ac_fn_cxx_check_header_compile "$LINENO" "hash_map" "ac_cv_header_hash_map" " - - " --if test "x$ac_cv_header_hash_map" = xyes; then : -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for std::hash_map and hash_set" >&5 --$as_echo_n "checking for std::hash_map and hash_set... " >&6; } --if ${wx_cv_class_stdhashmapset+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+if test "x$ac_cv_header_hash_map" = xyes -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for std::hash_map and hash_set" >&5 -+printf %s "checking for std::hash_map and hash_set... " >&6; } -+if test ${wx_cv_class_stdhashmapset+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include - int --main () -+main (void) - { - std::hash_map, std::equal_to > test1; - std::hash_set, std::equal_to > test2; -@@ -25165,43 +26604,47 @@ std::hash_map, std::equal_to > test1 - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_class_stdhashmapset=yes --else -- wx_cv_class_stdhashmapset=no -+else case e in #( -+ e) wx_cv_class_stdhashmapset=no ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_class_stdhashmapset" >&5 --$as_echo "$wx_cv_class_stdhashmapset" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_class_stdhashmapset" >&5 -+printf "%s\n" "$wx_cv_class_stdhashmapset" >&6; } - fi - - -- - if test "$wx_cv_class_stdhashmapset" = yes; then -- $as_echo "#define HAVE_HASH_MAP 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_HASH_MAP 1" >>confdefs.h - -- $as_echo "#define HAVE_STD_HASH_MAP 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_STD_HASH_MAP 1" >>confdefs.h - - fi - - ac_fn_cxx_check_header_compile "$LINENO" "ext/hash_map" "ac_cv_header_ext_hash_map" " - - " --if test "x$ac_cv_header_ext_hash_map" = xyes; then : -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU hash_map and hash_set" >&5 --$as_echo_n "checking for GNU hash_map and hash_set... " >&6; } --if ${wx_cv_class_gnuhashmapset+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+if test "x$ac_cv_header_ext_hash_map" = xyes -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU hash_map and hash_set" >&5 -+printf %s "checking for GNU hash_map and hash_set... " >&6; } -+if test ${wx_cv_class_gnuhashmapset+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include - int --main () -+main (void) - { - __gnu_cxx::hash_map, std::equal_to > test1; - __gnu_cxx::hash_set, std::equal_to > test2; -@@ -25209,55 +26652,58 @@ __gnu_cxx::hash_map, std::equal_to&5 --$as_echo "$wx_cv_class_gnuhashmapset" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_class_gnuhashmapset" >&5 -+printf "%s\n" "$wx_cv_class_gnuhashmapset" >&6; } - fi - - -- - fi - fi - fi - --for ac_header in type_traits tr1/type_traits -+ for ac_header in type_traits tr1/type_traits - do : -- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | sed "$as_sed_sh"` - ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default - " --if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : -+if eval test \"x\$"$as_ac_Header"\" = x"yes" -+then : - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `printf "%s\n" "HAVE_$ac_header" | sed "$as_sed_cpp"` 1 - _ACEOF - break - fi - - done - -- - fi - - - if test -n "$GCC"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __sync_xxx_and_fetch builtins" >&5 --$as_echo_n "checking for __sync_xxx_and_fetch builtins... " >&6; } -- if ${wx_cv_cc_gcc_atomic_builtins+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __sync_xxx_and_fetch builtins" >&5 -+printf %s "checking for __sync_xxx_and_fetch builtins... " >&6; } -+ if test ${wx_cv_cc_gcc_atomic_builtins+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - unsigned int value=0; -@@ -25268,20 +26714,23 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_link "$LINENO"; then : -+if ac_fn_cxx_try_link "$LINENO" -+then : - wx_cv_cc_gcc_atomic_builtins=yes --else -- wx_cv_cc_gcc_atomic_builtins=no -+else case e in #( -+ e) wx_cv_cc_gcc_atomic_builtins=no ;; -+esac - 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 -- -+ ;; -+esac - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_cc_gcc_atomic_builtins" >&5 --$as_echo "$wx_cv_cc_gcc_atomic_builtins" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_cc_gcc_atomic_builtins" >&5 -+printf "%s\n" "$wx_cv_cc_gcc_atomic_builtins" >&6; } - if test $wx_cv_cc_gcc_atomic_builtins = yes; then -- $as_echo "#define HAVE_GCC_ATOMIC_BUILTINS 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_GCC_ATOMIC_BUILTINS 1" >>confdefs.h - - fi - fi -@@ -25338,15 +26787,16 @@ SEARCH_INCLUDE="\ - \ - /usr/openwin/share/include" - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraries directories" >&5 --$as_echo_n "checking for libraries directories... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libraries directories" >&5 -+printf %s "checking for libraries directories... " >&6; } - - case "${host}" in - *-*-irix6* ) -- if ${wx_cv_std_libpath+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ if test ${wx_cv_std_libpath+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - for d in /usr/lib /usr/lib32 /usr/lib/64 /usr/lib64; do - for e in a so sl dylib dll.a; do - libc="$d/libc.$e" -@@ -25359,10 +26809,11 @@ else - int main() { return 0; } - - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - wx_cv_std_libpath=`echo $d | sed s@/usr/@@` - 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="$save_LIBS" - if test "x$wx_cv_std_libpath" != "x"; then -@@ -25372,7 +26823,8 @@ rm -f core conftest.err conftest.$ac_objext \ - done - done - -- -+ ;; -+esac - fi - - ;; -@@ -25420,8 +26872,8 @@ if test -z "$wx_cv_std_libfullpath"; then - fi - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_std_libfullpath" >&5 --$as_echo "$wx_cv_std_libfullpath" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_std_libfullpath" >&5 -+printf "%s\n" "$wx_cv_std_libfullpath" >&6; } - - SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` $wx_cv_std_libfullpath" - -@@ -25481,8 +26933,8 @@ cat >confcache <<\_ACEOF - # config.status only pays attention to the cache file if you give it - # the --recheck option to rerun configure. - # --# `ac_cv_env_foo' variables (set or unset) will be overridden when --# loading this file, other *unset* `ac_cv_foo' will be assigned the -+# 'ac_cv_env_foo' variables (set or unset) will be overridden when -+# loading this file, other *unset* 'ac_cv_foo' will be assigned the - # following values. - - _ACEOF -@@ -25498,8 +26950,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) ;; #( -@@ -25512,14 +26964,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) -- # `set' does not quote correctly, so add quotes: double-quote -+ # 'set' does not quote correctly, so add quotes: double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( - *) -- # `set' quotes correctly as required by POSIX, so do not add quotes. -+ # 'set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | -@@ -25529,15 +26981,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 -@@ -25551,78 +27003,78 @@ $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 - - have_cos=0 - have_floor=0 --for ac_func in cos -+ -+ for ac_func in cos - do : - ac_fn_c_check_func "$LINENO" "cos" "ac_cv_func_cos" --if test "x$ac_cv_func_cos" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_COS 1 --_ACEOF -+if test "x$ac_cv_func_cos" = xyes -+then : -+ printf "%s\n" "#define HAVE_COS 1" >>confdefs.h - have_cos=1 - fi -+ - done - --for ac_func in floor -+ for ac_func in floor - do : - ac_fn_c_check_func "$LINENO" "floor" "ac_cv_func_floor" --if test "x$ac_cv_func_floor" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_FLOOR 1 --_ACEOF -+if test "x$ac_cv_func_floor" = xyes -+then : -+ printf "%s\n" "#define HAVE_FLOOR 1" >>confdefs.h - have_floor=1 - fi --done - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if floating point functions link without -lm" >&5 --$as_echo_n "checking if floating point functions link without -lm... " >&6; } -+done -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if floating point functions link without -lm" >&5 -+printf %s "checking if floating point functions link without -lm... " >&6; } - if test "$have_cos" = 1 -a "$have_floor" = 1; 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; } - save_LIBS="$LIBS" - LIBS="$LIBS -lm" - have_sin=0 - have_ceil=0 -- for ac_func in sin -+ -+ for ac_func in sin - do : - ac_fn_c_check_func "$LINENO" "sin" "ac_cv_func_sin" --if test "x$ac_cv_func_sin" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_SIN 1 --_ACEOF -+if test "x$ac_cv_func_sin" = xyes -+then : -+ printf "%s\n" "#define HAVE_SIN 1" >>confdefs.h - have_sin=1 - fi -+ - done - -- for ac_func in ceil -+ for ac_func in ceil - do : - ac_fn_c_check_func "$LINENO" "ceil" "ac_cv_func_ceil" --if test "x$ac_cv_func_ceil" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_CEIL 1 --_ACEOF -+if test "x$ac_cv_func_ceil" = xyes -+then : -+ printf "%s\n" "#define HAVE_CEIL 1" >>confdefs.h - have_ceil=1 - fi --done - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if floating point functions link with -lm" >&5 --$as_echo_n "checking if floating point functions link with -lm... " >&6; } -+done -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if floating point functions link with -lm" >&5 -+printf %s "checking if floating point functions link with -lm... " >&6; } - if test "$have_sin" = 1 -a "$have_ceil" = 1; 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; } - LIBS="$save_LIBS" - fi - fi -@@ -25639,12 +27091,13 @@ if test "wxUSE_UNICODE" = "yes"; then - - for wx_func in wcstoull - do -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 --$as_echo_n "checking for $wx_func... " >&6; } --if eval \${wx_cv_func_$wx_func+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -25653,7 +27106,7 @@ else - $ac_includes_default - - int --main () -+main (void) - { - - #ifndef $wx_func -@@ -25666,23 +27119,26 @@ main () - } - - _ACEOF --if ac_fn_cxx_try_link "$LINENO"; then : -+if ac_fn_cxx_try_link "$LINENO" -+then : - eval wx_cv_func_$wx_func=yes --else -- eval wx_cv_func_$wx_func=no -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac - 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 -- -+ ;; -+esac - fi - eval ac_res=\$wx_cv_func_$wx_func -- { $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 \$wx_cv_func_$wx_func = yes - then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1 -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 - _ACEOF - - -@@ -25696,12 +27152,13 @@ else - - for wx_func in strtoull - do -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 --$as_echo_n "checking for $wx_func... " >&6; } --if eval \${wx_cv_func_$wx_func+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -25710,7 +27167,7 @@ else - $ac_includes_default - - int --main () -+main (void) - { - - #ifndef $wx_func -@@ -25723,23 +27180,26 @@ main () - } - - _ACEOF --if ac_fn_cxx_try_link "$LINENO"; then : -+if ac_fn_cxx_try_link "$LINENO" -+then : - eval wx_cv_func_$wx_func=yes --else -- eval wx_cv_func_$wx_func=no -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac - 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 -- -+ ;; -+esac - fi - eval ac_res=\$wx_cv_func_$wx_func -- { $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 \$wx_cv_func_$wx_func = yes - then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1 -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 - _ACEOF - - -@@ -25764,12 +27224,13 @@ 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 -- case $PKG_CONFIG in -+{ 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 case e in #( -+ e) case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; -@@ -25778,11 +27239,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 -@@ -25790,15 +27255,16 @@ done - IFS=$as_save_IFS - - ;; -+esac ;; - 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 - - -@@ -25807,12 +27273,13 @@ 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 -- case $ac_pt_PKG_CONFIG in -+{ 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 case e in #( -+ e) 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. - ;; -@@ -25821,11 +27288,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 -@@ -25833,15 +27304,16 @@ done - IFS=$as_save_IFS - - ;; -+esac ;; - 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 -@@ -25849,8 +27321,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 -@@ -25862,14 +27334,14 @@ 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 - -@@ -25886,8 +27358,8 @@ if test "$build" != "$host"; then - ;; - - * ) -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Not using native pkg-config when cross-compiling." >&5 --$as_echo "$as_me: WARNING: Not using native pkg-config when cross-compiling." >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Not using native pkg-config when cross-compiling." >&5 -+printf "%s\n" "$as_me: WARNING: Not using native pkg-config when cross-compiling." >&2;} - - - -@@ -25904,7 +27376,7 @@ fi - - - if test "$wxUSE_REGEX" != "no"; then -- $as_echo "#define wxUSE_REGEX 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_REGEX 1" >>confdefs.h - - - if test "$wxUSE_UNICODE" = "yes"; then -@@ -25926,18 +27398,18 @@ if test "$wxUSE_REGEX" != "no"; then - if test "$wxUSE_REGEX" != "builtin"; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBPCRE" >&5 --$as_echo_n "checking for LIBPCRE... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBPCRE" >&5 -+printf %s "checking for LIBPCRE... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$LIBPCRE_CFLAGS"; then - pkg_cv_LIBPCRE_CFLAGS="$LIBPCRE_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-\$pcre_suffix\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-\$pcre_suffix\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libpcre2-$pcre_suffix") 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_LIBPCRE_CFLAGS=`$PKG_CONFIG --cflags "libpcre2-$pcre_suffix" 2>/dev/null` - else -@@ -25952,10 +27424,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_LIBPCRE_LIBS="$LIBPCRE_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-\$pcre_suffix\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-\$pcre_suffix\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libpcre2-$pcre_suffix") 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_LIBPCRE_LIBS=`$PKG_CONFIG --libs "libpcre2-$pcre_suffix" 2>/dev/null` - else -@@ -25995,8 +27467,8 @@ elif test $pkg_failed = untried; then - else - LIBPCRE_CFLAGS=$pkg_cv_LIBPCRE_CFLAGS - LIBPCRE_LIBS=$pkg_cv_LIBPCRE_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; } - - PCRE_LINK=$LIBPCRE_LIBS - CXXFLAGS="$LIBPCRE_CFLAGS $CXXFLAGS" -@@ -26006,11 +27478,11 @@ fi - fi - - if test "$wxUSE_REGEX" = "builtin"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pcre submodule exists" >&5 --$as_echo_n "checking whether pcre submodule exists... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pcre submodule exists" >&5 -+printf %s "checking whether pcre submodule exists... " >&6; } - if ! test -f "$srcdir/3rdparty/pcre/pcre2-config.in" ; 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; } - as_fn_error $? " - Configured to use built-in PCRE library, but the file - $srcdir/3rdparty/pcre/pcre2-config.in couldn't be found. -@@ -26020,8 +27492,8 @@ $as_echo "no" >&6; } - - to fix this." "$LINENO" 5 - else -- { $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; } - fi - - if test $pcre_suffix != 8; then -@@ -26036,6 +27508,7 @@ $as_echo "yes" >&6; } - - - -+ - # Various preliminary checks. - - -@@ -26052,9 +27525,9 @@ $as_echo "yes" >&6; } - case "$ax_dir" in - .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) -- ac_dir_suffix=/`$as_echo "$ax_dir" | sed 's|^\.[\\/]||'` -+ ac_dir_suffix=/`printf "%s\n" "$ax_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/ ;; -@@ -26114,7 +27587,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - --disable-option-checking) - ;; - *) case $ax_arg in -- *\'*) ax_arg=$($as_echo "$ax_arg" | sed "s/'/'\\\\\\\\''/g");; -+ *\'*) ax_arg=$(printf "%s\n" "$ax_arg" | sed "s/'/'\\\\\\\\''/g");; - esac - as_fn_append ax_args " '$ax_arg'" ;; - esac -@@ -26141,8 +27614,8 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - eval "ax_sub_configure_args_$ax_var=\"$ax_args\"" - eval "ax_sub_configure_$ax_var=\"yes\"" - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find source tree for $ax_dir" >&5 --$as_echo "$as_me: WARNING: could not find source tree for $ax_dir" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: could not find source tree for $ax_dir" >&5 -+printf "%s\n" "$as_me: WARNING: could not find source tree for $ax_dir" >&2;} - fi - - -@@ -26154,20 +27627,22 @@ fi - - ZLIB_LINK= - if test "$wxUSE_ZLIB" != "no" ; then -- $as_echo "#define wxUSE_ZLIB 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_ZLIB 1" >>confdefs.h - - - if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib.h >= 1.1.4" >&5 --$as_echo_n "checking for zlib.h >= 1.1.4... " >&6; } --if ${ac_cv_header_zlib_h+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test "$cross_compiling" = yes; then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zlib.h >= 1.1.4" >&5 -+printf %s "checking for zlib.h >= 1.1.4... " >&6; } -+if test ${ac_cv_header_zlib_h+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if test "$cross_compiling" = yes -+then : - unset ac_cv_header_zlib_h - --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include -@@ -26187,65 +27662,77 @@ else - } - - _ACEOF --if ac_fn_c_try_run "$LINENO"; then : -+if ac_fn_c_try_run "$LINENO" -+then : - ac_cv_header_zlib_h=`cat conftestval` --else -- ac_cv_header_zlib_h=no -+else case e in #( -+ e) ac_cv_header_zlib_h=no ;; -+esac - fi - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac - fi - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_zlib_h" >&5 --$as_echo "$ac_cv_header_zlib_h" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_zlib_h" >&5 -+printf "%s\n" "$ac_cv_header_zlib_h" >&6; } - ac_fn_c_check_header_compile "$LINENO" "zlib.h" "ac_cv_header_zlib_h" " - " --if test "x$ac_cv_header_zlib_h" = xyes; then : -+if test "x$ac_cv_header_zlib_h" = xyes -+then : - - fi - - -- - if test "$ac_cv_header_zlib_h" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5 --$as_echo_n "checking for deflate in -lz... " >&6; } --if ${ac_cv_lib_z_deflate+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5 -+printf %s "checking for deflate in -lz... " >&6; } -+if test ${ac_cv_lib_z_deflate+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lz $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char deflate (); -+char deflate (void); - int --main () -+main (void) - { - return deflate (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_z_deflate=yes --else -- ac_cv_lib_z_deflate=no -+else case e in #( -+ e) ac_cv_lib_z_deflate=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5 --$as_echo "$ac_cv_lib_z_deflate" >&6; } --if test "x$ac_cv_lib_z_deflate" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5 -+printf "%s\n" "$ac_cv_lib_z_deflate" >&6; } -+if test "x$ac_cv_lib_z_deflate" = xyes -+then : - ZLIB_LINK=" -lz" - fi - -@@ -26255,8 +27742,8 @@ fi - if test "$wxUSE_ZLIB" = "sys" ; then - as_fn_error $? "zlib library not found or too old! Use --with-zlib=builtin to use built-in version" "$LINENO" 5 - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: zlib library not found or too old, will use built-in instead" >&5 --$as_echo "$as_me: WARNING: zlib library not found or too old, will use built-in instead" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: zlib library not found or too old, will use built-in instead" >&5 -+printf "%s\n" "$as_me: WARNING: zlib library not found or too old, will use built-in instead" >&2;} - wxUSE_ZLIB=builtin - fi - else -@@ -26265,11 +27752,11 @@ $as_echo "$as_me: WARNING: zlib library not found or too old, will use built-in - fi - - if test "$wxUSE_ZLIB" = "builtin" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether zlib.h file exists" >&5 --$as_echo_n "checking whether zlib.h file exists... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether zlib.h file exists" >&5 -+printf %s "checking whether zlib.h file exists... " >&6; } - if ! test -f "$srcdir/src/zlib/zlib.h" ; 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; } - as_fn_error $? " - Configured to use built-in zlib library, but the required file - $srcdir/src/zlib/zlib.h couldn't be found. -@@ -26279,8 +27766,8 @@ $as_echo "no" >&6; } - - to fix this." "$LINENO" 5 - else -- { $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; } - fi - fi - fi -@@ -26288,26 +27775,28 @@ fi - - PNG_LINK= - if test "$wxUSE_LIBPNG" != "no" ; then -- $as_echo "#define wxUSE_LIBPNG 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_LIBPNG 1" >>confdefs.h - - - if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: system png library doesn't work without system zlib, will use built-in instead" >&5 --$as_echo "$as_me: WARNING: system png library doesn't work without system zlib, will use built-in instead" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: system png library doesn't work without system zlib, will use built-in instead" >&5 -+printf "%s\n" "$as_me: WARNING: system png library doesn't work without system zlib, will use built-in instead" >&2;} - wxUSE_LIBPNG=builtin - fi - - if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png.h > 0.90" >&5 --$as_echo_n "checking for png.h > 0.90... " >&6; } --if ${ac_cv_header_png_h+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test "$cross_compiling" = yes; then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for png.h > 0.90" >&5 -+printf %s "checking for png.h > 0.90... " >&6; } -+if test ${ac_cv_header_png_h+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if test "$cross_compiling" = yes -+then : - unset ac_cv_header_png_h - --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include -@@ -26324,65 +27813,77 @@ else - } - - _ACEOF --if ac_fn_c_try_run "$LINENO"; then : -+if ac_fn_c_try_run "$LINENO" -+then : - ac_cv_header_png_h=`cat conftestval` --else -- ac_cv_header_png_h=no -+else case e in #( -+ e) ac_cv_header_png_h=no ;; -+esac - fi - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac - fi - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_png_h" >&5 --$as_echo "$ac_cv_header_png_h" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_png_h" >&5 -+printf "%s\n" "$ac_cv_header_png_h" >&6; } - ac_fn_c_check_header_compile "$LINENO" "png.h" "ac_cv_header_png_h" " - " --if test "x$ac_cv_header_png_h" = xyes; then : -+if test "x$ac_cv_header_png_h" = xyes -+then : - - fi - - -- - if test "$ac_cv_header_png_h" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_sig_cmp in -lpng" >&5 --$as_echo_n "checking for png_sig_cmp in -lpng... " >&6; } --if ${ac_cv_lib_png_png_sig_cmp+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for png_sig_cmp in -lpng" >&5 -+printf %s "checking for png_sig_cmp in -lpng... " >&6; } -+if test ${ac_cv_lib_png_png_sig_cmp+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lpng -lz -lm $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char png_sig_cmp (); -+char png_sig_cmp (void); - int --main () -+main (void) - { - return png_sig_cmp (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_png_png_sig_cmp=yes --else -- ac_cv_lib_png_png_sig_cmp=no -+else case e in #( -+ e) ac_cv_lib_png_png_sig_cmp=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_sig_cmp" >&5 --$as_echo "$ac_cv_lib_png_png_sig_cmp" >&6; } --if test "x$ac_cv_lib_png_png_sig_cmp" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_sig_cmp" >&5 -+printf "%s\n" "$ac_cv_lib_png_png_sig_cmp" >&6; } -+if test "x$ac_cv_lib_png_png_sig_cmp" = xyes -+then : - PNG_LINK=" -lpng -lz" - fi - -@@ -26392,8 +27893,8 @@ fi - if test "$wxUSE_LIBPNG" = "sys" ; then - as_fn_error $? "system png library not found or too old! Use --with-libpng=builtin to use built-in version" "$LINENO" 5 - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: system png library not found or too old, will use built-in instead" >&5 --$as_echo "$as_me: WARNING: system png library not found or too old, will use built-in instead" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: system png library not found or too old, will use built-in instead" >&5 -+printf "%s\n" "$as_me: WARNING: system png library not found or too old, will use built-in instead" >&2;} - wxUSE_LIBPNG=builtin - fi - else -@@ -26402,11 +27903,11 @@ $as_echo "$as_me: WARNING: system png library not found or too old, will use bui - fi - - if test "$wxUSE_LIBPNG" = "builtin" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether png.c file exists" >&5 --$as_echo_n "checking whether png.c file exists... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether png.c file exists" >&5 -+printf %s "checking whether png.c file exists... " >&6; } - if ! test -f "$srcdir/src/png/png.c" ; 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; } - as_fn_error $? " - Configured to use built-in png library, but the required file - $srcdir/src/png/png.c couldn't be found. -@@ -26416,8 +27917,8 @@ $as_echo "no" >&6; } - - to fix this." "$LINENO" 5 - else -- { $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; } - fi - fi - fi -@@ -26425,16 +27926,17 @@ fi - - JPEG_LINK= - if test "$wxUSE_LIBJPEG" != "no" ; then -- $as_echo "#define wxUSE_LIBJPEG 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_LIBJPEG 1" >>confdefs.h - - - if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeglib.h" >&5 --$as_echo_n "checking for jpeglib.h... " >&6; } -- if ${ac_cv_header_jpeglib_h+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for jpeglib.h" >&5 -+printf %s "checking for jpeglib.h... " >&6; } -+ if test ${ac_cv_header_jpeglib_h+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #undef HAVE_STDLIB_H -@@ -26442,7 +27944,7 @@ else - #include - - int --main () -+main (void) - { - - -@@ -26450,57 +27952,68 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - ac_cv_header_jpeglib_h=yes --else -- ac_cv_header_jpeglib_h=no -- -+else case e in #( -+ e) ac_cv_header_jpeglib_h=no -+ ;; -+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 -+ ;; -+esac - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_jpeglib_h" >&5 --$as_echo "$ac_cv_header_jpeglib_h" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_jpeglib_h" >&5 -+printf "%s\n" "$ac_cv_header_jpeglib_h" >&6; } - - if test "$ac_cv_header_jpeglib_h" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_read_header in -ljpeg" >&5 --$as_echo_n "checking for jpeg_read_header in -ljpeg... " >&6; } --if ${ac_cv_lib_jpeg_jpeg_read_header+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for jpeg_read_header in -ljpeg" >&5 -+printf %s "checking for jpeg_read_header in -ljpeg... " >&6; } -+if test ${ac_cv_lib_jpeg_jpeg_read_header+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-ljpeg $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char jpeg_read_header (); -+char jpeg_read_header (void); - int --main () -+main (void) - { - return jpeg_read_header (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_jpeg_jpeg_read_header=yes --else -- ac_cv_lib_jpeg_jpeg_read_header=no -+else case e in #( -+ e) ac_cv_lib_jpeg_jpeg_read_header=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5 --$as_echo "$ac_cv_lib_jpeg_jpeg_read_header" >&6; } --if test "x$ac_cv_lib_jpeg_jpeg_read_header" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5 -+printf "%s\n" "$ac_cv_lib_jpeg_jpeg_read_header" >&6; } -+if test "x$ac_cv_lib_jpeg_jpeg_read_header" = xyes -+then : - JPEG_LINK=" -ljpeg" - fi - -@@ -26510,8 +28023,8 @@ fi - if test "$wxUSE_LIBJPEG" = "sys" ; then - as_fn_error $? "system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" "$LINENO" 5 - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: system jpeg library not found, will use built-in instead" >&5 --$as_echo "$as_me: WARNING: system jpeg library not found, will use built-in instead" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: system jpeg library not found, will use built-in instead" >&5 -+printf "%s\n" "$as_me: WARNING: system jpeg library not found, will use built-in instead" >&2;} - wxUSE_LIBJPEG=builtin - fi - else -@@ -26520,49 +28033,50 @@ $as_echo "$as_me: WARNING: system jpeg library not found, will use built-in inst - if test "$wxUSE_MSW" = 1; then - ac_fn_c_check_type "$LINENO" "boolean" "ac_cv_type_boolean" "#include - " --if test "x$ac_cv_type_boolean" = xyes; then : -+if test "x$ac_cv_type_boolean" = xyes -+then : - --cat >>confdefs.h <<_ACEOF --#define HAVE_BOOLEAN 1 --_ACEOF -+printf "%s\n" "#define HAVE_BOOLEAN 1" >>confdefs.h - - - # The cast to long int works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects --# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of boolean" >&5 --$as_echo_n "checking size of boolean... " >&6; } --if ${ac_cv_sizeof_boolean+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (boolean))" "ac_cv_sizeof_boolean" " -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of boolean" >&5 -+printf %s "checking size of boolean... " >&6; } -+if test ${ac_cv_sizeof_boolean+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (boolean))" "ac_cv_sizeof_boolean" " - #undef HAVE_BOOLEAN - #include - #include - --"; then : -+" -+then : - --else -- if test "$ac_cv_type_boolean" = yes; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+else case e in #( -+ e) if test "$ac_cv_type_boolean" = yes; 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 77 "cannot compute sizeof (boolean) --See \`config.log' for more details" "$LINENO" 5; } -+See 'config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_boolean=0 -- fi -+ fi ;; -+esac - fi -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_boolean" >&5 --$as_echo "$ac_cv_sizeof_boolean" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_boolean" >&5 -+printf "%s\n" "$ac_cv_sizeof_boolean" >&6; } - - - --cat >>confdefs.h <<_ACEOF --#define SIZEOF_BOOLEAN $ac_cv_sizeof_boolean --_ACEOF -+printf "%s\n" "#define SIZEOF_BOOLEAN $ac_cv_sizeof_boolean" >>confdefs.h - - - cat >>confdefs.h <<_ACEOF -@@ -26577,11 +28091,11 @@ fi - fi - - if test "$wxUSE_LIBJPEG" = "builtin" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether jpeglib.h file exists" >&5 --$as_echo_n "checking whether jpeglib.h file exists... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether jpeglib.h file exists" >&5 -+printf %s "checking whether jpeglib.h file exists... " >&6; } - if ! test -f "$srcdir/src/jpeg/jpeglib.h" ; 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; } - as_fn_error $? " - Configured to use built-in jpeg library, but the required file - $srcdir/src/jpeg/jpeglib.h couldn't be found. -@@ -26591,63 +28105,71 @@ $as_echo "no" >&6; } - - to fix this." "$LINENO" 5 - else -- { $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; } - fi - fi - fi - - - if test "$wxUSE_LIBLZMA" != "no"; then -- ac_fn_c_check_header_mongrel "$LINENO" "lzma.h" "ac_cv_header_lzma_h" "$ac_includes_default" --if test "x$ac_cv_header_lzma_h" = xyes; then : -+ ac_fn_c_check_header_compile "$LINENO" "lzma.h" "ac_cv_header_lzma_h" "$ac_includes_default" -+if test "x$ac_cv_header_lzma_h" = xyes -+then : - - fi - - -- - if test "$ac_cv_header_lzma_h" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_code in -llzma" >&5 --$as_echo_n "checking for lzma_code in -llzma... " >&6; } --if ${ac_cv_lib_lzma_lzma_code+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lzma_code in -llzma" >&5 -+printf %s "checking for lzma_code in -llzma... " >&6; } -+if test ${ac_cv_lib_lzma_lzma_code+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-llzma $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char lzma_code (); -+char lzma_code (void); - int --main () -+main (void) - { - return lzma_code (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_lzma_lzma_code=yes --else -- ac_cv_lib_lzma_lzma_code=no -+else case e in #( -+ e) ac_cv_lib_lzma_lzma_code=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_code" >&5 --$as_echo "$ac_cv_lib_lzma_lzma_code" >&6; } --if test "x$ac_cv_lib_lzma_lzma_code" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_code" >&5 -+printf "%s\n" "$ac_cv_lib_lzma_lzma_code" >&6; } -+if test "x$ac_cv_lib_lzma_lzma_code" = xyes -+then : - - LZMA_LINK="-llzma" - LIBS="$LZMA_LINK $LIBS" -- $as_echo "#define wxUSE_LIBLZMA 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_LIBLZMA 1" >>confdefs.h - - wxUSE_LIBLZMA=sys - -@@ -26663,43 +28185,51 @@ fi - - JBIG_LINK= - if test "$wxUSE_LIBJBIG" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jbg_dec_init in -ljbig" >&5 --$as_echo_n "checking for jbg_dec_init in -ljbig... " >&6; } --if ${ac_cv_lib_jbig_jbg_dec_init+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for jbg_dec_init in -ljbig" >&5 -+printf %s "checking for jbg_dec_init in -ljbig... " >&6; } -+if test ${ac_cv_lib_jbig_jbg_dec_init+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-ljbig $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char jbg_dec_init (); -+char jbg_dec_init (void); - int --main () -+main (void) - { - return jbg_dec_init (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_jbig_jbg_dec_init=yes --else -- ac_cv_lib_jbig_jbg_dec_init=no -+else case e in #( -+ e) ac_cv_lib_jbig_jbg_dec_init=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jbig_jbg_dec_init" >&5 --$as_echo "$ac_cv_lib_jbig_jbg_dec_init" >&6; } --if test "x$ac_cv_lib_jbig_jbg_dec_init" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jbig_jbg_dec_init" >&5 -+printf "%s\n" "$ac_cv_lib_jbig_jbg_dec_init" >&6; } -+if test "x$ac_cv_lib_jbig_jbg_dec_init" = xyes -+then : - JBIG_LINK=" -ljbig" - fi - -@@ -26708,24 +28238,24 @@ fi - - TIFF_LINK= - if test "$wxUSE_LIBTIFF" != "no" ; then -- $as_echo "#define wxUSE_LIBTIFF 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_LIBTIFF 1" >>confdefs.h - - - if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBTIFF" >&5 --$as_echo_n "checking for LIBTIFF... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBTIFF" >&5 -+printf %s "checking for LIBTIFF... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$LIBTIFF_CFLAGS"; then - pkg_cv_LIBTIFF_CFLAGS="$LIBTIFF_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtiff-4\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtiff-4\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libtiff-4") 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_LIBTIFF_CFLAGS=`$PKG_CONFIG --cflags "libtiff-4" 2>/dev/null` - else -@@ -26740,10 +28270,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_LIBTIFF_LIBS="$LIBTIFF_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtiff-4\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtiff-4\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libtiff-4") 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_LIBTIFF_LIBS=`$PKG_CONFIG --libs "libtiff-4" 2>/dev/null` - else -@@ -26772,8 +28302,8 @@ fi - echo "$LIBTIFF_PKG_ERRORS" >&5 - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found via pkg-config" >&5 --$as_echo "not found via pkg-config" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found via pkg-config" >&5 -+printf "%s\n" "not found via pkg-config" >&6; } - - TIFF_PREREQ_LINKS=-lm - -@@ -26792,45 +28322,54 @@ $as_echo "not found via pkg-config" >&6; } - ac_fn_c_check_header_compile "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" " - - " --if test "x$ac_cv_header_tiffio_h" = xyes; then : -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFError in -ltiff" >&5 --$as_echo_n "checking for TIFFError in -ltiff... " >&6; } --if ${ac_cv_lib_tiff_TIFFError+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+if test "x$ac_cv_header_tiffio_h" = xyes -+then : -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIFFError in -ltiff" >&5 -+printf %s "checking for TIFFError in -ltiff... " >&6; } -+if test ${ac_cv_lib_tiff_TIFFError+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-ltiff $TIFF_PREREQ_LINKS $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char TIFFError (); -+char TIFFError (void); - int --main () -+main (void) - { - return TIFFError (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_tiff_TIFFError=yes --else -- ac_cv_lib_tiff_TIFFError=no -+else case e in #( -+ e) ac_cv_lib_tiff_TIFFError=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFError" >&5 --$as_echo "$ac_cv_lib_tiff_TIFFError" >&6; } --if test "x$ac_cv_lib_tiff_TIFFError" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFError" >&5 -+printf "%s\n" "$ac_cv_lib_tiff_TIFFError" >&6; } -+if test "x$ac_cv_lib_tiff_TIFFError" = xyes -+then : - TIFF_LINK=" -ltiff" - fi - -@@ -26838,11 +28377,10 @@ fi - fi - - -- - elif test $pkg_failed = untried; then - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found via pkg-config" >&5 --$as_echo "not found via pkg-config" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found via pkg-config" >&5 -+printf "%s\n" "not found via pkg-config" >&6; } - - TIFF_PREREQ_LINKS=-lm - -@@ -26861,45 +28399,54 @@ $as_echo "not found via pkg-config" >&6; } - ac_fn_c_check_header_compile "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" " - - " --if test "x$ac_cv_header_tiffio_h" = xyes; then : -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFError in -ltiff" >&5 --$as_echo_n "checking for TIFFError in -ltiff... " >&6; } --if ${ac_cv_lib_tiff_TIFFError+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+if test "x$ac_cv_header_tiffio_h" = xyes -+then : -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIFFError in -ltiff" >&5 -+printf %s "checking for TIFFError in -ltiff... " >&6; } -+if test ${ac_cv_lib_tiff_TIFFError+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-ltiff $TIFF_PREREQ_LINKS $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char TIFFError (); -+char TIFFError (void); - int --main () -+main (void) - { - return TIFFError (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_tiff_TIFFError=yes --else -- ac_cv_lib_tiff_TIFFError=no -+else case e in #( -+ e) ac_cv_lib_tiff_TIFFError=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFError" >&5 --$as_echo "$ac_cv_lib_tiff_TIFFError" >&6; } --if test "x$ac_cv_lib_tiff_TIFFError" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFError" >&5 -+printf "%s\n" "$ac_cv_lib_tiff_TIFFError" >&6; } -+if test "x$ac_cv_lib_tiff_TIFFError" = xyes -+then : - TIFF_LINK=" -ltiff" - fi - -@@ -26907,12 +28454,11 @@ fi - fi - - -- - else - LIBTIFF_CFLAGS=$pkg_cv_LIBTIFF_CFLAGS - LIBTIFF_LIBS=$pkg_cv_LIBTIFF_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; } - - TIFF_LINK=$LIBTIFF_LIBS - CFLAGS="$LIBTIFF_CFLAGS $CFLAGS" -@@ -26923,8 +28469,8 @@ fi - if test "$wxUSE_LIBTIFF" = "sys" ; then - as_fn_error $? "system tiff library not found! Use --with-libtiff=builtin to use built-in version" "$LINENO" 5 - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: system tiff library not found, will use built-in instead" >&5 --$as_echo "$as_me: WARNING: system tiff library not found, will use built-in instead" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: system tiff library not found, will use built-in instead" >&5 -+printf "%s\n" "$as_me: WARNING: system tiff library not found, will use built-in instead" >&2;} - wxUSE_LIBTIFF=builtin - fi - else -@@ -26932,11 +28478,11 @@ $as_echo "$as_me: WARNING: system tiff library not found, will use built-in inst - fi - fi - if test "$wxUSE_LIBTIFF" = "builtin" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether tiff.h file exists" >&5 --$as_echo_n "checking whether tiff.h file exists... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether tiff.h file exists" >&5 -+printf %s "checking whether tiff.h file exists... " >&6; } - if ! test -f "$srcdir/src/tiff/libtiff/tiff.h" ; 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; } - as_fn_error $? " - Configured to use built-in tiff library, but the required file - $srcdir/src/tiff/libtiff/tiff.h couldn't be found. -@@ -26946,8 +28492,8 @@ $as_echo "no" >&6; } - - to fix this." "$LINENO" 5 - else -- { $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; } - fi - - if test "$wxUSE_LIBLZMA" = "no"; then -@@ -26979,9 +28525,9 @@ $as_echo "yes" >&6; } - case "$ax_dir" in - .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) -- ac_dir_suffix=/`$as_echo "$ax_dir" | sed 's|^\.[\\/]||'` -+ ac_dir_suffix=/`printf "%s\n" "$ax_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/ ;; -@@ -27041,7 +28587,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - --disable-option-checking) - ;; - *) case $ax_arg in -- *\'*) ax_arg=$($as_echo "$ax_arg" | sed "s/'/'\\\\\\\\''/g");; -+ *\'*) ax_arg=$(printf "%s\n" "$ax_arg" | sed "s/'/'\\\\\\\\''/g");; - esac - as_fn_append ax_args " '$ax_arg'" ;; - esac -@@ -27072,8 +28618,8 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - eval "ax_sub_configure_args_$ax_var=\"$ax_args\"" - eval "ax_sub_configure_$ax_var=\"yes\"" - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find source tree for $ax_dir" >&5 --$as_echo "$as_me: WARNING: could not find source tree for $ax_dir" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: could not find source tree for $ax_dir" >&5 -+printf "%s\n" "$as_me: WARNING: could not find source tree for $ax_dir" >&2;} - fi - - -@@ -27087,18 +28633,19 @@ if test "$wxUSE_EXPAT" != "no"; then - if test "$wxUSE_EXPAT" = "sys" -o "$wxUSE_EXPAT" = "yes" ; then - ac_fn_c_check_header_compile "$LINENO" "expat.h" "ac_cv_header_expat_h" " - " --if test "x$ac_cv_header_expat_h" = xyes; then : -+if test "x$ac_cv_header_expat_h" = xyes -+then : - found_expat_h=1 - fi - -- - if test "x$found_expat_h" = "x1"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if expat.h is valid C++ header" >&5 --$as_echo_n "checking if expat.h is valid C++ header... " >&6; } --if ${wx_cv_expat_is_not_broken+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if expat.h is valid C++ header" >&5 -+printf %s "checking if expat.h is valid C++ header... " >&6; } -+if test ${wx_cv_expat_is_not_broken+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -27109,20 +28656,22 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - - ; - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_expat_is_not_broken=yes --else -- wx_cv_expat_is_not_broken=no -- -+else case e in #( -+ e) wx_cv_expat_is_not_broken=no -+ ;; -+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 - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -27130,48 +28679,57 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_expat_is_not_broken" >&5 --$as_echo "$wx_cv_expat_is_not_broken" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_expat_is_not_broken" >&5 -+printf "%s\n" "$wx_cv_expat_is_not_broken" >&6; } - if test "$wx_cv_expat_is_not_broken" = "yes" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate in -lexpat" >&5 --$as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; } --if ${ac_cv_lib_expat_XML_ParserCreate+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate in -lexpat" >&5 -+printf %s "checking for XML_ParserCreate in -lexpat... " >&6; } -+if test ${ac_cv_lib_expat_XML_ParserCreate+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lexpat $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char XML_ParserCreate (); -+char XML_ParserCreate (void); - int --main () -+main (void) - { - return XML_ParserCreate (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_expat_XML_ParserCreate=yes --else -- ac_cv_lib_expat_XML_ParserCreate=no -+else case e in #( -+ e) ac_cv_lib_expat_XML_ParserCreate=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate" >&5 --$as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; } --if test "x$ac_cv_lib_expat_XML_ParserCreate" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate" >&5 -+printf "%s\n" "$ac_cv_lib_expat_XML_ParserCreate" >&6; } -+if test "x$ac_cv_lib_expat_XML_ParserCreate" = xyes -+then : - EXPAT_LINK=" -lexpat" - fi - -@@ -27181,8 +28739,8 @@ fi - if test "$wxUSE_EXPAT" = "sys" ; then - as_fn_error $? "system expat library not found! Use --with-expat=builtin to use built-in version" "$LINENO" 5 - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: system expat library not found, will use built-in instead" >&5 --$as_echo "$as_me: WARNING: system expat library not found, will use built-in instead" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: system expat library not found, will use built-in instead" >&5 -+printf "%s\n" "$as_me: WARNING: system expat library not found, will use built-in instead" >&2;} - wxUSE_EXPAT=builtin - fi - else -@@ -27190,11 +28748,11 @@ $as_echo "$as_me: WARNING: system expat library not found, will use built-in ins - fi - fi - if test "$wxUSE_EXPAT" = "builtin" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether expat.h file exists" >&5 --$as_echo_n "checking whether expat.h file exists... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether expat.h file exists" >&5 -+printf %s "checking whether expat.h file exists... " >&6; } - if ! test -f "$srcdir/src/expat/expat/lib/expat.h" ; 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; } - as_fn_error $? " - Configured to use built-in expat library, but the required file - $srcdir/src/expat/expat/lib/expat.h couldn't be found. -@@ -27204,187 +28762,11 @@ $as_echo "no" >&6; } - - to fix this." "$LINENO" 5 - else -- { $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; } - fi - - save_CC="$CC" -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 --$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } --if ${ac_cv_prog_cc_c99+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_cv_prog_cc_c99=no --ac_save_CC=$CC --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include --#include --#include --#include --#include -- --// Check varargs macros. These examples are taken from C99 6.10.3.5. --#define debug(...) fprintf (stderr, __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 -- your preprocessor is broken; --#endif --#if BIG_OK --#else -- 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 void --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; -- float fnumber; -- -- 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); --} -- --int --main () --{ -- -- // Check bool. -- _Bool success = false; -- -- // Check restrict. -- if (test_restrict ("String literal") == 0) -- success = true; -- char *restrict newvar = "Another string"; -- -- // Check varargs. -- 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[ni.number - 1] = 543; -- -- // work around unused variable warnings -- return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' -- || dynamic_array[ni.number - 1] != 543); -- -- ; -- return 0; --} --_ACEOF --for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 --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 -- test "x$ac_cv_prog_cc_c99" != "xno" && break --done --rm -f conftest.$ac_ext --CC=$ac_save_CC -- --fi --# AC_CACHE_VAL --case "x$ac_cv_prog_cc_c99" 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_c99" -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 --$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; --esac --if test "x$ac_cv_prog_cc_c99" != xno; then : -- --fi -- - - CC="$save_CC" - -@@ -27396,7 +28778,7 @@ fi - fi - - wxUSE_XML=yes -- $as_echo "#define wxUSE_XML 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_XML 1" >>confdefs.h - - else - wxUSE_XML=no -@@ -27404,13 +28786,13 @@ fi - - - if test "$wxUSE_NANOSVG" = "yes"; then -- $as_echo "#define wxUSE_NANOSVG 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_NANOSVG 1" >>confdefs.h - - fi - - if test "$wxUSE_XML" != "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: XML library not built, cannot build wxrc" >&5 --$as_echo "$as_me: WARNING: XML library not built, cannot build wxrc" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: XML library not built, cannot build wxrc" >&5 -+printf "%s\n" "$as_me: WARNING: XML library not built, cannot build wxrc" >&2;} - USE_XML=0 - else - USE_XML=1 -@@ -27421,49 +28803,57 @@ fi - if test "$wxUSE_LIBMSPACK" != "no"; then - ac_fn_c_check_header_compile "$LINENO" "mspack.h" "ac_cv_header_mspack_h" " - " --if test "x$ac_cv_header_mspack_h" = xyes; then : -+if test "x$ac_cv_header_mspack_h" = xyes -+then : - found_mspack_h=1 - fi - -- - if test "x$found_mspack_h" = "x1"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mspack_create_chm_decompressor in -lmspack" >&5 --$as_echo_n "checking for mspack_create_chm_decompressor in -lmspack... " >&6; } --if ${ac_cv_lib_mspack_mspack_create_chm_decompressor+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mspack_create_chm_decompressor in -lmspack" >&5 -+printf %s "checking for mspack_create_chm_decompressor in -lmspack... " >&6; } -+if test ${ac_cv_lib_mspack_mspack_create_chm_decompressor+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lmspack $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char mspack_create_chm_decompressor (); -+char mspack_create_chm_decompressor (void); - int --main () -+main (void) - { - return mspack_create_chm_decompressor (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_mspack_mspack_create_chm_decompressor=yes --else -- ac_cv_lib_mspack_mspack_create_chm_decompressor=no -+else case e in #( -+ e) ac_cv_lib_mspack_mspack_create_chm_decompressor=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mspack_mspack_create_chm_decompressor" >&5 --$as_echo "$ac_cv_lib_mspack_mspack_create_chm_decompressor" >&6; } --if test "x$ac_cv_lib_mspack_mspack_create_chm_decompressor" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mspack_mspack_create_chm_decompressor" >&5 -+printf "%s\n" "$ac_cv_lib_mspack_mspack_create_chm_decompressor" >&6; } -+if test "x$ac_cv_lib_mspack_mspack_create_chm_decompressor" = xyes -+then : - MSPACK_LINK=" -lmspack" - fi - -@@ -27474,7 +28864,7 @@ fi - fi - - if test "$wxUSE_LIBMSPACK" != "no"; then -- $as_echo "#define wxUSE_LIBMSPACK 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_LIBMSPACK 1" >>confdefs.h - - fi - -@@ -27482,18 +28872,18 @@ fi - if test "$wxUSE_WEBREQUEST" = "yes" -a "$wxUSE_LIBCURL" != "no"; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCURL" >&5 --$as_echo_n "checking for LIBCURL... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBCURL" >&5 -+printf %s "checking for LIBCURL... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$LIBCURL_CFLAGS"; then - pkg_cv_LIBCURL_CFLAGS="$LIBCURL_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libcurl") 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_LIBCURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl" 2>/dev/null` - else -@@ -27508,10 +28898,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_LIBCURL_LIBS="$LIBCURL_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libcurl") 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_LIBCURL_LIBS=`$PKG_CONFIG --libs "libcurl" 2>/dev/null` - else -@@ -27541,22 +28931,22 @@ fi - - - wxUSE_LIBCURL=no -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 --$as_echo "not found" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -+printf "%s\n" "not found" >&6; } - - - elif test $pkg_failed = untried; then - - wxUSE_LIBCURL=no -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 --$as_echo "not found" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -+printf "%s\n" "not found" >&6; } - - - else - LIBCURL_CFLAGS=$pkg_cv_LIBCURL_CFLAGS - LIBCURL_LIBS=$pkg_cv_LIBCURL_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; } - - wxUSE_LIBCURL=yes - CXXFLAGS="$LIBCURL_CFLAGS $CXXFLAGS" -@@ -27573,16 +28963,17 @@ WIDGET_SET= - if test "$USE_WIN32" = 1 ; then - ac_fn_c_check_header_compile "$LINENO" "windows.h" "ac_cv_header_windows_h" " - " --if test "x$ac_cv_header_windows_h" = xyes; then : -- --else -+if test "x$ac_cv_header_windows_h" = xyes -+then : - -+else case e in #( -+ e) - as_fn_error $? "please set CFLAGS to contain the location of windows.h" "$LINENO" 5 -- -+ ;; -+esac - fi - - -- - LIBS="$LIBS -luxtheme -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lcomdlg32 -ladvapi32 -lversion -lws2_32 -lgdi32" - case "${host}" in - x86_64-*-mingw* ) -@@ -27595,14 +28986,15 @@ fi - if test "$wxUSE_WINHTTP" = "yes" ; then - ac_fn_c_check_header_compile "$LINENO" "winhttp.h" "ac_cv_header_winhttp_h" "#include - " --if test "x$ac_cv_header_winhttp_h" = xyes; then : -+if test "x$ac_cv_header_winhttp_h" = xyes -+then : - --else -- wxUSE_WINHTTP=no -+else case e in #( -+ e) wxUSE_WINHTTP=no ;; -+esac - fi - - -- - if test "$wxUSE_WINHTTP" = "yes" ; then - LIBS="$LIBS -lwinhttp" - fi -@@ -27639,17 +29031,18 @@ if test "$wxUSE_GUI" = "yes"; then - fi - - if test "$wxUSE_GTK" = 1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ version" >&5 --$as_echo_n "checking for GTK+ version... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK+ version" >&5 -+printf %s "checking for GTK+ version... " >&6; } - - gtk_version_cached=1 -- if ${wx_cv_lib_gtk+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ if test ${wx_cv_lib_gtk+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - gtk_version_cached=0 -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 --$as_echo "" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 -+printf "%s\n" "" >&6; } - - GTK_MODULES= - if test "$wxUSE_THREADS" = "yes"; then -@@ -27673,10 +29066,12 @@ $as_echo "" >&6; } - if test "$wxGTK_VERSION" = 3 -o "$wxGTK_VERSION" = any; then - - # Check whether --enable-gtktest was given. --if test "${enable_gtktest+set}" = set; then : -+if test ${enable_gtktest+y} -+then : - enableval=$enable_gtktest; --else -- enable_gtktest=yes -+else case e in #( -+ e) enable_gtktest=yes ;; -+esac - fi - - min_gtk_version=3.0.0 -@@ -27699,12 +29094,13 @@ 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 -- case $PKG_CONFIG in -+{ 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 case e in #( -+ e) case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; -@@ -27713,11 +29109,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 -@@ -27725,15 +29125,16 @@ done - IFS=$as_save_IFS - - ;; -+esac ;; - 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 - - -@@ -27742,12 +29143,13 @@ 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 -- case $ac_pt_PKG_CONFIG in -+{ 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 case e in #( -+ e) 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. - ;; -@@ -27756,11 +29158,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 -@@ -27768,15 +29174,16 @@ done - IFS=$as_save_IFS - - ;; -+esac ;; - 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 -@@ -27784,8 +29191,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 -@@ -27797,14 +29204,14 @@ fi - fi - if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.16 -- { $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 - -@@ -27814,8 +29221,8 @@ fi - no_gtk=yes - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5 --$as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5 -+printf %s "checking for GTK+ - version >= $min_gtk_version... " >&6; } - - if test -n "$PKG_CONFIG"; then - ## don't try to run the test against uninstalled libtool libs -@@ -27846,10 +29253,11 @@ $as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; } - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" - rm -f conf.gtktest -- if test "$cross_compiling" = yes; then : -+ if test "$cross_compiling" = yes -+then : - echo $ac_n "cross compiling; assumed OK... $ac_c" --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include -@@ -27921,13 +29329,16 @@ main () - } - - _ACEOF --if ac_fn_c_try_run "$LINENO"; then : -+if ac_fn_c_try_run "$LINENO" -+then : - --else -- no_gtk=yes -+else case e in #( -+ e) no_gtk=yes ;; -+esac - fi - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac - fi - - CFLAGS="$ac_save_CFLAGS" -@@ -27935,12 +29346,12 @@ fi - fi - fi - if test "x$no_gtk" = x ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5 --$as_echo "yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5 -+printf "%s\n" "yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; } - wx_cv_lib_gtk=3 - 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; } - if test -z "$PKG_CONFIG"; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://pkgconfig.sourceforge.net" -@@ -27960,14 +29371,15 @@ $as_echo "no" >&6; } - #include - - int --main () -+main (void) - { - return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK+ or finding the wrong" - echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" -@@ -27977,11 +29389,12 @@ if ac_fn_c_try_link "$LINENO"; then : - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" --else -- echo "*** The test program failed to compile or link. See the file config.log for the" -- echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed." -+else case e in #( -+ e) echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed." ;; -+esac - 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 - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" -@@ -27999,10 +29412,12 @@ rm -f core conftest.err conftest.$ac_objext \ - if test -z "$wx_cv_lib_gtk"; then - if test "$wxGTK_VERSION" = 2 -o "$wxGTK_VERSION" = any; then - # Check whether --enable-gtktest was given. --if test "${enable_gtktest+set}" = set; then : -+if test ${enable_gtktest+y} -+then : - enableval=$enable_gtktest; --else -- enable_gtktest=yes -+else case e in #( -+ e) enable_gtktest=yes ;; -+esac - fi - - -@@ -28025,12 +29440,13 @@ 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 -- case $PKG_CONFIG in -+{ 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 case e in #( -+ e) case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; -@@ -28039,11 +29455,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 -@@ -28051,15 +29471,16 @@ done - IFS=$as_save_IFS - - ;; -+esac ;; - 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 - - -@@ -28068,12 +29489,13 @@ 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 -- case $ac_pt_PKG_CONFIG in -+{ 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 case e in #( -+ e) 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. - ;; -@@ -28082,11 +29504,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 -@@ -28094,15 +29520,16 @@ done - IFS=$as_save_IFS - - ;; -+esac ;; - 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 -@@ -28110,8 +29537,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 -@@ -28123,22 +29550,22 @@ fi - fi - if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.7 -- { $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 - - min_gtk_version=2.6.0 -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5 --$as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5 -+printf %s "checking for GTK+ - version >= $min_gtk_version... " >&6; } - - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs -@@ -28169,10 +29596,11 @@ $as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; } - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" - rm -f conf.gtktest -- if test "$cross_compiling" = yes; then : -+ if test "$cross_compiling" = yes -+then : - echo $ac_n "cross compiling; assumed OK... $ac_c" --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include -@@ -28249,13 +29677,16 @@ main () - } - - _ACEOF --if ac_fn_c_try_run "$LINENO"; then : -+if ac_fn_c_try_run "$LINENO" -+then : - --else -- no_gtk=yes -+else case e in #( -+ e) no_gtk=yes ;; -+esac - fi - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac - fi - - CFLAGS="$ac_save_CFLAGS" -@@ -28263,12 +29694,12 @@ fi - fi - fi - if test "x$no_gtk" = x ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5 --$as_echo "yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5 -+printf "%s\n" "yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; } - wx_cv_lib_gtk=2.0 - 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; } - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://pkgconfig.sourceforge.net" -@@ -28288,14 +29719,15 @@ $as_echo "no" >&6; } - #include - - int --main () -+main (void) - { - return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK+ or finding the wrong" - echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" -@@ -28305,11 +29737,12 @@ if ac_fn_c_try_link "$LINENO"; then : - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" --else -- echo "*** The test program failed to compile or link. See the file config.log for the" -- echo "*** exact error that occured. This usually means GTK+ is incorrectly installed." -+else case e in #( -+ e) echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means GTK+ is incorrectly installed." ;; -+esac - 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 - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" -@@ -28329,10 +29762,12 @@ rm -f core conftest.err conftest.$ac_objext \ - if test "$wxGTK_VERSION" = 4 -o "$wxGTK_VERSION" = any; then - - # Check whether --enable-gtktest was given. --if test "${enable_gtktest+set}" = set; then : -+if test ${enable_gtktest+y} -+then : - enableval=$enable_gtktest; --else -- enable_gtktest=yes -+else case e in #( -+ e) enable_gtktest=yes ;; -+esac - fi - - min_gtk_version=3.90.0 -@@ -28351,12 +29786,13 @@ fi - - # 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_PKG_CONFIG+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- case $PKG_CONFIG in -+{ 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 case e in #( -+ e) case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; -@@ -28365,11 +29801,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 -@@ -28378,15 +29818,16 @@ IFS=$as_save_IFS - - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" - ;; -+esac ;; - 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 - - -@@ -28403,8 +29844,8 @@ fi - no_gtk=yes - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5 --$as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5 -+printf %s "checking for GTK+ - version >= $min_gtk_version... " >&6; } - - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs -@@ -28435,10 +29876,11 @@ $as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; } - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" - rm -f conf.gtktest -- if test "$cross_compiling" = yes; then : -+ if test "$cross_compiling" = yes -+then : - echo $ac_n "cross compiling; assumed OK... $ac_c" --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include -@@ -28510,13 +29952,16 @@ main () - } - - _ACEOF --if ac_fn_c_try_run "$LINENO"; then : -+if ac_fn_c_try_run "$LINENO" -+then : - --else -- no_gtk=yes -+else case e in #( -+ e) no_gtk=yes ;; -+esac - fi - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac - fi - - CFLAGS="$ac_save_CFLAGS" -@@ -28524,12 +29969,12 @@ fi - fi - fi - if test "x$no_gtk" = x ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5 --$as_echo "yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5 -+printf "%s\n" "yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; } - wx_cv_lib_gtk=4 - 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; } - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://pkgconfig.sourceforge.net" -@@ -28549,14 +29994,15 @@ $as_echo "no" >&6; } - #include - - int --main () -+main (void) - { - return ((gtk_get_major_version()) || (gtk_get_minor_version()) || (gtk_get_micro_version())); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK+ or finding the wrong" - echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" -@@ -28566,11 +30012,12 @@ if ac_fn_c_try_link "$LINENO"; then : - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" --else -- echo "*** The test program failed to compile or link. See the file config.log for the" -- echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed." -+else case e in #( -+ e) echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed." ;; -+esac - 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 - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" -@@ -28592,25 +30039,31 @@ rm -f core conftest.err conftest.$ac_objext \ - if test "x$wxGTK_VERSION" = "x1" -o "x$wxGTK_VERSION" = "xany" ; then - - # Check whether --with-gtk-prefix was given. --if test "${with_gtk_prefix+set}" = set; then : -+if test ${with_gtk_prefix+y} -+then : - withval=$with_gtk_prefix; gtk_config_prefix="$withval" --else -- gtk_config_prefix="" -+else case e in #( -+ e) gtk_config_prefix="" ;; -+esac - fi - - - # Check whether --with-gtk-exec-prefix was given. --if test "${with_gtk_exec_prefix+set}" = set; then : -+if test ${with_gtk_exec_prefix+y} -+then : - withval=$with_gtk_exec_prefix; gtk_config_exec_prefix="$withval" --else -- gtk_config_exec_prefix="" -+else case e in #( -+ e) gtk_config_exec_prefix="" ;; -+esac - fi - - # Check whether --enable-gtktest was given. --if test "${enable_gtktest+set}" = set; then : -+if test ${enable_gtktest+y} -+then : - enableval=$enable_gtktest; --else -- enable_gtktest=yes -+else case e in #( -+ e) enable_gtktest=yes ;; -+esac - fi - - -@@ -28638,12 +30091,13 @@ fi - - # Extract the first word of "gtk-config", so it can be a program name with args. - set dummy gtk-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_GTK_CONFIG+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- case $GTK_CONFIG in -+{ 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_GTK_CONFIG+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) case $GTK_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. - ;; -@@ -28652,11 +30106,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_GTK_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_GTK_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 -@@ -28665,21 +30123,22 @@ IFS=$as_save_IFS - - test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" - ;; -+esac ;; - esac - fi - GTK_CONFIG=$ac_cv_path_GTK_CONFIG - if test -n "$GTK_CONFIG"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_CONFIG" >&5 --$as_echo "$GTK_CONFIG" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GTK_CONFIG" >&5 -+printf "%s\n" "$GTK_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 - - - min_gtk_version=1.2.7 -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5 --$as_echo_n "checking for GTK - version >= $min_gtk_version... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5 -+printf %s "checking for GTK - version >= $min_gtk_version... " >&6; } - no_gtk="" - if test "$GTK_CONFIG" = "no" ; then - no_gtk=yes -@@ -28698,10 +30157,11 @@ $as_echo_n "checking for GTK - version >= $min_gtk_version... " >&6; } - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" - rm -f conf.gtktest -- if test "$cross_compiling" = yes; then : -+ if test "$cross_compiling" = yes -+then : - echo $ac_n "cross compiling; assumed OK... $ac_c" --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include -@@ -28781,13 +30241,16 @@ main () - } - - _ACEOF --if ac_fn_c_try_run "$LINENO"; then : -+if ac_fn_c_try_run "$LINENO" -+then : - --else -- no_gtk=yes -+else case e in #( -+ e) no_gtk=yes ;; -+esac - fi - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac - fi - - CFLAGS="$ac_save_CFLAGS" -@@ -28795,12 +30258,12 @@ fi - fi - fi - if test "x$no_gtk" = x ; 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; } - wx_cv_lib_gtk=1.2.7 - 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; } - if test "$GTK_CONFIG" = "no" ; then - echo "*** The gtk-config script installed by GTK could not be found" - echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" -@@ -28820,14 +30283,15 @@ $as_echo "no" >&6; } - #include - - int --main () -+main (void) - { - return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK or finding the wrong" - echo "*** version of GTK. If it is not finding GTK, you'll need to set your" -@@ -28842,13 +30306,14 @@ if ac_fn_c_try_link "$LINENO"; then : - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" --else -- echo "*** The test program failed to compile or link. See the file config.log for the" -+else case e in #( -+ e) echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occurred. This usually means GTK was incorrectly installed" - echo "*** or that you have moved GTK since it was installed. In the latter case, you" -- echo "*** may want to edit the gtk-config script: $GTK_CONFIG" -+ echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ;; -+esac - 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 - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" -@@ -28866,25 +30331,31 @@ rm -f core conftest.err conftest.$ac_objext \ - if test -z "$wx_cv_lib_gtk"; then - - # Check whether --with-gtk-prefix was given. --if test "${with_gtk_prefix+set}" = set; then : -+if test ${with_gtk_prefix+y} -+then : - withval=$with_gtk_prefix; gtk_config_prefix="$withval" --else -- gtk_config_prefix="" -+else case e in #( -+ e) gtk_config_prefix="" ;; -+esac - fi - - - # Check whether --with-gtk-exec-prefix was given. --if test "${with_gtk_exec_prefix+set}" = set; then : -+if test ${with_gtk_exec_prefix+y} -+then : - withval=$with_gtk_exec_prefix; gtk_config_exec_prefix="$withval" --else -- gtk_config_exec_prefix="" -+else case e in #( -+ e) gtk_config_exec_prefix="" ;; -+esac - fi - - # Check whether --enable-gtktest was given. --if test "${enable_gtktest+set}" = set; then : -+if test ${enable_gtktest+y} -+then : - enableval=$enable_gtktest; --else -- enable_gtktest=yes -+else case e in #( -+ e) enable_gtktest=yes ;; -+esac - fi - - -@@ -28912,12 +30383,13 @@ fi - - # Extract the first word of "gtk-config", so it can be a program name with args. - set dummy gtk-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_GTK_CONFIG+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- case $GTK_CONFIG in -+{ 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_GTK_CONFIG+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) case $GTK_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. - ;; -@@ -28926,11 +30398,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_GTK_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_GTK_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 -@@ -28939,21 +30415,22 @@ IFS=$as_save_IFS - - test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" - ;; -+esac ;; - esac - fi - GTK_CONFIG=$ac_cv_path_GTK_CONFIG - if test -n "$GTK_CONFIG"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_CONFIG" >&5 --$as_echo "$GTK_CONFIG" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GTK_CONFIG" >&5 -+printf "%s\n" "$GTK_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 - - - min_gtk_version=1.2.3 -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5 --$as_echo_n "checking for GTK - version >= $min_gtk_version... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5 -+printf %s "checking for GTK - version >= $min_gtk_version... " >&6; } - no_gtk="" - if test "$GTK_CONFIG" = "no" ; then - no_gtk=yes -@@ -28972,10 +30449,11 @@ $as_echo_n "checking for GTK - version >= $min_gtk_version... " >&6; } - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" - rm -f conf.gtktest -- if test "$cross_compiling" = yes; then : -+ if test "$cross_compiling" = yes -+then : - echo $ac_n "cross compiling; assumed OK... $ac_c" --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include -@@ -29055,13 +30533,16 @@ main () - } - - _ACEOF --if ac_fn_c_try_run "$LINENO"; then : -+if ac_fn_c_try_run "$LINENO" -+then : - --else -- no_gtk=yes -+else case e in #( -+ e) no_gtk=yes ;; -+esac - fi - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac - fi - - CFLAGS="$ac_save_CFLAGS" -@@ -29069,12 +30550,12 @@ fi - fi - fi - if test "x$no_gtk" = x ; 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; } - wx_cv_lib_gtk=1.2.3 - 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; } - if test "$GTK_CONFIG" = "no" ; then - echo "*** The gtk-config script installed by GTK could not be found" - echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" -@@ -29094,14 +30575,15 @@ $as_echo "no" >&6; } - #include - - int --main () -+main (void) - { - return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK or finding the wrong" - echo "*** version of GTK. If it is not finding GTK, you'll need to set your" -@@ -29116,13 +30598,14 @@ if ac_fn_c_try_link "$LINENO"; then : - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" --else -- echo "*** The test program failed to compile or link. See the file config.log for the" -+else case e in #( -+ e) echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occurred. This usually means GTK was incorrectly installed" - echo "*** or that you have moved GTK since it was installed. In the latter case, you" -- echo "*** may want to edit the gtk-config script: $GTK_CONFIG" -+ echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ;; -+esac - 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 - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" -@@ -29151,13 +30634,14 @@ rm -f core conftest.err conftest.$ac_objext \ - wx_cv_libs_gtk=$GTK_LIBS - fi - -- -+ ;; -+esac - fi - - - if test "$gtk_version_cached" = 1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_gtk" >&5 --$as_echo "$wx_cv_lib_gtk" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_gtk" >&5 -+printf "%s\n" "$wx_cv_lib_gtk" >&6; } - fi - - case "$wx_cv_lib_gtk" in -@@ -29187,11 +30671,11 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config - esac - - if test "$WXGTK3" = 1; then -- $as_echo "#define __WXGTK220__ 1" >>confdefs.h -+ printf "%s\n" "#define __WXGTK220__ 1" >>confdefs.h - -- $as_echo "#define __WXGTK218__ 1" >>confdefs.h -+ printf "%s\n" "#define __WXGTK218__ 1" >>confdefs.h - -- $as_echo "#define __WXGTK210__ 1" >>confdefs.h -+ printf "%s\n" "#define __WXGTK210__ 1" >>confdefs.h - - elif test "$WXGTK2" = 1; then - save_CFLAGS="$CFLAGS" -@@ -29200,19 +30684,20 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config - LIBS="$LIBS $wx_cv_libs_gtk" - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if GTK+ is version >= 2.20" >&5 --$as_echo_n "checking if GTK+ is version >= 2.20... " >&6; } --if ${wx_cv_gtk220+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if GTK+ is version >= 2.20" >&5 -+printf %s "checking if GTK+ is version >= 2.20... " >&6; } -+if test ${wx_cv_gtk220+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include - - int --main () -+main (void) - { - - #if !GTK_CHECK_VERSION(2,20,0) -@@ -29223,36 +30708,40 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - wx_cv_gtk220=yes --else -- wx_cv_gtk220=no -- -+else case e in #( -+ e) wx_cv_gtk220=no -+ ;; -+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 -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_gtk220" >&5 --$as_echo "$wx_cv_gtk220" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_gtk220" >&5 -+printf "%s\n" "$wx_cv_gtk220" >&6; } - - if test "$wx_cv_gtk220" = "yes"; then -- $as_echo "#define __WXGTK220__ 1" >>confdefs.h -+ printf "%s\n" "#define __WXGTK220__ 1" >>confdefs.h - - wx_cv_gtk218=yes - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if GTK+ is version >= 2.18" >&5 --$as_echo_n "checking if GTK+ is version >= 2.18... " >&6; } --if ${wx_cv_gtk218+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if GTK+ is version >= 2.18" >&5 -+printf %s "checking if GTK+ is version >= 2.18... " >&6; } -+if test ${wx_cv_gtk218+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include - - int --main () -+main (void) - { - - #if !GTK_CHECK_VERSION(2,18,0) -@@ -29263,37 +30752,41 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - wx_cv_gtk218=yes --else -- wx_cv_gtk218=no -- -+else case e in #( -+ e) wx_cv_gtk218=no -+ ;; -+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 -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_gtk218" >&5 --$as_echo "$wx_cv_gtk218" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_gtk218" >&5 -+printf "%s\n" "$wx_cv_gtk218" >&6; } - fi - - if test "$wx_cv_gtk218" = "yes"; then -- $as_echo "#define __WXGTK218__ 1" >>confdefs.h -+ printf "%s\n" "#define __WXGTK218__ 1" >>confdefs.h - - wx_cv_gtk210=yes - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if GTK+ is version >= 2.10" >&5 --$as_echo_n "checking if GTK+ is version >= 2.10... " >&6; } --if ${wx_cv_gtk210+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if GTK+ is version >= 2.10" >&5 -+printf %s "checking if GTK+ is version >= 2.10... " >&6; } -+if test ${wx_cv_gtk210+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include - - int --main () -+main (void) - { - - #if !GTK_CHECK_VERSION(2,10,0) -@@ -29304,21 +30797,24 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - wx_cv_gtk210=yes --else -- wx_cv_gtk210=no -- -+else case e in #( -+ e) wx_cv_gtk210=no -+ ;; -+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 -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_gtk210" >&5 --$as_echo "$wx_cv_gtk210" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_gtk210" >&5 -+printf "%s\n" "$wx_cv_gtk210" >&6; } - fi - - if test "$wx_cv_gtk210" = "yes"; then -- $as_echo "#define __WXGTK210__ 1" >>confdefs.h -+ printf "%s\n" "#define __WXGTK210__ 1" >>confdefs.h - - fi - -@@ -29326,64 +30822,68 @@ $as_echo "$wx_cv_gtk210" >&6; } - LIBS="$save_LIBS" - else - if test "$wxUSE_UNICODE" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unicode configuration not supported with GTK+ 1.x" >&5 --$as_echo "$as_me: WARNING: Unicode configuration not supported with GTK+ 1.x" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Unicode configuration not supported with GTK+ 1.x" >&5 -+printf "%s\n" "$as_me: WARNING: Unicode configuration not supported with GTK+ 1.x" >&2;} - wxUSE_UNICODE=no - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk_im_open in -lgdk" >&5 --$as_echo_n "checking for gdk_im_open in -lgdk... " >&6; } --if ${ac_cv_lib_gdk_gdk_im_open+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdk_im_open in -lgdk" >&5 -+printf %s "checking for gdk_im_open in -lgdk... " >&6; } -+if test ${ac_cv_lib_gdk_gdk_im_open+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lgdk $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char gdk_im_open (); -+char gdk_im_open (void); - int --main () -+main (void) - { - return gdk_im_open (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_gdk_gdk_im_open=yes --else -- ac_cv_lib_gdk_gdk_im_open=no -+else case e in #( -+ e) ac_cv_lib_gdk_gdk_im_open=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdk_gdk_im_open" >&5 --$as_echo "$ac_cv_lib_gdk_gdk_im_open" >&6; } --if test "x$ac_cv_lib_gdk_gdk_im_open" = xyes; then : -- $as_echo "#define HAVE_XIM 1" >>confdefs.h -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdk_gdk_im_open" >&5 -+printf "%s\n" "$ac_cv_lib_gdk_gdk_im_open" >&6; } -+if test "x$ac_cv_lib_gdk_gdk_im_open" = xyes -+then : -+ printf "%s\n" "#define HAVE_XIM 1" >>confdefs.h - - fi - - - if test "$USE_DARWIN" != 1; then -- for ac_func in poll --do : -- ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll" --if test "x$ac_cv_func_poll" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_POLL 1 --_ACEOF -+ ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll" -+if test "x$ac_cv_func_poll" = xyes -+then : -+ printf "%s\n" "#define HAVE_POLL 1" >>confdefs.h - - fi --done - - fi - fi -@@ -29393,12 +30893,13 @@ done - TOOLKIT=GTK - GUIDIST=GTK_DIST - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDK Wayland backend" >&5 --$as_echo_n "checking for GDK Wayland backend... " >&6; } --if ${wx_cv_gdk_wayland+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GDK Wayland backend" >&5 -+printf %s "checking for GDK Wayland backend... " >&6; } -+if test ${wx_cv_gdk_wayland+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $TOOLKIT_INCLUDE" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -29407,7 +30908,7 @@ else - #include - - int --main () -+main (void) - { - - #ifndef GDK_WINDOWING_WAYLAND -@@ -29418,22 +30919,25 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - wx_cv_gdk_wayland=yes --else -- wx_cv_gdk_wayland=no -- -+else case e in #( -+ e) wx_cv_gdk_wayland=no -+ ;; -+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 - CFLAGS=$save_CFLAGS -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_gdk_wayland" >&5 --$as_echo "$wx_cv_gdk_wayland" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_gdk_wayland" >&5 -+printf "%s\n" "$wx_cv_gdk_wayland" >&6; } - - if test "$wxUSE_GPE" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gpewidget library" >&5 --$as_echo_n "checking for gpewidget library... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gpewidget library" >&5 -+printf %s "checking for gpewidget library... " >&6; } - - ac_find_libraries= - for ac_dir in $SEARCH_LIB -@@ -29462,11 +30966,11 @@ $as_echo_n "checking for gpewidget library... " >&6; } - - GUI_TK_LIBRARY="-L${prefix}/lib -lgpewidget $GUI_TK_LIBRARY" - WXGPE=1 -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $ac_find_libraries" >&5 --$as_echo "found in $ac_find_libraries" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found in $ac_find_libraries" >&5 -+printf "%s\n" "found in $ac_find_libraries" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 --$as_echo "not found" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -+printf "%s\n" "not found" >&6; } - fi - - fi -@@ -29475,18 +30979,18 @@ $as_echo "not found" >&6; } - if test "$wxUSE_DFB" = 1; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DIRECTFB" >&5 --$as_echo_n "checking for DIRECTFB... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DIRECTFB" >&5 -+printf %s "checking for DIRECTFB... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$DIRECTFB_CFLAGS"; then - pkg_cv_DIRECTFB_CFLAGS="$DIRECTFB_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= 0.9.23\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= 0.9.23\""; } >&5 - ($PKG_CONFIG --exists --print-errors "directfb >= 0.9.23") 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_DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags "directfb >= 0.9.23" 2>/dev/null` - else -@@ -29501,10 +31005,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_DIRECTFB_LIBS="$DIRECTFB_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= 0.9.23\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= 0.9.23\""; } >&5 - ($PKG_CONFIG --exists --print-errors "directfb >= 0.9.23") 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_DIRECTFB_LIBS=`$PKG_CONFIG --libs "directfb >= 0.9.23" 2>/dev/null` - else -@@ -29544,8 +31048,8 @@ elif test $pkg_failed = untried; then - else - DIRECTFB_CFLAGS=$pkg_cv_DIRECTFB_CFLAGS - DIRECTFB_LIBS=$pkg_cv_DIRECTFB_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; } - - wxUSE_UNIVERSAL="yes" - TOOLKIT_INCLUDE="$DIRECTFB_CFLAGS" -@@ -29557,28 +31061,197 @@ fi - fi - - if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 --$as_echo_n "checking for X... " >&6; } -+ 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 -+{ 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; } -+# On Suns, sometimes $CPP names a directory. -+if test -n "$CPP" && test -d "$CPP"; then -+ CPP= -+fi -+if test -z "$CPP"; then -+ if test ${ac_cv_prog_CPP+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) # Double quotes because $CC needs to be expanded -+ for CPP in "$CC -E" "$CC -E -traditional-cpp" 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. -+ # 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. */ -+#include -+ Syntax error -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO" -+then : -+ -+else case e in #( -+ e) # Broken: fails on valid input. -+continue ;; -+esac -+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 case e in #( -+ e) # Passes both tests. -+ac_preproc_ok=: -+break ;; -+esac -+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 -+ ;; -+esac -+fi -+ CPP=$ac_cv_prog_CPP -+else -+ ac_cv_prog_CPP=$CPP -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -+printf "%s\n" "$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. -+ # 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. */ -+#include -+ Syntax error -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO" -+then : -+ -+else case e in #( -+ e) # Broken: fails on valid input. -+continue ;; -+esac -+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 case e in #( -+ e) # Passes both tests. -+ac_preproc_ok=: -+break ;; -+esac -+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 case e in #( -+ e) { { 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 \"$CPP\" fails sanity check -+See 'config.log' for more details" "$LINENO" 5; } ;; -+esac -+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 -+ -+ -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X" >&5 -+printf %s "checking for X... " >&6; } - - - # Check whether --with-x was given. --if test "${with_x+set}" = set; then : -+if test ${with_x+y} -+then : - withval=$with_x; - fi - --# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -+# $have_x is 'yes', 'no', 'disabled', or empty when we do not yet know. - if test "x$with_x" = xno; then - # The user explicitly disabled X. - have_x=disabled - else - case $x_includes,$x_libraries in #( - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( -- *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- # One or both of the vars are not set, and there is no cached value. --ac_x_includes=no ac_x_libraries=no --rm -f -r conftest.dir -+ *,NONE | NONE,*) if test ${ac_cv_have_x+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) # One or both of the vars are not set, and there is no cached value. -+ac_x_includes=no -+ac_x_libraries=no -+# Do we need to do anything special at all? -+ac_save_LIBS=$LIBS -+LIBS="-lX11 $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+XrmInitialize () -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ # We can compile and link X programs with no special options. -+ ac_x_includes= -+ ac_x_libraries= -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS="$ac_save_LIBS" -+# If that didn't work, only try xmkmf and file system searches -+# for native compilation. -+if test x"$ac_x_includes" = xno && test "$cross_compiling" = no -+then : -+ rm -f -r conftest.dir - if mkdir conftest.dir; then - cd conftest.dir - cat >Imakefile <<'_ACEOF' -@@ -29617,7 +31290,7 @@ _ACEOF - rm -f -r conftest.dir - fi - --# Standard set of common directories for X headers. -+ # Standard set of common directories for X headers. - # Check X11 before X11Rn because it is often a symlink to the current release. - ac_x_header_dirs=' - /usr/X11/include -@@ -29644,6 +31317,8 @@ ac_x_header_dirs=' - /usr/local/include/X11R5 - /usr/local/include/X11R4 - -+/opt/X11/include -+ - /usr/X386/include - /usr/x386/include - /usr/XFree86/include/X11 -@@ -29665,16 +31340,18 @@ if test "$ac_x_includes" = no; then - /* end confdefs.h. */ - #include - _ACEOF --if ac_fn_c_try_cpp "$LINENO"; then : -+if ac_fn_c_try_cpp "$LINENO" -+then : - # We can compile using X headers with no special include directory. - ac_x_includes= --else -- for ac_dir in $ac_x_header_dirs; do -+else case e in #( -+ e) for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Xlib.h"; then - ac_x_includes=$ac_dir - break - fi --done -+done ;; -+esac - fi - rm -f conftest.err conftest.i conftest.$ac_ext - fi # $ac_x_includes = no -@@ -29689,20 +31366,21 @@ if test "$ac_x_libraries" = no; then - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - XrmInitialize () - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - LIBS=$ac_save_LIBS - # We can link X programs with no special library path. - ac_x_libraries= --else -- LIBS=$ac_save_LIBS --for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -+else case e in #( -+ e) LIBS=$ac_save_LIBS -+for ac_dir in `printf "%s\n" "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` - do - # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl dylib la dll; do -@@ -29711,21 +31389,25 @@ do - break 2 - fi - done --done -+done ;; -+esac - 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 # $ac_x_libraries = no - -+fi -+# Record the results. - case $ac_x_includes,$ac_x_libraries in #( -- no,* | *,no | *\'*) -+ no,* | *,no | *\'*) : - # Didn't find X, or a directory has "'" in its name. -- ac_cv_have_x="have_x=no";; #( -- *) -+ ac_cv_have_x="have_x=no" ;; #( -+ *) : - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes\ - ac_x_includes='$ac_x_includes'\ -- ac_x_libraries='$ac_x_libraries'" -+ ac_x_libraries='$ac_x_libraries'" ;; -+esac ;; - esac - fi - ;; #( -@@ -29735,8 +31417,8 @@ fi - fi # $with_x != no - - if test "$have_x" != yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 --$as_echo "$have_x" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 -+printf "%s\n" "$have_x" >&6; } - no_x=yes - else - # If each of the values was on the command line, it overrides each guess. -@@ -29746,14 +31428,14 @@ else - ac_cv_have_x="have_x=yes\ - ac_x_includes='$x_includes'\ - ac_x_libraries='$x_libraries'" -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 --$as_echo "libraries $x_libraries, headers $x_includes" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 -+printf "%s\n" "libraries $x_libraries, headers $x_includes" >&6; } - fi - - if test "$no_x" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. - --$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h -+printf "%s\n" "#define X_DISPLAY_MISSING 1" >>confdefs.h - - X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= - else -@@ -29766,8 +31448,8 @@ else - X_LIBS="$X_LIBS -L$x_libraries" - # For Solaris; some versions of Sun CC require a space after -R and - # others require no space. Words are not sufficient . . . . -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 --$as_echo_n "checking whether -R must be followed by a space... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 -+printf %s "checking whether -R must be followed by a space... " >&6; } - ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" - ac_xsave_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes -@@ -29775,42 +31457,46 @@ $as_echo_n "checking whether -R must be followed by a space... " >&6; } - /* end confdefs.h. */ - - int --main () -+main (void) - { - - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -+if ac_fn_c_try_link "$LINENO" -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } - X_LIBS="$X_LIBS -R$x_libraries" --else -- LIBS="$ac_xsave_LIBS -R $x_libraries" -+else case e in #( -+ e) LIBS="$ac_xsave_LIBS -R $x_libraries" - 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 : -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -+if ac_fn_c_try_link "$LINENO" -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } - X_LIBS="$X_LIBS -R $x_libraries" --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 --$as_echo "neither works" >&6; } -+else case e in #( -+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 -+printf "%s\n" "neither works" >&6; } ;; -+esac - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext ;; -+esac - 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_c_werror_flag=$ac_xsave_c_werror_flag - LIBS=$ac_xsave_LIBS -@@ -29832,106 +31518,127 @@ rm -f core conftest.err conftest.$ac_objext \ - - /* 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. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char XOpenDisplay (); -+char XOpenDisplay (void); - int --main () -+main (void) - { - return XOpenDisplay (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 --$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } --if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+if ac_fn_c_try_link "$LINENO" -+then : -+ -+else case e in #( -+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 -+printf %s "checking for dnet_ntoa in -ldnet... " >&6; } -+if test ${ac_cv_lib_dnet_dnet_ntoa+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-ldnet $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char dnet_ntoa (); -+char dnet_ntoa (void); - int --main () -+main (void) - { - return dnet_ntoa (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_dnet_dnet_ntoa=yes --else -- ac_cv_lib_dnet_dnet_ntoa=no -+else case e in #( -+ e) ac_cv_lib_dnet_dnet_ntoa=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 --$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } --if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -+printf "%s\n" "$ac_cv_lib_dnet_dnet_ntoa" >&6; } -+if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes -+then : - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" - fi - - if test $ac_cv_lib_dnet_dnet_ntoa = no; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 --$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } --if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 -+printf %s "checking for dnet_ntoa in -ldnet_stub... " >&6; } -+if test ${ac_cv_lib_dnet_stub_dnet_ntoa+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-ldnet_stub $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char dnet_ntoa (); -+char dnet_ntoa (void); - int --main () -+main (void) - { - return dnet_ntoa (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_dnet_stub_dnet_ntoa=yes --else -- ac_cv_lib_dnet_stub_dnet_ntoa=no -+else case e in #( -+ e) ac_cv_lib_dnet_stub_dnet_ntoa=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 --$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } --if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -+printf "%s\n" "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } -+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes -+then : - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" - fi - -- fi -+ fi ;; -+esac - 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_xsave_LIBS" - -@@ -29944,89 +31651,106 @@ rm -f core conftest.err conftest.$ac_objext \ - # The functions gethostbyname, getservbyname, and inet_addr are - # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" --if test "x$ac_cv_func_gethostbyname" = xyes; then : -+if test "x$ac_cv_func_gethostbyname" = xyes -+then : - - fi - - if test $ac_cv_func_gethostbyname = no; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 --$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } --if ${ac_cv_lib_nsl_gethostbyname+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 -+printf %s "checking for gethostbyname in -lnsl... " >&6; } -+if test ${ac_cv_lib_nsl_gethostbyname+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lnsl $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char gethostbyname (); -+char gethostbyname (void); - int --main () -+main (void) - { - return gethostbyname (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_nsl_gethostbyname=yes --else -- ac_cv_lib_nsl_gethostbyname=no -+else case e in #( -+ e) ac_cv_lib_nsl_gethostbyname=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 --$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } --if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 -+printf "%s\n" "$ac_cv_lib_nsl_gethostbyname" >&6; } -+if test "x$ac_cv_lib_nsl_gethostbyname" = xyes -+then : - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" - fi - - if test $ac_cv_lib_nsl_gethostbyname = no; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 --$as_echo_n "checking for gethostbyname in -lbsd... " >&6; } --if ${ac_cv_lib_bsd_gethostbyname+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 -+printf %s "checking for gethostbyname in -lbsd... " >&6; } -+if test ${ac_cv_lib_bsd_gethostbyname+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lbsd $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char gethostbyname (); -+char gethostbyname (void); - int --main () -+main (void) - { - return gethostbyname (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_bsd_gethostbyname=yes --else -- ac_cv_lib_bsd_gethostbyname=no -+else case e in #( -+ e) ac_cv_lib_bsd_gethostbyname=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 --$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } --if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 -+printf "%s\n" "$ac_cv_lib_bsd_gethostbyname" >&6; } -+if test "x$ac_cv_lib_bsd_gethostbyname" = xyes -+then : - X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" - fi - -@@ -30041,48 +31765,57 @@ fi - # must be given before -lnsl if both are needed. We assume that - # if connect needs -lnsl, so does gethostbyname. - ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" --if test "x$ac_cv_func_connect" = xyes; then : -+if test "x$ac_cv_func_connect" = xyes -+then : - - fi - - if test $ac_cv_func_connect = no; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 --$as_echo_n "checking for connect in -lsocket... " >&6; } --if ${ac_cv_lib_socket_connect+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 -+printf %s "checking for connect in -lsocket... " >&6; } -+if test ${ac_cv_lib_socket_connect+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lsocket $X_EXTRA_LIBS $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char connect (); -+char connect (void); - int --main () -+main (void) - { - return connect (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_socket_connect=yes --else -- ac_cv_lib_socket_connect=no -+else case e in #( -+ e) ac_cv_lib_socket_connect=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 --$as_echo "$ac_cv_lib_socket_connect" >&6; } --if test "x$ac_cv_lib_socket_connect" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 -+printf "%s\n" "$ac_cv_lib_socket_connect" >&6; } -+if test "x$ac_cv_lib_socket_connect" = xyes -+then : - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" - fi - -@@ -30090,48 +31823,57 @@ fi - - # Guillermo Gomez says -lposix is necessary on A/UX. - ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" --if test "x$ac_cv_func_remove" = xyes; then : -+if test "x$ac_cv_func_remove" = xyes -+then : - - fi - - if test $ac_cv_func_remove = no; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 --$as_echo_n "checking for remove in -lposix... " >&6; } --if ${ac_cv_lib_posix_remove+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 -+printf %s "checking for remove in -lposix... " >&6; } -+if test ${ac_cv_lib_posix_remove+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lposix $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char remove (); -+char remove (void); - int --main () -+main (void) - { - return remove (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_posix_remove=yes --else -- ac_cv_lib_posix_remove=no -+else case e in #( -+ e) ac_cv_lib_posix_remove=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 --$as_echo "$ac_cv_lib_posix_remove" >&6; } --if test "x$ac_cv_lib_posix_remove" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 -+printf "%s\n" "$ac_cv_lib_posix_remove" >&6; } -+if test "x$ac_cv_lib_posix_remove" = xyes -+then : - X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" - fi - -@@ -30139,48 +31881,57 @@ fi - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" --if test "x$ac_cv_func_shmat" = xyes; then : -+if test "x$ac_cv_func_shmat" = xyes -+then : - - fi - - if test $ac_cv_func_shmat = no; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 --$as_echo_n "checking for shmat in -lipc... " >&6; } --if ${ac_cv_lib_ipc_shmat+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 -+printf %s "checking for shmat in -lipc... " >&6; } -+if test ${ac_cv_lib_ipc_shmat+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lipc $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char shmat (); -+char shmat (void); - int --main () -+main (void) - { - return shmat (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_ipc_shmat=yes --else -- ac_cv_lib_ipc_shmat=no -+else case e in #( -+ e) ac_cv_lib_ipc_shmat=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 --$as_echo "$ac_cv_lib_ipc_shmat" >&6; } --if test "x$ac_cv_lib_ipc_shmat" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 -+printf "%s\n" "$ac_cv_lib_ipc_shmat" >&6; } -+if test "x$ac_cv_lib_ipc_shmat" = xyes -+then : - X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" - fi - -@@ -30196,43 +31947,51 @@ fi - # These have to be linked with before -lX11, unlike the other - # libraries we check for below, so use a different variable. - # John Interrante, Karl Berry -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 --$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } --if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 -+printf %s "checking for IceConnectionNumber in -lICE... " >&6; } -+if test ${ac_cv_lib_ICE_IceConnectionNumber+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lICE $X_EXTRA_LIBS $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char IceConnectionNumber (); -+char IceConnectionNumber (void); - int --main () -+main (void) - { - return IceConnectionNumber (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_ICE_IceConnectionNumber=yes --else -- ac_cv_lib_ICE_IceConnectionNumber=no -+else case e in #( -+ e) ac_cv_lib_ICE_IceConnectionNumber=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 --$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } --if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -+printf "%s\n" "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes -+then : - X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" - fi - -@@ -30253,16 +32012,16 @@ fi - - if test "$wxUSE_X11" = 1; then - if test "$wxUSE_NANOX" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MicroWindows/NanoX distribution" >&5 --$as_echo_n "checking for MicroWindows/NanoX distribution... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MicroWindows/NanoX distribution" >&5 -+printf %s "checking for MicroWindows/NanoX distribution... " >&6; } - if test "x$MICROWIN" = x ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 --$as_echo "not found" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -+printf "%s\n" "not found" >&6; } - as_fn_error $? "Cannot find MicroWindows library. Make sure MICROWIN is set." "$LINENO" 5 - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MICROWIN" >&5 --$as_echo "$MICROWIN" >&6; } -- $as_echo "#define wxUSE_NANOX 1" >>confdefs.h -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MICROWIN" >&5 -+printf "%s\n" "$MICROWIN" >&6; } -+ printf "%s\n" "#define wxUSE_NANOX 1" >>confdefs.h - - fi - fi -@@ -30270,18 +32029,18 @@ $as_echo "$MICROWIN" >&6; } - if test "$wxUSE_UNICODE" = "yes"; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGOXFT" >&5 --$as_echo_n "checking for PANGOXFT... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PANGOXFT" >&5 -+printf %s "checking for PANGOXFT... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$PANGOXFT_CFLAGS"; then - pkg_cv_PANGOXFT_CFLAGS="$PANGOXFT_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangoxft\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangoxft\""; } >&5 - ($PKG_CONFIG --exists --print-errors "pangoxft") 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_PANGOXFT_CFLAGS=`$PKG_CONFIG --cflags "pangoxft" 2>/dev/null` - else -@@ -30296,10 +32055,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_PANGOXFT_LIBS="$PANGOXFT_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangoxft\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangoxft\""; } >&5 - ($PKG_CONFIG --exists --print-errors "pangoxft") 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_PANGOXFT_LIBS=`$PKG_CONFIG --libs "pangoxft" 2>/dev/null` - else -@@ -30339,10 +32098,10 @@ elif test $pkg_failed = untried; then - else - PANGOXFT_CFLAGS=$pkg_cv_PANGOXFT_CFLAGS - PANGOXFT_LIBS=$pkg_cv_PANGOXFT_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_PANGO_XFT 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_PANGO_XFT 1" >>confdefs.h - - CFLAGS="$PANGOXFT_CFLAGS $CFLAGS" - CXXFLAGS="$PANGOXFT_CFLAGS $CXXFLAGS" -@@ -30351,18 +32110,18 @@ $as_echo "yes" >&6; } - fi - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGOFT2" >&5 --$as_echo_n "checking for PANGOFT2... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PANGOFT2" >&5 -+printf %s "checking for PANGOFT2... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$PANGOFT2_CFLAGS"; then - pkg_cv_PANGOFT2_CFLAGS="$PANGOFT2_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangoft2\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangoft2\""; } >&5 - ($PKG_CONFIG --exists --print-errors "pangoft2") 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_PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2" 2>/dev/null` - else -@@ -30377,10 +32136,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_PANGOFT2_LIBS="$PANGOFT2_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangoft2\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangoft2\""; } >&5 - ($PKG_CONFIG --exists --print-errors "pangoft2") 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_PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2" 2>/dev/null` - else -@@ -30409,23 +32168,23 @@ fi - echo "$PANGOFT2_PKG_ERRORS" >&5 - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pangoft2 library not found, library will be compiled without printing support" >&5 --$as_echo "$as_me: WARNING: pangoft2 library not found, library will be compiled without printing support" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: pangoft2 library not found, library will be compiled without printing support" >&5 -+printf "%s\n" "$as_me: WARNING: pangoft2 library not found, library will be compiled without printing support" >&2;} - wxUSE_PRINTING_ARCHITECTURE="no" - - - elif test $pkg_failed = untried; then - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pangoft2 library not found, library will be compiled without printing support" >&5 --$as_echo "$as_me: WARNING: pangoft2 library not found, library will be compiled without printing support" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: pangoft2 library not found, library will be compiled without printing support" >&5 -+printf "%s\n" "$as_me: WARNING: pangoft2 library not found, library will be compiled without printing support" >&2;} - wxUSE_PRINTING_ARCHITECTURE="no" - - - else - PANGOFT2_CFLAGS=$pkg_cv_PANGOFT2_CFLAGS - PANGOFT2_LIBS=$pkg_cv_PANGOFT2_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; } - - CFLAGS="$PANGOFT2_CFLAGS $CFLAGS" - CXXFLAGS="$PANGOFT2_CFLAGS $CXXFLAGS" -@@ -30433,16 +32192,12 @@ $as_echo "yes" >&6; } - - fi - -- for ac_func in pango_font_family_is_monospace --do : -- ac_fn_c_check_func "$LINENO" "pango_font_family_is_monospace" "ac_cv_func_pango_font_family_is_monospace" --if test "x$ac_cv_func_pango_font_family_is_monospace" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE 1 --_ACEOF -+ ac_fn_c_check_func "$LINENO" "pango_font_family_is_monospace" "ac_cv_func_pango_font_family_is_monospace" -+if test "x$ac_cv_func_pango_font_family_is_monospace" = xyes -+then : -+ printf "%s\n" "#define HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE 1" >>confdefs.h - - fi --done - - fi - -@@ -30461,8 +32216,8 @@ done - fi - - if test "$wxUSE_MOTIF" = 1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Motif/Lesstif headers" >&5 --$as_echo_n "checking for Motif/Lesstif headers... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Motif/Lesstif headers" >&5 -+printf %s "checking for Motif/Lesstif headers... " >&6; } - - ac_find_includes= - for ac_dir in $SEARCH_INCLUDE /usr/include -@@ -30474,8 +32229,8 @@ for ac_dir in $SEARCH_INCLUDE /usr/include - done - - if test "$ac_find_includes" != "" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $ac_find_includes" >&5 --$as_echo "found in $ac_find_includes" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found in $ac_find_includes" >&5 -+printf "%s\n" "found in $ac_find_includes" >&6; } - - if test "x$ac_find_includes" = "x/usr/include"; then - ac_path_to_include="" -@@ -30500,7 +32255,7 @@ $as_echo "found in $ac_find_includes" >&6; } - #include - - int --main () -+main (void) - { - - int version; -@@ -30510,28 +32265,30 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in default search path" >&5 --$as_echo "found in default search path" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found in default search path" >&5 -+printf "%s\n" "found in default search path" >&6; } - COMPILED_X_PROGRAM=1 - --else -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } - as_fn_error $? "please set CPPFLAGS to contain the location of Xm/Xm.h" "$LINENO" 5 - -- -+ ;; -+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 - - CFLAGS=$save_CFLAGS - fi - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Motif/Lesstif library" >&5 --$as_echo_n "checking for Motif/Lesstif library... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Motif/Lesstif library" >&5 -+printf %s "checking for Motif/Lesstif library... " >&6; } - - ac_find_libraries= - for ac_dir in $SEARCH_LIB -@@ -30546,8 +32303,8 @@ $as_echo_n "checking for Motif/Lesstif library... " >&6; } - - - if test "x$ac_find_libraries" != "x" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $ac_find_libraries" >&5 --$as_echo "found in $ac_find_libraries" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found in $ac_find_libraries" >&5 -+printf "%s\n" "found in $ac_find_libraries" >&6; } - - - if test "$ac_find_libraries" = "default location"; then -@@ -30575,7 +32332,7 @@ $as_echo "found in $ac_find_libraries" >&6; } - #include - - int --main () -+main (void) - { - - int version; -@@ -30585,29 +32342,31 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in default search path" >&5 --$as_echo "found in default search path" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found in default search path" >&5 -+printf "%s\n" "found in default search path" >&6; } - COMPILED_X_PROGRAM=1 - --else -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } - as_fn_error $? "please set LDFLAGS to contain the location of libXm" "$LINENO" 5 - -- -+ ;; -+esac - 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 - - CFLAGS=$save_CFLAGS - LIBS="$save_LIBS" - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need -lXp and/or -lSM -lICE" >&5 --$as_echo_n "checking if we need -lXp and/or -lSM -lICE... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we need -lXp and/or -lSM -lICE" >&5 -+printf %s "checking if we need -lXp and/or -lSM -lICE... " >&6; } - libp_link="" - libsm_ice_link="" - libs_found=0 -@@ -30627,7 +32386,7 @@ $as_echo_n "checking if we need -lXp and/or -lSM -lICE... " >&6; } - #include - - int --main () -+main (void) - { - - XmString string = NULL; -@@ -30639,16 +32398,17 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - - libp_link="$libp" - libsm_ice_link="$libsm_ice" -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: need ${libp_link} ${libsm_ice_link}" >&5 --$as_echo "need ${libp_link} ${libsm_ice_link}" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: need ${libp_link} ${libsm_ice_link}" >&5 -+printf "%s\n" "need ${libp_link} ${libsm_ice_link}" >&6; } - libs_found=1 - - 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="$save_LIBS" -@@ -30659,48 +32419,56 @@ rm -f core conftest.err conftest.$ac_objext \ - done - - if test "$libs_found" = 0; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: can't find the right libraries" >&5 --$as_echo "can't find the right libraries" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: can't find the right libraries" >&5 -+printf "%s\n" "can't find the right libraries" >&6; } - as_fn_error $? "can't link a simple motif program" "$LINENO" 5 - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SgCreateList in -lSgm" >&5 --$as_echo_n "checking for SgCreateList in -lSgm... " >&6; } --if ${ac_cv_lib_Sgm_SgCreateList+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SgCreateList in -lSgm" >&5 -+printf %s "checking for SgCreateList in -lSgm... " >&6; } -+if test ${ac_cv_lib_Sgm_SgCreateList+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lSgm $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char SgCreateList (); -+char SgCreateList (void); - int --main () -+main (void) - { - return SgCreateList (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_Sgm_SgCreateList=yes --else -- ac_cv_lib_Sgm_SgCreateList=no -+else case e in #( -+ e) ac_cv_lib_Sgm_SgCreateList=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Sgm_SgCreateList" >&5 --$as_echo "$ac_cv_lib_Sgm_SgCreateList" >&6; } --if test "x$ac_cv_lib_Sgm_SgCreateList" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Sgm_SgCreateList" >&5 -+printf "%s\n" "$ac_cv_lib_Sgm_SgCreateList" >&6; } -+if test "x$ac_cv_lib_Sgm_SgCreateList" = xyes -+then : - libsgm_link=" -lSgm" - fi - -@@ -30708,18 +32476,19 @@ fi - save_CFLAGS=$CFLAGS - CFLAGS="$TOOLKIT_INCLUDE $CFLAGS" - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Motif 2" >&5 --$as_echo_n "checking for Motif 2... " >&6; } --if ${wx_cv_lib_motif2+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Motif 2" >&5 -+printf %s "checking for Motif 2... " >&6; } -+if test ${wx_cv_lib_motif2+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include - - int --main () -+main (void) - { - - #if XmVersion < 2000 -@@ -30730,35 +32499,39 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - wx_cv_lib_motif2="yes" --else -- wx_cv_lib_motif2="no" -+else case e in #( -+ e) wx_cv_lib_motif2="no" ;; -+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 ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_motif2" >&5 --$as_echo "$wx_cv_lib_motif2" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_motif2" >&5 -+printf "%s\n" "$wx_cv_lib_motif2" >&6; } - if test "$wx_cv_lib_motif2" = "yes"; then -- $as_echo "#define __WXMOTIF20__ 1" >>confdefs.h -+ printf "%s\n" "#define __WXMOTIF20__ 1" >>confdefs.h - - else -- $as_echo "#define __WXMOTIF20__ 0" >>confdefs.h -+ printf "%s\n" "#define __WXMOTIF20__ 0" >>confdefs.h - - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Motif is Lesstif" >&5 --$as_echo_n "checking whether Motif is Lesstif... " >&6; } --if ${wx_cv_lib_lesstif+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Motif is Lesstif" >&5 -+printf %s "checking whether Motif is Lesstif... " >&6; } -+if test ${wx_cv_lib_lesstif+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include - - int --main () -+main (void) - { - - #if !defined(LesstifVersion) || LesstifVersion <= 0 -@@ -30769,21 +32542,24 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - wx_cv_lib_lesstif="yes" --else -- wx_cv_lib_lesstif="no" -+else case e in #( -+ e) wx_cv_lib_lesstif="no" ;; -+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 -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_lesstif" >&5 --$as_echo "$wx_cv_lib_lesstif" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_lesstif" >&5 -+printf "%s\n" "$wx_cv_lib_lesstif" >&6; } - if test "$wx_cv_lib_lesstif" = "yes"; then -- $as_echo "#define __WXLESSTIF__ 1" >>confdefs.h -+ printf "%s\n" "#define __WXLESSTIF__ 1" >>confdefs.h - - else -- $as_echo "#define __WXLESSTIF__ 0" >>confdefs.h -+ printf "%s\n" "#define __WXLESSTIF__ 0" >>confdefs.h - - fi - -@@ -30796,8 +32572,8 @@ $as_echo "$wx_cv_lib_lesstif" >&6; } - - if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then - if test "$wxUSE_LIBXPM" = "sys"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xpm library" >&5 --$as_echo_n "checking for Xpm library... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Xpm library" >&5 -+printf %s "checking for Xpm library... " >&6; } - - ac_find_libraries= - for ac_dir in $SEARCH_LIB -@@ -30825,15 +32601,16 @@ $as_echo_n "checking for Xpm library... " >&6; } - fi - - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $ac_find_libraries" >&5 --$as_echo "found in $ac_find_libraries" >&6; } -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11/xpm.h" >&5 --$as_echo_n "checking for X11/xpm.h... " >&6; } --if ${wx_cv_x11_xpm_h+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found in $ac_find_libraries" >&5 -+printf "%s\n" "found in $ac_find_libraries" >&6; } -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X11/xpm.h" >&5 -+printf %s "checking for X11/xpm.h... " >&6; } -+if test ${wx_cv_x11_xpm_h+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - save_CFLAGS=$CFLAGS - CFLAGS="$TOOLKIT_INCLUDE $CFLAGS" - -@@ -30843,7 +32620,7 @@ else - #include - - int --main () -+main (void) - { - - int version; -@@ -30853,70 +32630,81 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - wx_cv_x11_xpm_h=yes --else -- wx_cv_x11_xpm_h=no -- -+else case e in #( -+ e) wx_cv_x11_xpm_h=no -+ ;; -+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 - - CFLAGS=$save_CFLAGS - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_x11_xpm_h" >&5 --$as_echo "$wx_cv_x11_xpm_h" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_x11_xpm_h" >&5 -+printf "%s\n" "$wx_cv_x11_xpm_h" >&6; } - - if test $wx_cv_x11_xpm_h = "yes"; then - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXpm" -- $as_echo "#define wxHAVE_LIB_XPM 1" >>confdefs.h -+ printf "%s\n" "#define wxHAVE_LIB_XPM 1" >>confdefs.h - - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: built-in less efficient XPM decoder will be used" >&5 --$as_echo "$as_me: WARNING: built-in less efficient XPM decoder will be used" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: built-in less efficient XPM decoder will be used" >&5 -+printf "%s\n" "$as_me: WARNING: built-in less efficient XPM decoder will be used" >&2;} - fi - fi - - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeQueryExtension in -lXext" >&5 --$as_echo_n "checking for XShapeQueryExtension in -lXext... " >&6; } --if ${ac_cv_lib_Xext_XShapeQueryExtension+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XShapeQueryExtension in -lXext" >&5 -+printf %s "checking for XShapeQueryExtension in -lXext... " >&6; } -+if test ${ac_cv_lib_Xext_XShapeQueryExtension+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lXext $GUI_TK_LIBRARY -lX11 $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char XShapeQueryExtension (); -+char XShapeQueryExtension (void); - int --main () -+main (void) - { - return XShapeQueryExtension (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_Xext_XShapeQueryExtension=yes --else -- ac_cv_lib_Xext_XShapeQueryExtension=no -+else case e in #( -+ e) ac_cv_lib_Xext_XShapeQueryExtension=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5 --$as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; } --if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5 -+printf "%s\n" "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; } -+if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = xyes -+then : - - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext" - wxHAVE_XEXT_LIB=1 -@@ -30928,8 +32716,8 @@ fi - save_CFLAGS="$CFLAGS" - CFLAGS="$TOOLKIT_INCLUDE $CFLAGS" - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11/extensions/shape.h" >&5 --$as_echo_n "checking for X11/extensions/shape.h... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X11/extensions/shape.h" >&5 -+printf %s "checking for X11/extensions/shape.h... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -30937,7 +32725,7 @@ $as_echo_n "checking for X11/extensions/shape.h... " >&6; } - #include - - int --main () -+main (void) - { - - int dummy1, dummy2; -@@ -30948,20 +32736,22 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - -- $as_echo "#define HAVE_XSHAPE 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_XSHAPE 1" >>confdefs.h - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 --$as_echo "found" >&6; } -- --else -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 --$as_echo "not found" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found" >&5 -+printf "%s\n" "found" >&6; } - -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -+printf "%s\n" "not found" >&6; } -+ ;; -+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 - CFLAGS="$save_CFLAGS" - - fi -@@ -30996,18 +32786,18 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - else - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT5" >&5 --$as_echo_n "checking for QT5... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for QT5" >&5 -+printf %s "checking for QT5... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$QT5_CFLAGS"; then - pkg_cv_QT5_CFLAGS="$QT5_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core Qt5Widgets Qt5Gui Qt5OpenGL Qt5Test\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core Qt5Widgets Qt5Gui Qt5OpenGL Qt5Test\""; } >&5 - ($PKG_CONFIG --exists --print-errors "Qt5Core Qt5Widgets Qt5Gui Qt5OpenGL Qt5Test") 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_QT5_CFLAGS=`$PKG_CONFIG --cflags "Qt5Core Qt5Widgets Qt5Gui Qt5OpenGL Qt5Test" 2>/dev/null` - else -@@ -31022,10 +32812,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_QT5_LIBS="$QT5_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core Qt5Widgets Qt5Gui Qt5OpenGL Qt5Test\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core Qt5Widgets Qt5Gui Qt5OpenGL Qt5Test\""; } >&5 - ($PKG_CONFIG --exists --print-errors "Qt5Core Qt5Widgets Qt5Gui Qt5OpenGL Qt5Test") 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_QT5_LIBS=`$PKG_CONFIG --libs "Qt5Core Qt5Widgets Qt5Gui Qt5OpenGL Qt5Test" 2>/dev/null` - else -@@ -31065,8 +32855,8 @@ elif test $pkg_failed = untried; then - else - QT5_CFLAGS=$pkg_cv_QT5_CFLAGS - QT5_LIBS=$pkg_cv_QT5_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; } - - TOOLKIT_INCLUDE="${TOOLKIT_INCLUDE} ${QT5_CFLAGS}" - GUI_TK_LIBRARY="${GUI_TK_LIBRARY} ${QT5_LIBS}" -@@ -31077,6 +32867,12 @@ $as_echo "yes" >&6; } - fi - fi - fi -+ -+ if test "$wxUSE_WASM" = 1; then -+ TOOLKIT=WASM -+ GUI_TK_LIBRARY="-sUSE_LIBPNG=1 -sUSE_ZLIB=1" -+ fi -+ - TOOLKIT_DIR=`echo ${TOOLKIT} | tr '[A-Z]' '[a-z]'` - - if test "$wxUSE_UNIVERSAL" = "yes"; then -@@ -31103,36 +32899,26 @@ fi - - if test "$wxUSE_GUI" = "yes"; then - if test "$wxUSE_UNIX" = "yes"; then -- for ac_header in X11/Xlib.h --do : -- ac_fn_c_check_header_compile "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" " -+ ac_fn_c_check_header_compile "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" " - " --if test "x$ac_cv_header_X11_Xlib_h" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_X11_XLIB_H 1 --_ACEOF -+if test "x$ac_cv_header_X11_Xlib_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_X11_XLIB_H 1" >>confdefs.h - - fi - --done -- -- for ac_header in X11/XKBlib.h --do : -- ac_fn_c_check_header_compile "$LINENO" "X11/XKBlib.h" "ac_cv_header_X11_XKBlib_h" " -+ ac_fn_c_check_header_compile "$LINENO" "X11/XKBlib.h" "ac_cv_header_X11_XKBlib_h" " - #if HAVE_X11_XLIB_H - #include - #endif - - " --if test "x$ac_cv_header_X11_XKBlib_h" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_X11_XKBLIB_H 1 --_ACEOF -+if test "x$ac_cv_header_X11_XKBlib_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_X11_XKBLIB_H 1" >>confdefs.h - - fi - --done -- - fi - fi - -@@ -31151,12 +32937,13 @@ 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 -- case $PKG_CONFIG in -+{ 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 case e in #( -+ e) case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; -@@ -31165,11 +32952,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 -@@ -31177,15 +32968,16 @@ done - IFS=$as_save_IFS - - ;; -+esac ;; - 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 - - -@@ -31194,12 +32986,13 @@ 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 -- case $ac_pt_PKG_CONFIG in -+{ 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 case e in #( -+ e) 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. - ;; -@@ -31208,11 +33001,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 -@@ -31220,15 +33017,16 @@ done - IFS=$as_save_IFS - - ;; -+esac ;; - 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 -@@ -31236,8 +33034,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 -@@ -31249,32 +33047,32 @@ 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 6> /dev/null - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xinerama" >&5 --$as_echo_n "checking for Xinerama... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Xinerama" >&5 -+printf %s "checking for Xinerama... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$Xinerama_CFLAGS"; then - pkg_cv_Xinerama_CFLAGS="$Xinerama_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 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_Xinerama_CFLAGS=`$PKG_CONFIG --cflags "$fl_pkgname" 2>/dev/null` - else -@@ -31289,10 +33087,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_Xinerama_LIBS="$Xinerama_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 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_Xinerama_LIBS=`$PKG_CONFIG --libs "$fl_pkgname" 2>/dev/null` - else -@@ -31323,43 +33121,51 @@ fi - - if test "x$ac_find_libraries" = "x"; then - if test "xXineramaQueryScreens" != "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XineramaQueryScreens in -lXinerama" >&5 --$as_echo_n "checking for XineramaQueryScreens in -lXinerama... " >&6; } --if ${ac_cv_lib_Xinerama_XineramaQueryScreens+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XineramaQueryScreens in -lXinerama" >&5 -+printf %s "checking for XineramaQueryScreens in -lXinerama... " >&6; } -+if test ${ac_cv_lib_Xinerama_XineramaQueryScreens+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lXinerama $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char XineramaQueryScreens (); -+char XineramaQueryScreens (void); - int --main () -+main (void) - { - return XineramaQueryScreens (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_Xinerama_XineramaQueryScreens=yes --else -- ac_cv_lib_Xinerama_XineramaQueryScreens=no -+else case e in #( -+ e) ac_cv_lib_Xinerama_XineramaQueryScreens=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xinerama_XineramaQueryScreens" >&5 --$as_echo "$ac_cv_lib_Xinerama_XineramaQueryScreens" >&6; } --if test "x$ac_cv_lib_Xinerama_XineramaQueryScreens" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xinerama_XineramaQueryScreens" >&5 -+printf "%s\n" "$ac_cv_lib_Xinerama_XineramaQueryScreens" >&6; } -+if test "x$ac_cv_lib_Xinerama_XineramaQueryScreens" = xyes -+then : - ac_find_libraries="std" - fi - -@@ -31367,8 +33173,8 @@ fi - fi - - if test "x$ac_find_libraries" = "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 --$as_echo_n "checking elsewhere... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 -+printf %s "checking elsewhere... " >&6; } - - ac_find_libraries= - for ac_dir in $SEARCH_LIB -@@ -31382,11 +33188,11 @@ $as_echo_n "checking elsewhere... " >&6; } - done - - if test "x$ac_find_libraries" != "x"; 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; } - fi - fi - -@@ -31394,43 +33200,51 @@ elif test $pkg_failed = untried; then - - if test "x$ac_find_libraries" = "x"; then - if test "xXineramaQueryScreens" != "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XineramaQueryScreens in -lXinerama" >&5 --$as_echo_n "checking for XineramaQueryScreens in -lXinerama... " >&6; } --if ${ac_cv_lib_Xinerama_XineramaQueryScreens+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XineramaQueryScreens in -lXinerama" >&5 -+printf %s "checking for XineramaQueryScreens in -lXinerama... " >&6; } -+if test ${ac_cv_lib_Xinerama_XineramaQueryScreens+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lXinerama $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char XineramaQueryScreens (); -+char XineramaQueryScreens (void); - int --main () -+main (void) - { - return XineramaQueryScreens (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_Xinerama_XineramaQueryScreens=yes --else -- ac_cv_lib_Xinerama_XineramaQueryScreens=no -+else case e in #( -+ e) ac_cv_lib_Xinerama_XineramaQueryScreens=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xinerama_XineramaQueryScreens" >&5 --$as_echo "$ac_cv_lib_Xinerama_XineramaQueryScreens" >&6; } --if test "x$ac_cv_lib_Xinerama_XineramaQueryScreens" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xinerama_XineramaQueryScreens" >&5 -+printf "%s\n" "$ac_cv_lib_Xinerama_XineramaQueryScreens" >&6; } -+if test "x$ac_cv_lib_Xinerama_XineramaQueryScreens" = xyes -+then : - ac_find_libraries="std" - fi - -@@ -31438,8 +33252,8 @@ fi - fi - - if test "x$ac_find_libraries" = "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 --$as_echo_n "checking elsewhere... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 -+printf %s "checking elsewhere... " >&6; } - - ac_find_libraries= - for ac_dir in $SEARCH_LIB -@@ -31453,19 +33267,19 @@ $as_echo_n "checking elsewhere... " >&6; } - done - - if test "x$ac_find_libraries" != "x"; 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; } - fi - fi - - else - Xinerama_CFLAGS=$pkg_cv_Xinerama_CFLAGS - Xinerama_LIBS=$pkg_cv_Xinerama_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; } - - ac_find_libraries="std" - -@@ -31503,8 +33317,8 @@ fi - USE_XINERAMA=1 - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama" - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Xinerama not found; disabling wxDisplay" >&5 --$as_echo "$as_me: WARNING: Xinerama not found; disabling wxDisplay" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Xinerama not found; disabling wxDisplay" >&5 -+printf "%s\n" "$as_me: WARNING: Xinerama not found; disabling wxDisplay" >&2;} - wxUSE_DISPLAY="no" - fi - fi -@@ -31522,12 +33336,13 @@ 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 -- case $PKG_CONFIG in -+{ 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 case e in #( -+ e) case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; -@@ -31536,11 +33351,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 -@@ -31548,15 +33367,16 @@ done - IFS=$as_save_IFS - - ;; -+esac ;; - 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 - - -@@ -31565,12 +33385,13 @@ 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 -- case $ac_pt_PKG_CONFIG in -+{ 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 case e in #( -+ e) 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. - ;; -@@ -31579,11 +33400,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 -@@ -31591,15 +33416,16 @@ done - IFS=$as_save_IFS - - ;; -+esac ;; - 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 -@@ -31607,8 +33433,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 -@@ -31620,32 +33446,32 @@ 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 6> /dev/null - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xxf86vm" >&5 --$as_echo_n "checking for Xxf86vm... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Xxf86vm" >&5 -+printf %s "checking for Xxf86vm... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$Xxf86vm_CFLAGS"; then - pkg_cv_Xxf86vm_CFLAGS="$Xxf86vm_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 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_Xxf86vm_CFLAGS=`$PKG_CONFIG --cflags "$fl_pkgname" 2>/dev/null` - else -@@ -31660,10 +33486,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_Xxf86vm_LIBS="$Xxf86vm_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 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_Xxf86vm_LIBS=`$PKG_CONFIG --libs "$fl_pkgname" 2>/dev/null` - else -@@ -31694,43 +33520,51 @@ fi - - if test "x$ac_find_libraries" = "x"; then - if test "xXF86VidModeQueryExtension" != "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 --$as_echo_n "checking for XF86VidModeQueryExtension in -lXxf86vm... " >&6; } --if ${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 -+printf %s "checking for XF86VidModeQueryExtension in -lXxf86vm... " >&6; } -+if test ${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lXxf86vm $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char XF86VidModeQueryExtension (); -+char XF86VidModeQueryExtension (void); - int --main () -+main (void) - { - return XF86VidModeQueryExtension (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes --else -- ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no -+else case e in #( -+ e) ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 --$as_echo "$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6; } --if test "x$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 -+printf "%s\n" "$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6; } -+if test "x$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" = xyes -+then : - ac_find_libraries="std" - fi - -@@ -31738,8 +33572,8 @@ fi - fi - - if test "x$ac_find_libraries" = "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 --$as_echo_n "checking elsewhere... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 -+printf %s "checking elsewhere... " >&6; } - - ac_find_libraries= - for ac_dir in $SEARCH_LIB -@@ -31753,11 +33587,11 @@ $as_echo_n "checking elsewhere... " >&6; } - done - - if test "x$ac_find_libraries" != "x"; 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; } - fi - fi - -@@ -31765,43 +33599,51 @@ elif test $pkg_failed = untried; then - - if test "x$ac_find_libraries" = "x"; then - if test "xXF86VidModeQueryExtension" != "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 --$as_echo_n "checking for XF86VidModeQueryExtension in -lXxf86vm... " >&6; } --if ${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 -+printf %s "checking for XF86VidModeQueryExtension in -lXxf86vm... " >&6; } -+if test ${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lXxf86vm $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char XF86VidModeQueryExtension (); -+char XF86VidModeQueryExtension (void); - int --main () -+main (void) - { - return XF86VidModeQueryExtension (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes --else -- ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no -+else case e in #( -+ e) ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 --$as_echo "$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6; } --if test "x$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 -+printf "%s\n" "$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6; } -+if test "x$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" = xyes -+then : - ac_find_libraries="std" - fi - -@@ -31809,8 +33651,8 @@ fi - fi - - if test "x$ac_find_libraries" = "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 --$as_echo_n "checking elsewhere... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 -+printf %s "checking elsewhere... " >&6; } - - ac_find_libraries= - for ac_dir in $SEARCH_LIB -@@ -31824,19 +33666,19 @@ $as_echo_n "checking elsewhere... " >&6; } - done - - if test "x$ac_find_libraries" != "x"; 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; } - fi - fi - - else - Xxf86vm_CFLAGS=$pkg_cv_Xxf86vm_CFLAGS - Xxf86vm_LIBS=$pkg_cv_Xxf86vm_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; } - - ac_find_libraries="std" - -@@ -31853,7 +33695,7 @@ $as_echo "yes" >&6; } - fi - - if test "$ac_find_libraries" != "" ; then -- for ac_header in X11/extensions/xf86vmode.h -+ for ac_header in X11/extensions/xf86vmode.h - do : - ac_fn_c_check_header_compile "$LINENO" "X11/extensions/xf86vmode.h" "ac_cv_header_X11_extensions_xf86vmode_h" " - #if HAVE_X11_XLIB_H -@@ -31861,17 +33703,15 @@ do : - #endif - - " --if test "x$ac_cv_header_X11_extensions_xf86vmode_h" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_X11_EXTENSIONS_XF86VMODE_H 1 --_ACEOF -+if test "x$ac_cv_header_X11_extensions_xf86vmode_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_X11_EXTENSIONS_XF86VMODE_H 1" >>confdefs.h - - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm" - - fi - - done -- - fi - fi - fi -@@ -31888,12 +33728,13 @@ 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 -- case $PKG_CONFIG in -+{ 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 case e in #( -+ e) case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; -@@ -31902,11 +33743,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 -@@ -31914,15 +33759,16 @@ done - IFS=$as_save_IFS - - ;; -+esac ;; - 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 - - -@@ -31931,12 +33777,13 @@ 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 -- case $ac_pt_PKG_CONFIG in -+{ 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 case e in #( -+ e) 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. - ;; -@@ -31945,11 +33792,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 -@@ -31957,15 +33808,16 @@ done - IFS=$as_save_IFS - - ;; -+esac ;; - 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 -@@ -31973,8 +33825,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 -@@ -31986,32 +33838,32 @@ 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 6> /dev/null - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SM" >&5 --$as_echo_n "checking for SM... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SM" >&5 -+printf %s "checking for SM... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$SM_CFLAGS"; then - pkg_cv_SM_CFLAGS="$SM_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 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_SM_CFLAGS=`$PKG_CONFIG --cflags "$fl_pkgname" 2>/dev/null` - else -@@ -32026,10 +33878,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_SM_LIBS="$SM_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 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_SM_LIBS=`$PKG_CONFIG --libs "$fl_pkgname" 2>/dev/null` - else -@@ -32060,43 +33912,51 @@ fi - - if test "x$ac_find_libraries" = "x"; then - if test "xSmcOpenConnection" != "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SmcOpenConnection in -lSM" >&5 --$as_echo_n "checking for SmcOpenConnection in -lSM... " >&6; } --if ${ac_cv_lib_SM_SmcOpenConnection+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SmcOpenConnection in -lSM" >&5 -+printf %s "checking for SmcOpenConnection in -lSM... " >&6; } -+if test ${ac_cv_lib_SM_SmcOpenConnection+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lSM $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char SmcOpenConnection (); -+char SmcOpenConnection (void); - int --main () -+main (void) - { - return SmcOpenConnection (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_SM_SmcOpenConnection=yes --else -- ac_cv_lib_SM_SmcOpenConnection=no -+else case e in #( -+ e) ac_cv_lib_SM_SmcOpenConnection=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SM_SmcOpenConnection" >&5 --$as_echo "$ac_cv_lib_SM_SmcOpenConnection" >&6; } --if test "x$ac_cv_lib_SM_SmcOpenConnection" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SM_SmcOpenConnection" >&5 -+printf "%s\n" "$ac_cv_lib_SM_SmcOpenConnection" >&6; } -+if test "x$ac_cv_lib_SM_SmcOpenConnection" = xyes -+then : - ac_find_libraries="std" - fi - -@@ -32104,8 +33964,8 @@ fi - fi - - if test "x$ac_find_libraries" = "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 --$as_echo_n "checking elsewhere... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 -+printf %s "checking elsewhere... " >&6; } - - ac_find_libraries= - for ac_dir in $SEARCH_LIB -@@ -32119,11 +33979,11 @@ $as_echo_n "checking elsewhere... " >&6; } - done - - if test "x$ac_find_libraries" != "x"; 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; } - fi - fi - -@@ -32131,43 +33991,51 @@ elif test $pkg_failed = untried; then - - if test "x$ac_find_libraries" = "x"; then - if test "xSmcOpenConnection" != "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SmcOpenConnection in -lSM" >&5 --$as_echo_n "checking for SmcOpenConnection in -lSM... " >&6; } --if ${ac_cv_lib_SM_SmcOpenConnection+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SmcOpenConnection in -lSM" >&5 -+printf %s "checking for SmcOpenConnection in -lSM... " >&6; } -+if test ${ac_cv_lib_SM_SmcOpenConnection+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lSM $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char SmcOpenConnection (); -+char SmcOpenConnection (void); - int --main () -+main (void) - { - return SmcOpenConnection (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_SM_SmcOpenConnection=yes --else -- ac_cv_lib_SM_SmcOpenConnection=no -+else case e in #( -+ e) ac_cv_lib_SM_SmcOpenConnection=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SM_SmcOpenConnection" >&5 --$as_echo "$ac_cv_lib_SM_SmcOpenConnection" >&6; } --if test "x$ac_cv_lib_SM_SmcOpenConnection" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SM_SmcOpenConnection" >&5 -+printf "%s\n" "$ac_cv_lib_SM_SmcOpenConnection" >&6; } -+if test "x$ac_cv_lib_SM_SmcOpenConnection" = xyes -+then : - ac_find_libraries="std" - fi - -@@ -32175,8 +34043,8 @@ fi - fi - - if test "x$ac_find_libraries" = "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 --$as_echo_n "checking elsewhere... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 -+printf %s "checking elsewhere... " >&6; } - - ac_find_libraries= - for ac_dir in $SEARCH_LIB -@@ -32190,19 +34058,19 @@ $as_echo_n "checking elsewhere... " >&6; } - done - - if test "x$ac_find_libraries" != "x"; 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; } - fi - fi - - else - SM_CFLAGS=$pkg_cv_SM_CFLAGS - SM_LIBS=$pkg_cv_SM_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; } - - ac_find_libraries="std" - -@@ -32239,8 +34107,8 @@ fi - fi - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lSM" - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libSM not found; disabling session management detection" >&5 --$as_echo "$as_me: WARNING: libSM not found; disabling session management detection" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libSM not found; disabling session management detection" >&5 -+printf "%s\n" "$as_me: WARNING: libSM not found; disabling session management detection" >&2;} - wxUSE_DETECT_SM="no" - fi - else -@@ -32260,8 +34128,8 @@ if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then - OPENGL_LIBS="-lopengl32 -lglu32" - elif test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_QT" = 1; then - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL headers" >&5 --$as_echo_n "checking for OpenGL headers... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenGL headers" >&5 -+printf %s "checking for OpenGL headers... " >&6; } - - ac_find_includes= - for ac_dir in $SEARCH_INCLUDE /opt/graphics/OpenGL/include /usr/include -@@ -32273,8 +34141,8 @@ for ac_dir in $SEARCH_INCLUDE /opt/graphics/OpenGL/include /usr/include - done - - if test "$ac_find_includes" != "" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $ac_find_includes" >&5 --$as_echo "found in $ac_find_includes" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found in $ac_find_includes" >&5 -+printf "%s\n" "found in $ac_find_includes" >&6; } - - if test "x$ac_find_includes" = "x/usr/include"; then - ac_path_to_include="" -@@ -32290,17 +34158,19 @@ $as_echo "found in $ac_find_includes" >&6; } - - CPPFLAGS="$CPPFLAGS $ac_path_to_include" - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 --$as_echo "not found" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -+printf "%s\n" "not found" >&6; } - fi - - ac_fn_c_check_header_compile "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" " - " --if test "x$ac_cv_header_GL_gl_h" = xyes; then : -+if test "x$ac_cv_header_GL_gl_h" = xyes -+then : - - ac_fn_c_check_header_compile "$LINENO" "GL/glu.h" "ac_cv_header_GL_glu_h" " - " --if test "x$ac_cv_header_GL_glu_h" = xyes; then : -+if test "x$ac_cv_header_GL_glu_h" = xyes -+then : - - found_gl=0 - -@@ -32314,12 +34184,13 @@ 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 -- case $PKG_CONFIG in -+{ 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 case e in #( -+ e) case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; -@@ -32328,11 +34199,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 -@@ -32340,15 +34215,16 @@ done - IFS=$as_save_IFS - - ;; -+esac ;; - 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 - - -@@ -32357,12 +34233,13 @@ 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 -- case $ac_pt_PKG_CONFIG in -+{ 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 case e in #( -+ e) 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. - ;; -@@ -32371,11 +34248,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 -@@ -32383,15 +34264,16 @@ done - IFS=$as_save_IFS - - ;; -+esac ;; - 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 -@@ -32399,8 +34281,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 -@@ -32412,32 +34294,32 @@ 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 6> /dev/null - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GL" >&5 --$as_echo_n "checking for GL... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GL" >&5 -+printf %s "checking for GL... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$GL_CFLAGS"; then - pkg_cv_GL_CFLAGS="$GL_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 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_GL_CFLAGS=`$PKG_CONFIG --cflags "$fl_pkgname" 2>/dev/null` - else -@@ -32452,10 +34334,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_GL_LIBS="$GL_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 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_GL_LIBS=`$PKG_CONFIG --libs "$fl_pkgname" 2>/dev/null` - else -@@ -32486,43 +34368,51 @@ fi - - if test "x$ac_find_libraries" = "x"; then - if test "xglBegin" != "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5 --$as_echo_n "checking for glBegin in -lGL... " >&6; } --if ${ac_cv_lib_GL_glBegin+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5 -+printf %s "checking for glBegin in -lGL... " >&6; } -+if test ${ac_cv_lib_GL_glBegin+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lGL $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char glBegin (); -+char glBegin (void); - int --main () -+main (void) - { - return glBegin (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_GL_glBegin=yes --else -- ac_cv_lib_GL_glBegin=no -+else case e in #( -+ e) ac_cv_lib_GL_glBegin=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glBegin" >&5 --$as_echo "$ac_cv_lib_GL_glBegin" >&6; } --if test "x$ac_cv_lib_GL_glBegin" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glBegin" >&5 -+printf "%s\n" "$ac_cv_lib_GL_glBegin" >&6; } -+if test "x$ac_cv_lib_GL_glBegin" = xyes -+then : - ac_find_libraries="std" - fi - -@@ -32530,8 +34420,8 @@ fi - fi - - if test "x$ac_find_libraries" = "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 --$as_echo_n "checking elsewhere... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 -+printf %s "checking elsewhere... " >&6; } - - ac_find_libraries= - for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB -@@ -32545,11 +34435,11 @@ $as_echo_n "checking elsewhere... " >&6; } - done - - if test "x$ac_find_libraries" != "x"; 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; } - fi - fi - -@@ -32557,43 +34447,51 @@ elif test $pkg_failed = untried; then - - if test "x$ac_find_libraries" = "x"; then - if test "xglBegin" != "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5 --$as_echo_n "checking for glBegin in -lGL... " >&6; } --if ${ac_cv_lib_GL_glBegin+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5 -+printf %s "checking for glBegin in -lGL... " >&6; } -+if test ${ac_cv_lib_GL_glBegin+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lGL $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char glBegin (); -+char glBegin (void); - int --main () -+main (void) - { - return glBegin (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_GL_glBegin=yes --else -- ac_cv_lib_GL_glBegin=no -+else case e in #( -+ e) ac_cv_lib_GL_glBegin=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glBegin" >&5 --$as_echo "$ac_cv_lib_GL_glBegin" >&6; } --if test "x$ac_cv_lib_GL_glBegin" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glBegin" >&5 -+printf "%s\n" "$ac_cv_lib_GL_glBegin" >&6; } -+if test "x$ac_cv_lib_GL_glBegin" = xyes -+then : - ac_find_libraries="std" - fi - -@@ -32601,8 +34499,8 @@ fi - fi - - if test "x$ac_find_libraries" = "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 --$as_echo_n "checking elsewhere... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 -+printf %s "checking elsewhere... " >&6; } - - ac_find_libraries= - for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB -@@ -32616,19 +34514,19 @@ $as_echo_n "checking elsewhere... " >&6; } - done - - if test "x$ac_find_libraries" != "x"; 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; } - fi - fi - - else - GL_CFLAGS=$pkg_cv_GL_CFLAGS - GL_LIBS=$pkg_cv_GL_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; } - - ac_find_libraries="std" - -@@ -32674,12 +34572,13 @@ 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 -- case $PKG_CONFIG in -+{ 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 case e in #( -+ e) case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; -@@ -32688,11 +34587,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 -@@ -32700,15 +34603,16 @@ done - IFS=$as_save_IFS - - ;; -+esac ;; - 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 - - -@@ -32717,12 +34621,13 @@ 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 -- case $ac_pt_PKG_CONFIG in -+{ 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 case e in #( -+ e) 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. - ;; -@@ -32731,11 +34636,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 -@@ -32743,15 +34652,16 @@ done - IFS=$as_save_IFS - - ;; -+esac ;; - 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 -@@ -32759,8 +34669,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 -@@ -32772,32 +34682,32 @@ 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 6> /dev/null - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLU" >&5 --$as_echo_n "checking for GLU... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GLU" >&5 -+printf %s "checking for GLU... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$GLU_CFLAGS"; then - pkg_cv_GLU_CFLAGS="$GLU_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 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_GLU_CFLAGS=`$PKG_CONFIG --cflags "$fl_pkgname" 2>/dev/null` - else -@@ -32812,10 +34722,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_GLU_LIBS="$GLU_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 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_GLU_LIBS=`$PKG_CONFIG --libs "$fl_pkgname" 2>/dev/null` - else -@@ -32846,43 +34756,51 @@ fi - - if test "x$ac_find_libraries" = "x"; then - if test "xgluBeginCurve" != "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gluBeginCurve in -lGLU" >&5 --$as_echo_n "checking for gluBeginCurve in -lGLU... " >&6; } --if ${ac_cv_lib_GLU_gluBeginCurve+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gluBeginCurve in -lGLU" >&5 -+printf %s "checking for gluBeginCurve in -lGLU... " >&6; } -+if test ${ac_cv_lib_GLU_gluBeginCurve+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lGLU $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char gluBeginCurve (); -+char gluBeginCurve (void); - int --main () -+main (void) - { - return gluBeginCurve (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_GLU_gluBeginCurve=yes --else -- ac_cv_lib_GLU_gluBeginCurve=no -+else case e in #( -+ e) ac_cv_lib_GLU_gluBeginCurve=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLU_gluBeginCurve" >&5 --$as_echo "$ac_cv_lib_GLU_gluBeginCurve" >&6; } --if test "x$ac_cv_lib_GLU_gluBeginCurve" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLU_gluBeginCurve" >&5 -+printf "%s\n" "$ac_cv_lib_GLU_gluBeginCurve" >&6; } -+if test "x$ac_cv_lib_GLU_gluBeginCurve" = xyes -+then : - ac_find_libraries="std" - fi - -@@ -32890,8 +34808,8 @@ fi - fi - - if test "x$ac_find_libraries" = "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 --$as_echo_n "checking elsewhere... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 -+printf %s "checking elsewhere... " >&6; } - - ac_find_libraries= - for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB -@@ -32905,11 +34823,11 @@ $as_echo_n "checking elsewhere... " >&6; } - done - - if test "x$ac_find_libraries" != "x"; 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; } - fi - fi - -@@ -32917,43 +34835,51 @@ elif test $pkg_failed = untried; then - - if test "x$ac_find_libraries" = "x"; then - if test "xgluBeginCurve" != "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gluBeginCurve in -lGLU" >&5 --$as_echo_n "checking for gluBeginCurve in -lGLU... " >&6; } --if ${ac_cv_lib_GLU_gluBeginCurve+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gluBeginCurve in -lGLU" >&5 -+printf %s "checking for gluBeginCurve in -lGLU... " >&6; } -+if test ${ac_cv_lib_GLU_gluBeginCurve+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lGLU $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char gluBeginCurve (); -+char gluBeginCurve (void); - int --main () -+main (void) - { - return gluBeginCurve (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_GLU_gluBeginCurve=yes --else -- ac_cv_lib_GLU_gluBeginCurve=no -+else case e in #( -+ e) ac_cv_lib_GLU_gluBeginCurve=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLU_gluBeginCurve" >&5 --$as_echo "$ac_cv_lib_GLU_gluBeginCurve" >&6; } --if test "x$ac_cv_lib_GLU_gluBeginCurve" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLU_gluBeginCurve" >&5 -+printf "%s\n" "$ac_cv_lib_GLU_gluBeginCurve" >&6; } -+if test "x$ac_cv_lib_GLU_gluBeginCurve" = xyes -+then : - ac_find_libraries="std" - fi - -@@ -32961,8 +34887,8 @@ fi - fi - - if test "x$ac_find_libraries" = "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 --$as_echo_n "checking elsewhere... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 -+printf %s "checking elsewhere... " >&6; } - - ac_find_libraries= - for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB -@@ -32976,19 +34902,19 @@ $as_echo_n "checking elsewhere... " >&6; } - done - - if test "x$ac_find_libraries" != "x"; 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; } - fi - fi - - else - GLU_CFLAGS=$pkg_cv_GLU_CFLAGS - GLU_LIBS=$pkg_cv_GLU_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; } - - ac_find_libraries="std" - -@@ -33032,18 +34958,18 @@ fi - if test "$wxUSE_GLCANVAS_EGL" != "no"; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGL" >&5 --$as_echo_n "checking for EGL... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EGL" >&5 -+printf %s "checking for EGL... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$EGL_CFLAGS"; then - pkg_cv_EGL_CFLAGS="$EGL_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"egl >= 1.5\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"egl >= 1.5\""; } >&5 - ($PKG_CONFIG --exists --print-errors "egl >= 1.5") 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_EGL_CFLAGS=`$PKG_CONFIG --cflags "egl >= 1.5" 2>/dev/null` - else -@@ -33058,10 +34984,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_EGL_LIBS="$EGL_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"egl >= 1.5\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"egl >= 1.5\""; } >&5 - ($PKG_CONFIG --exists --print-errors "egl >= 1.5") 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_EGL_LIBS=`$PKG_CONFIG --libs "egl >= 1.5" 2>/dev/null` - else -@@ -33090,39 +35016,39 @@ fi - echo "$EGL_PKG_ERRORS" >&5 - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: EGL 1.5+ not available. Will use GLX." >&5 --$as_echo "$as_me: EGL 1.5+ not available. Will use GLX." >&6;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: EGL 1.5+ not available. Will use GLX." >&5 -+printf "%s\n" "$as_me: EGL 1.5+ not available. Will use GLX." >&6;} - - - elif test $pkg_failed = untried; then - -- { $as_echo "$as_me:${as_lineno-$LINENO}: EGL 1.5+ not available. Will use GLX." >&5 --$as_echo "$as_me: EGL 1.5+ not available. Will use GLX." >&6;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: EGL 1.5+ not available. Will use GLX." >&5 -+printf "%s\n" "$as_me: EGL 1.5+ not available. Will use GLX." >&6;} - - - else - EGL_CFLAGS=$pkg_cv_EGL_CFLAGS - EGL_LIBS=$pkg_cv_EGL_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; } - - OPENGL_LIBS="$OPENGL_LIBS $EGL_LIBS" -- $as_echo "#define wxUSE_GLCANVAS_EGL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_GLCANVAS_EGL 1" >>confdefs.h - - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WAYLAND_EGL" >&5 --$as_echo_n "checking for WAYLAND_EGL... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for WAYLAND_EGL" >&5 -+printf %s "checking for WAYLAND_EGL... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$WAYLAND_EGL_CFLAGS"; then - pkg_cv_WAYLAND_EGL_CFLAGS="$WAYLAND_EGL_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-egl\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-egl\""; } >&5 - ($PKG_CONFIG --exists --print-errors "wayland-egl") 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_WAYLAND_EGL_CFLAGS=`$PKG_CONFIG --cflags "wayland-egl" 2>/dev/null` - else -@@ -33137,10 +35063,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_WAYLAND_EGL_LIBS="$WAYLAND_EGL_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-egl\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-egl\""; } >&5 - ($PKG_CONFIG --exists --print-errors "wayland-egl") 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_WAYLAND_EGL_LIBS=`$PKG_CONFIG --libs "wayland-egl" 2>/dev/null` - else -@@ -33176,8 +35102,8 @@ elif test $pkg_failed = untried; then - else - WAYLAND_EGL_CFLAGS=$pkg_cv_WAYLAND_EGL_CFLAGS - WAYLAND_EGL_LIBS=$pkg_cv_WAYLAND_EGL_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; } - - if test $wx_cv_gdk_wayland = "yes"; then - OPENGL_LIBS="$OPENGL_LIBS $WAYLAND_EGL_LIBS" -@@ -33188,8 +35114,8 @@ fi - - fi - if test "$have_wayland" != 1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: wxGLCanvas will not have Wayland support" >&5 --$as_echo "$as_me: wxGLCanvas will not have Wayland support" >&6;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: wxGLCanvas will not have Wayland support" >&5 -+printf "%s\n" "$as_me: wxGLCanvas will not have Wayland support" >&6;} - fi - fi - fi -@@ -33207,12 +35133,13 @@ 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 -- case $PKG_CONFIG in -+{ 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 case e in #( -+ e) case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; -@@ -33221,11 +35148,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 -@@ -33233,15 +35164,16 @@ done - IFS=$as_save_IFS - - ;; -+esac ;; - 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 - - -@@ -33250,12 +35182,13 @@ 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 -- case $ac_pt_PKG_CONFIG in -+{ 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 case e in #( -+ e) 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. - ;; -@@ -33264,11 +35197,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 -@@ -33276,15 +35213,16 @@ done - IFS=$as_save_IFS - - ;; -+esac ;; - 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 -@@ -33292,8 +35230,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 -@@ -33305,32 +35243,32 @@ 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 6> /dev/null - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MesaGL" >&5 --$as_echo_n "checking for MesaGL... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MesaGL" >&5 -+printf %s "checking for MesaGL... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$MesaGL_CFLAGS"; then - pkg_cv_MesaGL_CFLAGS="$MesaGL_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 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_MesaGL_CFLAGS=`$PKG_CONFIG --cflags "$fl_pkgname" 2>/dev/null` - else -@@ -33345,10 +35283,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_MesaGL_LIBS="$MesaGL_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 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_MesaGL_LIBS=`$PKG_CONFIG --libs "$fl_pkgname" 2>/dev/null` - else -@@ -33379,43 +35317,51 @@ fi - - if test "x$ac_find_libraries" = "x"; then - if test "xglEnable" != "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glEnable in -lMesaGL" >&5 --$as_echo_n "checking for glEnable in -lMesaGL... " >&6; } --if ${ac_cv_lib_MesaGL_glEnable+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glEnable in -lMesaGL" >&5 -+printf %s "checking for glEnable in -lMesaGL... " >&6; } -+if test ${ac_cv_lib_MesaGL_glEnable+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lMesaGL $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char glEnable (); -+char glEnable (void); - int --main () -+main (void) - { - return glEnable (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_MesaGL_glEnable=yes --else -- ac_cv_lib_MesaGL_glEnable=no -+else case e in #( -+ e) ac_cv_lib_MesaGL_glEnable=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_MesaGL_glEnable" >&5 --$as_echo "$ac_cv_lib_MesaGL_glEnable" >&6; } --if test "x$ac_cv_lib_MesaGL_glEnable" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_MesaGL_glEnable" >&5 -+printf "%s\n" "$ac_cv_lib_MesaGL_glEnable" >&6; } -+if test "x$ac_cv_lib_MesaGL_glEnable" = xyes -+then : - ac_find_libraries="std" - fi - -@@ -33423,8 +35369,8 @@ fi - fi - - if test "x$ac_find_libraries" = "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 --$as_echo_n "checking elsewhere... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 -+printf %s "checking elsewhere... " >&6; } - - ac_find_libraries= - for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB -@@ -33438,11 +35384,11 @@ $as_echo_n "checking elsewhere... " >&6; } - done - - if test "x$ac_find_libraries" != "x"; 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; } - fi - fi - -@@ -33450,43 +35396,51 @@ elif test $pkg_failed = untried; then - - if test "x$ac_find_libraries" = "x"; then - if test "xglEnable" != "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glEnable in -lMesaGL" >&5 --$as_echo_n "checking for glEnable in -lMesaGL... " >&6; } --if ${ac_cv_lib_MesaGL_glEnable+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glEnable in -lMesaGL" >&5 -+printf %s "checking for glEnable in -lMesaGL... " >&6; } -+if test ${ac_cv_lib_MesaGL_glEnable+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lMesaGL $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char glEnable (); -+char glEnable (void); - int --main () -+main (void) - { - return glEnable (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_MesaGL_glEnable=yes --else -- ac_cv_lib_MesaGL_glEnable=no -+else case e in #( -+ e) ac_cv_lib_MesaGL_glEnable=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_MesaGL_glEnable" >&5 --$as_echo "$ac_cv_lib_MesaGL_glEnable" >&6; } --if test "x$ac_cv_lib_MesaGL_glEnable" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_MesaGL_glEnable" >&5 -+printf "%s\n" "$ac_cv_lib_MesaGL_glEnable" >&6; } -+if test "x$ac_cv_lib_MesaGL_glEnable" = xyes -+then : - ac_find_libraries="std" - fi - -@@ -33494,8 +35448,8 @@ fi - fi - - if test "x$ac_find_libraries" = "x"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 --$as_echo_n "checking elsewhere... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 -+printf %s "checking elsewhere... " >&6; } - - ac_find_libraries= - for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB -@@ -33509,19 +35463,19 @@ $as_echo_n "checking elsewhere... " >&6; } - done - - if test "x$ac_find_libraries" != "x"; 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; } - fi - fi - - else - MesaGL_CFLAGS=$pkg_cv_MesaGL_CFLAGS - MesaGL_LIBS=$pkg_cv_MesaGL_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; } - - ac_find_libraries="std" - -@@ -33563,24 +35517,22 @@ fi - fi - - -- - fi - - -- - if test "x$OPENGL_LIBS" = "x"; then - if test "$wxUSE_OPENGL" = "yes"; then - as_fn_error $? "OpenGL libraries not available" "$LINENO" 5 - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OpenGL libraries not available, disabling support for OpenGL" >&5 --$as_echo "$as_me: WARNING: OpenGL libraries not available, disabling support for OpenGL" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: OpenGL libraries not available, disabling support for OpenGL" >&5 -+printf "%s\n" "$as_me: WARNING: OpenGL libraries not available, disabling support for OpenGL" >&2;} - wxUSE_OPENGL=no - USE_OPENGL=0 - fi - fi - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5 --$as_echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5 -+printf "%s\n" "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;} - wxUSE_OPENGL="no" - fi - -@@ -33590,9 +35542,9 @@ $as_echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library wil - - if test "$wxUSE_OPENGL" = "yes"; then - USE_OPENGL=1 -- $as_echo "#define wxUSE_OPENGL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_OPENGL 1" >>confdefs.h - -- $as_echo "#define wxUSE_GLCANVAS 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_GLCANVAS 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl/cube opengl/penguin opengl/isosurf opengl/pyramid" - SAMPLES_SUBTREES="$SAMPLES_SUBTREES opengl" -@@ -33615,12 +35567,13 @@ if test "$wxUSE_SHARED" = "yes"; then - ;; - - *) -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker accepts --version-script" >&5 --$as_echo_n "checking if the linker accepts --version-script... " >&6; } --if ${wx_cv_version_script+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker accepts --version-script" >&5 -+printf %s "checking if the linker accepts --version-script... " >&6; } -+if test ${wx_cv_version_script+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - echo "VER_1 { *; };" >conftest.sym - echo "int main() { return 0; }" >conftest.cpp - -@@ -33630,7 +35583,7 @@ else - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&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 - if test -s conftest.stderr ; then - wx_cv_version_script=no -@@ -33653,7 +35606,7 @@ else - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&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; }; } && - { ac_try=' - $CXX -shared -fPIC -o conftest2.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp -@@ -33661,7 +35614,7 @@ else - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&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 - if { ac_try=' -@@ -33670,7 +35623,7 @@ else - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&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 - wx_cv_version_script=yes -@@ -33682,10 +35635,11 @@ else - - rm -f conftest.output conftest.stderr conftest.sym conftest.cpp - rm -f conftest1.output conftest2.output conftest3.output -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_version_script" >&5 --$as_echo "$wx_cv_version_script" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_version_script" >&5 -+printf "%s\n" "$wx_cv_version_script" >&6; } - - if test $wx_cv_version_script = yes ; then - LDFLAGS_VERSIONING="-Wl,--version-script,\$(wx_top_builddir)/version-script" -@@ -33700,12 +35654,13 @@ $as_echo "$wx_cv_version_script" >&6; } - if test -n "$GCC"; then - CFLAGS_VISIBILITY="-fvisibility=hidden" - CXXFLAGS_VISIBILITY="-fvisibility=hidden -fvisibility-inlines-hidden" -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for symbols visibility support" >&5 --$as_echo_n "checking for symbols visibility support... " >&6; } -- if ${wx_cv_cc_visibility+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for symbols visibility support" >&5 -+printf %s "checking for symbols visibility support... " >&6; } -+ if test ${wx_cv_cc_visibility+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - wx_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY" - ac_ext=cpp -@@ -33755,37 +35710,41 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - }; - - int --main () -+main (void) - { - - ; - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_cc_visibility=yes --else -- wx_cv_cc_visibility=no -+else case e in #( -+ e) wx_cv_cc_visibility=no ;; -+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 - 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 - -- CXXFLAGS="$wx_save_CXXFLAGS" -+ CXXFLAGS="$wx_save_CXXFLAGS" ;; -+esac - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_cc_visibility" >&5 --$as_echo "$wx_cv_cc_visibility" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_cc_visibility" >&5 -+printf "%s\n" "$wx_cv_cc_visibility" >&6; } - if test $wx_cv_cc_visibility = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken libstdc++ visibility" >&5 --$as_echo_n "checking for broken libstdc++ visibility... " >&6; } -- if ${wx_cv_cc_broken_libstdcxx_visibility+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for broken libstdc++ visibility" >&5 -+printf %s "checking for broken libstdc++ visibility... " >&6; } -+ if test ${wx_cv_cc_broken_libstdcxx_visibility+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - wx_save_CXXFLAGS="$CXXFLAGS" - wx_save_LDFLAGS="$LDFLAGS" - CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY" -@@ -33802,7 +35761,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - #include - - int --main () -+main (void) - { - - std::string s("hello"); -@@ -33812,12 +35771,14 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_link "$LINENO"; then : -+if ac_fn_cxx_try_link "$LINENO" -+then : - wx_cv_cc_broken_libstdcxx_visibility=no --else -- wx_cv_cc_broken_libstdcxx_visibility=yes -+else case e in #( -+ e) wx_cv_cc_broken_libstdcxx_visibility=yes ;; -+esac - 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' -@@ -33826,19 +35787,21 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - CXXFLAGS="$wx_save_CXXFLAGS" -- LDFLAGS="$wx_save_LDFLAGS" -+ LDFLAGS="$wx_save_LDFLAGS" ;; -+esac - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_cc_broken_libstdcxx_visibility" >&5 --$as_echo "$wx_cv_cc_broken_libstdcxx_visibility" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_cc_broken_libstdcxx_visibility" >&5 -+printf "%s\n" "$wx_cv_cc_broken_libstdcxx_visibility" >&6; } - - if test $wx_cv_cc_broken_libstdcxx_visibility = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can work around it" >&5 --$as_echo_n "checking whether we can work around it... " >&6; } -- if ${wx_cv_cc_visibility_workaround+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we can work around it" >&5 -+printf %s "checking whether we can work around it... " >&6; } -+ if test ${wx_cv_cc_visibility_workaround+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -33853,7 +35816,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - #pragma GCC visibility pop - - int --main () -+main (void) - { - - std::string s("hello"); -@@ -33863,12 +35826,14 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_link "$LINENO"; then : -+if ac_fn_cxx_try_link "$LINENO" -+then : - wx_cv_cc_visibility_workaround=no --else -- wx_cv_cc_visibility_workaround=yes -+else case e in #( -+ e) wx_cv_cc_visibility_workaround=yes ;; -+esac - 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' -@@ -33876,11 +35841,12 @@ 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 - -- -+ ;; -+esac - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_cc_visibility_workaround" >&5 --$as_echo "$wx_cv_cc_visibility_workaround" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_cc_visibility_workaround" >&5 -+printf "%s\n" "$wx_cv_cc_visibility_workaround" >&6; } - - if test $wx_cv_cc_visibility_workaround = no; then - wx_cv_cc_visibility=no -@@ -33889,10 +35855,10 @@ $as_echo "$wx_cv_cc_visibility_workaround" >&6; } - fi - - if test $wx_cv_cc_visibility = yes; then -- $as_echo "#define HAVE_VISIBILITY 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_VISIBILITY 1" >>confdefs.h - - if test $wx_cv_cc_broken_libstdcxx_visibility = yes; then -- $as_echo "#define HAVE_BROKEN_LIBSTDCXX_VISIBILITY 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_BROKEN_LIBSTDCXX_VISIBILITY 1" >>confdefs.h - - fi - else -@@ -33921,62 +35887,66 @@ $as_echo "$wx_cv_cc_visibility_workaround" >&6; } - - saveLdflags="$LDFLAGS" - LDFLAGS="$saveLdflags -Wl,-rpath,/" -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker accepts -rpath" >&5 --$as_echo_n "checking if the linker accepts -rpath... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker accepts -rpath" >&5 -+printf %s "checking if the linker accepts -rpath... " >&6; } - 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 : - -- { $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; } - SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib" - WXCONFIG_RPATH="-Wl,-rpath,\$libdir" - --else -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker accepts -R" >&5 --$as_echo_n "checking if the linker accepts -R... " >&6; } -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker accepts -R" >&5 -+printf %s "checking if the linker accepts -R... " >&6; } - LDFLAGS="$saveLdflags -Wl,-R,/" - 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 : - -- { $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; } - SAMPLES_RPATH_FLAG="-Wl,-R,\$(wx_top_builddir)/lib" - WXCONFIG_RPATH="-Wl,-R,\$libdir" - --else -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ ;; -+esac - 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 -- -+ ;; -+esac - 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="$saveLdflags" - ;; -@@ -34073,11 +36043,10 @@ WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_u - - - ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default" --if test "x$ac_cv_type_ssize_t" = xyes; then : -+if test "x$ac_cv_type_ssize_t" = xyes -+then : - --cat >>confdefs.h <<_ACEOF --#define HAVE_SSIZE_T 1 --_ACEOF -+printf "%s\n" "#define HAVE_SSIZE_T 1" >>confdefs.h - - - fi -@@ -34088,17 +36057,18 @@ 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 if size_t is unsigned int" >&5 --$as_echo_n "checking if size_t is unsigned int... " >&6; } --if ${wx_cv_size_t_is_uint+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if size_t is unsigned int" >&5 -+printf %s "checking if size_t is unsigned int... " >&6; } -+if test ${wx_cv_size_t_is_uint+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - - return 0; } -@@ -34111,33 +36081,37 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_size_t_is_uint=no --else -- wx_cv_size_t_is_uint=yes -- -+else case e in #( -+ e) wx_cv_size_t_is_uint=yes -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_size_t_is_uint" >&5 --$as_echo "$wx_cv_size_t_is_uint" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_size_t_is_uint" >&5 -+printf "%s\n" "$wx_cv_size_t_is_uint" >&6; } - - if test "$wx_cv_size_t_is_uint" = "yes"; then -- $as_echo "#define wxSIZE_T_IS_UINT 1" >>confdefs.h -+ printf "%s\n" "#define wxSIZE_T_IS_UINT 1" >>confdefs.h - - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if size_t is unsigned long" >&5 --$as_echo_n "checking if size_t is unsigned long... " >&6; } --if ${wx_cv_size_t_is_ulong+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if size_t is unsigned long" >&5 -+printf %s "checking if size_t is unsigned long... " >&6; } -+if test ${wx_cv_size_t_is_ulong+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - - return 0; } -@@ -34150,34 +36124,38 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_size_t_is_ulong=no --else -- wx_cv_size_t_is_ulong=yes -- -+else case e in #( -+ e) wx_cv_size_t_is_ulong=yes -+ ;; -+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 -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_size_t_is_ulong" >&5 --$as_echo "$wx_cv_size_t_is_ulong" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_size_t_is_ulong" >&5 -+printf "%s\n" "$wx_cv_size_t_is_ulong" >&6; } - - if test "$wx_cv_size_t_is_ulong" = "yes"; then -- $as_echo "#define wxSIZE_T_IS_ULONG 1" >>confdefs.h -+ printf "%s\n" "#define wxSIZE_T_IS_ULONG 1" >>confdefs.h - - fi - fi - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if wchar_t is separate type" >&5 --$as_echo_n "checking if wchar_t is separate type... " >&6; } --if ${wx_cv_wchar_t_is_separate_type+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if wchar_t is separate type" >&5 -+printf %s "checking if wchar_t is separate type... " >&6; } -+if test ${wx_cv_wchar_t_is_separate_type+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - - return 0; } -@@ -34193,23 +36171,26 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_wchar_t_is_separate_type=yes --else -- wx_cv_wchar_t_is_separate_type=no -- -+else case e in #( -+ e) wx_cv_wchar_t_is_separate_type=no -+ ;; -+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 -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_wchar_t_is_separate_type" >&5 --$as_echo "$wx_cv_wchar_t_is_separate_type" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_wchar_t_is_separate_type" >&5 -+printf "%s\n" "$wx_cv_wchar_t_is_separate_type" >&6; } - - if test "$wx_cv_wchar_t_is_separate_type" = "yes"; then -- $as_echo "#define wxWCHAR_T_IS_REAL_TYPE 1" >>confdefs.h -+ printf "%s\n" "#define wxWCHAR_T_IS_REAL_TYPE 1" >>confdefs.h - - else -- $as_echo "#define wxWCHAR_T_IS_REAL_TYPE 0" >>confdefs.h -+ printf "%s\n" "#define wxWCHAR_T_IS_REAL_TYPE 0" >>confdefs.h - - fi - -@@ -34220,17 +36201,18 @@ 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 pw_gecos in struct passwd" >&5 --$as_echo_n "checking for pw_gecos in struct passwd... " >&6; } --if ${wx_cv_struct_pw_gecos+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pw_gecos in struct passwd" >&5 -+printf %s "checking for pw_gecos in struct passwd... " >&6; } -+if test ${wx_cv_struct_pw_gecos+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - - char *p; -@@ -34241,123 +36223,142 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - - wx_cv_struct_pw_gecos=yes - --else -- -+else case e in #( -+ e) - wx_cv_struct_pw_gecos=no - -- -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_struct_pw_gecos" >&5 --$as_echo "$wx_cv_struct_pw_gecos" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_struct_pw_gecos" >&5 -+printf "%s\n" "$wx_cv_struct_pw_gecos" >&6; } - - if test "$wx_cv_struct_pw_gecos" = "yes"; then -- $as_echo "#define HAVE_PW_GECOS 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_PW_GECOS 1" >>confdefs.h - - fi - - - WCSLEN_FOUND=0 - WCHAR_LINK= --for ac_func in wcslen -+ -+ for ac_func in wcslen - do : - ac_fn_c_check_func "$LINENO" "wcslen" "ac_cv_func_wcslen" --if test "x$ac_cv_func_wcslen" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_WCSLEN 1 --_ACEOF -+if test "x$ac_cv_func_wcslen" = xyes -+then : -+ printf "%s\n" "#define HAVE_WCSLEN 1" >>confdefs.h - WCSLEN_FOUND=1 - fi --done - -+done - - if test "$WCSLEN_FOUND" = 0; then - if test "$TOOLKIT" = "MSW"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wcslen in -lmsvcrt" >&5 --$as_echo_n "checking for wcslen in -lmsvcrt... " >&6; } --if ${ac_cv_lib_msvcrt_wcslen+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wcslen in -lmsvcrt" >&5 -+printf %s "checking for wcslen in -lmsvcrt... " >&6; } -+if test ${ac_cv_lib_msvcrt_wcslen+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lmsvcrt $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char wcslen (); -+char wcslen (void); - int --main () -+main (void) - { - return wcslen (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_msvcrt_wcslen=yes --else -- ac_cv_lib_msvcrt_wcslen=no -+else case e in #( -+ e) ac_cv_lib_msvcrt_wcslen=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_msvcrt_wcslen" >&5 --$as_echo "$ac_cv_lib_msvcrt_wcslen" >&6; } --if test "x$ac_cv_lib_msvcrt_wcslen" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_msvcrt_wcslen" >&5 -+printf "%s\n" "$ac_cv_lib_msvcrt_wcslen" >&6; } -+if test "x$ac_cv_lib_msvcrt_wcslen" = xyes -+then : - WCHAR_OK=1 - fi - - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wcslen in -lw" >&5 --$as_echo_n "checking for wcslen in -lw... " >&6; } --if ${ac_cv_lib_w_wcslen+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wcslen in -lw" >&5 -+printf %s "checking for wcslen in -lw... " >&6; } -+if test ${ac_cv_lib_w_wcslen+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lw $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char wcslen (); -+char wcslen (void); - int --main () -+main (void) - { - return wcslen (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_w_wcslen=yes --else -- ac_cv_lib_w_wcslen=no -+else case e in #( -+ e) ac_cv_lib_w_wcslen=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_w_wcslen" >&5 --$as_echo "$ac_cv_lib_w_wcslen" >&6; } --if test "x$ac_cv_lib_w_wcslen" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_w_wcslen" >&5 -+printf "%s\n" "$ac_cv_lib_w_wcslen" >&6; } -+if test "x$ac_cv_lib_w_wcslen" = xyes -+then : - - WCHAR_LINK=" -lw" - WCSLEN_FOUND=1 -@@ -34368,34 +36369,49 @@ fi - fi - - if test "$WCSLEN_FOUND" = 1; then -- $as_echo "#define HAVE_WCSLEN 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_WCSLEN 1" >>confdefs.h - - fi - --for ac_func in wcsftime --do : -- ac_fn_c_check_func "$LINENO" "wcsftime" "ac_cv_func_wcsftime" --if test "x$ac_cv_func_wcsftime" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_WCSFTIME 1 --_ACEOF -+ac_fn_c_check_func "$LINENO" "wcsftime" "ac_cv_func_wcsftime" -+if test "x$ac_cv_func_wcsftime" = xyes -+then : -+ printf "%s\n" "#define HAVE_WCSFTIME 1" >>confdefs.h - - fi --done - - - if test "$wxUSE_MAC" != 1; then -- for ac_func in strnlen wcsdup wcsnlen wcscasecmp wcsncasecmp --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" "strnlen" "ac_cv_func_strnlen" -+if test "x$ac_cv_func_strnlen" = xyes -+then : -+ printf "%s\n" "#define HAVE_STRNLEN 1" >>confdefs.h -+ -+fi -+ac_fn_c_check_func "$LINENO" "wcsdup" "ac_cv_func_wcsdup" -+if test "x$ac_cv_func_wcsdup" = xyes -+then : -+ printf "%s\n" "#define HAVE_WCSDUP 1" >>confdefs.h -+ -+fi -+ac_fn_c_check_func "$LINENO" "wcsnlen" "ac_cv_func_wcsnlen" -+if test "x$ac_cv_func_wcsnlen" = xyes -+then : -+ printf "%s\n" "#define HAVE_WCSNLEN 1" >>confdefs.h -+ -+fi -+ac_fn_c_check_func "$LINENO" "wcscasecmp" "ac_cv_func_wcscasecmp" -+if test "x$ac_cv_func_wcscasecmp" = xyes -+then : -+ printf "%s\n" "#define HAVE_WCSCASECMP 1" >>confdefs.h -+ -+fi -+ac_fn_c_check_func "$LINENO" "wcsncasecmp" "ac_cv_func_wcsncasecmp" -+if test "x$ac_cv_func_wcsncasecmp" = xyes -+then : -+ printf "%s\n" "#define HAVE_WCSNCASECMP 1" >>confdefs.h - - fi --done - - fi - -@@ -34405,22 +36421,17 @@ fi - - ac_fn_c_check_type "$LINENO" "mbstate_t" "ac_cv_type_mbstate_t" "#include - " --if test "x$ac_cv_type_mbstate_t" = xyes; then : -+if test "x$ac_cv_type_mbstate_t" = xyes -+then : - --cat >>confdefs.h <<_ACEOF --#define HAVE_MBSTATE_T 1 --_ACEOF -+printf "%s\n" "#define HAVE_MBSTATE_T 1" >>confdefs.h - --for ac_func in wcsrtombs --do : -- ac_fn_c_check_func "$LINENO" "wcsrtombs" "ac_cv_func_wcsrtombs" --if test "x$ac_cv_func_wcsrtombs" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_WCSRTOMBS 1 --_ACEOF -+ac_fn_c_check_func "$LINENO" "wcsrtombs" "ac_cv_func_wcsrtombs" -+if test "x$ac_cv_func_wcsrtombs" = xyes -+then : -+ printf "%s\n" "#define HAVE_WCSRTOMBS 1" >>confdefs.h - - fi --done - - fi - -@@ -34428,12 +36439,13 @@ fi - - for wx_func in snprintf vsnprintf vsscanf - do -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 --$as_echo_n "checking for $wx_func... " >&6; } --if eval \${wx_cv_func_$wx_func+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -34442,7 +36454,7 @@ else - $ac_includes_default - - int --main () -+main (void) - { - - #ifndef $wx_func -@@ -34455,23 +36467,26 @@ main () - } - - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - eval wx_cv_func_$wx_func=yes --else -- eval wx_cv_func_$wx_func=no -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac - 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 -- -+ ;; -+esac - fi - eval ac_res=\$wx_cv_func_$wx_func -- { $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 \$wx_cv_func_$wx_func = yes - then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1 -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 - _ACEOF - - -@@ -34489,12 +36504,13 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - if test "$wx_cv_func_vsnprintf" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if vsnprintf declaration is broken" >&5 --$as_echo_n "checking if vsnprintf declaration is broken... " >&6; } --if ${wx_cv_func_broken_vsnprintf_decl+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if vsnprintf declaration is broken" >&5 -+printf %s "checking if vsnprintf declaration is broken... " >&6; } -+if test ${wx_cv_func_broken_vsnprintf_decl+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -34502,7 +36518,7 @@ else - #include - - int --main () -+main (void) - { - - char *buf; -@@ -34514,21 +36530,24 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_func_broken_vsnprintf_decl=no --else -- wx_cv_func_broken_vsnprintf_decl=yes -- -+else case e in #( -+ e) wx_cv_func_broken_vsnprintf_decl=yes -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_broken_vsnprintf_decl" >&5 --$as_echo "$wx_cv_func_broken_vsnprintf_decl" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_broken_vsnprintf_decl" >&5 -+printf "%s\n" "$wx_cv_func_broken_vsnprintf_decl" >&6; } - - if test "$wx_cv_func_broken_vsnprintf_decl" = "yes"; then -- $as_echo "#define HAVE_BROKEN_VSNPRINTF_DECL 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_BROKEN_VSNPRINTF_DECL 1" >>confdefs.h - - fi - fi -@@ -34536,23 +36555,25 @@ fi - if test "$wx_cv_func_snprintf" = "yes"; then - if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if snprintf supports positional arguments" >&5 --$as_echo_n "checking if snprintf supports positional arguments... " >&6; } --if ${wx_cv_func_snprintf_pos_params+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -- if test "$cross_compiling" = yes; then : -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming Unix98 printf() is not available, -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if snprintf supports positional arguments" >&5 -+printf %s "checking if snprintf supports positional arguments... " >&6; } -+if test ${wx_cv_func_snprintf_pos_params+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ if test "$cross_compiling" = yes -+then : -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Assuming Unix98 printf() is not available, - define HAVE_UNIX98_PRINTF as 1 in setup.h if it is available." >&5 --$as_echo "$as_me: WARNING: Assuming Unix98 printf() is not available, -+printf "%s\n" "$as_me: WARNING: Assuming Unix98 printf() is not available, - define HAVE_UNIX98_PRINTF as 1 in setup.h if it is available." >&2;} - wx_cv_func_snprintf_pos_params=no - - --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include -@@ -34567,35 +36588,40 @@ else - } - - _ACEOF --if ac_fn_cxx_try_run "$LINENO"; then : -+if ac_fn_cxx_try_run "$LINENO" -+then : - wx_cv_func_snprintf_pos_params=no --else -- wx_cv_func_snprintf_pos_params=yes -+else case e in #( -+ e) wx_cv_func_snprintf_pos_params=yes ;; -+esac - fi - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac - fi - - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_snprintf_pos_params" >&5 --$as_echo "$wx_cv_func_snprintf_pos_params" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_snprintf_pos_params" >&5 -+printf "%s\n" "$wx_cv_func_snprintf_pos_params" >&6; } - - if test "$wx_cv_func_snprintf_pos_params" = "yes"; then -- $as_echo "#define HAVE_UNIX98_PRINTF 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_UNIX98_PRINTF 1" >>confdefs.h - - fi - fi - fi - - if test "$wx_cv_func_vsscanf" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if vsscanf() declaration is broken" >&5 --$as_echo_n "checking if vsscanf() declaration is broken... " >&6; } --if ${wx_cv_func_broken_vsscanf_decl+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if vsscanf() declaration is broken" >&5 -+printf %s "checking if vsscanf() declaration is broken... " >&6; } -+if test ${wx_cv_func_broken_vsscanf_decl+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -34603,7 +36629,7 @@ else - #include - - int --main () -+main (void) - { - - const char *buf; -@@ -34614,21 +36640,24 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_func_broken_vsscanf_decl=no --else -- wx_cv_func_broken_vsscanf_decl=yes -- -+else case e in #( -+ e) wx_cv_func_broken_vsscanf_decl=yes -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_broken_vsscanf_decl" >&5 --$as_echo "$wx_cv_func_broken_vsscanf_decl" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_broken_vsscanf_decl" >&5 -+printf "%s\n" "$wx_cv_func_broken_vsscanf_decl" >&6; } - - if test "$wx_cv_func_broken_vsscanf_decl" = "yes"; then -- $as_echo "#define HAVE_BROKEN_VSSCANF_DECL 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_BROKEN_VSSCANF_DECL 1" >>confdefs.h - - fi - fi -@@ -34643,19 +36672,14 @@ wchar_headers="#include - #include " - case "${host}" in - *-*-solaris2* ) -- for ac_header in widec.h --do : -- ac_fn_c_check_header_compile "$LINENO" "widec.h" "ac_cv_header_widec_h" "$ac_includes_default -+ ac_fn_c_check_header_compile "$LINENO" "widec.h" "ac_cv_header_widec_h" "$ac_includes_default - " --if test "x$ac_cv_header_widec_h" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_WIDEC_H 1 --_ACEOF -+if test "x$ac_cv_header_widec_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_WIDEC_H 1" >>confdefs.h - - fi - --done -- - if test "$ac_cv_header_widec_h" = "yes"; then - wchar_headers="$wchar_headers - #include " -@@ -34665,12 +36689,13 @@ esac - - for wx_func in putws fputws wprintf vswprintf vswscanf - do -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 --$as_echo_n "checking for $wx_func... " >&6; } --if eval \${wx_cv_func_$wx_func+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -34679,7 +36704,7 @@ else - $ac_includes_default - - int --main () -+main (void) - { - - #ifndef $wx_func -@@ -34692,23 +36717,26 @@ main () - } - - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - eval wx_cv_func_$wx_func=yes --else -- eval wx_cv_func_$wx_func=no -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac - 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 -- -+ ;; -+esac - fi - eval ac_res=\$wx_cv_func_$wx_func -- { $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 \$wx_cv_func_$wx_func = yes - then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1 -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 - _ACEOF - - -@@ -34719,40 +36747,43 @@ _ACEOF - done - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _vsnwprintf" >&5 --$as_echo_n "checking for _vsnwprintf... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _vsnwprintf" >&5 -+printf %s "checking for _vsnwprintf... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - &_vsnwprintf; - ; - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- $as_echo "#define HAVE__VSNWPRINTF 1" >>confdefs.h -+if ac_fn_c_try_compile "$LINENO" -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ printf "%s\n" "#define HAVE__VSNWPRINTF 1" >>confdefs.h - --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -+else case e in #( -+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } ;; -+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; - - if test "$wxUSE_FILE" = "yes"; then - - for wx_func in fsync - do -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 --$as_echo_n "checking for $wx_func... " >&6; } --if eval \${wx_cv_func_$wx_func+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -34761,7 +36792,7 @@ else - $ac_includes_default - - int --main () -+main (void) - { - - #ifndef $wx_func -@@ -34774,23 +36805,26 @@ main () - } - - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - eval wx_cv_func_$wx_func=yes --else -- eval wx_cv_func_$wx_func=no -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac - 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 -- -+ ;; -+esac - fi - eval ac_res=\$wx_cv_func_$wx_func -- { $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 \$wx_cv_func_$wx_func = yes - then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1 -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 - _ACEOF - - -@@ -34802,12 +36836,13 @@ _ACEOF - - fi - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for round" >&5 --$as_echo_n "checking for round... " >&6; } --if ${wx_cv_func_round+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for round" >&5 -+printf %s "checking for round... " >&6; } -+if test ${wx_cv_func_round+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -34818,19 +36853,21 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - return int(round(0.0)) - ; - return 0; - } - _ACEOF --if ac_fn_cxx_try_link "$LINENO"; then : -+if ac_fn_cxx_try_link "$LINENO" -+then : - wx_cv_func_round=yes --else -- wx_cv_func_round=no -+else case e in #( -+ e) wx_cv_func_round=no ;; -+esac - 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' -@@ -34838,12 +36875,13 @@ 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 - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_round" >&5 --$as_echo "$wx_cv_func_round" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_round" >&5 -+printf "%s\n" "$wx_cv_func_round" >&6; } - if test "$wx_cv_func_round" = yes; then -- $as_echo "#define HAVE_ROUND 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_ROUND 1" >>confdefs.h - - fi - -@@ -34860,7 +36898,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - - # Check whether --with-libiconv-prefix was given. --if test "${with_libiconv_prefix+set}" = set; then : -+if test ${with_libiconv_prefix+y} -+then : - withval=$with_libiconv_prefix; - for dir in `echo "$withval" | tr : ' '`; do - if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi -@@ -34870,12 +36909,13 @@ if test "${with_libiconv_prefix+set}" = set; then : - fi - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 --$as_echo_n "checking for iconv... " >&6; } --if ${am_cv_func_iconv+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 -+printf %s "checking for iconv... " >&6; } -+if test ${am_cv_func_iconv+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -34883,7 +36923,7 @@ else - #include - #include - int --main () -+main (void) - { - iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); -@@ -34892,10 +36932,11 @@ iconv_t cd = iconv_open("",""); - return 0; - } - _ACEOF --if ac_fn_cxx_try_link "$LINENO"; then : -+if ac_fn_cxx_try_link "$LINENO" -+then : - am_cv_func_iconv=yes - 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 "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" -@@ -34905,7 +36946,7 @@ rm -f core conftest.err conftest.$ac_objext \ - #include - #include - int --main () -+main (void) - { - iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); -@@ -34914,28 +36955,31 @@ iconv_t cd = iconv_open("",""); - return 0; - } - _ACEOF --if ac_fn_cxx_try_link "$LINENO"; then : -+if ac_fn_cxx_try_link "$LINENO" -+then : - am_cv_lib_iconv=yes - am_cv_func_iconv=yes - 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="$am_save_LIBS" - fi -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 --$as_echo "$am_cv_func_iconv" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 -+printf "%s\n" "$am_cv_func_iconv" >&6; } - if test "$am_cv_func_iconv" = yes; then - --$as_echo "#define HAVE_ICONV 1" >>confdefs.h -+printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv needs const" >&5 --$as_echo_n "checking if iconv needs const... " >&6; } --if ${wx_cv_func_iconv_const+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if iconv needs const" >&5 -+printf %s "checking if iconv needs const... " >&6; } -+if test ${wx_cv_func_iconv_const+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include -@@ -34951,24 +36995,27 @@ size_t iconv(); - #endif - - int --main () -+main (void) - { - - ; - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_func_iconv_const="no" --else -- wx_cv_func_iconv_const="yes" -- -+else case e in #( -+ e) wx_cv_func_iconv_const="yes" -+ ;; -+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 -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_iconv_const" >&5 --$as_echo "$wx_cv_func_iconv_const" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_iconv_const" >&5 -+printf "%s\n" "$wx_cv_func_iconv_const" >&6; } - - iconv_const= - if test "x$wx_cv_func_iconv_const" = "xyes"; then -@@ -34976,9 +37023,7 @@ $as_echo "$wx_cv_func_iconv_const" >&6; } - fi - - --cat >>confdefs.h <<_ACEOF --#define ICONV_CONST $iconv_const --_ACEOF -+printf "%s\n" "#define ICONV_CONST $iconv_const" >>confdefs.h - - fi - LIBICONV= -@@ -34997,31 +37042,28 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - fi - - if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then -- for ac_func in sigaction --do : -- ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction" --if test "x$ac_cv_func_sigaction" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_SIGACTION 1 --_ACEOF -+ ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction" -+if test "x$ac_cv_func_sigaction" = xyes -+then : -+ printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h - - fi --done - - - if test "$ac_cv_func_sigaction" = "no"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No POSIX signal functions on this system, wxApp::OnFatalException will not be called" >&5 --$as_echo "$as_me: WARNING: No POSIX signal functions on this system, wxApp::OnFatalException will not be called" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: No POSIX signal functions on this system, wxApp::OnFatalException will not be called" >&5 -+printf "%s\n" "$as_me: WARNING: No POSIX signal functions on this system, wxApp::OnFatalException will not be called" >&2;} - wxUSE_ON_FATAL_EXCEPTION=no - fi - - if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sa_handler type" >&5 --$as_echo_n "checking for sa_handler type... " >&6; } --if ${wx_cv_type_sa_handler+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sa_handler type" >&5 -+printf %s "checking for sa_handler type... " >&6; } -+if test ${wx_cv_type_sa_handler+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -35032,7 +37074,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - - extern void testSigHandler(int); -@@ -35044,41 +37086,43 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - - wx_cv_type_sa_handler=int - --else -- -+else case e in #( -+ e) - wx_cv_type_sa_handler=void -- -+ ;; -+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 - 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 - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_sa_handler" >&5 --$as_echo "$wx_cv_type_sa_handler" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_sa_handler" >&5 -+printf "%s\n" "$wx_cv_type_sa_handler" >&6; } - -- cat >>confdefs.h <<_ACEOF --#define wxTYPE_SA_HANDLER $wx_cv_type_sa_handler --_ACEOF -+ printf "%s\n" "#define wxTYPE_SA_HANDLER $wx_cv_type_sa_handler" >>confdefs.h - - fi - fi - - if test "$wxUSE_STACKWALKER" = "yes" -a "$wxUSE_UNIX" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for backtrace()" >&5 --$as_echo_n "checking for backtrace()... " >&6; } --if ${wx_cv_func_backtrace+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for backtrace()" >&5 -+printf %s "checking for backtrace()... " >&6; } -+if test ${wx_cv_func_backtrace+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -35089,7 +37133,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - - void *trace[1]; -@@ -35101,13 +37145,15 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_func_backtrace=yes --else -- wx_cv_func_backtrace=no -- -+else case e in #( -+ e) wx_cv_func_backtrace=no -+ ;; -+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 - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -35115,82 +37161,96 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_backtrace" >&5 --$as_echo "$wx_cv_func_backtrace" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_backtrace" >&5 -+printf "%s\n" "$wx_cv_func_backtrace" >&6; } - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing backtrace" >&5 --$as_echo_n "checking for library containing backtrace... " >&6; } --if ${ac_cv_search_backtrace+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_func_search_save_LIBS=$LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing backtrace" >&5 -+printf %s "checking for library containing backtrace... " >&6; } -+if test ${ac_cv_search_backtrace+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_func_search_save_LIBS=$LIBS - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char backtrace (); -+char backtrace (void); - int --main () -+main (void) - { - return backtrace (); - ; - return 0; - } - _ACEOF --for ac_lib in '' execinfo; do -+for ac_lib in '' execinfo -+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_backtrace=$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_backtrace+:} false; then : -+ if test ${ac_cv_search_backtrace+y} -+then : - break - fi - done --if ${ac_cv_search_backtrace+:} false; then : -+if test ${ac_cv_search_backtrace+y} -+then : - --else -- ac_cv_search_backtrace=no -+else case e in #( -+ e) ac_cv_search_backtrace=no ;; -+esac - fi - rm conftest.$ac_ext --LIBS=$ac_func_search_save_LIBS -+LIBS=$ac_func_search_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_backtrace" >&5 --$as_echo "$ac_cv_search_backtrace" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_backtrace" >&5 -+printf "%s\n" "$ac_cv_search_backtrace" >&6; } - ac_res=$ac_cv_search_backtrace --if test "$ac_res" != no; then : -+if test "$ac_res" != no -+then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - --else -- wx_cv_func_backtrace=no -+else case e in #( -+ e) wx_cv_func_backtrace=no ;; -+esac - fi - - - if test "$wx_cv_func_backtrace" = "no"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: backtrace() is not available, wxStackWalker will not be available" >&5 --$as_echo "$as_me: WARNING: backtrace() is not available, wxStackWalker will not be available" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: backtrace() is not available, wxStackWalker will not be available" >&5 -+printf "%s\n" "$as_me: WARNING: backtrace() is not available, wxStackWalker will not be available" >&2;} - wxUSE_STACKWALKER=no - else - if test "$ac_cv_header_cxxabi_h" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __cxa_demangle() in " >&5 --$as_echo_n "checking for __cxa_demangle() in ... " >&6; } --if ${wx_cv_func_cxa_demangle+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __cxa_demangle() in " >&5 -+printf %s "checking for __cxa_demangle() in ... " >&6; } -+if test ${wx_cv_func_cxa_demangle+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -35201,7 +37261,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - - int rc; -@@ -35211,13 +37271,15 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_link "$LINENO"; then : -+if ac_fn_cxx_try_link "$LINENO" -+then : - wx_cv_func_cxa_demangle=yes --else -- wx_cv_func_cxa_demangle=no -- -+else case e in #( -+ e) wx_cv_func_cxa_demangle=no -+ ;; -+esac - 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' -@@ -35226,47 +37288,51 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_cxa_demangle" >&5 --$as_echo "$wx_cv_func_cxa_demangle" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_cxa_demangle" >&5 -+printf "%s\n" "$wx_cv_func_cxa_demangle" >&6; } - else - wx_cv_func_cxa_demangle=no - fi - - if test "$wx_cv_func_cxa_demangle" = "yes"; then -- $as_echo "#define HAVE_CXA_DEMANGLE 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_CXA_DEMANGLE 1" >>confdefs.h - - fi - fi - fi - - if test "$wxUSE_STACKWALKER" = "yes" -a "$USE_WIN32" != 1 -a "$USE_UNIX" != 1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&5 --$as_echo "$as_me: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&2;} - wxUSE_STACKWALKER=no - fi - - --for ac_func in mkstemp mktemp -+ -+ for ac_func in mkstemp mktemp - do : -- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | sed "$as_sed_sh"` - ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" --if eval test \"x\$"$as_ac_var"\" = x"yes"; then : -+if eval test \"x\$"$as_ac_var"\" = x"yes" -+then : - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `printf "%s\n" "HAVE_$ac_func" | sed "$as_sed_cpp"` 1 - _ACEOF - break - fi --done - -+done - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for statfs" >&5 --$as_echo_n "checking for statfs... " >&6; } --if ${wx_cv_func_statfs+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for statfs" >&5 -+printf %s "checking for statfs... " >&6; } -+if test ${wx_cv_func_statfs+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #if defined(__BSD__) -@@ -35277,7 +37343,7 @@ else - #endif - - int --main () -+main (void) - { - - long l; -@@ -35291,25 +37357,29 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - wx_cv_func_statfs=yes --else -- wx_cv_func_statfs=no -- -+else case e in #( -+ e) wx_cv_func_statfs=no -+ ;; -+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 -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_statfs" >&5 --$as_echo "$wx_cv_func_statfs" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_statfs" >&5 -+printf "%s\n" "$wx_cv_func_statfs" >&6; } - - if test "$wx_cv_func_statfs" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for statfs declaration" >&5 --$as_echo_n "checking for statfs declaration... " >&6; } --if ${wx_cv_func_statfs_decl+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_ext=cpp -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for statfs declaration" >&5 -+printf %s "checking for statfs declaration... " >&6; } -+if test ${wx_cv_func_statfs_decl+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_ext=cpp - 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' -@@ -35326,7 +37396,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - #endif - - int --main () -+main (void) - { - - struct statfs fs; -@@ -35336,46 +37406,50 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_func_statfs_decl=yes --else -- wx_cv_func_statfs_decl=no -- -+else case e in #( -+ e) wx_cv_func_statfs_decl=no -+ ;; -+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 - 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 - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_statfs_decl" >&5 --$as_echo "$wx_cv_func_statfs_decl" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_statfs_decl" >&5 -+printf "%s\n" "$wx_cv_func_statfs_decl" >&6; } - - if test "$wx_cv_func_statfs_decl" = "yes"; then -- $as_echo "#define HAVE_STATFS_DECL 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_STATFS_DECL 1" >>confdefs.h - - fi - - wx_cv_type_statvfs_t="struct statfs" -- $as_echo "#define HAVE_STATFS 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_STATFS 1" >>confdefs.h - - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for statvfs" >&5 --$as_echo_n "checking for statvfs... " >&6; } --if ${wx_cv_func_statvfs+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for statvfs" >&5 -+printf %s "checking for statvfs... " >&6; } -+if test ${wx_cv_func_statvfs+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include - #include - - int --main () -+main (void) - { - - statvfs("/", NULL); -@@ -35384,25 +37458,29 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - wx_cv_func_statvfs=yes --else -- wx_cv_func_statvfs=no -- -+else case e in #( -+ e) wx_cv_func_statvfs=no -+ ;; -+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 -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_statvfs" >&5 --$as_echo "$wx_cv_func_statvfs" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_statvfs" >&5 -+printf "%s\n" "$wx_cv_func_statvfs" >&6; } - - if test "$wx_cv_func_statvfs" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for statvfs argument type" >&5 --$as_echo_n "checking for statvfs argument type... " >&6; } --if ${wx_cv_type_statvfs_t+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_ext=cpp -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for statvfs argument type" >&5 -+printf %s "checking for statvfs argument type... " >&6; } -+if test ${wx_cv_type_statvfs_t+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_ext=cpp - 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' -@@ -35414,7 +37492,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - #include - - int --main () -+main (void) - { - - long l; -@@ -35428,17 +37506,18 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_type_statvfs_t=statvfs_t --else -- -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include - - int --main () -+main (void) - { - - long l; -@@ -35452,30 +37531,34 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_type_statvfs_t="struct statvfs" --else -- wx_cv_type_statvfs_t="unknown" -- -+else case e in #( -+ e) wx_cv_type_statvfs_t="unknown" -+ ;; -+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 - -+ ;; -+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 - 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 - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_statvfs_t" >&5 --$as_echo "$wx_cv_type_statvfs_t" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_statvfs_t" >&5 -+printf "%s\n" "$wx_cv_type_statvfs_t" >&6; } - - if test "$wx_cv_type_statvfs_t" != "unknown"; then -- $as_echo "#define HAVE_STATVFS 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_STATVFS 1" >>confdefs.h - - fi - else -@@ -35484,131 +37567,138 @@ $as_echo "$wx_cv_type_statvfs_t" >&6; } - fi - - if test "$wx_cv_type_statvfs_t" != "unknown"; then -- cat >>confdefs.h <<_ACEOF --#define WX_STATFS_T $wx_cv_type_statvfs_t --_ACEOF -+ printf "%s\n" "#define WX_STATFS_T $wx_cv_type_statvfs_t" >>confdefs.h - - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxGetDiskSpace() function won't work without statfs()" >&5 --$as_echo "$as_me: WARNING: wxGetDiskSpace() function won't work without statfs()" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxGetDiskSpace() function won't work without statfs()" >&5 -+printf "%s\n" "$as_me: WARNING: wxGetDiskSpace() function won't work without statfs()" >&2;} - fi - - if test "$wxUSE_SNGLINST_CHECKER" = "yes" -a "$USE_WIN32" != 1 ; then -- for ac_func in fcntl flock -+ -+ for ac_func in fcntl flock - do : -- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | sed "$as_sed_sh"` - ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" --if eval test \"x\$"$as_ac_var"\" = x"yes"; then : -+if eval test \"x\$"$as_ac_var"\" = x"yes" -+then : - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `printf "%s\n" "HAVE_$ac_func" | sed "$as_sed_cpp"` 1 - _ACEOF - break - fi --done - -+done - - if test "$ac_cv_func_fcntl" != "yes" -a "$ac_cv_func_flock" != "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxSingleInstanceChecker not available" >&5 --$as_echo "$as_me: WARNING: wxSingleInstanceChecker not available" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxSingleInstanceChecker not available" >&5 -+printf "%s\n" "$as_me: WARNING: wxSingleInstanceChecker not available" >&2;} - wxUSE_SNGLINST_CHECKER=no - fi - fi - --for ac_func in setenv putenv -+ -+ for ac_func in setenv putenv - do : -- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | sed "$as_sed_sh"` - ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" --if eval test \"x\$"$as_ac_var"\" = x"yes"; then : -+if eval test \"x\$"$as_ac_var"\" = x"yes" -+then : - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `printf "%s\n" "HAVE_$ac_func" | sed "$as_sed_cpp"` 1 - _ACEOF - break - fi --done - -+done - if test "$ac_cv_func_setenv" = "yes"; then -- for ac_func in unsetenv --do : -- ac_fn_c_check_func "$LINENO" "unsetenv" "ac_cv_func_unsetenv" --if test "x$ac_cv_func_unsetenv" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_UNSETENV 1 --_ACEOF -+ ac_fn_c_check_func "$LINENO" "unsetenv" "ac_cv_func_unsetenv" -+if test "x$ac_cv_func_unsetenv" = xyes -+then : -+ printf "%s\n" "#define HAVE_UNSETENV 1" >>confdefs.h - - fi --done - - fi - - if test "$USE_DARWIN" = 1; then -- $as_echo "#define HAVE_USLEEP 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_USLEEP 1" >>confdefs.h - - else - POSIX4_LINK= -- for ac_func in nanosleep -+ -+ for ac_func in nanosleep - do : - ac_fn_c_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep" --if test "x$ac_cv_func_nanosleep" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_NANOSLEEP 1 --_ACEOF -- $as_echo "#define HAVE_NANOSLEEP 1" >>confdefs.h -- --else -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lposix4" >&5 --$as_echo_n "checking for nanosleep in -lposix4... " >&6; } --if ${ac_cv_lib_posix4_nanosleep+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+if test "x$ac_cv_func_nanosleep" = xyes -+then : -+ printf "%s\n" "#define HAVE_NANOSLEEP 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_NANOSLEEP 1" >>confdefs.h -+ -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lposix4" >&5 -+printf %s "checking for nanosleep in -lposix4... " >&6; } -+if test ${ac_cv_lib_posix4_nanosleep+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lposix4 $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char nanosleep (); -+char nanosleep (void); - int --main () -+main (void) - { - return nanosleep (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_posix4_nanosleep=yes --else -- ac_cv_lib_posix4_nanosleep=no -+else case e in #( -+ e) ac_cv_lib_posix4_nanosleep=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_nanosleep" >&5 --$as_echo "$ac_cv_lib_posix4_nanosleep" >&6; } --if test "x$ac_cv_lib_posix4_nanosleep" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_nanosleep" >&5 -+printf "%s\n" "$ac_cv_lib_posix4_nanosleep" >&6; } -+if test "x$ac_cv_lib_posix4_nanosleep" = xyes -+then : - -- $as_echo "#define HAVE_NANOSLEEP 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_NANOSLEEP 1" >>confdefs.h - - POSIX4_LINK=" -lposix4" - --else -- -+else case e in #( -+ e) - - for wx_func in usleep - do -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 --$as_echo_n "checking for $wx_func... " >&6; } --if eval \${wx_cv_func_$wx_func+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -35617,7 +37707,7 @@ else - $ac_includes_default - - int --main () -+main (void) - { - - #ifndef $wx_func -@@ -35630,23 +37720,26 @@ main () - } - - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - eval wx_cv_func_$wx_func=yes --else -- eval wx_cv_func_$wx_func=no -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac - 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 -- -+ ;; -+esac - fi - eval ac_res=\$wx_cv_func_$wx_func -- { $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 \$wx_cv_func_$wx_func = yes - then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1 -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 - _ACEOF - - -@@ -35658,25 +37751,28 @@ _ACEOF - done - - -- -+ ;; -+esac - fi - - -- -+ ;; -+esac - fi --done - -+done - fi - - - for wx_func in uname - do -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 --$as_echo_n "checking for $wx_func... " >&6; } --if eval \${wx_cv_func_$wx_func+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -35685,7 +37781,7 @@ else - $ac_includes_default - - int --main () -+main (void) - { - - #ifndef $wx_func -@@ -35698,23 +37794,26 @@ main () - } - - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - eval wx_cv_func_$wx_func=yes --else -- eval wx_cv_func_$wx_func=no -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac - 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 -- -+ ;; -+esac - fi - eval ac_res=\$wx_cv_func_$wx_func -- { $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 \$wx_cv_func_$wx_func = yes - then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1 -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 - _ACEOF - - -@@ -35728,12 +37827,13 @@ if test "$wx_cv_func_uname" != yes; then - - for wx_func in gethostname - do -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 --$as_echo_n "checking for $wx_func... " >&6; } --if eval \${wx_cv_func_$wx_func+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -35742,7 +37842,7 @@ else - $ac_includes_default - - int --main () -+main (void) - { - - #ifndef $wx_func -@@ -35755,23 +37855,26 @@ main () - } - - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - eval wx_cv_func_$wx_func=yes --else -- eval wx_cv_func_$wx_func=no -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac - 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 -- -+ ;; -+esac - fi - eval ac_res=\$wx_cv_func_$wx_func -- { $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 \$wx_cv_func_$wx_func = yes - then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1 -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 - _ACEOF - - -@@ -35786,12 +37889,13 @@ fi - - for wx_func in strtok_r - do -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 --$as_echo_n "checking for $wx_func... " >&6; } --if eval \${wx_cv_func_$wx_func+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -35800,7 +37904,7 @@ else - $ac_includes_default - - int --main () -+main (void) - { - - #ifndef $wx_func -@@ -35813,23 +37917,26 @@ main () - } - - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - eval wx_cv_func_$wx_func=yes --else -- eval wx_cv_func_$wx_func=no -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac - 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 -- -+ ;; -+esac - fi - eval ac_res=\$wx_cv_func_$wx_func -- { $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 \$wx_cv_func_$wx_func = yes - then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1 -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 - _ACEOF - - -@@ -35841,257 +37948,302 @@ _ACEOF - - - INET_LINK= --for ac_func in inet_addr -+ -+ for ac_func in inet_addr - do : - ac_fn_c_check_func "$LINENO" "inet_addr" "ac_cv_func_inet_addr" --if test "x$ac_cv_func_inet_addr" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_INET_ADDR 1 --_ACEOF -- $as_echo "#define HAVE_INET_ADDR 1" >>confdefs.h -- --else -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_addr in -lnsl" >&5 --$as_echo_n "checking for inet_addr in -lnsl... " >&6; } --if ${ac_cv_lib_nsl_inet_addr+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+if test "x$ac_cv_func_inet_addr" = xyes -+then : -+ printf "%s\n" "#define HAVE_INET_ADDR 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_INET_ADDR 1" >>confdefs.h -+ -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inet_addr in -lnsl" >&5 -+printf %s "checking for inet_addr in -lnsl... " >&6; } -+if test ${ac_cv_lib_nsl_inet_addr+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lnsl $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char inet_addr (); -+char inet_addr (void); - int --main () -+main (void) - { - return inet_addr (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_nsl_inet_addr=yes --else -- ac_cv_lib_nsl_inet_addr=no -+else case e in #( -+ e) ac_cv_lib_nsl_inet_addr=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_inet_addr" >&5 --$as_echo "$ac_cv_lib_nsl_inet_addr" >&6; } --if test "x$ac_cv_lib_nsl_inet_addr" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_inet_addr" >&5 -+printf "%s\n" "$ac_cv_lib_nsl_inet_addr" >&6; } -+if test "x$ac_cv_lib_nsl_inet_addr" = xyes -+then : - INET_LINK="nsl" --else -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_addr in -lresolv" >&5 --$as_echo_n "checking for inet_addr in -lresolv... " >&6; } --if ${ac_cv_lib_resolv_inet_addr+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inet_addr in -lresolv" >&5 -+printf %s "checking for inet_addr in -lresolv... " >&6; } -+if test ${ac_cv_lib_resolv_inet_addr+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lresolv $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char inet_addr (); -+char inet_addr (void); - int --main () -+main (void) - { - return inet_addr (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_resolv_inet_addr=yes --else -- ac_cv_lib_resolv_inet_addr=no -+else case e in #( -+ e) ac_cv_lib_resolv_inet_addr=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_addr" >&5 --$as_echo "$ac_cv_lib_resolv_inet_addr" >&6; } --if test "x$ac_cv_lib_resolv_inet_addr" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_addr" >&5 -+printf "%s\n" "$ac_cv_lib_resolv_inet_addr" >&6; } -+if test "x$ac_cv_lib_resolv_inet_addr" = xyes -+then : - INET_LINK="resolv" --else -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_addr in -lsocket" >&5 --$as_echo_n "checking for inet_addr in -lsocket... " >&6; } --if ${ac_cv_lib_socket_inet_addr+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inet_addr in -lsocket" >&5 -+printf %s "checking for inet_addr in -lsocket... " >&6; } -+if test ${ac_cv_lib_socket_inet_addr+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lsocket $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char inet_addr (); -+char inet_addr (void); - int --main () -+main (void) - { - return inet_addr (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_socket_inet_addr=yes --else -- ac_cv_lib_socket_inet_addr=no -+else case e in #( -+ e) ac_cv_lib_socket_inet_addr=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_inet_addr" >&5 --$as_echo "$ac_cv_lib_socket_inet_addr" >&6; } --if test "x$ac_cv_lib_socket_inet_addr" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_inet_addr" >&5 -+printf "%s\n" "$ac_cv_lib_socket_inet_addr" >&6; } -+if test "x$ac_cv_lib_socket_inet_addr" = xyes -+then : - INET_LINK="socket" --else -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_addr in -lnetwork" >&5 --$as_echo_n "checking for inet_addr in -lnetwork... " >&6; } --if ${ac_cv_lib_network_inet_addr+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inet_addr in -lnetwork" >&5 -+printf %s "checking for inet_addr in -lnetwork... " >&6; } -+if test ${ac_cv_lib_network_inet_addr+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lnetwork $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char inet_addr (); -+char inet_addr (void); - int --main () -+main (void) - { - return inet_addr (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_network_inet_addr=yes --else -- ac_cv_lib_network_inet_addr=no -+else case e in #( -+ e) ac_cv_lib_network_inet_addr=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_inet_addr" >&5 --$as_echo "$ac_cv_lib_network_inet_addr" >&6; } --if test "x$ac_cv_lib_network_inet_addr" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_inet_addr" >&5 -+printf "%s\n" "$ac_cv_lib_network_inet_addr" >&6; } -+if test "x$ac_cv_lib_network_inet_addr" = xyes -+then : - INET_LINK="network" - - fi - - -- -+ ;; -+esac - fi - - -- -+ ;; -+esac - fi - - -- -+ ;; -+esac - fi - - -- -+ ;; -+esac - fi -+ - done - - --for ac_func in inet_aton -+ for ac_func in inet_aton - do : - ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton" --if test "x$ac_cv_func_inet_aton" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_INET_ATON 1 --_ACEOF -- $as_echo "#define HAVE_INET_ATON 1" >>confdefs.h -- --else -- -- as_ac_Lib=`$as_echo "ac_cv_lib_$INET_LINK''_inet_aton" | $as_tr_sh` --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -l$INET_LINK" >&5 --$as_echo_n "checking for inet_aton in -l$INET_LINK... " >&6; } --if eval \${$as_ac_Lib+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+if test "x$ac_cv_func_inet_aton" = xyes -+then : -+ printf "%s\n" "#define HAVE_INET_ATON 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_INET_ATON 1" >>confdefs.h -+ -+else case e in #( -+ e) -+ as_ac_Lib=`printf "%s\n" "ac_cv_lib_$INET_LINK""_inet_aton" | sed "$as_sed_sh"` -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -l$INET_LINK" >&5 -+printf %s "checking for inet_aton in -l$INET_LINK... " >&6; } -+if eval test \${$as_ac_Lib+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-l$INET_LINK $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char inet_aton (); -+char inet_aton (void); - int --main () -+main (void) - { - return inet_aton (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - eval "$as_ac_Lib=yes" --else -- eval "$as_ac_Lib=no" -+else case e in #( -+ e) eval "$as_ac_Lib=no" ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi - eval ac_res=\$$as_ac_Lib -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : -- $as_echo "#define HAVE_INET_ATON 1" >>confdefs.h -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+printf "%s\n" "$ac_res" >&6; } -+if eval test \"x\$"$as_ac_Lib"\" = x"yes" -+then : -+ printf "%s\n" "#define HAVE_INET_ATON 1" >>confdefs.h - - fi - -- -+ ;; -+esac - fi --done - -+done - - if test "x$INET_LINK" != "x"; then -- $as_echo "#define HAVE_INET_ADDR 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_INET_ADDR 1" >>confdefs.h - - INET_LINK=" -l$INET_LINK" - fi -@@ -36099,12 +38251,13 @@ fi - - for wx_func in fdopen - do -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 --$as_echo_n "checking for $wx_func... " >&6; } --if eval \${wx_cv_func_$wx_func+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -36113,7 +38266,7 @@ else - $ac_includes_default - - int --main () -+main (void) - { - - #ifndef $wx_func -@@ -36126,23 +38279,26 @@ main () - } - - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - eval wx_cv_func_$wx_func=yes --else -- eval wx_cv_func_$wx_func=no -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac - 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 -- -+ ;; -+esac - fi - eval ac_res=\$wx_cv_func_$wx_func -- { $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 \$wx_cv_func_$wx_func = yes - then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1 -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 - _ACEOF - - -@@ -36157,12 +38313,13 @@ if test "$wxUSE_TARSTREAM" = "yes"; then - - for wx_func in sysconf - do -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 --$as_echo_n "checking for $wx_func... " >&6; } --if eval \${wx_cv_func_$wx_func+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -36171,7 +38328,7 @@ else - $ac_includes_default - - int --main () -+main (void) - { - - #ifndef $wx_func -@@ -36184,23 +38341,26 @@ main () - } - - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - eval wx_cv_func_$wx_func=yes --else -- eval wx_cv_func_$wx_func=no -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac - 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 -- -+ ;; -+esac - fi - eval ac_res=\$wx_cv_func_$wx_func -- { $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 \$wx_cv_func_$wx_func = yes - then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1 -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 - _ACEOF - - -@@ -36214,12 +38374,13 @@ _ACEOF - - for wx_func in getpwuid_r - do -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 --$as_echo_n "checking for $wx_func... " >&6; } --if eval \${wx_cv_func_$wx_func+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -36231,7 +38392,7 @@ else - $ac_includes_default - - int --main () -+main (void) - { - - #ifndef $wx_func -@@ -36248,23 +38409,26 @@ main () - } - - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - eval wx_cv_func_$wx_func=yes --else -- eval wx_cv_func_$wx_func=no -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac - 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 -- -+ ;; -+esac - fi - eval ac_res=\$wx_cv_func_$wx_func -- { $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 \$wx_cv_func_$wx_func = yes - then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1 -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 - _ACEOF - - -@@ -36278,12 +38442,13 @@ _ACEOF - - for wx_func in getgrgid_r - do -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 --$as_echo_n "checking for $wx_func... " >&6; } --if eval \${wx_cv_func_$wx_func+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -36295,7 +38460,7 @@ else - $ac_includes_default - - int --main () -+main (void) - { - - #ifndef $wx_func -@@ -36312,23 +38477,26 @@ main () - } - - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - eval wx_cv_func_$wx_func=yes --else -- eval wx_cv_func_$wx_func=no -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac - 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 -- -+ ;; -+esac - fi - eval ac_res=\$wx_cv_func_$wx_func -- { $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 \$wx_cv_func_$wx_func = yes - then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1 -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 - _ACEOF - - -@@ -36354,8 +38522,8 @@ cat >confcache <<\_ACEOF - # config.status only pays attention to the cache file if you give it - # the --recheck option to rerun configure. - # --# `ac_cv_env_foo' variables (set or unset) will be overridden when --# loading this file, other *unset* `ac_cv_foo' will be assigned the -+# 'ac_cv_env_foo' variables (set or unset) will be overridden when -+# loading this file, other *unset* 'ac_cv_foo' will be assigned the - # following values. - - _ACEOF -@@ -36371,8 +38539,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) ;; #( -@@ -36385,14 +38553,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) -- # `set' does not quote correctly, so add quotes: double-quote -+ # 'set' does not quote correctly, so add quotes: double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( - *) -- # `set' quotes correctly as required by POSIX, so do not add quotes. -+ # 'set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | -@@ -36402,15 +38570,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 -@@ -36424,8 +38592,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 -@@ -36439,8 +38607,8 @@ if test "$TOOLKIT" != "MSW"; then - - if test "$wxUSE_THREADS" = "yes" ; then - if test "$USE_BEOS" = 1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: BeOS threads are not yet supported... disabled" >&5 --$as_echo "$as_me: WARNING: BeOS threads are not yet supported... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: BeOS threads are not yet supported... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: BeOS threads are not yet supported... disabled" >&2;} - wxUSE_THREADS="no" - fi - fi -@@ -36508,19 +38676,19 @@ $as_echo "$as_me: WARNING: BeOS threads are not yet supported... disabled" >&2;} - for flag in $THREAD_OPTS; do - case $flag in - none) -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 --$as_echo_n "checking whether pthreads work without any flags... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 -+printf %s "checking whether pthreads work without any flags... " >&6; } - ;; - - -*) -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5 --$as_echo_n "checking whether pthreads work with $flag... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5 -+printf %s "checking whether pthreads work with $flag... " >&6; } - THREADS_CFLAGS="$flag" - ;; - - *) -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 --$as_echo_n "checking for the pthreads library -l$flag... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 -+printf %s "checking for the pthreads library -l$flag... " >&6; } - THREADS_LINK="-l$flag" - ;; - esac -@@ -36534,24 +38702,25 @@ $as_echo_n "checking for the pthreads library -l$flag... " >&6; } - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - pthread_create(0,0,0,0); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - THREADS_OK=yes - 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="$save_LIBS" - CFLAGS="$save_CFLAGS" - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THREADS_OK" >&5 --$as_echo "$THREADS_OK" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THREADS_OK" >&5 -+printf "%s\n" "$THREADS_OK" >&6; } - if test "x$THREADS_OK" = "xyes"; then - break; - fi -@@ -36562,15 +38731,15 @@ $as_echo "$THREADS_OK" >&6; } - - if test "x$THREADS_OK" != "xyes"; then - wxUSE_THREADS=no -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No thread support on this system... disabled" >&5 --$as_echo "$as_me: WARNING: No thread support on this system... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: No thread support on this system... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: No thread support on this system... disabled" >&2;} - else - LDFLAGS="$THREADS_CFLAGS $LDFLAGS" - WXCONFIG_LDFLAGS="$THREADS_CFLAGS $WXCONFIG_LDFLAGS" - LIBS="$THREADS_LINK $LIBS" - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5 --$as_echo_n "checking if more special flags are required for pthreads... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5 -+printf %s "checking if more special flags are required for pthreads... " >&6; } - flag=no - case "${host}" in - *-aix*) -@@ -36591,8 +38760,8 @@ $as_echo_n "checking if more special flags are required for pthreads... " >&6; } - flag="-D_REENTRANT" - ;; - esac -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5 --$as_echo "${flag}" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5 -+printf "%s\n" "${flag}" >&6; } - if test "x$flag" != xno; then - THREADS_CFLAGS="$THREADS_CFLAGS $flag" - fi -@@ -36602,43 +38771,46 @@ $as_echo "${flag}" >&6; } - fi - - if test "$wxUSE_THREADS" = "yes" ; then -- for ac_func in pthread_setconcurrency -+ -+ for ac_func in pthread_setconcurrency - do : - ac_fn_c_check_func "$LINENO" "pthread_setconcurrency" "ac_cv_func_pthread_setconcurrency" --if test "x$ac_cv_func_pthread_setconcurrency" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_PTHREAD_SETCONCURRENCY 1 --_ACEOF -- $as_echo "#define HAVE_PTHREAD_SET_CONCURRENCY 1" >>confdefs.h -+if test "x$ac_cv_func_pthread_setconcurrency" = xyes -+then : -+ printf "%s\n" "#define HAVE_PTHREAD_SETCONCURRENCY 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_PTHREAD_SET_CONCURRENCY 1" >>confdefs.h - --else -+else case e in #( -+ e) - -- for ac_func in thr_setconcurrency -+ for ac_func in thr_setconcurrency - do : - ac_fn_c_check_func "$LINENO" "thr_setconcurrency" "ac_cv_func_thr_setconcurrency" --if test "x$ac_cv_func_thr_setconcurrency" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_THR_SETCONCURRENCY 1 --_ACEOF -- $as_echo "#define HAVE_THR_SETCONCURRENCY 1" >>confdefs.h -- --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Setting thread concurrency will not work properly" >&5 --$as_echo "$as_me: WARNING: Setting thread concurrency will not work properly" >&2;} -+if test "x$ac_cv_func_thr_setconcurrency" = xyes -+then : -+ printf "%s\n" "#define HAVE_THR_SETCONCURRENCY 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_THR_SETCONCURRENCY 1" >>confdefs.h -+ -+else case e in #( -+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Setting thread concurrency will not work properly" >&5 -+printf "%s\n" "$as_me: WARNING: Setting thread concurrency will not work properly" >&2;} ;; -+esac - fi --done - -- --fi - done -+ ;; -+esac -+fi - -+done - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_cleanup_push/pop" >&5 --$as_echo_n "checking for pthread_cleanup_push/pop... " >&6; } --if ${wx_cv_func_pthread_cleanup+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_cleanup_push/pop" >&5 -+printf %s "checking for pthread_cleanup_push/pop... " >&6; } -+if test ${wx_cv_func_pthread_cleanup+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -36651,7 +38823,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - void ThreadCleanupFunc(void *p); - - int --main () -+main (void) - { - - void *p; -@@ -36662,156 +38834,177 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - - wx_cv_func_pthread_cleanup=yes - --else -- -+else case e in #( -+ e) - wx_cv_func_pthread_cleanup=no - -- -+ ;; -+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 - 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 - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_pthread_cleanup" >&5 --$as_echo "$wx_cv_func_pthread_cleanup" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_pthread_cleanup" >&5 -+printf "%s\n" "$wx_cv_func_pthread_cleanup" >&6; } - if test "x$wx_cv_func_pthread_cleanup" = "xyes"; then -- $as_echo "#define wxHAVE_PTHREAD_CLEANUP 1" >>confdefs.h -+ printf "%s\n" "#define wxHAVE_PTHREAD_CLEANUP 1" >>confdefs.h - - fi - -- for ac_header in sched.h --do : -- ac_fn_c_check_header_compile "$LINENO" "sched.h" "ac_cv_header_sched_h" "$ac_includes_default -+ ac_fn_c_check_header_compile "$LINENO" "sched.h" "ac_cv_header_sched_h" "$ac_includes_default - " --if test "x$ac_cv_header_sched_h" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_SCHED_H 1 --_ACEOF -+if test "x$ac_cv_header_sched_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_SCHED_H 1" >>confdefs.h - - fi - --done -- - if test "$ac_cv_header_sched_h" = "yes"; then - ac_fn_c_check_func "$LINENO" "sched_yield" "ac_cv_func_sched_yield" --if test "x$ac_cv_func_sched_yield" = xyes; then : -- $as_echo "#define HAVE_SCHED_YIELD 1" >>confdefs.h -- --else -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 --$as_echo_n "checking for sched_yield in -lposix4... " >&6; } --if ${ac_cv_lib_posix4_sched_yield+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+if test "x$ac_cv_func_sched_yield" = xyes -+then : -+ printf "%s\n" "#define HAVE_SCHED_YIELD 1" >>confdefs.h -+ -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 -+printf %s "checking for sched_yield in -lposix4... " >&6; } -+if test ${ac_cv_lib_posix4_sched_yield+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lposix4 $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char sched_yield (); -+char sched_yield (void); - int --main () -+main (void) - { - return sched_yield (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_posix4_sched_yield=yes --else -- ac_cv_lib_posix4_sched_yield=no -+else case e in #( -+ e) ac_cv_lib_posix4_sched_yield=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5 --$as_echo "$ac_cv_lib_posix4_sched_yield" >&6; } --if test "x$ac_cv_lib_posix4_sched_yield" = xyes; then : -- $as_echo "#define HAVE_SCHED_YIELD 1" >>confdefs.h -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5 -+printf "%s\n" "$ac_cv_lib_posix4_sched_yield" >&6; } -+if test "x$ac_cv_lib_posix4_sched_yield" = xyes -+then : -+ printf "%s\n" "#define HAVE_SCHED_YIELD 1" >>confdefs.h - POSIX4_LINK=" -lposix4" --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxThread::Yield will not work properly" >&5 --$as_echo "$as_me: WARNING: wxThread::Yield will not work properly" >&2;} -- -+else case e in #( -+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxThread::Yield will not work properly" >&5 -+printf "%s\n" "$as_me: WARNING: wxThread::Yield will not work properly" >&2;} -+ ;; -+esac - fi - - -- -+ ;; -+esac - fi - - fi - - HAVE_PRIOR_FUNCS=0 - ac_fn_c_check_func "$LINENO" "pthread_attr_getschedpolicy" "ac_cv_func_pthread_attr_getschedpolicy" --if test "x$ac_cv_func_pthread_attr_getschedpolicy" = xyes; then : -+if test "x$ac_cv_func_pthread_attr_getschedpolicy" = xyes -+then : - ac_fn_c_check_func "$LINENO" "pthread_attr_setschedparam" "ac_cv_func_pthread_attr_setschedparam" --if test "x$ac_cv_func_pthread_attr_setschedparam" = xyes; then : -+if test "x$ac_cv_func_pthread_attr_setschedparam" = xyes -+then : - ac_fn_c_check_func "$LINENO" "sched_get_priority_max" "ac_cv_func_sched_get_priority_max" --if test "x$ac_cv_func_sched_get_priority_max" = xyes; then : -+if test "x$ac_cv_func_sched_get_priority_max" = xyes -+then : - HAVE_PRIOR_FUNCS=1 --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_get_priority_max in -lposix4" >&5 --$as_echo_n "checking for sched_get_priority_max in -lposix4... " >&6; } --if ${ac_cv_lib_posix4_sched_get_priority_max+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+else case e in #( -+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_get_priority_max in -lposix4" >&5 -+printf %s "checking for sched_get_priority_max in -lposix4... " >&6; } -+if test ${ac_cv_lib_posix4_sched_get_priority_max+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lposix4 $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char sched_get_priority_max (); -+char sched_get_priority_max (void); - int --main () -+main (void) - { - return sched_get_priority_max (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_posix4_sched_get_priority_max=yes --else -- ac_cv_lib_posix4_sched_get_priority_max=no -+else case e in #( -+ e) ac_cv_lib_posix4_sched_get_priority_max=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_get_priority_max" >&5 --$as_echo "$ac_cv_lib_posix4_sched_get_priority_max" >&6; } --if test "x$ac_cv_lib_posix4_sched_get_priority_max" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_get_priority_max" >&5 -+printf "%s\n" "$ac_cv_lib_posix4_sched_get_priority_max" >&6; } -+if test "x$ac_cv_lib_posix4_sched_get_priority_max" = xyes -+then : - - HAVE_PRIOR_FUNCS=1 - POSIX4_LINK=" -lposix4" - - fi - -- -+ ;; -+esac - fi - - -@@ -36822,52 +39015,58 @@ fi - - - if test "$HAVE_PRIOR_FUNCS" = 1; then -- $as_echo "#define HAVE_THREAD_PRIORITY_FUNCTIONS 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_THREAD_PRIORITY_FUNCTIONS 1" >>confdefs.h - - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Setting thread priority will not work" >&5 --$as_echo "$as_me: WARNING: Setting thread priority will not work" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Setting thread priority will not work" >&5 -+printf "%s\n" "$as_me: WARNING: Setting thread priority will not work" >&2;} - fi - - ac_fn_c_check_func "$LINENO" "pthread_cancel" "ac_cv_func_pthread_cancel" --if test "x$ac_cv_func_pthread_cancel" = xyes; then : -- $as_echo "#define HAVE_PTHREAD_CANCEL 1" >>confdefs.h -+if test "x$ac_cv_func_pthread_cancel" = xyes -+then : -+ printf "%s\n" "#define HAVE_PTHREAD_CANCEL 1" >>confdefs.h - --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxThread::Kill() will not work properly" >&5 --$as_echo "$as_me: WARNING: wxThread::Kill() will not work properly" >&2;} -+else case e in #( -+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxThread::Kill() will not work properly" >&5 -+printf "%s\n" "$as_me: WARNING: wxThread::Kill() will not work properly" >&2;} ;; -+esac - fi - - - ac_fn_c_check_func "$LINENO" "pthread_mutex_timedlock" "ac_cv_func_pthread_mutex_timedlock" --if test "x$ac_cv_func_pthread_mutex_timedlock" = xyes; then : -- $as_echo "#define HAVE_PTHREAD_MUTEX_TIMEDLOCK 1" >>confdefs.h -+if test "x$ac_cv_func_pthread_mutex_timedlock" = xyes -+then : -+ printf "%s\n" "#define HAVE_PTHREAD_MUTEX_TIMEDLOCK 1" >>confdefs.h - --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxMutex::LockTimeout() will not work" >&5 --$as_echo "$as_me: WARNING: wxMutex::LockTimeout() will not work" >&2;} -+else case e in #( -+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxMutex::LockTimeout() will not work" >&5 -+printf "%s\n" "$as_me: WARNING: wxMutex::LockTimeout() will not work" >&2;} ;; -+esac - fi - - - ac_fn_c_check_func "$LINENO" "pthread_attr_setstacksize" "ac_cv_func_pthread_attr_setstacksize" --if test "x$ac_cv_func_pthread_attr_setstacksize" = xyes; then : -- $as_echo "#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1" >>confdefs.h -+if test "x$ac_cv_func_pthread_attr_setstacksize" = xyes -+then : -+ printf "%s\n" "#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1" >>confdefs.h - - fi - - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutexattr_t" >&5 --$as_echo_n "checking for pthread_mutexattr_t... " >&6; } --if ${wx_cv_type_pthread_mutexattr_t+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_mutexattr_t" >&5 -+printf %s "checking for pthread_mutexattr_t... " >&6; } -+if test ${wx_cv_type_pthread_mutexattr_t+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - - pthread_mutexattr_t attr; -@@ -36877,33 +39076,37 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - wx_cv_type_pthread_mutexattr_t=yes --else -- wx_cv_type_pthread_mutexattr_t=no -- -+else case e in #( -+ e) wx_cv_type_pthread_mutexattr_t=no -+ ;; -+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 -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_pthread_mutexattr_t" >&5 --$as_echo "$wx_cv_type_pthread_mutexattr_t" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_pthread_mutexattr_t" >&5 -+printf "%s\n" "$wx_cv_type_pthread_mutexattr_t" >&6; } - - if test "$wx_cv_type_pthread_mutexattr_t" = "yes"; then -- $as_echo "#define HAVE_PTHREAD_MUTEXATTR_T 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_PTHREAD_MUTEXATTR_T 1" >>confdefs.h - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutexattr_settype declaration" >&5 --$as_echo_n "checking for pthread_mutexattr_settype declaration... " >&6; } --if ${wx_cv_func_pthread_mutexattr_settype_decl+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_mutexattr_settype declaration" >&5 -+printf %s "checking for pthread_mutexattr_settype declaration... " >&6; } -+if test ${wx_cv_func_pthread_mutexattr_settype_decl+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - - pthread_mutexattr_t attr; -@@ -36913,33 +39116,37 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - wx_cv_func_pthread_mutexattr_settype_decl=yes --else -- wx_cv_func_pthread_mutexattr_settype_decl=no -- -+else case e in #( -+ e) wx_cv_func_pthread_mutexattr_settype_decl=no -+ ;; -+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 -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_pthread_mutexattr_settype_decl" >&5 --$as_echo "$wx_cv_func_pthread_mutexattr_settype_decl" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_pthread_mutexattr_settype_decl" >&5 -+printf "%s\n" "$wx_cv_func_pthread_mutexattr_settype_decl" >&6; } - if test "$wx_cv_func_pthread_mutexattr_settype_decl" = "yes"; then -- $as_echo "#define HAVE_PTHREAD_MUTEXATTR_SETTYPE_DECL 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_PTHREAD_MUTEXATTR_SETTYPE_DECL 1" >>confdefs.h - - fi - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5 --$as_echo_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER... " >&6; } --if ${wx_cv_type_pthread_rec_mutex_init+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5 -+printf %s "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER... " >&6; } -+if test ${wx_cv_type_pthread_rec_mutex_init+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - - pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; -@@ -36948,42 +39155,46 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - - wx_cv_type_pthread_rec_mutex_init=yes - --else -- -+else case e in #( -+ e) - wx_cv_type_pthread_rec_mutex_init=no - -- -+ ;; -+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 -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_pthread_rec_mutex_init" >&5 --$as_echo "$wx_cv_type_pthread_rec_mutex_init" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_pthread_rec_mutex_init" >&5 -+printf "%s\n" "$wx_cv_type_pthread_rec_mutex_init" >&6; } - if test "$wx_cv_type_pthread_rec_mutex_init" = "yes"; then -- $as_echo "#define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1" >>confdefs.h - - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxMutex won't be recursive on this platform" >&5 --$as_echo "$as_me: WARNING: wxMutex won't be recursive on this platform" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxMutex won't be recursive on this platform" >&5 -+printf "%s\n" "$as_me: WARNING: wxMutex won't be recursive on this platform" >&2;} - fi - fi - - if test "$wxUSE_COMPILER_TLS" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread keyword" >&5 --$as_echo_n "checking for __thread keyword... " >&6; } --if ${wx_cv_cc___thread+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __thread keyword" >&5 -+printf %s "checking for __thread keyword... " >&6; } -+if test ${wx_cv_cc___thread+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - - static __thread int n = 0; -@@ -36993,18 +39204,21 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - wx_cv_cc___thread=yes --else -- wx_cv_cc___thread=no -- -+else case e in #( -+ e) wx_cv_cc___thread=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_cc___thread" >&5 --$as_echo "$wx_cv_cc___thread" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_cc___thread" >&5 -+printf "%s\n" "$wx_cv_cc___thread" >&6; } - - if test "$wx_cv_cc___thread" = "yes"; then - -@@ -37012,22 +39226,25 @@ $as_echo "$wx_cv_cc___thread" >&6; } - - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc accepts -dumpversion option" >&5 --$as_echo_n "checking if gcc accepts -dumpversion option... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if gcc accepts -dumpversion option" >&5 -+printf %s "checking if gcc accepts -dumpversion option... " >&6; } - -- if test "x$GCC" = "xyes" ; then : -+ if test "x$GCC" = "xyes" -+then : - -- if test -z "" ; then : -+ if test -z "" -+then : - - ax_gcc_option_test="int main() - { - return 0; - }" - --else -- -+else case e in #( -+ e) - ax_gcc_option_test="" -- -+ ;; -+esac - fi - - # Dump the test program to file -@@ -37040,59 +39257,67 @@ EOF - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&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; }; } - - if { ac_try='$CC -dumpversion -c conftest.c 1>&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 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 : - -- { $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; } - - ax_gcc_version_option=yes - - --else -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } - - ax_gcc_version_option=no - -- -+ ;; -+esac - fi - --else -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no gcc available" >&5 --$as_echo "no gcc available" >&6; } -- -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no gcc available" >&5 -+printf "%s\n" "no gcc available" >&6; } -+ ;; -+esac - fi - -- if test "x$GXX" = "xyes"; then : -+ if test "x$GXX" = "xyes" -+then : - -- if test "x$ax_gxx_version_option" != "no"; then : -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking gxx version" >&5 --$as_echo_n "checking gxx version... " >&6; } --if ${ax_cv_gxx_version+:} false; then : -- $as_echo_n "(cached) " >&6 --else -+ if test "x$ax_gxx_version_option" != "no" -+then : - -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking gxx version" >&5 -+printf %s "checking gxx version... " >&6; } -+if test ${ax_cv_gxx_version+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - ax_cv_gxx_version="`$CXX -dumpversion`" -- if test "x$ax_cv_gxx_version" = "x"; then : -+ if test "x$ax_cv_gxx_version" = "x" -+then : - - ax_cv_gxx_version="" - - fi -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_gxx_version" >&5 --$as_echo "$ax_cv_gxx_version" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_gxx_version" >&5 -+printf "%s\n" "$ax_cv_gxx_version" >&6; } - GXX_VERSION=$ax_cv_gxx_version - - fi -@@ -37101,35 +39326,36 @@ fi - - - if test -n "$ax_cv_gxx_version"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __thread support in g++ is usable" >&5 --$as_echo_n "checking whether __thread support in g++ is usable... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether __thread support in g++ is usable" >&5 -+printf %s "checking whether __thread support in g++ is usable... " >&6; } - case "$ax_cv_gxx_version" in - 1.* | 2.* | 3.* ) -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, it's broken" >&5 --$as_echo "no, it's broken" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, it's broken" >&5 -+printf "%s\n" "no, it's broken" >&6; } - wx_cv_cc___thread=no - ;; - *) -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, it works" >&5 --$as_echo "yes, it works" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, it works" >&5 -+printf "%s\n" "yes, it works" >&6; } - ;; - esac - fi - fi - - if test "$wx_cv_cc___thread" = "yes"; then -- $as_echo "#define HAVE___THREAD_KEYWORD 1" >>confdefs.h -+ printf "%s\n" "#define HAVE___THREAD_KEYWORD 1" >>confdefs.h - - fi - fi - - if test "$ac_cv_header_cxxabi_h" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for abi::__forced_unwind() in " >&5 --$as_echo_n "checking for abi::__forced_unwind() in ... " >&6; } --if ${wx_cv_type_abi_forced_unwind+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for abi::__forced_unwind() in " >&5 -+printf %s "checking for abi::__forced_unwind() in ... " >&6; } -+if test ${wx_cv_type_abi_forced_unwind+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -37140,7 +39366,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - - void foo(abi::__forced_unwind&); -@@ -37149,13 +39375,15 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_type_abi_forced_unwind=yes --else -- wx_cv_type_abi_forced_unwind=no -- -+else case e in #( -+ e) wx_cv_type_abi_forced_unwind=no -+ ;; -+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 - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -37163,16 +39391,17 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_abi_forced_unwind" >&5 --$as_echo "$wx_cv_type_abi_forced_unwind" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_abi_forced_unwind" >&5 -+printf "%s\n" "$wx_cv_type_abi_forced_unwind" >&6; } - else - wx_cv_type_abi_forced_unwind=no - fi - - if test "$wx_cv_type_abi_forced_unwind" = "yes"; then -- $as_echo "#define HAVE_ABI_FORCEDUNWIND 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_ABI_FORCEDUNWIND 1" >>confdefs.h - - fi - fi -@@ -37183,19 +39412,20 @@ else - x86_64-*-mingw* ) - ;; - *-*-mingw32* ) -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports -mthreads" >&5 --$as_echo_n "checking if compiler supports -mthreads... " >&6; } --if ${wx_cv_cflags_mthread+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler supports -mthreads" >&5 -+printf %s "checking if compiler supports -mthreads... " >&6; } -+if test ${wx_cv_cflags_mthread+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - CFLAGS_OLD="$CFLAGS" - CFLAGS="-mthreads $CFLAGS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #ifdef __clang__ -@@ -37206,18 +39436,21 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - wx_cv_cflags_mthread=yes --else -- wx_cv_cflags_mthread=no -- -+else case e in #( -+ e) wx_cv_cflags_mthread=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_cflags_mthread" >&5 --$as_echo "$wx_cv_cflags_mthread" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_cflags_mthread" >&5 -+printf "%s\n" "$wx_cv_cflags_mthread" >&6; } - - if test "$wx_cv_cflags_mthread" = "yes"; then - WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -mthreads" -@@ -37231,14 +39464,16 @@ $as_echo "$wx_cv_cflags_mthread" >&6; } - fi - - ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r" --if test "x$ac_cv_func_localtime_r" = xyes; then : -- $as_echo "#define HAVE_LOCALTIME_R 1" >>confdefs.h -+if test "x$ac_cv_func_localtime_r" = xyes -+then : -+ printf "%s\n" "#define HAVE_LOCALTIME_R 1" >>confdefs.h - - fi - - ac_fn_c_check_func "$LINENO" "gmtime_r" "ac_cv_func_gmtime_r" --if test "x$ac_cv_func_gmtime_r" = xyes; then : -- $as_echo "#define HAVE_GMTIME_R 1" >>confdefs.h -+if test "x$ac_cv_func_gmtime_r" = xyes -+then : -+ printf "%s\n" "#define HAVE_GMTIME_R 1" >>confdefs.h - - fi - -@@ -37251,13 +39486,14 @@ 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 many arguments gethostbyname_r() takes" >&5 --$as_echo_n "checking how many arguments gethostbyname_r() takes... " >&6; } -- -- if ${ac_cv_func_which_gethostbyname_r+:} false; then : -- $as_echo_n "(cached) " >&6 --else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how many arguments gethostbyname_r() takes" >&5 -+printf %s "checking how many arguments gethostbyname_r() takes... " >&6; } - -+ if test ${ac_cv_func_which_gethostbyname_r+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - - ################################################################ - -@@ -37276,7 +39512,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - - char *name = "www.gnu.org"; -@@ -37286,10 +39522,11 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - ac_cv_func_which_gethostbyname_r=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 - - # - # SIX ARGUMENTS -@@ -37302,7 +39539,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - - char *name = "www.gnu.org"; -@@ -37316,10 +39553,11 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - ac_cv_func_which_gethostbyname_r=six - 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 - -@@ -37334,7 +39572,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - - char *name = "www.gnu.org"; -@@ -37348,10 +39586,11 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - ac_cv_func_which_gethostbyname_r=five - 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 - -@@ -37366,7 +39605,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - - char *name = "www.gnu.org"; -@@ -37378,59 +39617,61 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - ac_cv_func_which_gethostbyname_r=three - 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 - - ################################################################ - -- -+ ;; -+esac - fi - - case "$ac_cv_func_which_gethostbyname_r" in - three|five|six) - --$as_echo "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h -+printf "%s\n" "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h - - ;; - esac - - case "$ac_cv_func_which_gethostbyname_r" in - three) -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: three" >&5 --$as_echo "three" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: three" >&5 -+printf "%s\n" "three" >&6; } - --$as_echo "#define HAVE_FUNC_GETHOSTBYNAME_R_3 1" >>confdefs.h -+printf "%s\n" "#define HAVE_FUNC_GETHOSTBYNAME_R_3 1" >>confdefs.h - - ;; - - five) -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: five" >&5 --$as_echo "five" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: five" >&5 -+printf "%s\n" "five" >&6; } - --$as_echo "#define HAVE_FUNC_GETHOSTBYNAME_R_5 1" >>confdefs.h -+printf "%s\n" "#define HAVE_FUNC_GETHOSTBYNAME_R_5 1" >>confdefs.h - - ;; - - six) -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: six" >&5 --$as_echo "six" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: six" >&5 -+printf "%s\n" "six" >&6; } - --$as_echo "#define HAVE_FUNC_GETHOSTBYNAME_R_6 1" >>confdefs.h -+printf "%s\n" "#define HAVE_FUNC_GETHOSTBYNAME_R_6 1" >>confdefs.h - - ;; - - no) -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot find function declaration in netdb.h" >&5 --$as_echo "cannot find function declaration in netdb.h" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cannot find function declaration in netdb.h" >&5 -+printf "%s\n" "cannot find function declaration in netdb.h" >&6; } - ;; - - unknown) -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: can't tell" >&5 --$as_echo "can't tell" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: can't tell" >&5 -+printf "%s\n" "can't tell" >&6; } - ;; - - *) -@@ -37449,31 +39690,34 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x$ac_cv_func_which_gethostbyname_r" = "xno" -o \ - "x$ac_cv_func_which_gethostbyname_r" = "xunknown" ; then - ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" --if test "x$ac_cv_func_gethostbyname" = xyes; then : -- $as_echo "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h -- --else -+if test "x$ac_cv_func_gethostbyname" = xyes -+then : -+ printf "%s\n" "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h - -+else case e in #( -+ e) - case "${host}" in - *-*-haiku* ) -- $as_echo "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Defining HAVE_GETHOSTBYNAME unconditionally under ${host}." >&5 --$as_echo "$as_me: WARNING: Defining HAVE_GETHOSTBYNAME unconditionally under ${host}." >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Defining HAVE_GETHOSTBYNAME unconditionally under ${host}." >&5 -+printf "%s\n" "$as_me: WARNING: Defining HAVE_GETHOSTBYNAME unconditionally under ${host}." >&2;} - ;; - esac - -- -+ ;; -+esac - fi - - fi - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how many arguments getservbyname_r() takes" >&5 --$as_echo_n "checking how many arguments getservbyname_r() takes... " >&6; } --if ${ac_cv_func_which_getservbyname_r+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how many arguments getservbyname_r() takes" >&5 -+printf %s "checking how many arguments getservbyname_r() takes... " >&6; } -+if test ${ac_cv_func_which_getservbyname_r+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -37485,7 +39729,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - - char *name; -@@ -37499,15 +39743,16 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - ac_cv_func_which_getservbyname_r=six --else -- -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - - char *name; -@@ -37521,15 +39766,16 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - ac_cv_func_which_getservbyname_r=five --else -- -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int --main () -+main (void) - { - - char *name; -@@ -37542,21 +39788,25 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - ac_cv_func_which_getservbyname_r=four --else -- ac_cv_func_which_getservbyname_r=no -- -+else case e in #( -+ e) ac_cv_func_which_getservbyname_r=no -+ ;; -+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 - -+ ;; -+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 - -+ ;; -+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 - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -37564,118 +39814,108 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_which_getservbyname_r" >&5 --$as_echo "$ac_cv_func_which_getservbyname_r" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_which_getservbyname_r" >&5 -+printf "%s\n" "$ac_cv_func_which_getservbyname_r" >&6; } - - if test $ac_cv_func_which_getservbyname_r = six; then -- $as_echo "#define HAVE_FUNC_GETSERVBYNAME_R_6 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_FUNC_GETSERVBYNAME_R_6 1" >>confdefs.h - - elif test $ac_cv_func_which_getservbyname_r = five; then -- $as_echo "#define HAVE_FUNC_GETSERVBYNAME_R_5 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_FUNC_GETSERVBYNAME_R_5 1" >>confdefs.h - - elif test $ac_cv_func_which_getservbyname_r = four; then -- $as_echo "#define HAVE_FUNC_GETSERVBYNAME_R_4 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_FUNC_GETSERVBYNAME_R_4 1" >>confdefs.h - - fi - - - if test "x$ac_cv_func_which_getservbyname_r" = "xno" -o \ - "x$ac_cv_func_which_getservbyname_r" = "xunknown" ; then -- for ac_func in getservbyname -+ -+ for ac_func in getservbyname - do : - ac_fn_c_check_func "$LINENO" "getservbyname" "ac_cv_func_getservbyname" --if test "x$ac_cv_func_getservbyname" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_GETSERVBYNAME 1 --_ACEOF -- $as_echo "#define HAVE_GETSERVBYNAME 1" >>confdefs.h -- --else -+if test "x$ac_cv_func_getservbyname" = xyes -+then : -+ printf "%s\n" "#define HAVE_GETSERVBYNAME 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_GETSERVBYNAME 1" >>confdefs.h - -+else case e in #( -+ e) - case "${host}" in - *-*-haiku* ) -- $as_echo "#define HAVE_GETSERVBYNAME 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_GETSERVBYNAME 1" >>confdefs.h - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Defining HAVE_GETSERVBYNAME unconditionally under ${host}." >&5 --$as_echo "$as_me: WARNING: Defining HAVE_GETSERVBYNAME unconditionally under ${host}." >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Defining HAVE_GETSERVBYNAME unconditionally under ${host}." >&5 -+printf "%s\n" "$as_me: WARNING: Defining HAVE_GETSERVBYNAME unconditionally under ${host}." >&2;} - ;; - esac - -- -+ ;; -+esac - fi --done - -+done - fi - --$as_echo "#define wxUSE_COMPILER_TLS 1" >>confdefs.h -+printf "%s\n" "#define wxUSE_COMPILER_TLS 1" >>confdefs.h - - - if test "$wxUSE_THREADS" = "yes"; then -- $as_echo "#define wxUSE_THREADS 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_THREADS 1" >>confdefs.h - - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread" - else - if test "$wx_cv_func_strtok_r" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -D_REENTRANT is needed" >&5 --$as_echo_n "checking if -D_REENTRANT is needed... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if -D_REENTRANT is needed" >&5 -+printf %s "checking if -D_REENTRANT is needed... " >&6; } - if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then - WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_REENTRANT" -- { $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 - fi - fi - - if test "$WXGTK4" = 1 ; then -- cat >>confdefs.h <<_ACEOF --#define __WXGTK4__ 1 --_ACEOF -+ printf "%s\n" "#define __WXGTK4__ 1" >>confdefs.h - - fi - if test "$WXGTK3" = 1 ; then -- cat >>confdefs.h <<_ACEOF --#define __WXGTK3__ 1 --_ACEOF -+ printf "%s\n" "#define __WXGTK3__ 1" >>confdefs.h - - WXGTK2=1 - fi - if test "$WXGTK2" = 1 ; then -- cat >>confdefs.h <<_ACEOF --#define __WXGTK20__ $WXGTK2 --_ACEOF -+ printf "%s\n" "#define __WXGTK20__ $WXGTK2" >>confdefs.h - - fi - - if test "$WXGTK127" = 1 ; then -- cat >>confdefs.h <<_ACEOF --#define __WXGTK127__ $WXGTK127 --_ACEOF -+ printf "%s\n" "#define __WXGTK127__ $WXGTK127" >>confdefs.h - - fi - - if test "$WXGPE" = 1 ; then -- cat >>confdefs.h <<_ACEOF --#define __WXGPE__ $WXGPE --_ACEOF -+ printf "%s\n" "#define __WXGPE__ $WXGPE" >>confdefs.h - - fi - - if test "$WXQT" = 1 ; then -- cat >>confdefs.h <<_ACEOF --#define __WXQT__ $WXQT --_ACEOF -+ printf "%s\n" "#define __WXQT__ $WXQT" >>confdefs.h - - fi - DEBUG_CFLAGS= - if `echo $CXXFLAGS $CFLAGS | grep " -g" >/dev/null`; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: CXXFLAGS/CFLAGS already contains -g flag; ignoring the --enable-debug_info option" >&5 --$as_echo "$as_me: WARNING: CXXFLAGS/CFLAGS already contains -g flag; ignoring the --enable-debug_info option" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: CXXFLAGS/CFLAGS already contains -g flag; ignoring the --enable-debug_info option" >&5 -+printf "%s\n" "$as_me: WARNING: CXXFLAGS/CFLAGS already contains -g flag; ignoring the --enable-debug_info option" >&2;} - elif test "$wxUSE_DEBUG_INFO" = "yes" ; then - DEBUG_CFLAGS="-g" - fi -@@ -37700,11 +39940,11 @@ if test "$wxUSE_DEBUG_FLAG" = "no" ; then - fi - - if test "$wxUSE_MEM_TRACING" = "yes" ; then -- $as_echo "#define wxUSE_MEMORY_TRACING 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_MEMORY_TRACING 1" >>confdefs.h - -- $as_echo "#define wxUSE_GLOBAL_MEMORY_OPERATORS 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_GLOBAL_MEMORY_OPERATORS 1" >>confdefs.h - -- $as_echo "#define wxUSE_DEBUG_NEW_ALWAYS 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_DEBUG_NEW_ALWAYS 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck" - fi -@@ -37741,8 +39981,8 @@ fi - - OPTIMISE_CFLAGS= - if `echo $CXXFLAGS $CFLAGS | grep " -O" >/dev/null`; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: CXXFLAGS/CFLAGS already contains -O flag; ignoring the --disable-optimise option" >&5 --$as_echo "$as_me: WARNING: CXXFLAGS/CFLAGS already contains -O flag; ignoring the --disable-optimise option" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: CXXFLAGS/CFLAGS already contains -O flag; ignoring the --disable-optimise option" >&5 -+printf "%s\n" "$as_me: WARNING: CXXFLAGS/CFLAGS already contains -O flag; ignoring the --disable-optimise option" >&2;} - else - if test "$wxUSE_OPTIMISE" = "no" ; then - if test "$GCC" = yes ; then -@@ -37758,33 +39998,33 @@ else - fi - - if test "x$wxUSE_REPRODUCIBLE_BUILD" = "xyes"; then -- $as_echo "#define wxUSE_REPRODUCIBLE_BUILD 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_REPRODUCIBLE_BUILD 1" >>confdefs.h - - fi - - - if test "x$WXWIN_COMPATIBILITY_2_8" = "xyes"; then -- $as_echo "#define WXWIN_COMPATIBILITY_2_8 1" >>confdefs.h -+ printf "%s\n" "#define WXWIN_COMPATIBILITY_2_8 1" >>confdefs.h - - - WXWIN_COMPATIBILITY_3_0="yes" - fi - - if test "x$WXWIN_COMPATIBILITY_3_0" != "xno"; then -- $as_echo "#define WXWIN_COMPATIBILITY_3_0 1" >>confdefs.h -+ printf "%s\n" "#define WXWIN_COMPATIBILITY_3_0 1" >>confdefs.h - - fi - - - if test "$wxUSE_GUI" = "yes"; then -- $as_echo "#define wxUSE_GUI 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_GUI 1" >>confdefs.h - - - fi - - - if test "$wxUSE_UNIX" = "yes"; then -- $as_echo "#define wxUSE_UNIX 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_UNIX 1" >>confdefs.h - - fi - -@@ -37797,131 +40037,149 @@ if test "$TOOLKIT" != "MSW"; then - if test "$USE_DOS" = 1; then - HAVE_DL_FUNCS=0 - else -- for ac_func in dlopen -+ -+ for ac_func in dlopen - do : - ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" --if test "x$ac_cv_func_dlopen" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_DLOPEN 1 --_ACEOF -+if test "x$ac_cv_func_dlopen" = xyes -+then : -+ printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h - -- $as_echo "#define HAVE_DLOPEN 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h - - HAVE_DL_FUNCS=1 - --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 -- ac_check_lib_save_LIBS=$LIBS -+else case e in #( -+ e) -+ { 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 case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-ldl $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char dlopen (); -+char dlopen (void); - 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 -- ac_cv_lib_dl_dlopen=no -+else case e in #( -+ e) ac_cv_lib_dl_dlopen=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - 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 : - -- $as_echo "#define HAVE_DLOPEN 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h - - HAVE_DL_FUNCS=1 - DL_LINK="-ldl" - - fi - -- -+ ;; -+esac - fi --done - -+done - - if test "$HAVE_DL_FUNCS" = 1; then -- for ac_func in dladdr -+ -+ for ac_func in dladdr - do : - ac_fn_c_check_func "$LINENO" "dladdr" "ac_cv_func_dladdr" --if test "x$ac_cv_func_dladdr" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_DLADDR 1 --_ACEOF -- $as_echo "#define HAVE_DLADDR 1" >>confdefs.h -- --else -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dladdr in -ldl" >&5 --$as_echo_n "checking for dladdr in -ldl... " >&6; } --if ${ac_cv_lib_dl_dladdr+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+if test "x$ac_cv_func_dladdr" = xyes -+then : -+ printf "%s\n" "#define HAVE_DLADDR 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_DLADDR 1" >>confdefs.h -+ -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dladdr in -ldl" >&5 -+printf %s "checking for dladdr in -ldl... " >&6; } -+if test ${ac_cv_lib_dl_dladdr+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-ldl $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char dladdr (); -+char dladdr (void); - int --main () -+main (void) - { - return dladdr (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_dl_dladdr=yes --else -- ac_cv_lib_dl_dladdr=no -+else case e in #( -+ e) ac_cv_lib_dl_dladdr=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dladdr" >&5 --$as_echo "$ac_cv_lib_dl_dladdr" >&6; } --if test "x$ac_cv_lib_dl_dladdr" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dladdr" >&5 -+printf "%s\n" "$ac_cv_lib_dl_dladdr" >&6; } -+if test "x$ac_cv_lib_dl_dladdr" = xyes -+then : - -- $as_echo "#define HAVE_DLADDR 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_DLADDR 1" >>confdefs.h - - DL_LINK="-ldl" - - fi - - -- -+ ;; -+esac - fi --done - -+done - fi - fi - -@@ -37932,13 +40190,13 @@ done - if test "$HAVE_DL_FUNCS" = 0; then - if test "$HAVE_SHL_FUNCS" = 0; then - if test "$USE_UNIX" = 1 -o "$USE_DOS" = 1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Missing dynamic loading support, several features will be disabled" >&5 --$as_echo "$as_me: WARNING: Missing dynamic loading support, several features will be disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Missing dynamic loading support, several features will be disabled" >&5 -+printf "%s\n" "$as_me: WARNING: Missing dynamic loading support, several features will be disabled" >&2;} - wxUSE_DYNAMIC_LOADER=no - wxUSE_DYNLIB_CLASS=no - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming wxLibrary class works on this platform" >&5 --$as_echo "$as_me: WARNING: Assuming wxLibrary class works on this platform" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Assuming wxLibrary class works on this platform" >&5 -+printf "%s\n" "$as_me: WARNING: Assuming wxLibrary class works on this platform" >&2;} - fi - fi - fi -@@ -37946,11 +40204,11 @@ $as_echo "$as_me: WARNING: Assuming wxLibrary class works on this platform" >&2; - fi - - if test "$wxUSE_DYNAMIC_LOADER" = "yes" ; then -- $as_echo "#define wxUSE_DYNAMIC_LOADER 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_DYNAMIC_LOADER 1" >>confdefs.h - - fi - if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then -- $as_echo "#define wxUSE_DYNLIB_CLASS 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_DYNLIB_CLASS 1" >>confdefs.h - - fi - -@@ -37958,77 +40216,76 @@ fi - - if test "$wxUSE_PLUGINS" = "yes" ; then - if test "$wxUSE_SHARED" = "no" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: plugins supported only in shared build, disabling" >&5 --$as_echo "$as_me: WARNING: plugins supported only in shared build, disabling" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: plugins supported only in shared build, disabling" >&5 -+printf "%s\n" "$as_me: WARNING: plugins supported only in shared build, disabling" >&2;} - wxUSE_PLUGINS=no - fi - if test "$wxUSE_MONOLITHIC" = "yes" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: plugins not supported monolithic build, disabling" >&5 --$as_echo "$as_me: WARNING: plugins not supported monolithic build, disabling" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: plugins not supported monolithic build, disabling" >&5 -+printf "%s\n" "$as_me: WARNING: plugins not supported monolithic build, disabling" >&2;} - wxUSE_PLUGINS=no - fi - if test "$wxUSE_DYNLIB_CLASS" = "no" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: plugins require wxDynamicLibrary, disabling" >&5 --$as_echo "$as_me: WARNING: plugins require wxDynamicLibrary, disabling" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: plugins require wxDynamicLibrary, disabling" >&5 -+printf "%s\n" "$as_me: WARNING: plugins require wxDynamicLibrary, disabling" >&2;} - wxUSE_PLUGINS=no - fi - if test "$wxUSE_PLUGINS" = "yes" ; then -- $as_echo "#define wxUSE_PLUGINS 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_PLUGINS 1" >>confdefs.h - - fi - fi - - if test "$wxUSE_PIC" = "no" -a "$wxUSE_SHARED" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: position independent code (PIC) can not be disabled for shared libraries" >&5 --$as_echo "$as_me: WARNING: position independent code (PIC) can not be disabled for shared libraries" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: position independent code (PIC) can not be disabled for shared libraries" >&5 -+printf "%s\n" "$as_me: WARNING: position independent code (PIC) can not be disabled for shared libraries" >&2;} - fi - - - if test "$wxUSE_FSWATCHER" = "yes"; then - if test "$USE_WIN32" != 1; then - if test "$wxUSE_UNIX" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether inotify is usable" >&5 --$as_echo_n "checking whether inotify is usable... " >&6; } --if ${wx_cv_inotify_usable+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether inotify is usable" >&5 -+printf %s "checking whether inotify is usable... " >&6; } -+if test ${wx_cv_inotify_usable+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include - int main() { return inotify_init(); } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - wx_cv_inotify_usable=yes --else -- wx_cv_inotify_usable=no -- -+else case e in #( -+ e) wx_cv_inotify_usable=no -+ ;; -+esac - 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 -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_inotify_usable" >&5 --$as_echo "$wx_cv_inotify_usable" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_inotify_usable" >&5 -+printf "%s\n" "$wx_cv_inotify_usable" >&6; } - if test "$wx_cv_inotify_usable" = "yes"; then -- $as_echo "#define wxHAS_INOTIFY 1" >>confdefs.h -+ printf "%s\n" "#define wxHAS_INOTIFY 1" >>confdefs.h - - else -- for ac_header in sys/event.h --do : -- ac_fn_c_check_header_compile "$LINENO" "sys/event.h" "ac_cv_header_sys_event_h" "$ac_includes_default -+ ac_fn_c_check_header_compile "$LINENO" "sys/event.h" "ac_cv_header_sys_event_h" "$ac_includes_default - " --if test "x$ac_cv_header_sys_event_h" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_SYS_EVENT_H 1 --_ACEOF -+if test "x$ac_cv_header_sys_event_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_SYS_EVENT_H 1" >>confdefs.h - - fi - --done -- - if test "$ac_cv_header_sys_event_h" = "yes"; then -- $as_echo "#define wxHAS_KQUEUE 1" >>confdefs.h -+ printf "%s\n" "#define wxHAS_KQUEUE 1" >>confdefs.h - - else - wxUSE_FSWATCHER=no -@@ -38039,19 +40296,19 @@ done - fi - else - if test "$wxUSE_THREADS" != "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxFileSystemWatcher disabled due to --disable-threads" >&5 --$as_echo "$as_me: WARNING: wxFileSystemWatcher disabled due to --disable-threads" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxFileSystemWatcher disabled due to --disable-threads" >&5 -+printf "%s\n" "$as_me: WARNING: wxFileSystemWatcher disabled due to --disable-threads" >&2;} - wxUSE_FSWATCHER=no - fi - fi - - if test "$wxUSE_FSWATCHER" = "yes"; then -- $as_echo "#define wxUSE_FSWATCHER 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_FSWATCHER 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS fswatcher" - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxFileSystemWatcher won't be available on this platform" >&5 --$as_echo "$as_me: WARNING: wxFileSystemWatcher won't be available on this platform" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxFileSystemWatcher won't be available on this platform" >&5 -+printf "%s\n" "$as_me: WARNING: wxFileSystemWatcher won't be available on this platform" >&2;} - fi - fi - -@@ -38059,18 +40316,18 @@ if test "$wxUSE_GTK" = 1; then - if test "$USE_WIN32" != 1 -a "$USE_DARWIN" != 1; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XKBCOMMON" >&5 --$as_echo_n "checking for XKBCOMMON... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XKBCOMMON" >&5 -+printf %s "checking for XKBCOMMON... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$XKBCOMMON_CFLAGS"; then - pkg_cv_XKBCOMMON_CFLAGS="$XKBCOMMON_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xkbcommon\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xkbcommon\""; } >&5 - ($PKG_CONFIG --exists --print-errors "xkbcommon") 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_XKBCOMMON_CFLAGS=`$PKG_CONFIG --cflags "xkbcommon" 2>/dev/null` - else -@@ -38085,10 +40342,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_XKBCOMMON_LIBS="$XKBCOMMON_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xkbcommon\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xkbcommon\""; } >&5 - ($PKG_CONFIG --exists --print-errors "xkbcommon") 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_XKBCOMMON_LIBS=`$PKG_CONFIG --libs "xkbcommon" 2>/dev/null` - else -@@ -38117,26 +40374,26 @@ fi - echo "$XKBCOMMON_PKG_ERRORS" >&5 - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libxkbcommon not found, key codes in key events may be incorrect" >&5 --$as_echo "$as_me: WARNING: libxkbcommon not found, key codes in key events may be incorrect" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libxkbcommon not found, key codes in key events may be incorrect" >&5 -+printf "%s\n" "$as_me: WARNING: libxkbcommon not found, key codes in key events may be incorrect" >&2;} - - - elif test $pkg_failed = untried; then - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libxkbcommon not found, key codes in key events may be incorrect" >&5 --$as_echo "$as_me: WARNING: libxkbcommon not found, key codes in key events may be incorrect" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libxkbcommon not found, key codes in key events may be incorrect" >&5 -+printf "%s\n" "$as_me: WARNING: libxkbcommon not found, key codes in key events may be incorrect" >&2;} - - - else - XKBCOMMON_CFLAGS=$pkg_cv_XKBCOMMON_CFLAGS - XKBCOMMON_LIBS=$pkg_cv_XKBCOMMON_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; } - - CFLAGS="$XKBCOMMON_CFLAGS $CFLAGS" - CXXFLAGS="$XKBCOMMON_CFLAGS $CXXFLAGS" - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $XKBCOMMON_LIBS" -- $as_echo "#define HAVE_XKBCOMMON 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_XKBCOMMON 1" >>confdefs.h - - - fi -@@ -38146,24 +40403,24 @@ fi - - if test "$wxUSE_SECRETSTORE" = "yes"; then - if test "$WXGTK1" = "1"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libsecret is incompatible with GTK+ 1, disabled" >&5 --$as_echo "$as_me: WARNING: libsecret is incompatible with GTK+ 1, disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libsecret is incompatible with GTK+ 1, disabled" >&5 -+printf "%s\n" "$as_me: WARNING: libsecret is incompatible with GTK+ 1, disabled" >&2;} - wxUSE_SECRETSTORE=no - elif test "$wxUSE_MSW" != "1" -a "$wxUSE_OSX_COCOA" != 1; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSECRET" >&5 --$as_echo_n "checking for LIBSECRET... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBSECRET" >&5 -+printf %s "checking for LIBSECRET... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$LIBSECRET_CFLAGS"; then - pkg_cv_LIBSECRET_CFLAGS="$LIBSECRET_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsecret-1\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsecret-1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsecret-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 - pkg_cv_LIBSECRET_CFLAGS=`$PKG_CONFIG --cflags "libsecret-1" 2>/dev/null` - else -@@ -38178,10 +40435,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_LIBSECRET_LIBS="$LIBSECRET_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsecret-1\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsecret-1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsecret-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 - pkg_cv_LIBSECRET_LIBS=`$PKG_CONFIG --libs "libsecret-1" 2>/dev/null` - else -@@ -38210,23 +40467,23 @@ fi - echo "$LIBSECRET_PKG_ERRORS" >&5 - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libsecret not found, wxSecretStore won't be available" >&5 --$as_echo "$as_me: WARNING: libsecret not found, wxSecretStore won't be available" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libsecret not found, wxSecretStore won't be available" >&5 -+printf "%s\n" "$as_me: WARNING: libsecret not found, wxSecretStore won't be available" >&2;} - wxUSE_SECRETSTORE=no - - - elif test $pkg_failed = untried; then - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libsecret not found, wxSecretStore won't be available" >&5 --$as_echo "$as_me: WARNING: libsecret not found, wxSecretStore won't be available" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libsecret not found, wxSecretStore won't be available" >&5 -+printf "%s\n" "$as_me: WARNING: libsecret not found, wxSecretStore won't be available" >&2;} - wxUSE_SECRETSTORE=no - - - else - LIBSECRET_CFLAGS=$pkg_cv_LIBSECRET_CFLAGS - LIBSECRET_LIBS=$pkg_cv_LIBSECRET_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; } - - CXXFLAGS="$LIBSECRET_CFLAGS $CXXFLAGS" - LIBS="$LIBSECRET_LIBS $LIBS" -@@ -38239,7 +40496,7 @@ fi - LIBS="-framework Security $LIBS" - fi - -- $as_echo "#define wxUSE_SECRETSTORE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_SECRETSTORE 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS secretstore" - fi -@@ -38252,18 +40509,18 @@ if test "$wxUSE_SPELLCHECK" = "yes"; then - if test "$WXGTK3" = 1; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSPELL" >&5 --$as_echo_n "checking for GSPELL... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GSPELL" >&5 -+printf %s "checking for GSPELL... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$GSPELL_CFLAGS"; then - pkg_cv_GSPELL_CFLAGS="$GSPELL_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gspell-1\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gspell-1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gspell-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 - pkg_cv_GSPELL_CFLAGS=`$PKG_CONFIG --cflags "gspell-1" 2>/dev/null` - else -@@ -38278,10 +40535,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_GSPELL_LIBS="$GSPELL_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gspell-1\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gspell-1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gspell-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 - pkg_cv_GSPELL_LIBS=`$PKG_CONFIG --libs "gspell-1" 2>/dev/null` - else -@@ -38310,23 +40567,23 @@ fi - echo "$GSPELL_PKG_ERRORS" >&5 - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gspell-1 not found, spell checking in wxTextCtrl won't be available" >&5 --$as_echo "$as_me: WARNING: gspell-1 not found, spell checking in wxTextCtrl won't be available" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: gspell-1 not found, spell checking in wxTextCtrl won't be available" >&5 -+printf "%s\n" "$as_me: WARNING: gspell-1 not found, spell checking in wxTextCtrl won't be available" >&2;} - wxUSE_SPELLCHECK=no - - - elif test $pkg_failed = untried; then - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gspell-1 not found, spell checking in wxTextCtrl won't be available" >&5 --$as_echo "$as_me: WARNING: gspell-1 not found, spell checking in wxTextCtrl won't be available" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: gspell-1 not found, spell checking in wxTextCtrl won't be available" >&5 -+printf "%s\n" "$as_me: WARNING: gspell-1 not found, spell checking in wxTextCtrl won't be available" >&2;} - wxUSE_SPELLCHECK=no - - - else - GSPELL_CFLAGS=$pkg_cv_GSPELL_CFLAGS - GSPELL_LIBS=$pkg_cv_GSPELL_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; } - - CXXFLAGS="$GSPELL_CFLAGS $CXXFLAGS" - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GSPELL_LIBS" -@@ -38335,44 +40592,45 @@ fi - fi - - if test "$wxUSE_SPELLCHECK" = "yes"; then -- $as_echo "#define wxUSE_SPELLCHECK 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_SPELLCHECK 1" >>confdefs.h - - fi - fi - - - if test "$wxUSE_STL" = "yes"; then -- $as_echo "#define wxUSE_STL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_STL 1" >>confdefs.h - - fi - - if test "$wxUSE_EXTENDED_RTTI" = "yes"; then -- $as_echo "#define wxUSE_EXTENDED_RTTI 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_EXTENDED_RTTI 1" >>confdefs.h - - fi - - if test "$wxUSE_ANY" = "yes"; then -- $as_echo "#define wxUSE_ANY 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_ANY 1" >>confdefs.h - - fi - - if test "$wxUSE_APPLE_IEEE" = "yes"; then -- $as_echo "#define wxUSE_APPLE_IEEE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_APPLE_IEEE 1" >>confdefs.h - - fi - - if test "$wxUSE_TIMER" = "yes"; then -- $as_echo "#define wxUSE_TIMER 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_TIMER 1" >>confdefs.h - - fi - - if test "$USE_UNIX" = 1 ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SNDCTL_DSP_SPEED in sys/soundcard.h" >&5 --$as_echo_n "checking for SNDCTL_DSP_SPEED in sys/soundcard.h... " >&6; } --if ${ac_cv_header_sys_soundcard+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SNDCTL_DSP_SPEED in sys/soundcard.h" >&5 -+printf %s "checking for SNDCTL_DSP_SPEED in sys/soundcard.h... " >&6; } -+if test ${ac_cv_header_sys_soundcard+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -38380,7 +40638,7 @@ else - #include - - int --main () -+main (void) - { - - ioctl(0, SNDCTL_DSP_SPEED, 0); -@@ -38389,10 +40647,11 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_header_sys_soundcard=yes --else -- -+else case e in #( -+ e) - saveLibs="$LIBS" - LIBS="$saveLibs -lossaudio" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -38402,7 +40661,7 @@ else - #include - - int --main () -+main (void) - { - - ioctl(0, SNDCTL_DSP_SPEED, 0); -@@ -38411,29 +40670,33 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_header_sys_soundcard=yes --else -- -+else case e in #( -+ e) - LIBS="$saveLibs" - ac_cv_header_sys_soundcard=no - -- -+ ;; -+esac - 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 - -- -+ ;; -+esac - 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 -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_soundcard" >&5 --$as_echo "$ac_cv_header_sys_soundcard" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_soundcard" >&5 -+printf "%s\n" "$ac_cv_header_sys_soundcard" >&6; } - - if test "$ac_cv_header_sys_soundcard" = "yes"; then -- $as_echo "#define HAVE_SYS_SOUNDCARD_H 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_SYS_SOUNDCARD_H 1" >>confdefs.h - - fi - fi -@@ -38444,18 +40707,18 @@ if test "$wxUSE_SOUND" = "yes"; then - if test "$wxUSE_LIBSDL" != "no"; 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 SDL" >&5 -+printf %s "checking for SDL... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$SDL_CFLAGS"; then - pkg_cv_SDL_CFLAGS="$SDL_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2 >= 2.0.0\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2 >= 2.0.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "sdl2 >= 2.0.0") 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 "sdl2 >= 2.0.0" 2>/dev/null` - else -@@ -38470,10 +40733,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_SDL_LIBS="$SDL_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2 >= 2.0.0\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2 >= 2.0.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "sdl2 >= 2.0.0") 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 "sdl2 >= 2.0.0" 2>/dev/null` - else -@@ -38502,29 +40765,35 @@ fi - echo "$SDL_PKG_ERRORS" >&5 - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: SDL 2.0 not available. Falling back to 1.2." >&5 --$as_echo "$as_me: SDL 2.0 not available. Falling back to 1.2." >&6;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: SDL 2.0 not available. Falling back to 1.2." >&5 -+printf "%s\n" "$as_me: SDL 2.0 not available. Falling back to 1.2." >&6;} - - # Check whether --with-sdl-prefix was given. --if test "${with_sdl_prefix+set}" = set; then : -+if test ${with_sdl_prefix+y} -+then : - withval=$with_sdl_prefix; sdl_prefix="$withval" --else -- sdl_prefix="" -+else case e in #( -+ e) sdl_prefix="" ;; -+esac - fi - - - # Check whether --with-sdl-exec-prefix was given. --if test "${with_sdl_exec_prefix+set}" = set; then : -+if test ${with_sdl_exec_prefix+y} -+then : - withval=$with_sdl_exec_prefix; sdl_exec_prefix="$withval" --else -- sdl_exec_prefix="" -+else case e in #( -+ e) sdl_exec_prefix="" ;; -+esac - fi - - # Check whether --enable-sdltest was given. --if test "${enable_sdltest+set}" = set; then : -+if test ${enable_sdltest+y} -+then : - enableval=$enable_sdltest; --else -- enable_sdltest=yes -+else case e in #( -+ e) enable_sdltest=yes ;; -+esac - fi - - -@@ -38546,12 +40815,13 @@ fi - fi - # Extract the first word of "sdl-config", so it can be a program name with args. - set dummy sdl-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_SDL_CONFIG+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- case $SDL_CONFIG in -+{ 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_SDL_CONFIG+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) case $SDL_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a path. - ;; -@@ -38560,11 +40830,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_SDL_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_SDL_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 -@@ -38573,21 +40847,22 @@ IFS=$as_save_IFS - - test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no" - ;; -+esac ;; - esac - fi - SDL_CONFIG=$ac_cv_path_SDL_CONFIG - if test -n "$SDL_CONFIG"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDL_CONFIG" >&5 --$as_echo "$SDL_CONFIG" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SDL_CONFIG" >&5 -+printf "%s\n" "$SDL_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 - - - min_sdl_version=1.2.0 -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL - version >= $min_sdl_version" >&5 --$as_echo_n "checking for SDL - version >= $min_sdl_version... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SDL - version >= $min_sdl_version" >&5 -+printf %s "checking for SDL - version >= $min_sdl_version... " >&6; } - no_sdl="" - if test "$SDL_CONFIG" = "no" ; then - no_sdl=yes -@@ -38609,10 +40884,11 @@ $as_echo_n "checking for SDL - version >= $min_sdl_version... " >&6; } - CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SDL_LIBS" - rm -f conf.sdltest -- if test "$cross_compiling" = yes; then : -+ if test "$cross_compiling" = yes -+then : - echo $ac_n "cross compiling; assumed OK... $ac_c" --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include -@@ -38673,13 +40949,16 @@ int main (int argc, char *argv[]) - - - _ACEOF --if ac_fn_c_try_run "$LINENO"; then : -+if ac_fn_c_try_run "$LINENO" -+then : - --else -- no_sdl=yes -+else case e in #( -+ e) no_sdl=yes ;; -+esac - fi - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac - fi - - CFLAGS="$ac_save_CFLAGS" -@@ -38688,18 +40967,18 @@ fi - fi - fi - if test "x$no_sdl" = x ; 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; } - - EXTRALIBS_SDL="$SDL_LIBS" - CFLAGS="$SDL_CFLAGS $CFLAGS" - CXXFLAGS="$SDL_CFLAGS $CXXFLAGS" -- $as_echo "#define wxUSE_LIBSDL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_LIBSDL 1" >>confdefs.h - - - 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; } - if test "$SDL_CONFIG" = "no" ; then - echo "*** The sdl-config script installed by SDL could not be found" - echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" -@@ -38725,14 +41004,15 @@ int main(int argc, char *argv[]) - #define main K_and_R_C_main - - int --main () -+main (void) - { - return 0; - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding SDL or finding the wrong" - echo "*** version of SDL. If it is not finding SDL, you'll need to set your" -@@ -38742,13 +41022,14 @@ if ac_fn_c_try_link "$LINENO"; then : - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" --else -- echo "*** The test program failed to compile or link. See the file config.log for the" -+else case e in #( -+ e) echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occurred. This usually means SDL was incorrectly installed" - echo "*** or that you have moved SDL since it was installed. In the latter case, you" -- echo "*** may want to edit the sdl-config script: $SDL_CONFIG" -+ echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ;; -+esac - 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 - CFLAGS="$ac_save_CFLAGS" - CXXFLAGS="$ac_save_CXXFLAGS" -@@ -38766,29 +41047,35 @@ rm -f core conftest.err conftest.$ac_objext \ - - elif test $pkg_failed = untried; then - -- { $as_echo "$as_me:${as_lineno-$LINENO}: SDL 2.0 not available. Falling back to 1.2." >&5 --$as_echo "$as_me: SDL 2.0 not available. Falling back to 1.2." >&6;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: SDL 2.0 not available. Falling back to 1.2." >&5 -+printf "%s\n" "$as_me: SDL 2.0 not available. Falling back to 1.2." >&6;} - - # Check whether --with-sdl-prefix was given. --if test "${with_sdl_prefix+set}" = set; then : -+if test ${with_sdl_prefix+y} -+then : - withval=$with_sdl_prefix; sdl_prefix="$withval" --else -- sdl_prefix="" -+else case e in #( -+ e) sdl_prefix="" ;; -+esac - fi - - - # Check whether --with-sdl-exec-prefix was given. --if test "${with_sdl_exec_prefix+set}" = set; then : -+if test ${with_sdl_exec_prefix+y} -+then : - withval=$with_sdl_exec_prefix; sdl_exec_prefix="$withval" --else -- sdl_exec_prefix="" -+else case e in #( -+ e) sdl_exec_prefix="" ;; -+esac - fi - - # Check whether --enable-sdltest was given. --if test "${enable_sdltest+set}" = set; then : -+if test ${enable_sdltest+y} -+then : - enableval=$enable_sdltest; --else -- enable_sdltest=yes -+else case e in #( -+ e) enable_sdltest=yes ;; -+esac - fi - - -@@ -38810,12 +41097,13 @@ fi - fi - # Extract the first word of "sdl-config", so it can be a program name with args. - set dummy sdl-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_SDL_CONFIG+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- case $SDL_CONFIG in -+{ 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_SDL_CONFIG+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) case $SDL_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a path. - ;; -@@ -38824,11 +41112,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_SDL_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_SDL_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 -@@ -38837,21 +41129,22 @@ IFS=$as_save_IFS - - test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no" - ;; -+esac ;; - esac - fi - SDL_CONFIG=$ac_cv_path_SDL_CONFIG - if test -n "$SDL_CONFIG"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDL_CONFIG" >&5 --$as_echo "$SDL_CONFIG" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SDL_CONFIG" >&5 -+printf "%s\n" "$SDL_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 - - - min_sdl_version=1.2.0 -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL - version >= $min_sdl_version" >&5 --$as_echo_n "checking for SDL - version >= $min_sdl_version... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SDL - version >= $min_sdl_version" >&5 -+printf %s "checking for SDL - version >= $min_sdl_version... " >&6; } - no_sdl="" - if test "$SDL_CONFIG" = "no" ; then - no_sdl=yes -@@ -38873,10 +41166,11 @@ $as_echo_n "checking for SDL - version >= $min_sdl_version... " >&6; } - CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SDL_LIBS" - rm -f conf.sdltest -- if test "$cross_compiling" = yes; then : -+ if test "$cross_compiling" = yes -+then : - echo $ac_n "cross compiling; assumed OK... $ac_c" --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include -@@ -38937,13 +41231,16 @@ int main (int argc, char *argv[]) - - - _ACEOF --if ac_fn_c_try_run "$LINENO"; then : -+if ac_fn_c_try_run "$LINENO" -+then : - --else -- no_sdl=yes -+else case e in #( -+ e) no_sdl=yes ;; -+esac - fi - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac - fi - - CFLAGS="$ac_save_CFLAGS" -@@ -38952,18 +41249,18 @@ fi - fi - fi - if test "x$no_sdl" = x ; 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; } - - EXTRALIBS_SDL="$SDL_LIBS" - CFLAGS="$SDL_CFLAGS $CFLAGS" - CXXFLAGS="$SDL_CFLAGS $CXXFLAGS" -- $as_echo "#define wxUSE_LIBSDL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_LIBSDL 1" >>confdefs.h - - - 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; } - if test "$SDL_CONFIG" = "no" ; then - echo "*** The sdl-config script installed by SDL could not be found" - echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" -@@ -38989,14 +41286,15 @@ int main(int argc, char *argv[]) - #define main K_and_R_C_main - - int --main () -+main (void) - { - return 0; - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding SDL or finding the wrong" - echo "*** version of SDL. If it is not finding SDL, you'll need to set your" -@@ -39006,13 +41304,14 @@ if ac_fn_c_try_link "$LINENO"; then : - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" --else -- echo "*** The test program failed to compile or link. See the file config.log for the" -+else case e in #( -+ e) echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occurred. This usually means SDL was incorrectly installed" - echo "*** or that you have moved SDL since it was installed. In the latter case, you" -- echo "*** may want to edit the sdl-config script: $SDL_CONFIG" -+ echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ;; -+esac - 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 - CFLAGS="$ac_save_CFLAGS" - CXXFLAGS="$ac_save_CXXFLAGS" -@@ -39031,13 +41330,13 @@ rm -f core conftest.err conftest.$ac_objext \ - 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; } - - EXTRALIBS_SDL="$SDL_LIBS" - CFLAGS="$SDL_CFLAGS $CFLAGS" - CXXFLAGS="$SDL_CFLAGS $CXXFLAGS" -- $as_echo "#define wxUSE_LIBSDL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_LIBSDL 1" >>confdefs.h - - - fi -@@ -39049,7 +41348,7 @@ fi - fi - - if test "$wxUSE_SOUND" = "yes"; then -- $as_echo "#define wxUSE_SOUND 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_SOUND 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound" - fi -@@ -39065,18 +41364,18 @@ if test "$WXGTK2" = 1; then - fi - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKPRINT" >&5 --$as_echo_n "checking for GTKPRINT... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTKPRINT" >&5 -+printf %s "checking for GTKPRINT... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$GTKPRINT_CFLAGS"; then - pkg_cv_GTKPRINT_CFLAGS="$GTKPRINT_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_unix_print\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_unix_print\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$gtk_unix_print") 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_GTKPRINT_CFLAGS=`$PKG_CONFIG --cflags "$gtk_unix_print" 2>/dev/null` - else -@@ -39091,10 +41390,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_GTKPRINT_LIBS="$GTKPRINT_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_unix_print\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_unix_print\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$gtk_unix_print") 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_GTKPRINT_LIBS=`$PKG_CONFIG --libs "$gtk_unix_print" 2>/dev/null` - else -@@ -39123,28 +41422,28 @@ fi - echo "$GTKPRINT_PKG_ERRORS" >&5 - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&5 --$as_echo "$as_me: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&5 -+printf "%s\n" "$as_me: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&2;} - wxUSE_GTKPRINT="no" - - - elif test $pkg_failed = untried; then - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&5 --$as_echo "$as_me: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&5 -+printf "%s\n" "$as_me: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&2;} - wxUSE_GTKPRINT="no" - - - else - GTKPRINT_CFLAGS=$pkg_cv_GTKPRINT_CFLAGS - GTKPRINT_LIBS=$pkg_cv_GTKPRINT_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; } - - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GTKPRINT_LIBS" - CFLAGS="$GTKPRINT_CFLAGS $CFLAGS" - CXXFLAGS="$GTKPRINT_CFLAGS $CXXFLAGS" -- $as_echo "#define wxUSE_GTKPRINT 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_GTKPRINT 1" >>confdefs.h - - - fi -@@ -39156,18 +41455,18 @@ fi - - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOMEVFS" >&5 --$as_echo_n "checking for GNOMEVFS... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNOMEVFS" >&5 -+printf %s "checking for GNOMEVFS... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$GNOMEVFS_CFLAGS"; then - pkg_cv_GNOMEVFS_CFLAGS="$GNOMEVFS_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.0\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= 2.0") 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_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.0" 2>/dev/null` - else -@@ -39182,10 +41481,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_GNOMEVFS_LIBS="$GNOMEVFS_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.0\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= 2.0") 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_GNOMEVFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.0" 2>/dev/null` - else -@@ -39214,28 +41513,28 @@ fi - echo "$GNOMEVFS_PKG_ERRORS" >&5 - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&5 --$as_echo "$as_me: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&5 -+printf "%s\n" "$as_me: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&2;} - wxUSE_LIBGNOMEVFS="no" - - - elif test $pkg_failed = untried; then - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&5 --$as_echo "$as_me: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&5 -+printf "%s\n" "$as_me: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&2;} - wxUSE_LIBGNOMEVFS="no" - - - else - GNOMEVFS_CFLAGS=$pkg_cv_GNOMEVFS_CFLAGS - GNOMEVFS_LIBS=$pkg_cv_GNOMEVFS_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; } - - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GNOMEVFS_LIBS" - CFLAGS="$GNOMEVFS_CFLAGS $CFLAGS" - CXXFLAGS="$GNOMEVFS_CFLAGS $CXXFLAGS" -- $as_echo "#define wxUSE_LIBGNOMEVFS 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_LIBGNOMEVFS 1" >>confdefs.h - - - fi -@@ -39247,18 +41546,18 @@ fi - HAVE_LIBNOTIFY=0 - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5 --$as_echo_n "checking for LIBNOTIFY... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5 -+printf %s "checking for LIBNOTIFY... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$LIBNOTIFY_CFLAGS"; then - pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.7\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.7\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnotify >= 0.7") 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_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= 0.7" 2>/dev/null` - else -@@ -39273,10 +41572,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.7\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.7\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnotify >= 0.7") 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_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= 0.7" 2>/dev/null` - else -@@ -39307,18 +41606,18 @@ fi - - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5 --$as_echo_n "checking for LIBNOTIFY... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5 -+printf %s "checking for LIBNOTIFY... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$LIBNOTIFY_CFLAGS"; then - pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.4\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.4\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnotify >= 0.4") 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_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= 0.4" 2>/dev/null` - else -@@ -39333,10 +41632,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.4\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.4\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnotify >= 0.4") 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_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= 0.4" 2>/dev/null` - else -@@ -39365,23 +41664,23 @@ fi - echo "$LIBNOTIFY_PKG_ERRORS" >&5 - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5 --$as_echo "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5 -+printf "%s\n" "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;} - wxUSE_LIBNOTIFY="no" - - - elif test $pkg_failed = untried; then - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5 --$as_echo "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5 -+printf "%s\n" "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;} - wxUSE_LIBNOTIFY="no" - - - else - LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS - LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_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; } - HAVE_LIBNOTIFY=1 - fi - -@@ -39390,18 +41689,18 @@ elif test $pkg_failed = untried; then - - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5 --$as_echo_n "checking for LIBNOTIFY... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5 -+printf %s "checking for LIBNOTIFY... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$LIBNOTIFY_CFLAGS"; then - pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.4\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.4\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnotify >= 0.4") 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_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= 0.4" 2>/dev/null` - else -@@ -39416,10 +41715,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.4\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.4\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnotify >= 0.4") 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_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= 0.4" 2>/dev/null` - else -@@ -39448,23 +41747,23 @@ fi - echo "$LIBNOTIFY_PKG_ERRORS" >&5 - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5 --$as_echo "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5 -+printf "%s\n" "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;} - wxUSE_LIBNOTIFY="no" - - - elif test $pkg_failed = untried; then - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5 --$as_echo "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5 -+printf "%s\n" "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;} - wxUSE_LIBNOTIFY="no" - - - else - LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS - LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_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; } - HAVE_LIBNOTIFY=1 - fi - -@@ -39472,11 +41771,11 @@ fi - else - LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS - LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_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; } - - HAVE_LIBNOTIFY=1 -- $as_echo "#define wxUSE_LIBNOTIFY_0_7 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_LIBNOTIFY_0_7 1" >>confdefs.h - - - fi -@@ -39485,7 +41784,7 @@ fi - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $LIBNOTIFY_LIBS" - CFLAGS="$LIBNOTIFY_CFLAGS $CFLAGS" - CXXFLAGS="$LIBNOTIFY_CFLAGS $CXXFLAGS" -- $as_echo "#define wxUSE_LIBNOTIFY 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_LIBNOTIFY 1" >>confdefs.h - - fi - fi -@@ -39494,128 +41793,128 @@ fi - fi - - if test "$wxUSE_CMDLINE_PARSER" = "yes"; then -- $as_echo "#define wxUSE_CMDLINE_PARSER 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_CMDLINE_PARSER 1" >>confdefs.h - - fi - - if test "$wxUSE_STOPWATCH" = "yes"; then -- $as_echo "#define wxUSE_STOPWATCH 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_STOPWATCH 1" >>confdefs.h - - fi - - if test "$wxUSE_DATETIME" = "yes"; then -- $as_echo "#define wxUSE_DATETIME 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_DATETIME 1" >>confdefs.h - - fi - - if test "$wxUSE_FILE" = "yes"; then -- $as_echo "#define wxUSE_FILE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_FILE 1" >>confdefs.h - - fi - - if test "$wxUSE_FFILE" = "yes"; then -- $as_echo "#define wxUSE_FFILE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_FFILE 1" >>confdefs.h - - fi - - if test "$wxUSE_ARCHIVE_STREAMS" = "yes"; then - if test "$wxUSE_STREAMS" != yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxArchive requires wxStreams... disabled" >&5 --$as_echo "$as_me: WARNING: wxArchive requires wxStreams... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxArchive requires wxStreams... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxArchive requires wxStreams... disabled" >&2;} - wxUSE_ARCHIVE_STREAMS=no - else -- $as_echo "#define wxUSE_ARCHIVE_STREAMS 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_ARCHIVE_STREAMS 1" >>confdefs.h - - fi - fi - - if test "$wxUSE_ZIPSTREAM" = "yes"; then - if test "$wxUSE_ARCHIVE_STREAMS" != "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxZip requires wxArchive... disabled" >&5 --$as_echo "$as_me: WARNING: wxZip requires wxArchive... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxZip requires wxArchive... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxZip requires wxArchive... disabled" >&2;} - elif test "$wxUSE_ZLIB" = "no"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxZip requires wxZlib... disabled" >&5 --$as_echo "$as_me: WARNING: wxZip requires wxZlib... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxZip requires wxZlib... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxZip requires wxZlib... disabled" >&2;} - else -- $as_echo "#define wxUSE_ZIPSTREAM 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_ZIPSTREAM 1" >>confdefs.h - - fi - fi - - if test "$wxUSE_TARSTREAM" = "yes"; then - if test "$wxUSE_ARCHIVE_STREAMS" != "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxTar requires wxArchive... disabled" >&5 --$as_echo "$as_me: WARNING: wxTar requires wxArchive... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxTar requires wxArchive... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxTar requires wxArchive... disabled" >&2;} - else -- $as_echo "#define wxUSE_TARSTREAM 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_TARSTREAM 1" >>confdefs.h - - fi - fi - - if test "$wxUSE_FILE_HISTORY" = "yes"; then -- $as_echo "#define wxUSE_FILE_HISTORY 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_FILE_HISTORY 1" >>confdefs.h - - fi - - if test "$wxUSE_FILESYSTEM" = "yes"; then - if test "$wxUSE_STREAMS" != yes -o \( "$wxUSE_FILE" != yes -a "$wxUSE_FFILE" != yes \); then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxFileSystem requires wxStreams and wxFile or wxFFile... disabled" >&5 --$as_echo "$as_me: WARNING: wxFileSystem requires wxStreams and wxFile or wxFFile... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxFileSystem requires wxStreams and wxFile or wxFFile... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxFileSystem requires wxStreams and wxFile or wxFFile... disabled" >&2;} - wxUSE_FILESYSTEM=no - else -- $as_echo "#define wxUSE_FILESYSTEM 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_FILESYSTEM 1" >>confdefs.h - - fi - fi - - if test "$wxUSE_FS_ARCHIVE" = "yes"; then - if test "$wxUSE_FILESYSTEM" != yes -o "$wxUSE_ARCHIVE_STREAMS" != yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxArchiveFSHandler requires wxArchive and wxFileSystem... disabled" >&5 --$as_echo "$as_me: WARNING: wxArchiveFSHandler requires wxArchive and wxFileSystem... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxArchiveFSHandler requires wxArchive and wxFileSystem... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxArchiveFSHandler requires wxArchive and wxFileSystem... disabled" >&2;} - else -- $as_echo "#define wxUSE_FS_ARCHIVE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_FS_ARCHIVE 1" >>confdefs.h - - fi - fi - - if test "$wxUSE_FS_ZIP" = "yes"; then - if test "$wxUSE_FS_ARCHIVE" != yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxZipFSHandler requires wxArchiveFSHandler... disabled" >&5 --$as_echo "$as_me: WARNING: wxZipFSHandler requires wxArchiveFSHandler... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxZipFSHandler requires wxArchiveFSHandler... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxZipFSHandler requires wxArchiveFSHandler... disabled" >&2;} - else -- $as_echo "#define wxUSE_FS_ZIP 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_FS_ZIP 1" >>confdefs.h - - fi - fi - - if test "$wxUSE_FSVOLUME" = "yes"; then -- $as_echo "#define wxUSE_FSVOLUME 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_FSVOLUME 1" >>confdefs.h - - fi - - if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then - if test "$USE_UNIX" != 1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called" >&5 --$as_echo "$as_me: WARNING: Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called" >&5 -+printf "%s\n" "$as_me: WARNING: Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called" >&2;} - wxUSE_ON_FATAL_EXCEPTION=no - else -- $as_echo "#define wxUSE_ON_FATAL_EXCEPTION 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_ON_FATAL_EXCEPTION 1" >>confdefs.h - - fi - fi - - if test "$wxUSE_STACKWALKER" = "yes"; then -- $as_echo "#define wxUSE_STACKWALKER 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_STACKWALKER 1" >>confdefs.h - - fi - - if test "$wxUSE_DEBUGREPORT" = "yes"; then - if test "$USE_UNIX" != 1 -a "$USE_WIN32" != 1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Creating debug reports not currently supported on this system, disabled" >&5 --$as_echo "$as_me: WARNING: Creating debug reports not currently supported on this system, disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Creating debug reports not currently supported on this system, disabled" >&5 -+printf "%s\n" "$as_me: WARNING: Creating debug reports not currently supported on this system, disabled" >&2;} - wxUSE_DEBUGREPORT=no - else -- $as_echo "#define wxUSE_DEBUGREPORT 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_DEBUGREPORT 1" >>confdefs.h - - if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS debugrpt" -@@ -39624,19 +41923,19 @@ $as_echo "$as_me: WARNING: Creating debug reports not currently supported on thi - fi - - if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then -- $as_echo "#define wxUSE_SNGLINST_CHECKER 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_SNGLINST_CHECKER 1" >>confdefs.h - - fi - - if test "$wxUSE_BUSYINFO" = "yes"; then -- $as_echo "#define wxUSE_BUSYINFO 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_BUSYINFO 1" >>confdefs.h - - fi - - if test "$wxUSE_HOTKEY" = "yes"; then - if test "$wxUSE_MSW" != 1 -a "$wxUSE_OSX_COCOA" != 1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Hot keys not supported by the current toolkit, disabled" >&5 --$as_echo "$as_me: WARNING: Hot keys not supported by the current toolkit, disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Hot keys not supported by the current toolkit, disabled" >&5 -+printf "%s\n" "$as_me: WARNING: Hot keys not supported by the current toolkit, disabled" >&2;} - wxUSE_HOTKEY=no - fi - elif test "$wxUSE_HOTKEY" = "auto"; then -@@ -39645,68 +41944,68 @@ elif test "$wxUSE_HOTKEY" = "auto"; then - fi - fi - if test "$wxUSE_HOTKEY" = "yes"; then -- $as_echo "#define wxUSE_HOTKEY 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_HOTKEY 1" >>confdefs.h - - fi - - if test "$wxUSE_STD_CONTAINERS" = "yes"; then -- $as_echo "#define wxUSE_STD_CONTAINERS 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_STD_CONTAINERS 1" >>confdefs.h - - fi - - if test "$wxUSE_STD_CONTAINERS_COMPATIBLY" = "yes"; then -- $as_echo "#define wxUSE_STD_CONTAINERS_COMPATIBLY 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_STD_CONTAINERS_COMPATIBLY 1" >>confdefs.h - - fi - - if test "$wxUSE_STD_IOSTREAM" = "yes"; then -- $as_echo "#define wxUSE_STD_IOSTREAM 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_STD_IOSTREAM 1" >>confdefs.h - - fi - - if test "$wxUSE_STD_STRING" = "yes"; then -- $as_echo "#define wxUSE_STD_STRING 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_STD_STRING 1" >>confdefs.h - - fi - - if test "$wxUSE_STD_STRING_CONV_IN_WXSTRING" = "yes"; then -- $as_echo "#define wxUSE_STD_STRING_CONV_IN_WXSTRING 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_STD_STRING_CONV_IN_WXSTRING 1" >>confdefs.h - - fi - - if test "$wxUSE_UNSAFE_WXSTRING_CONV" = "yes"; then -- $as_echo "#define wxUSE_UNSAFE_WXSTRING_CONV 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_UNSAFE_WXSTRING_CONV 1" >>confdefs.h - - fi - - if test "$wxUSE_STDPATHS" = "yes"; then -- $as_echo "#define wxUSE_STDPATHS 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_STDPATHS 1" >>confdefs.h - - fi - - if test "$wxUSE_TEXTBUFFER" = "yes"; then -- $as_echo "#define wxUSE_TEXTBUFFER 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_TEXTBUFFER 1" >>confdefs.h - - fi - - if test "$wxUSE_TEXTFILE" = "yes"; then - if test "$wxUSE_FILE" != "yes" -o "$wxUSE_TEXTBUFFER" != "yes" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxTextFile requires wxFile and wxTextBuffer... disabled" >&5 --$as_echo "$as_me: WARNING: wxTextFile requires wxFile and wxTextBuffer... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxTextFile requires wxFile and wxTextBuffer... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxTextFile requires wxFile and wxTextBuffer... disabled" >&2;} - else -- $as_echo "#define wxUSE_TEXTFILE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_TEXTFILE 1" >>confdefs.h - - fi - fi - - if test "$wxUSE_CONFIG" = "yes" ; then - if test "$wxUSE_TEXTFILE" != "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxConfig requires wxTextFile... disabled" >&5 --$as_echo "$as_me: WARNING: wxConfig requires wxTextFile... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxConfig requires wxTextFile... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxConfig requires wxTextFile... disabled" >&2;} - else -- $as_echo "#define wxUSE_CONFIG 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_CONFIG 1" >>confdefs.h - -- $as_echo "#define wxUSE_CONFIG_NATIVE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_CONFIG_NATIVE 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config" - fi -@@ -39714,10 +42013,10 @@ fi - - if test "$wxUSE_INTL" = "yes" ; then - if test "$wxUSE_FILE" != "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I18n code requires wxFile... disabled" >&5 --$as_echo "$as_me: WARNING: I18n code requires wxFile... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: I18n code requires wxFile... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: I18n code requires wxFile... disabled" >&2;} - else -- $as_echo "#define wxUSE_INTL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_INTL 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat" - GUIDIST="$GUIDIST INTL_DIST" -@@ -39725,25 +42024,21 @@ $as_echo "$as_me: WARNING: I18n code requires wxFile... disabled" >&2;} - fi - - if test "$wxUSE_XLOCALE" = "yes" ; then -- for ac_header in xlocale.h --do : -- ac_fn_c_check_header_mongrel "$LINENO" "xlocale.h" "ac_cv_header_xlocale_h" "$ac_includes_default" --if test "x$ac_cv_header_xlocale_h" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_XLOCALE_H 1 --_ACEOF -+ ac_fn_c_check_header_compile "$LINENO" "xlocale.h" "ac_cv_header_xlocale_h" "$ac_includes_default" -+if test "x$ac_cv_header_xlocale_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_XLOCALE_H 1" >>confdefs.h - - fi - --done -- -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for locale_t" >&5 --$as_echo_n "checking for locale_t... " >&6; } --if ${wx_cv_type_locale_t+:} false; then : -- $as_echo_n "(cached) " >&6 --else - -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for locale_t" >&5 -+printf %s "checking for locale_t... " >&6; } -+if test ${wx_cv_type_locale_t+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -39760,7 +42055,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - #include - - int --main () -+main (void) - { - - locale_t t; -@@ -39772,52 +42067,55 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_type_locale_t=yes --else -- wx_cv_type_locale_t=no -- -+else case e in #( -+ e) wx_cv_type_locale_t=no -+ ;; -+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 - 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 - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_locale_t" >&5 --$as_echo "$wx_cv_type_locale_t" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_locale_t" >&5 -+printf "%s\n" "$wx_cv_type_locale_t" >&6; } - - if test "$wx_cv_type_locale_t" = "yes" ; then -- $as_echo "#define wxUSE_XLOCALE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_XLOCALE 1" >>confdefs.h - - -- $as_echo "#define HAVE_LOCALE_T 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_LOCALE_T 1" >>confdefs.h - - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No locale_t support, wxXLocale won't be available" >&5 --$as_echo "$as_me: WARNING: No locale_t support, wxXLocale won't be available" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: No locale_t support, wxXLocale won't be available" >&5 -+printf "%s\n" "$as_me: WARNING: No locale_t support, wxXLocale won't be available" >&2;} - fi - fi - - if test "$wxUSE_LOG" = "yes"; then -- $as_echo "#define wxUSE_LOG 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_LOG 1" >>confdefs.h - - - if test "$wxUSE_LOGGUI" = "yes"; then -- $as_echo "#define wxUSE_LOGGUI 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_LOGGUI 1" >>confdefs.h - - fi - - if test "$wxUSE_LOGWINDOW" = "yes"; then -- $as_echo "#define wxUSE_LOGWINDOW 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_LOGWINDOW 1" >>confdefs.h - - fi - - if test "$wxUSE_LOGDIALOG" = "yes"; then -- $as_echo "#define wxUSE_LOG_DIALOG 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_LOG_DIALOG 1" >>confdefs.h - - fi - -@@ -39825,95 +42123,93 @@ if test "$wxUSE_LOG" = "yes"; then - fi - - if test "$wxUSE_LONGLONG" = "yes"; then -- $as_echo "#define wxUSE_LONGLONG 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_LONGLONG 1" >>confdefs.h - - fi - - if test "$wxUSE_GEOMETRY" = "yes"; then -- $as_echo "#define wxUSE_GEOMETRY 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_GEOMETRY 1" >>confdefs.h - - fi - - if test "$wxUSE_BASE64" = "yes"; then -- $as_echo "#define wxUSE_BASE64 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_BASE64 1" >>confdefs.h - - fi - - if test "$wxUSE_STREAMS" = "yes" ; then -- $as_echo "#define wxUSE_STREAMS 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_STREAMS 1" >>confdefs.h - - fi - - if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then -- $as_echo "#define wxUSE_PRINTF_POS_PARAMS 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_PRINTF_POS_PARAMS 1" >>confdefs.h - - fi - - - if test "$wxUSE_CONSOLE_EVENTLOOP" = "yes"; then -- $as_echo "#define wxUSE_CONSOLE_EVENTLOOP 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_CONSOLE_EVENTLOOP 1" >>confdefs.h - - - if test "$wxUSE_UNIX" = "yes"; then - if test "$wxUSE_SELECT_DISPATCHER" = "yes"; then -- $as_echo "#define wxUSE_SELECT_DISPATCHER 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_SELECT_DISPATCHER 1" >>confdefs.h - - fi - - if test "$wxUSE_EPOLL_DISPATCHER" = "yes"; then -- for ac_header in sys/epoll.h --do : -- ac_fn_c_check_header_compile "$LINENO" "sys/epoll.h" "ac_cv_header_sys_epoll_h" "$ac_includes_default -+ ac_fn_c_check_header_compile "$LINENO" "sys/epoll.h" "ac_cv_header_sys_epoll_h" "$ac_includes_default - " --if test "x$ac_cv_header_sys_epoll_h" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_SYS_EPOLL_H 1 --_ACEOF -+if test "x$ac_cv_header_sys_epoll_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_SYS_EPOLL_H 1" >>confdefs.h - - fi - --done -- - if test "$ac_cv_header_sys_epoll_h" = "yes"; then - case "${host}" in - *-*-linux*) -- $as_echo "#define wxUSE_EPOLL_DISPATCHER 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_EPOLL_DISPATCHER 1" >>confdefs.h - - ;; - *) -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxEpollDispatcher disabled, because OS is not Linux" >&5 --$as_echo "$as_me: WARNING: wxEpollDispatcher disabled, because OS is not Linux" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxEpollDispatcher disabled, because OS is not Linux" >&5 -+printf "%s\n" "$as_me: WARNING: wxEpollDispatcher disabled, because OS is not Linux" >&2;} - ;; - esac - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: sys/epoll.h not available, wxEpollDispatcher disabled" >&5 --$as_echo "$as_me: WARNING: sys/epoll.h not available, wxEpollDispatcher disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: sys/epoll.h not available, wxEpollDispatcher disabled" >&5 -+printf "%s\n" "$as_me: WARNING: sys/epoll.h not available, wxEpollDispatcher disabled" >&2;} - fi - fi - fi - fi - - --for ac_func in gettimeofday ftime -+ -+ for ac_func in gettimeofday ftime - do : -- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | sed "$as_sed_sh"` - ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" --if eval test \"x\$"$as_ac_var"\" = x"yes"; then : -+if eval test \"x\$"$as_ac_var"\" = x"yes" -+then : - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `printf "%s\n" "HAVE_$ac_func" | sed "$as_sed_cpp"` 1 - _ACEOF - break - fi --done - -+done - - if test "$ac_cv_func_gettimeofday" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday takes two arguments" >&5 --$as_echo_n "checking whether gettimeofday takes two arguments... " >&6; } --if ${wx_cv_func_gettimeofday_has_2_args+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday takes two arguments" >&5 -+printf %s "checking whether gettimeofday takes two arguments... " >&6; } -+if test ${wx_cv_func_gettimeofday_has_2_args+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -39921,7 +42217,7 @@ else - #include - - int --main () -+main (void) - { - - struct timeval tv; -@@ -39931,17 +42227,18 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - wx_cv_func_gettimeofday_has_2_args=yes --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include - #include - - int --main () -+main (void) - { - - struct timeval tv; -@@ -39951,38 +42248,43 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - wx_cv_func_gettimeofday_has_2_args=no --else -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: failed to determine number of gettimeofday() arguments" >&5 --$as_echo "$as_me: WARNING: failed to determine number of gettimeofday() arguments" >&2;} -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: failed to determine number of gettimeofday() arguments" >&5 -+printf "%s\n" "$as_me: WARNING: failed to determine number of gettimeofday() arguments" >&2;} - wx_cv_func_gettimeofday_has_2_args=unknown - -- -+ ;; -+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 -+ ;; -+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 -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_gettimeofday_has_2_args" >&5 --$as_echo "$wx_cv_func_gettimeofday_has_2_args" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_gettimeofday_has_2_args" >&5 -+printf "%s\n" "$wx_cv_func_gettimeofday_has_2_args" >&6; } - - if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then -- $as_echo "#define WX_GETTIMEOFDAY_NO_TZ 1" >>confdefs.h -+ printf "%s\n" "#define WX_GETTIMEOFDAY_NO_TZ 1" >>confdefs.h - - fi - fi - - if test "$wxUSE_DATETIME" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for timezone variable in " >&5 --$as_echo_n "checking for timezone variable in ... " >&6; } --if ${wx_cv_var_timezone+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for timezone variable in " >&5 -+printf %s "checking for timezone variable in ... " >&6; } -+if test ${wx_cv_var_timezone+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -39995,7 +42297,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - #include - - int --main () -+main (void) - { - - int tz; -@@ -40005,19 +42307,20 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - - wx_cv_var_timezone=timezone - --else -- -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include - - int --main () -+main (void) - { - - int tz; -@@ -40027,19 +42330,20 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - - wx_cv_var_timezone=_timezone - --else -- -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include - - int --main () -+main (void) - { - - int tz; -@@ -40049,28 +42353,32 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - - wx_cv_var_timezone=__timezone - --else -- -+else case e in #( -+ e) - if test "$USE_DOS" = 0 ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no timezone variable" >&5 --$as_echo "$as_me: WARNING: no timezone variable" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: no timezone variable" >&5 -+printf "%s\n" "$as_me: WARNING: no timezone variable" >&2;} - fi - -- -+ ;; -+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 - -+ ;; -+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 - -+ ;; -+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 - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -40078,44 +42386,40 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_var_timezone" >&5 --$as_echo "$wx_cv_var_timezone" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_var_timezone" >&5 -+printf "%s\n" "$wx_cv_var_timezone" >&6; } - - if test "x$wx_cv_var_timezone" != x ; then -- cat >>confdefs.h <<_ACEOF --#define WX_TIMEZONE $wx_cv_var_timezone --_ACEOF -+ printf "%s\n" "#define WX_TIMEZONE $wx_cv_var_timezone" >>confdefs.h - - fi - -- for ac_func in localtime --do : -- ac_fn_c_check_func "$LINENO" "localtime" "ac_cv_func_localtime" --if test "x$ac_cv_func_localtime" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_LOCALTIME 1 --_ACEOF -+ ac_fn_c_check_func "$LINENO" "localtime" "ac_cv_func_localtime" -+if test "x$ac_cv_func_localtime" = xyes -+then : -+ printf "%s\n" "#define HAVE_LOCALTIME 1" >>confdefs.h - - fi --done - - - if test "$ac_cv_func_localtime" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tm_gmtoff in struct tm" >&5 --$as_echo_n "checking for tm_gmtoff in struct tm... " >&6; } --if ${wx_cv_struct_tm_has_gmtoff+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tm_gmtoff in struct tm" >&5 -+printf %s "checking for tm_gmtoff in struct tm... " >&6; } -+if test ${wx_cv_struct_tm_has_gmtoff+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include - - int --main () -+main (void) - { - - struct tm tm; -@@ -40125,32 +42429,36 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - - wx_cv_struct_tm_has_gmtoff=yes - --else -- wx_cv_struct_tm_has_gmtoff=no -- -+else case e in #( -+ e) wx_cv_struct_tm_has_gmtoff=no -+ ;; -+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 -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_struct_tm_has_gmtoff" >&5 --$as_echo "$wx_cv_struct_tm_has_gmtoff" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_struct_tm_has_gmtoff" >&5 -+printf "%s\n" "$wx_cv_struct_tm_has_gmtoff" >&6; } - fi - - if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then -- $as_echo "#define WX_GMTOFF_IN_TM 1" >>confdefs.h -+ printf "%s\n" "#define WX_GMTOFF_IN_TM 1" >>confdefs.h - - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _NL_TIME_FIRST_WEEKDAY in langinfo.h" >&5 --$as_echo_n "checking for _NL_TIME_FIRST_WEEKDAY in langinfo.h... " >&6; } --if ${wx_cv_have_nl_time_first_weekday+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _NL_TIME_FIRST_WEEKDAY in langinfo.h" >&5 -+printf %s "checking for _NL_TIME_FIRST_WEEKDAY in langinfo.h... " >&6; } -+if test ${wx_cv_have_nl_time_first_weekday+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -40158,7 +42466,7 @@ else - #include - - int --main () -+main (void) - { - - _NL_TIME_FIRST_WEEKDAY; -@@ -40167,22 +42475,25 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - - wx_cv_have_nl_time_first_weekday=yes - --else -- wx_cv_have_nl_time_first_weekday=no -- -+else case e in #( -+ e) wx_cv_have_nl_time_first_weekday=no -+ ;; -+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 -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_have_nl_time_first_weekday" >&5 --$as_echo "$wx_cv_have_nl_time_first_weekday" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_have_nl_time_first_weekday" >&5 -+printf "%s\n" "$wx_cv_have_nl_time_first_weekday" >&6; } - - if test "$wx_cv_have_nl_time_first_weekday" = "yes"; then -- $as_echo "#define HAVE_NL_TIME_FIRST_WEEKDAY 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_NL_TIME_FIRST_WEEKDAY 1" >>confdefs.h - - fi - -@@ -40190,123 +42501,139 @@ $as_echo "$wx_cv_have_nl_time_first_weekday" >&6; } - fi - - --for ac_func in setpriority --do : -- ac_fn_c_check_func "$LINENO" "setpriority" "ac_cv_func_setpriority" --if test "x$ac_cv_func_setpriority" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_SETPRIORITY 1 --_ACEOF -+ac_fn_c_check_func "$LINENO" "setpriority" "ac_cv_func_setpriority" -+if test "x$ac_cv_func_setpriority" = xyes -+then : -+ printf "%s\n" "#define HAVE_SETPRIORITY 1" >>confdefs.h - - fi --done - - - - if test "$wxUSE_SOCKETS" = "yes"; then - if test "$USE_WIN32" != 1 ; then - ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket" --if test "x$ac_cv_func_socket" = xyes; then : -- --else -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 --$as_echo_n "checking for socket in -lsocket... " >&6; } --if ${ac_cv_lib_socket_socket+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+if test "x$ac_cv_func_socket" = xyes -+then : -+ -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 -+printf %s "checking for socket in -lsocket... " >&6; } -+if test ${ac_cv_lib_socket_socket+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lsocket $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char socket (); -+char socket (void); - int --main () -+main (void) - { - return socket (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_socket_socket=yes --else -- ac_cv_lib_socket_socket=no -+else case e in #( -+ e) ac_cv_lib_socket_socket=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 --$as_echo "$ac_cv_lib_socket_socket" >&6; } --if test "x$ac_cv_lib_socket_socket" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 -+printf "%s\n" "$ac_cv_lib_socket_socket" >&6; } -+if test "x$ac_cv_lib_socket_socket" = xyes -+then : - if test "$INET_LINK" != " -lsocket"; then - INET_LINK="$INET_LINK -lsocket" - fi --else -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lnetwork" >&5 --$as_echo_n "checking for socket in -lnetwork... " >&6; } --if ${ac_cv_lib_network_socket+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socket in -lnetwork" >&5 -+printf %s "checking for socket in -lnetwork... " >&6; } -+if test ${ac_cv_lib_network_socket+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS - LIBS="-lnetwork $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ - #ifdef __cplusplus - extern "C" - #endif --char socket (); -+char socket (void); - int --main () -+main (void) - { - return socket (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - ac_cv_lib_network_socket=yes --else -- ac_cv_lib_network_socket=no -+else case e in #( -+ e) ac_cv_lib_network_socket=no ;; -+esac - 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 -+LIBS=$ac_check_lib_save_LIBS ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_socket" >&5 --$as_echo "$ac_cv_lib_network_socket" >&6; } --if test "x$ac_cv_lib_network_socket" = xyes; then : -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_socket" >&5 -+printf "%s\n" "$ac_cv_lib_network_socket" >&6; } -+if test "x$ac_cv_lib_network_socket" = xyes -+then : - if test "$INET_LINK" != " -lnetwork"; then - INET_LINK="$INET_LINK -lnetwork" - fi --else -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: socket library not found - sockets will be disabled" >&5 --$as_echo "$as_me: WARNING: socket library not found - sockets will be disabled" >&2;} -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: socket library not found - sockets will be disabled" >&5 -+printf "%s\n" "$as_me: WARNING: socket library not found - sockets will be disabled" >&2;} - wxUSE_SOCKETS=no - -- -+ ;; -+esac - fi - - -- -+ ;; -+esac - fi - - -- -+ ;; -+esac - fi - - fi -@@ -40314,12 +42641,13 @@ fi - - if test "$wxUSE_SOCKETS" = "yes" ; then - if test "$USE_WIN32" != 1 ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is the type of the third argument of getsockname" >&5 --$as_echo_n "checking what is the type of the third argument of getsockname... " >&6; } --if ${wx_cv_type_getsockname3+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what is the type of the third argument of getsockname" >&5 -+printf %s "checking what is the type of the third argument of getsockname... " >&6; } -+if test ${wx_cv_type_getsockname3+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -40333,7 +42661,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - #include - - int --main () -+main (void) - { - - socklen_t len; -@@ -40343,10 +42671,11 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_type_getsockname3=socklen_t --else -- -+else case e in #( -+ e) - CFLAGS_OLD="$CFLAGS" - if test "$GCC" = yes ; then - CFLAGS="-Werror $CFLAGS" -@@ -40359,7 +42688,7 @@ else - #include - - int --main () -+main (void) - { - - size_t len; -@@ -40369,17 +42698,18 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_type_getsockname3=size_t --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include - #include - - int --main () -+main (void) - { - - int len; -@@ -40389,49 +42719,53 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_type_getsockname3=int --else -- wx_cv_type_getsockname3=unknown -- -+else case e in #( -+ e) wx_cv_type_getsockname3=unknown -+ ;; -+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 -+ ;; -+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 - - CFLAGS="$CFLAGS_OLD" - -- -+ ;; -+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 - 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 - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_getsockname3" >&5 --$as_echo "$wx_cv_type_getsockname3" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_getsockname3" >&5 -+printf "%s\n" "$wx_cv_type_getsockname3" >&6; } - - if test "$wx_cv_type_getsockname3" = "unknown"; then - wxUSE_SOCKETS=no -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Couldn't find socklen_t synonym for this system" >&5 --$as_echo "$as_me: WARNING: Couldn't find socklen_t synonym for this system" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Couldn't find socklen_t synonym for this system" >&5 -+printf "%s\n" "$as_me: WARNING: Couldn't find socklen_t synonym for this system" >&2;} - else -- cat >>confdefs.h <<_ACEOF --#define WX_SOCKLEN_T $wx_cv_type_getsockname3 --_ACEOF -+ printf "%s\n" "#define WX_SOCKLEN_T $wx_cv_type_getsockname3" >>confdefs.h - - fi -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is the type of the fifth argument of getsockopt" >&5 --$as_echo_n "checking what is the type of the fifth argument of getsockopt... " >&6; } --if ${wx_cv_type_getsockopt5+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what is the type of the fifth argument of getsockopt" >&5 -+printf %s "checking what is the type of the fifth argument of getsockopt... " >&6; } -+if test ${wx_cv_type_getsockopt5+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -40445,7 +42779,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - #include - - int --main () -+main (void) - { - - socklen_t len; -@@ -40455,10 +42789,11 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_type_getsockopt5=socklen_t --else -- -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -40466,7 +42801,7 @@ else - #include - - int --main () -+main (void) - { - - size_t len; -@@ -40476,17 +42811,18 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_type_getsockopt5=size_t --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include - #include - - int --main () -+main (void) - { - - int len; -@@ -40496,39 +42832,42 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_type_getsockopt5=int --else -- wx_cv_type_getsockopt5=unknown -- -+else case e in #( -+ e) wx_cv_type_getsockopt5=unknown -+ ;; -+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 -+ ;; -+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 - -+ ;; -+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 - 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 - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_getsockopt5" >&5 --$as_echo "$wx_cv_type_getsockopt5" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_getsockopt5" >&5 -+printf "%s\n" "$wx_cv_type_getsockopt5" >&6; } - - if test "$wx_cv_type_getsockopt5" = "unknown"; then - wxUSE_SOCKETS=no -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Couldn't find socklen_t synonym for this system" >&5 --$as_echo "$as_me: WARNING: Couldn't find socklen_t synonym for this system" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Couldn't find socklen_t synonym for this system" >&5 -+printf "%s\n" "$as_me: WARNING: Couldn't find socklen_t synonym for this system" >&2;} - else -- cat >>confdefs.h <<_ACEOF --#define SOCKOPTLEN_T $wx_cv_type_getsockopt5 --_ACEOF -+ printf "%s\n" "#define SOCKOPTLEN_T $wx_cv_type_getsockopt5" >>confdefs.h - - fi - fi -@@ -40536,12 +42875,13 @@ fi - - if test "$wxUSE_SOCKETS" = "yes" ; then - if test "$wxUSE_IPV6" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have sockaddr_in6" >&5 --$as_echo_n "checking whether we have sockaddr_in6... " >&6; } --if ${wx_cv_type_sockaddr_in6+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we have sockaddr_in6" >&5 -+printf %s "checking whether we have sockaddr_in6... " >&6; } -+if test ${wx_cv_type_sockaddr_in6+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -40550,7 +42890,7 @@ else - #include - - int --main () -+main (void) - { - - struct sockaddr_in6 sa6; -@@ -40559,113 +42899,116 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+then : - wx_cv_type_sockaddr_in6=yes --else -- wx_cv_type_sockaddr_in6=no -- -+else case e in #( -+ e) wx_cv_type_sockaddr_in6=no -+ ;; -+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 - -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_sockaddr_in6" >&5 --$as_echo "$wx_cv_type_sockaddr_in6" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_sockaddr_in6" >&5 -+printf "%s\n" "$wx_cv_type_sockaddr_in6" >&6; } - - if test "$wx_cv_type_sockaddr_in6"="yes"; then -- $as_echo "#define wxUSE_IPV6 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_IPV6 1" >>confdefs.h - - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: IPv6 support not available... disabled" >&5 --$as_echo "$as_me: WARNING: IPv6 support not available... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: IPv6 support not available... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: IPv6 support not available... disabled" >&2;} - fi - fi - -- $as_echo "#define wxUSE_SOCKETS 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_SOCKETS 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets" - fi - - if test "$wxUSE_PROTOCOL" = "yes"; then - if test "$wxUSE_SOCKETS" != "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Protocol classes require sockets... disabled" >&5 --$as_echo "$as_me: WARNING: Protocol classes require sockets... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Protocol classes require sockets... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: Protocol classes require sockets... disabled" >&2;} - wxUSE_PROTOCOL=no - fi - fi - - if test "$wxUSE_PROTOCOL" = "yes"; then -- $as_echo "#define wxUSE_PROTOCOL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_PROTOCOL 1" >>confdefs.h - - - if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then -- $as_echo "#define wxUSE_PROTOCOL_HTTP 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_PROTOCOL_HTTP 1" >>confdefs.h - - fi - if test "$wxUSE_PROTOCOL_FTP" = "yes"; then -- $as_echo "#define wxUSE_PROTOCOL_FTP 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_PROTOCOL_FTP 1" >>confdefs.h - - fi - if test "$wxUSE_PROTOCOL_FILE" = "yes"; then -- $as_echo "#define wxUSE_PROTOCOL_FILE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_PROTOCOL_FILE 1" >>confdefs.h - - fi - else - if test "$wxUSE_FS_INET" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: HTTP filesystem require protocol classes... disabled" >&5 --$as_echo "$as_me: WARNING: HTTP filesystem require protocol classes... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: HTTP filesystem require protocol classes... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: HTTP filesystem require protocol classes... disabled" >&2;} - wxUSE_FS_INET="no" - fi - fi - - if test "$wxUSE_URL" = "yes"; then - if test "$wxUSE_PROTOCOL" != "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxURL class requires wxProtocol... disabled" >&5 --$as_echo "$as_me: WARNING: wxURL class requires wxProtocol... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxURL class requires wxProtocol... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxURL class requires wxProtocol... disabled" >&2;} - wxUSE_URL=no - fi - if test "$wxUSE_URL" = "yes"; then -- $as_echo "#define wxUSE_URL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_URL 1" >>confdefs.h - - fi - fi - - if test "$wxUSE_VARIANT" = "yes"; then -- $as_echo "#define wxUSE_VARIANT 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_VARIANT 1" >>confdefs.h - - fi - - if test "$wxUSE_FS_INET" = "yes"; then -- $as_echo "#define wxUSE_FS_INET 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_FS_INET 1" >>confdefs.h - - fi - - if test "$wxUSE_WEBREQUEST" = "yes"; then - if test "$wxUSE_LIBCURL" = "yes"; then -- $as_echo "#define wxUSE_WEBREQUEST_CURL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_WEBREQUEST_CURL 1" >>confdefs.h - - have_webrequest_backend=1 - fi - - if test "$USE_DARWIN" = 1 -a "$wxUSE_URLSESSION" = "yes"; then -- $as_echo "#define wxUSE_WEBREQUEST_URLSESSION 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_WEBREQUEST_URLSESSION 1" >>confdefs.h - - have_webrequest_backend=1 - fi - - if test "$USE_WIN32" = 1 -a "$wxUSE_WINHTTP" = "yes"; then -- $as_echo "#define wxUSE_WEBREQUEST_WINHTTP 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_WEBREQUEST_WINHTTP 1" >>confdefs.h - - have_webrequest_backend=1 - fi - - if test "$have_webrequest_backend" = 1; then -- $as_echo "#define wxUSE_WEBREQUEST 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_WEBREQUEST 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS webrequest" - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling wxWebRequest because no backends are available" >&5 --$as_echo "$as_me: WARNING: Disabling wxWebRequest because no backends are available" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Disabling wxWebRequest because no backends are available" >&5 -+printf "%s\n" "$as_me: WARNING: Disabling wxWebRequest because no backends are available" >&2;} - fi - fi - -@@ -40677,130 +43020,128 @@ if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then - wxUSE_JOYSTICK=yes - - else -- for ac_header in linux/joystick.h -+ for ac_header in linux/joystick.h - do : - ac_fn_c_check_header_compile "$LINENO" "linux/joystick.h" "ac_cv_header_linux_joystick_h" "$ac_includes_default - " --if test "x$ac_cv_header_linux_joystick_h" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_LINUX_JOYSTICK_H 1 --_ACEOF -+if test "x$ac_cv_header_linux_joystick_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_LINUX_JOYSTICK_H 1" >>confdefs.h - wxUSE_JOYSTICK=yes - fi - - done -- - fi - - if test "$wxUSE_JOYSTICK" = "yes"; then -- $as_echo "#define wxUSE_JOYSTICK 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_JOYSTICK 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest" - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Joystick not supported by this system... disabled" >&5 --$as_echo "$as_me: WARNING: Joystick not supported by this system... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Joystick not supported by this system... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: Joystick not supported by this system... disabled" >&2;} - fi - fi - - - - if test "$wxUSE_FONTENUM" = "yes" ; then -- $as_echo "#define wxUSE_FONTENUM 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_FONTENUM 1" >>confdefs.h - - fi - - if test "$wxUSE_FONTMAP" = "yes" ; then -- $as_echo "#define wxUSE_FONTMAP 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_FONTMAP 1" >>confdefs.h - - fi - - if test "$wxUSE_UNICODE" = "yes" ; then -- $as_echo "#define wxUSE_UNICODE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_UNICODE 1" >>confdefs.h - - fi - - if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "yes"; then -- $as_echo "#define wxUSE_UNICODE_UTF8 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_UNICODE_UTF8 1" >>confdefs.h - - - if test "$wxUSE_UNICODE_UTF8_LOCALE" = "yes"; then -- $as_echo "#define wxUSE_UTF8_LOCALE_ONLY 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_UTF8_LOCALE_ONLY 1" >>confdefs.h - - fi - fi - - - if test "$wxUSE_CONSTRAINTS" = "yes"; then -- $as_echo "#define wxUSE_CONSTRAINTS 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_CONSTRAINTS 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout" - fi - - if test "$wxUSE_MDI" = "yes"; then -- $as_echo "#define wxUSE_MDI 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_MDI 1" >>confdefs.h - - - if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then -- $as_echo "#define wxUSE_MDI_ARCHITECTURE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_MDI_ARCHITECTURE 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi" - fi - fi - - if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then -- $as_echo "#define wxUSE_DOC_VIEW_ARCHITECTURE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_DOC_VIEW_ARCHITECTURE 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview" - fi - - if test "$wxUSE_HELP" = "yes"; then -- $as_echo "#define wxUSE_HELP 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_HELP 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help" - - if test "$wxUSE_MSW" = 1; then - if test "$wxUSE_MS_HTML_HELP" = "yes"; then -- $as_echo "#define wxUSE_MS_HTML_HELP 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_MS_HTML_HELP 1" >>confdefs.h - - fi - fi - - if test "$wxUSE_WXHTML_HELP" = "yes"; then - if test "$wxUSE_HTML" = "yes"; then -- $as_echo "#define wxUSE_WXHTML_HELP 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_WXHTML_HELP 1" >>confdefs.h - - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot use wxHTML-based help without wxHTML so it won't be compiled" >&5 --$as_echo "$as_me: WARNING: Cannot use wxHTML-based help without wxHTML so it won't be compiled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Cannot use wxHTML-based help without wxHTML so it won't be compiled" >&5 -+printf "%s\n" "$as_me: WARNING: Cannot use wxHTML-based help without wxHTML so it won't be compiled" >&2;} - wxUSE_WXHTML_HELP=no - fi - fi - fi - - if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then -- $as_echo "#define wxUSE_PRINTING_ARCHITECTURE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_PRINTING_ARCHITECTURE 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing" - fi - - if test "$wxUSE_POSTSCRIPT" = "yes" ; then -- $as_echo "#define wxUSE_POSTSCRIPT 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_POSTSCRIPT 1" >>confdefs.h - - fi - --$as_echo "#define wxUSE_AFM_FOR_POSTSCRIPT 1" >>confdefs.h -+printf "%s\n" "#define wxUSE_AFM_FOR_POSTSCRIPT 1" >>confdefs.h - - - if test "$wxUSE_SVG" = "yes"; then -- $as_echo "#define wxUSE_SVG 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_SVG 1" >>confdefs.h - - fi - - - if test "$wxUSE_METAFILE" = "yes"; then - if test "$wxUSE_MSW" != 1 -a "$wxUSE_MAC" != 1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxMetafile is not available on this system... disabled" >&5 --$as_echo "$as_me: WARNING: wxMetafile is not available on this system... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxMetafile is not available on this system... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxMetafile is not available on this system... disabled" >&2;} - wxUSE_METAFILE=no - fi - elif test "$wxUSE_METAFILE" = "auto"; then -@@ -40810,10 +43151,10 @@ elif test "$wxUSE_METAFILE" = "auto"; then - fi - - if test "$wxUSE_METAFILE" = "yes"; then -- $as_echo "#define wxUSE_METAFILE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_METAFILE 1" >>confdefs.h - - if test "$wxUSE_MSW" = 1; then -- $as_echo "#define wxUSE_ENH_METAFILE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_ENH_METAFILE 1" >>confdefs.h - - fi - fi -@@ -40823,11 +43164,11 @@ if test "$USE_WIN32" = 1 ; then - if test "$wxUSE_OLE" = "yes" ; then - LIBS="-lrpcrt4 -loleaut32 -lole32 -luuid $LIBS" - -- $as_echo "#define wxUSE_OLE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_OLE 1" >>confdefs.h - -- $as_echo "#define wxUSE_OLE_AUTOMATION 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_OLE_AUTOMATION 1" >>confdefs.h - -- $as_echo "#define wxUSE_ACTIVEX 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_ACTIVEX 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS oleauto" - else -@@ -40836,14 +43177,14 @@ if test "$USE_WIN32" = 1 ; then - wxUSE_DATAOBJ=no - - if test "$wxUSE_MEDIACTRL" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxMediaCtrl requires wxUSE_OLE... disabled" >&5 --$as_echo "$as_me: WARNING: wxMediaCtrl requires wxUSE_OLE... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxMediaCtrl requires wxUSE_OLE... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxMediaCtrl requires wxUSE_OLE... disabled" >&2;} - wxUSE_MEDIACTRL=no - fi - - if test "$wxUSE_WEBVIEW" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxWebView requires wxUSE_OLE... disabled" >&5 --$as_echo "$as_me: WARNING: wxWebView requires wxUSE_OLE... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxWebView requires wxUSE_OLE... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxWebView requires wxUSE_OLE... disabled" >&2;} - wxUSE_WEBVIEW=no - fi - fi -@@ -40851,13 +43192,13 @@ fi - - if test "$wxUSE_IPC" = "yes"; then - if test "$wxUSE_SOCKETS" != "yes" -a "$USE_WIN32" != 1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxWidgets IPC classes require sockets... disabled" >&5 --$as_echo "$as_me: WARNING: wxWidgets IPC classes require sockets... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxWidgets IPC classes require sockets... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxWidgets IPC classes require sockets... disabled" >&2;} - wxUSE_IPC=no - fi - - if test "$wxUSE_IPC" = "yes"; then -- $as_echo "#define wxUSE_IPC 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_IPC 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ipc" - fi -@@ -40865,42 +43206,42 @@ fi - - if test "$wxUSE_DATAOBJ" = "yes"; then - if test "$wxUSE_DFB" = 1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&5 --$as_echo "$as_me: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&2;} - wxUSE_DATAOBJ=no - else -- $as_echo "#define wxUSE_DATAOBJ 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_DATAOBJ 1" >>confdefs.h - - fi - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Clipboard and drag-and-drop require wxDataObject -- disabled" >&5 --$as_echo "$as_me: WARNING: Clipboard and drag-and-drop require wxDataObject -- disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Clipboard and drag-and-drop require wxDataObject -- disabled" >&5 -+printf "%s\n" "$as_me: WARNING: Clipboard and drag-and-drop require wxDataObject -- disabled" >&2;} - wxUSE_CLIPBOARD=no - wxUSE_DRAG_AND_DROP=no - fi - - if test "$wxUSE_CLIPBOARD" = "yes"; then - if test "$wxUSE_DFB" = 1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Clipboard not yet supported under $TOOLKIT... disabled" >&5 --$as_echo "$as_me: WARNING: Clipboard not yet supported under $TOOLKIT... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Clipboard not yet supported under $TOOLKIT... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: Clipboard not yet supported under $TOOLKIT... disabled" >&2;} - wxUSE_CLIPBOARD=no - fi - - if test "$wxUSE_CLIPBOARD" = "yes"; then -- $as_echo "#define wxUSE_CLIPBOARD 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_CLIPBOARD 1" >>confdefs.h - - fi - fi - - if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then - if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_DFB" = 1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&5 --$as_echo "$as_me: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&2;} - wxUSE_DRAG_AND_DROP=no - fi - - if test "$wxUSE_DRAG_AND_DROP" = "yes"; then -- $as_echo "#define wxUSE_DRAG_AND_DROP 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_DRAG_AND_DROP 1" >>confdefs.h - - fi - -@@ -40915,12 +43256,12 @@ if test "$wxUSE_CLIPBOARD" = "yes"; then - fi - - if test "$wxUSE_SPLINES" = "yes" ; then -- $as_echo "#define wxUSE_SPLINES 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_SPLINES 1" >>confdefs.h - - fi - - if test "$wxUSE_MOUSEWHEEL" = "yes" ; then -- $as_echo "#define wxUSE_MOUSEWHEEL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_MOUSEWHEEL 1" >>confdefs.h - - fi - -@@ -40929,18 +43270,18 @@ if test "$wxUSE_UIACTIONSIMULATOR" = "yes" ; then - if test "$wxUSE_XTEST" = "yes" ; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XTST" >&5 --$as_echo_n "checking for XTST... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XTST" >&5 -+printf %s "checking for XTST... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$XTST_CFLAGS"; then - pkg_cv_XTST_CFLAGS="$XTST_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xtst\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xtst\""; } >&5 - ($PKG_CONFIG --exists --print-errors "xtst") 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_XTST_CFLAGS=`$PKG_CONFIG --cflags "xtst" 2>/dev/null` - else -@@ -40955,10 +43296,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_XTST_LIBS="$XTST_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xtst\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xtst\""; } >&5 - ($PKG_CONFIG --exists --print-errors "xtst") 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_XTST_LIBS=`$PKG_CONFIG --libs "xtst" 2>/dev/null` - else -@@ -40988,8 +43329,8 @@ fi - - - if test "$WXGTK3" = 1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: XTest not found, disabling wxUIActionSimulator" >&5 --$as_echo "$as_me: WARNING: XTest not found, disabling wxUIActionSimulator" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: XTest not found, disabling wxUIActionSimulator" >&5 -+printf "%s\n" "$as_me: WARNING: XTest not found, disabling wxUIActionSimulator" >&2;} - wxUSE_UIACTIONSIMULATOR=no - fi - wxUSE_XTEST="no" -@@ -40998,8 +43339,8 @@ $as_echo "$as_me: WARNING: XTest not found, disabling wxUIActionSimulator" >&2;} - elif test $pkg_failed = untried; then - - if test "$WXGTK3" = 1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: XTest not found, disabling wxUIActionSimulator" >&5 --$as_echo "$as_me: WARNING: XTest not found, disabling wxUIActionSimulator" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: XTest not found, disabling wxUIActionSimulator" >&5 -+printf "%s\n" "$as_me: WARNING: XTest not found, disabling wxUIActionSimulator" >&2;} - wxUSE_UIACTIONSIMULATOR=no - fi - wxUSE_XTEST="no" -@@ -41008,13 +43349,13 @@ $as_echo "$as_me: WARNING: XTest not found, disabling wxUIActionSimulator" >&2;} - else - XTST_CFLAGS=$pkg_cv_XTST_CFLAGS - XTST_LIBS=$pkg_cv_XTST_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; } - - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $XTST_LIBS" - CFLAGS="$XTST_CFLAGS $CFLAGS" - CXXFLAGS="$XTST_CFLAGS $CXXFLAGS" -- $as_echo "#define wxUSE_XTEST 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_XTEST 1" >>confdefs.h - - - fi -@@ -41022,20 +43363,20 @@ fi - wxUSE_UIACTIONSIMULATOR=no - fi - elif test "$wxUSE_DFB" = 1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxUIActionSimulator not yet supported under $TOOLKIT... disabled" >&5 --$as_echo "$as_me: WARNING: wxUIActionSimulator not yet supported under $TOOLKIT... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxUIActionSimulator not yet supported under $TOOLKIT... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxUIActionSimulator not yet supported under $TOOLKIT... disabled" >&2;} - wxUSE_UIACTIONSIMULATOR=no - fi - - if test "$wxUSE_UIACTIONSIMULATOR" = "yes" ; then -- $as_echo "#define wxUSE_UIACTIONSIMULATOR 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_UIACTIONSIMULATOR 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS uiaction" - fi - fi - - if test "$wxUSE_DC_TRANSFORM_MATRIX" = "yes" ; then -- $as_echo "#define wxUSE_DC_TRANSFORM_MATRIX 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_DC_TRANSFORM_MATRIX 1" >>confdefs.h - - fi - -@@ -41046,366 +43387,366 @@ if test "$wxUSE_CONTROLS" = "yes"; then - fi - - if test "$wxUSE_MARKUP" = "yes"; then -- $as_echo "#define wxUSE_MARKUP 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_MARKUP 1" >>confdefs.h - - fi - - if test "$wxUSE_ACCEL" = "yes"; then -- $as_echo "#define wxUSE_ACCEL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_ACCEL 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_ACTIVITYINDICATOR" = "yes"; then -- $as_echo "#define wxUSE_ACTIVITYINDICATOR 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_ACTIVITYINDICATOR 1" >>confdefs.h - - fi - - if test "$wxUSE_ADDREMOVECTRL" = "yes"; then -- $as_echo "#define wxUSE_ADDREMOVECTRL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_ADDREMOVECTRL 1" >>confdefs.h - - fi - - if test "$wxUSE_ANIMATIONCTRL" = "yes"; then -- $as_echo "#define wxUSE_ANIMATIONCTRL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_ANIMATIONCTRL 1" >>confdefs.h - - USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS animate" - fi - - if test "$wxUSE_BANNERWINDOW" = "yes"; then -- $as_echo "#define wxUSE_BANNERWINDOW 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_BANNERWINDOW 1" >>confdefs.h - - fi - - if test "$wxUSE_BUTTON" = "yes"; then -- $as_echo "#define wxUSE_BUTTON 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_BUTTON 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_BMPBUTTON" = "yes"; then -- $as_echo "#define wxUSE_BMPBUTTON 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_BMPBUTTON 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_CALCTRL" = "yes"; then -- $as_echo "#define wxUSE_CALENDARCTRL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_CALENDARCTRL 1" >>confdefs.h - - USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS calendar" - fi - - if test "$wxUSE_CARET" = "yes"; then -- $as_echo "#define wxUSE_CARET 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_CARET 1" >>confdefs.h - - USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret" - fi - - if test "$wxUSE_COLLPANE" = "yes"; then -- $as_echo "#define wxUSE_COLLPANE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_COLLPANE 1" >>confdefs.h - - USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS collpane" - fi - - if test "$wxUSE_COMBOBOX" = "yes"; then -- $as_echo "#define wxUSE_COMBOBOX 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_COMBOBOX 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_COMBOCTRL" = "yes"; then -- $as_echo "#define wxUSE_COMBOCTRL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_COMBOCTRL 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_COMMANDLINKBUTTON" = "yes"; then -- $as_echo "#define wxUSE_COMMANDLINKBUTTON 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_COMMANDLINKBUTTON 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_CHOICE" = "yes"; then -- $as_echo "#define wxUSE_CHOICE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_CHOICE 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_CHOICEBOOK" = "yes"; then -- $as_echo "#define wxUSE_CHOICEBOOK 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_CHOICEBOOK 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_CHECKBOX" = "yes"; then -- $as_echo "#define wxUSE_CHECKBOX 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_CHECKBOX 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_CHECKLST" = "yes"; then -- $as_echo "#define wxUSE_CHECKLISTBOX 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_CHECKLISTBOX 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_COLOURPICKERCTRL" = "yes"; then -- $as_echo "#define wxUSE_COLOURPICKERCTRL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_COLOURPICKERCTRL 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_DATEPICKCTRL" = "yes"; then -- $as_echo "#define wxUSE_DATEPICKCTRL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_DATEPICKCTRL 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_DIRPICKERCTRL" = "yes"; then -- $as_echo "#define wxUSE_DIRPICKERCTRL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_DIRPICKERCTRL 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_FILECTRL" = "yes"; then -- $as_echo "#define wxUSE_FILECTRL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_FILECTRL 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_FILEPICKERCTRL" = "yes"; then -- $as_echo "#define wxUSE_FILEPICKERCTRL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_FILEPICKERCTRL 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_FONTPICKERCTRL" = "yes"; then -- $as_echo "#define wxUSE_FONTPICKERCTRL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_FONTPICKERCTRL 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_DISPLAY" = "yes"; then - if test "$wxUSE_DFB" = 1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >&5 --$as_echo "$as_me: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >&2;} - wxUSE_DISPLAY=no - else -- $as_echo "#define wxUSE_DISPLAY 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_DISPLAY 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display" - fi - fi - - if test "$wxUSE_DETECT_SM" = "yes"; then -- $as_echo "#define wxUSE_DETECT_SM 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_DETECT_SM 1" >>confdefs.h - - fi - - if test "$wxUSE_GAUGE" = "yes"; then -- $as_echo "#define wxUSE_GAUGE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_GAUGE 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_GRID" = "yes"; then -- $as_echo "#define wxUSE_GRID 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_GRID 1" >>confdefs.h - - USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid" - fi - - if test "$wxUSE_HEADERCTRL" = "yes"; then -- $as_echo "#define wxUSE_HEADERCTRL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_HEADERCTRL 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_HYPERLINKCTRL" = "yes"; then -- $as_echo "#define wxUSE_HYPERLINKCTRL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_HYPERLINKCTRL 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_BITMAPCOMBOBOX" = "yes"; then -- $as_echo "#define wxUSE_BITMAPCOMBOBOX 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_BITMAPCOMBOBOX 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_DATAVIEWCTRL" = "yes"; then -- $as_echo "#define wxUSE_DATAVIEWCTRL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_DATAVIEWCTRL 1" >>confdefs.h - - USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dataview" - - if test "$wxUSE_NATIVE_DATAVIEWCTRL" = "yes"; then -- $as_echo "#define wxUSE_NATIVE_DATAVIEWCTRL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_NATIVE_DATAVIEWCTRL 1" >>confdefs.h - - fi - fi - - if test "$wxUSE_IMAGLIST" = "yes"; then -- $as_echo "#define wxUSE_IMAGLIST 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_IMAGLIST 1" >>confdefs.h - - fi - - if test "$wxUSE_INFOBAR" = "yes"; then -- $as_echo "#define wxUSE_INFOBAR 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_INFOBAR 1" >>confdefs.h - - fi - - if test "$wxUSE_LISTBOOK" = "yes"; then -- $as_echo "#define wxUSE_LISTBOOK 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_LISTBOOK 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_LISTBOX" = "yes"; then -- $as_echo "#define wxUSE_LISTBOX 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_LISTBOX 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_LISTCTRL" = "yes"; then - if test "$wxUSE_IMAGLIST" = "yes"; then -- $as_echo "#define wxUSE_LISTCTRL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_LISTCTRL 1" >>confdefs.h - - USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listctrl" - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxListCtrl requires wxImageList and won't be compiled without it" >&5 --$as_echo "$as_me: WARNING: wxListCtrl requires wxImageList and won't be compiled without it" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxListCtrl requires wxImageList and won't be compiled without it" >&5 -+printf "%s\n" "$as_me: WARNING: wxListCtrl requires wxImageList and won't be compiled without it" >&2;} - fi - fi - - if test "$wxUSE_EDITABLELISTBOX" = "yes"; then -- $as_echo "#define wxUSE_EDITABLELISTBOX 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_EDITABLELISTBOX 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_NOTEBOOK" = "yes"; then -- $as_echo "#define wxUSE_NOTEBOOK 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_NOTEBOOK 1" >>confdefs.h - - USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook" - fi - - if test "$wxUSE_NOTIFICATION_MESSAGE" = "yes"; then -- $as_echo "#define wxUSE_NOTIFICATION_MESSAGE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_NOTIFICATION_MESSAGE 1" >>confdefs.h - - fi - - if test "$wxUSE_ODCOMBOBOX" = "yes"; then -- $as_echo "#define wxUSE_ODCOMBOBOX 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_ODCOMBOBOX 1" >>confdefs.h - - USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS combo" - fi - - if test "$wxUSE_RADIOBOX" = "yes"; then -- $as_echo "#define wxUSE_RADIOBOX 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_RADIOBOX 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_RADIOBTN" = "yes"; then -- $as_echo "#define wxUSE_RADIOBTN 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_RADIOBTN 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_REARRANGECTRL" = "yes"; then -- $as_echo "#define wxUSE_REARRANGECTRL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_REARRANGECTRL 1" >>confdefs.h - - fi - - if test "$wxUSE_RICHMSGDLG" = "yes"; then -- $as_echo "#define wxUSE_RICHMSGDLG 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_RICHMSGDLG 1" >>confdefs.h - - fi - - if test "$wxUSE_RICHTOOLTIP" = "yes"; then -- $as_echo "#define wxUSE_RICHTOOLTIP 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_RICHTOOLTIP 1" >>confdefs.h - - fi - - if test "$wxUSE_SASH" = "yes"; then -- $as_echo "#define wxUSE_SASH 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_SASH 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sashtest" - fi - - if test "$wxUSE_SCROLLBAR" = "yes"; then -- $as_echo "#define wxUSE_SCROLLBAR 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_SCROLLBAR 1" >>confdefs.h - - USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll" - fi - - if test "$wxUSE_SEARCHCTRL" = "yes"; then -- $as_echo "#define wxUSE_SEARCHCTRL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_SEARCHCTRL 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_SLIDER" = "yes"; then -- $as_echo "#define wxUSE_SLIDER 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_SLIDER 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_SPINBTN" = "yes"; then -- $as_echo "#define wxUSE_SPINBTN 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_SPINBTN 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_SPINCTRL" = "yes"; then -- $as_echo "#define wxUSE_SPINCTRL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_SPINCTRL 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_SPLITTER" = "yes"; then -- $as_echo "#define wxUSE_SPLITTER 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_SPLITTER 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splitter" - fi - - if test "$wxUSE_STATBMP" = "yes"; then -- $as_echo "#define wxUSE_STATBMP 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_STATBMP 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_STATBOX" = "yes"; then -- $as_echo "#define wxUSE_STATBOX 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_STATBOX 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_STATTEXT" = "yes"; then -- $as_echo "#define wxUSE_STATTEXT 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_STATTEXT 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_STATLINE" = "yes"; then -- $as_echo "#define wxUSE_STATLINE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_STATLINE 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_STATUSBAR" = "yes"; then -- $as_echo "#define wxUSE_NATIVE_STATUSBAR 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_NATIVE_STATUSBAR 1" >>confdefs.h - -- $as_echo "#define wxUSE_STATUSBAR 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_STATUSBAR 1" >>confdefs.h - - USES_CONTROLS=1 - -@@ -41413,31 +43754,31 @@ if test "$wxUSE_STATUSBAR" = "yes"; then - fi - - if test "$wxUSE_TEXTCTRL" = "yes"; then -- $as_echo "#define wxUSE_TEXTCTRL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_TEXTCTRL 1" >>confdefs.h - - USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text" - -- $as_echo "#define wxUSE_RICHEDIT 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_RICHEDIT 1" >>confdefs.h - -- $as_echo "#define wxUSE_RICHEDIT2 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_RICHEDIT2 1" >>confdefs.h - - fi - - if test "$wxUSE_TIMEPICKCTRL" = "yes"; then -- $as_echo "#define wxUSE_TIMEPICKCTRL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_TIMEPICKCTRL 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_TOGGLEBTN" = "yes"; then -- $as_echo "#define wxUSE_TOGGLEBTN 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_TOGGLEBTN 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_TOOLBAR" = "yes"; then -- $as_echo "#define wxUSE_TOOLBAR 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_TOOLBAR 1" >>confdefs.h - - USES_CONTROLS=1 - -@@ -41445,7 +43786,7 @@ if test "$wxUSE_TOOLBAR" = "yes"; then - wxUSE_TOOLBAR_NATIVE="no" - else - wxUSE_TOOLBAR_NATIVE="yes" -- $as_echo "#define wxUSE_TOOLBAR_NATIVE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_TOOLBAR_NATIVE 1" >>confdefs.h - - fi - -@@ -41454,52 +43795,52 @@ fi - - if test "$wxUSE_TOOLTIPS" = "yes"; then - if test "$wxUSE_MOTIF" = 1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxTooltip not supported yet under Motif... disabled" >&5 --$as_echo "$as_me: WARNING: wxTooltip not supported yet under Motif... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxTooltip not supported yet under Motif... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxTooltip not supported yet under Motif... disabled" >&2;} - else - if test "$wxUSE_UNIVERSAL" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxTooltip not supported yet in wxUniversal... disabled" >&5 --$as_echo "$as_me: WARNING: wxTooltip not supported yet in wxUniversal... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxTooltip not supported yet in wxUniversal... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxTooltip not supported yet in wxUniversal... disabled" >&2;} - else -- $as_echo "#define wxUSE_TOOLTIPS 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_TOOLTIPS 1" >>confdefs.h - - fi - fi - fi - - if test "$wxUSE_TREEBOOK" = "yes"; then -- $as_echo "#define wxUSE_TREEBOOK 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_TREEBOOK 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_TOOLBOOK" = "yes"; then -- $as_echo "#define wxUSE_TOOLBOOK 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_TOOLBOOK 1" >>confdefs.h - - USES_CONTROLS=1 - fi - - if test "$wxUSE_TREECTRL" = "yes"; then - if test "$wxUSE_IMAGLIST" = "yes"; then -- $as_echo "#define wxUSE_TREECTRL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_TREECTRL 1" >>confdefs.h - - USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treectrl" - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxTreeCtrl requires wxImageList and won't be compiled without it" >&5 --$as_echo "$as_me: WARNING: wxTreeCtrl requires wxImageList and won't be compiled without it" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxTreeCtrl requires wxImageList and won't be compiled without it" >&5 -+printf "%s\n" "$as_me: WARNING: wxTreeCtrl requires wxImageList and won't be compiled without it" >&2;} - fi - fi - - if test "$wxUSE_TREELISTCTRL" = "yes"; then -- $as_echo "#define wxUSE_TREELISTCTRL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_TREELISTCTRL 1" >>confdefs.h - - USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelist" - fi - - if test "$wxUSE_POPUPWIN" = "yes"; then -- $as_echo "#define wxUSE_POPUPWIN 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_POPUPWIN 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS popup" - -@@ -41507,7 +43848,7 @@ if test "$wxUSE_POPUPWIN" = "yes"; then - fi - - if test "$wxUSE_PREFERENCES_EDITOR" = "yes"; then -- $as_echo "#define wxUSE_PREFERENCES_EDITOR 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_PREFERENCES_EDITOR 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS preferences" - fi -@@ -41517,18 +43858,18 @@ if test "$wxUSE_PRIVATE_FONTS" = "yes"; then - if test "$wxUSE_PRIVATE_FONTS" = "yes"; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PRIVATE_FONTS" >&5 --$as_echo_n "checking for PRIVATE_FONTS... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PRIVATE_FONTS" >&5 -+printf %s "checking for PRIVATE_FONTS... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$PRIVATE_FONTS_CFLAGS"; then - pkg_cv_PRIVATE_FONTS_CFLAGS="$PRIVATE_FONTS_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 2.8.0 pangoft2 >= 1.38.0\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 2.8.0 pangoft2 >= 1.38.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "fontconfig >= 2.8.0 pangoft2 >= 1.38.0") 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_PRIVATE_FONTS_CFLAGS=`$PKG_CONFIG --cflags "fontconfig >= 2.8.0 pangoft2 >= 1.38.0" 2>/dev/null` - else -@@ -41543,10 +43884,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_PRIVATE_FONTS_LIBS="$PRIVATE_FONTS_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 2.8.0 pangoft2 >= 1.38.0\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 2.8.0 pangoft2 >= 1.38.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "fontconfig >= 2.8.0 pangoft2 >= 1.38.0") 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_PRIVATE_FONTS_LIBS=`$PKG_CONFIG --libs "fontconfig >= 2.8.0 pangoft2 >= 1.38.0" 2>/dev/null` - else -@@ -41574,18 +43915,18 @@ fi - # Put the nasty error message in config.log where it belongs - echo "$PRIVATE_FONTS_PKG_ERRORS" >&5 - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: run-time font loading won't be supported by wxFont" >&5 --$as_echo "$as_me: WARNING: run-time font loading won't be supported by wxFont" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: run-time font loading won't be supported by wxFont" >&5 -+printf "%s\n" "$as_me: WARNING: run-time font loading won't be supported by wxFont" >&2;} - elif test $pkg_failed = untried; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: run-time font loading won't be supported by wxFont" >&5 --$as_echo "$as_me: WARNING: run-time font loading won't be supported by wxFont" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: run-time font loading won't be supported by wxFont" >&5 -+printf "%s\n" "$as_me: WARNING: run-time font loading won't be supported by wxFont" >&2;} - else - PRIVATE_FONTS_CFLAGS=$pkg_cv_PRIVATE_FONTS_CFLAGS - PRIVATE_FONTS_LIBS=$pkg_cv_PRIVATE_FONTS_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 wxUSE_PRIVATE_FONTS 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_PRIVATE_FONTS 1" >>confdefs.h - - CXXFLAGS="$PRIVATE_FONTS_CFLAGS $CXXFLAGS" - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PRIVATE_FONTS_LIBS" -@@ -41593,41 +43934,41 @@ $as_echo "yes" >&6; } - fi - fi - elif test "$wxUSE_MAC" = 1 -o "$wxUSE_MSW" = 1; then -- $as_echo "#define wxUSE_PRIVATE_FONTS 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_PRIVATE_FONTS 1" >>confdefs.h - - fi - fi - - if test "$wxUSE_DIALUP_MANAGER" = "yes"; then - if test "$wxUSE_MAC" = 1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Dialup manager not supported on this platform... disabled" >&5 --$as_echo "$as_me: WARNING: Dialup manager not supported on this platform... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Dialup manager not supported on this platform... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: Dialup manager not supported on this platform... disabled" >&2;} - else -- $as_echo "#define wxUSE_DIALUP_MANAGER 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_DIALUP_MANAGER 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup" - fi - fi - - if test "$wxUSE_TIPWINDOW" = "yes"; then -- $as_echo "#define wxUSE_TIPWINDOW 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_TIPWINDOW 1" >>confdefs.h - - fi - - if test "$USES_CONTROLS" = 1; then -- $as_echo "#define wxUSE_CONTROLS 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_CONTROLS 1" >>confdefs.h - - fi - - - if test "$wxUSE_ACCESSIBILITY" = "yes"; then -- $as_echo "#define wxUSE_ACCESSIBILITY 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_ACCESSIBILITY 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access" - fi - - if test "$wxUSE_ARTPROVIDER_STD" = "yes"; then -- $as_echo "#define wxUSE_ARTPROVIDER_STD 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_ARTPROVIDER_STD 1" >>confdefs.h - - fi - -@@ -41642,22 +43983,22 @@ if test "$wxUSE_ARTPROVIDER_TANGO" = "auto"; then - fi - - if test "$wxUSE_ARTPROVIDER_TANGO" = "yes"; then -- $as_echo "#define wxUSE_ARTPROVIDER_TANGO 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_ARTPROVIDER_TANGO 1" >>confdefs.h - - fi - - if test "$wxUSE_DRAGIMAGE" = "yes"; then -- $as_echo "#define wxUSE_DRAGIMAGE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_DRAGIMAGE 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag" - fi - - if test "$wxUSE_EXCEPTIONS" = "yes"; then - if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --enable-exceptions can't be used with --enable-no_exceptions" >&5 --$as_echo "$as_me: WARNING: --enable-exceptions can't be used with --enable-no_exceptions" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: --enable-exceptions can't be used with --enable-no_exceptions" >&5 -+printf "%s\n" "$as_me: WARNING: --enable-exceptions can't be used with --enable-no_exceptions" >&2;} - else -- $as_echo "#define wxUSE_EXCEPTIONS 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_EXCEPTIONS 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS except" - fi -@@ -41665,7 +44006,7 @@ fi - - USE_HTML=0 - if test "$wxUSE_HTML" = "yes"; then -- $as_echo "#define wxUSE_HTML 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_HTML 1" >>confdefs.h - - USE_HTML=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox" -@@ -41675,11 +44016,11 @@ fi - USE_XRC=0 - if test "$wxUSE_XRC" = "yes"; then - if test "$wxUSE_XML" != "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: XML library not built, XRC resources disabled" >&5 --$as_echo "$as_me: WARNING: XML library not built, XRC resources disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: XML library not built, XRC resources disabled" >&5 -+printf "%s\n" "$as_me: WARNING: XML library not built, XRC resources disabled" >&2;} - wxUSE_XRC=no - else -- $as_echo "#define wxUSE_XRC 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_XRC 1" >>confdefs.h - - USE_XRC=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS xrc" -@@ -41688,7 +44029,7 @@ fi - - USE_AUI=0 - if test "$wxUSE_AUI" = "yes"; then -- $as_echo "#define wxUSE_AUI 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_AUI 1" >>confdefs.h - - USE_AUI=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS aui" -@@ -41696,7 +44037,7 @@ fi - - USE_PROPGRID=0 - if test "$wxUSE_PROPGRID" = "yes"; then -- $as_echo "#define wxUSE_PROPGRID 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_PROPGRID 1" >>confdefs.h - - USE_PROPGRID=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS propgrid" -@@ -41704,7 +44045,7 @@ fi - - USE_RIBBON=0 - if test "$wxUSE_RIBBON" = "yes"; then -- $as_echo "#define wxUSE_RIBBON 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_RIBBON 1" >>confdefs.h - - USE_RIBBON=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ribbon" -@@ -41712,19 +44053,20 @@ fi - - USE_STC=0 - if test "$wxUSE_STC" = "yes"; then -- $as_echo "#define wxUSE_STC 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_STC 1" >>confdefs.h - - USE_STC=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS stc" - - # Extract the first word of "python", so it can be a program name with args. - set dummy python; 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_PYTHON+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- case $PYTHON in -+{ 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_PYTHON+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) case $PYTHON in - [\\/]* | ?:[\\/]*) - ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. - ;; -@@ -41733,11 +44075,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_PYTHON="$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_PYTHON="$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 -@@ -41745,15 +44091,16 @@ done - IFS=$as_save_IFS - - ;; -+esac ;; - esac - fi - PYTHON=$ac_cv_path_PYTHON - if test -n "$PYTHON"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 --$as_echo "$PYTHON" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 -+printf "%s\n" "$PYTHON" >&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 - - -@@ -41764,62 +44111,62 @@ fi - fi - - if test "$wxUSE_MENUS" = "yes"; then -- $as_echo "#define wxUSE_MENUS 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_MENUS 1" >>confdefs.h - - if test "$wxUSE_MENUBAR" = "yes"; then -- $as_echo "#define wxUSE_MENUBAR 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_MENUBAR 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu" - fi - elif test "$wxUSE_MENUBAR" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxMenuBar can't be used without wxMenu and will be disabled" >&5 --$as_echo "$as_me: WARNING: wxMenuBar can't be used without wxMenu and will be disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxMenuBar can't be used without wxMenu and will be disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxMenuBar can't be used without wxMenu and will be disabled" >&2;} - fi - - if test "$wxUSE_MIMETYPE" = "yes"; then -- $as_echo "#define wxUSE_MIMETYPE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_MIMETYPE 1" >>confdefs.h - - fi - - if test "$wxUSE_MINIFRAME" = "yes"; then -- $as_echo "#define wxUSE_MINIFRAME 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_MINIFRAME 1" >>confdefs.h - - fi - - if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then -- $as_echo "#define wxUSE_SYSTEM_OPTIONS 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_SYSTEM_OPTIONS 1" >>confdefs.h - - fi - - if test "$wxUSE_TASKBARICON" = "yes"; then -- $as_echo "#define wxUSE_TASKBARICON 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_TASKBARICON 1" >>confdefs.h - -- $as_echo "#define wxUSE_TASKBARICON_BALLOONS 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_TASKBARICON_BALLOONS 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar" - fi - - - if test "$wxUSE_VALIDATORS" = "yes"; then -- $as_echo "#define wxUSE_VALIDATORS 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_VALIDATORS 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate" - fi - - if test "$wxUSE_PALETTE" = "yes" ; then - if test "$wxUSE_DFB" = 1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxPalette not yet supported under DFB... disabled" >&5 --$as_echo "$as_me: WARNING: wxPalette not yet supported under DFB... disabled" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxPalette not yet supported under DFB... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxPalette not yet supported under DFB... disabled" >&2;} - wxUSE_PALETTE=no - else -- $as_echo "#define wxUSE_PALETTE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_PALETTE 1" >>confdefs.h - - fi - fi - - USE_RICHTEXT=0 - if test "$wxUSE_RICHTEXT" = "yes"; then -- $as_echo "#define wxUSE_RICHTEXT 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_RICHTEXT 1" >>confdefs.h - - USE_RICHTEXT=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext" -@@ -41833,18 +44180,18 @@ if test "$wxUSE_WEBVIEW" = "yes"; then - if test "$WXGTK3" = 1; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEBKIT" >&5 --$as_echo_n "checking for WEBKIT... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for WEBKIT" >&5 -+printf %s "checking for WEBKIT... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$WEBKIT_CFLAGS"; then - pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-4.1\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-4.1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "webkit2gtk-4.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 - pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "webkit2gtk-4.1" 2>/dev/null` - else -@@ -41859,10 +44206,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-4.1\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-4.1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "webkit2gtk-4.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 - pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "webkit2gtk-4.1" 2>/dev/null` - else -@@ -41891,19 +44238,19 @@ fi - echo "$WEBKIT_PKG_ERRORS" >&5 - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: webkit2gtk-4.1 not found, falling back to webkit2gtk-4.0" >&5 --$as_echo "$as_me: WARNING: webkit2gtk-4.1 not found, falling back to webkit2gtk-4.0" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: webkit2gtk-4.1 not found, falling back to webkit2gtk-4.0" >&5 -+printf "%s\n" "$as_me: WARNING: webkit2gtk-4.1 not found, falling back to webkit2gtk-4.0" >&2;} - - elif test $pkg_failed = untried; then - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: webkit2gtk-4.1 not found, falling back to webkit2gtk-4.0" >&5 --$as_echo "$as_me: WARNING: webkit2gtk-4.1 not found, falling back to webkit2gtk-4.0" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: webkit2gtk-4.1 not found, falling back to webkit2gtk-4.0" >&5 -+printf "%s\n" "$as_me: WARNING: webkit2gtk-4.1 not found, falling back to webkit2gtk-4.0" >&2;} - - else - WEBKIT_CFLAGS=$pkg_cv_WEBKIT_CFLAGS - WEBKIT_LIBS=$pkg_cv_WEBKIT_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; } - - USE_WEBVIEW_WEBKIT2=1 - CXXFLAGS="$CXXFLAGS $WEBKIT_CFLAGS" -@@ -41913,18 +44260,18 @@ fi - if test "$USE_WEBVIEW_WEBKIT2" = 0; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEBKIT" >&5 --$as_echo_n "checking for WEBKIT... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for WEBKIT" >&5 -+printf %s "checking for WEBKIT... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$WEBKIT_CFLAGS"; then - pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-4.0\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-4.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "webkit2gtk-4.0") 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_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "webkit2gtk-4.0" 2>/dev/null` - else -@@ -41939,10 +44286,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-4.0\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-4.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "webkit2gtk-4.0") 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_WEBKIT_LIBS=`$PKG_CONFIG --libs "webkit2gtk-4.0" 2>/dev/null` - else -@@ -41971,19 +44318,19 @@ fi - echo "$WEBKIT_PKG_ERRORS" >&5 - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: webkit2gtk-4.0 not found, falling back to webkitgtk" >&5 --$as_echo "$as_me: WARNING: webkit2gtk-4.0 not found, falling back to webkitgtk" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: webkit2gtk-4.0 not found, falling back to webkitgtk" >&5 -+printf "%s\n" "$as_me: WARNING: webkit2gtk-4.0 not found, falling back to webkitgtk" >&2;} - - elif test $pkg_failed = untried; then - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: webkit2gtk-4.0 not found, falling back to webkitgtk" >&5 --$as_echo "$as_me: WARNING: webkit2gtk-4.0 not found, falling back to webkitgtk" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: webkit2gtk-4.0 not found, falling back to webkitgtk" >&5 -+printf "%s\n" "$as_me: WARNING: webkit2gtk-4.0 not found, falling back to webkitgtk" >&2;} - - else - WEBKIT_CFLAGS=$pkg_cv_WEBKIT_CFLAGS - WEBKIT_LIBS=$pkg_cv_WEBKIT_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; } - - USE_WEBVIEW_WEBKIT2=1 - CXXFLAGS="$CXXFLAGS $WEBKIT_CFLAGS" -@@ -41999,18 +44346,18 @@ fi - fi - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEBKIT" >&5 --$as_echo_n "checking for WEBKIT... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for WEBKIT" >&5 -+printf %s "checking for WEBKIT... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$WEBKIT_CFLAGS"; then - pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$webkitgtk >= 1.3.1\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$webkitgtk >= 1.3.1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$webkitgtk >= 1.3.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 - pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "$webkitgtk >= 1.3.1" 2>/dev/null` - else -@@ -42025,10 +44372,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$webkitgtk >= 1.3.1\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$webkitgtk >= 1.3.1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$webkitgtk >= 1.3.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 - pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "$webkitgtk >= 1.3.1" 2>/dev/null` - else -@@ -42057,19 +44404,19 @@ fi - echo "$WEBKIT_PKG_ERRORS" >&5 - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: webkitgtk not found." >&5 --$as_echo "$as_me: WARNING: webkitgtk not found." >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: webkitgtk not found." >&5 -+printf "%s\n" "$as_me: WARNING: webkitgtk not found." >&2;} - - elif test $pkg_failed = untried; then - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: webkitgtk not found." >&5 --$as_echo "$as_me: WARNING: webkitgtk not found." >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: webkitgtk not found." >&5 -+printf "%s\n" "$as_me: WARNING: webkitgtk not found." >&2;} - - else - WEBKIT_CFLAGS=$pkg_cv_WEBKIT_CFLAGS - WEBKIT_LIBS=$pkg_cv_WEBKIT_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; } - - USE_WEBVIEW_WEBKIT=1 - CXXFLAGS="$CXXFLAGS $WEBKIT_CFLAGS" -@@ -42087,25 +44434,25 @@ fi - if test "$wxUSE_GTK" = 1 -o "$wxUSE_MAC" = 1; then - if test "$USE_WEBVIEW_WEBKIT" = 1; then - wxUSE_WEBVIEW="yes" -- $as_echo "#define wxUSE_WEBVIEW_WEBKIT 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_WEBVIEW_WEBKIT 1" >>confdefs.h - - elif test "$USE_WEBVIEW_WEBKIT2" = 1; then - wxUSE_WEBVIEW="yes" -- $as_echo "#define wxUSE_WEBVIEW_WEBKIT2 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_WEBVIEW_WEBKIT2 1" >>confdefs.h - - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: WebKit not available, disabling wxWebView" >&5 --$as_echo "$as_me: WARNING: WebKit not available, disabling wxWebView" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: WebKit not available, disabling wxWebView" >&5 -+printf "%s\n" "$as_me: WARNING: WebKit not available, disabling wxWebView" >&2;} - fi - elif test "$wxUSE_MSW" = 1; then - if test "$wxUSE_WEBVIEW_IE" = "yes"; then - wxUSE_WEBVIEW="yes" -- $as_echo "#define wxUSE_WEBVIEW_IE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_WEBVIEW_IE 1" >>confdefs.h - - fi - if test "$wxUSE_WEBVIEW_EDGE" = "yes"; then - wxUSE_WEBVIEW="yes" -- $as_echo "#define wxUSE_WEBVIEW_EDGE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_WEBVIEW_EDGE 1" >>confdefs.h - - fi - fi -@@ -42113,7 +44460,7 @@ fi - - if test "$wxUSE_WEBVIEW" = "yes"; then - USE_WEBVIEW=1 -- $as_echo "#define wxUSE_WEBVIEW 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_WEBVIEW 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS webview" - else -@@ -42122,126 +44469,126 @@ fi - - - if test "$wxUSE_IMAGE" = "yes" ; then -- $as_echo "#define wxUSE_IMAGE 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_IMAGE 1" >>confdefs.h - - - if test "$wxUSE_GIF" = "yes" ; then -- $as_echo "#define wxUSE_GIF 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_GIF 1" >>confdefs.h - - fi - - if test "$wxUSE_PCX" = "yes" ; then -- $as_echo "#define wxUSE_PCX 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_PCX 1" >>confdefs.h - - fi - - if test "$wxUSE_TGA" = "yes" ; then -- $as_echo "#define wxUSE_TGA 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_TGA 1" >>confdefs.h - - fi - - if test "$wxUSE_IFF" = "yes" ; then -- $as_echo "#define wxUSE_IFF 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_IFF 1" >>confdefs.h - - fi - - if test "$wxUSE_PNM" = "yes" ; then -- $as_echo "#define wxUSE_PNM 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_PNM 1" >>confdefs.h - - fi - - if test "$wxUSE_XPM" = "yes" ; then -- $as_echo "#define wxUSE_XPM 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_XPM 1" >>confdefs.h - - fi - - if test "$wxUSE_ICO_CUR" = "yes" ; then -- $as_echo "#define wxUSE_ICO_CUR 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_ICO_CUR 1" >>confdefs.h - - fi - fi - - - if test "$wxUSE_ABOUTDLG" = "yes"; then -- $as_echo "#define wxUSE_ABOUTDLG 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_ABOUTDLG 1" >>confdefs.h - - fi - - if test "$wxUSE_CHOICEDLG" = "yes"; then -- $as_echo "#define wxUSE_CHOICEDLG 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_CHOICEDLG 1" >>confdefs.h - - fi - - if test "$wxUSE_COLOURDLG" = "yes"; then -- $as_echo "#define wxUSE_COLOURDLG 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_COLOURDLG 1" >>confdefs.h - - fi - - if test "$wxUSE_CREDENTIALDLG" = "yes"; then -- $as_echo "#define wxUSE_CREDENTIALDLG 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_CREDENTIALDLG 1" >>confdefs.h - - fi - - if test "$wxUSE_FILEDLG" = "yes"; then -- $as_echo "#define wxUSE_FILEDLG 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_FILEDLG 1" >>confdefs.h - - fi - - if test "$wxUSE_FINDREPLDLG" = "yes"; then -- $as_echo "#define wxUSE_FINDREPLDLG 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_FINDREPLDLG 1" >>confdefs.h - - fi - - if test "$wxUSE_FONTDLG" = "yes"; then -- $as_echo "#define wxUSE_FONTDLG 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_FONTDLG 1" >>confdefs.h - - fi - - if test "$wxUSE_DIRDLG" = "yes"; then - if test "$wxUSE_TREECTRL" != "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" >&5 --$as_echo "$as_me: WARNING: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" >&5 -+printf "%s\n" "$as_me: WARNING: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" >&2;} - else -- $as_echo "#define wxUSE_DIRDLG 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_DIRDLG 1" >>confdefs.h - - fi - fi - - if test "$wxUSE_MSGDLG" = "yes"; then -- $as_echo "#define wxUSE_MSGDLG 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_MSGDLG 1" >>confdefs.h - - fi - - if test "$wxUSE_NUMBERDLG" = "yes"; then -- $as_echo "#define wxUSE_NUMBERDLG 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_NUMBERDLG 1" >>confdefs.h - - fi - - if test "$wxUSE_PROGRESSDLG" = "yes"; then -- $as_echo "#define wxUSE_PROGRESSDLG 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_PROGRESSDLG 1" >>confdefs.h - -- $as_echo "#define wxUSE_NATIVE_PROGRESSDLG 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_NATIVE_PROGRESSDLG 1" >>confdefs.h - - fi - - if test "$wxUSE_SPLASH" = "yes"; then -- $as_echo "#define wxUSE_SPLASH 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_SPLASH 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splash" - fi - - if test "$wxUSE_STARTUP_TIPS" = "yes"; then -- $as_echo "#define wxUSE_STARTUP_TIPS 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_STARTUP_TIPS 1" >>confdefs.h - - fi - - if test "$wxUSE_TEXTDLG" = "yes"; then -- $as_echo "#define wxUSE_TEXTDLG 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_TEXTDLG 1" >>confdefs.h - - fi - - if test "$wxUSE_WIZARDDLG" = "yes"; then -- $as_echo "#define wxUSE_WIZARDDLG 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_WIZARDDLG 1" >>confdefs.h - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard" - fi -@@ -42249,7 +44596,7 @@ fi - - if test "$wxUSE_MSW" = 1; then - if test "$wxUSE_OWNER_DRAWN" = "yes"; then -- $as_echo "#define wxUSE_OWNER_DRAWN 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_OWNER_DRAWN 1" >>confdefs.h - - fi - fi -@@ -42258,40 +44605,41 @@ fi - if test "$wxUSE_MSW" = 1 ; then - - if test "$wxUSE_DC_CACHEING" = "yes"; then -- $as_echo "#define wxUSE_DC_CACHEING 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_DC_CACHEING 1" >>confdefs.h - - fi - - if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then -- $as_echo "#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1" >>confdefs.h - - fi - - if test "$wxUSE_TASKBARBUTTON" = "yes"; then -- $as_echo "#define wxUSE_TASKBARBUTTON 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_TASKBARBUTTON 1" >>confdefs.h - - fi - - if test "$wxUSE_UXTHEME" = "yes"; then -- $as_echo "#define wxUSE_UXTHEME 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_UXTHEME 1" >>confdefs.h - - fi - - fi - - if test "$wxUSE_AUTOID_MANAGEMENT" = "yes"; then -- $as_echo "#define wxUSE_AUTOID_MANAGEMENT 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_AUTOID_MANAGEMENT 1" >>confdefs.h - - fi - - if test "$USE_WIN32" = 1 ; then - if test "$wxUSE_DBGHELP" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if debug help API is available" >&5 --$as_echo_n "checking if debug help API is available... " >&6; } --if ${wx_cv_lib_debughlp+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if debug help API is available" >&5 -+printf %s "checking if debug help API is available... " >&6; } -+if test ${wx_cv_lib_debughlp+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -42303,7 +44651,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - #include - #include - int --main () -+main (void) - { - - #ifndef API_VERSION_NUMBER -@@ -42317,13 +44665,15 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_lib_debughlp=yes --else -- wx_cv_lib_debughlp=no -- -+else case e in #( -+ e) wx_cv_lib_debughlp=no -+ ;; -+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 - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -42331,32 +44681,33 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_debughlp" >&5 --$as_echo "$wx_cv_lib_debughlp" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_debughlp" >&5 -+printf "%s\n" "$wx_cv_lib_debughlp" >&6; } - - if test "$wx_cv_lib_debughlp" = yes; then -- $as_echo "#define wxUSE_DBGHELP 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_DBGHELP 1" >>confdefs.h - - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Debug help API and wxStackWalker won't be available" >&5 --$as_echo "$as_me: WARNING: Debug help API and wxStackWalker won't be available" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Debug help API and wxStackWalker won't be available" >&5 -+printf "%s\n" "$as_me: WARNING: Debug help API and wxStackWalker won't be available" >&2;} - fi - fi - - if test "$wxUSE_DIB" = "yes"; then -- $as_echo "#define wxUSE_WXDIB 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_WXDIB 1" >>confdefs.h - - fi - - if test "$wxUSE_INICONF" = "yes"; then -- $as_echo "#define wxUSE_INICONF 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_INICONF 1" >>confdefs.h - - fi - - if test "$wxUSE_REGKEY" = "yes"; then -- $as_echo "#define wxUSE_REGKEY 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_REGKEY 1" >>confdefs.h - - fi - fi -@@ -42373,18 +44724,18 @@ fi - if test "$wxUSE_CAIRO" = "yes" -o "$wx_needs_cairo" = 1; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5 --$as_echo_n "checking for CAIRO... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5 -+printf %s "checking for CAIRO... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$CAIRO_CFLAGS"; then - pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5 - ($PKG_CONFIG --exists --print-errors "cairo") 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_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo" 2>/dev/null` - else -@@ -42399,10 +44750,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_CAIRO_LIBS="$CAIRO_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5 - ($PKG_CONFIG --exists --print-errors "cairo") 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_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo" 2>/dev/null` - else -@@ -42430,41 +44781,37 @@ fi - # Put the nasty error message in config.log where it belongs - echo "$CAIRO_PKG_ERRORS" >&5 - -- { $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; } - - 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; } - - else - CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS - CAIRO_LIBS=$pkg_cv_CAIRO_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; } - wx_has_cairo=1 - fi - if test "$wx_has_cairo" = 1; then - save_LIBS="$LIBS" - LIBS="$LIBS $CAIRO_LIBS" -- for ac_func in cairo_push_group --do : -- ac_fn_c_check_func "$LINENO" "cairo_push_group" "ac_cv_func_cairo_push_group" --if test "x$ac_cv_func_cairo_push_group" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_CAIRO_PUSH_GROUP 1 --_ACEOF -+ ac_fn_c_check_func "$LINENO" "cairo_push_group" "ac_cv_func_cairo_push_group" -+if test "x$ac_cv_func_cairo_push_group" = xyes -+then : -+ printf "%s\n" "#define HAVE_CAIRO_PUSH_GROUP 1" >>confdefs.h - - fi --done - - LIBS="$save_LIBS" - if test "$ac_cv_func_cairo_push_group" = "no"; then - wx_has_cairo=0 -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cairo library is too old and misses cairo_push_group()" >&5 --$as_echo "$as_me: WARNING: Cairo library is too old and misses cairo_push_group()" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Cairo library is too old and misses cairo_push_group()" >&5 -+printf "%s\n" "$as_me: WARNING: Cairo library is too old and misses cairo_push_group()" >&2;} - else -- $as_echo "#define wxUSE_CAIRO 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_CAIRO 1" >>confdefs.h - - - if test "$wxUSE_GTK" != 1; then -@@ -42478,12 +44825,13 @@ fi - if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then - wx_has_graphics=0 - if test "$wxUSE_MSW" = 1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if GDI+ is available" >&5 --$as_echo_n "checking if GDI+ is available... " >&6; } --if ${wx_cv_lib_gdiplus+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if GDI+ is available" >&5 -+printf %s "checking if GDI+ is available... " >&6; } -+if test ${wx_cv_lib_gdiplus+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -42495,7 +44843,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - #include - #include - int --main () -+main (void) - { - - using namespace Gdiplus; -@@ -42504,13 +44852,15 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_lib_gdiplus=yes --else -- wx_cv_lib_gdiplus=no -- -+else case e in #( -+ e) wx_cv_lib_gdiplus=no -+ ;; -+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 - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -42518,20 +44868,22 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_gdiplus" >&5 --$as_echo "$wx_cv_lib_gdiplus" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_gdiplus" >&5 -+printf "%s\n" "$wx_cv_lib_gdiplus" >&6; } - if test "$wx_cv_lib_gdiplus" = "yes"; then - wx_has_graphics=1 - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Direct2D is available" >&5 --$as_echo_n "checking if Direct2D is available... " >&6; } --if ${wx_cv_lib_direct2d+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if Direct2D is available" >&5 -+printf %s "checking if Direct2D is available... " >&6; } -+if test ${wx_cv_lib_direct2d+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -42545,7 +44897,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - #include - - int --main () -+main (void) - { - - ID2D1Factory* factory = NULL; -@@ -42554,13 +44906,15 @@ main () - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - wx_cv_lib_direct2d=yes --else -- wx_cv_lib_direct2d=no -- -+else case e in #( -+ e) wx_cv_lib_direct2d=no -+ ;; -+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 - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -42568,17 +44922,18 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_direct2d" >&5 --$as_echo "$wx_cv_lib_direct2d" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_direct2d" >&5 -+printf "%s\n" "$wx_cv_lib_direct2d" >&6; } - if test "$wx_cv_lib_direct2d" = "yes"; then -- $as_echo "#define wxUSE_GRAPHICS_DIRECT2D 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_GRAPHICS_DIRECT2D 1" >>confdefs.h - - fi - elif test "$WXGTK1" = "1"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxGraphicsContext not supported with GTK +1" >&5 --$as_echo "$as_me: WARNING: wxGraphicsContext not supported with GTK +1" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxGraphicsContext not supported with GTK +1" >&5 -+printf "%s\n" "$as_me: WARNING: wxGraphicsContext not supported with GTK +1" >&2;} - elif test "$wx_needs_cairo_for_gc" = 1; then - wx_has_graphics=$wx_has_cairo - else -@@ -42586,11 +44941,11 @@ $as_echo "$as_me: WARNING: wxGraphicsContext not supported with GTK +1" >&2;} - fi - - if test "$wx_has_graphics" = 1; then -- $as_echo "#define wxUSE_GRAPHICS_CONTEXT 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_GRAPHICS_CONTEXT 1" >>confdefs.h - - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxGraphicsContext won't be available" >&5 --$as_echo "$as_me: WARNING: wxGraphicsContext won't be available" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxGraphicsContext won't be available" >&5 -+printf "%s\n" "$as_me: WARNING: wxGraphicsContext won't be available" >&2;} - fi - fi - -@@ -42609,18 +44964,18 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then - - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GST" >&5 --$as_echo_n "checking for GST... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GST" >&5 -+printf %s "checking for GST... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$GST_CFLAGS"; then - pkg_cv_GST_CFLAGS="$GST_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-video-\$GST_VERSION gstreamer-player-\$GST_VERSION >= 1.7.2.1\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-video-\$GST_VERSION gstreamer-player-\$GST_VERSION >= 1.7.2.1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION gstreamer-player-$GST_VERSION >= 1.7.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 - pkg_cv_GST_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION gstreamer-player-$GST_VERSION >= 1.7.2.1" 2>/dev/null` - else -@@ -42635,10 +44990,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_GST_LIBS="$GST_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-video-\$GST_VERSION gstreamer-player-\$GST_VERSION >= 1.7.2.1\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-video-\$GST_VERSION gstreamer-player-\$GST_VERSION >= 1.7.2.1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION gstreamer-player-$GST_VERSION >= 1.7.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 - pkg_cv_GST_LIBS=`$PKG_CONFIG --libs "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION gstreamer-player-$GST_VERSION >= 1.7.2.1" 2>/dev/null` - else -@@ -42667,24 +45022,24 @@ fi - echo "$GST_PKG_ERRORS" >&5 - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: GStreamer 1.7.2+ not available. Not using GstPlayer and falling back to 1.0" >&5 --$as_echo "$as_me: GStreamer 1.7.2+ not available. Not using GstPlayer and falling back to 1.0" >&6;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: GStreamer 1.7.2+ not available. Not using GstPlayer and falling back to 1.0" >&5 -+printf "%s\n" "$as_me: GStreamer 1.7.2+ not available. Not using GstPlayer and falling back to 1.0" >&6;} - - - elif test $pkg_failed = untried; then - -- { $as_echo "$as_me:${as_lineno-$LINENO}: GStreamer 1.7.2+ not available. Not using GstPlayer and falling back to 1.0" >&5 --$as_echo "$as_me: GStreamer 1.7.2+ not available. Not using GstPlayer and falling back to 1.0" >&6;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: GStreamer 1.7.2+ not available. Not using GstPlayer and falling back to 1.0" >&5 -+printf "%s\n" "$as_me: GStreamer 1.7.2+ not available. Not using GstPlayer and falling back to 1.0" >&6;} - - - else - GST_CFLAGS=$pkg_cv_GST_CFLAGS - GST_LIBS=$pkg_cv_GST_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; } - - wxUSE_GSTREAMER="yes" -- $as_echo "#define wxUSE_GSTREAMER_PLAYER 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_GSTREAMER_PLAYER 1" >>confdefs.h - - - fi -@@ -42692,18 +45047,18 @@ fi - if test $wxUSE_GSTREAMER = "no"; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GST" >&5 --$as_echo_n "checking for GST... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GST" >&5 -+printf %s "checking for GST... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$GST_CFLAGS"; then - pkg_cv_GST_CFLAGS="$GST_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-video-\$GST_VERSION\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-video-\$GST_VERSION\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION") 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_GST_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION" 2>/dev/null` - else -@@ -42718,10 +45073,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_GST_LIBS="$GST_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-video-\$GST_VERSION\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-video-\$GST_VERSION\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION") 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_GST_LIBS=`$PKG_CONFIG --libs "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION" 2>/dev/null` - else -@@ -42750,8 +45105,8 @@ fi - echo "$GST_PKG_ERRORS" >&5 - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer 1.0 not available, falling back to 0.10" >&5 --$as_echo "$as_me: WARNING: GStreamer 1.0 not available, falling back to 0.10" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer 1.0 not available, falling back to 0.10" >&5 -+printf "%s\n" "$as_me: WARNING: GStreamer 1.0 not available, falling back to 0.10" >&2;} - GST_VERSION_MAJOR=0 - GST_VERSION_MINOR=10 - GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR -@@ -42759,8 +45114,8 @@ $as_echo "$as_me: WARNING: GStreamer 1.0 not available, falling back to 0.10" >& - - elif test $pkg_failed = untried; then - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer 1.0 not available, falling back to 0.10" >&5 --$as_echo "$as_me: WARNING: GStreamer 1.0 not available, falling back to 0.10" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer 1.0 not available, falling back to 0.10" >&5 -+printf "%s\n" "$as_me: WARNING: GStreamer 1.0 not available, falling back to 0.10" >&2;} - GST_VERSION_MAJOR=0 - GST_VERSION_MINOR=10 - GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR -@@ -42769,8 +45124,8 @@ $as_echo "$as_me: WARNING: GStreamer 1.0 not available, falling back to 0.10" >& - else - GST_CFLAGS=$pkg_cv_GST_CFLAGS - GST_LIBS=$pkg_cv_GST_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; } - - wxUSE_GSTREAMER="yes" - -@@ -42780,18 +45135,18 @@ fi - if test $GST_VERSION_MINOR = "10"; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GST" >&5 --$as_echo_n "checking for GST... " >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GST" >&5 -+printf %s "checking for GST... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$GST_CFLAGS"; then - pkg_cv_GST_CFLAGS="$GST_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-plugins-base-\$GST_VERSION\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-plugins-base-\$GST_VERSION\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION") 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_GST_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION" 2>/dev/null` - else -@@ -42806,10 +45161,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_GST_LIBS="$GST_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-plugins-base-\$GST_VERSION\""; } >&5 -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-plugins-base-\$GST_VERSION\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION") 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_GST_LIBS=`$PKG_CONFIG --libs "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION" 2>/dev/null` - else -@@ -42838,21 +45193,21 @@ fi - echo "$GST_PKG_ERRORS" >&5 - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer 0.10 not available" >&5 --$as_echo "$as_me: WARNING: GStreamer 0.10 not available" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer 0.10 not available" >&5 -+printf "%s\n" "$as_me: WARNING: GStreamer 0.10 not available" >&2;} - - - elif test $pkg_failed = untried; then - -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer 0.10 not available" >&5 --$as_echo "$as_me: WARNING: GStreamer 0.10 not available" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer 0.10 not available" >&5 -+printf "%s\n" "$as_me: WARNING: GStreamer 0.10 not available" >&2;} - - - else - GST_CFLAGS=$pkg_cv_GST_CFLAGS - GST_LIBS=$pkg_cv_GST_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; } - - wxUSE_GSTREAMER="yes" - GST_LIBS="$GST_LIBS -lgstinterfaces-$GST_VERSION" -@@ -42864,7 +45219,7 @@ fi - CXXFLAGS="$CXXFLAGS $GST_CFLAGS" - EXTRALIBS_MEDIA="$GST_LIBS" - -- $as_echo "#define wxUSE_GSTREAMER 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_GSTREAMER 1" >>confdefs.h - - else - USE_MEDIA=0 -@@ -42875,13 +45230,13 @@ fi - if test "$wxUSE_OSX_IPHONE" != 1; then - old_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="-x objective-c++ $CPPFLAGS" -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if AVKit is available" >&5 --$as_echo_n "checking if AVKit is available... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if AVKit is available" >&5 -+printf %s "checking if AVKit is available... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include "AvailabilityMacros.h" - int --main () -+main (void) - { - - #if defined(MAC_OS_X_VERSION_10_9) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9 -@@ -42894,29 +45249,31 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- GST_LIBS="$GST_LIBS -weak_framework AVKit"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- -+if ac_fn_c_try_compile "$LINENO" -+then : -+ GST_LIBS="$GST_LIBS -weak_framework AVKit"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+else case e in #( -+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ ;; -+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 - CPPFLAGS="$old_CPPFLAGS" - fi - fi - - if test $USE_MEDIA = 1; then - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mediaplayer" -- $as_echo "#define wxUSE_MEDIACTRL 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_MEDIACTRL 1" >>confdefs.h - - else - if test "$wxUSE_MEDIACTRL" = "yes"; then - as_fn_error $? "GStreamer not available" "$LINENO" 5 - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer not available... disabling wxMediaCtrl" >&5 --$as_echo "$as_me: WARNING: GStreamer not available... disabling wxMediaCtrl" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer not available... disabling wxMediaCtrl" >&5 -+printf "%s\n" "$as_me: WARNING: GStreamer not available... disabling wxMediaCtrl" >&2;} - fi - fi - fi -@@ -42933,9 +45290,7 @@ else - wxPREFIX=$ac_default_prefix - fi - --cat >>confdefs.h <<_ACEOF --#define wxINSTALL_PREFIX "$wxPREFIX" --_ACEOF -+printf "%s\n" "#define wxINSTALL_PREFIX \"$wxPREFIX\"" >>confdefs.h - - - -@@ -43013,16 +45368,18 @@ if test "$wxUSE_MAC" = 1 ; then - if test "$cross_compiling" != "no"; then - wx_cv_target_x86_64=no - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we target only x86_64" >&5 --$as_echo_n "checking if we target only x86_64... " >&6; } --if ${wx_cv_target_x86_64+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we target only x86_64" >&5 -+printf %s "checking if we target only x86_64... " >&6; } -+if test ${wx_cv_target_x86_64+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main() { return 0; } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO" -+then : - if file conftest$ac_exeext|grep -q 'i386\|ppc'; then - wx_cv_target_x86_64=no - else -@@ -43030,12 +45387,13 @@ if ac_fn_c_try_link "$LINENO"; then : - 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 -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_target_x86_64" >&5 --$as_echo "$wx_cv_target_x86_64" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_target_x86_64" >&5 -+printf "%s\n" "$wx_cv_target_x86_64" >&6; } - fi - - if test "$wx_cv_target_x86_64" != "yes"; then -@@ -43092,12 +45450,13 @@ if test "x$INTELCXX" = "xyes" ; then - CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419,1881,2259" - elif test "$GXX" = yes ; then - CXXWARNINGS="-Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy" -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking CXXWARNINGS for gcc -Woverloaded-virtual" >&5 --$as_echo_n "checking CXXWARNINGS for gcc -Woverloaded-virtual... " >&6; } --if ${ac_cv_cxxflags_gcc_option__Woverloaded_virtual+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_cv_cxxflags_gcc_option__Woverloaded_virtual="no, unknown" -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking CXXWARNINGS for gcc -Woverloaded-virtual" >&5 -+printf %s "checking CXXWARNINGS for gcc -Woverloaded-virtual... " >&6; } -+if test ${ac_cv_cxxflags_gcc_option__Woverloaded_virtual+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_cv_cxxflags_gcc_option__Woverloaded_virtual="no, unknown" - - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' -@@ -43112,17 +45471,18 @@ do CXXFLAGS="$ac_save_CXXFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - /* end confdefs.h. */ - - int --main () -+main (void) - { - return 0; - ; - return 0; - } - _ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -+if ac_fn_cxx_try_compile "$LINENO" -+then : - ac_cv_cxxflags_gcc_option__Woverloaded_virtual=`echo $ac_arg | sed -e 's,.*% *,,'` ; break - 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 - done - CXXFLAGS="$ac_save_CXXFLAGS" - ac_ext=c -@@ -43131,24 +45491,25 @@ 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 - -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxxflags_gcc_option__Woverloaded_virtual" >&5 --$as_echo "$ac_cv_cxxflags_gcc_option__Woverloaded_virtual" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxxflags_gcc_option__Woverloaded_virtual" >&5 -+printf "%s\n" "$ac_cv_cxxflags_gcc_option__Woverloaded_virtual" >&6; } - case ".$ac_cv_cxxflags_gcc_option__Woverloaded_virtual" in - .ok|.ok,*) ;; - .|.no|.no,*) ;; - *) - if echo " $CXXWARNINGS " | grep " $ac_cv_cxxflags_gcc_option__Woverloaded_virtual " 2>&1 >/dev/null -- then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXWARNINGS does contain \$ac_cv_cxxflags_gcc_option__Woverloaded_virtual"; } >&5 -+ then { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXWARNINGS does contain \$ac_cv_cxxflags_gcc_option__Woverloaded_virtual"; } >&5 - (: CXXWARNINGS does contain $ac_cv_cxxflags_gcc_option__Woverloaded_virtual) 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; } -- else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXWARNINGS=\"\$CXXWARNINGS \$ac_cv_cxxflags_gcc_option__Woverloaded_virtual\""; } >&5 -+ else { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXWARNINGS=\"\$CXXWARNINGS \$ac_cv_cxxflags_gcc_option__Woverloaded_virtual\""; } >&5 - (: CXXWARNINGS="$CXXWARNINGS $ac_cv_cxxflags_gcc_option__Woverloaded_virtual") 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; } - CXXWARNINGS="$CXXWARNINGS $ac_cv_cxxflags_gcc_option__Woverloaded_virtual" - fi -@@ -43274,15 +45635,13 @@ if test "x$wxUSE_UNIVERSAL" = "xyes" ; then - - case "$wxUNIV_THEMES" in - ''|all) -- $as_echo "#define wxUSE_ALL_THEMES 1" >>confdefs.h -+ printf "%s\n" "#define wxUSE_ALL_THEMES 1" >>confdefs.h - - ;; - - *) - for t in `echo $wxUNIV_THEMES | tr , ' ' | tr '[a-z]' '[A-Z]'`; do -- cat >>confdefs.h <<_ACEOF --#define wxUSE_THEME_$t 1 --_ACEOF -+ printf "%s\n" "#define wxUSE_THEME_$t 1" >>confdefs.h - - done - esac -@@ -43397,7 +45756,8 @@ if test "$wxUSE_WINE" = "yes"; then - BAKEFILE_FORCE_PLATFORM=win32 - fi - --# 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 -@@ -43411,20 +45771,25 @@ fi - # 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 -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+if test ${ac_cv_path_install+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) 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/* ) ;; -@@ -43434,13 +45799,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 -@@ -43448,12 +45813,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 -@@ -43467,9 +45832,10 @@ esac - IFS=$as_save_IFS - - rm -rf conftest.one conftest.two conftest.dir -- -+ ;; -+esac - 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 -@@ -43479,8 +45845,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. -@@ -43509,38 +45875,44 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - 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 -- if test -n "$RANLIB"; then -+{ 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 case e in #( -+ e) if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. - else - 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 - done - IFS=$as_save_IFS - --fi -+fi ;; -+esac - 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 - - -@@ -43549,38 +45921,44 @@ 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 -- if test -n "$ac_ct_RANLIB"; then -+{ 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 case e in #( -+ e) if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. - else - 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 - done - IFS=$as_save_IFS - --fi -+fi ;; -+esac - 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 -@@ -43588,8 +45966,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 -@@ -43599,26 +45977,27 @@ else - fi - - -- { $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 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 -- cat >conftest.make <<\_ACEOF -+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 case e in #( -+ e) cat >conftest.make <<\_ACEOF - SHELL = /bin/sh - all: - @echo '@@@%%%=$(MAKE)=@@@%%%' -@@ -43630,15 +46009,16 @@ case `${MAKE-make} -f conftest.make 2>/dev/null` in - *) - eval ac_cv_prog_make_${ac_make}_set=no;; - esac --rm -f conftest.make -+rm -f conftest.make ;; -+esac - 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 - -@@ -43656,38 +46036,44 @@ fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. - set dummy ${ac_tool_prefix}ar; ac_word=$2 --{ $as_echo "$as_me:${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 -- if test -n "$AR"; then -+{ 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 case e in #( -+ e) if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. - else - 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}ar" -- $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 - done - IFS=$as_save_IFS - --fi -+fi ;; -+esac - 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 - - -@@ -43696,38 +46082,44 @@ if test -z "$ac_cv_prog_AR"; then - ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. - set dummy ar; ac_word=$2 --{ $as_echo "$as_me:${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 -- if test -n "$ac_ct_AR"; then -+{ 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 case e in #( -+ e) if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. - else - 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="ar" -- $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 - done - IFS=$as_save_IFS - --fi -+fi ;; -+esac - 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 - - if test "x$ac_ct_AR" = x; then -@@ -43735,8 +46127,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 - AR=$ac_ct_AR -@@ -43752,38 +46144,44 @@ 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 -- if test -n "$STRIP"; then -+{ 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 case e in #( -+ e) if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. - else - 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 - done - IFS=$as_save_IFS - --fi -+fi ;; -+esac - 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 - - -@@ -43792,38 +46190,44 @@ 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 -- if test -n "$ac_ct_STRIP"; then -+{ 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 case e in #( -+ e) if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. - else - 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 - done - IFS=$as_save_IFS - --fi -+fi ;; -+esac - 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 -@@ -43831,8 +46235,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 -@@ -43844,38 +46248,44 @@ fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args. - set dummy ${ac_tool_prefix}nm; 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_NM+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test -n "$NM"; then -+{ 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_NM+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if test -n "$NM"; then - ac_cv_prog_NM="$NM" # Let the user override the test. - else - 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_NM="${ac_tool_prefix}nm" -- $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 - done - IFS=$as_save_IFS - --fi -+fi ;; -+esac - fi - NM=$ac_cv_prog_NM - if test -n "$NM"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5 --$as_echo "$NM" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NM" >&5 -+printf "%s\n" "$NM" >&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 - - -@@ -43884,38 +46294,44 @@ if test -z "$ac_cv_prog_NM"; then - ac_ct_NM=$NM - # Extract the first word of "nm", so it can be a program name with args. - set dummy nm; 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_NM+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test -n "$ac_ct_NM"; then -+{ 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_NM+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if test -n "$ac_ct_NM"; then - ac_cv_prog_ac_ct_NM="$ac_ct_NM" # Let the user override the test. - else - 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_NM="nm" -- $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 - done - IFS=$as_save_IFS - --fi -+fi ;; -+esac - fi - ac_ct_NM=$ac_cv_prog_ac_ct_NM - if test -n "$ac_ct_NM"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NM" >&5 --$as_echo "$ac_ct_NM" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NM" >&5 -+printf "%s\n" "$ac_ct_NM" >&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_NM" = x; then -@@ -43923,8 +46339,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 - NM=$ac_ct_NM -@@ -43946,22 +46362,24 @@ fi - - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if make is GNU make" >&5 --$as_echo_n "checking if make is GNU make... " >&6; } --if ${bakefile_cv_prog_makeisgnu+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if make is GNU make" >&5 -+printf %s "checking if make is GNU make... " >&6; } -+if test ${bakefile_cv_prog_makeisgnu+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) - if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null | - grep -sE GNU > /dev/null); then - bakefile_cv_prog_makeisgnu="yes" - else - bakefile_cv_prog_makeisgnu="no" - fi -- -+ ;; -+esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_prog_makeisgnu" >&5 --$as_echo "$bakefile_cv_prog_makeisgnu" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_prog_makeisgnu" >&5 -+printf "%s\n" "$bakefile_cv_prog_makeisgnu" >&6; } - - if test "x$bakefile_cv_prog_makeisgnu" = "xyes"; then - IF_GNU_MAKE="" -@@ -44171,23 +46589,28 @@ $as_echo "$bakefile_cv_prog_makeisgnu" >&6; } - else - # Extract the first word of "makeC++SharedLib", so it can be a program name with args. - set dummy makeC++SharedLib; 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_AIX_CXX_LD+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test -n "$AIX_CXX_LD"; then -+{ 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_AIX_CXX_LD+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if test -n "$AIX_CXX_LD"; then - ac_cv_prog_AIX_CXX_LD="$AIX_CXX_LD" # Let the user override the test. - else - 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_AIX_CXX_LD="makeC++SharedLib" -- $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 -@@ -44195,15 +46618,16 @@ done - IFS=$as_save_IFS - - test -z "$ac_cv_prog_AIX_CXX_LD" && ac_cv_prog_AIX_CXX_LD="/usr/lpp/xlC/bin/makeC++SharedLib" --fi -+fi ;; -+esac - fi - AIX_CXX_LD=$ac_cv_prog_AIX_CXX_LD - if test -n "$AIX_CXX_LD"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AIX_CXX_LD" >&5 --$as_echo "$AIX_CXX_LD" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AIX_CXX_LD" >&5 -+printf "%s\n" "$AIX_CXX_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 - - -@@ -44236,7 +46660,8 @@ fi - *-*-sunos4* | \ - *-*-osf* | \ - *-*-dgux5* | \ -- *-*-sysv5* ) -+ *-*-sysv5* | \ -+ *-*-emscripten ) - ;; - - *) -@@ -44311,51 +46736,52 @@ fi - - - # 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; bk_use_trackdeps="$enableval" - fi - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dependency tracking method" >&5 --$as_echo_n "checking for dependency tracking method... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dependency tracking method" >&5 -+printf %s "checking for dependency tracking method... " >&6; } - - BK_DEPS="" - if test "x$bk_use_trackdeps" = "xno" ; then - DEPS_TRACKING=0 -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 --$as_echo "disabled" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -+printf "%s\n" "disabled" >&6; } - else - DEPS_TRACKING=1 - - if test "x$GCC" = "xyes"; then - DEPSMODE=gcc - DEPSFLAG="-MMD" -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: gcc" >&5 --$as_echo "gcc" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: gcc" >&5 -+printf "%s\n" "gcc" >&6; } - elif test "x$SUNCC" = "xyes"; then - DEPSMODE=unixcc - DEPSFLAG="-xM1" -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sun cc" >&5 --$as_echo "Sun cc" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Sun cc" >&5 -+printf "%s\n" "Sun cc" >&6; } - elif test "x$SGICC" = "xyes"; then - DEPSMODE=unixcc - DEPSFLAG="-M" -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: SGI cc" >&5 --$as_echo "SGI cc" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SGI cc" >&5 -+printf "%s\n" "SGI cc" >&6; } - elif test "x$HPCC" = "xyes"; then - DEPSMODE=unixcc - DEPSFLAG="+make" -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: HP cc" >&5 --$as_echo "HP cc" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: HP cc" >&5 -+printf "%s\n" "HP cc" >&6; } - elif test "x$COMPAQCC" = "xyes"; then - DEPSMODE=gcc - DEPSFLAG="-MD" -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Compaq cc" >&5 --$as_echo "Compaq cc" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Compaq cc" >&5 -+printf "%s\n" "Compaq cc" >&6; } - else - DEPS_TRACKING=0 -- { $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 - - if test $DEPS_TRACKING = 1 ; then -@@ -44472,38 +46898,44 @@ EOF - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. - set dummy ${ac_tool_prefix}windres; 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_WINDRES+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test -n "$WINDRES"; then -+{ 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_WINDRES+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if test -n "$WINDRES"; then - ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. - else - 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_WINDRES="${ac_tool_prefix}windres" -- $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 - done - IFS=$as_save_IFS - --fi -+fi ;; -+esac - fi - WINDRES=$ac_cv_prog_WINDRES - if test -n "$WINDRES"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5 --$as_echo "$WINDRES" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5 -+printf "%s\n" "$WINDRES" >&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 - - -@@ -44512,38 +46944,44 @@ if test -z "$ac_cv_prog_WINDRES"; then - ac_ct_WINDRES=$WINDRES - # Extract the first word of "windres", so it can be a program name with args. - set dummy windres; 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_WINDRES+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test -n "$ac_ct_WINDRES"; then -+{ 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_WINDRES+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if test -n "$ac_ct_WINDRES"; then - ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. - else - 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_WINDRES="windres" -- $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 - done - IFS=$as_save_IFS - --fi -+fi ;; -+esac - fi - ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES - if test -n "$ac_ct_WINDRES"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5 --$as_echo "$ac_ct_WINDRES" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5 -+printf "%s\n" "$ac_ct_WINDRES" >&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_WINDRES" = x; then -@@ -44551,8 +46989,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 - WINDRES=$ac_ct_WINDRES -@@ -44578,7 +47016,8 @@ BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.13" - - - # Check whether --enable-precomp-headers was given. --if test "${enable_precomp_headers+set}" = set; then : -+if test ${enable_precomp_headers+y} -+then : - enableval=$enable_precomp_headers; bk_use_pch="$enableval" - fi - -@@ -44596,13 +47035,13 @@ fi - - if test "x$bk_use_pch" = "x" -o "x$bk_use_pch" = "xyes" ; then - if test "x$GCC" = "xyes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the compiler supports precompiled headers" >&5 --$as_echo_n "checking if the compiler supports precompiled headers... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the compiler supports precompiled headers" >&5 -+printf %s "checking if the compiler supports precompiled headers... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int --main () -+main (void) - { - - #if !defined(__GNUC__) || !defined(__GNUC_MINOR__) -@@ -44622,17 +47061,18 @@ main () - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO" -+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; } - GCC_PCH=1 - --else -- -+else case e in #( -+ e) - if test "$INTELCXX8" = "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; } - ICC_PCH=1 - if test "$INTELCXX10" = "yes"; then - ICC_PCH_CREATE_SWITCH="-pch-create" -@@ -44642,12 +47082,13 @@ $as_echo "yes" >&6; } - ICC_PCH_USE_SWITCH="-use-pch" - fi - 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 -- -+ ;; -+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 - if test $GCC_PCH = 1 -o $ICC_PCH = 1 ; then - USE_PCH=1 - -@@ -45777,14 +48218,15 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq - - - --{ $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 -- cat >conftest.make <<\_ACEOF -+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 case e in #( -+ e) cat >conftest.make <<\_ACEOF - SHELL = /bin/sh - all: - @echo '@@@%%%=$(MAKE)=@@@%%%' -@@ -45796,15 +48238,16 @@ case `${MAKE-make} -f conftest.make 2>/dev/null` in - *) - eval ac_cv_prog_make_${ac_make}_set=no;; - esac --rm -f conftest.make -+rm -f conftest.make ;; -+esac - 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 - -@@ -45848,11 +48291,11 @@ fi - if test "$wxUSE_TESTS_SUBDIR" != "no"; then - SUBDIRS="$SUBDIRS tests" - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether catch.hpp file exists" >&5 --$as_echo_n "checking whether catch.hpp file exists... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether catch.hpp file exists" >&5 -+printf %s "checking whether catch.hpp file exists... " >&6; } - if ! test -f "$srcdir/3rdparty/catch/include/catch.hpp" ; 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; } - as_fn_error $? " - CATCH (C++ Automated Test Cases in Headers) is required, the required file - $srcdir/3rdparty/catch/include/catch.hpp couldn't be found. -@@ -45863,8 +48306,8 @@ $as_echo "no" >&6; } - - to fix this." "$LINENO" 5 - else -- { $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; } - fi - fi - -@@ -45928,8 +48371,8 @@ cat >confcache <<\_ACEOF - # config.status only pays attention to the cache file if you give it - # the --recheck option to rerun configure. - # --# `ac_cv_env_foo' variables (set or unset) will be overridden when --# loading this file, other *unset* `ac_cv_foo' will be assigned the -+# 'ac_cv_env_foo' variables (set or unset) will be overridden when -+# loading this file, other *unset* 'ac_cv_foo' will be assigned the - # following values. - - _ACEOF -@@ -45945,8 +48388,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) ;; #( -@@ -45959,14 +48402,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) -- # `set' does not quote correctly, so add quotes: double-quote -+ # 'set' does not quote correctly, so add quotes: double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( - *) -- # `set' quotes correctly as required by POSIX, so do not add quotes. -+ # 'set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | -@@ -45976,15 +48419,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 -@@ -45998,8 +48441,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 -@@ -46016,7 +48459,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" -@@ -46036,17 +48479,17 @@ LTLIBOBJS=$ac_ltlibobjs - subdirs_extra="$subdirs_extra $ax_dir" - - ax_msg="=== configuring in $ax_dir ($(pwd)/$ax_dir)" -- $as_echo "$as_me:${as_lineno-$LINENO}: $ax_msg" >&5 -- $as_echo "$ax_msg" >&6 -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ax_msg" >&5 -+ printf "%s\n" "$ax_msg" >&6 - as_dir="$ax_dir"; as_fn_mkdir_p - ac_builddir=. - - case "$ax_dir" in - .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) -- ac_dir_suffix=/`$as_echo "$ax_dir" | sed 's|^\.[\\/]||'` -+ ac_dir_suffix=/`printf "%s\n" "$ax_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/ ;; -@@ -46086,8 +48529,8 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - # This should be Cygnus configure. - ax_sub_configure=$ac_aux_dir/configure - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ax_dir" >&5 --$as_echo "$as_me: WARNING: no configuration information is in $ax_dir" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ax_dir" >&5 -+printf "%s\n" "$as_me: WARNING: no configuration information is in $ax_dir" >&2;} - ax_sub_configure= - fi - -@@ -46099,7 +48542,7 @@ $as_echo "$as_me: WARNING: no configuration information is in $ax_dir" >&2;} - # in subdir configurations. - ax_arg="--prefix=$prefix" - case $ax_arg in -- *\'*) ax_arg=$($as_echo "$ax_arg" | sed "s/'/'\\\\\\\\''/g");; -+ *\'*) ax_arg=$(printf "%s\n" "$ax_arg" | sed "s/'/'\\\\\\\\''/g");; - esac - ax_sub_configure_args="'$ax_arg' $ax_sub_configure_args" - if test "$silent" = yes; then -@@ -46113,8 +48556,8 @@ $as_echo "$as_me: WARNING: no configuration information is in $ax_dir" >&2;} - ax_sub_cache_file=$ac_top_build_prefix$cache_file ;; - esac - -- { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ac_sub_cache_file" >&5 --$as_echo "$as_me: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ac_sub_cache_file" >&6;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ac_sub_cache_file" >&5 -+printf "%s\n" "$as_me: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ac_sub_cache_file" >&6;} - eval "\$SHELL \"$ax_sub_configure\" $ax_sub_configure_args --cache-file=\"$ax_sub_cache_file\"" \ - || as_fn_error $? "$ax_sub_configure failed for $ax_dir" "$LINENO" 5 - fi -@@ -46131,17 +48574,17 @@ $as_echo "$as_me: running $SHELL $ax_sub_configure $ax_sub_configure_args --cach - subdirs_extra="$subdirs_extra $ax_dir" - - ax_msg="=== configuring in $ax_dir ($(pwd)/$ax_dir)" -- $as_echo "$as_me:${as_lineno-$LINENO}: $ax_msg" >&5 -- $as_echo "$ax_msg" >&6 -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ax_msg" >&5 -+ printf "%s\n" "$ax_msg" >&6 - as_dir="$ax_dir"; as_fn_mkdir_p - ac_builddir=. - - case "$ax_dir" in - .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) -- ac_dir_suffix=/`$as_echo "$ax_dir" | sed 's|^\.[\\/]||'` -+ ac_dir_suffix=/`printf "%s\n" "$ax_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/ ;; -@@ -46181,8 +48624,8 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - # This should be Cygnus configure. - ax_sub_configure=$ac_aux_dir/configure - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ax_dir" >&5 --$as_echo "$as_me: WARNING: no configuration information is in $ax_dir" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ax_dir" >&5 -+printf "%s\n" "$as_me: WARNING: no configuration information is in $ax_dir" >&2;} - ax_sub_configure= - fi - -@@ -46194,7 +48637,7 @@ $as_echo "$as_me: WARNING: no configuration information is in $ax_dir" >&2;} - # in subdir configurations. - ax_arg="--prefix=$prefix" - case $ax_arg in -- *\'*) ax_arg=$($as_echo "$ax_arg" | sed "s/'/'\\\\\\\\''/g");; -+ *\'*) ax_arg=$(printf "%s\n" "$ax_arg" | sed "s/'/'\\\\\\\\''/g");; - esac - ax_sub_configure_args="'$ax_arg' $ax_sub_configure_args" - if test "$silent" = yes; then -@@ -46208,8 +48651,8 @@ $as_echo "$as_me: WARNING: no configuration information is in $ax_dir" >&2;} - ax_sub_cache_file=$ac_top_build_prefix$cache_file ;; - esac - -- { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ac_sub_cache_file" >&5 --$as_echo "$as_me: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ac_sub_cache_file" >&6;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ac_sub_cache_file" >&5 -+printf "%s\n" "$as_me: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ac_sub_cache_file" >&6;} - eval "\$SHELL \"$ax_sub_configure\" $ax_sub_configure_args --cache-file=\"$ax_sub_cache_file\"" \ - || as_fn_error $? "$ax_sub_configure failed for $ax_dir" "$LINENO" 5 - fi -@@ -46222,8 +48665,8 @@ $as_echo "$as_me: running $SHELL $ax_sub_configure $ax_sub_configure_args --cach - 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 -@@ -46246,63 +48689,65 @@ 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 : -+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 -- case `(set -o) 2>/dev/null` in #( -+else case e in #( -+ e) case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -+esac ;; - 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 || -@@ -46311,13 +48756,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 #(( -@@ -46326,43 +48764,27 @@ 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 - - ;; - esac --# We did not find ourselves, most probably we were run as `sh COMMAND' -+# We did not find ourselves, most probably we were run as 'sh COMMAND' - # in which case we are not to be found in the path. - 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] -@@ -46375,9 +48797,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 - -@@ -46408,22 +48830,25 @@ 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 -- as_fn_append () -+else case e in #( -+ e) as_fn_append () - { - eval $1=\$$1\$2 -- } -+ } ;; -+esac - fi # as_fn_append - - # as_fn_arith ARG... -@@ -46431,16 +48856,18 @@ 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 -- as_fn_arith () -+else case e in #( -+ e) as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` -- } -+ } ;; -+esac - fi # as_fn_arith - - -@@ -46467,7 +48894,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 -@@ -46489,6 +48916,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*) -@@ -46502,6 +48933,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 -@@ -46513,9 +48950,9 @@ if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: -- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -pR'. -+ # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. -+ # In both cases, we have to default to 'cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then -@@ -46543,7 +48980,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" -@@ -46552,7 +48989,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 -@@ -46596,10 +49033,12 @@ as_test_x='test -x' - as_executable_p=as_fn_executable_p - - # Sed expression to map a string onto a valid CPP name. --as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -+as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -+as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated - - # Sed expression to map a string onto a valid variable name. --as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -+as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -+as_tr_sh="eval sed '$as_sed_sh'" # deprecated - - - exec 6>&1 -@@ -46615,7 +49054,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - # values after options handling. - ac_log=" - This file was extended by wxWidgets $as_me 3.2.6, which was --generated by GNU Autoconf 2.69. Invocation command line was -+generated by GNU Autoconf 2.72. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -46647,7 +49086,7 @@ _ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - ac_cs_usage="\ --\`$as_me' instantiates files and other configuration actions -+'$as_me' instantiates files and other configuration actions - from templates according to the current configuration. Unless the files - and actions are specified as TAGs, all are instantiated by default. - -@@ -46677,14 +49116,16 @@ $config_commands - 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="\\ - wxWidgets config.status 3.2.6 --configured by $0, generated by GNU Autoconf 2.69, -+configured by $0, generated by GNU Autoconf 2.72, - with options \\"\$ac_cs_config\\" - --Copyright (C) 2012 Free Software Foundation, Inc. -+Copyright (C) 2023 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." - -@@ -46722,15 +49163,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'" -@@ -46738,23 +49179,23 @@ 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;; - --he | --h) - # Conflict between --help and --header -- as_fn_error $? "ambiguous option: \`$1' --Try \`$0 --help' for more information.";; -+ 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=: ;; - - # This is an error. -- -*) as_fn_error $? "unrecognized option: \`$1' --Try \`$0 --help' for more information." ;; -+ -*) as_fn_error $? "unrecognized option: '$1' -+Try '$0 --help' for more information." ;; - - *) as_fn_append ac_config_targets " $1" - ac_need_defaults=false ;; -@@ -46775,7 +49216,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 "\$@" -@@ -46789,7 +49230,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 -@@ -46827,7 +49268,7 @@ do - "wx-config") CONFIG_COMMANDS="$CONFIG_COMMANDS wx-config" ;; - "$mk") CONFIG_FILES="$CONFIG_FILES $mk" ;; - -- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; -+ *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;; - esac - done - -@@ -46837,9 +49278,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 -@@ -46847,7 +49288,7 @@ fi - # creating and moving files from /tmp can sometimes cause problems. - # Hook for its removal unless debugging. - # Note that there is a small window in which the directory will not be cleaned: --# after its creation but before its name has been assigned to `$tmp'. -+# after its creation but before its name has been assigned to '$tmp'. - $debug || - { - tmp= ac_tmp= -@@ -46871,7 +49312,7 @@ ac_tmp=$tmp - - # Set up the scripts for CONFIG_FILES section. - # No need to generate them if there are no CONFIG_FILES. --# This happens for instance with `./config.status config.h'. -+# This happens for instance with './config.status config.h'. - if test -n "$CONFIG_FILES"; then - - -@@ -47029,13 +49470,13 @@ fi # test -n "$CONFIG_FILES" - - # Set up the scripts for CONFIG_HEADERS section. - # No need to generate them if there are no CONFIG_HEADERS. --# This happens for instance with `./config.status Makefile'. -+# This happens for instance with './config.status Makefile'. - if test -n "$CONFIG_HEADERS"; then - cat >"$ac_tmp/defines.awk" <<\_ACAWK || - BEGIN { - _ACEOF - --# Transform confdefs.h into an awk script `defines.awk', embedded as -+# Transform confdefs.h into an awk script 'defines.awk', embedded as - # here-document in config.status, that substitutes the proper values into - # config.h.in to produce config.h. - -@@ -47145,7 +49586,7 @@ do - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; -- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; -+ :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac -@@ -47167,33 +49608,33 @@ do - -) ac_f="$ac_tmp/stdin";; - *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, -- # because $ac_f cannot contain `:'. -+ # because $ac_f cannot contain ':'. - test -f "$ac_f" || - case $ac_f in - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || -- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; -+ 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 - -- # Let's still pretend it is `configure' which instantiates (i.e., don't -+ # Let's still pretend it is 'configure' which instantiates (i.e., don't - # 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 -@@ -47210,7 +49651,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 -@@ -47234,9 +49675,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/ ;; -@@ -47293,8 +49734,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=' -@@ -47307,7 +49748,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - esac - _ACEOF - --# Neutralize VPATH when `$srcdir' = `.'. -+# Neutralize VPATH when '$srcdir' = '.'. - # Shell code in configure.ac might set extrasub. - # FIXME: do we really want to maintain this feature? - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -@@ -47337,9 +49778,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" -@@ -47355,27 +49796,27 @@ 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 - ;; - -- :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 - -@@ -47464,7 +49905,7 @@ if test "$no_recursion" != yes; then - ;; - *) - case $ac_arg in -- *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - as_fn_append ac_sub_configure_args " '$ac_arg'" ;; - esac -@@ -47474,7 +49915,7 @@ if test "$no_recursion" != yes; then - # in subdir configurations. - ac_arg="--prefix=$prefix" - case $ac_arg in -- *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args" - -@@ -47495,17 +49936,17 @@ if test "$no_recursion" != yes; then - test -d "$srcdir/$ac_dir" || continue - - ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)" -- $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5 -- $as_echo "$ac_msg" >&6 -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5 -+ printf "%s\n" "$ac_msg" >&6 - as_dir="$ac_dir"; as_fn_mkdir_p - ac_builddir=. - - 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/ ;; -@@ -47535,17 +49976,15 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - cd "$ac_dir" - -- # Check for guested configure; otherwise get Cygnus style 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 - ac_sub_configure=$ac_srcdir/configure.gnu - elif test -f "$ac_srcdir/configure"; then - ac_sub_configure=$ac_srcdir/configure -- elif test -f "$ac_srcdir/configure.in"; then -- # This should be Cygnus configure. -- ac_sub_configure=$ac_aux_dir/configure - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5 --$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5 -+printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} - ac_sub_configure= - fi - -@@ -47558,8 +49997,8 @@ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} - ac_sub_cache_file=$ac_top_build_prefix$cache_file ;; - esac - -- { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 --$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 -+printf "%s\n" "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} - # The eval makes quoting arguments work. - eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ - --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || -@@ -47570,8 +50009,8 @@ $as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cach - done - 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 - - -@@ -47615,3 +50054,4 @@ echo " sdl ${wxUSE_LIBSDL}" - - echo "" - -+ -diff --git a/configure.in b/configure.in -index 73caf77a44..054e9356db 100644 ---- a/configure.in -+++ b/configure.in -@@ -77,6 +77,7 @@ USE_WIN32=0 - USE_DOS=0 - USE_BEOS=0 - USE_MAC=0 -+USE_WASM=0 - - dnl Unix kind - USE_AIX= -@@ -111,7 +112,7 @@ NEEDS_D_REENTRANT_FOR_R_FUNCS=0 - dnl the list of all available toolkits - dnl - dnl update NUM_TOOLKITS calculation below when adding a new toolkit here! --ALL_TOOLKITS="GTK OSX_COCOA OSX_IPHONE MOTIF MSW X11 DFB QT" -+ALL_TOOLKITS="GTK OSX_COCOA OSX_IPHONE MOTIF MSW X11 DFB QT WASM" - - dnl NB: these wxUSE_XXX constants have value of 0 or 1 unlike all the other ones - dnl which are either yes or no -@@ -123,6 +124,7 @@ DEFAULT_wxUSE_MSW=0 - DEFAULT_wxUSE_X11=0 - DEFAULT_wxUSE_DFB=0 - DEFAULT_wxUSE_QT=0 -+DEFAULT_wxUSE_WASM=0 - - dnl these are the values which are really default for the given platform: - dnl they're used if no --with- options were given to detect the -@@ -135,6 +137,7 @@ DEFAULT_DEFAULT_wxUSE_MSW=0 - DEFAULT_DEFAULT_wxUSE_X11=0 - DEFAULT_DEFAULT_wxUSE_DFB=0 - DEFAULT_DEFAULT_wxUSE_QT=0 -+DEFAULT_DEFAULT_wxUSE_WASM=0 - - PROGRAM_EXT= - SAMPLES_CXXFLAGS= -@@ -304,6 +307,13 @@ case "${host}" in - DEFAULT_DEFAULT_wxUSE_QT=1 - ;; - -+ *-*-emscripten* ) -+ USE_WASM=1 -+ AC_DEFINE(__WASM__) -+ DEFAULT_DEFAULT_wxUSE_WASM=1 -+ PROGRAM_EXT=".js" -+ ;; -+ - *) - AC_MSG_WARN([*** System type ${host} is unknown, assuming generic Unix and continuing nevertheless.]) - AC_MSG_WARN([*** Please report the build results to wx-dev@googlegroups.com.]) -@@ -443,6 +453,7 @@ WX_ARG_ONLY_WITH(msw, [ --with-msw use MS-Windows], [wxU - WX_ARG_ONLY_WITH(directfb, [ --with-directfb use DirectFB], [wxUSE_DFB="$withval" wxUSE_UNIVERSAL="yes" CACHE_DFB=1 TOOLKIT_GIVEN=1]) - WX_ARG_ONLY_WITH(x11, [ --with-x11 use X11], [wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1]) - WX_ARG_ONLY_WITH(qt, [ --with-qt use Qt], [wxUSE_QT="$withval" CACHE_QT=1 TOOLKIT_GIVEN=1]) -+WX_ARG_ONLY_WITH(wasm, [ --with-wasm use WebAssembly], [wxUSE_WASM="$withval" CACHE_WASM=1 TOOLKIT_GIVEN=1]) - WX_ARG_ENABLE(nanox, [ --enable-nanox use NanoX], wxUSE_NANOX) - WX_ARG_ENABLE(gpe, [ --enable-gpe use GNOME PDA Environment features if possible], wxUSE_GPE) - -@@ -498,7 +509,7 @@ if test "$wxUSE_GUI" = "yes"; then - NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} \ - + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_DFB:-0} \ - + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} \ -- + ${wxUSE_X11:-0} + ${wxUSE_QT:-0}` -+ + ${wxUSE_X11:-0} + ${wxUSE_QT:-0} + ${wxUSE_WASM:-0}` - - - case "$NUM_TOOLKITS" in -@@ -3738,6 +3749,13 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config - ) - fi - fi -+ -+ if test "$wxUSE_WASM" = 1; then -+ TOOLKIT=WASM -+ dnl Use built-in png/zlib via Emscripten ports -+ GUI_TK_LIBRARY="-sUSE_LIBPNG=1 -sUSE_ZLIB=1" -+ fi -+ - dnl the name of the directory where the files for this toolkit live - TOOLKIT_DIR=`echo ${TOOLKIT} | tr '[[A-Z]]' '[[a-z]]'` - -diff --git a/configure~ b/configure~ -new file mode 100755 -index 0000000000..b96ae11165 ---- /dev/null -+++ b/configure~ -@@ -0,0 +1,50051 @@ -+#! /bin/sh -+# Guess values for system-dependent variables and create Makefiles. -+# Generated by GNU Autoconf 2.72 for wxWidgets 3.2.6. -+# -+# Report bugs to . -+# -+# -+# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, -+# Inc. -+# -+# -+# This configure script is free software; the Free Software Foundation -+# gives unlimited permission to copy, distribute and modify it. -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## -+ -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+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 case e in #( -+ e) case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac ;; -+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 -+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 ${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 || -+ PATH_SEPARATOR=';' -+ } -+fi -+ -+ -+# Find who we are. Look in the path if we contain no directory separator. -+as_myself= -+case $0 in #(( -+ *[\\/]* ) as_myself=$0 ;; -+ *) 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 -+ test -r "$as_dir$0" && as_myself=$as_dir$0 && break -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as 'sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ exit 1 -+fi -+ -+ -+# Use a proper internal environment variable to ensure we don't fall -+ # into an infinite loop, continuously re-executing ourselves. -+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then -+ _as_can_reexec=no; export _as_can_reexec; -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+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'. -+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 \${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 case e in #( -+ e) case \`(set -o) 2>/dev/null\` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac ;; -+esac -+fi -+" -+ as_required="as_fn_return () { (exit \$1); } -+as_fn_success () { as_fn_return 0; } -+as_fn_failure () { as_fn_return 1; } -+as_fn_ret_success () { return 0; } -+as_fn_ret_failure () { return 1; } -+ -+exitcode=0 -+as_fn_success || { exitcode=1; echo as_fn_success failed.; } -+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -+if ( set x; as_fn_ret_success y && test x = \"\$1\" ) -+then : -+ -+else case e in #( -+ e) exitcode=1; echo positional parameters were not saved. ;; -+esac -+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 -+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && -+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -+test \$(( 1 + 1 )) = 2 || exit 1" -+ if (eval "$as_required") 2>/dev/null -+then : -+ as_have_required=yes -+else case e in #( -+ e) as_have_required=no ;; -+esac -+fi -+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null -+then : -+ -+else case e in #( -+ e) 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 -+ 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 -+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && -+ 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_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null -+then : -+ break 2 -+fi -+fi -+ done;; -+ esac -+ as_found=false -+done -+IFS=$as_save_IFS -+if $as_found -+then : -+ -+else case e in #( -+ e) 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 ;; -+esac -+fi -+ -+ -+ 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 -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+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'. -+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 -+exit 255 -+fi -+ -+ 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 -+ printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and -+$0: wx-dev@googlegroups.com about your system, including -+$0: any error possibly output before this message. Then -+$0: install a modern shell, or manually run the script -+$0: under such a shell if you do have one." -+ fi -+ exit 1 -+fi ;; -+esac -+fi -+fi -+SHELL=${CONFIG_SHELL-/bin/sh} -+export SHELL -+# Unset more variables known to interfere with behavior of common tools. -+CLICOLOR_FORCE= GREP_OPTIONS= -+unset CLICOLOR_FORCE GREP_OPTIONS -+ -+## --------------------- ## -+## M4sh Shell Functions. ## -+## --------------------- ## -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset -+ -+ -+# as_fn_set_status STATUS -+# ----------------------- -+# Set $? to STATUS, without forking. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status -+ -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ -+ -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+printf "%s\n" X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -+ -+ -+} # as_fn_mkdir_p -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null -+then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else case e in #( -+ e) as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } ;; -+esac -+fi # as_fn_append -+ -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null -+then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else case e in #( -+ e) as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } ;; -+esac -+fi # as_fn_arith -+ -+ -+# as_fn_error STATUS ERROR [LINENO LOG_FD] -+# ---------------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with STATUS, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$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 -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 -+ fi -+ printf "%s\n" "$as_me: error: $2" >&2 -+ as_fn_exit $as_status -+} # as_fn_error -+ -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then -+ as_basename=basename -+else -+ as_basename=false -+fi -+ -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi -+ -+as_me=`$as_basename -- "$0" || -+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+printf "%s\n" X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ -+ -+ as_lineno_1=$LINENO as_lineno_1a=$LINENO -+ as_lineno_2=$LINENO as_lineno_2a=$LINENO -+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && -+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { -+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | -+ sed ' -+ t clear -+ :clear -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno -+ N -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ -+ t loop -+ s/-\n.*// -+ ' >$as_me.lineno && -+ chmod +x "$as_me.lineno" || -+ { 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 -+ # in an infinite loop. This has already happened in practice. -+ _as_can_reexec=no; export _as_can_reexec -+ # Don't try to exec as it changes $[0], causing all sort of problems -+ # (the dirname of $[0] is not the place where we might find the -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" -+ # Exit status is that of the last command. -+ exit -+} -+ -+ -+# 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*) -+ case `echo 'xy\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; -+ esac;; -+*) -+ 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 -+else -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null -+fi -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. -+ # In both cases, we have to default to 'cp -pR'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -pR' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -pR' -+ fi -+else -+ as_ln_s='cp -pR' -+fi -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null -+ -+if mkdir -p . 2>/dev/null; then -+ as_mkdir_p='mkdir -p "$as_dir"' -+else -+ test -d ./-p && rmdir ./-p -+ as_mkdir_p=false -+fi -+ -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p -+ -+# Sed expression to map a string onto a valid CPP name. -+as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -+as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated -+ -+# Sed expression to map a string onto a valid variable name. -+as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -+as_tr_sh="eval sed '$as_sed_sh'" # deprecated -+ -+ -+test -n "$DJDIR" || exec 7<&0 &1 -+ -+# Name of the host. -+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, -+# so uname gets run too. -+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -+ -+# -+# Initializations. -+# -+ac_default_prefix=/usr/local -+ac_clean_files= -+ac_config_libobj_dir=. -+LIBOBJS= -+cross_compiling=no -+subdirs= -+MFLAGS= -+MAKEFLAGS= -+ -+# Identity of this package. -+PACKAGE_NAME='wxWidgets' -+PACKAGE_TARNAME='wxwidgets' -+PACKAGE_VERSION='3.2.6' -+PACKAGE_STRING='wxWidgets 3.2.6' -+PACKAGE_BUGREPORT='wx-dev@googlegroups.com' -+PACKAGE_URL='' -+ -+ac_unique_file="wx-config.in" -+# Factoring default headers for most tests. -+ac_includes_default="\ -+#include -+#ifdef HAVE_STDIO_H -+# include -+#endif -+#ifdef HAVE_STDLIB_H -+# include -+#endif -+#ifdef HAVE_STRING_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_c_list= -+enable_option_checking=no -+enable_option_checking=fatal -+ac_subst_vars='subdirs_extra -+LTLIBOBJS -+LIBOBJS -+RESCOMP -+DLLTOOL -+GCC -+WX_VERSION_TAG -+DMALLOC_LIBS -+OPENGL_LIBS -+LDFLAGS_GL -+SAMPLES_CXXFLAGS -+SAMPLES_SUBDIRS -+DISTDIR -+GUIDIST -+WXCONFIG_RESFLAGS -+WXCONFIG_LDFLAGS_GUI -+WXCONFIG_LDFLAGS -+WX_LDFLAGS -+WXCONFIG_RPATH -+WXCONFIG_LIBS -+WXCONFIG_CXXFLAGS -+WX_CXXFLAGS -+WXCONFIG_CFLAGS -+WX_CFLAGS -+WXCONFIG_CPPFLAGS -+WX_CPPFLAGS -+WX_CHARTYPE -+WX_SUBVERSION -+WX_VERSION -+WX_RELEASE -+WIDGET_SET -+cross_compiling -+TOOLCHAIN_FULLNAME -+TOOLCHAIN_NAME -+TOOLKIT_DIR -+TOOLKIT -+USE_XML -+USE_GUI -+WX_LIBRARY_BASENAME_GUI -+WX_LIBRARY_BASENAME_NOGUI -+SHARED -+COND_wxUSE_ZLIB_builtin -+COND_wxUSE_REGEX_builtin -+COND_wxUSE_LIBTIFF_builtin -+COND_wxUSE_LIBPNG_builtin -+COND_wxUSE_LIBJPEG_builtin -+COND_wxUSE_EXPAT_builtin -+COND_WXUNIV_1 -+COND_WITH_PLUGIN_SDL_1 -+COND_WINDOWS_IMPLIB_1 -+COND_USE_XRC_1 -+COND_USE_XML_1 -+COND_USE_WEBVIEW_WEBKIT2_1 -+COND_USE_THREADS_1 -+COND_USE_THREADS_0 -+COND_USE_STC_1 -+COND_USE_SOVERSOLARIS_1 -+COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1 -+COND_USE_SOVERSION_0 -+COND_USE_SOVERLINUX_1 -+COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 -+COND_USE_SOTWOSYMLINKS_1 -+COND_USE_RTTI_1 -+COND_USE_RTTI_0 -+COND_USE_PLUGINS_0 -+COND_USE_PCH_1 -+COND_USE_OPENGL_1 -+COND_USE_GUI_1_wxUSE_LIBTIFF_builtin -+COND_USE_GUI_1_wxUSE_LIBPNG_builtin -+COND_USE_GUI_1_wxUSE_LIBJPEG_builtin -+COND_USE_GUI_1_WXUNIV_1 -+COND_USE_GUI_1_WXUNIV_0 -+COND_USE_GUI_1_USE_OPENGL_1 -+COND_USE_GUI_1 -+COND_USE_GUI_0 -+COND_USE_EXCEPTIONS_1 -+COND_USE_EXCEPTIONS_0 -+COND_USE_CAIRO_1 -+COND_UNICODE_1 -+COND_TOOLKIT_X11_USE_GUI_1 -+COND_TOOLKIT_X11 -+COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0 -+COND_TOOLKIT_QT -+COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0 -+COND_TOOLKIT_OSX_IPHONE_USE_GUI_1 -+COND_TOOLKIT_OSX_IPHONE -+COND_TOOLKIT_OSX_COCOA_WXUNIV_0 -+COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0 -+COND_TOOLKIT_OSX_COCOA_USE_GUI_1 -+COND_TOOLKIT_OSX_COCOA -+COND_TOOLKIT_OSX_CARBON -+COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 -+COND_TOOLKIT_MSW_USE_GUI_1 -+COND_TOOLKIT_MSW -+COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 -+COND_TOOLKIT_MOTIF_USE_GUI_1 -+COND_TOOLKIT_MOTIF -+COND_TOOLKIT_MAC -+COND_TOOLKIT_GTK_USE_GUI_1 -+COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0 -+COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1 -+COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0 -+COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1 -+COND_TOOLKIT_GTK_TOOLKIT_VERSION_4 -+COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0 -+COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1 -+COND_TOOLKIT_GTK_TOOLKIT_VERSION_3 -+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0 -+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1 -+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2 -+COND_TOOLKIT_GTK_TOOLKIT_VERSION_ -+COND_TOOLKIT_GTK -+COND_TOOLKIT_DFB_USE_GUI_1 -+COND_TOOLKIT_DFB -+COND_TOOLKIT_COCOA -+COND_TOOLKIT_ -+COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 -+COND_SHARED_1_USE_GUI_1 -+COND_SHARED_1 -+COND_SHARED_0_wxUSE_ZLIB_builtin -+COND_SHARED_0_wxUSE_REGEX_builtin -+COND_SHARED_0_wxUSE_EXPAT_builtin -+COND_SHARED_0_USE_STC_1 -+COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin -+COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin -+COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin -+COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 -+COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0 -+COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0 -+COND_SHARED_0 -+COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0 -+COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1 -+COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1 -+COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1 -+COND_PLATFORM_WIN32_1_SHARED_0 -+COND_PLATFORM_WIN32_1 -+COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_4 -+COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_3 -+COND_PLATFORM_WIN32_0 -+COND_PLATFORM_UNIX_1_USE_PLUGINS_0 -+COND_PLATFORM_UNIX_1_USE_GUI_1 -+COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1 -+COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1 -+COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1 -+COND_PLATFORM_UNIX_1 -+COND_PLATFORM_UNIX_0 -+COND_PLATFORM_OS2_1 -+COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 -+COND_PLATFORM_MACOSX_1_USE_OPENGL_1 -+COND_PLATFORM_MACOSX_1_USE_GUI_1 -+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0 -+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1 -+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0 -+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1 -+COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1 -+COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1 -+COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1 -+COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0 -+COND_PLATFORM_MACOSX_1 -+COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 -+COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 -+COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 -+COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 -+COND_MONOLITHIC_1_USE_STC_1 -+COND_MONOLITHIC_1_SHARED_1 -+COND_MONOLITHIC_1_SHARED_0 -+COND_MONOLITHIC_1 -+COND_MONOLITHIC_0_USE_XRC_1 -+COND_MONOLITHIC_0_USE_XML_1 -+COND_MONOLITHIC_0_USE_WEBVIEW_1 -+COND_MONOLITHIC_0_USE_STC_1 -+COND_MONOLITHIC_0_USE_RICHTEXT_1 -+COND_MONOLITHIC_0_USE_RIBBON_1 -+COND_MONOLITHIC_0_USE_QA_1 -+COND_MONOLITHIC_0_USE_PROPGRID_1 -+COND_MONOLITHIC_0_USE_MEDIA_1 -+COND_MONOLITHIC_0_USE_HTML_1 -+COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1 -+COND_MONOLITHIC_0_USE_GUI_1 -+COND_MONOLITHIC_0_USE_AUI_1 -+COND_MONOLITHIC_0_SHARED_1_USE_XML_1_USE_XRC_1 -+COND_MONOLITHIC_0_SHARED_1_USE_XML_1 -+COND_MONOLITHIC_0_SHARED_1_USE_STC_1 -+COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1_USE_XML_1 -+COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1 -+COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1 -+COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1 -+COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1 -+COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1 -+COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1 -+COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 -+COND_MONOLITHIC_0_SHARED_1_USE_AUI_1 -+COND_MONOLITHIC_0_SHARED_1 -+COND_MONOLITHIC_0_SHARED_0_USE_XRC_1 -+COND_MONOLITHIC_0_SHARED_0_USE_XML_1 -+COND_MONOLITHIC_0_SHARED_0_USE_STC_1 -+COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1 -+COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1 -+COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1 -+COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1 -+COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1 -+COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1 -+COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1 -+COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 -+COND_MONOLITHIC_0_SHARED_0_USE_AUI_1 -+COND_MONOLITHIC_0_SHARED_0 -+COND_MONOLITHIC_0 -+COND_ICC_PCH_1 -+COND_GCC_PCH_1 -+COND_DEPS_TRACKING_1 -+COND_DEPS_TRACKING_0 -+COND_DEBUG_INFO_1 -+COND_DEBUG_INFO_0 -+COND_DEBUG_FLAG_0 -+COND_BUILD_release_DEBUG_INFO_default -+COND_BUILD_release -+COND_BUILD_debug_DEBUG_INFO_default -+COND_BUILD_debug -+BK_MAKE_PCH -+ICC_PCH_USE_SWITCH -+ICC_PCH_CREATE_SWITCH -+ICC_PCH -+GCC_PCH -+OBJCXXFLAGS -+WINDRES -+BK_DEPS -+DEPS_TRACKING -+SONAME_FLAG -+USE_SOTWOSYMLINKS -+USE_MACVERSION -+USE_SOVERCYGWIN -+USE_SOVERSOLARIS -+USE_SOVERLINUX -+USE_SOVERSION -+WINDOWS_IMPLIB -+PIC_FLAG -+SHARED_LD_MODULE_CXX -+SHARED_LD_MODULE_CC -+SHARED_LD_CXX -+SHARED_LD_CC -+AIX_CXX_LD -+dlldir -+DLLPREFIX_MODULE -+DLLPREFIX -+LIBEXT -+LIBPREFIX -+DLLIMP_SUFFIX -+SO_SUFFIX_MODULE -+SO_SUFFIX -+PLATFORM_BEOS -+PLATFORM_MACOSX -+PLATFORM_MACOS -+PLATFORM_MAC -+PLATFORM_WIN32 -+PLATFORM_UNIX -+IF_GNU_MAKE -+LDFLAGS_GUI -+INSTALL_DIR -+NM -+STRIP -+AROPTIONS -+MAKE_SET -+SET_MAKE -+LN_S -+INSTALL_DATA -+INSTALL_SCRIPT -+INSTALL_PROGRAM -+RANLIB -+USE_DPI_AWARE_MANIFEST -+HOST_SUFFIX -+HEADER_PAD_OPTION -+SAMPLES_RPATH_FLAG -+DYLIB_RPATH_POSTLINK -+DYLIB_RPATH_INSTALL -+TOOLKIT_VERSION -+TOOLKIT_LOWERCASE -+DEBUG_FLAG -+DEBUG_INFO -+UNICODE -+WITH_PLUGIN_SDL -+EXTRALIBS_WEBVIEW -+EXTRALIBS_STC -+EXTRALIBS_SDL -+EXTRALIBS_OPENGL -+EXTRALIBS_GUI -+EXTRALIBS_MEDIA -+EXTRALIBS_HTML -+EXTRALIBS_XML -+EXTRALIBS -+USE_PLUGINS -+MONOLITHIC -+WXUNIV -+WX_LIB_FLAVOUR -+WX_FLAVOUR -+OFFICIAL_BUILD -+VENDOR -+wxUSE_LIBTIFF -+wxUSE_LIBPNG -+wxUSE_LIBJPEG -+wxUSE_EXPAT -+wxUSE_XML -+wxUSE_REGEX -+wxUSE_ZLIB -+STD_GUI_LIBS -+STD_BASE_LIBS -+BUILT_WX_LIBS -+GST_LIBS -+GST_CFLAGS -+CAIRO_LIBS -+CAIRO_CFLAGS -+WEBKIT_LIBS -+WEBKIT_CFLAGS -+COND_PYTHON -+PYTHON -+PRIVATE_FONTS_LIBS -+PRIVATE_FONTS_CFLAGS -+XTST_LIBS -+XTST_CFLAGS -+LIBNOTIFY_LIBS -+LIBNOTIFY_CFLAGS -+GNOMEVFS_LIBS -+GNOMEVFS_CFLAGS -+GTKPRINT_LIBS -+GTKPRINT_CFLAGS -+SDL_CONFIG -+SDL_LIBS -+SDL_CFLAGS -+GSPELL_LIBS -+GSPELL_CFLAGS -+LIBSECRET_LIBS -+LIBSECRET_CFLAGS -+XKBCOMMON_LIBS -+XKBCOMMON_CFLAGS -+GXX_VERSION -+LIBICONV -+CXXFLAGS_VISIBILITY -+CFLAGS_VISIBILITY -+MesaGL_LIBS -+MesaGL_CFLAGS -+WAYLAND_EGL_LIBS -+WAYLAND_EGL_CFLAGS -+EGL_LIBS -+EGL_CFLAGS -+GLU_LIBS -+GLU_CFLAGS -+GL_LIBS -+GL_CFLAGS -+SM_LIBS -+SM_CFLAGS -+Xxf86vm_LIBS -+Xxf86vm_CFLAGS -+Xinerama_LIBS -+Xinerama_CFLAGS -+QT5_LIBS -+QT5_CFLAGS -+PANGOFT2_LIBS -+PANGOFT2_CFLAGS -+PANGOXFT_LIBS -+PANGOXFT_CFLAGS -+X_EXTRA_LIBS -+X_LIBS -+X_PRE_LIBS -+X_CFLAGS -+CPP -+XMKMF -+DIRECTFB_LIBS -+DIRECTFB_CFLAGS -+GTK_CONFIG -+GTK_LIBS -+GTK_CFLAGS -+LIBCURL_LIBS -+LIBCURL_CFLAGS -+subdirs -+wxCFLAGS_C99 -+LIBTIFF_LIBS -+LIBTIFF_CFLAGS -+wxPCRE2_CODE_UNIT_WIDTH -+LIBPCRE_LIBS -+LIBPCRE_CFLAGS -+PKG_CONFIG -+AR -+HAVE_CXX20 -+HAVE_CXX17 -+HAVE_CXX14 -+HAVE_CXX11 -+ac_ct_CXX -+CXXFLAGS -+CXX -+OBJEXT -+EXEEXT -+ac_ct_CC -+CPPFLAGS -+LDFLAGS -+CFLAGS -+CC -+wx_top_builddir -+host_os -+host_vendor -+host_cpu -+host -+build_os -+build_vendor -+build_cpu -+build -+target_alias -+host_alias -+build_alias -+LIBS -+ECHO_T -+ECHO_N -+ECHO_C -+DEFS -+mandir -+localedir -+libdir -+psdir -+pdfdir -+dvidir -+htmldir -+infodir -+docdir -+oldincludedir -+includedir -+runstatedir -+localstatedir -+sharedstatedir -+sysconfdir -+datadir -+datarootdir -+libexecdir -+sbindir -+bindir -+program_transform_name -+prefix -+exec_prefix -+PACKAGE_URL -+PACKAGE_BUGREPORT -+PACKAGE_STRING -+PACKAGE_VERSION -+PACKAGE_TARNAME -+PACKAGE_NAME -+PATH_SEPARATOR -+SHELL' -+ac_subst_files='' -+ac_user_opts=' -+enable_option_checking -+enable_gui -+enable_monolithic -+enable_plugins -+with_subdirs -+with_flavour -+enable_official_build -+enable_vendor -+enable_all_features -+enable_sys_libs -+enable_tests -+with_dpi -+enable_universal -+with_themes -+with_gtk -+with_motif -+with_osx_cocoa -+with_osx_iphone -+with_osx -+with_cocoa -+with_iphone -+with_mac -+with_wine -+with_msw -+with_directfb -+with_x11 -+with_qt -+with_wasm -+enable_nanox -+enable_gpe -+with_libpng -+with_libjpeg -+with_libtiff -+with_libjbig -+with_libxpm -+with_libiconv -+with_libmspack -+with_gtkprint -+with_gnomevfs -+with_libnotify -+with_opengl -+with_xtest -+with_nanosvg -+with_cairo -+with_dmalloc -+with_sdl -+with_regex -+with_liblzma -+with_zlib -+with_expat -+with_libcurl -+with_winhttp -+with_urlsession -+with_macosx_sdk -+with_macosx_version_min -+enable_debug -+enable_debug_flag -+enable_debug_info -+enable_debug_gdb -+enable_debug_cntxt -+enable_mem_tracing -+enable_shared -+enable_cxx11 -+with_cxx -+enable_stl -+enable_std_containers -+enable_std_containers_compat -+enable_std_iostreams -+enable_std_string -+enable_std_string_conv_in_wxstring -+enable_unsafe_conv_in_wxstring -+enable_unicode -+enable_utf8 -+enable_utf8only -+enable_extended_rtti -+enable_optimise -+enable_profile -+enable_pic -+enable_no_rtti -+enable_no_exceptions -+enable_permissive -+enable_vararg_macros -+enable_universal_binary -+enable_macosx_arch -+enable_compat28 -+enable_compat30 -+enable_rpath -+enable_visibility -+enable_tls -+enable_repro_build -+enable_pch -+enable_intl -+enable_xlocale -+enable_config -+enable_protocols -+enable_ftp -+enable_http -+enable_fileproto -+enable_sockets -+enable_ipv6 -+enable_ole -+enable_dataobj -+enable_webrequest -+enable_ipc -+enable_baseevtloop -+enable_epollloop -+enable_selectloop -+enable_any -+enable_apple_ieee -+enable_arcstream -+enable_base64 -+enable_backtrace -+enable_catch_segvs -+enable_cmdline -+enable_datetime -+enable_debugreport -+enable_dialupman -+enable_dynlib -+enable_dynamicloader -+enable_exceptions -+enable_ffile -+enable_file -+enable_filehistory -+enable_filesystem -+enable_fontenum -+enable_fontmap -+enable_fs_archive -+enable_fs_inet -+enable_fs_zip -+enable_fsvolume -+enable_fswatcher -+enable_geometry -+enable_log -+enable_longlong -+enable_mimetype -+enable_printfposparam -+enable_secretstore -+enable_snglinst -+enable_sound -+enable_spellcheck -+enable_stdpaths -+enable_stopwatch -+enable_streams -+enable_sysoptions -+enable_tarstream -+enable_textbuf -+enable_textfile -+enable_timer -+enable_variant -+enable_zipstream -+enable_url -+enable_protocol -+enable_protocol_http -+enable_protocol_ftp -+enable_protocol_file -+enable_threads -+enable_dbghelp -+enable_iniconf -+enable_regkey -+enable_docview -+enable_help -+enable_mshtmlhelp -+enable_html -+enable_htmlhelp -+enable_xrc -+enable_aui -+enable_propgrid -+enable_ribbon -+enable_stc -+enable_constraints -+enable_loggui -+enable_logwin -+enable_logdialog -+enable_mdi -+enable_mdidoc -+enable_mediactrl -+enable_richtext -+enable_postscript -+enable_printarch -+enable_svg -+enable_webview -+enable_graphics_ctx -+enable_graphics_d2d -+enable_clipboard -+enable_dnd -+enable_controls -+enable_markup -+enable_accel -+enable_actindicator -+enable_addremovectrl -+enable_animatectrl -+enable_bannerwindow -+enable_artstd -+enable_arttango -+enable_bmpbutton -+enable_bmpcombobox -+enable_button -+enable_calendar -+enable_caret -+enable_checkbox -+enable_checklst -+enable_choice -+enable_choicebook -+enable_collpane -+enable_colourpicker -+enable_combobox -+enable_comboctrl -+enable_commandlinkbutton -+enable_dataviewctrl -+enable_nativedvc -+enable_datepick -+enable_detect_sm -+enable_dirpicker -+enable_display -+enable_editablebox -+enable_filectrl -+enable_filepicker -+enable_fontpicker -+enable_gauge -+enable_grid -+enable_headerctrl -+enable_hyperlink -+enable_imaglist -+enable_infobar -+enable_listbook -+enable_listbox -+enable_listctrl -+enable_notebook -+enable_notifmsg -+enable_odcombobox -+enable_popupwin -+enable_prefseditor -+enable_privatefonts -+enable_radiobox -+enable_radiobtn -+enable_richmsgdlg -+enable_richtooltip -+enable_rearrangectrl -+enable_sash -+enable_scrollbar -+enable_searchctrl -+enable_slider -+enable_spinbtn -+enable_spinctrl -+enable_splitter -+enable_statbmp -+enable_statbox -+enable_statline -+enable_stattext -+enable_statusbar -+enable_taskbaricon -+enable_tbarnative -+enable_textctrl -+enable_timepick -+enable_tipwindow -+enable_togglebtn -+enable_toolbar -+enable_toolbook -+enable_treebook -+enable_treectrl -+enable_treelist -+enable_commondlg -+enable_aboutdlg -+enable_choicedlg -+enable_coldlg -+enable_creddlg -+enable_filedlg -+enable_finddlg -+enable_fontdlg -+enable_dirdlg -+enable_msgdlg -+enable_numberdlg -+enable_splash -+enable_textdlg -+enable_tipdlg -+enable_progressdlg -+enable_wizarddlg -+enable_menus -+enable_menubar -+enable_miniframe -+enable_tooltips -+enable_splines -+enable_mousewheel -+enable_validators -+enable_busyinfo -+enable_hotkey -+enable_joystick -+enable_metafile -+enable_dragimage -+enable_accessibility -+enable_uiactionsim -+enable_dctransform -+enable_webviewwebkit -+enable_glcanvasegl -+enable_palette -+enable_image -+enable_gif -+enable_pcx -+enable_tga -+enable_iff -+enable_pnm -+enable_xpm -+enable_ico_cur -+enable_dccache -+enable_ps_in_msw -+enable_ownerdrawn -+enable_taskbarbutton -+enable_uxtheme -+enable_wxdib -+enable_webviewie -+enable_webviewedge -+enable_autoidman -+enable_largefile -+enable_gtktest -+with_gtk_prefix -+with_gtk_exec_prefix -+with_x -+with_libiconv_prefix -+with_sdl_prefix -+with_sdl_exec_prefix -+enable_sdltest -+enable_dependency_tracking -+enable_precomp_headers -+' -+ ac_precious_vars='build_alias -+host_alias -+target_alias -+CC -+CFLAGS -+LDFLAGS -+LIBS -+CPPFLAGS -+CXX -+CXXFLAGS -+CCC -+PKG_CONFIG -+LIBPCRE_CFLAGS -+LIBPCRE_LIBS -+LIBTIFF_CFLAGS -+LIBTIFF_LIBS -+LIBCURL_CFLAGS -+LIBCURL_LIBS -+DIRECTFB_CFLAGS -+DIRECTFB_LIBS -+XMKMF -+CPP -+PANGOXFT_CFLAGS -+PANGOXFT_LIBS -+PANGOFT2_CFLAGS -+PANGOFT2_LIBS -+QT5_CFLAGS -+QT5_LIBS -+Xinerama_CFLAGS -+Xinerama_LIBS -+Xxf86vm_CFLAGS -+Xxf86vm_LIBS -+SM_CFLAGS -+SM_LIBS -+GL_CFLAGS -+GL_LIBS -+GLU_CFLAGS -+GLU_LIBS -+EGL_CFLAGS -+EGL_LIBS -+WAYLAND_EGL_CFLAGS -+WAYLAND_EGL_LIBS -+MesaGL_CFLAGS -+MesaGL_LIBS -+XKBCOMMON_CFLAGS -+XKBCOMMON_LIBS -+LIBSECRET_CFLAGS -+LIBSECRET_LIBS -+GSPELL_CFLAGS -+GSPELL_LIBS -+SDL_CFLAGS -+SDL_LIBS -+GTKPRINT_CFLAGS -+GTKPRINT_LIBS -+GNOMEVFS_CFLAGS -+GNOMEVFS_LIBS -+LIBNOTIFY_CFLAGS -+LIBNOTIFY_LIBS -+XTST_CFLAGS -+XTST_LIBS -+PRIVATE_FONTS_CFLAGS -+PRIVATE_FONTS_LIBS -+WEBKIT_CFLAGS -+WEBKIT_LIBS -+CAIRO_CFLAGS -+CAIRO_LIBS -+GST_CFLAGS -+GST_LIBS' -+ac_subdirs_all='src/expat/expat' -+ -+# Initialize some variables set by options. -+ac_init_help= -+ac_init_version=false -+ac_unrecognized_opts= -+ac_unrecognized_sep= -+# The variables have the same names as the options, with -+# dashes changed to underlines. -+cache_file=/dev/null -+exec_prefix=NONE -+no_create= -+no_recursion= -+prefix=NONE -+program_prefix=NONE -+program_suffix=NONE -+program_transform_name=s,x,x, -+silent= -+site= -+srcdir= -+verbose= -+x_includes=NONE -+x_libraries=NONE -+ -+# Installation directory options. -+# These are left unexpanded so users can "make install exec_prefix=/foo" -+# and all the variables that are supposed to be based on exec_prefix -+# by default will actually change. -+# Use braces instead of parens because sh, perl, etc. also accept them. -+# (The list follows the same order as the GNU Coding Standards.) -+bindir='${exec_prefix}/bin' -+sbindir='${exec_prefix}/sbin' -+libexecdir='${exec_prefix}/libexec' -+datarootdir='${prefix}/share' -+datadir='${datarootdir}' -+sysconfdir='${prefix}/etc' -+sharedstatedir='${prefix}/com' -+localstatedir='${prefix}/var' -+runstatedir='${localstatedir}/run' -+includedir='${prefix}/include' -+oldincludedir='/usr/include' -+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -+infodir='${datarootdir}/info' -+htmldir='${docdir}' -+dvidir='${docdir}' -+pdfdir='${docdir}' -+psdir='${docdir}' -+libdir='${exec_prefix}/lib' -+localedir='${datarootdir}/locale' -+mandir='${datarootdir}/man' -+ -+ac_prev= -+ac_dashdash= -+for ac_option -+do -+ # If the previous option needs an argument, assign it. -+ if test -n "$ac_prev"; then -+ eval $ac_prev=\$ac_option -+ ac_prev= -+ continue -+ fi -+ -+ case $ac_option in -+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -+ *=) ac_optarg= ;; -+ *) ac_optarg=yes ;; -+ esac -+ -+ case $ac_dashdash$ac_option in -+ --) -+ ac_dashdash=yes ;; -+ -+ -bindir | --bindir | --bindi | --bind | --bin | --bi) -+ ac_prev=bindir ;; -+ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) -+ bindir=$ac_optarg ;; -+ -+ -build | --build | --buil | --bui | --bu) -+ ac_prev=build_alias ;; -+ -build=* | --build=* | --buil=* | --bui=* | --bu=*) -+ build_alias=$ac_optarg ;; -+ -+ -cache-file | --cache-file | --cache-fil | --cache-fi \ -+ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) -+ ac_prev=cache_file ;; -+ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ -+ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) -+ cache_file=$ac_optarg ;; -+ -+ --config-cache | -C) -+ cache_file=config.cache ;; -+ -+ -datadir | --datadir | --datadi | --datad) -+ ac_prev=datadir ;; -+ -datadir=* | --datadir=* | --datadi=* | --datad=*) -+ datadir=$ac_optarg ;; -+ -+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ -+ | --dataroo | --dataro | --datar) -+ ac_prev=datarootdir ;; -+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ -+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) -+ datarootdir=$ac_optarg ;; -+ -+ -disable-* | --disable-*) -+ 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'" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval enable_$ac_useropt=no ;; -+ -+ -docdir | --docdir | --docdi | --doc | --do) -+ ac_prev=docdir ;; -+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) -+ docdir=$ac_optarg ;; -+ -+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) -+ ac_prev=dvidir ;; -+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) -+ dvidir=$ac_optarg ;; -+ -+ -enable-* | --enable-*) -+ 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'" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval enable_$ac_useropt=\$ac_optarg ;; -+ -+ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ -+ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -+ | --exec | --exe | --ex) -+ ac_prev=exec_prefix ;; -+ -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ -+ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ -+ | --exec=* | --exe=* | --ex=*) -+ exec_prefix=$ac_optarg ;; -+ -+ -gas | --gas | --ga | --g) -+ # Obsolete; use --with-gas. -+ with_gas=yes ;; -+ -+ -help | --help | --hel | --he | -h) -+ ac_init_help=long ;; -+ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) -+ ac_init_help=recursive ;; -+ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) -+ ac_init_help=short ;; -+ -+ -host | --host | --hos | --ho) -+ ac_prev=host_alias ;; -+ -host=* | --host=* | --hos=* | --ho=*) -+ host_alias=$ac_optarg ;; -+ -+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) -+ ac_prev=htmldir ;; -+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ -+ | --ht=*) -+ htmldir=$ac_optarg ;; -+ -+ -includedir | --includedir | --includedi | --included | --include \ -+ | --includ | --inclu | --incl | --inc) -+ ac_prev=includedir ;; -+ -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ -+ | --includ=* | --inclu=* | --incl=* | --inc=*) -+ includedir=$ac_optarg ;; -+ -+ -infodir | --infodir | --infodi | --infod | --info | --inf) -+ ac_prev=infodir ;; -+ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) -+ infodir=$ac_optarg ;; -+ -+ -libdir | --libdir | --libdi | --libd) -+ ac_prev=libdir ;; -+ -libdir=* | --libdir=* | --libdi=* | --libd=*) -+ libdir=$ac_optarg ;; -+ -+ -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ -+ | --libexe | --libex | --libe) -+ ac_prev=libexecdir ;; -+ -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ -+ | --libexe=* | --libex=* | --libe=*) -+ libexecdir=$ac_optarg ;; -+ -+ -localedir | --localedir | --localedi | --localed | --locale) -+ ac_prev=localedir ;; -+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) -+ localedir=$ac_optarg ;; -+ -+ -localstatedir | --localstatedir | --localstatedi | --localstated \ -+ | --localstate | --localstat | --localsta | --localst | --locals) -+ ac_prev=localstatedir ;; -+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) -+ localstatedir=$ac_optarg ;; -+ -+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -+ ac_prev=mandir ;; -+ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) -+ mandir=$ac_optarg ;; -+ -+ -nfp | --nfp | --nf) -+ # Obsolete; use --without-fp. -+ with_fp=no ;; -+ -+ -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -+ | --no-cr | --no-c | -n) -+ no_create=yes ;; -+ -+ -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -+ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) -+ no_recursion=yes ;; -+ -+ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ -+ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ -+ | --oldin | --oldi | --old | --ol | --o) -+ ac_prev=oldincludedir ;; -+ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ -+ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ -+ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) -+ oldincludedir=$ac_optarg ;; -+ -+ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) -+ ac_prev=prefix ;; -+ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) -+ prefix=$ac_optarg ;; -+ -+ -program-prefix | --program-prefix | --program-prefi | --program-pref \ -+ | --program-pre | --program-pr | --program-p) -+ ac_prev=program_prefix ;; -+ -program-prefix=* | --program-prefix=* | --program-prefi=* \ -+ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) -+ program_prefix=$ac_optarg ;; -+ -+ -program-suffix | --program-suffix | --program-suffi | --program-suff \ -+ | --program-suf | --program-su | --program-s) -+ ac_prev=program_suffix ;; -+ -program-suffix=* | --program-suffix=* | --program-suffi=* \ -+ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) -+ program_suffix=$ac_optarg ;; -+ -+ -program-transform-name | --program-transform-name \ -+ | --program-transform-nam | --program-transform-na \ -+ | --program-transform-n | --program-transform- \ -+ | --program-transform | --program-transfor \ -+ | --program-transfo | --program-transf \ -+ | --program-trans | --program-tran \ -+ | --progr-tra | --program-tr | --program-t) -+ ac_prev=program_transform_name ;; -+ -program-transform-name=* | --program-transform-name=* \ -+ | --program-transform-nam=* | --program-transform-na=* \ -+ | --program-transform-n=* | --program-transform-=* \ -+ | --program-transform=* | --program-transfor=* \ -+ | --program-transfo=* | --program-transf=* \ -+ | --program-trans=* | --program-tran=* \ -+ | --progr-tra=* | --program-tr=* | --program-t=*) -+ program_transform_name=$ac_optarg ;; -+ -+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) -+ ac_prev=pdfdir ;; -+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) -+ pdfdir=$ac_optarg ;; -+ -+ -psdir | --psdir | --psdi | --psd | --ps) -+ ac_prev=psdir ;; -+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) -+ psdir=$ac_optarg ;; -+ -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil) -+ silent=yes ;; -+ -+ -runstatedir | --runstatedir | --runstatedi | --runstated \ -+ | --runstate | --runstat | --runsta | --runst | --runs \ -+ | --run | --ru | --r) -+ ac_prev=runstatedir ;; -+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ -+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ -+ | --run=* | --ru=* | --r=*) -+ runstatedir=$ac_optarg ;; -+ -+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) -+ ac_prev=sbindir ;; -+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -+ | --sbi=* | --sb=*) -+ sbindir=$ac_optarg ;; -+ -+ -sharedstatedir | --sharedstatedir | --sharedstatedi \ -+ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ -+ | --sharedst | --shareds | --shared | --share | --shar \ -+ | --sha | --sh) -+ ac_prev=sharedstatedir ;; -+ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ -+ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ -+ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ -+ | --sha=* | --sh=*) -+ sharedstatedir=$ac_optarg ;; -+ -+ -site | --site | --sit) -+ ac_prev=site ;; -+ -site=* | --site=* | --sit=*) -+ site=$ac_optarg ;; -+ -+ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) -+ ac_prev=srcdir ;; -+ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) -+ srcdir=$ac_optarg ;; -+ -+ -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ -+ | --syscon | --sysco | --sysc | --sys | --sy) -+ ac_prev=sysconfdir ;; -+ -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ -+ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) -+ sysconfdir=$ac_optarg ;; -+ -+ -target | --target | --targe | --targ | --tar | --ta | --t) -+ ac_prev=target_alias ;; -+ -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) -+ target_alias=$ac_optarg ;; -+ -+ -v | -verbose | --verbose | --verbos | --verbo | --verb) -+ verbose=yes ;; -+ -+ -version | --version | --versio | --versi | --vers | -V) -+ ac_init_version=: ;; -+ -+ -with-* | --with-*) -+ 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'" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval with_$ac_useropt=\$ac_optarg ;; -+ -+ -without-* | --without-*) -+ 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'" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval with_$ac_useropt=no ;; -+ -+ --x) -+ # Obsolete; use --with-x. -+ with_x=yes ;; -+ -+ -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ -+ | --x-incl | --x-inc | --x-in | --x-i) -+ ac_prev=x_includes ;; -+ -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ -+ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) -+ x_includes=$ac_optarg ;; -+ -+ -x-libraries | --x-libraries | --x-librarie | --x-librari \ -+ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) -+ ac_prev=x_libraries ;; -+ -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ -+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) -+ x_libraries=$ac_optarg ;; -+ -+ -*) as_fn_error $? "unrecognized option: '$ac_option' -+Try '$0 --help' for more information" -+ ;; -+ -+ *=*) -+ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` -+ # Reject names that are not valid shell variable names. -+ case $ac_envvar in #( -+ '' | [0-9]* | *[!_$as_cr_alnum]* ) -+ as_fn_error $? "invalid variable name: '$ac_envvar'" ;; -+ esac -+ eval $ac_envvar=\$ac_optarg -+ export $ac_envvar ;; -+ -+ *) -+ # FIXME: should be removed in autoconf 3.0. -+ printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 -+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && -+ printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 -+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" -+ ;; -+ -+ esac -+done -+ -+if test -n "$ac_prev"; then -+ ac_option=--`echo $ac_prev | sed 's/_/-/g'` -+ as_fn_error $? "missing argument to $ac_option" -+fi -+ -+if test -n "$ac_unrecognized_opts"; then -+ case $enable_option_checking in -+ no) ;; -+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; -+ *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; -+ esac -+fi -+ -+# Check all directory arguments for consistency. -+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ -+ datadir sysconfdir sharedstatedir localstatedir includedir \ -+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -+ libdir localedir mandir runstatedir -+do -+ eval ac_val=\$$ac_var -+ # Remove trailing slashes. -+ case $ac_val in -+ */ ) -+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` -+ eval $ac_var=\$ac_val;; -+ esac -+ # Be sure to have absolute directory names. -+ case $ac_val in -+ [\\/$]* | ?:[\\/]* ) continue;; -+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; -+ esac -+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" -+done -+ -+# There might be people who depend on the old broken behavior: '$host' -+# used to hold the argument of --host etc. -+# FIXME: To remove some day. -+build=$build_alias -+host=$host_alias -+target=$target_alias -+ -+# FIXME: To remove some day. -+if test "x$host_alias" != x; then -+ if test "x$build_alias" = x; then -+ cross_compiling=maybe -+ elif test "x$build_alias" != "x$host_alias"; then -+ cross_compiling=yes -+ fi -+fi -+ -+ac_tool_prefix= -+test -n "$host_alias" && ac_tool_prefix=$host_alias- -+ -+test "$silent" = yes && exec 6>/dev/null -+ -+ -+ac_pwd=`pwd` && test -n "$ac_pwd" && -+ac_ls_di=`ls -di .` && -+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -+ as_fn_error $? "working directory cannot be determined" -+test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -+ as_fn_error $? "pwd does not report name of working directory" -+ -+ -+# Find the source files, if location was not specified. -+if test -z "$srcdir"; then -+ ac_srcdir_defaulted=yes -+ # Try the directory containing this script, then the parent directory. -+ ac_confdir=`$as_dirname -- "$as_myself" || -+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_myself" : 'X\(//\)[^/]' \| \ -+ X"$as_myself" : 'X\(//\)$' \| \ -+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -+printf "%s\n" X"$as_myself" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ srcdir=$ac_confdir -+ if test ! -r "$srcdir/$ac_unique_file"; then -+ srcdir=.. -+ fi -+else -+ ac_srcdir_defaulted=no -+fi -+if test ! -r "$srcdir/$ac_unique_file"; then -+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" -+fi -+ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work" -+ac_abs_confdir=`( -+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" -+ pwd)` -+# When building in place, set srcdir=. -+if test "$ac_abs_confdir" = "$ac_pwd"; then -+ srcdir=. -+fi -+# Remove unnecessary trailing slashes from srcdir. -+# Double slashes in file names in object file debugging info -+# mess up M-x gdb in Emacs. -+case $srcdir in -+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -+esac -+for ac_var in $ac_precious_vars; do -+ eval ac_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_env_${ac_var}_value=\$${ac_var} -+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_cv_env_${ac_var}_value=\$${ac_var} -+done -+ -+# -+# Report the --help message. -+# -+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 wxWidgets 3.2.6 to adapt to many kinds of systems. -+ -+Usage: $0 [OPTION]... [VAR=VALUE]... -+ -+To assign environment variables (e.g., CC, CFLAGS...), specify them as -+VAR=VALUE. See below for descriptions of some of the useful variables. -+ -+Defaults for the options are specified in brackets. -+ -+Configuration: -+ -h, --help display this help and exit -+ --help=short display options specific to this package -+ --help=recursive display the short help of all the included packages -+ -V, --version display version information and exit -+ -q, --quiet, --silent do not print 'checking ...' messages -+ --cache-file=FILE cache test results in FILE [disabled] -+ -C, --config-cache alias for '--cache-file=config.cache' -+ -n, --no-create do not create output files -+ --srcdir=DIR find the sources in DIR [configure dir or '..'] -+ -+Installation directories: -+ --prefix=PREFIX install architecture-independent files in PREFIX -+ [$ac_default_prefix] -+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -+ [PREFIX] -+ -+By default, 'make install' will install all the files in -+'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify -+an installation prefix other than '$ac_default_prefix' using '--prefix', -+for instance '--prefix=\$HOME'. -+ -+For better control, use the options below. -+ -+Fine tuning of the installation directories: -+ --bindir=DIR user executables [EPREFIX/bin] -+ --sbindir=DIR system admin executables [EPREFIX/sbin] -+ --libexecdir=DIR program executables [EPREFIX/libexec] -+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] -+ --libdir=DIR object code libraries [EPREFIX/lib] -+ --includedir=DIR C header files [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc [/usr/include] -+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -+ --infodir=DIR info documentation [DATAROOTDIR/info] -+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -+ --mandir=DIR man documentation [DATAROOTDIR/man] -+ --docdir=DIR documentation root [DATAROOTDIR/doc/wxwidgets] -+ --htmldir=DIR html documentation [DOCDIR] -+ --dvidir=DIR dvi documentation [DOCDIR] -+ --pdfdir=DIR pdf documentation [DOCDIR] -+ --psdir=DIR ps documentation [DOCDIR] -+_ACEOF -+ -+ cat <<\_ACEOF -+ -+X features: -+ --x-includes=DIR X include files are in DIR -+ --x-libraries=DIR X library files are in DIR -+ -+System types: -+ --build=BUILD configure for building on BUILD [guessed] -+ --host=HOST cross-compile to build programs to run on HOST [BUILD] -+_ACEOF -+fi -+ -+if test -n "$ac_init_help"; then -+ case $ac_init_help in -+ short | recursive ) echo "Configuration of wxWidgets 3.2.6:";; -+ esac -+ cat <<\_ACEOF -+ -+Optional Features: -+ --disable-option-checking ignore unrecognized --enable/--with options -+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) -+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes] -+ --disable-gui don't build GUI parts of the library -+ --enable-monolithic build wxWidgets as single library -+ --enable-plugins build parts of wxWidgets as loadable components -+ --enable-official_build official build of wxWidgets (win32 DLL only) -+ --enable-vendor=VENDOR vendor name (win32 DLL only) -+ --disable-all-features disable all optional features to build minimal library -+ --disable-sys-libs disable use of system libraries for which built-in versions are available -+ --disable-tests disable building tests -+ --enable-universal use wxWidgets GUI controls instead of native ones -+ --enable-nanox use NanoX -+ --enable-gpe use GNOME PDA Environment features if possible -+ --enable-debug build library for debugging -+ --disable-debug_flag disable all debugging support -+ --enable-debug_info generate debug information -+ --enable-debug_gdb create code with extra GDB debugging information -+ --enable-debug_cntxt obsolete, don't use: use wxDebugContext -+ --enable-mem_tracing obsolete, don't use: create code with memory tracing -+ --disable-shared create static library instead of shared -+ --enable-cxx11 use C++11 compiler if available -+ --enable-stl use standard C++ classes for everything -+ --enable-std_containers use standard C++ container classes -+ --enable-std_containers_compat use standard C++ container classes when it can be done compatible -+ --enable-std_iostreams use standard C++ stream classes -+ --enable-std_string use standard C++ string classes -+ --enable-std_string_conv_in_wxstring provide implicit conversion to std::string in wxString -+ --disable-unsafe_conv_in_wxstring disable unsafe implicit conversions in wxString -+ --disable-unicode compile without Unicode support -+ --enable-utf8 use UTF-8 representation for strings (Unix only) -+ --enable-utf8only only support UTF-8 locales in UTF-8 build (Unix only) -+ --enable-extended_rtti use extended RTTI (XTI) -+ --disable-optimise compile without optimisations -+ --enable-profile create code with profiling information -+ --disable-pic don't use position independent code when building static libraries (shared libraries always use PIC) -+ --enable-no_rtti create code without RTTI information -+ --enable-no_exceptions create code without C++ exceptions handling -+ --enable-permissive compile code disregarding strict ANSI -+ --disable-vararg_macros don't use vararg macros, even if they are supported -+ --enable-universal_binary=archs create universal binary for the specified (or all supported) architectures -+ --enable-macosx_arch=ARCH build for just the specified architecture -+ --enable-compat28 enable wxWidgets 2.8 compatibility -+ --disable-compat30 disable wxWidgets 3.0 compatibility -+ --disable-rpath disable use of rpath for uninstalled builds -+ --disable-visibility disable use of ELF symbols visibility even if supported -+ --disable-tls disable use of compiler TLS support -+ --enable-repro-build enable reproducible build mode -+ --enable-pch use precompiled headers if possible (off by default) -+ --enable-intl use internationalization system -+ --enable-xlocale use x-locale support (requires wxLocale) -+ --enable-config use wxConfig (and derived) classes -+ --enable-protocols use wxProtocol and derived classes -+ --enable-ftp use wxFTP (requires wxProtocol -+ --enable-http use wxHTTP (requires wxProtocol -+ --enable-fileproto use wxFileProto class (requires wxProtocol -+ --enable-sockets use socket/network classes -+ --enable-ipv6 enable IPv6 support in wxSocket -+ --enable-ole use OLE classes (Win32 only) -+ --enable-dataobj use data object classes -+ --enable-webrequest use wxWebRequest -+ --enable-ipc use interprocess communication (wxSocket etc.) -+ --enable-baseevtloop use event loop in console programs too -+ --enable-epollloop use wxEpollDispatcher class (Linux only) -+ --enable-selectloop use wxSelectDispatcher class -+ --enable-any use wxAny class -+ --enable-apple_ieee use the Apple IEEE codec -+ --enable-arcstream use wxArchive streams -+ --enable-base64 use base64 encoding/decoding functions -+ --enable-backtrace use wxStackWalker class for getting backtraces -+ --enable-catch_segvs catch signals in wxApp::OnFatalException (Unix only) -+ --enable-cmdline use wxCmdLineParser class -+ --enable-datetime use wxDateTime class -+ --enable-debugreport use wxDebugReport class -+ --enable-dialupman use dialup network classes -+ --enable-dynlib use wxLibrary class for DLL loading -+ --enable-dynamicloader use (new) wxDynamicLibrary class -+ --enable-exceptions build exception-safe library -+ --enable-ffile use wxFFile class -+ --enable-file use wxFile class -+ --enable-filehistory use wxFileHistory class -+ --enable-filesystem use virtual file systems classes -+ --enable-fontenum use wxFontEnumerator class -+ --enable-fontmap use font encodings conversion classes -+ --enable-fs_archive use virtual archive filesystems -+ --enable-fs_inet use virtual HTTP/FTP filesystems -+ --enable-fs_zip now replaced by fs_archive -+ --enable-fsvolume use wxFSVolume class -+ --enable-fswatcher use wxFileSystemWatcher class -+ --enable-geometry use geometry class -+ --enable-log use logging system -+ --enable-longlong use wxLongLong class -+ --enable-mimetype use wxMimeTypesManager -+ --enable-printfposparam use wxVsnprintf() which supports positional parameters -+ --enable-secretstore use wxSecretStore class -+ --enable-snglinst use wxSingleInstanceChecker class -+ --enable-sound use wxSound class -+ --enable-spellcheck enable spell checking in wxTextCtrl -+ --enable-stdpaths use wxStandardPaths class -+ --enable-stopwatch use wxStopWatch class -+ --enable-streams use wxStream etc classes -+ --enable-sysoptions use wxSystemOptions -+ --enable-tarstream use wxTar streams -+ --enable-textbuf use wxTextBuffer class -+ --enable-textfile use wxTextFile class -+ --enable-timer use wxTimer class -+ --enable-variant use wxVariant class -+ --enable-zipstream use wxZip streams -+ --enable-url use wxURL class -+ --enable-protocol use wxProtocol class -+ --enable-protocol-http HTTP support in wxProtocol -+ --enable-protocol-ftp FTP support in wxProtocol -+ --enable-protocol-file FILE support in wxProtocol -+ --enable-threads use threads -+ --enable-dbghelp use dbghelp.dll API (Win32 only) -+ --enable-iniconf use wxIniConfig (Win32 only) -+ --enable-regkey use wxRegKey class (Win32 only) -+ --enable-docview use document view architecture -+ --enable-help use help subsystem -+ --enable-mshtmlhelp use MS HTML Help (win32) -+ --enable-html use wxHTML sub-library -+ --enable-htmlhelp use wxHTML-based help -+ --enable-xrc use XRC resources sub-library -+ --enable-aui use AUI docking library -+ --enable-propgrid use wxPropertyGrid library -+ --enable-ribbon use wxRibbon library -+ --enable-stc use wxStyledTextCtrl library -+ --enable-constraints use layout-constraints system -+ --enable-loggui use standard GUI logger -+ --enable-logwin use wxLogWindow -+ --enable-logdialog use wxLogDialog -+ --enable-mdi use multiple document interface architecture -+ --enable-mdidoc use docview architecture with MDI -+ --enable-mediactrl use wxMediaCtrl class -+ --enable-richtext use wxRichTextCtrl -+ --enable-postscript use wxPostscriptDC device context (default for gtk+) -+ --enable-printarch use printing architecture -+ --enable-svg use wxSVGFileDC device context -+ --enable-webview use wxWebView library -+ --enable-graphics_ctx use graphics context 2D drawing API -+ --enable-graphics-d2d use Direct2D-based graphics context -+ --enable-clipboard use wxClipboard class -+ --enable-dnd use Drag'n'Drop classes -+ --disable-controls disable compilation of all standard controls -+ --enable-markup support wxControl::SetLabelMarkup -+ --enable-accel use accelerators -+ --enable-actindicator use wxActivityIndicator class -+ --enable-addremovectrl use wxAddRemoveCtrl -+ --enable-animatectrl use wxAnimationCtrl class -+ --enable-bannerwindow use wxBannerWindow class -+ --enable-artstd use standard XPM icons in wxArtProvider -+ --enable-arttango use Tango icons in wxArtProvider -+ --enable-bmpbutton use wxBitmapButton class -+ --enable-bmpcombobox use wxBitmapComboBox class -+ --enable-button use wxButton class -+ --enable-calendar use wxCalendarCtrl class -+ --enable-caret use wxCaret class -+ --enable-checkbox use wxCheckBox class -+ --enable-checklst use wxCheckListBox (listbox with checkboxes) class -+ --enable-choice use wxChoice class -+ --enable-choicebook use wxChoicebook class -+ --enable-collpane use wxCollapsiblePane class -+ --enable-colourpicker use wxColourPickerCtrl class -+ --enable-combobox use wxComboBox class -+ --enable-comboctrl use wxComboCtrl class -+ --enable-commandlinkbutton use wxCommmandLinkButton class -+ --enable-dataviewctrl use wxDataViewCtrl class -+ --disable-nativedvc disable use of native wxDataViewCtrl even if available -+ --enable-datepick use wxDatePickerCtrl class -+ --enable-detect_sm use code to detect X11 session manager -+ --enable-dirpicker use wxDirPickerCtrl class -+ --enable-display use wxDisplay class -+ --enable-editablebox use wxEditableListBox class -+ --enable-filectrl use wxFileCtrl class -+ --enable-filepicker use wxFilePickerCtrl class -+ --enable-fontpicker use wxFontPickerCtrl class -+ --enable-gauge use wxGauge class -+ --enable-grid use wxGrid class -+ --enable-headerctrl use wxHeaderCtrl class -+ --enable-hyperlink use wxHyperlinkCtrl class -+ --enable-imaglist use wxImageList class -+ --enable-infobar use wxInfoBar class -+ --enable-listbook use wxListbook class -+ --enable-listbox use wxListBox class -+ --enable-listctrl use wxListCtrl class -+ --enable-notebook use wxNotebook class -+ --enable-notifmsg use wxNotificationMessage class -+ --enable-odcombobox use wxOwnerDrawnComboBox class -+ --enable-popupwin use wxPopUpWindow class -+ --enable-prefseditor use wxPreferencesEditor class -+ --enable-privatefonts provide wxFont::AddPrivateFont() method -+ --enable-radiobox use wxRadioBox class -+ --enable-radiobtn use wxRadioButton class -+ --enable-richmsgdlg use wxRichMessageDialog class -+ --enable-richtooltip use wxRichToolTip class -+ --enable-rearrangectrl use wxRearrangeList/Ctrl/Dialog -+ --enable-sash use wxSashWindow class -+ --enable-scrollbar use wxScrollBar class and scrollable windows -+ --enable-searchctrl use wxSearchCtrl class -+ --enable-slider use wxSlider class -+ --enable-spinbtn use wxSpinButton class -+ --enable-spinctrl use wxSpinCtrl class -+ --enable-splitter use wxSplitterWindow class -+ --enable-statbmp use wxStaticBitmap class -+ --enable-statbox use wxStaticBox class -+ --enable-statline use wxStaticLine class -+ --enable-stattext use wxStaticText class -+ --enable-statusbar use wxStatusBar class -+ --enable-taskbaricon use wxTaskBarIcon class -+ --enable-tbarnative use native wxToolBar class -+ --enable-textctrl use wxTextCtrl class -+ --enable-timepick use wxTimePickerCtrl class -+ --enable-tipwindow use wxTipWindow class -+ --enable-togglebtn use wxToggleButton class -+ --enable-toolbar use wxToolBar class -+ --enable-toolbook use wxToolbook class -+ --enable-treebook use wxTreebook class -+ --enable-treectrl use wxTreeCtrl class -+ --enable-treelist use wxTreeListCtrl class -+ --enable-commondlg use all common dialogs -+ --enable-aboutdlg use wxAboutBox -+ --enable-choicedlg use wxChoiceDialog -+ --enable-coldlg use wxColourDialog -+ --enable-creddlg use wxCredentialEntryDialog -+ --enable-filedlg use wxFileDialog -+ --enable-finddlg use wxFindReplaceDialog -+ --enable-fontdlg use wxFontDialog -+ --enable-dirdlg use wxDirDialog -+ --enable-msgdlg use wxMessageDialog -+ --enable-numberdlg use wxNumberEntryDialog -+ --enable-splash use wxSplashScreen -+ --enable-textdlg use wxTextDialog -+ --enable-tipdlg use startup tips -+ --enable-progressdlg use wxProgressDialog -+ --enable-wizarddlg use wxWizard -+ --enable-menus use wxMenu and wxMenuItem classes -+ --enable-menubar use wxMenuBar class -+ --enable-miniframe use wxMiniFrame class -+ --enable-tooltips use wxToolTip class -+ --enable-splines use spline drawing code -+ --enable-mousewheel use mousewheel -+ --enable-validators use wxValidator and derived classes -+ --enable-busyinfo use wxBusyInfo -+ --enable-hotkey use wxWindow::RegisterHotKey() -+ --enable-joystick use wxJoystick -+ --enable-metafile use wxMetaFile -+ --enable-dragimage use wxDragImage -+ --enable-accessibility enable accessibility support -+ --enable-uiactionsim use wxUIActionSimulator -+ --enable-dctransform use wxDC::SetTransformMatrix and related -+ --enable-webviewwebkit use wxWebView WebKit backend -+ --disable-glcanvasegl disable wxGLCanvas EGL backend -+ --enable-palette use wxPalette class -+ --enable-image use wxImage class -+ --enable-gif use gif images (GIF file format) -+ --enable-pcx use pcx images (PCX file format) -+ --enable-tga use tga images (TGA file format) -+ --enable-iff use iff images (IFF file format) -+ --enable-pnm use pnm images (PNM file format) -+ --enable-xpm use xpm images (XPM file format) -+ --enable-ico_cur use Windows ICO and CUR formats -+ --enable-dccache cache temporary wxDC objects (Win32 only) -+ --enable-ps-in-msw use PS printing in wxMSW (Win32 only) -+ --enable-ownerdrawn use owner drawn controls (Win32 and OS/2 only) -+ --enable-taskbarbutton enable wxTaskBarButton (Win32 only) -+ --enable-uxtheme enable support for Windows XP themed look (Win32 only) -+ --enable-wxdib use wxDIB class (Win32 only) -+ --enable-webviewie use wxWebView IE backend (Win32 only) -+ --enable-webviewedge use wxWebView Edge backend (Win32 only) -+ --enable-autoidman use automatic ids management -+ --disable-largefile omit support for large files -+ --disable-gtktest do not try to compile and run a test GTK+ program -+ --disable-gtktest Do not try to compile and run a test GTK program -+ --disable-sdltest Do not try to compile and run a test SDL program -+ --disable-dependency-tracking -+ don't use dependency tracking even if the compiler -+ can -+ --disable-precomp-headers -+ don't use precompiled headers even if compiler can -+ -+Optional Packages: -+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -+ --without-subdirs don't generate makefiles for samples/demos/... -+ --with-flavour=NAME specify a name to identify this build -+ --with-dpi=none|system|per-monitor set dpi-awareness (Win32 only), default is per-monitor -+ --with-themes=all|list use only the specified comma-separated list of wxUniversal themes -+ --with-gtk[=VERSION] use GTK+, VERSION can be 3 (default), 2, 1 or "any" -+ --with-motif use Motif/Lesstif -+ --with-osx_cocoa use macOS (Cocoa) -+ --with-osx_iphone use iOS -+ --with-osx use macOS (default port, Cocoa) -+ --with-cocoa same as --with-osx_cocoa -+ --with-iphone same as --with-osx_iphone -+ --with-mac same as --with-osx -+ --with-wine use Wine -+ --with-msw use MS-Windows -+ --with-directfb use DirectFB -+ --with-x11 use X11 -+ --with-qt use Qt -+ --with-wasm use WebAssembly -+ --with-libpng use libpng (PNG image format) -+ --with-libjpeg use libjpeg (JPEG file format) -+ --with-libtiff use libtiff (TIFF file format) -+ --without-libjbig don't use libjbig in libtiff even if available -+ --with-libxpm use libxpm (XPM file format) -+ --with-libiconv use libiconv (character conversion) -+ --with-libmspack use libmspack (CHM help files loading) -+ --without-gtkprint don't use GTK printing support -+ --with-gnomevfs use GNOME VFS for associating MIME types -+ --with-libnotify use libnotify for notifications -+ --with-opengl use OpenGL (or Mesa) -+ --with-xtest use XTest extension -+ --with-nanosvg use NanoSVG for rasterizing SVG -+ --with-cairo use Cairo-based wxGraphicsContext implementation -+ --with-dmalloc use dmalloc library (http://dmalloc.com/) -+ --with-sdl use SDL for audio on Unix -+ --with-regex enable support for wxRegEx class -+ --with-liblzma use LZMA compression) -+ --with-zlib use zlib for LZW compression -+ --with-expat enable XML support using expat parser -+ --with-libcurl use libcurl-based wxWebRequest -+ --with-winhttp use WinHTTP-based wxWebRequest -+ --with-urlsession use NSURLSession-based wxWebRequest -+ --with-macosx-sdk=PATH use macOS SDK at PATH -+ --with-macosx-version-min=VER build binaries requiring at least this macOS version (default and lowest supported: 10.10) -+ --with-cxx=11|14|17|20 use the given C++ dialect -+ --with-gtk-prefix=PFX Prefix where GTK is installed (optional) -+ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional) -+ --with-x use the X Window System -+ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib -+ --with-sdl-prefix=PFX Prefix where SDL is installed (optional) -+ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional) -+ -+Some influential environment variables: -+ CC C compiler command -+ CFLAGS C compiler flags -+ LDFLAGS linker flags, e.g. -L if you have libraries in a -+ nonstandard directory -+ LIBS libraries to pass to the linker, e.g. -l -+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if -+ you have headers in a nonstandard directory -+ CXX C++ compiler command -+ CXXFLAGS C++ compiler flags -+ PKG_CONFIG path to pkg-config utility -+ LIBPCRE_CFLAGS -+ C compiler flags for LIBPCRE, overriding pkg-config -+ LIBPCRE_LIBS -+ linker flags for LIBPCRE, overriding pkg-config -+ LIBTIFF_CFLAGS -+ C compiler flags for LIBTIFF, overriding pkg-config -+ LIBTIFF_LIBS -+ linker flags for LIBTIFF, overriding pkg-config -+ LIBCURL_CFLAGS -+ C compiler flags for LIBCURL, overriding pkg-config -+ LIBCURL_LIBS -+ linker flags for LIBCURL, overriding pkg-config -+ DIRECTFB_CFLAGS -+ C compiler flags for DIRECTFB, overriding pkg-config -+ DIRECTFB_LIBS -+ linker flags for DIRECTFB, overriding pkg-config -+ XMKMF Path to xmkmf, Makefile generator for X Window System -+ CPP C preprocessor -+ PANGOXFT_CFLAGS -+ C compiler flags for PANGOXFT, overriding pkg-config -+ PANGOXFT_LIBS -+ linker flags for PANGOXFT, overriding pkg-config -+ PANGOFT2_CFLAGS -+ C compiler flags for PANGOFT2, overriding pkg-config -+ PANGOFT2_LIBS -+ linker flags for PANGOFT2, overriding pkg-config -+ QT5_CFLAGS C compiler flags for QT5, overriding pkg-config -+ QT5_LIBS linker flags for QT5, overriding pkg-config -+ Xinerama_CFLAGS -+ C compiler flags for Xinerama, overriding pkg-config -+ Xinerama_LIBS -+ linker flags for Xinerama, overriding pkg-config -+ Xxf86vm_CFLAGS -+ C compiler flags for Xxf86vm, overriding pkg-config -+ Xxf86vm_LIBS -+ linker flags for Xxf86vm, overriding pkg-config -+ SM_CFLAGS C compiler flags for SM, overriding pkg-config -+ SM_LIBS linker flags for SM, overriding pkg-config -+ GL_CFLAGS C compiler flags for GL, overriding pkg-config -+ GL_LIBS linker flags for GL, overriding pkg-config -+ GLU_CFLAGS C compiler flags for GLU, overriding pkg-config -+ GLU_LIBS linker flags for GLU, overriding pkg-config -+ EGL_CFLAGS C compiler flags for EGL, overriding pkg-config -+ EGL_LIBS linker flags for EGL, overriding pkg-config -+ WAYLAND_EGL_CFLAGS -+ C compiler flags for WAYLAND_EGL, overriding pkg-config -+ WAYLAND_EGL_LIBS -+ linker flags for WAYLAND_EGL, overriding pkg-config -+ MesaGL_CFLAGS -+ C compiler flags for MesaGL, overriding pkg-config -+ MesaGL_LIBS linker flags for MesaGL, overriding pkg-config -+ XKBCOMMON_CFLAGS -+ C compiler flags for XKBCOMMON, overriding pkg-config -+ XKBCOMMON_LIBS -+ linker flags for XKBCOMMON, overriding pkg-config -+ LIBSECRET_CFLAGS -+ C compiler flags for LIBSECRET, overriding pkg-config -+ LIBSECRET_LIBS -+ linker flags for LIBSECRET, overriding pkg-config -+ GSPELL_CFLAGS -+ C compiler flags for GSPELL, overriding pkg-config -+ GSPELL_LIBS linker flags for GSPELL, overriding pkg-config -+ SDL_CFLAGS C compiler flags for SDL, overriding pkg-config -+ SDL_LIBS linker flags for SDL, overriding pkg-config -+ GTKPRINT_CFLAGS -+ C compiler flags for GTKPRINT, overriding pkg-config -+ GTKPRINT_LIBS -+ linker flags for GTKPRINT, overriding pkg-config -+ GNOMEVFS_CFLAGS -+ C compiler flags for GNOMEVFS, overriding pkg-config -+ GNOMEVFS_LIBS -+ linker flags for GNOMEVFS, overriding pkg-config -+ LIBNOTIFY_CFLAGS -+ C compiler flags for LIBNOTIFY, overriding pkg-config -+ LIBNOTIFY_LIBS -+ linker flags for LIBNOTIFY, overriding pkg-config -+ XTST_CFLAGS C compiler flags for XTST, overriding pkg-config -+ XTST_LIBS linker flags for XTST, overriding pkg-config -+ PRIVATE_FONTS_CFLAGS -+ C compiler flags for PRIVATE_FONTS, overriding pkg-config -+ PRIVATE_FONTS_LIBS -+ linker flags for PRIVATE_FONTS, overriding pkg-config -+ WEBKIT_CFLAGS -+ C compiler flags for WEBKIT, overriding pkg-config -+ WEBKIT_LIBS linker flags for WEBKIT, overriding pkg-config -+ CAIRO_CFLAGS -+ C compiler flags for CAIRO, overriding pkg-config -+ CAIRO_LIBS linker flags for CAIRO, overriding pkg-config -+ GST_CFLAGS C compiler flags for GST, overriding pkg-config -+ GST_LIBS linker flags for GST, overriding pkg-config -+ -+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 . -+_ACEOF -+ac_status=$? -+fi -+ -+if test "$ac_init_help" = "recursive"; then -+ # If there are subdirs, report their specific --help. -+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -+ test -d "$ac_dir" || -+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || -+ continue -+ ac_builddir=. -+ -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ 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/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix -+ -+case $srcdir in -+ .) # We are building in place. -+ ac_srcdir=. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. -+ ac_srcdir=$srcdir$ac_dir_suffix; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -+esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -+ -+ cd "$ac_dir" || { ac_status=$?; continue; } -+ # 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 -+ elif test -f "$ac_srcdir/configure"; then -+ echo && -+ $SHELL "$ac_srcdir/configure" --help=recursive -+ else -+ printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -+ fi || ac_status=$? -+ cd "$ac_pwd" || { ac_status=$?; break; } -+ done -+fi -+ -+test -n "$ac_init_help" && exit $ac_status -+if $ac_init_version; then -+ cat <<\_ACEOF -+wxWidgets configure 3.2.6 -+generated by GNU Autoconf 2.72 -+ -+Copyright (C) 2023 Free Software Foundation, Inc. -+This configure script is free software; the Free Software Foundation -+gives unlimited permission to copy, distribute and modify it. -+_ACEOF -+ exit -+fi -+ -+## ------------------------ ## -+## Autoconf initialization. ## -+## ------------------------ ## -+ -+# ac_fn_c_try_compile LINENO -+# -------------------------- -+# Try to compile conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext 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\"" -+printf "%s\n" "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ 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 : -+ ac_retval=0 -+else case e in #( -+ e) printf "%s\n" "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 ;; -+esac -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_compile -+ -+# ac_fn_cxx_try_compile LINENO -+# ---------------------------- -+# Try to compile conftest.$ac_ext, and return whether this succeeded. -+ac_fn_cxx_try_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ 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\"" -+printf "%s\n" "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ 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 : -+ ac_retval=0 -+else case e in #( -+ e) printf "%s\n" "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 ;; -+esac -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_cxx_try_compile -+ -+# ac_fn_c_try_link LINENO -+# ----------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_link () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext conftest.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\"" -+printf "%s\n" "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ 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 : -+ ac_retval=0 -+else case e in #( -+ e) printf "%s\n" "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 ;; -+esac -+fi -+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information -+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would -+ # interfere with the next link command; also delete a directory that is -+ # left behind by Apple's compiler. We do this before executing the actions. -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_link -+ -+# ac_fn_cxx_try_link LINENO -+# ------------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. -+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.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\"" -+printf "%s\n" "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ 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 : -+ ac_retval=0 -+else case e in #( -+ e) printf "%s\n" "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 ;; -+esac -+fi -+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information -+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would -+ # interfere with the next link command; also delete a directory that is -+ # left behind by Apple's compiler. We do this before executing the actions. -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_cxx_try_link -+ -+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -+# ------------------------------------------------------- -+# Tests whether HEADER exists and can be compiled using the include files in -+# INCLUDES, setting the cache variable VAR accordingly. -+ac_fn_c_check_header_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { 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 case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ eval "$3=yes" -+else case e in #( -+ e) eval "$3=no" ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+eval ac_res=\$$3 -+ { 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_cxx_check_header_compile LINENO HEADER VAR INCLUDES -+# --------------------------------------------------------- -+# Tests whether HEADER exists and can be compiled using the include files in -+# INCLUDES, setting the cache variable VAR accordingly. -+ac_fn_cxx_check_header_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { 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 case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ eval "$3=yes" -+else case e in #( -+ e) eval "$3=no" ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+eval ac_res=\$$3 -+ { 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_compile -+ -+# 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 case e in #( -+ e) 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 ;; -+esac -+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_compute_int LINENO EXPR VAR INCLUDES -+# -------------------------------------------- -+# Tries to find the compile-time value of EXPR in a program that includes -+# INCLUDES, setting VAR accordingly. Returns whether the value could be -+# computed -+ac_fn_c_compute_int () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if test "$cross_compiling" = yes; then -+ # Depending upon the size, compute the lo and hi bounds. -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main (void) -+{ -+static int test_array [1 - 2 * !(($2) >= 0)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ ac_lo=0 ac_mid=0 -+ while :; do -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main (void) -+{ -+static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ ac_hi=$ac_mid; break -+else case e in #( -+ e) as_fn_arith $ac_mid + 1 && ac_lo=$as_val -+ if test $ac_lo -le $ac_mid; then -+ ac_lo= ac_hi= -+ break -+ fi -+ as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ done -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main (void) -+{ -+static int test_array [1 - 2 * !(($2) < 0)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ ac_hi=-1 ac_mid=-1 -+ while :; do -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main (void) -+{ -+static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ ac_lo=$ac_mid; break -+else case e in #( -+ e) as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val -+ if test $ac_mid -le $ac_hi; then -+ ac_lo= ac_hi= -+ break -+ fi -+ as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ done -+else case e in #( -+ e) ac_lo= ac_hi= ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+# Binary search between lo and hi bounds. -+while test "x$ac_lo" != "x$ac_hi"; do -+ as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main (void) -+{ -+static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ ac_hi=$ac_mid -+else case e in #( -+ e) as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+done -+case $ac_lo in #(( -+?*) eval "$3=\$ac_lo"; ac_retval=0 ;; -+'') ac_retval=1 ;; -+esac -+ else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+static long int longval (void) { return $2; } -+static unsigned long int ulongval (void) { return $2; } -+#include -+#include -+int -+main (void) -+{ -+ -+ FILE *f = fopen ("conftest.val", "w"); -+ if (! f) -+ return 1; -+ if (($2) < 0) -+ { -+ long int i = longval (); -+ if (i != ($2)) -+ return 1; -+ fprintf (f, "%ld", i); -+ } -+ else -+ { -+ unsigned long int i = ulongval (); -+ if (i != ($2)) -+ return 1; -+ fprintf (f, "%lu", i); -+ } -+ /* Do not output a trailing newline, as this causes \r\n confusion -+ on some platforms. */ -+ return ferror (f) || fclose (f) != 0; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_run "$LINENO" -+then : -+ echo >>conftest.val; read $3 &5 -+printf %s "checking for $2... " >&6; } -+if eval test \${$3+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) eval "$3=no" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main (void) -+{ -+if (sizeof ($2)) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main (void) -+{ -+if (sizeof (($2))) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ -+else case e in #( -+ e) eval "$3=yes" ;; -+esac -+fi -+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 ;; -+esac -+fi -+eval ac_res=\$$3 -+ { 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_type -+ -+# 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 -+ { 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 case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+/* Define $2 to an innocuous variant, in case declares $2. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define $2 innocuous_$2 -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $2 (void); below. */ -+ -+#include -+#undef $2 -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $2 (void); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$2 || defined __stub___$2 -+choke me -+#endif -+ -+int -+main (void) -+{ -+return $2 (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ eval "$3=yes" -+else case e in #( -+ e) eval "$3=no" ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext ;; -+esac -+fi -+eval ac_res=\$$3 -+ { 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 -+ -+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES -+# ------------------------------------------- -+# Tests whether TYPE exists after having included INCLUDES, setting cache -+# variable VAR accordingly. -+ac_fn_c_check_type () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { 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 case e in #( -+ e) eval "$3=no" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main (void) -+{ -+if (sizeof ($2)) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main (void) -+{ -+if (sizeof (($2))) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ -+else case e in #( -+ e) eval "$3=yes" ;; -+esac -+fi -+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 ;; -+esac -+fi -+eval ac_res=\$$3 -+ { 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 -+ -+# 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\"" -+printf "%s\n" "$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 -+ printf "%s\n" "$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 case e in #( -+ e) printf "%s\n" "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 ;; -+esac -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_cpp -+ -+# ac_fn_cxx_try_run LINENO -+# ------------------------ -+# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that -+# executables *can* be run. -+ac_fn_cxx_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 case e in #( -+ e) 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 ;; -+esac -+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_cxx_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 wxWidgets $as_me 3.2.6, which was -+generated by GNU Autoconf 2.72. Invocation command line was -+ -+ $ $0$ac_configure_args_raw -+ -+_ACEOF -+exec 5>>config.log -+{ -+cat <<_ASUNAME -+## --------- ## -+## Platform. ## -+## --------- ## -+ -+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -+uname -m = `(uname -m) 2>/dev/null || echo unknown` -+uname -r = `(uname -r) 2>/dev/null || echo unknown` -+uname -s = `(uname -s) 2>/dev/null || echo unknown` -+uname -v = `(uname -v) 2>/dev/null || echo unknown` -+ -+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -+ -+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -+ -+_ASUNAME -+ -+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 -+ printf "%s\n" "PATH: $as_dir" -+ done -+IFS=$as_save_IFS -+ -+} >&5 -+ -+cat >&5 <<_ACEOF -+ -+ -+## ----------- ## -+## Core tests. ## -+## ----------- ## -+ -+_ACEOF -+ -+ -+# Keep a trace of the command line. -+# Strip out --no-create and --no-recursion so they do not pile up. -+# Strip out --silent because we don't want to record it for future runs. -+# Also quote any args containing shell meta-characters. -+# Make two passes to allow for proper duplicate-argument suppression. -+ac_configure_args= -+ac_configure_args0= -+ac_configure_args1= -+ac_must_keep_next=false -+for ac_pass in 1 2 -+do -+ for ac_arg -+ do -+ case $ac_arg in -+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil) -+ continue ;; -+ *\'*) -+ ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ case $ac_pass in -+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; -+ 2) -+ as_fn_append ac_configure_args1 " '$ac_arg'" -+ if test $ac_must_keep_next = true; then -+ ac_must_keep_next=false # Got value, back to normal. -+ else -+ case $ac_arg in -+ *=* | --config-cache | -C | -disable-* | --disable-* \ -+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ -+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ -+ | -with-* | --with-* | -without-* | --without-* | --x) -+ case "$ac_configure_args0 " in -+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; -+ esac -+ ;; -+ -* ) ac_must_keep_next=true ;; -+ esac -+ fi -+ as_fn_append ac_configure_args " '$ac_arg'" -+ ;; -+ esac -+ done -+done -+{ ac_configure_args0=; unset ac_configure_args0;} -+{ ac_configure_args1=; unset ac_configure_args1;} -+ -+# When interrupted or exit'd, cleanup temporary files, and complete -+# config.log. We remove comments because anyway the quotes in there -+# would cause problems or look ugly. -+# 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 -+ -+ printf "%s\n" "## ---------------- ## -+## Cache variables. ## -+## ---------------- ##" -+ echo -+ # The following way of writing the cache mishandles newlines in values, -+( -+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_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) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done -+ (set) 2>&1 | -+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) -+ sed -n \ -+ "s/'\''/'\''\\\\'\'''\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" -+ ;; #( -+ *) -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" -+ ;; -+ esac | -+ sort -+) -+ echo -+ -+ printf "%s\n" "## ----------------- ## -+## Output variables. ## -+## ----------------- ##" -+ echo -+ for ac_var in $ac_subst_vars -+ do -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ printf "%s\n" "$ac_var='\''$ac_val'\''" -+ done | sort -+ echo -+ -+ if test -n "$ac_subst_files"; then -+ printf "%s\n" "## ------------------- ## -+## File substitutions. ## -+## ------------------- ##" -+ echo -+ for ac_var in $ac_subst_files -+ do -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ printf "%s\n" "$ac_var='\''$ac_val'\''" -+ done | sort -+ echo -+ fi -+ -+ if test -s confdefs.h; then -+ printf "%s\n" "## ----------- ## -+## confdefs.h. ## -+## ----------- ##" -+ echo -+ cat confdefs.h -+ echo -+ fi -+ test "$ac_signal" != 0 && -+ 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 && -+ exit $exit_status -+' 0 -+for ac_signal in 1 2 13 15; do -+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal -+done -+ac_signal=0 -+ -+# confdefs.h avoids OS command line length limits that DEFS can exceed. -+rm -f -r conftest* confdefs.h -+ -+printf "%s\n" "/* confdefs.h */" > confdefs.h -+ -+# Predefined preprocessor variables. -+ -+printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h -+ -+printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h -+ -+printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h -+ -+printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h -+ -+printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h -+ -+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. -+if test -n "$CONFIG_SITE"; then -+ ac_site_files="$CONFIG_SITE" -+elif test "x$prefix" != xNONE; then -+ ac_site_files="$prefix/share/config.site $prefix/etc/config.site" -+else -+ ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -+fi -+ -+for ac_site_file in $ac_site_files -+do -+ 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" \ -+ || { { 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 -+done -+ -+if test -r "$cache_file"; then -+ # Some versions of bash will fail to source /dev/null (special files -+ # actually), so we avoid doing that. DJGPP emulates it as a regular file. -+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then -+ { 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 -+ { 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 -+ -+# 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 (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; -+} -+ -+/* C89 style stringification. */ -+#define noexpand_stringify(a) #a -+const char *stringified = noexpand_stringify(arbitrary+token=sequence); -+ -+/* C89 style token pasting. Exercises some of the corner cases that -+ e.g. old MSVC gets wrong, but not very hard. */ -+#define noexpand_concat(a,b) a##b -+#define expand_concat(a,b) noexpand_concat(a,b) -+extern int vA; -+extern int vbee; -+#define aye A -+#define bee B -+int *pvA = &expand_concat(v,aye); -+int *pvbee = &noexpand_concat(v,bee); -+ -+/* 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 -+ -+// See if C++-style comments work. -+ -+#include -+extern int puts (const char *); -+extern int printf (const char *, ...); -+extern int dprintf (int, const char *, ...); -+extern void *malloc (size_t); -+extern void free (void *); -+ -+// 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) -+{ -+ // 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; -+ // Work around memory leak warnings. -+ free (ia); -+ -+ // 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; -+} -+" -+ -+# 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 " 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" -+ -+# Auxiliary files required by this configure script. -+ac_aux_files="install-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 case e in #( -+ e) as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 ;; -+esac -+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 -+for ac_var in $ac_precious_vars; do -+ eval ac_old_set=\$ac_cv_env_${ac_var}_set -+ eval ac_new_set=\$ac_env_${ac_var}_set -+ eval ac_old_val=\$ac_cv_env_${ac_var}_value -+ eval ac_new_val=\$ac_env_${ac_var}_value -+ case $ac_old_set,$ac_new_set in -+ set,) -+ { 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) -+ { 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=: ;; -+ ,);; -+ *) -+ if test "x$ac_old_val" != "x$ac_new_val"; then -+ # differences in whitespace do not lead to failure. -+ 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 -+ { 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 -+ { 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 -+ { 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=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *) ac_arg=$ac_var=$ac_new_val ;; -+ esac -+ case " $ac_configure_args " in -+ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -+ *) as_fn_append ac_configure_args " '$ac_arg'" ;; -+ esac -+ fi -+done -+if $ac_cache_corrupted; then -+ { 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. ## -+## -------------------- ## -+ -+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 -+ -+ -+ -+ -+ -+ -+ -+ -+ # 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 -+ -+{ 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 case e in #( -+ e) ac_build_alias=$build_alias -+test "x$ac_build_alias" = x && -+ ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` -+test "x$ac_build_alias" = x && -+ as_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 -+ ;; -+esac -+fi -+{ 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;; -+esac -+build=$ac_cv_build -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_build -+shift -+build_cpu=$1 -+build_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+build_os=$* -+IFS=$ac_save_IFS -+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -+ -+ -+{ 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 case e in #( -+ e) 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 -+fi -+ ;; -+esac -+fi -+{ 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;; -+esac -+host=$ac_cv_host -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_host -+shift -+host_cpu=$1 -+host_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+host_os=$* -+IFS=$ac_save_IFS -+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -+ -+ -+ -+if test "$cross_compiling" != "no"; then -+ HOST_PREFIX="${host_alias}-" -+ HOST_SUFFIX="-$host_alias" -+else -+ HOST_PREFIX= -+ HOST_SUFFIX= -+fi -+ -+ -+wx_major_version_number=3 -+wx_minor_version_number=2 -+wx_release_number=6 -+wx_subrelease_number=0 -+ -+WX_RELEASE=$wx_major_version_number.$wx_minor_version_number -+WX_VERSION=$WX_RELEASE.$wx_release_number -+WX_SUBVERSION=$WX_VERSION.$wx_subrelease_number -+ -+WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number -+ -+ -+wx_top_builddir="`pwd -W 2> /dev/null || pwd`" -+ -+ -+ -+USER_CPPFLAGS=$CPPFLAGS -+USER_CFLAGS=$CFLAGS -+USER_CXXFLAGS=$CXXFLAGS -+USER_LDFLAGS=$LDFLAGS -+ -+ -+USE_UNIX=1 -+USE_WIN32=0 -+USE_DOS=0 -+USE_BEOS=0 -+USE_MAC=0 -+USE_WASM=0 -+ -+USE_AIX= -+USE_BSD= USE_DARWIN= USE_FREEBSD= -+USE_GNU= USE_HPUX= -+USE_LINUX= -+USE_NETBSD= -+USE_OPENBSD= -+USE_OSF= USE_SGI= -+USE_SOLARIS= USE_SUN= USE_SUNOS= USE_SVR4= USE_SYSV= USE_VMS= -+USE_ULTRIX= -+USE_UNIXWARE= -+USE_HAIKU= -+ -+USE_ALPHA= -+ -+NEEDS_D_REENTRANT_FOR_R_FUNCS=0 -+ -+ALL_TOOLKITS="GTK OSX_COCOA OSX_IPHONE MOTIF MSW X11 DFB QT WASM" -+ -+DEFAULT_wxUSE_GTK=0 -+DEFAULT_wxUSE_OSX_COCOA=0 -+DEFAULT_wxUSE_OSX_IPHONE=0 -+DEFAULT_wxUSE_MOTIF=0 -+DEFAULT_wxUSE_MSW=0 -+DEFAULT_wxUSE_X11=0 -+DEFAULT_wxUSE_DFB=0 -+DEFAULT_wxUSE_QT=0 -+DEFAULT_wxUSE_WASM=0 -+ -+DEFAULT_DEFAULT_wxUSE_GTK=0 -+DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0 -+DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=0 -+DEFAULT_DEFAULT_wxUSE_MOTIF=0 -+DEFAULT_DEFAULT_wxUSE_MSW=0 -+DEFAULT_DEFAULT_wxUSE_X11=0 -+DEFAULT_DEFAULT_wxUSE_DFB=0 -+DEFAULT_DEFAULT_wxUSE_QT=0 -+DEFAULT_DEFAULT_wxUSE_WASM=0 -+ -+PROGRAM_EXT= -+SAMPLES_CXXFLAGS= -+SAMPLES_RPATH_FLAG= -+DYLIB_RPATH_INSTALL= -+DYLIB_RPATH_POSTLINK= -+ -+DEFAULT_STD_FLAG=yes -+ -+case "${host}" in -+ *-hp-hpux* ) -+ USE_HPUX=1 -+ DEFAULT_DEFAULT_wxUSE_GTK=1 -+ NEEDS_D_REENTRANT_FOR_R_FUNCS=1 -+ printf "%s\n" "#define __HPUX__ 1" >>confdefs.h -+ -+ -+ CPPFLAGS="-D_HPUX_SOURCE $CPPFLAGS" -+ ;; -+ *-*-linux* ) -+ USE_LINUX=1 -+ printf "%s\n" "#define __LINUX__ 1" >>confdefs.h -+ -+ TMP=`uname -m` -+ if test "x$TMP" = "xalpha"; then -+ USE_ALPHA=1 -+ printf "%s\n" "#define __ALPHA__ 1" >>confdefs.h -+ -+ fi -+ DEFAULT_DEFAULT_wxUSE_GTK=1 -+ ;; -+ *-*-gnu* | *-*-k*bsd*-gnu ) -+ USE_GNU=1 -+ TMP=`uname -m` -+ if test "x$TMP" = "xalpha"; then -+ USE_ALPHA=1 -+ printf "%s\n" "#define __ALPHA__ 1" >>confdefs.h -+ -+ fi -+ DEFAULT_DEFAULT_wxUSE_GTK=1 -+ ;; -+ *-*-irix5* | *-*-irix6* ) -+ USE_SGI=1 -+ USE_SVR4=1 -+ printf "%s\n" "#define __SGI__ 1" >>confdefs.h -+ -+ printf "%s\n" "#define __SVR4__ 1" >>confdefs.h -+ -+ DEFAULT_DEFAULT_wxUSE_GTK=1 -+ ;; -+ *-*-qnx*) -+ USE_QNX=1 -+ printf "%s\n" "#define __QNX__ 1" >>confdefs.h -+ -+ DEFAULT_DEFAULT_wxUSE_X11=1 -+ ;; -+ *-*-solaris2* ) -+ USE_SUN=1 -+ USE_SOLARIS=1 -+ USE_SVR4=1 -+ printf "%s\n" "#define __SUN__ 1" >>confdefs.h -+ -+ printf "%s\n" "#define __SOLARIS__ 1" >>confdefs.h -+ -+ printf "%s\n" "#define __SVR4__ 1" >>confdefs.h -+ -+ DEFAULT_DEFAULT_wxUSE_GTK=1 -+ NEEDS_D_REENTRANT_FOR_R_FUNCS=1 -+ ;; -+ *-*-sunos4* ) -+ USE_SUN=1 -+ USE_SUNOS=1 -+ USE_BSD=1 -+ printf "%s\n" "#define __SUN__ 1" >>confdefs.h -+ -+ printf "%s\n" "#define __SUNOS__ 1" >>confdefs.h -+ -+ printf "%s\n" "#define __BSD__ 1" >>confdefs.h -+ -+ DEFAULT_DEFAULT_wxUSE_GTK=1 -+ ;; -+ *-*-freebsd*) -+ USE_BSD=1 -+ USE_FREEBSD=1 -+ printf "%s\n" "#define __FREEBSD__ 1" >>confdefs.h -+ -+ printf "%s\n" "#define __BSD__ 1" >>confdefs.h -+ -+ DEFAULT_DEFAULT_wxUSE_GTK=1 -+ ;; -+ *-*-openbsd*|*-*-mirbsd*) -+ USE_BSD=1 -+ USE_OPENBSD=1 -+ printf "%s\n" "#define __OPENBSD__ 1" >>confdefs.h -+ -+ printf "%s\n" "#define __BSD__ 1" >>confdefs.h -+ -+ DEFAULT_DEFAULT_wxUSE_GTK=1 -+ ;; -+ *-*-netbsd*) -+ USE_BSD=1 -+ USE_NETBSD=1 -+ printf "%s\n" "#define __NETBSD__ 1" >>confdefs.h -+ -+ printf "%s\n" "#define __BSD__ 1" >>confdefs.h -+ -+ DEFAULT_DEFAULT_wxUSE_GTK=1 -+ NEEDS_D_REENTRANT_FOR_R_FUNCS=1 -+ -+ CPPFLAGS="-D_NETBSD_SOURCE -D_LIBC $CPPFLAGS" -+ ;; -+ *-*-osf* ) -+ USE_ALPHA=1 -+ USE_OSF=1 -+ printf "%s\n" "#define __ALPHA__ 1" >>confdefs.h -+ -+ printf "%s\n" "#define __OSF__ 1" >>confdefs.h -+ -+ DEFAULT_DEFAULT_wxUSE_GTK=1 -+ NEEDS_D_REENTRANT_FOR_R_FUNCS=1 -+ ;; -+ *-*-dgux5* ) -+ USE_ALPHA=1 -+ USE_SVR4=1 -+ printf "%s\n" "#define __ALPHA__ 1" >>confdefs.h -+ -+ printf "%s\n" "#define __SVR4__ 1" >>confdefs.h -+ -+ DEFAULT_DEFAULT_wxUSE_GTK=1 -+ ;; -+ *-*-sysv5* ) -+ USE_SYSV=1 -+ USE_SVR4=1 -+ printf "%s\n" "#define __SYSV__ 1" >>confdefs.h -+ -+ printf "%s\n" "#define __SVR4__ 1" >>confdefs.h -+ -+ DEFAULT_DEFAULT_wxUSE_GTK=1 -+ ;; -+ *-*-aix* ) -+ USE_AIX=1 -+ USE_SYSV=1 -+ USE_SVR4=1 -+ printf "%s\n" "#define __AIX__ 1" >>confdefs.h -+ -+ printf "%s\n" "#define __SYSV__ 1" >>confdefs.h -+ -+ printf "%s\n" "#define __SVR4__ 1" >>confdefs.h -+ -+ DEFAULT_DEFAULT_wxUSE_GTK=1 -+ ;; -+ -+ *-*-*UnixWare*) -+ USE_SYSV=1 -+ USE_SVR4=1 -+ USE_UNIXWARE=1 -+ printf "%s\n" "#define __UNIXWARE__ 1" >>confdefs.h -+ -+ ;; -+ -+ *-*-cygwin* | *-*-mingw32* | *-*-mingw64* ) -+ PROGRAM_EXT=".exe" -+ DEFAULT_DEFAULT_wxUSE_MSW=1 -+ ;; -+ -+ *-*-darwin* ) -+ USE_BSD=1 -+ USE_DARWIN=1 -+ printf "%s\n" "#define __BSD__ 1" >>confdefs.h -+ -+ printf "%s\n" "#define __DARWIN__ 1" >>confdefs.h -+ -+ DEFAULT_DEFAULT_wxUSE_OSX_COCOA=1 -+ ;; -+ -+ *-*-beos* ) -+ USE_BEOS=1 -+ printf "%s\n" "#define __BEOS__ 1" >>confdefs.h -+ -+ ;; -+ -+ *-*-haiku* ) -+ USE_HAIKU=1 -+ printf "%s\n" "#define __HAIKU__ 1" >>confdefs.h -+ -+ DEFAULT_DEFAULT_wxUSE_QT=1 -+ ;; -+ -+ *-*-emscripten* ) -+ USE_WASM=1 -+ printf "%s\n" "#define __WASM__ 1" >>confdefs.h -+ -+ DEFAULT_DEFAULT_wxUSE_WASM=1 -+ PROGRAM_EXT=".js" -+ ;; -+ -+ *) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** System type ${host} is unknown, assuming generic Unix and continuing nevertheless." >&5 -+printf "%s\n" "$as_me: WARNING: *** System type ${host} is unknown, assuming generic Unix and continuing nevertheless." >&2;} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** Please report the build results to wx-dev@googlegroups.com." >&5 -+printf "%s\n" "$as_me: WARNING: *** Please report the build results to wx-dev@googlegroups.com." >&2;} -+ -+ DEFAULT_DEFAULT_wxUSE_X11=1 -+ DEFAULT_wxUSE_SHARED=no -+esac -+ -+ -+ -+DEFAULT_wxUSE_ALL_FEATURES=yes -+ -+DEFAULT_wxUSE_STD_CONTAINERS=no -+DEFAULT_wxUSE_STD_CONTAINERS_COMPATIBLY=$DEFAULT_STD_FLAG -+DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG -+DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG -+ -+DEFAULT_wxUSE_DMALLOC=no -+DEFAULT_wxUSE_LIBCURL=auto -+DEFAULT_wxUSE_LIBGNOMEVFS=no -+DEFAULT_wxUSE_LIBMSPACK=no -+DEFAULT_wxUSE_LIBSDL=no -+DEFAULT_wxUSE_LIBLZMA=no -+DEFAULT_wxUSE_CAIRO=no -+ -+DEFAULT_wxUSE_ACCESSIBILITY=no -+DEFAULT_wxUSE_UNICODE_UTF8=no -+DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no -+ -+DEFAULT_wxUSE_ARTPROVIDER_TANGO=auto -+DEFAULT_wxUSE_COMPILER_TLS=auto -+DEFAULT_wxUSE_HOTKEY=auto -+DEFAULT_wxUSE_MEDIACTRL=auto -+DEFAULT_wxUSE_METAFILE=auto -+DEFAULT_wxUSE_OPENGL=auto -+DEFAULT_wxUSE_WEBVIEW_EDGE=no -+ -+DEFAULT_wxUSE_UNIVERSAL_BINARY=no -+DEFAULT_wxUSE_MAC_ARCH=no -+ -+DEFAULT_wxUSE_OFFICIAL_BUILD=no -+ -+DEFAULT_wxUSE_OBJC_UNIQUIFYING=no -+ -+ -+ -+ -+ -+ enablestring=disable -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-gui was given. -+if test ${enable_gui+y} -+then : -+ enableval=$enable_gui; -+ if test "$enableval" = yes; then -+ wx_cv_use_gui='wxUSE_GUI=yes' -+ else -+ wx_cv_use_gui='wxUSE_GUI=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_gui" -+ -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-monolithic was given. -+if test ${enable_monolithic+y} -+then : -+ enableval=$enable_monolithic; -+ if test "$enableval" = yes; then -+ wx_cv_use_monolithic='wxUSE_MONOLITHIC=yes' -+ else -+ wx_cv_use_monolithic='wxUSE_MONOLITHIC=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_monolithic" -+ -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-plugins was given. -+if test ${enable_plugins+y} -+then : -+ enableval=$enable_plugins; -+ if test "$enableval" = yes; then -+ wx_cv_use_plugins='wxUSE_PLUGINS=yes' -+ else -+ wx_cv_use_plugins='wxUSE_PLUGINS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_plugins" -+ -+ -+ withstring=without -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$withstring" = xwithout; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+# Check whether --with-subdirs was given. -+if test ${with_subdirs+y} -+then : -+ withval=$with_subdirs; -+ if test "$withval" = yes; then -+ wx_cv_use_subdirs='wxWITH_SUBDIRS=yes' -+ else -+ wx_cv_use_subdirs='wxWITH_SUBDIRS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_subdirs" -+ -+ -+# Check whether --with-flavour was given. -+if test ${with_flavour+y} -+then : -+ withval=$with_flavour; WX_FLAVOUR="$withval" -+fi -+ -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-official_build was given. -+if test ${enable_official_build+y} -+then : -+ enableval=$enable_official_build; -+ if test "$enableval" = yes; then -+ wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=yes' -+ else -+ wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=${'DEFAULT_wxUSE_OFFICIAL_BUILD":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_official_build" -+ -+# Check whether --enable-vendor was given. -+if test ${enable_vendor+y} -+then : -+ enableval=$enable_vendor; VENDOR="$enableval" -+fi -+ -+if test "x$VENDOR" = "x"; then -+ VENDOR="custom" -+fi -+ -+ -+ enablestring=disable -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-all-features was given. -+if test ${enable_all_features+y} -+then : -+ enableval=$enable_all_features; -+ if test "$enableval" = yes; then -+ wx_cv_use_all_features='wxUSE_ALL_FEATURES=yes' -+ else -+ wx_cv_use_all_features='wxUSE_ALL_FEATURES=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_all_features" -+ -+ -+ enablestring=disable -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-sys-libs was given. -+if test ${enable_sys_libs+y} -+then : -+ enableval=$enable_sys_libs; -+ if test "$enableval" = yes; then -+ wx_cv_use_sys_libs='wxUSE_SYS_LIBS=yes' -+ else -+ wx_cv_use_sys_libs='wxUSE_SYS_LIBS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_sys_libs='wxUSE_SYS_LIBS=${'DEFAULT_wxUSE_SYS_LIBS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_sys_libs" -+ -+ -+ enablestring=disable -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-tests was given. -+if test ${enable_tests+y} -+then : -+ enableval=$enable_tests; -+ if test "$enableval" = yes; then -+ wx_cv_use_tests='wxUSE_TESTS_SUBDIR=yes' -+ else -+ wx_cv_use_tests='wxUSE_TESTS_SUBDIR=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_tests='wxUSE_TESTS_SUBDIR=${'DEFAULT_wxUSE_TESTS_SUBDIR":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_tests" -+ -+ -+if test "$wxUSE_ALL_FEATURES" = "no"; then -+ DEFAULT_wxUSE_ARTPROVIDER_TANGO=no -+ DEFAULT_wxUSE_MEDIACTRL=no -+fi -+ -+ -+# Check whether --with-dpi was given. -+if test ${with_dpi+y} -+then : -+ withval=$with_dpi; wxWITH_DPI_MANIFEST="$withval" -+fi -+ -+ -+ -+if test "$wxUSE_GUI" = "yes"; then -+ -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-universal was given. -+if test ${enable_universal+y} -+then : -+ enableval=$enable_universal; -+ if test "$enableval" = yes; then -+ wx_cv_use_universal='wxUSE_UNIVERSAL=yes' -+ else -+ wx_cv_use_universal='wxUSE_UNIVERSAL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_universal" -+ -+if test "$wxUSE_UNIVERSAL" = "yes"; then -+ -+# Check whether --with-themes was given. -+if test ${with_themes+y} -+then : -+ withval=$with_themes; wxUNIV_THEMES="$withval" -+fi -+ -+fi -+ -+ -+# Check whether --with-gtk was given. -+if test ${with_gtk+y} -+then : -+ withval=$with_gtk; wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1 -+fi -+ -+ -+ -+# Check whether --with-motif was given. -+if test ${with_motif+y} -+then : -+ withval=$with_motif; -+ if test "$withval" != yes; then -+ as_fn_error $? "Option --with-motif doesn't accept any arguments" "$LINENO" 5 -+ fi -+ wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1 -+ -+fi -+ -+ -+ -+ -+# Check whether --with-osx_cocoa was given. -+if test ${with_osx_cocoa+y} -+then : -+ withval=$with_osx_cocoa; -+ if test "$withval" != yes; then -+ as_fn_error $? "Option --with-osx_cocoa doesn't accept any arguments" "$LINENO" 5 -+ fi -+ wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1 -+ -+fi -+ -+ -+ -+ -+# Check whether --with-osx_iphone was given. -+if test ${with_osx_iphone+y} -+then : -+ withval=$with_osx_iphone; -+ if test "$withval" != yes; then -+ as_fn_error $? "Option --with-osx_iphone doesn't accept any arguments" "$LINENO" 5 -+ fi -+ wxUSE_OSX_IPHONE="$withval" CACHE_OSX_IPHONE=1 TOOLKIT_GIVEN=1 -+ -+fi -+ -+ -+ -+ -+# Check whether --with-osx was given. -+if test ${with_osx+y} -+then : -+ withval=$with_osx; -+ if test "$withval" != yes; then -+ as_fn_error $? "Option --with-osx doesn't accept any arguments" "$LINENO" 5 -+ fi -+ wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1 -+ -+fi -+ -+ -+ -+ -+# Check whether --with-cocoa was given. -+if test ${with_cocoa+y} -+then : -+ withval=$with_cocoa; -+ if test "$withval" != yes; then -+ as_fn_error $? "Option --with-cocoa doesn't accept any arguments" "$LINENO" 5 -+ fi -+ wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1 -+ -+fi -+ -+ -+ -+ -+# Check whether --with-iphone was given. -+if test ${with_iphone+y} -+then : -+ withval=$with_iphone; -+ if test "$withval" != yes; then -+ as_fn_error $? "Option --with-iphone doesn't accept any arguments" "$LINENO" 5 -+ fi -+ wxUSE_OSX_IPHONE="$withval" CACHE_OSX_IPHONE=1 TOOLKIT_GIVEN=1 -+ -+fi -+ -+ -+ -+ -+# Check whether --with-mac was given. -+if test ${with_mac+y} -+then : -+ withval=$with_mac; -+ if test "$withval" != yes; then -+ as_fn_error $? "Option --with-mac doesn't accept any arguments" "$LINENO" 5 -+ fi -+ wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1 -+ -+fi -+ -+ -+ -+ -+# Check whether --with-wine was given. -+if test ${with_wine+y} -+then : -+ withval=$with_wine; -+ if test "$withval" != yes; then -+ as_fn_error $? "Option --with-wine doesn't accept any arguments" "$LINENO" 5 -+ fi -+ wxUSE_WINE="$withval" CACHE_WINE=1 -+ -+fi -+ -+ -+ -+ -+# Check whether --with-msw was given. -+if test ${with_msw+y} -+then : -+ withval=$with_msw; -+ if test "$withval" != yes; then -+ as_fn_error $? "Option --with-msw doesn't accept any arguments" "$LINENO" 5 -+ fi -+ wxUSE_MSW="$withval" CACHE_MSW=1 TOOLKIT_GIVEN=1 -+ -+fi -+ -+ -+ -+ -+# Check whether --with-directfb was given. -+if test ${with_directfb+y} -+then : -+ withval=$with_directfb; -+ if test "$withval" != yes; then -+ as_fn_error $? "Option --with-directfb doesn't accept any arguments" "$LINENO" 5 -+ fi -+ wxUSE_DFB="$withval" wxUSE_UNIVERSAL="yes" CACHE_DFB=1 TOOLKIT_GIVEN=1 -+ -+fi -+ -+ -+ -+ -+# Check whether --with-x11 was given. -+if test ${with_x11+y} -+then : -+ withval=$with_x11; -+ if test "$withval" != yes; then -+ as_fn_error $? "Option --with-x11 doesn't accept any arguments" "$LINENO" 5 -+ fi -+ wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1 -+ -+fi -+ -+ -+ -+ -+# Check whether --with-qt was given. -+if test ${with_qt+y} -+then : -+ withval=$with_qt; -+ if test "$withval" != yes; then -+ as_fn_error $? "Option --with-qt doesn't accept any arguments" "$LINENO" 5 -+ fi -+ wxUSE_QT="$withval" CACHE_QT=1 TOOLKIT_GIVEN=1 -+ -+fi -+ -+ -+ -+ -+# Check whether --with-wasm was given. -+if test ${with_wasm+y} -+then : -+ withval=$with_wasm; -+ if test "$withval" != yes; then -+ as_fn_error $? "Option --with-wasm doesn't accept any arguments" "$LINENO" 5 -+ fi -+ wxUSE_WASM="$withval" CACHE_WASM=1 TOOLKIT_GIVEN=1 -+ -+fi -+ -+ -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-nanox was given. -+if test ${enable_nanox+y} -+then : -+ enableval=$enable_nanox; -+ if test "$enableval" = yes; then -+ wx_cv_use_nanox='wxUSE_NANOX=yes' -+ else -+ wx_cv_use_nanox='wxUSE_NANOX=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_nanox" -+ -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-gpe was given. -+if test ${enable_gpe+y} -+then : -+ enableval=$enable_gpe; -+ if test "$enableval" = yes; then -+ wx_cv_use_gpe='wxUSE_GPE=yes' -+ else -+ wx_cv_use_gpe='wxUSE_GPE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_gpe" -+ -+ -+ -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for toolkit" >&5 -+printf %s "checking for toolkit... " >&6; } -+ -+ -+ -+# In Wine, we need to default to MSW, not GTK or MOTIF -+if test "$wxUSE_WINE" = "yes"; then -+ DEFAULT_DEFAULT_wxUSE_GTK=0 -+ DEFAULT_DEFAULT_wxUSE_MOTIF=0 -+ DEFAULT_DEFAULT_wxUSE_MSW=1 -+ wxUSE_SHARED=no -+ CC=${CC:-winegcc} -+ CXX=${CXX:-wineg++} -+fi -+ -+ -+if test "$wxUSE_GUI" = "yes"; then -+ -+ if test "$USE_BEOS" = 1; then -+ as_fn_error $? "BeOS GUI is not supported yet, use --disable-gui" "$LINENO" 5 -+ fi -+ -+ if test "$TOOLKIT_GIVEN" = 1; then -+ for toolkit in $ALL_TOOLKITS; do -+ var=wxUSE_$toolkit -+ eval "value=\$${var}" -+ if test "x$value" = "xno"; then -+ eval "$var=0" -+ elif test "x$value" != "x"; then -+ eval "$var=1" -+ fi -+ -+ if test "x$value" != "x" -a "x$value" != "xyes" -a "x$value" != "xno"; then -+ eval "wx${toolkit}_VERSION=$value" -+ fi -+ done -+ else -+ for toolkit in $ALL_TOOLKITS; do -+ var=DEFAULT_DEFAULT_wxUSE_$toolkit -+ eval "wxUSE_$toolkit=\$${var}" -+ done -+ fi -+ -+ NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} \ -+ + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_DFB:-0} \ -+ + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} \ -+ + ${wxUSE_X11:-0} + ${wxUSE_QT:-0} + ${wxUSE_WASM:-0}` -+ -+ -+ case "$NUM_TOOLKITS" in -+ 1) -+ ;; -+ 0) -+ as_fn_error $? "Please specify a toolkit -- cannot determine the default for ${host}" "$LINENO" 5 -+ ;; -+ *) -+ as_fn_error $? "Please specify at most one toolkit" "$LINENO" 5 -+ esac -+ -+ for toolkit in $ALL_TOOLKITS; do -+ var=wxUSE_$toolkit -+ eval "value=\$${var}" -+ if test "$value" = 1; then -+ toolkit_echo=`echo $toolkit | tr '[A-Z]' '[a-z]'` -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $toolkit_echo" >&5 -+printf "%s\n" "$toolkit_echo" >&6; } -+ fi -+ done -+else -+ if test "x$host_alias" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: base ($host_alias hosted) only" >&5 -+printf "%s\n" "base ($host_alias hosted) only" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: base only" >&5 -+printf "%s\n" "base only" >&6; } -+ fi -+fi -+ -+wxUSE_MAC=0 -+if test "$wxUSE_OSX_COCOA" = 1 \ -+ -o "$wxUSE_OSX_IPHONE" = 1; then -+ wxUSE_MAC=1 -+fi -+ -+ -+ -+ -+# Check whether --with-libpng was given. -+if test ${with_libpng+y} -+then : -+ withval=$with_libpng; -+ if test "$withval" = yes; then -+ wx_cv_use_libpng='wxUSE_LIBPNG=yes' -+ elif test "$withval" = no; then -+ wx_cv_use_libpng='wxUSE_LIBPNG=no' -+ elif test "$withval" = sys; then -+ wx_cv_use_libpng='wxUSE_LIBPNG=sys' -+ elif test "$withval" = builtin; then -+ wx_cv_use_libpng='wxUSE_LIBPNG=builtin' -+ else -+ as_fn_error $? "Invalid value for --with-libpng: should be yes, no, sys, or builtin" "$LINENO" 5 -+ fi -+ -+else case e in #( -+ e) -+ if test "DEFAULT_wxUSE_LIBPNG" = no; then -+ value=no -+ elif test "$wxUSE_ALL_FEATURES" = no; then -+ value=no -+ elif test "$wxUSE_SYS_LIBS" = no; then -+ value=builtin -+ else -+ value=yes -+ fi -+ -+ wx_cv_use_libpng="wxUSE_LIBPNG=$value" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_libpng" -+ -+ -+ -+# Check whether --with-libjpeg was given. -+if test ${with_libjpeg+y} -+then : -+ withval=$with_libjpeg; -+ if test "$withval" = yes; then -+ wx_cv_use_libjpeg='wxUSE_LIBJPEG=yes' -+ elif test "$withval" = no; then -+ wx_cv_use_libjpeg='wxUSE_LIBJPEG=no' -+ elif test "$withval" = sys; then -+ wx_cv_use_libjpeg='wxUSE_LIBJPEG=sys' -+ elif test "$withval" = builtin; then -+ wx_cv_use_libjpeg='wxUSE_LIBJPEG=builtin' -+ else -+ as_fn_error $? "Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" "$LINENO" 5 -+ fi -+ -+else case e in #( -+ e) -+ if test "DEFAULT_wxUSE_LIBJPEG" = no; then -+ value=no -+ elif test "$wxUSE_ALL_FEATURES" = no; then -+ value=no -+ elif test "$wxUSE_SYS_LIBS" = no; then -+ value=builtin -+ else -+ value=yes -+ fi -+ -+ wx_cv_use_libjpeg="wxUSE_LIBJPEG=$value" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_libjpeg" -+ -+ -+ -+# Check whether --with-libtiff was given. -+if test ${with_libtiff+y} -+then : -+ withval=$with_libtiff; -+ if test "$withval" = yes; then -+ wx_cv_use_libtiff='wxUSE_LIBTIFF=yes' -+ elif test "$withval" = no; then -+ wx_cv_use_libtiff='wxUSE_LIBTIFF=no' -+ elif test "$withval" = sys; then -+ wx_cv_use_libtiff='wxUSE_LIBTIFF=sys' -+ elif test "$withval" = builtin; then -+ wx_cv_use_libtiff='wxUSE_LIBTIFF=builtin' -+ else -+ as_fn_error $? "Invalid value for --with-libtiff: should be yes, no, sys, or builtin" "$LINENO" 5 -+ fi -+ -+else case e in #( -+ e) -+ if test "DEFAULT_wxUSE_LIBTIFF" = no; then -+ value=no -+ elif test "$wxUSE_ALL_FEATURES" = no; then -+ value=no -+ elif test "$wxUSE_SYS_LIBS" = no; then -+ value=builtin -+ else -+ value=yes -+ fi -+ -+ wx_cv_use_libtiff="wxUSE_LIBTIFF=$value" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_libtiff" -+ -+ -+if test "$wxUSE_LIBTIFF" = "builtin" ; then -+ wxUSE_LIBJBIG=no -+else -+ -+ withstring=without -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$withstring" = xwithout; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+# Check whether --with-libjbig was given. -+if test ${with_libjbig+y} -+then : -+ withval=$with_libjbig; -+ if test "$withval" = yes; then -+ wx_cv_use_libjbig='wxUSE_LIBJBIG=yes' -+ else -+ wx_cv_use_libjbig='wxUSE_LIBJBIG=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_libjbig='wxUSE_LIBJBIG=${'DEFAULT_wxUSE_LIBJBIG":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_libjbig" -+ -+fi -+ -+ -+ -+# Check whether --with-libxpm was given. -+if test ${with_libxpm+y} -+then : -+ withval=$with_libxpm; -+ if test "$withval" = yes; then -+ wx_cv_use_libxpm='wxUSE_LIBXPM=yes' -+ elif test "$withval" = no; then -+ wx_cv_use_libxpm='wxUSE_LIBXPM=no' -+ elif test "$withval" = sys; then -+ wx_cv_use_libxpm='wxUSE_LIBXPM=sys' -+ elif test "$withval" = builtin; then -+ wx_cv_use_libxpm='wxUSE_LIBXPM=builtin' -+ else -+ as_fn_error $? "Invalid value for --with-libxpm: should be yes, no, sys, or builtin" "$LINENO" 5 -+ fi -+ -+else case e in #( -+ e) -+ if test "DEFAULT_wxUSE_LIBXPM" = no; then -+ value=no -+ elif test "$wxUSE_ALL_FEATURES" = no; then -+ value=no -+ elif test "$wxUSE_SYS_LIBS" = no; then -+ value=builtin -+ else -+ value=yes -+ fi -+ -+ wx_cv_use_libxpm="wxUSE_LIBXPM=$value" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_libxpm" -+ -+ -+ withstring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$withstring" = xwithout; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+# Check whether --with-libiconv was given. -+if test ${with_libiconv+y} -+then : -+ withval=$with_libiconv; -+ if test "$withval" = yes; then -+ wx_cv_use_libiconv='wxUSE_LIBICONV=yes' -+ else -+ wx_cv_use_libiconv='wxUSE_LIBICONV=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_libiconv='wxUSE_LIBICONV=${'DEFAULT_wxUSE_LIBICONV":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_libiconv" -+ -+ -+ withstring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$withstring" = xwithout; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+# Check whether --with-libmspack was given. -+if test ${with_libmspack+y} -+then : -+ withval=$with_libmspack; -+ if test "$withval" = yes; then -+ wx_cv_use_libmspack='wxUSE_LIBMSPACK=yes' -+ else -+ wx_cv_use_libmspack='wxUSE_LIBMSPACK=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_libmspack" -+ -+ -+ withstring=without -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$withstring" = xwithout; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+# Check whether --with-gtkprint was given. -+if test ${with_gtkprint+y} -+then : -+ withval=$with_gtkprint; -+ if test "$withval" = yes; then -+ wx_cv_use_gtkprint='wxUSE_GTKPRINT=yes' -+ else -+ wx_cv_use_gtkprint='wxUSE_GTKPRINT=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_gtkprint='wxUSE_GTKPRINT=${'DEFAULT_wxUSE_GTKPRINT":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_gtkprint" -+ -+ -+ withstring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$withstring" = xwithout; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+# Check whether --with-gnomevfs was given. -+if test ${with_gnomevfs+y} -+then : -+ withval=$with_gnomevfs; -+ if test "$withval" = yes; then -+ wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=yes' -+ else -+ wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_gnomevfs" -+ -+ -+ withstring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$withstring" = xwithout; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+# Check whether --with-libnotify was given. -+if test ${with_libnotify+y} -+then : -+ withval=$with_libnotify; -+ if test "$withval" = yes; then -+ wx_cv_use_libnotify='wxUSE_LIBNOTIFY=yes' -+ else -+ wx_cv_use_libnotify='wxUSE_LIBNOTIFY=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_libnotify='wxUSE_LIBNOTIFY=${'DEFAULT_wxUSE_LIBNOTIFY":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_libnotify" -+ -+ -+ withstring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$withstring" = xwithout; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+# Check whether --with-opengl was given. -+if test ${with_opengl+y} -+then : -+ withval=$with_opengl; -+ if test "$withval" = yes; then -+ wx_cv_use_opengl='wxUSE_OPENGL=yes' -+ else -+ wx_cv_use_opengl='wxUSE_OPENGL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_opengl" -+ -+ -+ withstring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$withstring" = xwithout; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+# Check whether --with-xtest was given. -+if test ${with_xtest+y} -+then : -+ withval=$with_xtest; -+ if test "$withval" = yes; then -+ wx_cv_use_xtest='wxUSE_XTEST=yes' -+ else -+ wx_cv_use_xtest='wxUSE_XTEST=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_xtest='wxUSE_XTEST=${'DEFAULT_wxUSE_XTEST":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_xtest" -+ -+ -+ withstring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$withstring" = xwithout; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+# Check whether --with-nanosvg was given. -+if test ${with_nanosvg+y} -+then : -+ withval=$with_nanosvg; -+ if test "$withval" = yes; then -+ wx_cv_use_nanosvg='wxUSE_NANOSVG=yes' -+ else -+ wx_cv_use_nanosvg='wxUSE_NANOSVG=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_nanosvg='wxUSE_NANOSVG=${'DEFAULT_wxUSE_NANOSVG":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_nanosvg" -+ -+ -+if test "$wxUSE_GTK" = 1 -o "$wxUSE_QT" = 1 -o "$wxUSE_X11" = 1; then -+ wx_needs_cairo_for_gc=1 -+fi -+ -+if test "$wx_needs_cairo_for_gc" != 1; then -+ -+ withstring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$withstring" = xwithout; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+# Check whether --with-cairo was given. -+if test ${with_cairo+y} -+then : -+ withval=$with_cairo; -+ if test "$withval" = yes; then -+ wx_cv_use_cairo='wxUSE_CAIRO=yes' -+ else -+ wx_cv_use_cairo='wxUSE_CAIRO=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_cairo='wxUSE_CAIRO=${'DEFAULT_wxUSE_CAIRO":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_cairo" -+ -+fi -+ -+fi -+ -+ -+ withstring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$withstring" = xwithout; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+# Check whether --with-dmalloc was given. -+if test ${with_dmalloc+y} -+then : -+ withval=$with_dmalloc; -+ if test "$withval" = yes; then -+ wx_cv_use_dmalloc='wxUSE_DMALLOC=yes' -+ else -+ wx_cv_use_dmalloc='wxUSE_DMALLOC=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_dmalloc" -+ -+ -+ withstring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$withstring" = xwithout; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+# Check whether --with-sdl was given. -+if test ${with_sdl+y} -+then : -+ withval=$with_sdl; -+ if test "$withval" = yes; then -+ wx_cv_use_sdl='wxUSE_LIBSDL=yes' -+ else -+ wx_cv_use_sdl='wxUSE_LIBSDL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_sdl" -+ -+ -+ -+# Check whether --with-regex was given. -+if test ${with_regex+y} -+then : -+ withval=$with_regex; -+ if test "$withval" = yes; then -+ wx_cv_use_regex='wxUSE_REGEX=yes' -+ elif test "$withval" = no; then -+ wx_cv_use_regex='wxUSE_REGEX=no' -+ elif test "$withval" = sys; then -+ wx_cv_use_regex='wxUSE_REGEX=sys' -+ elif test "$withval" = builtin; then -+ wx_cv_use_regex='wxUSE_REGEX=builtin' -+ else -+ as_fn_error $? "Invalid value for --with-regex: should be yes, no, sys, or builtin" "$LINENO" 5 -+ fi -+ -+else case e in #( -+ e) -+ if test "DEFAULT_wxUSE_REGEX" = no; then -+ value=no -+ elif test "$wxUSE_ALL_FEATURES" = no; then -+ value=no -+ elif test "$wxUSE_SYS_LIBS" = no; then -+ value=builtin -+ else -+ value=yes -+ fi -+ -+ wx_cv_use_regex="wxUSE_REGEX=$value" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_regex" -+ -+ -+ withstring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$withstring" = xwithout; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+# Check whether --with-liblzma was given. -+if test ${with_liblzma+y} -+then : -+ withval=$with_liblzma; -+ if test "$withval" = yes; then -+ wx_cv_use_liblzma='wxUSE_LIBLZMA=yes' -+ else -+ wx_cv_use_liblzma='wxUSE_LIBLZMA=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_liblzma='wxUSE_LIBLZMA=${'DEFAULT_wxUSE_LIBLZMA":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_liblzma" -+ -+ -+ -+# Check whether --with-zlib was given. -+if test ${with_zlib+y} -+then : -+ withval=$with_zlib; -+ if test "$withval" = yes; then -+ wx_cv_use_zlib='wxUSE_ZLIB=yes' -+ elif test "$withval" = no; then -+ wx_cv_use_zlib='wxUSE_ZLIB=no' -+ elif test "$withval" = sys; then -+ wx_cv_use_zlib='wxUSE_ZLIB=sys' -+ elif test "$withval" = builtin; then -+ wx_cv_use_zlib='wxUSE_ZLIB=builtin' -+ else -+ as_fn_error $? "Invalid value for --with-zlib: should be yes, no, sys, or builtin" "$LINENO" 5 -+ fi -+ -+else case e in #( -+ e) -+ if test "DEFAULT_wxUSE_ZLIB" = no; then -+ value=no -+ elif test "$wxUSE_ALL_FEATURES" = no; then -+ value=no -+ elif test "$wxUSE_SYS_LIBS" = no; then -+ value=builtin -+ else -+ value=yes -+ fi -+ -+ wx_cv_use_zlib="wxUSE_ZLIB=$value" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_zlib" -+ -+ -+ -+# Check whether --with-expat was given. -+if test ${with_expat+y} -+then : -+ withval=$with_expat; -+ if test "$withval" = yes; then -+ wx_cv_use_expat='wxUSE_EXPAT=yes' -+ elif test "$withval" = no; then -+ wx_cv_use_expat='wxUSE_EXPAT=no' -+ elif test "$withval" = sys; then -+ wx_cv_use_expat='wxUSE_EXPAT=sys' -+ elif test "$withval" = builtin; then -+ wx_cv_use_expat='wxUSE_EXPAT=builtin' -+ else -+ as_fn_error $? "Invalid value for --with-expat: should be yes, no, sys, or builtin" "$LINENO" 5 -+ fi -+ -+else case e in #( -+ e) -+ if test "DEFAULT_wxUSE_EXPAT" = no; then -+ value=no -+ elif test "$wxUSE_ALL_FEATURES" = no; then -+ value=no -+ elif test "$wxUSE_SYS_LIBS" = no; then -+ value=builtin -+ else -+ value=yes -+ fi -+ -+ wx_cv_use_expat="wxUSE_EXPAT=$value" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_expat" -+ -+ -+ -+ withstring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$withstring" = xwithout; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+# Check whether --with-libcurl was given. -+if test ${with_libcurl+y} -+then : -+ withval=$with_libcurl; -+ if test "$withval" = yes; then -+ wx_cv_use_libcurl='wxUSE_LIBCURL=yes' -+ else -+ wx_cv_use_libcurl='wxUSE_LIBCURL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_libcurl='wxUSE_LIBCURL=${'DEFAULT_wxUSE_LIBCURL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_libcurl" -+ -+ -+ withstring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$withstring" = xwithout; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+# Check whether --with-winhttp was given. -+if test ${with_winhttp+y} -+then : -+ withval=$with_winhttp; -+ if test "$withval" = yes; then -+ wx_cv_use_winhttp='wxUSE_WINHTTP=yes' -+ else -+ wx_cv_use_winhttp='wxUSE_WINHTTP=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_winhttp='wxUSE_WINHTTP=${'DEFAULT_wxUSE_WINHTTP":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_winhttp" -+ -+if test "$USE_DARWIN" = 1; then -+ -+ withstring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$withstring" = xwithout; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+# Check whether --with-urlsession was given. -+if test ${with_urlsession+y} -+then : -+ withval=$with_urlsession; -+ if test "$withval" = yes; then -+ wx_cv_use_urlsession='wxUSE_URLSESSION=yes' -+ else -+ wx_cv_use_urlsession='wxUSE_URLSESSION=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_urlsession='wxUSE_URLSESSION=${'DEFAULT_wxUSE_URLSESSION":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_urlsession" -+ -+fi -+ -+if test "$USE_DARWIN" = 1; then -+ -+ -+# Check whether --with-macosx-sdk was given. -+if test ${with_macosx_sdk+y} -+then : -+ withval=$with_macosx_sdk; -+ wxUSE_MACOSX_SDK=$withval -+ wx_cv_use_macosx_sdk="wxUSE_MACOSX_SDK=$withval" -+ -+fi -+ -+ -+ -+# Check whether --with-macosx-version-min was given. -+if test ${with_macosx_version_min+y} -+then : -+ withval=$with_macosx_version_min; -+ wxUSE_MACOSX_VERSION_MIN=$withval -+ wx_cv_use_macosx_version_min="wxUSE_MACOSX_VERSION_MIN=$withval" -+ -+fi -+ -+ -+fi -+ -+# Check whether --enable-debug was given. -+if test ${enable_debug+y} -+then : -+ enableval=$enable_debug; -+ if test "$enableval" = yes; then -+ wxUSE_DEBUG=yes -+ elif test "$enableval" = no; then -+ wxUSE_DEBUG=no -+ elif test "$enableval" = max; then -+ wxUSE_DEBUG=yes -+ WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DwxDEBUG_LEVEL=2" -+ else -+ as_fn_error $? "Invalid --enable-debug value, must be yes, no or max" "$LINENO" 5 -+ fi -+ -+else case e in #( -+ e) wxUSE_DEBUG=default -+ ;; -+esac -+fi -+ -+ -+case "$wxUSE_DEBUG" in -+ yes) -+ DEFAULT_wxUSE_DEBUG_FLAG=yes -+ DEFAULT_wxUSE_DEBUG_INFO=yes -+ -+ DEFAULT_wxUSE_OPTIMISE=no -+ ;; -+ -+ no) -+ DEFAULT_wxUSE_DEBUG_FLAG=no -+ DEFAULT_wxUSE_DEBUG_INFO=no -+ ;; -+ -+ default) -+ DEFAULT_wxUSE_DEBUG_FLAG=yes -+ DEFAULT_wxUSE_DEBUG_INFO=no -+ ;; -+esac -+ -+ -+ enablestring=disable -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-debug_flag was given. -+if test ${enable_debug_flag+y} -+then : -+ enableval=$enable_debug_flag; -+ if test "$enableval" = yes; then -+ wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes' -+ else -+ wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_debug_flag" -+ -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-debug_info was given. -+if test ${enable_debug_info+y} -+then : -+ enableval=$enable_debug_info; -+ if test "$enableval" = yes; then -+ wx_cv_use_debug_info='wxUSE_DEBUG_INFO=yes' -+ else -+ wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_debug_info" -+ -+ -+ -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-debug_gdb was given. -+if test ${enable_debug_gdb+y} -+then : -+ enableval=$enable_debug_gdb; -+ if test "$enableval" = yes; then -+ wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes' -+ else -+ wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_debug_gdb" -+ -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-debug_cntxt was given. -+if test ${enable_debug_cntxt+y} -+then : -+ enableval=$enable_debug_cntxt; -+ if test "$enableval" = yes; then -+ wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes' -+ else -+ wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_debug_cntxt" -+ -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-mem_tracing was given. -+if test ${enable_mem_tracing+y} -+then : -+ enableval=$enable_mem_tracing; -+ if test "$enableval" = yes; then -+ wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes' -+ else -+ wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_mem_tracing" -+ -+ -+ -+ -+ enablestring=disable -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-shared was given. -+if test ${enable_shared+y} -+then : -+ enableval=$enable_shared; -+ if test "$enableval" = yes; then -+ wx_cv_use_shared='wxUSE_SHARED=yes' -+ else -+ wx_cv_use_shared='wxUSE_SHARED=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_shared" -+ -+# Check whether --enable-cxx11 was given. -+if test ${enable_cxx11+y} -+then : -+ enableval=$enable_cxx11; wxWITH_CXX=11 wxWITH_CXX_IS_OPTIONAL=1 -+fi -+ -+ -+# Check whether --with-cxx was given. -+if test ${with_cxx+y} -+then : -+ withval=$with_cxx; wxWITH_CXX="$withval" -+fi -+ -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-stl was given. -+if test ${enable_stl+y} -+then : -+ enableval=$enable_stl; -+ if test "$enableval" = yes; then -+ wx_cv_use_stl='wxUSE_STL=yes' -+ else -+ wx_cv_use_stl='wxUSE_STL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_stl" -+ -+if test "$wxUSE_STL" = "yes"; then -+ DEFAULT_wxUSE_STD_CONTAINERS=yes -+ DEFAULT_wxUSE_STD_CONTAINERS_COMPATIBLY=yes -+ DEFAULT_wxUSE_STD_IOSTREAM=yes -+ DEFAULT_wxUSE_STD_STRING=yes -+fi -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-std_containers was given. -+if test ${enable_std_containers+y} -+then : -+ enableval=$enable_std_containers; -+ if test "$enableval" = yes; then -+ wx_cv_use_std_containers='wxUSE_STD_CONTAINERS=yes' -+ else -+ wx_cv_use_std_containers='wxUSE_STD_CONTAINERS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_std_containers='wxUSE_STD_CONTAINERS=${'DEFAULT_wxUSE_STD_CONTAINERS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_std_containers" -+ -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-std_containers_compat was given. -+if test ${enable_std_containers_compat+y} -+then : -+ enableval=$enable_std_containers_compat; -+ if test "$enableval" = yes; then -+ wx_cv_use_std_containers_compat='wxUSE_STD_CONTAINERS_COMPATIBLY=yes' -+ else -+ wx_cv_use_std_containers_compat='wxUSE_STD_CONTAINERS_COMPATIBLY=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_std_containers_compat='wxUSE_STD_CONTAINERS_COMPATIBLY=${'DEFAULT_wxUSE_STD_CONTAINERS_COMPATIBLY":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_std_containers_compat" -+ -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-std_iostreams was given. -+if test ${enable_std_iostreams+y} -+then : -+ enableval=$enable_std_iostreams; -+ if test "$enableval" = yes; then -+ wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes' -+ else -+ wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_std_iostreams" -+ -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-std_string was given. -+if test ${enable_std_string+y} -+then : -+ enableval=$enable_std_string; -+ if test "$enableval" = yes; then -+ wx_cv_use_std_string='wxUSE_STD_STRING=yes' -+ else -+ wx_cv_use_std_string='wxUSE_STD_STRING=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_std_string" -+ -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-std_string_conv_in_wxstring was given. -+if test ${enable_std_string_conv_in_wxstring+y} -+then : -+ enableval=$enable_std_string_conv_in_wxstring; -+ if test "$enableval" = yes; then -+ wx_cv_use_std_string_conv_in_wxstring='wxUSE_STD_STRING_CONV_IN_WXSTRING=yes' -+ else -+ wx_cv_use_std_string_conv_in_wxstring='wxUSE_STD_STRING_CONV_IN_WXSTRING=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_std_string_conv_in_wxstring='wxUSE_STD_STRING_CONV_IN_WXSTRING=${'DEFAULT_wxUSE_STD_STRING_CONV_IN_WXSTRING":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_std_string_conv_in_wxstring" -+ -+ -+ enablestring=disable -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-unsafe_conv_in_wxstring was given. -+if test ${enable_unsafe_conv_in_wxstring+y} -+then : -+ enableval=$enable_unsafe_conv_in_wxstring; -+ if test "$enableval" = yes; then -+ wx_cv_use_unsafe_conv_in_wxstring='wxUSE_UNSAFE_WXSTRING_CONV=yes' -+ else -+ wx_cv_use_unsafe_conv_in_wxstring='wxUSE_UNSAFE_WXSTRING_CONV=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_unsafe_conv_in_wxstring='wxUSE_UNSAFE_WXSTRING_CONV=${'DEFAULT_wxUSE_UNSAFE_WXSTRING_CONV":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_unsafe_conv_in_wxstring" -+ -+ -+ enablestring=disable -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-unicode was given. -+if test ${enable_unicode+y} -+then : -+ enableval=$enable_unicode; -+ if test "$enableval" = yes; then -+ wx_cv_use_unicode='wxUSE_UNICODE=yes' -+ else -+ wx_cv_use_unicode='wxUSE_UNICODE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_unicode" -+ -+ -+ enablestring= -+ # Check whether --enable-utf8 was given. -+if test ${enable_utf8+y} -+then : -+ enableval=$enable_utf8; -+ wx_cv_use_utf8="wxUSE_UNICODE_UTF8='$enableval'" -+ -+else case e in #( -+ e) -+ wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8 -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_utf8" -+ -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-utf8only was given. -+if test ${enable_utf8only+y} -+then : -+ enableval=$enable_utf8only; -+ if test "$enableval" = yes; then -+ wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=yes' -+ else -+ wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_utf8only" -+ -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-extended_rtti was given. -+if test ${enable_extended_rtti+y} -+then : -+ enableval=$enable_extended_rtti; -+ if test "$enableval" = yes; then -+ wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=yes' -+ else -+ wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_extended_rtti" -+ -+ -+ -+ enablestring=disable -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-optimise was given. -+if test ${enable_optimise+y} -+then : -+ enableval=$enable_optimise; -+ if test "$enableval" = yes; then -+ wx_cv_use_optimise='wxUSE_OPTIMISE=yes' -+ else -+ wx_cv_use_optimise='wxUSE_OPTIMISE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_optimise" -+ -+ -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-profile was given. -+if test ${enable_profile+y} -+then : -+ enableval=$enable_profile; -+ if test "$enableval" = yes; then -+ wx_cv_use_profile='wxUSE_PROFILE=yes' -+ else -+ wx_cv_use_profile='wxUSE_PROFILE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_profile" -+ -+ -+ enablestring=disable -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-pic was given. -+if test ${enable_pic+y} -+then : -+ enableval=$enable_pic; -+ if test "$enableval" = yes; then -+ wx_cv_use_pic='wxUSE_PIC=yes' -+ else -+ wx_cv_use_pic='wxUSE_PIC=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_pic='wxUSE_PIC=${'DEFAULT_wxUSE_PIC":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_pic" -+ -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-no_rtti was given. -+if test ${enable_no_rtti+y} -+then : -+ enableval=$enable_no_rtti; -+ if test "$enableval" = yes; then -+ wx_cv_use_no_rtti='wxUSE_NO_RTTI=yes' -+ else -+ wx_cv_use_no_rtti='wxUSE_NO_RTTI=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_no_rtti" -+ -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-no_exceptions was given. -+if test ${enable_no_exceptions+y} -+then : -+ enableval=$enable_no_exceptions; -+ if test "$enableval" = yes; then -+ wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=yes' -+ else -+ wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_no_exceptions" -+ -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-permissive was given. -+if test ${enable_permissive+y} -+then : -+ enableval=$enable_permissive; -+ if test "$enableval" = yes; then -+ wx_cv_use_permissive='wxUSE_PERMISSIVE=yes' -+ else -+ wx_cv_use_permissive='wxUSE_PERMISSIVE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_permissive" -+ -+ -+ enablestring=disable -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-vararg_macros was given. -+if test ${enable_vararg_macros+y} -+then : -+ enableval=$enable_vararg_macros; -+ if test "$enableval" = yes; then -+ wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=yes' -+ else -+ wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_vararg_macros" -+ -+ -+if test "$USE_DARWIN" = 1; then -+ -+ enablestring= -+ # Check whether --enable-universal_binary was given. -+if test ${enable_universal_binary+y} -+then : -+ enableval=$enable_universal_binary; -+ wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY='$enableval'" -+ -+else case e in #( -+ e) -+ wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_universal_binary" -+ -+ -+ enablestring= -+ # Check whether --enable-macosx_arch was given. -+if test ${enable_macosx_arch+y} -+then : -+ enableval=$enable_macosx_arch; -+ wx_cv_use_macosx_arch="wxUSE_MAC_ARCH='$enableval'" -+ -+else case e in #( -+ e) -+ wx_cv_use_macosx_arch='wxUSE_MAC_ARCH='$DEFAULT_wxUSE_MAC_ARCH -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_macosx_arch" -+ -+fi -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-compat28 was given. -+if test ${enable_compat28+y} -+then : -+ enableval=$enable_compat28; -+ if test "$enableval" = yes; then -+ wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=yes' -+ else -+ wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_compat28" -+ -+ -+ enablestring=disable -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-compat30 was given. -+if test ${enable_compat30+y} -+then : -+ enableval=$enable_compat30; -+ if test "$enableval" = yes; then -+ wx_cv_use_compat30='WXWIN_COMPATIBILITY_3_0=yes' -+ else -+ wx_cv_use_compat30='WXWIN_COMPATIBILITY_3_0=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_compat30='WXWIN_COMPATIBILITY_3_0=${'DEFAULT_WXWIN_COMPATIBILITY_3_0":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_compat30" -+ -+ -+ -+ enablestring=disable -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-rpath was given. -+if test ${enable_rpath+y} -+then : -+ enableval=$enable_rpath; -+ if test "$enableval" = yes; then -+ wx_cv_use_rpath='wxUSE_RPATH=yes' -+ else -+ wx_cv_use_rpath='wxUSE_RPATH=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_rpath" -+ -+ -+ -+ enablestring=disable -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-visibility was given. -+if test ${enable_visibility+y} -+then : -+ enableval=$enable_visibility; -+ if test "$enableval" = yes; then -+ wx_cv_use_visibility='wxUSE_VISIBILITY=yes' -+ else -+ wx_cv_use_visibility='wxUSE_VISIBILITY=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_visibility" -+ -+ -+ enablestring=disable -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-tls was given. -+if test ${enable_tls+y} -+then : -+ enableval=$enable_tls; -+ if test "$enableval" = yes; then -+ wx_cv_use_tls='wxUSE_COMPILER_TLS=yes' -+ else -+ wx_cv_use_tls='wxUSE_COMPILER_TLS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_tls='wxUSE_COMPILER_TLS=${'DEFAULT_wxUSE_COMPILER_TLS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_tls" -+ -+ -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-repro_build was given. -+if test ${enable_repro_build+y} -+then : -+ enableval=$enable_repro_build; -+ if test "$enableval" = yes; then -+ wx_cv_use_repro_build='wxUSE_REPRODUCIBLE_BUILD=yes' -+ else -+ wx_cv_use_repro_build='wxUSE_REPRODUCIBLE_BUILD=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_repro_build='wxUSE_REPRODUCIBLE_BUILD=${'DEFAULT_wxUSE_REPRODUCIBLE_BUILD":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_repro_build" -+ -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-pch was given. -+if test ${enable_pch+y} -+then : -+ enableval=$enable_pch; -+ if test "$enableval" = yes; then -+ wx_cv_use_pch='wxUSE_PCH=yes' -+ else -+ wx_cv_use_pch='wxUSE_PCH=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_pch='wxUSE_PCH=${'DEFAULT_wxUSE_PCH":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_pch" -+ -+ -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-intl was given. -+if test ${enable_intl+y} -+then : -+ enableval=$enable_intl; -+ if test "$enableval" = yes; then -+ wx_cv_use_intl='wxUSE_INTL=yes' -+ else -+ wx_cv_use_intl='wxUSE_INTL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_intl" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-xlocale was given. -+if test ${enable_xlocale+y} -+then : -+ enableval=$enable_xlocale; -+ if test "$enableval" = yes; then -+ wx_cv_use_xlocale='wxUSE_XLOCALE=yes' -+ else -+ wx_cv_use_xlocale='wxUSE_XLOCALE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_xlocale='wxUSE_XLOCALE=${'DEFAULT_wxUSE_XLOCALE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_xlocale" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-config was given. -+if test ${enable_config+y} -+then : -+ enableval=$enable_config; -+ if test "$enableval" = yes; then -+ wx_cv_use_config='wxUSE_CONFIG=yes' -+ else -+ wx_cv_use_config='wxUSE_CONFIG=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_config" -+ -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-protocols was given. -+if test ${enable_protocols+y} -+then : -+ enableval=$enable_protocols; -+ if test "$enableval" = yes; then -+ wx_cv_use_protocols='wxUSE_PROTOCOL=yes' -+ else -+ wx_cv_use_protocols='wxUSE_PROTOCOL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_protocols" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-ftp was given. -+if test ${enable_ftp+y} -+then : -+ enableval=$enable_ftp; -+ if test "$enableval" = yes; then -+ wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=yes' -+ else -+ wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_ftp" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-http was given. -+if test ${enable_http+y} -+then : -+ enableval=$enable_http; -+ if test "$enableval" = yes; then -+ wx_cv_use_http='wxUSE_PROTOCOL_HTTP=yes' -+ else -+ wx_cv_use_http='wxUSE_PROTOCOL_HTTP=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_http" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-fileproto was given. -+if test ${enable_fileproto+y} -+then : -+ enableval=$enable_fileproto; -+ if test "$enableval" = yes; then -+ wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=yes' -+ else -+ wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_fileproto" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-sockets was given. -+if test ${enable_sockets+y} -+then : -+ enableval=$enable_sockets; -+ if test "$enableval" = yes; then -+ wx_cv_use_sockets='wxUSE_SOCKETS=yes' -+ else -+ wx_cv_use_sockets='wxUSE_SOCKETS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_sockets" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-ipv6 was given. -+if test ${enable_ipv6+y} -+then : -+ enableval=$enable_ipv6; -+ if test "$enableval" = yes; then -+ wx_cv_use_ipv6='wxUSE_IPV6=yes' -+ else -+ wx_cv_use_ipv6='wxUSE_IPV6=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_ipv6='wxUSE_IPV6=${'DEFAULT_wxUSE_IPV6":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_ipv6" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-ole was given. -+if test ${enable_ole+y} -+then : -+ enableval=$enable_ole; -+ if test "$enableval" = yes; then -+ wx_cv_use_ole='wxUSE_OLE=yes' -+ else -+ wx_cv_use_ole='wxUSE_OLE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_ole" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-dataobj was given. -+if test ${enable_dataobj+y} -+then : -+ enableval=$enable_dataobj; -+ if test "$enableval" = yes; then -+ wx_cv_use_dataobj='wxUSE_DATAOBJ=yes' -+ else -+ wx_cv_use_dataobj='wxUSE_DATAOBJ=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_dataobj" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-webrequest was given. -+if test ${enable_webrequest+y} -+then : -+ enableval=$enable_webrequest; -+ if test "$enableval" = yes; then -+ wx_cv_use_webrequest='wxUSE_WEBREQUEST=yes' -+ else -+ wx_cv_use_webrequest='wxUSE_WEBREQUEST=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_webrequest='wxUSE_WEBREQUEST=${'DEFAULT_wxUSE_WEBREQUEST":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_webrequest" -+ -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-ipc was given. -+if test ${enable_ipc+y} -+then : -+ enableval=$enable_ipc; -+ if test "$enableval" = yes; then -+ wx_cv_use_ipc='wxUSE_IPC=yes' -+ else -+ wx_cv_use_ipc='wxUSE_IPC=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_ipc" -+ -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-baseevtloop was given. -+if test ${enable_baseevtloop+y} -+then : -+ enableval=$enable_baseevtloop; -+ if test "$enableval" = yes; then -+ wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=yes' -+ else -+ wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=${'DEFAULT_wxUSE_CONSOLE_EVENTLOOP":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_baseevtloop" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-epollloop was given. -+if test ${enable_epollloop+y} -+then : -+ enableval=$enable_epollloop; -+ if test "$enableval" = yes; then -+ wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=yes' -+ else -+ wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_epollloop" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-selectloop was given. -+if test ${enable_selectloop+y} -+then : -+ enableval=$enable_selectloop; -+ if test "$enableval" = yes; then -+ wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=yes' -+ else -+ wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=${'DEFAULT_wxUSE_SELECT_DISPATCHER":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_selectloop" -+ -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-any was given. -+if test ${enable_any+y} -+then : -+ enableval=$enable_any; -+ if test "$enableval" = yes; then -+ wx_cv_use_any='wxUSE_ANY=yes' -+ else -+ wx_cv_use_any='wxUSE_ANY=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_any='wxUSE_ANY=${'DEFAULT_wxUSE_ANY":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_any" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-apple_ieee was given. -+if test ${enable_apple_ieee+y} -+then : -+ enableval=$enable_apple_ieee; -+ if test "$enableval" = yes; then -+ wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes' -+ else -+ wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_apple_ieee" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-arcstream was given. -+if test ${enable_arcstream+y} -+then : -+ enableval=$enable_arcstream; -+ if test "$enableval" = yes; then -+ wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=yes' -+ else -+ wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_arcstream" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-base64 was given. -+if test ${enable_base64+y} -+then : -+ enableval=$enable_base64; -+ if test "$enableval" = yes; then -+ wx_cv_use_base64='wxUSE_BASE64=yes' -+ else -+ wx_cv_use_base64='wxUSE_BASE64=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_base64" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-backtrace was given. -+if test ${enable_backtrace+y} -+then : -+ enableval=$enable_backtrace; -+ if test "$enableval" = yes; then -+ wx_cv_use_backtrace='wxUSE_STACKWALKER=yes' -+ else -+ wx_cv_use_backtrace='wxUSE_STACKWALKER=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_backtrace" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-catch_segvs was given. -+if test ${enable_catch_segvs+y} -+then : -+ enableval=$enable_catch_segvs; -+ if test "$enableval" = yes; then -+ wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes' -+ else -+ wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_catch_segvs" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-cmdline was given. -+if test ${enable_cmdline+y} -+then : -+ enableval=$enable_cmdline; -+ if test "$enableval" = yes; then -+ wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes' -+ else -+ wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_cmdline" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-datetime was given. -+if test ${enable_datetime+y} -+then : -+ enableval=$enable_datetime; -+ if test "$enableval" = yes; then -+ wx_cv_use_datetime='wxUSE_DATETIME=yes' -+ else -+ wx_cv_use_datetime='wxUSE_DATETIME=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_datetime" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-debugreport was given. -+if test ${enable_debugreport+y} -+then : -+ enableval=$enable_debugreport; -+ if test "$enableval" = yes; then -+ wx_cv_use_debugreport='wxUSE_DEBUGREPORT=yes' -+ else -+ wx_cv_use_debugreport='wxUSE_DEBUGREPORT=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_debugreport" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-dialupman was given. -+if test ${enable_dialupman+y} -+then : -+ enableval=$enable_dialupman; -+ if test "$enableval" = yes; then -+ wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes' -+ else -+ wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_dialupman" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-dynlib was given. -+if test ${enable_dynlib+y} -+then : -+ enableval=$enable_dynlib; -+ if test "$enableval" = yes; then -+ wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=yes' -+ else -+ wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_dynlib" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-dynamicloader was given. -+if test ${enable_dynamicloader+y} -+then : -+ enableval=$enable_dynamicloader; -+ if test "$enableval" = yes; then -+ wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=yes' -+ else -+ wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_dynamicloader" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-exceptions was given. -+if test ${enable_exceptions+y} -+then : -+ enableval=$enable_exceptions; -+ if test "$enableval" = yes; then -+ wx_cv_use_exceptions='wxUSE_EXCEPTIONS=yes' -+ else -+ wx_cv_use_exceptions='wxUSE_EXCEPTIONS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_exceptions" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-ffile was given. -+if test ${enable_ffile+y} -+then : -+ enableval=$enable_ffile; -+ if test "$enableval" = yes; then -+ wx_cv_use_ffile='wxUSE_FFILE=yes' -+ else -+ wx_cv_use_ffile='wxUSE_FFILE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_ffile" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-file was given. -+if test ${enable_file+y} -+then : -+ enableval=$enable_file; -+ if test "$enableval" = yes; then -+ wx_cv_use_file='wxUSE_FILE=yes' -+ else -+ wx_cv_use_file='wxUSE_FILE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_file" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-filehistory was given. -+if test ${enable_filehistory+y} -+then : -+ enableval=$enable_filehistory; -+ if test "$enableval" = yes; then -+ wx_cv_use_filehistory='wxUSE_FILE_HISTORY=yes' -+ else -+ wx_cv_use_filehistory='wxUSE_FILE_HISTORY=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_filehistory='wxUSE_FILE_HISTORY=${'DEFAULT_wxUSE_FILE_HISTORY":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_filehistory" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-filesystem was given. -+if test ${enable_filesystem+y} -+then : -+ enableval=$enable_filesystem; -+ if test "$enableval" = yes; then -+ wx_cv_use_filesystem='wxUSE_FILESYSTEM=yes' -+ else -+ wx_cv_use_filesystem='wxUSE_FILESYSTEM=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_filesystem" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-fontenum was given. -+if test ${enable_fontenum+y} -+then : -+ enableval=$enable_fontenum; -+ if test "$enableval" = yes; then -+ wx_cv_use_fontenum='wxUSE_FONTENUM=yes' -+ else -+ wx_cv_use_fontenum='wxUSE_FONTENUM=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_fontenum='wxUSE_FONTENUM=${'DEFAULT_wxUSE_FONTENUM":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_fontenum" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-fontmap was given. -+if test ${enable_fontmap+y} -+then : -+ enableval=$enable_fontmap; -+ if test "$enableval" = yes; then -+ wx_cv_use_fontmap='wxUSE_FONTMAP=yes' -+ else -+ wx_cv_use_fontmap='wxUSE_FONTMAP=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_fontmap" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-fs_archive was given. -+if test ${enable_fs_archive+y} -+then : -+ enableval=$enable_fs_archive; -+ if test "$enableval" = yes; then -+ wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=yes' -+ else -+ wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_fs_archive" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-fs_inet was given. -+if test ${enable_fs_inet+y} -+then : -+ enableval=$enable_fs_inet; -+ if test "$enableval" = yes; then -+ wx_cv_use_fs_inet='wxUSE_FS_INET=yes' -+ else -+ wx_cv_use_fs_inet='wxUSE_FS_INET=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_fs_inet" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-fs_zip was given. -+if test ${enable_fs_zip+y} -+then : -+ enableval=$enable_fs_zip; -+ if test "$enableval" = yes; then -+ wx_cv_use_fs_zip='wxUSE_FS_ZIP=yes' -+ else -+ wx_cv_use_fs_zip='wxUSE_FS_ZIP=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_fs_zip" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-fsvolume was given. -+if test ${enable_fsvolume+y} -+then : -+ enableval=$enable_fsvolume; -+ if test "$enableval" = yes; then -+ wx_cv_use_fsvolume='wxUSE_FSVOLUME=yes' -+ else -+ wx_cv_use_fsvolume='wxUSE_FSVOLUME=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_fsvolume='wxUSE_FSVOLUME=${'DEFAULT_wxUSE_FSVOLUME":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_fsvolume" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-fswatcher was given. -+if test ${enable_fswatcher+y} -+then : -+ enableval=$enable_fswatcher; -+ if test "$enableval" = yes; then -+ wx_cv_use_fswatcher='wxUSE_FSWATCHER=yes' -+ else -+ wx_cv_use_fswatcher='wxUSE_FSWATCHER=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_fswatcher='wxUSE_FSWATCHER=${'DEFAULT_wxUSE_FSWATCHER":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_fswatcher" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-geometry was given. -+if test ${enable_geometry+y} -+then : -+ enableval=$enable_geometry; -+ if test "$enableval" = yes; then -+ wx_cv_use_geometry='wxUSE_GEOMETRY=yes' -+ else -+ wx_cv_use_geometry='wxUSE_GEOMETRY=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_geometry" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-log was given. -+if test ${enable_log+y} -+then : -+ enableval=$enable_log; -+ if test "$enableval" = yes; then -+ wx_cv_use_log='wxUSE_LOG=yes' -+ else -+ wx_cv_use_log='wxUSE_LOG=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_log" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-longlong was given. -+if test ${enable_longlong+y} -+then : -+ enableval=$enable_longlong; -+ if test "$enableval" = yes; then -+ wx_cv_use_longlong='wxUSE_LONGLONG=yes' -+ else -+ wx_cv_use_longlong='wxUSE_LONGLONG=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_longlong" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-mimetype was given. -+if test ${enable_mimetype+y} -+then : -+ enableval=$enable_mimetype; -+ if test "$enableval" = yes; then -+ wx_cv_use_mimetype='wxUSE_MIMETYPE=yes' -+ else -+ wx_cv_use_mimetype='wxUSE_MIMETYPE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_mimetype" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-printfposparam was given. -+if test ${enable_printfposparam+y} -+then : -+ enableval=$enable_printfposparam; -+ if test "$enableval" = yes; then -+ wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=yes' -+ else -+ wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_printfposparam" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-secretstore was given. -+if test ${enable_secretstore+y} -+then : -+ enableval=$enable_secretstore; -+ if test "$enableval" = yes; then -+ wx_cv_use_secretstore='wxUSE_SECRETSTORE=yes' -+ else -+ wx_cv_use_secretstore='wxUSE_SECRETSTORE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_secretstore='wxUSE_SECRETSTORE=${'DEFAULT_wxUSE_SECRETSTORE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_secretstore" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-snglinst was given. -+if test ${enable_snglinst+y} -+then : -+ enableval=$enable_snglinst; -+ if test "$enableval" = yes; then -+ wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes' -+ else -+ wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_snglinst" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-sound was given. -+if test ${enable_sound+y} -+then : -+ enableval=$enable_sound; -+ if test "$enableval" = yes; then -+ wx_cv_use_sound='wxUSE_SOUND=yes' -+ else -+ wx_cv_use_sound='wxUSE_SOUND=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_sound" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-spellcheck was given. -+if test ${enable_spellcheck+y} -+then : -+ enableval=$enable_spellcheck; -+ if test "$enableval" = yes; then -+ wx_cv_use_spellcheck='wxUSE_SPELLCHECK=yes' -+ else -+ wx_cv_use_spellcheck='wxUSE_SPELLCHECK=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_spellcheck='wxUSE_SPELLCHECK=${'DEFAULT_wxUSE_SPELLCHECK":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_spellcheck" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-stdpaths was given. -+if test ${enable_stdpaths+y} -+then : -+ enableval=$enable_stdpaths; -+ if test "$enableval" = yes; then -+ wx_cv_use_stdpaths='wxUSE_STDPATHS=yes' -+ else -+ wx_cv_use_stdpaths='wxUSE_STDPATHS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_stdpaths" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-stopwatch was given. -+if test ${enable_stopwatch+y} -+then : -+ enableval=$enable_stopwatch; -+ if test "$enableval" = yes; then -+ wx_cv_use_stopwatch='wxUSE_STOPWATCH=yes' -+ else -+ wx_cv_use_stopwatch='wxUSE_STOPWATCH=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_stopwatch" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-streams was given. -+if test ${enable_streams+y} -+then : -+ enableval=$enable_streams; -+ if test "$enableval" = yes; then -+ wx_cv_use_streams='wxUSE_STREAMS=yes' -+ else -+ wx_cv_use_streams='wxUSE_STREAMS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_streams" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-sysoptions was given. -+if test ${enable_sysoptions+y} -+then : -+ enableval=$enable_sysoptions; -+ if test "$enableval" = yes; then -+ wx_cv_use_sysoptions='wxUSE_SYSTEM_OPTIONS=yes' -+ else -+ wx_cv_use_sysoptions='wxUSE_SYSTEM_OPTIONS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_sysoptions='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_sysoptions" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-tarstream was given. -+if test ${enable_tarstream+y} -+then : -+ enableval=$enable_tarstream; -+ if test "$enableval" = yes; then -+ wx_cv_use_tarstream='wxUSE_TARSTREAM=yes' -+ else -+ wx_cv_use_tarstream='wxUSE_TARSTREAM=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_tarstream" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-textbuf was given. -+if test ${enable_textbuf+y} -+then : -+ enableval=$enable_textbuf; -+ if test "$enableval" = yes; then -+ wx_cv_use_textbuf='wxUSE_TEXTBUFFER=yes' -+ else -+ wx_cv_use_textbuf='wxUSE_TEXTBUFFER=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_textbuf" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-textfile was given. -+if test ${enable_textfile+y} -+then : -+ enableval=$enable_textfile; -+ if test "$enableval" = yes; then -+ wx_cv_use_textfile='wxUSE_TEXTFILE=yes' -+ else -+ wx_cv_use_textfile='wxUSE_TEXTFILE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_textfile" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-timer was given. -+if test ${enable_timer+y} -+then : -+ enableval=$enable_timer; -+ if test "$enableval" = yes; then -+ wx_cv_use_timer='wxUSE_TIMER=yes' -+ else -+ wx_cv_use_timer='wxUSE_TIMER=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_timer" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-variant was given. -+if test ${enable_variant+y} -+then : -+ enableval=$enable_variant; -+ if test "$enableval" = yes; then -+ wx_cv_use_variant='wxUSE_VARIANT=yes' -+ else -+ wx_cv_use_variant='wxUSE_VARIANT=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_variant" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-zipstream was given. -+if test ${enable_zipstream+y} -+then : -+ enableval=$enable_zipstream; -+ if test "$enableval" = yes; then -+ wx_cv_use_zipstream='wxUSE_ZIPSTREAM=yes' -+ else -+ wx_cv_use_zipstream='wxUSE_ZIPSTREAM=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_zipstream" -+ -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-url was given. -+if test ${enable_url+y} -+then : -+ enableval=$enable_url; -+ if test "$enableval" = yes; then -+ wx_cv_use_url='wxUSE_URL=yes' -+ else -+ wx_cv_use_url='wxUSE_URL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_url" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-protocol was given. -+if test ${enable_protocol+y} -+then : -+ enableval=$enable_protocol; -+ if test "$enableval" = yes; then -+ wx_cv_use_protocol='wxUSE_PROTOCOL=yes' -+ else -+ wx_cv_use_protocol='wxUSE_PROTOCOL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_protocol" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-protocol_http was given. -+if test ${enable_protocol_http+y} -+then : -+ enableval=$enable_protocol_http; -+ if test "$enableval" = yes; then -+ wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=yes' -+ else -+ wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_protocol_http" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-protocol_ftp was given. -+if test ${enable_protocol_ftp+y} -+then : -+ enableval=$enable_protocol_ftp; -+ if test "$enableval" = yes; then -+ wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=yes' -+ else -+ wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_protocol_ftp" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-protocol_file was given. -+if test ${enable_protocol_file+y} -+then : -+ enableval=$enable_protocol_file; -+ if test "$enableval" = yes; then -+ wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=yes' -+ else -+ wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_protocol_file" -+ -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-threads was given. -+if test ${enable_threads+y} -+then : -+ enableval=$enable_threads; -+ if test "$enableval" = yes; then -+ wx_cv_use_threads='wxUSE_THREADS=yes' -+ else -+ wx_cv_use_threads='wxUSE_THREADS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_threads" -+ -+ -+if test "$wxUSE_MSW" = 1 ; then -+ -+ enablestring=disable -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-dbghelp was given. -+if test ${enable_dbghelp+y} -+then : -+ enableval=$enable_dbghelp; -+ if test "$enableval" = yes; then -+ wx_cv_use_dbghelp='wxUSE_DBGHELP=yes' -+ else -+ wx_cv_use_dbghelp='wxUSE_DBGHELP=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_dbghelp='wxUSE_DBGHELP=${'DEFAULT_wxUSE_DBGHELP":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_dbghelp" -+ -+ -+ enablestring= -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-iniconf was given. -+if test ${enable_iniconf+y} -+then : -+ enableval=$enable_iniconf; -+ if test "$enableval" = yes; then -+ wx_cv_use_iniconf='wxUSE_INICONF=yes' -+ else -+ wx_cv_use_iniconf='wxUSE_INICONF=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_iniconf='wxUSE_INICONF=${'DEFAULT_wxUSE_INICONF":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_iniconf" -+ -+fi -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-regkey was given. -+if test ${enable_regkey+y} -+then : -+ enableval=$enable_regkey; -+ if test "$enableval" = yes; then -+ wx_cv_use_regkey='wxUSE_REGKEY=yes' -+ else -+ wx_cv_use_regkey='wxUSE_REGKEY=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_regkey='wxUSE_REGKEY=${'DEFAULT_wxUSE_REGKEY":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_regkey" -+ -+ -+if test "$wxUSE_GUI" = "yes"; then -+ -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-docview was given. -+if test ${enable_docview+y} -+then : -+ enableval=$enable_docview; -+ if test "$enableval" = yes; then -+ wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes' -+ else -+ wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_docview" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-help was given. -+if test ${enable_help+y} -+then : -+ enableval=$enable_help; -+ if test "$enableval" = yes; then -+ wx_cv_use_help='wxUSE_HELP=yes' -+ else -+ wx_cv_use_help='wxUSE_HELP=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_help" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-mshtmlhelp was given. -+if test ${enable_mshtmlhelp+y} -+then : -+ enableval=$enable_mshtmlhelp; -+ if test "$enableval" = yes; then -+ wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes' -+ else -+ wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_mshtmlhelp" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-html was given. -+if test ${enable_html+y} -+then : -+ enableval=$enable_html; -+ if test "$enableval" = yes; then -+ wx_cv_use_html='wxUSE_HTML=yes' -+ else -+ wx_cv_use_html='wxUSE_HTML=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_html" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-htmlhelp was given. -+if test ${enable_htmlhelp+y} -+then : -+ enableval=$enable_htmlhelp; -+ if test "$enableval" = yes; then -+ wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes' -+ else -+ wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_htmlhelp" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-xrc was given. -+if test ${enable_xrc+y} -+then : -+ enableval=$enable_xrc; -+ if test "$enableval" = yes; then -+ wx_cv_use_xrc='wxUSE_XRC=yes' -+ else -+ wx_cv_use_xrc='wxUSE_XRC=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_xrc" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-aui was given. -+if test ${enable_aui+y} -+then : -+ enableval=$enable_aui; -+ if test "$enableval" = yes; then -+ wx_cv_use_aui='wxUSE_AUI=yes' -+ else -+ wx_cv_use_aui='wxUSE_AUI=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_aui" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-propgrid was given. -+if test ${enable_propgrid+y} -+then : -+ enableval=$enable_propgrid; -+ if test "$enableval" = yes; then -+ wx_cv_use_propgrid='wxUSE_PROPGRID=yes' -+ else -+ wx_cv_use_propgrid='wxUSE_PROPGRID=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_propgrid='wxUSE_PROPGRID=${'DEFAULT_wxUSE_PROPGRID":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_propgrid" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-ribbon was given. -+if test ${enable_ribbon+y} -+then : -+ enableval=$enable_ribbon; -+ if test "$enableval" = yes; then -+ wx_cv_use_ribbon='wxUSE_RIBBON=yes' -+ else -+ wx_cv_use_ribbon='wxUSE_RIBBON=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_ribbon='wxUSE_RIBBON=${'DEFAULT_wxUSE_RIBBON":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_ribbon" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-stc was given. -+if test ${enable_stc+y} -+then : -+ enableval=$enable_stc; -+ if test "$enableval" = yes; then -+ wx_cv_use_stc='wxUSE_STC=yes' -+ else -+ wx_cv_use_stc='wxUSE_STC=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_stc" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-constraints was given. -+if test ${enable_constraints+y} -+then : -+ enableval=$enable_constraints; -+ if test "$enableval" = yes; then -+ wx_cv_use_constraints='wxUSE_CONSTRAINTS=yes' -+ else -+ wx_cv_use_constraints='wxUSE_CONSTRAINTS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_constraints" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-loggui was given. -+if test ${enable_loggui+y} -+then : -+ enableval=$enable_loggui; -+ if test "$enableval" = yes; then -+ wx_cv_use_loggui='wxUSE_LOGGUI=yes' -+ else -+ wx_cv_use_loggui='wxUSE_LOGGUI=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_loggui" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-logwin was given. -+if test ${enable_logwin+y} -+then : -+ enableval=$enable_logwin; -+ if test "$enableval" = yes; then -+ wx_cv_use_logwin='wxUSE_LOGWINDOW=yes' -+ else -+ wx_cv_use_logwin='wxUSE_LOGWINDOW=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_logwin" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-logdialog was given. -+if test ${enable_logdialog+y} -+then : -+ enableval=$enable_logdialog; -+ if test "$enableval" = yes; then -+ wx_cv_use_logdialog='wxUSE_LOGDIALOG=yes' -+ else -+ wx_cv_use_logdialog='wxUSE_LOGDIALOG=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_logdialog" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-mdi was given. -+if test ${enable_mdi+y} -+then : -+ enableval=$enable_mdi; -+ if test "$enableval" = yes; then -+ wx_cv_use_mdi='wxUSE_MDI=yes' -+ else -+ wx_cv_use_mdi='wxUSE_MDI=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_mdi" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-mdidoc was given. -+if test ${enable_mdidoc+y} -+then : -+ enableval=$enable_mdidoc; -+ if test "$enableval" = yes; then -+ wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=yes' -+ else -+ wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_mdidoc" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-mediactrl was given. -+if test ${enable_mediactrl+y} -+then : -+ enableval=$enable_mediactrl; -+ if test "$enableval" = yes; then -+ wx_cv_use_mediactrl='wxUSE_MEDIACTRL=yes' -+ else -+ wx_cv_use_mediactrl='wxUSE_MEDIACTRL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_mediactrl" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-richtext was given. -+if test ${enable_richtext+y} -+then : -+ enableval=$enable_richtext; -+ if test "$enableval" = yes; then -+ wx_cv_use_richtext='wxUSE_RICHTEXT=yes' -+ else -+ wx_cv_use_richtext='wxUSE_RICHTEXT=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_richtext" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-postscript was given. -+if test ${enable_postscript+y} -+then : -+ enableval=$enable_postscript; -+ if test "$enableval" = yes; then -+ wx_cv_use_postscript='wxUSE_POSTSCRIPT=yes' -+ else -+ wx_cv_use_postscript='wxUSE_POSTSCRIPT=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_postscript" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-printarch was given. -+if test ${enable_printarch+y} -+then : -+ enableval=$enable_printarch; -+ if test "$enableval" = yes; then -+ wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes' -+ else -+ wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_printarch" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-svg was given. -+if test ${enable_svg+y} -+then : -+ enableval=$enable_svg; -+ if test "$enableval" = yes; then -+ wx_cv_use_svg='wxUSE_SVG=yes' -+ else -+ wx_cv_use_svg='wxUSE_SVG=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_svg" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-webview was given. -+if test ${enable_webview+y} -+then : -+ enableval=$enable_webview; -+ if test "$enableval" = yes; then -+ wx_cv_use_webview='wxUSE_WEBVIEW=yes' -+ else -+ wx_cv_use_webview='wxUSE_WEBVIEW=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_webview='wxUSE_WEBVIEW=${'DEFAULT_wxUSE_WEBVIEW":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_webview" -+ -+ -+if test "$wxUSE_MAC" != 1; then -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-graphics_ctx was given. -+if test ${enable_graphics_ctx+y} -+then : -+ enableval=$enable_graphics_ctx; -+ if test "$enableval" = yes; then -+ wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=yes' -+ else -+ wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_graphics_ctx" -+ -+fi -+ -+if test "$wxUSE_MSW" = 1 ; then -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-graphics_d2d was given. -+if test ${enable_graphics_d2d+y} -+then : -+ enableval=$enable_graphics_d2d; -+ if test "$enableval" = yes; then -+ wx_cv_use_graphics_d2d='wxUSE_GRAPHICS_DIRECT2D=yes' -+ else -+ wx_cv_use_graphics_d2d='wxUSE_GRAPHICS_DIRECT2D=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_graphics_d2d='wxUSE_GRAPHICS_DIRECT2D=${'DEFAULT_wxUSE_GRAPHICS_DIRECT2D":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_graphics_d2d" -+ -+fi -+ -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-clipboard was given. -+if test ${enable_clipboard+y} -+then : -+ enableval=$enable_clipboard; -+ if test "$enableval" = yes; then -+ wx_cv_use_clipboard='wxUSE_CLIPBOARD=yes' -+ else -+ wx_cv_use_clipboard='wxUSE_CLIPBOARD=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_clipboard" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-dnd was given. -+if test ${enable_dnd+y} -+then : -+ enableval=$enable_dnd; -+ if test "$enableval" = yes; then -+ wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=yes' -+ else -+ wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_dnd" -+ -+ -+ -+DEFAULT_wxUSE_CONTROLS=none -+ -+ enablestring=disable -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-controls was given. -+if test ${enable_controls+y} -+then : -+ enableval=$enable_controls; -+ if test "$enableval" = yes; then -+ wx_cv_use_controls='wxUSE_CONTROLS=yes' -+ else -+ wx_cv_use_controls='wxUSE_CONTROLS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_controls" -+ -+ -+if test "$wxUSE_CONTROLS" = "no"; then -+ DEFAULT_wxUSE_ACCEL=no -+ DEFAULT_wxUSE_ANIMATIONCTRL=no -+ DEFAULT_wxUSE_BANNERWINDOW=no -+ DEFAULT_wxUSE_BMPBUTTON=no -+ DEFAULT_wxUSE_BUTTON=no -+ DEFAULT_wxUSE_CALCTRL=no -+ DEFAULT_wxUSE_CARET=no -+ DEFAULT_wxUSE_CHECKBOX=no -+ DEFAULT_wxUSE_CHECKLISTBOX=no -+ DEFAULT_wxUSE_CHOICE=no -+ DEFAULT_wxUSE_CHOICEBOOK=no -+ DEFAULT_wxUSE_COLLPANE=no -+ DEFAULT_wxUSE_COLOURPICKERCTRL=no -+ DEFAULT_wxUSE_COMBOBOX=no -+ DEFAULT_wxUSE_COMBOBOX=no -+ DEFAULT_wxUSE_COMMANDLINKBUTTON=no -+ DEFAULT_wxUSE_DATAVIEWCTRL=no -+ DEFAULT_wxUSE_DATEPICKCTRL=no -+ DEFAULT_wxUSE_DETECT_SM=no -+ DEFAULT_wxUSE_DIRPICKERCTRL=no -+ DEFAULT_wxUSE_DISPLAY=no -+ DEFAULT_wxUSE_FILECTRL=no -+ DEFAULT_wxUSE_FILEPICKERCTRL=no -+ DEFAULT_wxUSE_FONTPICKERCTRL=no -+ DEFAULT_wxUSE_GAUGE=no -+ DEFAULT_wxUSE_GRID=no -+ DEFAULT_wxUSE_HEADERCTRL=no -+ DEFAULT_wxUSE_HYPERLINKCTRL=no -+ DEFAULT_wxUSE_IMAGLIST=no -+ DEFAULT_wxUSE_LISTBOOK=no -+ DEFAULT_wxUSE_LISTBOX=no -+ DEFAULT_wxUSE_LISTCTRL=no -+ DEFAULT_wxUSE_MARKUP=no -+ DEFAULT_wxUSE_NOTEBOOK=no -+ DEFAULT_wxUSE_POPUPWIN=no -+ DEFAULT_wxUSE_RADIOBOX=no -+ DEFAULT_wxUSE_RADIOBTN=no -+ DEFAULT_wxUSE_RICHMSGDLG=no -+ DEFAULT_wxUSE_RICHTOOLTIP=no -+ DEFAULT_wxUSE_REARRANGECTRL=no -+ DEFAULT_wxUSE_SASH=no -+ DEFAULT_wxUSE_SCROLLBAR=no -+ DEFAULT_wxUSE_SEARCHCTRL=no -+ DEFAULT_wxUSE_SLIDER=no -+ DEFAULT_wxUSE_SPINBTN=no -+ DEFAULT_wxUSE_SPINCTRL=no -+ DEFAULT_wxUSE_SPLITTER=no -+ DEFAULT_wxUSE_STATBMP=no -+ DEFAULT_wxUSE_STATBOX=no -+ DEFAULT_wxUSE_STATLINE=no -+ DEFAULT_wxUSE_STATUSBAR=no -+ DEFAULT_wxUSE_TIMEPICKCTRL=no -+ DEFAULT_wxUSE_TIPWINDOW=no -+ DEFAULT_wxUSE_TOGGLEBTN=no -+ DEFAULT_wxUSE_TOOLBAR=no -+ DEFAULT_wxUSE_TOOLBAR_NATIVE=no -+ DEFAULT_wxUSE_TOOLBOOK=no -+ DEFAULT_wxUSE_TOOLTIPS=no -+ DEFAULT_wxUSE_TREEBOOK=no -+ DEFAULT_wxUSE_TREECTRL=no -+ DEFAULT_wxUSE_TREELISTCTRL=no -+fi -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-markup was given. -+if test ${enable_markup+y} -+then : -+ enableval=$enable_markup; -+ if test "$enableval" = yes; then -+ wx_cv_use_markup='wxUSE_MARKUP=yes' -+ else -+ wx_cv_use_markup='wxUSE_MARKUP=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_markup='wxUSE_MARKUP=${'DEFAULT_wxUSE_MARKUP":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_markup" -+ -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-accel was given. -+if test ${enable_accel+y} -+then : -+ enableval=$enable_accel; -+ if test "$enableval" = yes; then -+ wx_cv_use_accel='wxUSE_ACCEL=yes' -+ else -+ wx_cv_use_accel='wxUSE_ACCEL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_accel" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-actindicator was given. -+if test ${enable_actindicator+y} -+then : -+ enableval=$enable_actindicator; -+ if test "$enableval" = yes; then -+ wx_cv_use_actindicator='wxUSE_ACTIVITYINDICATOR=yes' -+ else -+ wx_cv_use_actindicator='wxUSE_ACTIVITYINDICATOR=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_actindicator='wxUSE_ACTIVITYINDICATOR=${'DEFAULT_wxUSE_ACTIVITYINDICATOR":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_actindicator" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-addremovectrl was given. -+if test ${enable_addremovectrl+y} -+then : -+ enableval=$enable_addremovectrl; -+ if test "$enableval" = yes; then -+ wx_cv_use_addremovectrl='wxUSE_ADDREMOVECTRL=yes' -+ else -+ wx_cv_use_addremovectrl='wxUSE_ADDREMOVECTRL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_addremovectrl='wxUSE_ADDREMOVECTRL=${'DEFAULT_wxUSE_ADDREMOVECTRL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_addremovectrl" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-animatectrl was given. -+if test ${enable_animatectrl+y} -+then : -+ enableval=$enable_animatectrl; -+ if test "$enableval" = yes; then -+ wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=yes' -+ else -+ wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_animatectrl" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-bannerwindow was given. -+if test ${enable_bannerwindow+y} -+then : -+ enableval=$enable_bannerwindow; -+ if test "$enableval" = yes; then -+ wx_cv_use_bannerwindow='wxUSE_BANNERWINDOW=yes' -+ else -+ wx_cv_use_bannerwindow='wxUSE_BANNERWINDOW=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_bannerwindow='wxUSE_BANNERWINDOW=${'DEFAULT_wxUSE_BANNERWINDOW":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_bannerwindow" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-artstd was given. -+if test ${enable_artstd+y} -+then : -+ enableval=$enable_artstd; -+ if test "$enableval" = yes; then -+ wx_cv_use_artstd='wxUSE_ARTPROVIDER_STD=yes' -+ else -+ wx_cv_use_artstd='wxUSE_ARTPROVIDER_STD=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_artstd='wxUSE_ARTPROVIDER_STD=${'DEFAULT_wxUSE_ARTPROVIDER_STD":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_artstd" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-arttango was given. -+if test ${enable_arttango+y} -+then : -+ enableval=$enable_arttango; -+ if test "$enableval" = yes; then -+ wx_cv_use_arttango='wxUSE_ARTPROVIDER_TANGO=yes' -+ else -+ wx_cv_use_arttango='wxUSE_ARTPROVIDER_TANGO=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_arttango='wxUSE_ARTPROVIDER_TANGO=${'DEFAULT_wxUSE_ARTPROVIDER_TANGO":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_arttango" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-bmpbutton was given. -+if test ${enable_bmpbutton+y} -+then : -+ enableval=$enable_bmpbutton; -+ if test "$enableval" = yes; then -+ wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes' -+ else -+ wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_bmpbutton" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-bmpcombobox was given. -+if test ${enable_bmpcombobox+y} -+then : -+ enableval=$enable_bmpcombobox; -+ if test "$enableval" = yes; then -+ wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=yes' -+ else -+ wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_bmpcombobox" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-button was given. -+if test ${enable_button+y} -+then : -+ enableval=$enable_button; -+ if test "$enableval" = yes; then -+ wx_cv_use_button='wxUSE_BUTTON=yes' -+ else -+ wx_cv_use_button='wxUSE_BUTTON=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_button" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-calendar was given. -+if test ${enable_calendar+y} -+then : -+ enableval=$enable_calendar; -+ if test "$enableval" = yes; then -+ wx_cv_use_calendar='wxUSE_CALCTRL=yes' -+ else -+ wx_cv_use_calendar='wxUSE_CALCTRL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_calendar" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-caret was given. -+if test ${enable_caret+y} -+then : -+ enableval=$enable_caret; -+ if test "$enableval" = yes; then -+ wx_cv_use_caret='wxUSE_CARET=yes' -+ else -+ wx_cv_use_caret='wxUSE_CARET=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_caret" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-checkbox was given. -+if test ${enable_checkbox+y} -+then : -+ enableval=$enable_checkbox; -+ if test "$enableval" = yes; then -+ wx_cv_use_checkbox='wxUSE_CHECKBOX=yes' -+ else -+ wx_cv_use_checkbox='wxUSE_CHECKBOX=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_checkbox" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-checklst was given. -+if test ${enable_checklst+y} -+then : -+ enableval=$enable_checklst; -+ if test "$enableval" = yes; then -+ wx_cv_use_checklst='wxUSE_CHECKLST=yes' -+ else -+ wx_cv_use_checklst='wxUSE_CHECKLST=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_checklst" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-choice was given. -+if test ${enable_choice+y} -+then : -+ enableval=$enable_choice; -+ if test "$enableval" = yes; then -+ wx_cv_use_choice='wxUSE_CHOICE=yes' -+ else -+ wx_cv_use_choice='wxUSE_CHOICE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_choice" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-choicebook was given. -+if test ${enable_choicebook+y} -+then : -+ enableval=$enable_choicebook; -+ if test "$enableval" = yes; then -+ wx_cv_use_choicebook='wxUSE_CHOICEBOOK=yes' -+ else -+ wx_cv_use_choicebook='wxUSE_CHOICEBOOK=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_choicebook" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-collpane was given. -+if test ${enable_collpane+y} -+then : -+ enableval=$enable_collpane; -+ if test "$enableval" = yes; then -+ wx_cv_use_collpane='wxUSE_COLLPANE=yes' -+ else -+ wx_cv_use_collpane='wxUSE_COLLPANE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_collpane" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-colourpicker was given. -+if test ${enable_colourpicker+y} -+then : -+ enableval=$enable_colourpicker; -+ if test "$enableval" = yes; then -+ wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=yes' -+ else -+ wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_colourpicker" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-combobox was given. -+if test ${enable_combobox+y} -+then : -+ enableval=$enable_combobox; -+ if test "$enableval" = yes; then -+ wx_cv_use_combobox='wxUSE_COMBOBOX=yes' -+ else -+ wx_cv_use_combobox='wxUSE_COMBOBOX=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_combobox" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-comboctrl was given. -+if test ${enable_comboctrl+y} -+then : -+ enableval=$enable_comboctrl; -+ if test "$enableval" = yes; then -+ wx_cv_use_comboctrl='wxUSE_COMBOCTRL=yes' -+ else -+ wx_cv_use_comboctrl='wxUSE_COMBOCTRL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_comboctrl" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-commandlinkbutton was given. -+if test ${enable_commandlinkbutton+y} -+then : -+ enableval=$enable_commandlinkbutton; -+ if test "$enableval" = yes; then -+ wx_cv_use_commandlinkbutton='wxUSE_COMMANDLINKBUTTON=yes' -+ else -+ wx_cv_use_commandlinkbutton='wxUSE_COMMANDLINKBUTTON=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_commandlinkbutton='wxUSE_COMMANDLINKBUTTON=${'DEFAULT_wxUSE_COMMANDLINKBUTTON":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_commandlinkbutton" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-dataviewctrl was given. -+if test ${enable_dataviewctrl+y} -+then : -+ enableval=$enable_dataviewctrl; -+ if test "$enableval" = yes; then -+ wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=yes' -+ else -+ wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_dataviewctrl" -+ -+ -+ enablestring=disable -+ defaultval= -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-nativedvc was given. -+if test ${enable_nativedvc+y} -+then : -+ enableval=$enable_nativedvc; -+ if test "$enableval" = yes; then -+ wx_cv_use_nativedvc='wxUSE_NATIVE_DATAVIEWCTRL=yes' -+ else -+ wx_cv_use_nativedvc='wxUSE_NATIVE_DATAVIEWCTRL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_nativedvc='wxUSE_NATIVE_DATAVIEWCTRL=${'DEFAULT_wxUSE_NATIVE_DATAVIEWCTRL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_nativedvc" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-datepick was given. -+if test ${enable_datepick+y} -+then : -+ enableval=$enable_datepick; -+ if test "$enableval" = yes; then -+ wx_cv_use_datepick='wxUSE_DATEPICKCTRL=yes' -+ else -+ wx_cv_use_datepick='wxUSE_DATEPICKCTRL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_datepick" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-detect_sm was given. -+if test ${enable_detect_sm+y} -+then : -+ enableval=$enable_detect_sm; -+ if test "$enableval" = yes; then -+ wx_cv_use_detect_sm='wxUSE_DETECT_SM=yes' -+ else -+ wx_cv_use_detect_sm='wxUSE_DETECT_SM=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_detect_sm" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-dirpicker was given. -+if test ${enable_dirpicker+y} -+then : -+ enableval=$enable_dirpicker; -+ if test "$enableval" = yes; then -+ wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=yes' -+ else -+ wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_dirpicker" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-display was given. -+if test ${enable_display+y} -+then : -+ enableval=$enable_display; -+ if test "$enableval" = yes; then -+ wx_cv_use_display='wxUSE_DISPLAY=yes' -+ else -+ wx_cv_use_display='wxUSE_DISPLAY=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_display" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-editablebox was given. -+if test ${enable_editablebox+y} -+then : -+ enableval=$enable_editablebox; -+ if test "$enableval" = yes; then -+ wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=yes' -+ else -+ wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_editablebox" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-filectrl was given. -+if test ${enable_filectrl+y} -+then : -+ enableval=$enable_filectrl; -+ if test "$enableval" = yes; then -+ wx_cv_use_filectrl='wxUSE_FILECTRL=yes' -+ else -+ wx_cv_use_filectrl='wxUSE_FILECTRL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_filectrl='wxUSE_FILECTRL=${'DEFAULT_wxUSE_FILECTRL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_filectrl" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-filepicker was given. -+if test ${enable_filepicker+y} -+then : -+ enableval=$enable_filepicker; -+ if test "$enableval" = yes; then -+ wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=yes' -+ else -+ wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_filepicker" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-fontpicker was given. -+if test ${enable_fontpicker+y} -+then : -+ enableval=$enable_fontpicker; -+ if test "$enableval" = yes; then -+ wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=yes' -+ else -+ wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_fontpicker" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-gauge was given. -+if test ${enable_gauge+y} -+then : -+ enableval=$enable_gauge; -+ if test "$enableval" = yes; then -+ wx_cv_use_gauge='wxUSE_GAUGE=yes' -+ else -+ wx_cv_use_gauge='wxUSE_GAUGE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_gauge" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-grid was given. -+if test ${enable_grid+y} -+then : -+ enableval=$enable_grid; -+ if test "$enableval" = yes; then -+ wx_cv_use_grid='wxUSE_GRID=yes' -+ else -+ wx_cv_use_grid='wxUSE_GRID=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_grid" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-headerctrl was given. -+if test ${enable_headerctrl+y} -+then : -+ enableval=$enable_headerctrl; -+ if test "$enableval" = yes; then -+ wx_cv_use_headerctrl='wxUSE_HEADERCTRL=yes' -+ else -+ wx_cv_use_headerctrl='wxUSE_HEADERCTRL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_headerctrl='wxUSE_HEADERCTRL=${'DEFAULT_wxUSE_HEADERCTRL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_headerctrl" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-hyperlink was given. -+if test ${enable_hyperlink+y} -+then : -+ enableval=$enable_hyperlink; -+ if test "$enableval" = yes; then -+ wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=yes' -+ else -+ wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_hyperlink" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-imaglist was given. -+if test ${enable_imaglist+y} -+then : -+ enableval=$enable_imaglist; -+ if test "$enableval" = yes; then -+ wx_cv_use_imaglist='wxUSE_IMAGLIST=yes' -+ else -+ wx_cv_use_imaglist='wxUSE_IMAGLIST=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_imaglist" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-infobar was given. -+if test ${enable_infobar+y} -+then : -+ enableval=$enable_infobar; -+ if test "$enableval" = yes; then -+ wx_cv_use_infobar='wxUSE_INFOBAR=yes' -+ else -+ wx_cv_use_infobar='wxUSE_INFOBAR=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_infobar='wxUSE_INFOBAR=${'DEFAULT_wxUSE_INFOBAR":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_infobar" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-listbook was given. -+if test ${enable_listbook+y} -+then : -+ enableval=$enable_listbook; -+ if test "$enableval" = yes; then -+ wx_cv_use_listbook='wxUSE_LISTBOOK=yes' -+ else -+ wx_cv_use_listbook='wxUSE_LISTBOOK=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_listbook" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-listbox was given. -+if test ${enable_listbox+y} -+then : -+ enableval=$enable_listbox; -+ if test "$enableval" = yes; then -+ wx_cv_use_listbox='wxUSE_LISTBOX=yes' -+ else -+ wx_cv_use_listbox='wxUSE_LISTBOX=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_listbox" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-listctrl was given. -+if test ${enable_listctrl+y} -+then : -+ enableval=$enable_listctrl; -+ if test "$enableval" = yes; then -+ wx_cv_use_listctrl='wxUSE_LISTCTRL=yes' -+ else -+ wx_cv_use_listctrl='wxUSE_LISTCTRL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_listctrl" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-notebook was given. -+if test ${enable_notebook+y} -+then : -+ enableval=$enable_notebook; -+ if test "$enableval" = yes; then -+ wx_cv_use_notebook='wxUSE_NOTEBOOK=yes' -+ else -+ wx_cv_use_notebook='wxUSE_NOTEBOOK=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_notebook" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-notifmsg was given. -+if test ${enable_notifmsg+y} -+then : -+ enableval=$enable_notifmsg; -+ if test "$enableval" = yes; then -+ wx_cv_use_notifmsg='wxUSE_NOTIFICATION_MESSAGE=yes' -+ else -+ wx_cv_use_notifmsg='wxUSE_NOTIFICATION_MESSAGE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_notifmsg='wxUSE_NOTIFICATION_MESSAGE=${'DEFAULT_wxUSE_NOTIFICATION_MESSAGE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_notifmsg" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-odcombobox was given. -+if test ${enable_odcombobox+y} -+then : -+ enableval=$enable_odcombobox; -+ if test "$enableval" = yes; then -+ wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=yes' -+ else -+ wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_odcombobox" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-popupwin was given. -+if test ${enable_popupwin+y} -+then : -+ enableval=$enable_popupwin; -+ if test "$enableval" = yes; then -+ wx_cv_use_popupwin='wxUSE_POPUPWIN=yes' -+ else -+ wx_cv_use_popupwin='wxUSE_POPUPWIN=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_popupwin" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-prefseditor was given. -+if test ${enable_prefseditor+y} -+then : -+ enableval=$enable_prefseditor; -+ if test "$enableval" = yes; then -+ wx_cv_use_prefseditor='wxUSE_PREFERENCES_EDITOR=yes' -+ else -+ wx_cv_use_prefseditor='wxUSE_PREFERENCES_EDITOR=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_prefseditor='wxUSE_PREFERENCES_EDITOR=${'DEFAULT_wxUSE_PREFERENCES_EDITOR":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_prefseditor" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-privatefonts was given. -+if test ${enable_privatefonts+y} -+then : -+ enableval=$enable_privatefonts; -+ if test "$enableval" = yes; then -+ wx_cv_use_privatefonts='wxUSE_PRIVATE_FONTS=yes' -+ else -+ wx_cv_use_privatefonts='wxUSE_PRIVATE_FONTS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_privatefonts='wxUSE_PRIVATE_FONTS=${'DEFAULT_wxUSE_PRIVATE_FONTS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_privatefonts" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-radiobox was given. -+if test ${enable_radiobox+y} -+then : -+ enableval=$enable_radiobox; -+ if test "$enableval" = yes; then -+ wx_cv_use_radiobox='wxUSE_RADIOBOX=yes' -+ else -+ wx_cv_use_radiobox='wxUSE_RADIOBOX=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_radiobox" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-radiobtn was given. -+if test ${enable_radiobtn+y} -+then : -+ enableval=$enable_radiobtn; -+ if test "$enableval" = yes; then -+ wx_cv_use_radiobtn='wxUSE_RADIOBTN=yes' -+ else -+ wx_cv_use_radiobtn='wxUSE_RADIOBTN=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_radiobtn" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-richmsgdlg was given. -+if test ${enable_richmsgdlg+y} -+then : -+ enableval=$enable_richmsgdlg; -+ if test "$enableval" = yes; then -+ wx_cv_use_richmsgdlg='wxUSE_RICHMSGDLG=yes' -+ else -+ wx_cv_use_richmsgdlg='wxUSE_RICHMSGDLG=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_richmsgdlg='wxUSE_RICHMSGDLG=${'DEFAULT_wxUSE_RICHMSGDLG":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_richmsgdlg" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-richtooltip was given. -+if test ${enable_richtooltip+y} -+then : -+ enableval=$enable_richtooltip; -+ if test "$enableval" = yes; then -+ wx_cv_use_richtooltip='wxUSE_RICHTOOLTIP=yes' -+ else -+ wx_cv_use_richtooltip='wxUSE_RICHTOOLTIP=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_richtooltip='wxUSE_RICHTOOLTIP=${'DEFAULT_wxUSE_RICHTOOLTIP":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_richtooltip" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-rearrangectrl was given. -+if test ${enable_rearrangectrl+y} -+then : -+ enableval=$enable_rearrangectrl; -+ if test "$enableval" = yes; then -+ wx_cv_use_rearrangectrl='wxUSE_REARRANGECTRL=yes' -+ else -+ wx_cv_use_rearrangectrl='wxUSE_REARRANGECTRL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_rearrangectrl='wxUSE_REARRANGECTRL=${'DEFAULT_wxUSE_REARRANGECTRL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_rearrangectrl" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-sash was given. -+if test ${enable_sash+y} -+then : -+ enableval=$enable_sash; -+ if test "$enableval" = yes; then -+ wx_cv_use_sash='wxUSE_SASH=yes' -+ else -+ wx_cv_use_sash='wxUSE_SASH=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_sash" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-scrollbar was given. -+if test ${enable_scrollbar+y} -+then : -+ enableval=$enable_scrollbar; -+ if test "$enableval" = yes; then -+ wx_cv_use_scrollbar='wxUSE_SCROLLBAR=yes' -+ else -+ wx_cv_use_scrollbar='wxUSE_SCROLLBAR=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_scrollbar" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-searchctrl was given. -+if test ${enable_searchctrl+y} -+then : -+ enableval=$enable_searchctrl; -+ if test "$enableval" = yes; then -+ wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=yes' -+ else -+ wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_searchctrl" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-slider was given. -+if test ${enable_slider+y} -+then : -+ enableval=$enable_slider; -+ if test "$enableval" = yes; then -+ wx_cv_use_slider='wxUSE_SLIDER=yes' -+ else -+ wx_cv_use_slider='wxUSE_SLIDER=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_slider" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-spinbtn was given. -+if test ${enable_spinbtn+y} -+then : -+ enableval=$enable_spinbtn; -+ if test "$enableval" = yes; then -+ wx_cv_use_spinbtn='wxUSE_SPINBTN=yes' -+ else -+ wx_cv_use_spinbtn='wxUSE_SPINBTN=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_spinbtn" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-spinctrl was given. -+if test ${enable_spinctrl+y} -+then : -+ enableval=$enable_spinctrl; -+ if test "$enableval" = yes; then -+ wx_cv_use_spinctrl='wxUSE_SPINCTRL=yes' -+ else -+ wx_cv_use_spinctrl='wxUSE_SPINCTRL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_spinctrl" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-splitter was given. -+if test ${enable_splitter+y} -+then : -+ enableval=$enable_splitter; -+ if test "$enableval" = yes; then -+ wx_cv_use_splitter='wxUSE_SPLITTER=yes' -+ else -+ wx_cv_use_splitter='wxUSE_SPLITTER=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_splitter" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-statbmp was given. -+if test ${enable_statbmp+y} -+then : -+ enableval=$enable_statbmp; -+ if test "$enableval" = yes; then -+ wx_cv_use_statbmp='wxUSE_STATBMP=yes' -+ else -+ wx_cv_use_statbmp='wxUSE_STATBMP=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_statbmp" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-statbox was given. -+if test ${enable_statbox+y} -+then : -+ enableval=$enable_statbox; -+ if test "$enableval" = yes; then -+ wx_cv_use_statbox='wxUSE_STATBOX=yes' -+ else -+ wx_cv_use_statbox='wxUSE_STATBOX=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_statbox" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-statline was given. -+if test ${enable_statline+y} -+then : -+ enableval=$enable_statline; -+ if test "$enableval" = yes; then -+ wx_cv_use_statline='wxUSE_STATLINE=yes' -+ else -+ wx_cv_use_statline='wxUSE_STATLINE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_statline" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-stattext was given. -+if test ${enable_stattext+y} -+then : -+ enableval=$enable_stattext; -+ if test "$enableval" = yes; then -+ wx_cv_use_stattext='wxUSE_STATTEXT=yes' -+ else -+ wx_cv_use_stattext='wxUSE_STATTEXT=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_stattext" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-statusbar was given. -+if test ${enable_statusbar+y} -+then : -+ enableval=$enable_statusbar; -+ if test "$enableval" = yes; then -+ wx_cv_use_statusbar='wxUSE_STATUSBAR=yes' -+ else -+ wx_cv_use_statusbar='wxUSE_STATUSBAR=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_statusbar" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-taskbaricon was given. -+if test ${enable_taskbaricon+y} -+then : -+ enableval=$enable_taskbaricon; -+ if test "$enableval" = yes; then -+ wx_cv_use_taskbaricon='wxUSE_TASKBARICON=yes' -+ else -+ wx_cv_use_taskbaricon='wxUSE_TASKBARICON=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_taskbaricon='wxUSE_TASKBARICON=${'DEFAULT_wxUSE_TASKBARICON":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_taskbaricon" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-tbarnative was given. -+if test ${enable_tbarnative+y} -+then : -+ enableval=$enable_tbarnative; -+ if test "$enableval" = yes; then -+ wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes' -+ else -+ wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_tbarnative" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-textctrl was given. -+if test ${enable_textctrl+y} -+then : -+ enableval=$enable_textctrl; -+ if test "$enableval" = yes; then -+ wx_cv_use_textctrl='wxUSE_TEXTCTRL=yes' -+ else -+ wx_cv_use_textctrl='wxUSE_TEXTCTRL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_textctrl" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-timepick was given. -+if test ${enable_timepick+y} -+then : -+ enableval=$enable_timepick; -+ if test "$enableval" = yes; then -+ wx_cv_use_timepick='wxUSE_TIMEPICKCTRL=yes' -+ else -+ wx_cv_use_timepick='wxUSE_TIMEPICKCTRL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_timepick='wxUSE_TIMEPICKCTRL=${'DEFAULT_wxUSE_TIMEPICKCTRL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_timepick" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-tipwindow was given. -+if test ${enable_tipwindow+y} -+then : -+ enableval=$enable_tipwindow; -+ if test "$enableval" = yes; then -+ wx_cv_use_tipwindow='wxUSE_TIPWINDOW=yes' -+ else -+ wx_cv_use_tipwindow='wxUSE_TIPWINDOW=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_tipwindow" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-togglebtn was given. -+if test ${enable_togglebtn+y} -+then : -+ enableval=$enable_togglebtn; -+ if test "$enableval" = yes; then -+ wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes' -+ else -+ wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_togglebtn" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-toolbar was given. -+if test ${enable_toolbar+y} -+then : -+ enableval=$enable_toolbar; -+ if test "$enableval" = yes; then -+ wx_cv_use_toolbar='wxUSE_TOOLBAR=yes' -+ else -+ wx_cv_use_toolbar='wxUSE_TOOLBAR=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_toolbar" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-toolbook was given. -+if test ${enable_toolbook+y} -+then : -+ enableval=$enable_toolbook; -+ if test "$enableval" = yes; then -+ wx_cv_use_toolbook='wxUSE_TOOLBOOK=yes' -+ else -+ wx_cv_use_toolbook='wxUSE_TOOLBOOK=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_toolbook" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-treebook was given. -+if test ${enable_treebook+y} -+then : -+ enableval=$enable_treebook; -+ if test "$enableval" = yes; then -+ wx_cv_use_treebook='wxUSE_TREEBOOK=yes' -+ else -+ wx_cv_use_treebook='wxUSE_TREEBOOK=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_treebook" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-treectrl was given. -+if test ${enable_treectrl+y} -+then : -+ enableval=$enable_treectrl; -+ if test "$enableval" = yes; then -+ wx_cv_use_treectrl='wxUSE_TREECTRL=yes' -+ else -+ wx_cv_use_treectrl='wxUSE_TREECTRL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_treectrl" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-treelist was given. -+if test ${enable_treelist+y} -+then : -+ enableval=$enable_treelist; -+ if test "$enableval" = yes; then -+ wx_cv_use_treelist='wxUSE_TREELISTCTRL=yes' -+ else -+ wx_cv_use_treelist='wxUSE_TREELISTCTRL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_treelist='wxUSE_TREELISTCTRL=${'DEFAULT_wxUSE_TREELISTCTRL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_treelist" -+ -+ -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-commondlg was given. -+if test ${enable_commondlg+y} -+then : -+ enableval=$enable_commondlg; -+ if test "$enableval" = yes; then -+ wx_cv_use_commondlg='wxUSE_COMMONDLGS=yes' -+ else -+ wx_cv_use_commondlg='wxUSE_COMMONDLGS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_commondlg" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-aboutdlg was given. -+if test ${enable_aboutdlg+y} -+then : -+ enableval=$enable_aboutdlg; -+ if test "$enableval" = yes; then -+ wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=yes' -+ else -+ wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_aboutdlg" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-choicedlg was given. -+if test ${enable_choicedlg+y} -+then : -+ enableval=$enable_choicedlg; -+ if test "$enableval" = yes; then -+ wx_cv_use_choicedlg='wxUSE_CHOICEDLG=yes' -+ else -+ wx_cv_use_choicedlg='wxUSE_CHOICEDLG=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_choicedlg" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-coldlg was given. -+if test ${enable_coldlg+y} -+then : -+ enableval=$enable_coldlg; -+ if test "$enableval" = yes; then -+ wx_cv_use_coldlg='wxUSE_COLOURDLG=yes' -+ else -+ wx_cv_use_coldlg='wxUSE_COLOURDLG=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_coldlg" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-creddlg was given. -+if test ${enable_creddlg+y} -+then : -+ enableval=$enable_creddlg; -+ if test "$enableval" = yes; then -+ wx_cv_use_creddlg='wxUSE_CREDENTIALDLG=yes' -+ else -+ wx_cv_use_creddlg='wxUSE_CREDENTIALDLG=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_creddlg='wxUSE_CREDENTIALDLG=${'DEFAULT_wxUSE_CREDENTIALDLG":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_creddlg" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-filedlg was given. -+if test ${enable_filedlg+y} -+then : -+ enableval=$enable_filedlg; -+ if test "$enableval" = yes; then -+ wx_cv_use_filedlg='wxUSE_FILEDLG=yes' -+ else -+ wx_cv_use_filedlg='wxUSE_FILEDLG=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_filedlg" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-finddlg was given. -+if test ${enable_finddlg+y} -+then : -+ enableval=$enable_finddlg; -+ if test "$enableval" = yes; then -+ wx_cv_use_finddlg='wxUSE_FINDREPLDLG=yes' -+ else -+ wx_cv_use_finddlg='wxUSE_FINDREPLDLG=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_finddlg" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-fontdlg was given. -+if test ${enable_fontdlg+y} -+then : -+ enableval=$enable_fontdlg; -+ if test "$enableval" = yes; then -+ wx_cv_use_fontdlg='wxUSE_FONTDLG=yes' -+ else -+ wx_cv_use_fontdlg='wxUSE_FONTDLG=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_fontdlg" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-dirdlg was given. -+if test ${enable_dirdlg+y} -+then : -+ enableval=$enable_dirdlg; -+ if test "$enableval" = yes; then -+ wx_cv_use_dirdlg='wxUSE_DIRDLG=yes' -+ else -+ wx_cv_use_dirdlg='wxUSE_DIRDLG=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_dirdlg" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-msgdlg was given. -+if test ${enable_msgdlg+y} -+then : -+ enableval=$enable_msgdlg; -+ if test "$enableval" = yes; then -+ wx_cv_use_msgdlg='wxUSE_MSGDLG=yes' -+ else -+ wx_cv_use_msgdlg='wxUSE_MSGDLG=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_msgdlg" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-numberdlg was given. -+if test ${enable_numberdlg+y} -+then : -+ enableval=$enable_numberdlg; -+ if test "$enableval" = yes; then -+ wx_cv_use_numberdlg='wxUSE_NUMBERDLG=yes' -+ else -+ wx_cv_use_numberdlg='wxUSE_NUMBERDLG=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_numberdlg" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-splash was given. -+if test ${enable_splash+y} -+then : -+ enableval=$enable_splash; -+ if test "$enableval" = yes; then -+ wx_cv_use_splash='wxUSE_SPLASH=yes' -+ else -+ wx_cv_use_splash='wxUSE_SPLASH=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_splash" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-textdlg was given. -+if test ${enable_textdlg+y} -+then : -+ enableval=$enable_textdlg; -+ if test "$enableval" = yes; then -+ wx_cv_use_textdlg='wxUSE_TEXTDLG=yes' -+ else -+ wx_cv_use_textdlg='wxUSE_TEXTDLG=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_textdlg" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-tipdlg was given. -+if test ${enable_tipdlg+y} -+then : -+ enableval=$enable_tipdlg; -+ if test "$enableval" = yes; then -+ wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes' -+ else -+ wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_tipdlg" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-progressdlg was given. -+if test ${enable_progressdlg+y} -+then : -+ enableval=$enable_progressdlg; -+ if test "$enableval" = yes; then -+ wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes' -+ else -+ wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_progressdlg" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-wizarddlg was given. -+if test ${enable_wizarddlg+y} -+then : -+ enableval=$enable_wizarddlg; -+ if test "$enableval" = yes; then -+ wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=yes' -+ else -+ wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_wizarddlg" -+ -+ -+ -+if test "$wxUSE_MSW" = 1 ; then -+ DEFAULT_wxUSE_ACCESSIBILITY=yes -+fi -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-menus was given. -+if test ${enable_menus+y} -+then : -+ enableval=$enable_menus; -+ if test "$enableval" = yes; then -+ wx_cv_use_menus='wxUSE_MENUS=yes' -+ else -+ wx_cv_use_menus='wxUSE_MENUS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_menus" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-menubar was given. -+if test ${enable_menubar+y} -+then : -+ enableval=$enable_menubar; -+ if test "$enableval" = yes; then -+ wx_cv_use_menubar='wxUSE_MENUBAR=yes' -+ else -+ wx_cv_use_menubar='wxUSE_MENUBAR=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_menubar='wxUSE_MENUBAR=${'DEFAULT_wxUSE_MENUBAR":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_menubar" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-miniframe was given. -+if test ${enable_miniframe+y} -+then : -+ enableval=$enable_miniframe; -+ if test "$enableval" = yes; then -+ wx_cv_use_miniframe='wxUSE_MINIFRAME=yes' -+ else -+ wx_cv_use_miniframe='wxUSE_MINIFRAME=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_miniframe" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-tooltips was given. -+if test ${enable_tooltips+y} -+then : -+ enableval=$enable_tooltips; -+ if test "$enableval" = yes; then -+ wx_cv_use_tooltips='wxUSE_TOOLTIPS=yes' -+ else -+ wx_cv_use_tooltips='wxUSE_TOOLTIPS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_tooltips" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-splines was given. -+if test ${enable_splines+y} -+then : -+ enableval=$enable_splines; -+ if test "$enableval" = yes; then -+ wx_cv_use_splines='wxUSE_SPLINES=yes' -+ else -+ wx_cv_use_splines='wxUSE_SPLINES=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_splines" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-mousewheel was given. -+if test ${enable_mousewheel+y} -+then : -+ enableval=$enable_mousewheel; -+ if test "$enableval" = yes; then -+ wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=yes' -+ else -+ wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_mousewheel" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-validators was given. -+if test ${enable_validators+y} -+then : -+ enableval=$enable_validators; -+ if test "$enableval" = yes; then -+ wx_cv_use_validators='wxUSE_VALIDATORS=yes' -+ else -+ wx_cv_use_validators='wxUSE_VALIDATORS=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_validators" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-busyinfo was given. -+if test ${enable_busyinfo+y} -+then : -+ enableval=$enable_busyinfo; -+ if test "$enableval" = yes; then -+ wx_cv_use_busyinfo='wxUSE_BUSYINFO=yes' -+ else -+ wx_cv_use_busyinfo='wxUSE_BUSYINFO=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_busyinfo" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-hotkey was given. -+if test ${enable_hotkey+y} -+then : -+ enableval=$enable_hotkey; -+ if test "$enableval" = yes; then -+ wx_cv_use_hotkey='wxUSE_HOTKEY=yes' -+ else -+ wx_cv_use_hotkey='wxUSE_HOTKEY=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_hotkey='wxUSE_HOTKEY=${'DEFAULT_wxUSE_HOTKEY":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_hotkey" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-joystick was given. -+if test ${enable_joystick+y} -+then : -+ enableval=$enable_joystick; -+ if test "$enableval" = yes; then -+ wx_cv_use_joystick='wxUSE_JOYSTICK=yes' -+ else -+ wx_cv_use_joystick='wxUSE_JOYSTICK=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_joystick='wxUSE_JOYSTICK=${'DEFAULT_wxUSE_JOYSTICK":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_joystick" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-metafile was given. -+if test ${enable_metafile+y} -+then : -+ enableval=$enable_metafile; -+ if test "$enableval" = yes; then -+ wx_cv_use_metafile='wxUSE_METAFILE=yes' -+ else -+ wx_cv_use_metafile='wxUSE_METAFILE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_metafile" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-dragimage was given. -+if test ${enable_dragimage+y} -+then : -+ enableval=$enable_dragimage; -+ if test "$enableval" = yes; then -+ wx_cv_use_dragimage='wxUSE_DRAGIMAGE=yes' -+ else -+ wx_cv_use_dragimage='wxUSE_DRAGIMAGE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_dragimage='wxUSE_DRAGIMAGE=${'DEFAULT_wxUSE_DRAGIMAGE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_dragimage" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-accessibility was given. -+if test ${enable_accessibility+y} -+then : -+ enableval=$enable_accessibility; -+ if test "$enableval" = yes; then -+ wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=yes' -+ else -+ wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=${'DEFAULT_wxUSE_ACCESSIBILITY":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_accessibility" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-uiactionsim was given. -+if test ${enable_uiactionsim+y} -+then : -+ enableval=$enable_uiactionsim; -+ if test "$enableval" = yes; then -+ wx_cv_use_uiactionsim='wxUSE_UIACTIONSIMULATOR=yes' -+ else -+ wx_cv_use_uiactionsim='wxUSE_UIACTIONSIMULATOR=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_uiactionsim='wxUSE_UIACTIONSIMULATOR=${'DEFAULT_wxUSE_UIACTIONSIMULATOR":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_uiactionsim" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-dctransform was given. -+if test ${enable_dctransform+y} -+then : -+ enableval=$enable_dctransform; -+ if test "$enableval" = yes; then -+ wx_cv_use_dctransform='wxUSE_DC_TRANSFORM_MATRIX=yes' -+ else -+ wx_cv_use_dctransform='wxUSE_DC_TRANSFORM_MATRIX=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_dctransform='wxUSE_DC_TRANSFORM_MATRIX=${'DEFAULT_wxUSE_DC_TRANSFORM_MATRIX":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_dctransform" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-webviewwebkit was given. -+if test ${enable_webviewwebkit+y} -+then : -+ enableval=$enable_webviewwebkit; -+ if test "$enableval" = yes; then -+ wx_cv_use_webviewwebkit='wxUSE_WEBVIEW_WEBKIT=yes' -+ else -+ wx_cv_use_webviewwebkit='wxUSE_WEBVIEW_WEBKIT=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_webviewwebkit='wxUSE_WEBVIEW_WEBKIT=${'DEFAULT_wxUSE_WEBVIEW_WEBKIT":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_webviewwebkit" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-glcanvasegl was given. -+if test ${enable_glcanvasegl+y} -+then : -+ enableval=$enable_glcanvasegl; -+ if test "$enableval" = yes; then -+ wx_cv_use_glcanvasegl='wxUSE_GLCANVAS_EGL=yes' -+ else -+ wx_cv_use_glcanvasegl='wxUSE_GLCANVAS_EGL=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_glcanvasegl='wxUSE_GLCANVAS_EGL=${'DEFAULT_wxUSE_GLCANVAS_EGL":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_glcanvasegl" -+ -+ -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-palette was given. -+if test ${enable_palette+y} -+then : -+ enableval=$enable_palette; -+ if test "$enableval" = yes; then -+ wx_cv_use_palette='wxUSE_PALETTE=yes' -+ else -+ wx_cv_use_palette='wxUSE_PALETTE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_palette='wxUSE_PALETTE=${'DEFAULT_wxUSE_PALETTE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_palette" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-image was given. -+if test ${enable_image+y} -+then : -+ enableval=$enable_image; -+ if test "$enableval" = yes; then -+ wx_cv_use_image='wxUSE_IMAGE=yes' -+ else -+ wx_cv_use_image='wxUSE_IMAGE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_image='wxUSE_IMAGE=${'DEFAULT_wxUSE_IMAGE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_image" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-gif was given. -+if test ${enable_gif+y} -+then : -+ enableval=$enable_gif; -+ if test "$enableval" = yes; then -+ wx_cv_use_gif='wxUSE_GIF=yes' -+ else -+ wx_cv_use_gif='wxUSE_GIF=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_gif='wxUSE_GIF=${'DEFAULT_wxUSE_GIF":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_gif" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-pcx was given. -+if test ${enable_pcx+y} -+then : -+ enableval=$enable_pcx; -+ if test "$enableval" = yes; then -+ wx_cv_use_pcx='wxUSE_PCX=yes' -+ else -+ wx_cv_use_pcx='wxUSE_PCX=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_pcx='wxUSE_PCX=${'DEFAULT_wxUSE_PCX":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_pcx" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-tga was given. -+if test ${enable_tga+y} -+then : -+ enableval=$enable_tga; -+ if test "$enableval" = yes; then -+ wx_cv_use_tga='wxUSE_TGA=yes' -+ else -+ wx_cv_use_tga='wxUSE_TGA=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_tga='wxUSE_TGA=${'DEFAULT_wxUSE_TGA":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_tga" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-iff was given. -+if test ${enable_iff+y} -+then : -+ enableval=$enable_iff; -+ if test "$enableval" = yes; then -+ wx_cv_use_iff='wxUSE_IFF=yes' -+ else -+ wx_cv_use_iff='wxUSE_IFF=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_iff='wxUSE_IFF=${'DEFAULT_wxUSE_IFF":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_iff" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-pnm was given. -+if test ${enable_pnm+y} -+then : -+ enableval=$enable_pnm; -+ if test "$enableval" = yes; then -+ wx_cv_use_pnm='wxUSE_PNM=yes' -+ else -+ wx_cv_use_pnm='wxUSE_PNM=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_pnm='wxUSE_PNM=${'DEFAULT_wxUSE_PNM":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_pnm" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-xpm was given. -+if test ${enable_xpm+y} -+then : -+ enableval=$enable_xpm; -+ if test "$enableval" = yes; then -+ wx_cv_use_xpm='wxUSE_XPM=yes' -+ else -+ wx_cv_use_xpm='wxUSE_XPM=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_xpm='wxUSE_XPM=${'DEFAULT_wxUSE_XPM":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_xpm" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-ico_cur was given. -+if test ${enable_ico_cur+y} -+then : -+ enableval=$enable_ico_cur; -+ if test "$enableval" = yes; then -+ wx_cv_use_ico_cur='wxUSE_ICO_CUR=yes' -+ else -+ wx_cv_use_ico_cur='wxUSE_ICO_CUR=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_ico_cur='wxUSE_ICO_CUR=${'DEFAULT_wxUSE_ICO_CUR":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_ico_cur" -+ -+ -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-dccache was given. -+if test ${enable_dccache+y} -+then : -+ enableval=$enable_dccache; -+ if test "$enableval" = yes; then -+ wx_cv_use_dccache='wxUSE_DC_CACHEING=yes' -+ else -+ wx_cv_use_dccache='wxUSE_DC_CACHEING=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_dccache" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-ps-in-msw was given. -+if test ${enable_ps_in_msw+y} -+then : -+ enableval=$enable_ps_in_msw; -+ if test "$enableval" = yes; then -+ wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=yes' -+ else -+ wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=${'DEFAULT_wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_ps_in_msw" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-ownerdrawn was given. -+if test ${enable_ownerdrawn+y} -+then : -+ enableval=$enable_ownerdrawn; -+ if test "$enableval" = yes; then -+ wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=yes' -+ else -+ wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=${'DEFAULT_wxUSE_OWNER_DRAWN":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_ownerdrawn" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-taskbarbutton was given. -+if test ${enable_taskbarbutton+y} -+then : -+ enableval=$enable_taskbarbutton; -+ if test "$enableval" = yes; then -+ wx_cv_use_taskbarbutton='wxUSE_TASKBARBUTTON=yes' -+ else -+ wx_cv_use_taskbarbutton='wxUSE_TASKBARBUTTON=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_taskbarbutton='wxUSE_TASKBARBUTTON=${'DEFAULT_wxUSE_TASKBARBUTTON":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_taskbarbutton" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-uxtheme was given. -+if test ${enable_uxtheme+y} -+then : -+ enableval=$enable_uxtheme; -+ if test "$enableval" = yes; then -+ wx_cv_use_uxtheme='wxUSE_UXTHEME=yes' -+ else -+ wx_cv_use_uxtheme='wxUSE_UXTHEME=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_uxtheme='wxUSE_UXTHEME=${'DEFAULT_wxUSE_UXTHEME":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_uxtheme" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-wxdib was given. -+if test ${enable_wxdib+y} -+then : -+ enableval=$enable_wxdib; -+ if test "$enableval" = yes; then -+ wx_cv_use_wxdib='wxUSE_DIB=yes' -+ else -+ wx_cv_use_wxdib='wxUSE_DIB=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_wxdib='wxUSE_DIB=${'DEFAULT_wxUSE_DIB":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_wxdib" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-webviewie was given. -+if test ${enable_webviewie+y} -+then : -+ enableval=$enable_webviewie; -+ if test "$enableval" = yes; then -+ wx_cv_use_webviewie='wxUSE_WEBVIEW_IE=yes' -+ else -+ wx_cv_use_webviewie='wxUSE_WEBVIEW_IE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_webviewie='wxUSE_WEBVIEW_IE=${'DEFAULT_wxUSE_WEBVIEW_IE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_webviewie" -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-webviewedge was given. -+if test ${enable_webviewedge+y} -+then : -+ enableval=$enable_webviewedge; -+ if test "$enableval" = yes; then -+ wx_cv_use_webviewedge='wxUSE_WEBVIEW_EDGE=yes' -+ else -+ wx_cv_use_webviewedge='wxUSE_WEBVIEW_EDGE=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_webviewedge='wxUSE_WEBVIEW_EDGE=${'DEFAULT_wxUSE_WEBVIEW_EDGE":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_webviewedge" -+ -+ -+if test "$wxUSE_MSW" != 1; then -+ DEFAULT_wxUSE_AUTOID_MANAGEMENT=no -+fi -+ -+ -+ enablestring= -+ defaultval=$wxUSE_ALL_FEATURES -+ if test -z "$defaultval"; then -+ if test x"$enablestring" = xdisable; then -+ defaultval=yes -+ else -+ defaultval=no -+ fi -+ fi -+ -+ # Check whether --enable-autoidman was given. -+if test ${enable_autoidman+y} -+then : -+ enableval=$enable_autoidman; -+ if test "$enableval" = yes; then -+ wx_cv_use_autoidman='wxUSE_AUTOID_MANAGEMENT=yes' -+ else -+ wx_cv_use_autoidman='wxUSE_AUTOID_MANAGEMENT=no' -+ fi -+ -+else case e in #( -+ e) -+ wx_cv_use_autoidman='wxUSE_AUTOID_MANAGEMENT=${'DEFAULT_wxUSE_AUTOID_MANAGEMENT":-$defaultval}" -+ ;; -+esac -+fi -+ -+ -+ eval "$wx_cv_use_autoidman" -+ -+ -+fi -+ -+ -+cat >confcache <<\_ACEOF -+# This file is a shell script that caches the results of configure -+# tests run on this system so they can be shared between configure -+# scripts and configure runs, see configure's option --config-cache. -+# It is not useful on other systems. If it contains results you don't -+# want to keep, you may remove or edit it. -+# -+# config.status only pays attention to the cache file if you give it -+# the --recheck option to rerun configure. -+# -+# 'ac_cv_env_foo' variables (set or unset) will be overridden when -+# loading this file, other *unset* 'ac_cv_foo' will be assigned the -+# following values. -+ -+_ACEOF -+ -+# The following way of writing the cache mishandles newlines in values, -+# but we know of no workaround that is simple, portable, and efficient. -+# So, we kill variables containing newlines. -+# Ultrix sh set writes to stderr and can't be redirected directly, -+# and sets the high bit in the cache file unless we assign to the vars. -+( -+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_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) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done -+ -+ (set) 2>&1 | -+ case $as_nl`(ac_space=' '; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) -+ # 'set' does not quote correctly, so add quotes: double-quote -+ # substitution turns \\\\ into \\, and sed turns \\ into \. -+ sed -n \ -+ "s/'/'\\\\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -+ ;; #( -+ *) -+ # 'set' quotes correctly as required by POSIX, so do not add quotes. -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" -+ ;; -+ esac | -+ sort -+) | -+ sed ' -+ /^ac_cv_env_/b end -+ t clear -+ :clear -+ 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 -+ { 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 -+ case $cache_file in #( -+ */* | ?:*) -+ mv -f confcache "$cache_file"$$ && -+ mv -f "$cache_file"$$ "$cache_file" ;; #( -+ *) -+ mv -f confcache "$cache_file" ;; -+ esac -+ fi -+ fi -+ else -+ { 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 -+ -+CFLAGS=${CFLAGS:=} -+ -+ -+ -+ -+ -+ -+ -+ -+ -+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 -+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 -+{ 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 case e in #( -+ e) 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}gcc" -+ 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 ;; -+esac -+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 "gcc", so it can be a program name with args. -+set dummy gcc; 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 case e in #( -+ e) 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="gcc" -+ 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 ;; -+esac -+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 -+ -+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 -+{ 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 case e in #( -+ e) 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}cc" -+ 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 ;; -+esac -+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 -+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 -+{ 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 case e in #( -+ e) if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+ ac_prog_rejected=no -+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 -+ if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then -+ ac_prog_rejected=yes -+ continue -+ fi -+ ac_cv_prog_CC="cc" -+ 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 -+ -+if test $ac_prog_rejected = yes; then -+ # We found a bogon in the path, so make sure we never use it. -+ set dummy $ac_cv_prog_CC -+ shift -+ if test $# != 0; then -+ # We chose a different compiler from the bogus one. -+ # 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+' '}$@" -+ fi -+fi -+fi ;; -+esac -+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 "$CC"; then -+ if test -n "$ac_tool_prefix"; then -+ for ac_prog in cl.exe -+ 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 -+{ 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 case e in #( -+ e) 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$ac_prog" -+ 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 ;; -+esac -+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 -+ -+ -+ test -n "$CC" && break -+ done -+fi -+if test -z "$CC"; then -+ ac_ct_CC=$CC -+ for ac_prog in cl.exe -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; 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 case e in #( -+ e) 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="$ac_prog" -+ 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 ;; -+esac -+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 -+ -+ -+ test -n "$ac_ct_CC" && break -+done -+ -+ 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 -+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 case e in #( -+ e) 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 ;; -+esac -+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 case e in #( -+ e) 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 ;; -+esac -+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" && { { 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. -+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 -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\"" -+printf "%s\n" "$ac_try_echo"; } >&5 -+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ sed '10a\ -+... rest of stderr output deleted ... -+ 10q' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ fi -+ rm -f conftest.er1 conftest.err -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+done -+ -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+ac_clean_files_save=$ac_clean_files -+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. -+{ 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.*" -+ -+ac_rmfiles= -+for ac_file in $ac_files -+do -+ case $ac_file in -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; -+ * ) ac_rmfiles="$ac_rmfiles $ac_file";; -+ esac -+done -+rm -f $ac_rmfiles -+ -+if { { ac_try="$ac_link_default" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+printf "%s\n" "$ac_try_echo"; } >&5 -+ (eval "$ac_link_default") 2>&5 -+ ac_status=$? -+ 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, -+# so that the user can short-circuit this test for compilers unknown to -+# Autoconf. -+for ac_file in $ac_files '' -+do -+ test -f "$ac_file" || continue -+ case $ac_file in -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) -+ ;; -+ [ab].out ) -+ # We found the default executable, but exeext='' is most -+ # certainly right. -+ break;; -+ *.* ) -+ if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; -+ then :; else -+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -+ fi -+ # We set ac_cv_exeext here because the later test for it is not -+ # safe: cross compilers may not add the suffix if given an '-o' -+ # argument, so we may need to know it at that point already. -+ # Even if this section looks crufty: it has the advantage of -+ # actually working. -+ break;; -+ * ) -+ break;; -+ esac -+done -+test "$ac_cv_exeext" = no && ac_cv_exeext= -+ -+else case e in #( -+ e) ac_file='' ;; -+esac -+fi -+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 -+ -+{ { 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 case e in #( -+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } ;; -+esac -+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 -+{ 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\"" -+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; } -+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 -+# 'rm'. -+for ac_file in conftest.exe conftest conftest.*; do -+ test -f "$ac_file" || continue -+ case $ac_file in -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; -+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -+ break;; -+ * ) break;; -+ esac -+done -+else case e in #( -+ e) { { 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; } ;; -+esac -+fi -+rm -f conftest conftest$ac_cv_exeext -+{ 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 -+ac_exeext=$EXEEXT -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+FILE *f = fopen ("conftest.out", "w"); -+ if (!f) -+ return 1; -+ return ferror (f) || fclose (f) != 0; -+ -+ ; -+ return 0; -+} -+_ACEOF -+ac_clean_files="$ac_clean_files conftest.out" -+# Check that the compiler produces executables we can run. If not, either -+# the compiler is broken, or we cross compile. -+{ 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 -+ *\"* | *\`* | *\\*) 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; } -+ if { ac_try='./conftest$ac_cv_exeext' -+ { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+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 -+ cross_compiling=no -+ else -+ if test "$cross_compiling" = maybe; then -+ cross_compiling=yes -+ else -+ { { 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 -+{ 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.o conftest.obj conftest.out -+ac_clean_files=$ac_clean_files_save -+{ 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 case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.o conftest.obj -+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\"" -+printf "%s\n" "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>&5 -+ ac_status=$? -+ 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 -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; -+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` -+ break;; -+ esac -+done -+else case e in #( -+ e) printf "%s\n" "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+{ { 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; } ;; -+esac -+fi -+rm -f conftest.$ac_cv_objext conftest.$ac_ext ;; -+esac -+fi -+{ 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 -+{ 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 case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+#ifndef __GNUC__ -+ choke me -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ ac_compiler_gnu=yes -+else case e in #( -+ e) ac_compiler_gnu=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ac_cv_c_compiler_gnu=$ac_compiler_gnu -+ ;; -+esac -+fi -+{ 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+y} -+ac_save_CFLAGS=$CFLAGS -+{ 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 case e in #( -+ e) ac_save_c_werror_flag=$ac_c_werror_flag -+ ac_c_werror_flag=yes -+ ac_cv_prog_cc_g=no -+ CFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ ac_cv_prog_cc_g=yes -+else case e in #( -+ e) CFLAGS="" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ -+else case e in #( -+ e) ac_c_werror_flag=$ac_save_c_werror_flag -+ CFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ ac_cv_prog_cc_g=yes -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ac_c_werror_flag=$ac_save_c_werror_flag ;; -+esac -+fi -+{ 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 -+ CFLAGS="-g -O2" -+ else -+ CFLAGS="-g" -+ fi -+else -+ if test "$GCC" = yes; then -+ CFLAGS="-O2" -+ else -+ CFLAGS= -+ fi -+fi -+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 case e in #( -+ e) ac_cv_prog_cc_c11=no -+ac_save_CC=$CC -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$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 ;; -+esac -+fi -+ -+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 case e in #( -+ e) 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 case e in #( -+ e) { 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" ;; -+esac -+fi -+ ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 -+ ac_prog_cc_stdc=c11 ;; -+esac -+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 case e in #( -+ e) 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 ;; -+esac -+fi -+ -+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 case e in #( -+ e) 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 case e in #( -+ e) { 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" ;; -+esac -+fi -+ ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 -+ ac_prog_cc_stdc=c99 ;; -+esac -+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 case e in #( -+ e) 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__" -+do -+ CC="$ac_save_CC $ac_arg" -+ if ac_fn_c_try_compile "$LINENO" -+then : -+ ac_cv_prog_cc_c89=$ac_arg -+fi -+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 ;; -+esac -+fi -+ -+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 case e in #( -+ e) 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 case e in #( -+ e) { 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" ;; -+esac -+fi -+ ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 -+ ac_prog_cc_stdc=c89 ;; -+esac -+fi -+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 -+ -+ -+ -+ -+ -+ -+ -+ -+ 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 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the Intel C compiler" >&5 -+printf %s "checking whether we are using the Intel C compiler... " >&6; } -+if test ${bakefile_cv_c_compiler___INTEL_COMPILER+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #ifndef __INTEL_COMPILER -+ choke me -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ bakefile_cv_c_compiler___INTEL_COMPILER=yes -+else case e in #( -+ e) bakefile_cv_c_compiler___INTEL_COMPILER=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___INTEL_COMPILER" >&5 -+printf "%s\n" "$bakefile_cv_c_compiler___INTEL_COMPILER" >&6; } -+ if test "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then -+ :; INTELCC=yes -+ else -+ :; -+ 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 -+ -+ -+ -+ -+ if test "$INTELCC" = "yes"; then -+ -+ -+ 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 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using Intel C compiler v8 or later" >&5 -+printf %s "checking whether we are using Intel C compiler v8 or later... " >&6; } -+if test ${bakefile_cv_c_compiler___INTEL_COMPILER_lt_800+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #ifndef __INTEL_COMPILER || __INTEL_COMPILER < 800 -+ choke me -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ bakefile_cv_c_compiler___INTEL_COMPILER_lt_800=yes -+else case e in #( -+ e) bakefile_cv_c_compiler___INTEL_COMPILER_lt_800=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___INTEL_COMPILER_lt_800" >&5 -+printf "%s\n" "$bakefile_cv_c_compiler___INTEL_COMPILER_lt_800" >&6; } -+ if test "x$bakefile_cv_c_compiler___INTEL_COMPILER_lt_800" = "xyes"; then -+ :; INTELCC8=yes -+ else -+ :; -+ 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 -+ -+ -+ -+ -+ -+ 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 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using Intel C compiler v10 or later" >&5 -+printf %s "checking whether we are using Intel C compiler v10 or later... " >&6; } -+if test ${bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #ifndef __INTEL_COMPILER || __INTEL_COMPILER < 1000 -+ choke me -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000=yes -+else case e in #( -+ e) bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000" >&5 -+printf "%s\n" "$bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000" >&6; } -+ if test "x$bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000" = "xyes"; then -+ :; INTELCC10=yes -+ else -+ :; -+ 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 -+ -+ -+ -+ fi -+ -+ if test "x$GCC" != "xyes"; then -+ case `uname -s` in -+ AIX*) -+ -+ -+ 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 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the IBM xlC C compiler" >&5 -+printf %s "checking whether we are using the IBM xlC C compiler... " >&6; } -+if test ${bakefile_cv_c_compiler___xlC__+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #ifndef __xlC__ -+ choke me -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ bakefile_cv_c_compiler___xlC__=yes -+else case e in #( -+ e) bakefile_cv_c_compiler___xlC__=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___xlC__" >&5 -+printf "%s\n" "$bakefile_cv_c_compiler___xlC__" >&6; } -+ if test "x$bakefile_cv_c_compiler___xlC__" = "xyes"; then -+ :; XLCC=yes -+ else -+ :; -+ 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 -+ -+ -+ -+ ;; -+ -+ Darwin) -+ -+ -+ 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 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the IBM xlC C compiler" >&5 -+printf %s "checking whether we are using the IBM xlC C compiler... " >&6; } -+if test ${bakefile_cv_c_compiler___xlC__+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #ifndef __xlC__ -+ choke me -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ bakefile_cv_c_compiler___xlC__=yes -+else case e in #( -+ e) bakefile_cv_c_compiler___xlC__=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___xlC__" >&5 -+printf "%s\n" "$bakefile_cv_c_compiler___xlC__" >&6; } -+ if test "x$bakefile_cv_c_compiler___xlC__" = "xyes"; then -+ :; XLCC=yes -+ else -+ :; -+ 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 -+ -+ -+ -+ ;; -+ -+ IRIX*) -+ -+ -+ 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 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the SGI C compiler" >&5 -+printf %s "checking whether we are using the SGI C compiler... " >&6; } -+if test ${bakefile_cv_c_compiler__SGI_COMPILER_VERSION+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #ifndef _SGI_COMPILER_VERSION -+ choke me -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ bakefile_cv_c_compiler__SGI_COMPILER_VERSION=yes -+else case e in #( -+ e) bakefile_cv_c_compiler__SGI_COMPILER_VERSION=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&5 -+printf "%s\n" "$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&6; } -+ if test "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then -+ :; SGICC=yes -+ else -+ :; -+ 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 -+ -+ -+ -+ ;; -+ -+ Linux*) -+ if test "$INTELCC" != "yes"; then -+ -+ -+ 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 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the Sun C compiler" >&5 -+printf %s "checking whether we are using the Sun C compiler... " >&6; } -+if test ${bakefile_cv_c_compiler___SUNPRO_C+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #ifndef __SUNPRO_C -+ choke me -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ bakefile_cv_c_compiler___SUNPRO_C=yes -+else case e in #( -+ e) bakefile_cv_c_compiler___SUNPRO_C=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5 -+printf "%s\n" "$bakefile_cv_c_compiler___SUNPRO_C" >&6; } -+ if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then -+ :; SUNCC=yes -+ else -+ :; -+ 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 -+ -+ -+ -+ fi -+ ;; -+ -+ HP-UX*) -+ -+ -+ 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 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the HP C compiler" >&5 -+printf %s "checking whether we are using the HP C compiler... " >&6; } -+if test ${bakefile_cv_c_compiler___HP_cc+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #ifndef __HP_cc -+ choke me -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ bakefile_cv_c_compiler___HP_cc=yes -+else case e in #( -+ e) bakefile_cv_c_compiler___HP_cc=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___HP_cc" >&5 -+printf "%s\n" "$bakefile_cv_c_compiler___HP_cc" >&6; } -+ if test "x$bakefile_cv_c_compiler___HP_cc" = "xyes"; then -+ :; HPCC=yes -+ else -+ :; -+ 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 -+ -+ -+ -+ ;; -+ -+ OSF1) -+ -+ -+ 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 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the Compaq C compiler" >&5 -+printf %s "checking whether we are using the Compaq C compiler... " >&6; } -+if test ${bakefile_cv_c_compiler___DECC+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #ifndef __DECC -+ choke me -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ bakefile_cv_c_compiler___DECC=yes -+else case e in #( -+ e) bakefile_cv_c_compiler___DECC=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___DECC" >&5 -+printf "%s\n" "$bakefile_cv_c_compiler___DECC" >&6; } -+ if test "x$bakefile_cv_c_compiler___DECC" = "xyes"; then -+ :; COMPAQCC=yes -+ else -+ :; -+ 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 -+ -+ -+ -+ ;; -+ -+ SunOS) -+ -+ -+ 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 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the Sun C compiler" >&5 -+printf %s "checking whether we are using the Sun C compiler... " >&6; } -+if test ${bakefile_cv_c_compiler___SUNPRO_C+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #ifndef __SUNPRO_C -+ choke me -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ bakefile_cv_c_compiler___SUNPRO_C=yes -+else case e in #( -+ e) bakefile_cv_c_compiler___SUNPRO_C=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5 -+printf "%s\n" "$bakefile_cv_c_compiler___SUNPRO_C" >&6; } -+ if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then -+ :; SUNCC=yes -+ else -+ :; -+ 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 -+ -+ -+ -+ ;; -+ esac -+ fi -+ -+ -+ -+ -+ -+CXXFLAGS=${CXXFLAGS:=} -+ -+ -+ -+ -+ -+ -+ac_ext=cpp -+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 -+if test -z "$CXX"; then -+ if test -n "$CCC"; 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 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 -+{ 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 case e in #( -+ e) if test -n "$CXX"; then -+ ac_cv_prog_CXX="$CXX" # 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_CXX="$ac_tool_prefix$ac_prog" -+ 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 ;; -+esac -+fi -+CXX=$ac_cv_prog_CXX -+if test -n "$CXX"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -+printf "%s\n" "$CXX" >&6; } -+else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+fi -+ -+ -+ test -n "$CXX" && break -+ done -+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 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 -+{ 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 case e in #( -+ e) if test -n "$ac_ct_CXX"; then -+ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # 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_CXX="$ac_prog" -+ 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 ;; -+esac -+fi -+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -+if test -n "$ac_ct_CXX"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -+printf "%s\n" "$ac_ct_CXX" >&6; } -+else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+fi -+ -+ -+ test -n "$ac_ct_CXX" && break -+done -+ -+ if test "x$ac_ct_CXX" = x; then -+ CXX="g++" -+ 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 -+ CXX=$ac_ct_CXX -+ fi -+fi -+ -+ fi -+fi -+# Provide some information about the compiler. -+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 -+ { { 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\"" -+printf "%s\n" "$ac_try_echo"; } >&5 -+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ sed '10a\ -+... rest of stderr output deleted ... -+ 10q' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ fi -+ rm -f conftest.er1 conftest.err -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+done -+ -+{ 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 case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+#ifndef __GNUC__ -+ choke me -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ ac_compiler_gnu=yes -+else case e in #( -+ e) ac_compiler_gnu=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu -+ ;; -+esac -+fi -+{ 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+y} -+ac_save_CXXFLAGS=$CXXFLAGS -+{ 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 case e in #( -+ e) ac_save_cxx_werror_flag=$ac_cxx_werror_flag -+ ac_cxx_werror_flag=yes -+ ac_cv_prog_cxx_g=no -+ CXXFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ ac_cv_prog_cxx_g=yes -+else case e in #( -+ e) CXXFLAGS="" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ -+else case e in #( -+ e) ac_cxx_werror_flag=$ac_save_cxx_werror_flag -+ CXXFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ ac_cv_prog_cxx_g=yes -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ;; -+esac -+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_cxx11+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_cv_prog_cxx_cxx11=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 ;; -+esac -+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 case e in #( -+ e) 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 case e in #( -+ e) { 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" ;; -+esac -+fi -+ ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 -+ ac_prog_cxx_stdcxx=cxx11 ;; -+esac -+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_cxx98+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_cv_prog_cxx_cxx98=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 ;; -+esac -+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 case e in #( -+ e) 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 case e in #( -+ e) { 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" ;; -+esac -+fi -+ ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 -+ ac_prog_cxx_stdcxx=cxx98 ;; -+esac -+fi -+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 -+ -+ -+ -+ -+ -+ -+ -+ -+ ac_ext=cpp -+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 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the Intel C++ compiler" >&5 -+printf %s "checking whether we are using the Intel C++ compiler... " >&6; } -+if test ${bakefile_cv_cxx_compiler___INTEL_COMPILER+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #ifndef __INTEL_COMPILER -+ choke me -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ bakefile_cv_cxx_compiler___INTEL_COMPILER=yes -+else case e in #( -+ e) bakefile_cv_cxx_compiler___INTEL_COMPILER=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER" >&5 -+printf "%s\n" "$bakefile_cv_cxx_compiler___INTEL_COMPILER" >&6; } -+ if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER" = "xyes"; then -+ :; INTELCXX=yes -+ else -+ :; -+ 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 -+ -+ -+ -+ -+ if test "$INTELCXX" = "yes"; then -+ -+ -+ ac_ext=cpp -+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 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using Intel C++ compiler v8 or later" >&5 -+printf %s "checking whether we are using Intel C++ compiler v8 or later... " >&6; } -+if test ${bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #ifndef __INTEL_COMPILER || __INTEL_COMPILER < 800 -+ choke me -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800=yes -+else case e in #( -+ e) bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800" >&5 -+printf "%s\n" "$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800" >&6; } -+ if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800" = "xyes"; then -+ :; INTELCXX8=yes -+ else -+ :; -+ 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 -+ -+ -+ -+ -+ -+ ac_ext=cpp -+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 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using Intel C++ compiler v10 or later" >&5 -+printf %s "checking whether we are using Intel C++ compiler v10 or later... " >&6; } -+if test ${bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #ifndef __INTEL_COMPILER || __INTEL_COMPILER < 1000 -+ choke me -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000=yes -+else case e in #( -+ e) bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000" >&5 -+printf "%s\n" "$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000" >&6; } -+ if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000" = "xyes"; then -+ :; INTELCXX10=yes -+ else -+ :; -+ 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 -+ -+ -+ -+ fi -+ -+ if test "x$GCXX" != "xyes"; then -+ case `uname -s` in -+ AIX*) -+ -+ -+ ac_ext=cpp -+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 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the IBM xlC C++ compiler" >&5 -+printf %s "checking whether we are using the IBM xlC C++ compiler... " >&6; } -+if test ${bakefile_cv_cxx_compiler___xlC__+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #ifndef __xlC__ -+ choke me -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ bakefile_cv_cxx_compiler___xlC__=yes -+else case e in #( -+ e) bakefile_cv_cxx_compiler___xlC__=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___xlC__" >&5 -+printf "%s\n" "$bakefile_cv_cxx_compiler___xlC__" >&6; } -+ if test "x$bakefile_cv_cxx_compiler___xlC__" = "xyes"; then -+ :; XLCXX=yes -+ else -+ :; -+ 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 -+ -+ -+ -+ ;; -+ -+ Darwin) -+ -+ -+ ac_ext=cpp -+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 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the IBM xlC C++ compiler" >&5 -+printf %s "checking whether we are using the IBM xlC C++ compiler... " >&6; } -+if test ${bakefile_cv_cxx_compiler___xlC__+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #ifndef __xlC__ -+ choke me -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ bakefile_cv_cxx_compiler___xlC__=yes -+else case e in #( -+ e) bakefile_cv_cxx_compiler___xlC__=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___xlC__" >&5 -+printf "%s\n" "$bakefile_cv_cxx_compiler___xlC__" >&6; } -+ if test "x$bakefile_cv_cxx_compiler___xlC__" = "xyes"; then -+ :; XLCXX=yes -+ else -+ :; -+ 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 -+ -+ -+ -+ ;; -+ -+ IRIX*) -+ -+ -+ ac_ext=cpp -+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 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the SGI C++ compiler" >&5 -+printf %s "checking whether we are using the SGI C++ compiler... " >&6; } -+if test ${bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #ifndef _SGI_COMPILER_VERSION -+ choke me -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION=yes -+else case e in #( -+ e) bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&5 -+printf "%s\n" "$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&6; } -+ if test "x$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" = "xyes"; then -+ :; SGICXX=yes -+ else -+ :; -+ 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 -+ -+ -+ -+ ;; -+ -+ Linux*) -+ if test "$INTELCXX" != "yes"; then -+ -+ -+ ac_ext=cpp -+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 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the Sun C++ compiler" >&5 -+printf %s "checking whether we are using the Sun C++ compiler... " >&6; } -+if test ${bakefile_cv_cxx_compiler___SUNPRO_CC+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #ifndef __SUNPRO_CC -+ choke me -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ bakefile_cv_cxx_compiler___SUNPRO_CC=yes -+else case e in #( -+ e) bakefile_cv_cxx_compiler___SUNPRO_CC=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5 -+printf "%s\n" "$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6; } -+ if test "x$bakefile_cv_cxx_compiler___SUNPRO_CC" = "xyes"; then -+ :; SUNCXX=yes -+ else -+ :; -+ 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 -+ -+ -+ -+ fi -+ ;; -+ -+ HP-UX*) -+ -+ -+ ac_ext=cpp -+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 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the HP C++ compiler" >&5 -+printf %s "checking whether we are using the HP C++ compiler... " >&6; } -+if test ${bakefile_cv_cxx_compiler___HP_aCC+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #ifndef __HP_aCC -+ choke me -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ bakefile_cv_cxx_compiler___HP_aCC=yes -+else case e in #( -+ e) bakefile_cv_cxx_compiler___HP_aCC=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___HP_aCC" >&5 -+printf "%s\n" "$bakefile_cv_cxx_compiler___HP_aCC" >&6; } -+ if test "x$bakefile_cv_cxx_compiler___HP_aCC" = "xyes"; then -+ :; HPCXX=yes -+ else -+ :; -+ 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 -+ -+ -+ -+ ;; -+ -+ OSF1) -+ -+ -+ ac_ext=cpp -+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 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the Compaq C++ compiler" >&5 -+printf %s "checking whether we are using the Compaq C++ compiler... " >&6; } -+if test ${bakefile_cv_cxx_compiler___DECCXX+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #ifndef __DECCXX -+ choke me -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ bakefile_cv_cxx_compiler___DECCXX=yes -+else case e in #( -+ e) bakefile_cv_cxx_compiler___DECCXX=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___DECCXX" >&5 -+printf "%s\n" "$bakefile_cv_cxx_compiler___DECCXX" >&6; } -+ if test "x$bakefile_cv_cxx_compiler___DECCXX" = "xyes"; then -+ :; COMPAQCXX=yes -+ else -+ :; -+ 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 -+ -+ -+ -+ ;; -+ -+ SunOS) -+ -+ -+ ac_ext=cpp -+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 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the Sun C++ compiler" >&5 -+printf %s "checking whether we are using the Sun C++ compiler... " >&6; } -+if test ${bakefile_cv_cxx_compiler___SUNPRO_CC+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #ifndef __SUNPRO_CC -+ choke me -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ bakefile_cv_cxx_compiler___SUNPRO_CC=yes -+else case e in #( -+ e) bakefile_cv_cxx_compiler___SUNPRO_CC=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5 -+printf "%s\n" "$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6; } -+ if test "x$bakefile_cv_cxx_compiler___SUNPRO_CC" = "xyes"; then -+ :; SUNCXX=yes -+ else -+ :; -+ 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 -+ -+ -+ -+ ;; -+ esac -+ fi -+ -+ -+ -+if test "$CXX" = "g++" -a "$GXX" != "yes"; then -+ as_fn_error $? "C++ compiler is needed to build wxWidgets" "$LINENO" 5 -+fi -+ -+if test "$wxUSE_MAC" = 1 -a -z "$wxWITH_CXX"; then -+ wxWITH_CXX=11 -+fi -+ -+if test -n "$wxWITH_CXX"; then -+ case "$wxWITH_CXX" in -+ 11) -+ ax_cxx_compile_alternatives="11 0x" ax_cxx_compile_cxx11_required=false -+ ac_ext=cpp -+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 -+ ac_success=no -+ -+ { 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 case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+// If the compiler admits that it is not ready for C++11, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201103L -+ -+#error "This is not a C++11 compiler" -+ -+#else -+ -+namespace cxx11 -+{ -+ -+ namespace test_static_assert -+ { -+ -+ template -+ struct check -+ { -+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); -+ }; -+ -+ } -+ -+ namespace test_final_override -+ { -+ -+ struct Base -+ { -+ virtual ~Base() {} -+ virtual void f() {} -+ }; -+ -+ struct Derived : public Base -+ { -+ virtual ~Derived() override {} -+ virtual void f() override {} -+ }; -+ -+ } -+ -+ namespace test_double_right_angle_brackets -+ { -+ -+ template < typename T > -+ struct check {}; -+ -+ typedef check single_type; -+ typedef check> double_type; -+ typedef check>> triple_type; -+ typedef check>>> quadruple_type; -+ -+ } -+ -+ namespace test_decltype -+ { -+ -+ int -+ f() -+ { -+ int a = 1; -+ decltype(a) b = 2; -+ return a + b; -+ } -+ -+ } -+ -+ namespace test_type_deduction -+ { -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static const bool value = false; -+ }; -+ -+ template < typename T > -+ struct is_same -+ { -+ static const bool value = true; -+ }; -+ -+ template < typename T1, typename T2 > -+ auto -+ add(T1 a1, T2 a2) -> decltype(a1 + a2) -+ { -+ return a1 + a2; -+ } -+ -+ int -+ test(const int c, volatile int v) -+ { -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == false, ""); -+ auto ac = c; -+ auto av = v; -+ auto sumi = ac + av + 'x'; -+ auto sumf = ac + av + 1.0; -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == true, ""); -+ return (sumf > 0.0) ? sumi : add(c, v); -+ } -+ -+ } -+ -+ namespace test_noexcept -+ { -+ -+ int f() { return 0; } -+ int g() noexcept { return 0; } -+ -+ static_assert(noexcept(f()) == false, ""); -+ static_assert(noexcept(g()) == true, ""); -+ -+ } -+ -+ namespace test_constexpr -+ { -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c_r(const CharT *const s, const unsigned long acc) noexcept -+ { -+ return *s ? strlen_c_r(s + 1, acc + 1) : acc; -+ } -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c(const CharT *const s) noexcept -+ { -+ return strlen_c_r(s, 0UL); -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("1") == 1UL, ""); -+ static_assert(strlen_c("example") == 7UL, ""); -+ static_assert(strlen_c("another\0example") == 7UL, ""); -+ -+ } -+ -+ namespace test_rvalue_references -+ { -+ -+ template < int N > -+ struct answer -+ { -+ static constexpr int value = N; -+ }; -+ -+ answer<1> f(int&) { return answer<1>(); } -+ answer<2> f(const int&) { return answer<2>(); } -+ answer<3> f(int&&) { return answer<3>(); } -+ -+ void -+ test() -+ { -+ int i = 0; -+ const int c = 0; -+ static_assert(decltype(f(i))::value == 1, ""); -+ static_assert(decltype(f(c))::value == 2, ""); -+ static_assert(decltype(f(0))::value == 3, ""); -+ } -+ -+ } -+ -+ namespace test_uniform_initialization -+ { -+ -+ struct test -+ { -+ static const int zero {}; -+ static const int one {1}; -+ }; -+ -+ static_assert(test::zero == 0, ""); -+ static_assert(test::one == 1, ""); -+ -+ } -+ -+ namespace test_lambdas -+ { -+ -+ void -+ test1() -+ { -+ auto lambda1 = [](){}; -+ auto lambda2 = lambda1; -+ lambda1(); -+ lambda2(); -+ } -+ -+ int -+ test2() -+ { -+ auto a = [](int i, int j){ return i + j; }(1, 2); -+ auto b = []() -> int { return '0'; }(); -+ auto c = [=](){ return a + b; }(); -+ auto d = [&](){ return c; }(); -+ auto e = [a, &b](int x) mutable { -+ const auto identity = [](int y){ return y; }; -+ for (auto i = 0; i < a; ++i) -+ a += b--; -+ return x + identity(a + b); -+ }(0); -+ return a + b + c + d + e; -+ } -+ -+ int -+ test3() -+ { -+ const auto nullary = [](){ return 0; }; -+ const auto unary = [](int x){ return x; }; -+ using nullary_t = decltype(nullary); -+ using unary_t = decltype(unary); -+ const auto higher1st = [](nullary_t f){ return f(); }; -+ const auto higher2nd = [unary](nullary_t f1){ -+ return [unary, f1](unary_t f2){ return f2(unary(f1())); }; -+ }; -+ return higher1st(nullary) + higher2nd(nullary)(unary); -+ } -+ -+ } -+ -+ namespace test_variadic_templates -+ { -+ -+ template -+ struct sum; -+ -+ template -+ struct sum -+ { -+ static constexpr auto value = N0 + sum::value; -+ }; -+ -+ template <> -+ struct sum<> -+ { -+ static constexpr auto value = 0; -+ }; -+ -+ static_assert(sum<>::value == 0, ""); -+ static_assert(sum<1>::value == 1, ""); -+ static_assert(sum<23>::value == 23, ""); -+ static_assert(sum<1, 2>::value == 3, ""); -+ static_assert(sum<5, 5, 11>::value == 21, ""); -+ static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); -+ -+ } -+ -+ // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae -+ // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function -+ // because of this. -+ namespace test_template_alias_sfinae -+ { -+ -+ struct foo {}; -+ -+ template -+ using member = typename T::member_type; -+ -+ template -+ void func(...) {} -+ -+ template -+ void func(member*) {} -+ -+ void test(); -+ -+ void test() { func(0); } -+ -+ } -+ -+} // namespace cxx11 -+ -+#endif // __cplusplus >= 201103L -+ -+ -+ -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ ax_cv_cxx_compile_cxx11=yes -+else case e in #( -+ e) ax_cv_cxx_compile_cxx11=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+{ 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 alternative in ${ax_cxx_compile_alternatives}; do -+ switch="-std=gnu++${alternative}" -+ cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx11_$switch" | sed "$as_sed_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 case e in #( -+ e) ac_save_CXX="$CXX" -+ CXX="$CXX $switch" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+// If the compiler admits that it is not ready for C++11, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201103L -+ -+#error "This is not a C++11 compiler" -+ -+#else -+ -+namespace cxx11 -+{ -+ -+ namespace test_static_assert -+ { -+ -+ template -+ struct check -+ { -+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); -+ }; -+ -+ } -+ -+ namespace test_final_override -+ { -+ -+ struct Base -+ { -+ virtual ~Base() {} -+ virtual void f() {} -+ }; -+ -+ struct Derived : public Base -+ { -+ virtual ~Derived() override {} -+ virtual void f() override {} -+ }; -+ -+ } -+ -+ namespace test_double_right_angle_brackets -+ { -+ -+ template < typename T > -+ struct check {}; -+ -+ typedef check single_type; -+ typedef check> double_type; -+ typedef check>> triple_type; -+ typedef check>>> quadruple_type; -+ -+ } -+ -+ namespace test_decltype -+ { -+ -+ int -+ f() -+ { -+ int a = 1; -+ decltype(a) b = 2; -+ return a + b; -+ } -+ -+ } -+ -+ namespace test_type_deduction -+ { -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static const bool value = false; -+ }; -+ -+ template < typename T > -+ struct is_same -+ { -+ static const bool value = true; -+ }; -+ -+ template < typename T1, typename T2 > -+ auto -+ add(T1 a1, T2 a2) -> decltype(a1 + a2) -+ { -+ return a1 + a2; -+ } -+ -+ int -+ test(const int c, volatile int v) -+ { -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == false, ""); -+ auto ac = c; -+ auto av = v; -+ auto sumi = ac + av + 'x'; -+ auto sumf = ac + av + 1.0; -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == true, ""); -+ return (sumf > 0.0) ? sumi : add(c, v); -+ } -+ -+ } -+ -+ namespace test_noexcept -+ { -+ -+ int f() { return 0; } -+ int g() noexcept { return 0; } -+ -+ static_assert(noexcept(f()) == false, ""); -+ static_assert(noexcept(g()) == true, ""); -+ -+ } -+ -+ namespace test_constexpr -+ { -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c_r(const CharT *const s, const unsigned long acc) noexcept -+ { -+ return *s ? strlen_c_r(s + 1, acc + 1) : acc; -+ } -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c(const CharT *const s) noexcept -+ { -+ return strlen_c_r(s, 0UL); -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("1") == 1UL, ""); -+ static_assert(strlen_c("example") == 7UL, ""); -+ static_assert(strlen_c("another\0example") == 7UL, ""); -+ -+ } -+ -+ namespace test_rvalue_references -+ { -+ -+ template < int N > -+ struct answer -+ { -+ static constexpr int value = N; -+ }; -+ -+ answer<1> f(int&) { return answer<1>(); } -+ answer<2> f(const int&) { return answer<2>(); } -+ answer<3> f(int&&) { return answer<3>(); } -+ -+ void -+ test() -+ { -+ int i = 0; -+ const int c = 0; -+ static_assert(decltype(f(i))::value == 1, ""); -+ static_assert(decltype(f(c))::value == 2, ""); -+ static_assert(decltype(f(0))::value == 3, ""); -+ } -+ -+ } -+ -+ namespace test_uniform_initialization -+ { -+ -+ struct test -+ { -+ static const int zero {}; -+ static const int one {1}; -+ }; -+ -+ static_assert(test::zero == 0, ""); -+ static_assert(test::one == 1, ""); -+ -+ } -+ -+ namespace test_lambdas -+ { -+ -+ void -+ test1() -+ { -+ auto lambda1 = [](){}; -+ auto lambda2 = lambda1; -+ lambda1(); -+ lambda2(); -+ } -+ -+ int -+ test2() -+ { -+ auto a = [](int i, int j){ return i + j; }(1, 2); -+ auto b = []() -> int { return '0'; }(); -+ auto c = [=](){ return a + b; }(); -+ auto d = [&](){ return c; }(); -+ auto e = [a, &b](int x) mutable { -+ const auto identity = [](int y){ return y; }; -+ for (auto i = 0; i < a; ++i) -+ a += b--; -+ return x + identity(a + b); -+ }(0); -+ return a + b + c + d + e; -+ } -+ -+ int -+ test3() -+ { -+ const auto nullary = [](){ return 0; }; -+ const auto unary = [](int x){ return x; }; -+ using nullary_t = decltype(nullary); -+ using unary_t = decltype(unary); -+ const auto higher1st = [](nullary_t f){ return f(); }; -+ const auto higher2nd = [unary](nullary_t f1){ -+ return [unary, f1](unary_t f2){ return f2(unary(f1())); }; -+ }; -+ return higher1st(nullary) + higher2nd(nullary)(unary); -+ } -+ -+ } -+ -+ namespace test_variadic_templates -+ { -+ -+ template -+ struct sum; -+ -+ template -+ struct sum -+ { -+ static constexpr auto value = N0 + sum::value; -+ }; -+ -+ template <> -+ struct sum<> -+ { -+ static constexpr auto value = 0; -+ }; -+ -+ static_assert(sum<>::value == 0, ""); -+ static_assert(sum<1>::value == 1, ""); -+ static_assert(sum<23>::value == 23, ""); -+ static_assert(sum<1, 2>::value == 3, ""); -+ static_assert(sum<5, 5, 11>::value == 21, ""); -+ static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); -+ -+ } -+ -+ // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae -+ // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function -+ // because of this. -+ namespace test_template_alias_sfinae -+ { -+ -+ struct foo {}; -+ -+ template -+ using member = typename T::member_type; -+ -+ template -+ void func(...) {} -+ -+ template -+ void func(member*) {} -+ -+ void test(); -+ -+ void test() { func(0); } -+ -+ } -+ -+} // namespace cxx11 -+ -+#endif // __cplusplus >= 201103L -+ -+ -+ -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ eval $cachevar=yes -+else case e in #( -+ e) eval $cachevar=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ CXX="$ac_save_CXX" ;; -+esac -+fi -+eval ac_res=\$$cachevar -+ { 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 -+ CXX="$CXX $switch" -+ if test -n "$CXXCPP" ; then -+ CXXCPP="$CXXCPP $switch" -+ fi -+ ac_success=yes -+ break -+ fi -+ done -+ fi -+ -+ if test x$ac_success = xno; then -+ for alternative in ${ax_cxx_compile_alternatives}; do -+ for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do -+ cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx11_$switch" | sed "$as_sed_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 case e in #( -+ e) ac_save_CXX="$CXX" -+ CXX="$CXX $switch" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+// If the compiler admits that it is not ready for C++11, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201103L -+ -+#error "This is not a C++11 compiler" -+ -+#else -+ -+namespace cxx11 -+{ -+ -+ namespace test_static_assert -+ { -+ -+ template -+ struct check -+ { -+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); -+ }; -+ -+ } -+ -+ namespace test_final_override -+ { -+ -+ struct Base -+ { -+ virtual ~Base() {} -+ virtual void f() {} -+ }; -+ -+ struct Derived : public Base -+ { -+ virtual ~Derived() override {} -+ virtual void f() override {} -+ }; -+ -+ } -+ -+ namespace test_double_right_angle_brackets -+ { -+ -+ template < typename T > -+ struct check {}; -+ -+ typedef check single_type; -+ typedef check> double_type; -+ typedef check>> triple_type; -+ typedef check>>> quadruple_type; -+ -+ } -+ -+ namespace test_decltype -+ { -+ -+ int -+ f() -+ { -+ int a = 1; -+ decltype(a) b = 2; -+ return a + b; -+ } -+ -+ } -+ -+ namespace test_type_deduction -+ { -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static const bool value = false; -+ }; -+ -+ template < typename T > -+ struct is_same -+ { -+ static const bool value = true; -+ }; -+ -+ template < typename T1, typename T2 > -+ auto -+ add(T1 a1, T2 a2) -> decltype(a1 + a2) -+ { -+ return a1 + a2; -+ } -+ -+ int -+ test(const int c, volatile int v) -+ { -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == false, ""); -+ auto ac = c; -+ auto av = v; -+ auto sumi = ac + av + 'x'; -+ auto sumf = ac + av + 1.0; -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == true, ""); -+ return (sumf > 0.0) ? sumi : add(c, v); -+ } -+ -+ } -+ -+ namespace test_noexcept -+ { -+ -+ int f() { return 0; } -+ int g() noexcept { return 0; } -+ -+ static_assert(noexcept(f()) == false, ""); -+ static_assert(noexcept(g()) == true, ""); -+ -+ } -+ -+ namespace test_constexpr -+ { -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c_r(const CharT *const s, const unsigned long acc) noexcept -+ { -+ return *s ? strlen_c_r(s + 1, acc + 1) : acc; -+ } -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c(const CharT *const s) noexcept -+ { -+ return strlen_c_r(s, 0UL); -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("1") == 1UL, ""); -+ static_assert(strlen_c("example") == 7UL, ""); -+ static_assert(strlen_c("another\0example") == 7UL, ""); -+ -+ } -+ -+ namespace test_rvalue_references -+ { -+ -+ template < int N > -+ struct answer -+ { -+ static constexpr int value = N; -+ }; -+ -+ answer<1> f(int&) { return answer<1>(); } -+ answer<2> f(const int&) { return answer<2>(); } -+ answer<3> f(int&&) { return answer<3>(); } -+ -+ void -+ test() -+ { -+ int i = 0; -+ const int c = 0; -+ static_assert(decltype(f(i))::value == 1, ""); -+ static_assert(decltype(f(c))::value == 2, ""); -+ static_assert(decltype(f(0))::value == 3, ""); -+ } -+ -+ } -+ -+ namespace test_uniform_initialization -+ { -+ -+ struct test -+ { -+ static const int zero {}; -+ static const int one {1}; -+ }; -+ -+ static_assert(test::zero == 0, ""); -+ static_assert(test::one == 1, ""); -+ -+ } -+ -+ namespace test_lambdas -+ { -+ -+ void -+ test1() -+ { -+ auto lambda1 = [](){}; -+ auto lambda2 = lambda1; -+ lambda1(); -+ lambda2(); -+ } -+ -+ int -+ test2() -+ { -+ auto a = [](int i, int j){ return i + j; }(1, 2); -+ auto b = []() -> int { return '0'; }(); -+ auto c = [=](){ return a + b; }(); -+ auto d = [&](){ return c; }(); -+ auto e = [a, &b](int x) mutable { -+ const auto identity = [](int y){ return y; }; -+ for (auto i = 0; i < a; ++i) -+ a += b--; -+ return x + identity(a + b); -+ }(0); -+ return a + b + c + d + e; -+ } -+ -+ int -+ test3() -+ { -+ const auto nullary = [](){ return 0; }; -+ const auto unary = [](int x){ return x; }; -+ using nullary_t = decltype(nullary); -+ using unary_t = decltype(unary); -+ const auto higher1st = [](nullary_t f){ return f(); }; -+ const auto higher2nd = [unary](nullary_t f1){ -+ return [unary, f1](unary_t f2){ return f2(unary(f1())); }; -+ }; -+ return higher1st(nullary) + higher2nd(nullary)(unary); -+ } -+ -+ } -+ -+ namespace test_variadic_templates -+ { -+ -+ template -+ struct sum; -+ -+ template -+ struct sum -+ { -+ static constexpr auto value = N0 + sum::value; -+ }; -+ -+ template <> -+ struct sum<> -+ { -+ static constexpr auto value = 0; -+ }; -+ -+ static_assert(sum<>::value == 0, ""); -+ static_assert(sum<1>::value == 1, ""); -+ static_assert(sum<23>::value == 23, ""); -+ static_assert(sum<1, 2>::value == 3, ""); -+ static_assert(sum<5, 5, 11>::value == 21, ""); -+ static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); -+ -+ } -+ -+ // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae -+ // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function -+ // because of this. -+ namespace test_template_alias_sfinae -+ { -+ -+ struct foo {}; -+ -+ template -+ using member = typename T::member_type; -+ -+ template -+ void func(...) {} -+ -+ template -+ void func(member*) {} -+ -+ void test(); -+ -+ void test() { func(0); } -+ -+ } -+ -+} // namespace cxx11 -+ -+#endif // __cplusplus >= 201103L -+ -+ -+ -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ eval $cachevar=yes -+else case e in #( -+ e) eval $cachevar=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ CXX="$ac_save_CXX" ;; -+esac -+fi -+eval ac_res=\$$cachevar -+ { 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 -+ CXX="$CXX $switch" -+ if test -n "$CXXCPP" ; then -+ CXXCPP="$CXXCPP $switch" -+ fi -+ ac_success=yes -+ break -+ fi -+ done -+ if test x$ac_success = xyes; then -+ break -+ fi -+ done -+ 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 -+ -+ if test x$ax_cxx_compile_cxx11_required = xtrue; then -+ if test x$ac_success = xno; then -+ as_fn_error $? "*** A compiler with support for C++11 language features is required." "$LINENO" 5 -+ fi -+ fi -+ if test x$ac_success = xno; then -+ HAVE_CXX11=0 -+ { 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 -+ -+printf "%s\n" "#define HAVE_CXX11 1" >>confdefs.h -+ -+ fi -+ -+ -+ if test -n "$wxWITH_CXX_IS_OPTIONAL"; then -+ if test "$HAVE_CXX11" != 1; 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 $? "C++11 support was requested but is not available -+See 'config.log' for more details" "$LINENO" 5; } -+ fi -+ fi -+ ;; -+ -+ 14) -+ ax_cxx_compile_alternatives="14 1y" ax_cxx_compile_cxx14_required=true -+ ac_ext=cpp -+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 -+ ac_success=no -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++14 features by default" >&5 -+printf %s "checking whether $CXX supports C++14 features by default... " >&6; } -+if test ${ax_cv_cxx_compile_cxx14+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+// If the compiler admits that it is not ready for C++11, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201103L -+ -+#error "This is not a C++11 compiler" -+ -+#else -+ -+namespace cxx11 -+{ -+ -+ namespace test_static_assert -+ { -+ -+ template -+ struct check -+ { -+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); -+ }; -+ -+ } -+ -+ namespace test_final_override -+ { -+ -+ struct Base -+ { -+ virtual ~Base() {} -+ virtual void f() {} -+ }; -+ -+ struct Derived : public Base -+ { -+ virtual ~Derived() override {} -+ virtual void f() override {} -+ }; -+ -+ } -+ -+ namespace test_double_right_angle_brackets -+ { -+ -+ template < typename T > -+ struct check {}; -+ -+ typedef check single_type; -+ typedef check> double_type; -+ typedef check>> triple_type; -+ typedef check>>> quadruple_type; -+ -+ } -+ -+ namespace test_decltype -+ { -+ -+ int -+ f() -+ { -+ int a = 1; -+ decltype(a) b = 2; -+ return a + b; -+ } -+ -+ } -+ -+ namespace test_type_deduction -+ { -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static const bool value = false; -+ }; -+ -+ template < typename T > -+ struct is_same -+ { -+ static const bool value = true; -+ }; -+ -+ template < typename T1, typename T2 > -+ auto -+ add(T1 a1, T2 a2) -> decltype(a1 + a2) -+ { -+ return a1 + a2; -+ } -+ -+ int -+ test(const int c, volatile int v) -+ { -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == false, ""); -+ auto ac = c; -+ auto av = v; -+ auto sumi = ac + av + 'x'; -+ auto sumf = ac + av + 1.0; -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == true, ""); -+ return (sumf > 0.0) ? sumi : add(c, v); -+ } -+ -+ } -+ -+ namespace test_noexcept -+ { -+ -+ int f() { return 0; } -+ int g() noexcept { return 0; } -+ -+ static_assert(noexcept(f()) == false, ""); -+ static_assert(noexcept(g()) == true, ""); -+ -+ } -+ -+ namespace test_constexpr -+ { -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c_r(const CharT *const s, const unsigned long acc) noexcept -+ { -+ return *s ? strlen_c_r(s + 1, acc + 1) : acc; -+ } -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c(const CharT *const s) noexcept -+ { -+ return strlen_c_r(s, 0UL); -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("1") == 1UL, ""); -+ static_assert(strlen_c("example") == 7UL, ""); -+ static_assert(strlen_c("another\0example") == 7UL, ""); -+ -+ } -+ -+ namespace test_rvalue_references -+ { -+ -+ template < int N > -+ struct answer -+ { -+ static constexpr int value = N; -+ }; -+ -+ answer<1> f(int&) { return answer<1>(); } -+ answer<2> f(const int&) { return answer<2>(); } -+ answer<3> f(int&&) { return answer<3>(); } -+ -+ void -+ test() -+ { -+ int i = 0; -+ const int c = 0; -+ static_assert(decltype(f(i))::value == 1, ""); -+ static_assert(decltype(f(c))::value == 2, ""); -+ static_assert(decltype(f(0))::value == 3, ""); -+ } -+ -+ } -+ -+ namespace test_uniform_initialization -+ { -+ -+ struct test -+ { -+ static const int zero {}; -+ static const int one {1}; -+ }; -+ -+ static_assert(test::zero == 0, ""); -+ static_assert(test::one == 1, ""); -+ -+ } -+ -+ namespace test_lambdas -+ { -+ -+ void -+ test1() -+ { -+ auto lambda1 = [](){}; -+ auto lambda2 = lambda1; -+ lambda1(); -+ lambda2(); -+ } -+ -+ int -+ test2() -+ { -+ auto a = [](int i, int j){ return i + j; }(1, 2); -+ auto b = []() -> int { return '0'; }(); -+ auto c = [=](){ return a + b; }(); -+ auto d = [&](){ return c; }(); -+ auto e = [a, &b](int x) mutable { -+ const auto identity = [](int y){ return y; }; -+ for (auto i = 0; i < a; ++i) -+ a += b--; -+ return x + identity(a + b); -+ }(0); -+ return a + b + c + d + e; -+ } -+ -+ int -+ test3() -+ { -+ const auto nullary = [](){ return 0; }; -+ const auto unary = [](int x){ return x; }; -+ using nullary_t = decltype(nullary); -+ using unary_t = decltype(unary); -+ const auto higher1st = [](nullary_t f){ return f(); }; -+ const auto higher2nd = [unary](nullary_t f1){ -+ return [unary, f1](unary_t f2){ return f2(unary(f1())); }; -+ }; -+ return higher1st(nullary) + higher2nd(nullary)(unary); -+ } -+ -+ } -+ -+ namespace test_variadic_templates -+ { -+ -+ template -+ struct sum; -+ -+ template -+ struct sum -+ { -+ static constexpr auto value = N0 + sum::value; -+ }; -+ -+ template <> -+ struct sum<> -+ { -+ static constexpr auto value = 0; -+ }; -+ -+ static_assert(sum<>::value == 0, ""); -+ static_assert(sum<1>::value == 1, ""); -+ static_assert(sum<23>::value == 23, ""); -+ static_assert(sum<1, 2>::value == 3, ""); -+ static_assert(sum<5, 5, 11>::value == 21, ""); -+ static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); -+ -+ } -+ -+ // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae -+ // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function -+ // because of this. -+ namespace test_template_alias_sfinae -+ { -+ -+ struct foo {}; -+ -+ template -+ using member = typename T::member_type; -+ -+ template -+ void func(...) {} -+ -+ template -+ void func(member*) {} -+ -+ void test(); -+ -+ void test() { func(0); } -+ -+ } -+ -+} // namespace cxx11 -+ -+#endif // __cplusplus >= 201103L -+ -+ -+ -+ -+// If the compiler admits that it is not ready for C++14, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201402L -+ -+#error "This is not a C++14 compiler" -+ -+#else -+ -+namespace cxx14 -+{ -+ -+ namespace test_polymorphic_lambdas -+ { -+ -+ int -+ test() -+ { -+ const auto lambda = [](auto&&... args){ -+ const auto istiny = [](auto x){ -+ return (sizeof(x) == 1UL) ? 1 : 0; -+ }; -+ const int aretiny[] = { istiny(args)... }; -+ return aretiny[0]; -+ }; -+ return lambda(1, 1L, 1.0f, '1'); -+ } -+ -+ } -+ -+ namespace test_binary_literals -+ { -+ -+ constexpr auto ivii = 0b0000000000101010; -+ static_assert(ivii == 42, "wrong value"); -+ -+ } -+ -+ namespace test_generalized_constexpr -+ { -+ -+ template < typename CharT > -+ constexpr unsigned long -+ strlen_c(const CharT *const s) noexcept -+ { -+ auto length = 0UL; -+ for (auto p = s; *p; ++p) -+ ++length; -+ return length; -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("x") == 1UL, ""); -+ static_assert(strlen_c("test") == 4UL, ""); -+ static_assert(strlen_c("another\0test") == 7UL, ""); -+ -+ } -+ -+ namespace test_lambda_init_capture -+ { -+ -+ int -+ test() -+ { -+ auto x = 0; -+ const auto lambda1 = [a = x](int b){ return a + b; }; -+ const auto lambda2 = [a = lambda1(x)](){ return a; }; -+ return lambda2(); -+ } -+ -+ } -+ -+ namespace test_digit_separators -+ { -+ -+ constexpr auto ten_million = 100'000'000; -+ static_assert(ten_million == 100000000, ""); -+ -+ } -+ -+ namespace test_return_type_deduction -+ { -+ -+ auto f(int& x) { return x; } -+ decltype(auto) g(int& x) { return x; } -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static constexpr auto value = false; -+ }; -+ -+ template < typename T > -+ struct is_same -+ { -+ static constexpr auto value = true; -+ }; -+ -+ int -+ test() -+ { -+ auto x = 0; -+ static_assert(is_same::value, ""); -+ static_assert(is_same::value, ""); -+ return x; -+ } -+ -+ } -+ -+} // namespace cxx14 -+ -+#endif // __cplusplus >= 201402L -+ -+ -+ -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ ax_cv_cxx_compile_cxx14=yes -+else case e in #( -+ e) ax_cv_cxx_compile_cxx14=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx14" >&5 -+printf "%s\n" "$ax_cv_cxx_compile_cxx14" >&6; } -+ if test x$ax_cv_cxx_compile_cxx14 = xyes; then -+ ac_success=yes -+ fi -+ -+ if test x$ac_success = xno; then -+ for alternative in ${ax_cxx_compile_alternatives}; do -+ switch="-std=gnu++${alternative}" -+ cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx14_$switch" | sed "$as_sed_sh"` -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++14 features with $switch" >&5 -+printf %s "checking whether $CXX supports C++14 features with $switch... " >&6; } -+if eval test \${$cachevar+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_save_CXX="$CXX" -+ CXX="$CXX $switch" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+// If the compiler admits that it is not ready for C++11, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201103L -+ -+#error "This is not a C++11 compiler" -+ -+#else -+ -+namespace cxx11 -+{ -+ -+ namespace test_static_assert -+ { -+ -+ template -+ struct check -+ { -+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); -+ }; -+ -+ } -+ -+ namespace test_final_override -+ { -+ -+ struct Base -+ { -+ virtual ~Base() {} -+ virtual void f() {} -+ }; -+ -+ struct Derived : public Base -+ { -+ virtual ~Derived() override {} -+ virtual void f() override {} -+ }; -+ -+ } -+ -+ namespace test_double_right_angle_brackets -+ { -+ -+ template < typename T > -+ struct check {}; -+ -+ typedef check single_type; -+ typedef check> double_type; -+ typedef check>> triple_type; -+ typedef check>>> quadruple_type; -+ -+ } -+ -+ namespace test_decltype -+ { -+ -+ int -+ f() -+ { -+ int a = 1; -+ decltype(a) b = 2; -+ return a + b; -+ } -+ -+ } -+ -+ namespace test_type_deduction -+ { -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static const bool value = false; -+ }; -+ -+ template < typename T > -+ struct is_same -+ { -+ static const bool value = true; -+ }; -+ -+ template < typename T1, typename T2 > -+ auto -+ add(T1 a1, T2 a2) -> decltype(a1 + a2) -+ { -+ return a1 + a2; -+ } -+ -+ int -+ test(const int c, volatile int v) -+ { -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == false, ""); -+ auto ac = c; -+ auto av = v; -+ auto sumi = ac + av + 'x'; -+ auto sumf = ac + av + 1.0; -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == true, ""); -+ return (sumf > 0.0) ? sumi : add(c, v); -+ } -+ -+ } -+ -+ namespace test_noexcept -+ { -+ -+ int f() { return 0; } -+ int g() noexcept { return 0; } -+ -+ static_assert(noexcept(f()) == false, ""); -+ static_assert(noexcept(g()) == true, ""); -+ -+ } -+ -+ namespace test_constexpr -+ { -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c_r(const CharT *const s, const unsigned long acc) noexcept -+ { -+ return *s ? strlen_c_r(s + 1, acc + 1) : acc; -+ } -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c(const CharT *const s) noexcept -+ { -+ return strlen_c_r(s, 0UL); -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("1") == 1UL, ""); -+ static_assert(strlen_c("example") == 7UL, ""); -+ static_assert(strlen_c("another\0example") == 7UL, ""); -+ -+ } -+ -+ namespace test_rvalue_references -+ { -+ -+ template < int N > -+ struct answer -+ { -+ static constexpr int value = N; -+ }; -+ -+ answer<1> f(int&) { return answer<1>(); } -+ answer<2> f(const int&) { return answer<2>(); } -+ answer<3> f(int&&) { return answer<3>(); } -+ -+ void -+ test() -+ { -+ int i = 0; -+ const int c = 0; -+ static_assert(decltype(f(i))::value == 1, ""); -+ static_assert(decltype(f(c))::value == 2, ""); -+ static_assert(decltype(f(0))::value == 3, ""); -+ } -+ -+ } -+ -+ namespace test_uniform_initialization -+ { -+ -+ struct test -+ { -+ static const int zero {}; -+ static const int one {1}; -+ }; -+ -+ static_assert(test::zero == 0, ""); -+ static_assert(test::one == 1, ""); -+ -+ } -+ -+ namespace test_lambdas -+ { -+ -+ void -+ test1() -+ { -+ auto lambda1 = [](){}; -+ auto lambda2 = lambda1; -+ lambda1(); -+ lambda2(); -+ } -+ -+ int -+ test2() -+ { -+ auto a = [](int i, int j){ return i + j; }(1, 2); -+ auto b = []() -> int { return '0'; }(); -+ auto c = [=](){ return a + b; }(); -+ auto d = [&](){ return c; }(); -+ auto e = [a, &b](int x) mutable { -+ const auto identity = [](int y){ return y; }; -+ for (auto i = 0; i < a; ++i) -+ a += b--; -+ return x + identity(a + b); -+ }(0); -+ return a + b + c + d + e; -+ } -+ -+ int -+ test3() -+ { -+ const auto nullary = [](){ return 0; }; -+ const auto unary = [](int x){ return x; }; -+ using nullary_t = decltype(nullary); -+ using unary_t = decltype(unary); -+ const auto higher1st = [](nullary_t f){ return f(); }; -+ const auto higher2nd = [unary](nullary_t f1){ -+ return [unary, f1](unary_t f2){ return f2(unary(f1())); }; -+ }; -+ return higher1st(nullary) + higher2nd(nullary)(unary); -+ } -+ -+ } -+ -+ namespace test_variadic_templates -+ { -+ -+ template -+ struct sum; -+ -+ template -+ struct sum -+ { -+ static constexpr auto value = N0 + sum::value; -+ }; -+ -+ template <> -+ struct sum<> -+ { -+ static constexpr auto value = 0; -+ }; -+ -+ static_assert(sum<>::value == 0, ""); -+ static_assert(sum<1>::value == 1, ""); -+ static_assert(sum<23>::value == 23, ""); -+ static_assert(sum<1, 2>::value == 3, ""); -+ static_assert(sum<5, 5, 11>::value == 21, ""); -+ static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); -+ -+ } -+ -+ // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae -+ // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function -+ // because of this. -+ namespace test_template_alias_sfinae -+ { -+ -+ struct foo {}; -+ -+ template -+ using member = typename T::member_type; -+ -+ template -+ void func(...) {} -+ -+ template -+ void func(member*) {} -+ -+ void test(); -+ -+ void test() { func(0); } -+ -+ } -+ -+} // namespace cxx11 -+ -+#endif // __cplusplus >= 201103L -+ -+ -+ -+ -+// If the compiler admits that it is not ready for C++14, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201402L -+ -+#error "This is not a C++14 compiler" -+ -+#else -+ -+namespace cxx14 -+{ -+ -+ namespace test_polymorphic_lambdas -+ { -+ -+ int -+ test() -+ { -+ const auto lambda = [](auto&&... args){ -+ const auto istiny = [](auto x){ -+ return (sizeof(x) == 1UL) ? 1 : 0; -+ }; -+ const int aretiny[] = { istiny(args)... }; -+ return aretiny[0]; -+ }; -+ return lambda(1, 1L, 1.0f, '1'); -+ } -+ -+ } -+ -+ namespace test_binary_literals -+ { -+ -+ constexpr auto ivii = 0b0000000000101010; -+ static_assert(ivii == 42, "wrong value"); -+ -+ } -+ -+ namespace test_generalized_constexpr -+ { -+ -+ template < typename CharT > -+ constexpr unsigned long -+ strlen_c(const CharT *const s) noexcept -+ { -+ auto length = 0UL; -+ for (auto p = s; *p; ++p) -+ ++length; -+ return length; -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("x") == 1UL, ""); -+ static_assert(strlen_c("test") == 4UL, ""); -+ static_assert(strlen_c("another\0test") == 7UL, ""); -+ -+ } -+ -+ namespace test_lambda_init_capture -+ { -+ -+ int -+ test() -+ { -+ auto x = 0; -+ const auto lambda1 = [a = x](int b){ return a + b; }; -+ const auto lambda2 = [a = lambda1(x)](){ return a; }; -+ return lambda2(); -+ } -+ -+ } -+ -+ namespace test_digit_separators -+ { -+ -+ constexpr auto ten_million = 100'000'000; -+ static_assert(ten_million == 100000000, ""); -+ -+ } -+ -+ namespace test_return_type_deduction -+ { -+ -+ auto f(int& x) { return x; } -+ decltype(auto) g(int& x) { return x; } -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static constexpr auto value = false; -+ }; -+ -+ template < typename T > -+ struct is_same -+ { -+ static constexpr auto value = true; -+ }; -+ -+ int -+ test() -+ { -+ auto x = 0; -+ static_assert(is_same::value, ""); -+ static_assert(is_same::value, ""); -+ return x; -+ } -+ -+ } -+ -+} // namespace cxx14 -+ -+#endif // __cplusplus >= 201402L -+ -+ -+ -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ eval $cachevar=yes -+else case e in #( -+ e) eval $cachevar=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ CXX="$ac_save_CXX" ;; -+esac -+fi -+eval ac_res=\$$cachevar -+ { 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 -+ CXX="$CXX $switch" -+ if test -n "$CXXCPP" ; then -+ CXXCPP="$CXXCPP $switch" -+ fi -+ ac_success=yes -+ break -+ fi -+ done -+ fi -+ -+ if test x$ac_success = xno; then -+ for alternative in ${ax_cxx_compile_alternatives}; do -+ for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do -+ cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx14_$switch" | sed "$as_sed_sh"` -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++14 features with $switch" >&5 -+printf %s "checking whether $CXX supports C++14 features with $switch... " >&6; } -+if eval test \${$cachevar+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_save_CXX="$CXX" -+ CXX="$CXX $switch" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+// If the compiler admits that it is not ready for C++11, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201103L -+ -+#error "This is not a C++11 compiler" -+ -+#else -+ -+namespace cxx11 -+{ -+ -+ namespace test_static_assert -+ { -+ -+ template -+ struct check -+ { -+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); -+ }; -+ -+ } -+ -+ namespace test_final_override -+ { -+ -+ struct Base -+ { -+ virtual ~Base() {} -+ virtual void f() {} -+ }; -+ -+ struct Derived : public Base -+ { -+ virtual ~Derived() override {} -+ virtual void f() override {} -+ }; -+ -+ } -+ -+ namespace test_double_right_angle_brackets -+ { -+ -+ template < typename T > -+ struct check {}; -+ -+ typedef check single_type; -+ typedef check> double_type; -+ typedef check>> triple_type; -+ typedef check>>> quadruple_type; -+ -+ } -+ -+ namespace test_decltype -+ { -+ -+ int -+ f() -+ { -+ int a = 1; -+ decltype(a) b = 2; -+ return a + b; -+ } -+ -+ } -+ -+ namespace test_type_deduction -+ { -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static const bool value = false; -+ }; -+ -+ template < typename T > -+ struct is_same -+ { -+ static const bool value = true; -+ }; -+ -+ template < typename T1, typename T2 > -+ auto -+ add(T1 a1, T2 a2) -> decltype(a1 + a2) -+ { -+ return a1 + a2; -+ } -+ -+ int -+ test(const int c, volatile int v) -+ { -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == false, ""); -+ auto ac = c; -+ auto av = v; -+ auto sumi = ac + av + 'x'; -+ auto sumf = ac + av + 1.0; -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == true, ""); -+ return (sumf > 0.0) ? sumi : add(c, v); -+ } -+ -+ } -+ -+ namespace test_noexcept -+ { -+ -+ int f() { return 0; } -+ int g() noexcept { return 0; } -+ -+ static_assert(noexcept(f()) == false, ""); -+ static_assert(noexcept(g()) == true, ""); -+ -+ } -+ -+ namespace test_constexpr -+ { -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c_r(const CharT *const s, const unsigned long acc) noexcept -+ { -+ return *s ? strlen_c_r(s + 1, acc + 1) : acc; -+ } -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c(const CharT *const s) noexcept -+ { -+ return strlen_c_r(s, 0UL); -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("1") == 1UL, ""); -+ static_assert(strlen_c("example") == 7UL, ""); -+ static_assert(strlen_c("another\0example") == 7UL, ""); -+ -+ } -+ -+ namespace test_rvalue_references -+ { -+ -+ template < int N > -+ struct answer -+ { -+ static constexpr int value = N; -+ }; -+ -+ answer<1> f(int&) { return answer<1>(); } -+ answer<2> f(const int&) { return answer<2>(); } -+ answer<3> f(int&&) { return answer<3>(); } -+ -+ void -+ test() -+ { -+ int i = 0; -+ const int c = 0; -+ static_assert(decltype(f(i))::value == 1, ""); -+ static_assert(decltype(f(c))::value == 2, ""); -+ static_assert(decltype(f(0))::value == 3, ""); -+ } -+ -+ } -+ -+ namespace test_uniform_initialization -+ { -+ -+ struct test -+ { -+ static const int zero {}; -+ static const int one {1}; -+ }; -+ -+ static_assert(test::zero == 0, ""); -+ static_assert(test::one == 1, ""); -+ -+ } -+ -+ namespace test_lambdas -+ { -+ -+ void -+ test1() -+ { -+ auto lambda1 = [](){}; -+ auto lambda2 = lambda1; -+ lambda1(); -+ lambda2(); -+ } -+ -+ int -+ test2() -+ { -+ auto a = [](int i, int j){ return i + j; }(1, 2); -+ auto b = []() -> int { return '0'; }(); -+ auto c = [=](){ return a + b; }(); -+ auto d = [&](){ return c; }(); -+ auto e = [a, &b](int x) mutable { -+ const auto identity = [](int y){ return y; }; -+ for (auto i = 0; i < a; ++i) -+ a += b--; -+ return x + identity(a + b); -+ }(0); -+ return a + b + c + d + e; -+ } -+ -+ int -+ test3() -+ { -+ const auto nullary = [](){ return 0; }; -+ const auto unary = [](int x){ return x; }; -+ using nullary_t = decltype(nullary); -+ using unary_t = decltype(unary); -+ const auto higher1st = [](nullary_t f){ return f(); }; -+ const auto higher2nd = [unary](nullary_t f1){ -+ return [unary, f1](unary_t f2){ return f2(unary(f1())); }; -+ }; -+ return higher1st(nullary) + higher2nd(nullary)(unary); -+ } -+ -+ } -+ -+ namespace test_variadic_templates -+ { -+ -+ template -+ struct sum; -+ -+ template -+ struct sum -+ { -+ static constexpr auto value = N0 + sum::value; -+ }; -+ -+ template <> -+ struct sum<> -+ { -+ static constexpr auto value = 0; -+ }; -+ -+ static_assert(sum<>::value == 0, ""); -+ static_assert(sum<1>::value == 1, ""); -+ static_assert(sum<23>::value == 23, ""); -+ static_assert(sum<1, 2>::value == 3, ""); -+ static_assert(sum<5, 5, 11>::value == 21, ""); -+ static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); -+ -+ } -+ -+ // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae -+ // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function -+ // because of this. -+ namespace test_template_alias_sfinae -+ { -+ -+ struct foo {}; -+ -+ template -+ using member = typename T::member_type; -+ -+ template -+ void func(...) {} -+ -+ template -+ void func(member*) {} -+ -+ void test(); -+ -+ void test() { func(0); } -+ -+ } -+ -+} // namespace cxx11 -+ -+#endif // __cplusplus >= 201103L -+ -+ -+ -+ -+// If the compiler admits that it is not ready for C++14, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201402L -+ -+#error "This is not a C++14 compiler" -+ -+#else -+ -+namespace cxx14 -+{ -+ -+ namespace test_polymorphic_lambdas -+ { -+ -+ int -+ test() -+ { -+ const auto lambda = [](auto&&... args){ -+ const auto istiny = [](auto x){ -+ return (sizeof(x) == 1UL) ? 1 : 0; -+ }; -+ const int aretiny[] = { istiny(args)... }; -+ return aretiny[0]; -+ }; -+ return lambda(1, 1L, 1.0f, '1'); -+ } -+ -+ } -+ -+ namespace test_binary_literals -+ { -+ -+ constexpr auto ivii = 0b0000000000101010; -+ static_assert(ivii == 42, "wrong value"); -+ -+ } -+ -+ namespace test_generalized_constexpr -+ { -+ -+ template < typename CharT > -+ constexpr unsigned long -+ strlen_c(const CharT *const s) noexcept -+ { -+ auto length = 0UL; -+ for (auto p = s; *p; ++p) -+ ++length; -+ return length; -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("x") == 1UL, ""); -+ static_assert(strlen_c("test") == 4UL, ""); -+ static_assert(strlen_c("another\0test") == 7UL, ""); -+ -+ } -+ -+ namespace test_lambda_init_capture -+ { -+ -+ int -+ test() -+ { -+ auto x = 0; -+ const auto lambda1 = [a = x](int b){ return a + b; }; -+ const auto lambda2 = [a = lambda1(x)](){ return a; }; -+ return lambda2(); -+ } -+ -+ } -+ -+ namespace test_digit_separators -+ { -+ -+ constexpr auto ten_million = 100'000'000; -+ static_assert(ten_million == 100000000, ""); -+ -+ } -+ -+ namespace test_return_type_deduction -+ { -+ -+ auto f(int& x) { return x; } -+ decltype(auto) g(int& x) { return x; } -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static constexpr auto value = false; -+ }; -+ -+ template < typename T > -+ struct is_same -+ { -+ static constexpr auto value = true; -+ }; -+ -+ int -+ test() -+ { -+ auto x = 0; -+ static_assert(is_same::value, ""); -+ static_assert(is_same::value, ""); -+ return x; -+ } -+ -+ } -+ -+} // namespace cxx14 -+ -+#endif // __cplusplus >= 201402L -+ -+ -+ -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ eval $cachevar=yes -+else case e in #( -+ e) eval $cachevar=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ CXX="$ac_save_CXX" ;; -+esac -+fi -+eval ac_res=\$$cachevar -+ { 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 -+ CXX="$CXX $switch" -+ if test -n "$CXXCPP" ; then -+ CXXCPP="$CXXCPP $switch" -+ fi -+ ac_success=yes -+ break -+ fi -+ done -+ if test x$ac_success = xyes; then -+ break -+ fi -+ done -+ 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 -+ -+ if test x$ax_cxx_compile_cxx14_required = xtrue; then -+ if test x$ac_success = xno; then -+ as_fn_error $? "*** A compiler with support for C++14 language features is required." "$LINENO" 5 -+ fi -+ fi -+ if test x$ac_success = xno; then -+ HAVE_CXX14=0 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: No compiler with C++14 support was found" >&5 -+printf "%s\n" "$as_me: No compiler with C++14 support was found" >&6;} -+ else -+ HAVE_CXX14=1 -+ -+printf "%s\n" "#define HAVE_CXX14 1" >>confdefs.h -+ -+ fi -+ -+ -+ -+ -+ HAVE_CXX11=1 -+ ;; -+ -+ 17) -+ ax_cxx_compile_alternatives="17 1z" ax_cxx_compile_cxx17_required=true -+ ac_ext=cpp -+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 -+ ac_success=no -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features by default" >&5 -+printf %s "checking whether $CXX supports C++17 features by default... " >&6; } -+if test ${ax_cv_cxx_compile_cxx17+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+// If the compiler admits that it is not ready for C++11, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201103L -+ -+#error "This is not a C++11 compiler" -+ -+#else -+ -+namespace cxx11 -+{ -+ -+ namespace test_static_assert -+ { -+ -+ template -+ struct check -+ { -+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); -+ }; -+ -+ } -+ -+ namespace test_final_override -+ { -+ -+ struct Base -+ { -+ virtual ~Base() {} -+ virtual void f() {} -+ }; -+ -+ struct Derived : public Base -+ { -+ virtual ~Derived() override {} -+ virtual void f() override {} -+ }; -+ -+ } -+ -+ namespace test_double_right_angle_brackets -+ { -+ -+ template < typename T > -+ struct check {}; -+ -+ typedef check single_type; -+ typedef check> double_type; -+ typedef check>> triple_type; -+ typedef check>>> quadruple_type; -+ -+ } -+ -+ namespace test_decltype -+ { -+ -+ int -+ f() -+ { -+ int a = 1; -+ decltype(a) b = 2; -+ return a + b; -+ } -+ -+ } -+ -+ namespace test_type_deduction -+ { -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static const bool value = false; -+ }; -+ -+ template < typename T > -+ struct is_same -+ { -+ static const bool value = true; -+ }; -+ -+ template < typename T1, typename T2 > -+ auto -+ add(T1 a1, T2 a2) -> decltype(a1 + a2) -+ { -+ return a1 + a2; -+ } -+ -+ int -+ test(const int c, volatile int v) -+ { -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == false, ""); -+ auto ac = c; -+ auto av = v; -+ auto sumi = ac + av + 'x'; -+ auto sumf = ac + av + 1.0; -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == true, ""); -+ return (sumf > 0.0) ? sumi : add(c, v); -+ } -+ -+ } -+ -+ namespace test_noexcept -+ { -+ -+ int f() { return 0; } -+ int g() noexcept { return 0; } -+ -+ static_assert(noexcept(f()) == false, ""); -+ static_assert(noexcept(g()) == true, ""); -+ -+ } -+ -+ namespace test_constexpr -+ { -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c_r(const CharT *const s, const unsigned long acc) noexcept -+ { -+ return *s ? strlen_c_r(s + 1, acc + 1) : acc; -+ } -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c(const CharT *const s) noexcept -+ { -+ return strlen_c_r(s, 0UL); -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("1") == 1UL, ""); -+ static_assert(strlen_c("example") == 7UL, ""); -+ static_assert(strlen_c("another\0example") == 7UL, ""); -+ -+ } -+ -+ namespace test_rvalue_references -+ { -+ -+ template < int N > -+ struct answer -+ { -+ static constexpr int value = N; -+ }; -+ -+ answer<1> f(int&) { return answer<1>(); } -+ answer<2> f(const int&) { return answer<2>(); } -+ answer<3> f(int&&) { return answer<3>(); } -+ -+ void -+ test() -+ { -+ int i = 0; -+ const int c = 0; -+ static_assert(decltype(f(i))::value == 1, ""); -+ static_assert(decltype(f(c))::value == 2, ""); -+ static_assert(decltype(f(0))::value == 3, ""); -+ } -+ -+ } -+ -+ namespace test_uniform_initialization -+ { -+ -+ struct test -+ { -+ static const int zero {}; -+ static const int one {1}; -+ }; -+ -+ static_assert(test::zero == 0, ""); -+ static_assert(test::one == 1, ""); -+ -+ } -+ -+ namespace test_lambdas -+ { -+ -+ void -+ test1() -+ { -+ auto lambda1 = [](){}; -+ auto lambda2 = lambda1; -+ lambda1(); -+ lambda2(); -+ } -+ -+ int -+ test2() -+ { -+ auto a = [](int i, int j){ return i + j; }(1, 2); -+ auto b = []() -> int { return '0'; }(); -+ auto c = [=](){ return a + b; }(); -+ auto d = [&](){ return c; }(); -+ auto e = [a, &b](int x) mutable { -+ const auto identity = [](int y){ return y; }; -+ for (auto i = 0; i < a; ++i) -+ a += b--; -+ return x + identity(a + b); -+ }(0); -+ return a + b + c + d + e; -+ } -+ -+ int -+ test3() -+ { -+ const auto nullary = [](){ return 0; }; -+ const auto unary = [](int x){ return x; }; -+ using nullary_t = decltype(nullary); -+ using unary_t = decltype(unary); -+ const auto higher1st = [](nullary_t f){ return f(); }; -+ const auto higher2nd = [unary](nullary_t f1){ -+ return [unary, f1](unary_t f2){ return f2(unary(f1())); }; -+ }; -+ return higher1st(nullary) + higher2nd(nullary)(unary); -+ } -+ -+ } -+ -+ namespace test_variadic_templates -+ { -+ -+ template -+ struct sum; -+ -+ template -+ struct sum -+ { -+ static constexpr auto value = N0 + sum::value; -+ }; -+ -+ template <> -+ struct sum<> -+ { -+ static constexpr auto value = 0; -+ }; -+ -+ static_assert(sum<>::value == 0, ""); -+ static_assert(sum<1>::value == 1, ""); -+ static_assert(sum<23>::value == 23, ""); -+ static_assert(sum<1, 2>::value == 3, ""); -+ static_assert(sum<5, 5, 11>::value == 21, ""); -+ static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); -+ -+ } -+ -+ // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae -+ // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function -+ // because of this. -+ namespace test_template_alias_sfinae -+ { -+ -+ struct foo {}; -+ -+ template -+ using member = typename T::member_type; -+ -+ template -+ void func(...) {} -+ -+ template -+ void func(member*) {} -+ -+ void test(); -+ -+ void test() { func(0); } -+ -+ } -+ -+} // namespace cxx11 -+ -+#endif // __cplusplus >= 201103L -+ -+ -+ -+ -+// If the compiler admits that it is not ready for C++14, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201402L -+ -+#error "This is not a C++14 compiler" -+ -+#else -+ -+namespace cxx14 -+{ -+ -+ namespace test_polymorphic_lambdas -+ { -+ -+ int -+ test() -+ { -+ const auto lambda = [](auto&&... args){ -+ const auto istiny = [](auto x){ -+ return (sizeof(x) == 1UL) ? 1 : 0; -+ }; -+ const int aretiny[] = { istiny(args)... }; -+ return aretiny[0]; -+ }; -+ return lambda(1, 1L, 1.0f, '1'); -+ } -+ -+ } -+ -+ namespace test_binary_literals -+ { -+ -+ constexpr auto ivii = 0b0000000000101010; -+ static_assert(ivii == 42, "wrong value"); -+ -+ } -+ -+ namespace test_generalized_constexpr -+ { -+ -+ template < typename CharT > -+ constexpr unsigned long -+ strlen_c(const CharT *const s) noexcept -+ { -+ auto length = 0UL; -+ for (auto p = s; *p; ++p) -+ ++length; -+ return length; -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("x") == 1UL, ""); -+ static_assert(strlen_c("test") == 4UL, ""); -+ static_assert(strlen_c("another\0test") == 7UL, ""); -+ -+ } -+ -+ namespace test_lambda_init_capture -+ { -+ -+ int -+ test() -+ { -+ auto x = 0; -+ const auto lambda1 = [a = x](int b){ return a + b; }; -+ const auto lambda2 = [a = lambda1(x)](){ return a; }; -+ return lambda2(); -+ } -+ -+ } -+ -+ namespace test_digit_separators -+ { -+ -+ constexpr auto ten_million = 100'000'000; -+ static_assert(ten_million == 100000000, ""); -+ -+ } -+ -+ namespace test_return_type_deduction -+ { -+ -+ auto f(int& x) { return x; } -+ decltype(auto) g(int& x) { return x; } -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static constexpr auto value = false; -+ }; -+ -+ template < typename T > -+ struct is_same -+ { -+ static constexpr auto value = true; -+ }; -+ -+ int -+ test() -+ { -+ auto x = 0; -+ static_assert(is_same::value, ""); -+ static_assert(is_same::value, ""); -+ return x; -+ } -+ -+ } -+ -+} // namespace cxx14 -+ -+#endif // __cplusplus >= 201402L -+ -+ -+ -+ -+// If the compiler admits that it is not ready for C++17, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201703L -+ -+#error "This is not a C++17 compiler" -+ -+#else -+ -+#include -+#include -+#include -+ -+namespace cxx17 -+{ -+ -+ namespace test_constexpr_lambdas -+ { -+ -+ constexpr int foo = [](){return 42;}(); -+ -+ } -+ -+ namespace test::nested_namespace::definitions -+ { -+ -+ } -+ -+ namespace test_fold_expression -+ { -+ -+ template -+ int multiply(Args... args) -+ { -+ return (args * ... * 1); -+ } -+ -+ template -+ bool all(Args... args) -+ { -+ return (args && ...); -+ } -+ -+ } -+ -+ namespace test_extended_static_assert -+ { -+ -+ static_assert (true); -+ -+ } -+ -+ namespace test_auto_brace_init_list -+ { -+ -+ auto foo = {5}; -+ auto bar {5}; -+ -+ static_assert(std::is_same, decltype(foo)>::value); -+ static_assert(std::is_same::value); -+ } -+ -+ namespace test_typename_in_template_template_parameter -+ { -+ -+ template typename X> struct D; -+ -+ } -+ -+ namespace test_fallthrough_nodiscard_maybe_unused_attributes -+ { -+ -+ int f1() -+ { -+ return 42; -+ } -+ -+ [[nodiscard]] int f2() -+ { -+ [[maybe_unused]] auto unused = f1(); -+ -+ switch (f1()) -+ { -+ case 17: -+ f1(); -+ [[fallthrough]]; -+ case 42: -+ f1(); -+ } -+ return f1(); -+ } -+ -+ } -+ -+ namespace test_extended_aggregate_initialization -+ { -+ -+ struct base1 -+ { -+ int b1, b2 = 42; -+ }; -+ -+ struct base2 -+ { -+ base2() { -+ b3 = 42; -+ } -+ int b3; -+ }; -+ -+ struct derived : base1, base2 -+ { -+ int d; -+ }; -+ -+ derived d1 {{1, 2}, {}, 4}; // full initialization -+ derived d2 {{}, {}, 4}; // value-initialized bases -+ -+ } -+ -+ namespace test_general_range_based_for_loop -+ { -+ -+ struct iter -+ { -+ int i; -+ -+ int& operator* () -+ { -+ return i; -+ } -+ -+ const int& operator* () const -+ { -+ return i; -+ } -+ -+ iter& operator++() -+ { -+ ++i; -+ return *this; -+ } -+ }; -+ -+ struct sentinel -+ { -+ int i; -+ }; -+ -+ bool operator== (const iter& i, const sentinel& s) -+ { -+ return i.i == s.i; -+ } -+ -+ bool operator!= (const iter& i, const sentinel& s) -+ { -+ return !(i == s); -+ } -+ -+ struct range -+ { -+ iter begin() const -+ { -+ return {0}; -+ } -+ -+ sentinel end() const -+ { -+ return {5}; -+ } -+ }; -+ -+ void f() -+ { -+ range r {}; -+ -+ for (auto i : r) -+ { -+ [[maybe_unused]] auto v = i; -+ } -+ } -+ -+ } -+ -+ namespace test_lambda_capture_asterisk_this_by_value -+ { -+ -+ struct t -+ { -+ int i; -+ int foo() -+ { -+ return [*this]() -+ { -+ return i; -+ }(); -+ } -+ }; -+ -+ } -+ -+ namespace test_enum_class_construction -+ { -+ -+ enum class byte : unsigned char -+ {}; -+ -+ byte foo {42}; -+ -+ } -+ -+ namespace test_constexpr_if -+ { -+ -+ template -+ int f () -+ { -+ if constexpr(cond) -+ { -+ return 13; -+ } -+ else -+ { -+ return 42; -+ } -+ } -+ -+ } -+ -+ namespace test_selection_statement_with_initializer -+ { -+ -+ int f() -+ { -+ return 13; -+ } -+ -+ int f2() -+ { -+ if (auto i = f(); i > 0) -+ { -+ return 3; -+ } -+ -+ switch (auto i = f(); i + 4) -+ { -+ case 17: -+ return 2; -+ -+ default: -+ return 1; -+ } -+ } -+ -+ } -+ -+ namespace test_template_argument_deduction_for_class_templates -+ { -+ -+ template -+ struct pair -+ { -+ pair (T1 p1, T2 p2) -+ : m1 {p1}, -+ m2 {p2} -+ {} -+ -+ T1 m1; -+ T2 m2; -+ }; -+ -+ void f() -+ { -+ [[maybe_unused]] auto p = pair{13, 42u}; -+ } -+ -+ } -+ -+ namespace test_non_type_auto_template_parameters -+ { -+ -+ template -+ struct B -+ {}; -+ -+ B<5> b1; -+ B<'a'> b2; -+ -+ } -+ -+ namespace test_structured_bindings -+ { -+ -+ int arr[2] = { 1, 2 }; -+ std::pair pr = { 1, 2 }; -+ -+ auto f1() -> int(&)[2] -+ { -+ return arr; -+ } -+ -+ auto f2() -> std::pair& -+ { -+ return pr; -+ } -+ -+ struct S -+ { -+ int x1 : 2; -+ volatile double y1; -+ }; -+ -+ S f3() -+ { -+ return {}; -+ } -+ -+ auto [ x1, y1 ] = f1(); -+ auto& [ xr1, yr1 ] = f1(); -+ auto [ x2, y2 ] = f2(); -+ auto& [ xr2, yr2 ] = f2(); -+ const auto [ x3, y3 ] = f3(); -+ -+ } -+ -+ namespace test_exception_spec_type_system -+ { -+ -+ struct Good {}; -+ struct Bad {}; -+ -+ void g1() noexcept; -+ void g2(); -+ -+ template -+ Bad -+ f(T*, T*); -+ -+ template -+ Good -+ f(T1*, T2*); -+ -+ static_assert (std::is_same_v); -+ -+ } -+ -+ namespace test_inline_variables -+ { -+ -+ template void f(T) -+ {} -+ -+ template inline T g(T) -+ { -+ return T{}; -+ } -+ -+ template<> inline void f<>(int) -+ {} -+ -+ template<> int g<>(int) -+ { -+ return 5; -+ } -+ -+ } -+ -+} // namespace cxx17 -+ -+#endif // __cplusplus < 201703L -+ -+ -+ -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ ax_cv_cxx_compile_cxx17=yes -+else case e in #( -+ e) ax_cv_cxx_compile_cxx17=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx17" >&5 -+printf "%s\n" "$ax_cv_cxx_compile_cxx17" >&6; } -+ if test x$ax_cv_cxx_compile_cxx17 = xyes; then -+ ac_success=yes -+ fi -+ -+ if test x$ac_success = xno; then -+ for alternative in ${ax_cxx_compile_alternatives}; do -+ switch="-std=gnu++${alternative}" -+ cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx17_$switch" | sed "$as_sed_sh"` -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features with $switch" >&5 -+printf %s "checking whether $CXX supports C++17 features with $switch... " >&6; } -+if eval test \${$cachevar+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_save_CXX="$CXX" -+ CXX="$CXX $switch" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+// If the compiler admits that it is not ready for C++11, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201103L -+ -+#error "This is not a C++11 compiler" -+ -+#else -+ -+namespace cxx11 -+{ -+ -+ namespace test_static_assert -+ { -+ -+ template -+ struct check -+ { -+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); -+ }; -+ -+ } -+ -+ namespace test_final_override -+ { -+ -+ struct Base -+ { -+ virtual ~Base() {} -+ virtual void f() {} -+ }; -+ -+ struct Derived : public Base -+ { -+ virtual ~Derived() override {} -+ virtual void f() override {} -+ }; -+ -+ } -+ -+ namespace test_double_right_angle_brackets -+ { -+ -+ template < typename T > -+ struct check {}; -+ -+ typedef check single_type; -+ typedef check> double_type; -+ typedef check>> triple_type; -+ typedef check>>> quadruple_type; -+ -+ } -+ -+ namespace test_decltype -+ { -+ -+ int -+ f() -+ { -+ int a = 1; -+ decltype(a) b = 2; -+ return a + b; -+ } -+ -+ } -+ -+ namespace test_type_deduction -+ { -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static const bool value = false; -+ }; -+ -+ template < typename T > -+ struct is_same -+ { -+ static const bool value = true; -+ }; -+ -+ template < typename T1, typename T2 > -+ auto -+ add(T1 a1, T2 a2) -> decltype(a1 + a2) -+ { -+ return a1 + a2; -+ } -+ -+ int -+ test(const int c, volatile int v) -+ { -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == false, ""); -+ auto ac = c; -+ auto av = v; -+ auto sumi = ac + av + 'x'; -+ auto sumf = ac + av + 1.0; -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == true, ""); -+ return (sumf > 0.0) ? sumi : add(c, v); -+ } -+ -+ } -+ -+ namespace test_noexcept -+ { -+ -+ int f() { return 0; } -+ int g() noexcept { return 0; } -+ -+ static_assert(noexcept(f()) == false, ""); -+ static_assert(noexcept(g()) == true, ""); -+ -+ } -+ -+ namespace test_constexpr -+ { -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c_r(const CharT *const s, const unsigned long acc) noexcept -+ { -+ return *s ? strlen_c_r(s + 1, acc + 1) : acc; -+ } -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c(const CharT *const s) noexcept -+ { -+ return strlen_c_r(s, 0UL); -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("1") == 1UL, ""); -+ static_assert(strlen_c("example") == 7UL, ""); -+ static_assert(strlen_c("another\0example") == 7UL, ""); -+ -+ } -+ -+ namespace test_rvalue_references -+ { -+ -+ template < int N > -+ struct answer -+ { -+ static constexpr int value = N; -+ }; -+ -+ answer<1> f(int&) { return answer<1>(); } -+ answer<2> f(const int&) { return answer<2>(); } -+ answer<3> f(int&&) { return answer<3>(); } -+ -+ void -+ test() -+ { -+ int i = 0; -+ const int c = 0; -+ static_assert(decltype(f(i))::value == 1, ""); -+ static_assert(decltype(f(c))::value == 2, ""); -+ static_assert(decltype(f(0))::value == 3, ""); -+ } -+ -+ } -+ -+ namespace test_uniform_initialization -+ { -+ -+ struct test -+ { -+ static const int zero {}; -+ static const int one {1}; -+ }; -+ -+ static_assert(test::zero == 0, ""); -+ static_assert(test::one == 1, ""); -+ -+ } -+ -+ namespace test_lambdas -+ { -+ -+ void -+ test1() -+ { -+ auto lambda1 = [](){}; -+ auto lambda2 = lambda1; -+ lambda1(); -+ lambda2(); -+ } -+ -+ int -+ test2() -+ { -+ auto a = [](int i, int j){ return i + j; }(1, 2); -+ auto b = []() -> int { return '0'; }(); -+ auto c = [=](){ return a + b; }(); -+ auto d = [&](){ return c; }(); -+ auto e = [a, &b](int x) mutable { -+ const auto identity = [](int y){ return y; }; -+ for (auto i = 0; i < a; ++i) -+ a += b--; -+ return x + identity(a + b); -+ }(0); -+ return a + b + c + d + e; -+ } -+ -+ int -+ test3() -+ { -+ const auto nullary = [](){ return 0; }; -+ const auto unary = [](int x){ return x; }; -+ using nullary_t = decltype(nullary); -+ using unary_t = decltype(unary); -+ const auto higher1st = [](nullary_t f){ return f(); }; -+ const auto higher2nd = [unary](nullary_t f1){ -+ return [unary, f1](unary_t f2){ return f2(unary(f1())); }; -+ }; -+ return higher1st(nullary) + higher2nd(nullary)(unary); -+ } -+ -+ } -+ -+ namespace test_variadic_templates -+ { -+ -+ template -+ struct sum; -+ -+ template -+ struct sum -+ { -+ static constexpr auto value = N0 + sum::value; -+ }; -+ -+ template <> -+ struct sum<> -+ { -+ static constexpr auto value = 0; -+ }; -+ -+ static_assert(sum<>::value == 0, ""); -+ static_assert(sum<1>::value == 1, ""); -+ static_assert(sum<23>::value == 23, ""); -+ static_assert(sum<1, 2>::value == 3, ""); -+ static_assert(sum<5, 5, 11>::value == 21, ""); -+ static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); -+ -+ } -+ -+ // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae -+ // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function -+ // because of this. -+ namespace test_template_alias_sfinae -+ { -+ -+ struct foo {}; -+ -+ template -+ using member = typename T::member_type; -+ -+ template -+ void func(...) {} -+ -+ template -+ void func(member*) {} -+ -+ void test(); -+ -+ void test() { func(0); } -+ -+ } -+ -+} // namespace cxx11 -+ -+#endif // __cplusplus >= 201103L -+ -+ -+ -+ -+// If the compiler admits that it is not ready for C++14, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201402L -+ -+#error "This is not a C++14 compiler" -+ -+#else -+ -+namespace cxx14 -+{ -+ -+ namespace test_polymorphic_lambdas -+ { -+ -+ int -+ test() -+ { -+ const auto lambda = [](auto&&... args){ -+ const auto istiny = [](auto x){ -+ return (sizeof(x) == 1UL) ? 1 : 0; -+ }; -+ const int aretiny[] = { istiny(args)... }; -+ return aretiny[0]; -+ }; -+ return lambda(1, 1L, 1.0f, '1'); -+ } -+ -+ } -+ -+ namespace test_binary_literals -+ { -+ -+ constexpr auto ivii = 0b0000000000101010; -+ static_assert(ivii == 42, "wrong value"); -+ -+ } -+ -+ namespace test_generalized_constexpr -+ { -+ -+ template < typename CharT > -+ constexpr unsigned long -+ strlen_c(const CharT *const s) noexcept -+ { -+ auto length = 0UL; -+ for (auto p = s; *p; ++p) -+ ++length; -+ return length; -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("x") == 1UL, ""); -+ static_assert(strlen_c("test") == 4UL, ""); -+ static_assert(strlen_c("another\0test") == 7UL, ""); -+ -+ } -+ -+ namespace test_lambda_init_capture -+ { -+ -+ int -+ test() -+ { -+ auto x = 0; -+ const auto lambda1 = [a = x](int b){ return a + b; }; -+ const auto lambda2 = [a = lambda1(x)](){ return a; }; -+ return lambda2(); -+ } -+ -+ } -+ -+ namespace test_digit_separators -+ { -+ -+ constexpr auto ten_million = 100'000'000; -+ static_assert(ten_million == 100000000, ""); -+ -+ } -+ -+ namespace test_return_type_deduction -+ { -+ -+ auto f(int& x) { return x; } -+ decltype(auto) g(int& x) { return x; } -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static constexpr auto value = false; -+ }; -+ -+ template < typename T > -+ struct is_same -+ { -+ static constexpr auto value = true; -+ }; -+ -+ int -+ test() -+ { -+ auto x = 0; -+ static_assert(is_same::value, ""); -+ static_assert(is_same::value, ""); -+ return x; -+ } -+ -+ } -+ -+} // namespace cxx14 -+ -+#endif // __cplusplus >= 201402L -+ -+ -+ -+ -+// If the compiler admits that it is not ready for C++17, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201703L -+ -+#error "This is not a C++17 compiler" -+ -+#else -+ -+#include -+#include -+#include -+ -+namespace cxx17 -+{ -+ -+ namespace test_constexpr_lambdas -+ { -+ -+ constexpr int foo = [](){return 42;}(); -+ -+ } -+ -+ namespace test::nested_namespace::definitions -+ { -+ -+ } -+ -+ namespace test_fold_expression -+ { -+ -+ template -+ int multiply(Args... args) -+ { -+ return (args * ... * 1); -+ } -+ -+ template -+ bool all(Args... args) -+ { -+ return (args && ...); -+ } -+ -+ } -+ -+ namespace test_extended_static_assert -+ { -+ -+ static_assert (true); -+ -+ } -+ -+ namespace test_auto_brace_init_list -+ { -+ -+ auto foo = {5}; -+ auto bar {5}; -+ -+ static_assert(std::is_same, decltype(foo)>::value); -+ static_assert(std::is_same::value); -+ } -+ -+ namespace test_typename_in_template_template_parameter -+ { -+ -+ template typename X> struct D; -+ -+ } -+ -+ namespace test_fallthrough_nodiscard_maybe_unused_attributes -+ { -+ -+ int f1() -+ { -+ return 42; -+ } -+ -+ [[nodiscard]] int f2() -+ { -+ [[maybe_unused]] auto unused = f1(); -+ -+ switch (f1()) -+ { -+ case 17: -+ f1(); -+ [[fallthrough]]; -+ case 42: -+ f1(); -+ } -+ return f1(); -+ } -+ -+ } -+ -+ namespace test_extended_aggregate_initialization -+ { -+ -+ struct base1 -+ { -+ int b1, b2 = 42; -+ }; -+ -+ struct base2 -+ { -+ base2() { -+ b3 = 42; -+ } -+ int b3; -+ }; -+ -+ struct derived : base1, base2 -+ { -+ int d; -+ }; -+ -+ derived d1 {{1, 2}, {}, 4}; // full initialization -+ derived d2 {{}, {}, 4}; // value-initialized bases -+ -+ } -+ -+ namespace test_general_range_based_for_loop -+ { -+ -+ struct iter -+ { -+ int i; -+ -+ int& operator* () -+ { -+ return i; -+ } -+ -+ const int& operator* () const -+ { -+ return i; -+ } -+ -+ iter& operator++() -+ { -+ ++i; -+ return *this; -+ } -+ }; -+ -+ struct sentinel -+ { -+ int i; -+ }; -+ -+ bool operator== (const iter& i, const sentinel& s) -+ { -+ return i.i == s.i; -+ } -+ -+ bool operator!= (const iter& i, const sentinel& s) -+ { -+ return !(i == s); -+ } -+ -+ struct range -+ { -+ iter begin() const -+ { -+ return {0}; -+ } -+ -+ sentinel end() const -+ { -+ return {5}; -+ } -+ }; -+ -+ void f() -+ { -+ range r {}; -+ -+ for (auto i : r) -+ { -+ [[maybe_unused]] auto v = i; -+ } -+ } -+ -+ } -+ -+ namespace test_lambda_capture_asterisk_this_by_value -+ { -+ -+ struct t -+ { -+ int i; -+ int foo() -+ { -+ return [*this]() -+ { -+ return i; -+ }(); -+ } -+ }; -+ -+ } -+ -+ namespace test_enum_class_construction -+ { -+ -+ enum class byte : unsigned char -+ {}; -+ -+ byte foo {42}; -+ -+ } -+ -+ namespace test_constexpr_if -+ { -+ -+ template -+ int f () -+ { -+ if constexpr(cond) -+ { -+ return 13; -+ } -+ else -+ { -+ return 42; -+ } -+ } -+ -+ } -+ -+ namespace test_selection_statement_with_initializer -+ { -+ -+ int f() -+ { -+ return 13; -+ } -+ -+ int f2() -+ { -+ if (auto i = f(); i > 0) -+ { -+ return 3; -+ } -+ -+ switch (auto i = f(); i + 4) -+ { -+ case 17: -+ return 2; -+ -+ default: -+ return 1; -+ } -+ } -+ -+ } -+ -+ namespace test_template_argument_deduction_for_class_templates -+ { -+ -+ template -+ struct pair -+ { -+ pair (T1 p1, T2 p2) -+ : m1 {p1}, -+ m2 {p2} -+ {} -+ -+ T1 m1; -+ T2 m2; -+ }; -+ -+ void f() -+ { -+ [[maybe_unused]] auto p = pair{13, 42u}; -+ } -+ -+ } -+ -+ namespace test_non_type_auto_template_parameters -+ { -+ -+ template -+ struct B -+ {}; -+ -+ B<5> b1; -+ B<'a'> b2; -+ -+ } -+ -+ namespace test_structured_bindings -+ { -+ -+ int arr[2] = { 1, 2 }; -+ std::pair pr = { 1, 2 }; -+ -+ auto f1() -> int(&)[2] -+ { -+ return arr; -+ } -+ -+ auto f2() -> std::pair& -+ { -+ return pr; -+ } -+ -+ struct S -+ { -+ int x1 : 2; -+ volatile double y1; -+ }; -+ -+ S f3() -+ { -+ return {}; -+ } -+ -+ auto [ x1, y1 ] = f1(); -+ auto& [ xr1, yr1 ] = f1(); -+ auto [ x2, y2 ] = f2(); -+ auto& [ xr2, yr2 ] = f2(); -+ const auto [ x3, y3 ] = f3(); -+ -+ } -+ -+ namespace test_exception_spec_type_system -+ { -+ -+ struct Good {}; -+ struct Bad {}; -+ -+ void g1() noexcept; -+ void g2(); -+ -+ template -+ Bad -+ f(T*, T*); -+ -+ template -+ Good -+ f(T1*, T2*); -+ -+ static_assert (std::is_same_v); -+ -+ } -+ -+ namespace test_inline_variables -+ { -+ -+ template void f(T) -+ {} -+ -+ template inline T g(T) -+ { -+ return T{}; -+ } -+ -+ template<> inline void f<>(int) -+ {} -+ -+ template<> int g<>(int) -+ { -+ return 5; -+ } -+ -+ } -+ -+} // namespace cxx17 -+ -+#endif // __cplusplus < 201703L -+ -+ -+ -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ eval $cachevar=yes -+else case e in #( -+ e) eval $cachevar=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ CXX="$ac_save_CXX" ;; -+esac -+fi -+eval ac_res=\$$cachevar -+ { 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 -+ CXX="$CXX $switch" -+ if test -n "$CXXCPP" ; then -+ CXXCPP="$CXXCPP $switch" -+ fi -+ ac_success=yes -+ break -+ fi -+ done -+ fi -+ -+ if test x$ac_success = xno; then -+ for alternative in ${ax_cxx_compile_alternatives}; do -+ for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do -+ cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx17_$switch" | sed "$as_sed_sh"` -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features with $switch" >&5 -+printf %s "checking whether $CXX supports C++17 features with $switch... " >&6; } -+if eval test \${$cachevar+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_save_CXX="$CXX" -+ CXX="$CXX $switch" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+// If the compiler admits that it is not ready for C++11, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201103L -+ -+#error "This is not a C++11 compiler" -+ -+#else -+ -+namespace cxx11 -+{ -+ -+ namespace test_static_assert -+ { -+ -+ template -+ struct check -+ { -+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); -+ }; -+ -+ } -+ -+ namespace test_final_override -+ { -+ -+ struct Base -+ { -+ virtual ~Base() {} -+ virtual void f() {} -+ }; -+ -+ struct Derived : public Base -+ { -+ virtual ~Derived() override {} -+ virtual void f() override {} -+ }; -+ -+ } -+ -+ namespace test_double_right_angle_brackets -+ { -+ -+ template < typename T > -+ struct check {}; -+ -+ typedef check single_type; -+ typedef check> double_type; -+ typedef check>> triple_type; -+ typedef check>>> quadruple_type; -+ -+ } -+ -+ namespace test_decltype -+ { -+ -+ int -+ f() -+ { -+ int a = 1; -+ decltype(a) b = 2; -+ return a + b; -+ } -+ -+ } -+ -+ namespace test_type_deduction -+ { -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static const bool value = false; -+ }; -+ -+ template < typename T > -+ struct is_same -+ { -+ static const bool value = true; -+ }; -+ -+ template < typename T1, typename T2 > -+ auto -+ add(T1 a1, T2 a2) -> decltype(a1 + a2) -+ { -+ return a1 + a2; -+ } -+ -+ int -+ test(const int c, volatile int v) -+ { -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == false, ""); -+ auto ac = c; -+ auto av = v; -+ auto sumi = ac + av + 'x'; -+ auto sumf = ac + av + 1.0; -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == true, ""); -+ return (sumf > 0.0) ? sumi : add(c, v); -+ } -+ -+ } -+ -+ namespace test_noexcept -+ { -+ -+ int f() { return 0; } -+ int g() noexcept { return 0; } -+ -+ static_assert(noexcept(f()) == false, ""); -+ static_assert(noexcept(g()) == true, ""); -+ -+ } -+ -+ namespace test_constexpr -+ { -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c_r(const CharT *const s, const unsigned long acc) noexcept -+ { -+ return *s ? strlen_c_r(s + 1, acc + 1) : acc; -+ } -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c(const CharT *const s) noexcept -+ { -+ return strlen_c_r(s, 0UL); -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("1") == 1UL, ""); -+ static_assert(strlen_c("example") == 7UL, ""); -+ static_assert(strlen_c("another\0example") == 7UL, ""); -+ -+ } -+ -+ namespace test_rvalue_references -+ { -+ -+ template < int N > -+ struct answer -+ { -+ static constexpr int value = N; -+ }; -+ -+ answer<1> f(int&) { return answer<1>(); } -+ answer<2> f(const int&) { return answer<2>(); } -+ answer<3> f(int&&) { return answer<3>(); } -+ -+ void -+ test() -+ { -+ int i = 0; -+ const int c = 0; -+ static_assert(decltype(f(i))::value == 1, ""); -+ static_assert(decltype(f(c))::value == 2, ""); -+ static_assert(decltype(f(0))::value == 3, ""); -+ } -+ -+ } -+ -+ namespace test_uniform_initialization -+ { -+ -+ struct test -+ { -+ static const int zero {}; -+ static const int one {1}; -+ }; -+ -+ static_assert(test::zero == 0, ""); -+ static_assert(test::one == 1, ""); -+ -+ } -+ -+ namespace test_lambdas -+ { -+ -+ void -+ test1() -+ { -+ auto lambda1 = [](){}; -+ auto lambda2 = lambda1; -+ lambda1(); -+ lambda2(); -+ } -+ -+ int -+ test2() -+ { -+ auto a = [](int i, int j){ return i + j; }(1, 2); -+ auto b = []() -> int { return '0'; }(); -+ auto c = [=](){ return a + b; }(); -+ auto d = [&](){ return c; }(); -+ auto e = [a, &b](int x) mutable { -+ const auto identity = [](int y){ return y; }; -+ for (auto i = 0; i < a; ++i) -+ a += b--; -+ return x + identity(a + b); -+ }(0); -+ return a + b + c + d + e; -+ } -+ -+ int -+ test3() -+ { -+ const auto nullary = [](){ return 0; }; -+ const auto unary = [](int x){ return x; }; -+ using nullary_t = decltype(nullary); -+ using unary_t = decltype(unary); -+ const auto higher1st = [](nullary_t f){ return f(); }; -+ const auto higher2nd = [unary](nullary_t f1){ -+ return [unary, f1](unary_t f2){ return f2(unary(f1())); }; -+ }; -+ return higher1st(nullary) + higher2nd(nullary)(unary); -+ } -+ -+ } -+ -+ namespace test_variadic_templates -+ { -+ -+ template -+ struct sum; -+ -+ template -+ struct sum -+ { -+ static constexpr auto value = N0 + sum::value; -+ }; -+ -+ template <> -+ struct sum<> -+ { -+ static constexpr auto value = 0; -+ }; -+ -+ static_assert(sum<>::value == 0, ""); -+ static_assert(sum<1>::value == 1, ""); -+ static_assert(sum<23>::value == 23, ""); -+ static_assert(sum<1, 2>::value == 3, ""); -+ static_assert(sum<5, 5, 11>::value == 21, ""); -+ static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); -+ -+ } -+ -+ // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae -+ // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function -+ // because of this. -+ namespace test_template_alias_sfinae -+ { -+ -+ struct foo {}; -+ -+ template -+ using member = typename T::member_type; -+ -+ template -+ void func(...) {} -+ -+ template -+ void func(member*) {} -+ -+ void test(); -+ -+ void test() { func(0); } -+ -+ } -+ -+} // namespace cxx11 -+ -+#endif // __cplusplus >= 201103L -+ -+ -+ -+ -+// If the compiler admits that it is not ready for C++14, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201402L -+ -+#error "This is not a C++14 compiler" -+ -+#else -+ -+namespace cxx14 -+{ -+ -+ namespace test_polymorphic_lambdas -+ { -+ -+ int -+ test() -+ { -+ const auto lambda = [](auto&&... args){ -+ const auto istiny = [](auto x){ -+ return (sizeof(x) == 1UL) ? 1 : 0; -+ }; -+ const int aretiny[] = { istiny(args)... }; -+ return aretiny[0]; -+ }; -+ return lambda(1, 1L, 1.0f, '1'); -+ } -+ -+ } -+ -+ namespace test_binary_literals -+ { -+ -+ constexpr auto ivii = 0b0000000000101010; -+ static_assert(ivii == 42, "wrong value"); -+ -+ } -+ -+ namespace test_generalized_constexpr -+ { -+ -+ template < typename CharT > -+ constexpr unsigned long -+ strlen_c(const CharT *const s) noexcept -+ { -+ auto length = 0UL; -+ for (auto p = s; *p; ++p) -+ ++length; -+ return length; -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("x") == 1UL, ""); -+ static_assert(strlen_c("test") == 4UL, ""); -+ static_assert(strlen_c("another\0test") == 7UL, ""); -+ -+ } -+ -+ namespace test_lambda_init_capture -+ { -+ -+ int -+ test() -+ { -+ auto x = 0; -+ const auto lambda1 = [a = x](int b){ return a + b; }; -+ const auto lambda2 = [a = lambda1(x)](){ return a; }; -+ return lambda2(); -+ } -+ -+ } -+ -+ namespace test_digit_separators -+ { -+ -+ constexpr auto ten_million = 100'000'000; -+ static_assert(ten_million == 100000000, ""); -+ -+ } -+ -+ namespace test_return_type_deduction -+ { -+ -+ auto f(int& x) { return x; } -+ decltype(auto) g(int& x) { return x; } -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static constexpr auto value = false; -+ }; -+ -+ template < typename T > -+ struct is_same -+ { -+ static constexpr auto value = true; -+ }; -+ -+ int -+ test() -+ { -+ auto x = 0; -+ static_assert(is_same::value, ""); -+ static_assert(is_same::value, ""); -+ return x; -+ } -+ -+ } -+ -+} // namespace cxx14 -+ -+#endif // __cplusplus >= 201402L -+ -+ -+ -+ -+// If the compiler admits that it is not ready for C++17, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201703L -+ -+#error "This is not a C++17 compiler" -+ -+#else -+ -+#include -+#include -+#include -+ -+namespace cxx17 -+{ -+ -+ namespace test_constexpr_lambdas -+ { -+ -+ constexpr int foo = [](){return 42;}(); -+ -+ } -+ -+ namespace test::nested_namespace::definitions -+ { -+ -+ } -+ -+ namespace test_fold_expression -+ { -+ -+ template -+ int multiply(Args... args) -+ { -+ return (args * ... * 1); -+ } -+ -+ template -+ bool all(Args... args) -+ { -+ return (args && ...); -+ } -+ -+ } -+ -+ namespace test_extended_static_assert -+ { -+ -+ static_assert (true); -+ -+ } -+ -+ namespace test_auto_brace_init_list -+ { -+ -+ auto foo = {5}; -+ auto bar {5}; -+ -+ static_assert(std::is_same, decltype(foo)>::value); -+ static_assert(std::is_same::value); -+ } -+ -+ namespace test_typename_in_template_template_parameter -+ { -+ -+ template typename X> struct D; -+ -+ } -+ -+ namespace test_fallthrough_nodiscard_maybe_unused_attributes -+ { -+ -+ int f1() -+ { -+ return 42; -+ } -+ -+ [[nodiscard]] int f2() -+ { -+ [[maybe_unused]] auto unused = f1(); -+ -+ switch (f1()) -+ { -+ case 17: -+ f1(); -+ [[fallthrough]]; -+ case 42: -+ f1(); -+ } -+ return f1(); -+ } -+ -+ } -+ -+ namespace test_extended_aggregate_initialization -+ { -+ -+ struct base1 -+ { -+ int b1, b2 = 42; -+ }; -+ -+ struct base2 -+ { -+ base2() { -+ b3 = 42; -+ } -+ int b3; -+ }; -+ -+ struct derived : base1, base2 -+ { -+ int d; -+ }; -+ -+ derived d1 {{1, 2}, {}, 4}; // full initialization -+ derived d2 {{}, {}, 4}; // value-initialized bases -+ -+ } -+ -+ namespace test_general_range_based_for_loop -+ { -+ -+ struct iter -+ { -+ int i; -+ -+ int& operator* () -+ { -+ return i; -+ } -+ -+ const int& operator* () const -+ { -+ return i; -+ } -+ -+ iter& operator++() -+ { -+ ++i; -+ return *this; -+ } -+ }; -+ -+ struct sentinel -+ { -+ int i; -+ }; -+ -+ bool operator== (const iter& i, const sentinel& s) -+ { -+ return i.i == s.i; -+ } -+ -+ bool operator!= (const iter& i, const sentinel& s) -+ { -+ return !(i == s); -+ } -+ -+ struct range -+ { -+ iter begin() const -+ { -+ return {0}; -+ } -+ -+ sentinel end() const -+ { -+ return {5}; -+ } -+ }; -+ -+ void f() -+ { -+ range r {}; -+ -+ for (auto i : r) -+ { -+ [[maybe_unused]] auto v = i; -+ } -+ } -+ -+ } -+ -+ namespace test_lambda_capture_asterisk_this_by_value -+ { -+ -+ struct t -+ { -+ int i; -+ int foo() -+ { -+ return [*this]() -+ { -+ return i; -+ }(); -+ } -+ }; -+ -+ } -+ -+ namespace test_enum_class_construction -+ { -+ -+ enum class byte : unsigned char -+ {}; -+ -+ byte foo {42}; -+ -+ } -+ -+ namespace test_constexpr_if -+ { -+ -+ template -+ int f () -+ { -+ if constexpr(cond) -+ { -+ return 13; -+ } -+ else -+ { -+ return 42; -+ } -+ } -+ -+ } -+ -+ namespace test_selection_statement_with_initializer -+ { -+ -+ int f() -+ { -+ return 13; -+ } -+ -+ int f2() -+ { -+ if (auto i = f(); i > 0) -+ { -+ return 3; -+ } -+ -+ switch (auto i = f(); i + 4) -+ { -+ case 17: -+ return 2; -+ -+ default: -+ return 1; -+ } -+ } -+ -+ } -+ -+ namespace test_template_argument_deduction_for_class_templates -+ { -+ -+ template -+ struct pair -+ { -+ pair (T1 p1, T2 p2) -+ : m1 {p1}, -+ m2 {p2} -+ {} -+ -+ T1 m1; -+ T2 m2; -+ }; -+ -+ void f() -+ { -+ [[maybe_unused]] auto p = pair{13, 42u}; -+ } -+ -+ } -+ -+ namespace test_non_type_auto_template_parameters -+ { -+ -+ template -+ struct B -+ {}; -+ -+ B<5> b1; -+ B<'a'> b2; -+ -+ } -+ -+ namespace test_structured_bindings -+ { -+ -+ int arr[2] = { 1, 2 }; -+ std::pair pr = { 1, 2 }; -+ -+ auto f1() -> int(&)[2] -+ { -+ return arr; -+ } -+ -+ auto f2() -> std::pair& -+ { -+ return pr; -+ } -+ -+ struct S -+ { -+ int x1 : 2; -+ volatile double y1; -+ }; -+ -+ S f3() -+ { -+ return {}; -+ } -+ -+ auto [ x1, y1 ] = f1(); -+ auto& [ xr1, yr1 ] = f1(); -+ auto [ x2, y2 ] = f2(); -+ auto& [ xr2, yr2 ] = f2(); -+ const auto [ x3, y3 ] = f3(); -+ -+ } -+ -+ namespace test_exception_spec_type_system -+ { -+ -+ struct Good {}; -+ struct Bad {}; -+ -+ void g1() noexcept; -+ void g2(); -+ -+ template -+ Bad -+ f(T*, T*); -+ -+ template -+ Good -+ f(T1*, T2*); -+ -+ static_assert (std::is_same_v); -+ -+ } -+ -+ namespace test_inline_variables -+ { -+ -+ template void f(T) -+ {} -+ -+ template inline T g(T) -+ { -+ return T{}; -+ } -+ -+ template<> inline void f<>(int) -+ {} -+ -+ template<> int g<>(int) -+ { -+ return 5; -+ } -+ -+ } -+ -+} // namespace cxx17 -+ -+#endif // __cplusplus < 201703L -+ -+ -+ -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ eval $cachevar=yes -+else case e in #( -+ e) eval $cachevar=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ CXX="$ac_save_CXX" ;; -+esac -+fi -+eval ac_res=\$$cachevar -+ { 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 -+ CXX="$CXX $switch" -+ if test -n "$CXXCPP" ; then -+ CXXCPP="$CXXCPP $switch" -+ fi -+ ac_success=yes -+ break -+ fi -+ done -+ if test x$ac_success = xyes; then -+ break -+ fi -+ done -+ 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 -+ -+ if test x$ax_cxx_compile_cxx17_required = xtrue; then -+ if test x$ac_success = xno; then -+ as_fn_error $? "*** A compiler with support for C++17 language features is required." "$LINENO" 5 -+ fi -+ fi -+ if test x$ac_success = xno; then -+ HAVE_CXX17=0 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: No compiler with C++17 support was found" >&5 -+printf "%s\n" "$as_me: No compiler with C++17 support was found" >&6;} -+ else -+ HAVE_CXX17=1 -+ -+printf "%s\n" "#define HAVE_CXX17 1" >>confdefs.h -+ -+ fi -+ -+ -+ HAVE_CXX11=1 -+ ;; -+ -+ 20) -+ ax_cxx_compile_alternatives="20" ax_cxx_compile_cxx20_required=true -+ ac_ext=cpp -+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 -+ ac_success=no -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++20 features by default" >&5 -+printf %s "checking whether $CXX supports C++20 features by default... " >&6; } -+if test ${ax_cv_cxx_compile_cxx20+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+// If the compiler admits that it is not ready for C++11, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201103L -+ -+#error "This is not a C++11 compiler" -+ -+#else -+ -+namespace cxx11 -+{ -+ -+ namespace test_static_assert -+ { -+ -+ template -+ struct check -+ { -+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); -+ }; -+ -+ } -+ -+ namespace test_final_override -+ { -+ -+ struct Base -+ { -+ virtual ~Base() {} -+ virtual void f() {} -+ }; -+ -+ struct Derived : public Base -+ { -+ virtual ~Derived() override {} -+ virtual void f() override {} -+ }; -+ -+ } -+ -+ namespace test_double_right_angle_brackets -+ { -+ -+ template < typename T > -+ struct check {}; -+ -+ typedef check single_type; -+ typedef check> double_type; -+ typedef check>> triple_type; -+ typedef check>>> quadruple_type; -+ -+ } -+ -+ namespace test_decltype -+ { -+ -+ int -+ f() -+ { -+ int a = 1; -+ decltype(a) b = 2; -+ return a + b; -+ } -+ -+ } -+ -+ namespace test_type_deduction -+ { -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static const bool value = false; -+ }; -+ -+ template < typename T > -+ struct is_same -+ { -+ static const bool value = true; -+ }; -+ -+ template < typename T1, typename T2 > -+ auto -+ add(T1 a1, T2 a2) -> decltype(a1 + a2) -+ { -+ return a1 + a2; -+ } -+ -+ int -+ test(const int c, volatile int v) -+ { -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == false, ""); -+ auto ac = c; -+ auto av = v; -+ auto sumi = ac + av + 'x'; -+ auto sumf = ac + av + 1.0; -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == true, ""); -+ return (sumf > 0.0) ? sumi : add(c, v); -+ } -+ -+ } -+ -+ namespace test_noexcept -+ { -+ -+ int f() { return 0; } -+ int g() noexcept { return 0; } -+ -+ static_assert(noexcept(f()) == false, ""); -+ static_assert(noexcept(g()) == true, ""); -+ -+ } -+ -+ namespace test_constexpr -+ { -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c_r(const CharT *const s, const unsigned long acc) noexcept -+ { -+ return *s ? strlen_c_r(s + 1, acc + 1) : acc; -+ } -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c(const CharT *const s) noexcept -+ { -+ return strlen_c_r(s, 0UL); -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("1") == 1UL, ""); -+ static_assert(strlen_c("example") == 7UL, ""); -+ static_assert(strlen_c("another\0example") == 7UL, ""); -+ -+ } -+ -+ namespace test_rvalue_references -+ { -+ -+ template < int N > -+ struct answer -+ { -+ static constexpr int value = N; -+ }; -+ -+ answer<1> f(int&) { return answer<1>(); } -+ answer<2> f(const int&) { return answer<2>(); } -+ answer<3> f(int&&) { return answer<3>(); } -+ -+ void -+ test() -+ { -+ int i = 0; -+ const int c = 0; -+ static_assert(decltype(f(i))::value == 1, ""); -+ static_assert(decltype(f(c))::value == 2, ""); -+ static_assert(decltype(f(0))::value == 3, ""); -+ } -+ -+ } -+ -+ namespace test_uniform_initialization -+ { -+ -+ struct test -+ { -+ static const int zero {}; -+ static const int one {1}; -+ }; -+ -+ static_assert(test::zero == 0, ""); -+ static_assert(test::one == 1, ""); -+ -+ } -+ -+ namespace test_lambdas -+ { -+ -+ void -+ test1() -+ { -+ auto lambda1 = [](){}; -+ auto lambda2 = lambda1; -+ lambda1(); -+ lambda2(); -+ } -+ -+ int -+ test2() -+ { -+ auto a = [](int i, int j){ return i + j; }(1, 2); -+ auto b = []() -> int { return '0'; }(); -+ auto c = [=](){ return a + b; }(); -+ auto d = [&](){ return c; }(); -+ auto e = [a, &b](int x) mutable { -+ const auto identity = [](int y){ return y; }; -+ for (auto i = 0; i < a; ++i) -+ a += b--; -+ return x + identity(a + b); -+ }(0); -+ return a + b + c + d + e; -+ } -+ -+ int -+ test3() -+ { -+ const auto nullary = [](){ return 0; }; -+ const auto unary = [](int x){ return x; }; -+ using nullary_t = decltype(nullary); -+ using unary_t = decltype(unary); -+ const auto higher1st = [](nullary_t f){ return f(); }; -+ const auto higher2nd = [unary](nullary_t f1){ -+ return [unary, f1](unary_t f2){ return f2(unary(f1())); }; -+ }; -+ return higher1st(nullary) + higher2nd(nullary)(unary); -+ } -+ -+ } -+ -+ namespace test_variadic_templates -+ { -+ -+ template -+ struct sum; -+ -+ template -+ struct sum -+ { -+ static constexpr auto value = N0 + sum::value; -+ }; -+ -+ template <> -+ struct sum<> -+ { -+ static constexpr auto value = 0; -+ }; -+ -+ static_assert(sum<>::value == 0, ""); -+ static_assert(sum<1>::value == 1, ""); -+ static_assert(sum<23>::value == 23, ""); -+ static_assert(sum<1, 2>::value == 3, ""); -+ static_assert(sum<5, 5, 11>::value == 21, ""); -+ static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); -+ -+ } -+ -+ // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae -+ // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function -+ // because of this. -+ namespace test_template_alias_sfinae -+ { -+ -+ struct foo {}; -+ -+ template -+ using member = typename T::member_type; -+ -+ template -+ void func(...) {} -+ -+ template -+ void func(member*) {} -+ -+ void test(); -+ -+ void test() { func(0); } -+ -+ } -+ -+} // namespace cxx11 -+ -+#endif // __cplusplus >= 201103L -+ -+ -+ -+ -+// If the compiler admits that it is not ready for C++14, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201402L -+ -+#error "This is not a C++14 compiler" -+ -+#else -+ -+namespace cxx14 -+{ -+ -+ namespace test_polymorphic_lambdas -+ { -+ -+ int -+ test() -+ { -+ const auto lambda = [](auto&&... args){ -+ const auto istiny = [](auto x){ -+ return (sizeof(x) == 1UL) ? 1 : 0; -+ }; -+ const int aretiny[] = { istiny(args)... }; -+ return aretiny[0]; -+ }; -+ return lambda(1, 1L, 1.0f, '1'); -+ } -+ -+ } -+ -+ namespace test_binary_literals -+ { -+ -+ constexpr auto ivii = 0b0000000000101010; -+ static_assert(ivii == 42, "wrong value"); -+ -+ } -+ -+ namespace test_generalized_constexpr -+ { -+ -+ template < typename CharT > -+ constexpr unsigned long -+ strlen_c(const CharT *const s) noexcept -+ { -+ auto length = 0UL; -+ for (auto p = s; *p; ++p) -+ ++length; -+ return length; -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("x") == 1UL, ""); -+ static_assert(strlen_c("test") == 4UL, ""); -+ static_assert(strlen_c("another\0test") == 7UL, ""); -+ -+ } -+ -+ namespace test_lambda_init_capture -+ { -+ -+ int -+ test() -+ { -+ auto x = 0; -+ const auto lambda1 = [a = x](int b){ return a + b; }; -+ const auto lambda2 = [a = lambda1(x)](){ return a; }; -+ return lambda2(); -+ } -+ -+ } -+ -+ namespace test_digit_separators -+ { -+ -+ constexpr auto ten_million = 100'000'000; -+ static_assert(ten_million == 100000000, ""); -+ -+ } -+ -+ namespace test_return_type_deduction -+ { -+ -+ auto f(int& x) { return x; } -+ decltype(auto) g(int& x) { return x; } -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static constexpr auto value = false; -+ }; -+ -+ template < typename T > -+ struct is_same -+ { -+ static constexpr auto value = true; -+ }; -+ -+ int -+ test() -+ { -+ auto x = 0; -+ static_assert(is_same::value, ""); -+ static_assert(is_same::value, ""); -+ return x; -+ } -+ -+ } -+ -+} // namespace cxx14 -+ -+#endif // __cplusplus >= 201402L -+ -+ -+ -+ -+// If the compiler admits that it is not ready for C++17, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201703L -+ -+#error "This is not a C++17 compiler" -+ -+#else -+ -+#include -+#include -+#include -+ -+namespace cxx17 -+{ -+ -+ namespace test_constexpr_lambdas -+ { -+ -+ constexpr int foo = [](){return 42;}(); -+ -+ } -+ -+ namespace test::nested_namespace::definitions -+ { -+ -+ } -+ -+ namespace test_fold_expression -+ { -+ -+ template -+ int multiply(Args... args) -+ { -+ return (args * ... * 1); -+ } -+ -+ template -+ bool all(Args... args) -+ { -+ return (args && ...); -+ } -+ -+ } -+ -+ namespace test_extended_static_assert -+ { -+ -+ static_assert (true); -+ -+ } -+ -+ namespace test_auto_brace_init_list -+ { -+ -+ auto foo = {5}; -+ auto bar {5}; -+ -+ static_assert(std::is_same, decltype(foo)>::value); -+ static_assert(std::is_same::value); -+ } -+ -+ namespace test_typename_in_template_template_parameter -+ { -+ -+ template typename X> struct D; -+ -+ } -+ -+ namespace test_fallthrough_nodiscard_maybe_unused_attributes -+ { -+ -+ int f1() -+ { -+ return 42; -+ } -+ -+ [[nodiscard]] int f2() -+ { -+ [[maybe_unused]] auto unused = f1(); -+ -+ switch (f1()) -+ { -+ case 17: -+ f1(); -+ [[fallthrough]]; -+ case 42: -+ f1(); -+ } -+ return f1(); -+ } -+ -+ } -+ -+ namespace test_extended_aggregate_initialization -+ { -+ -+ struct base1 -+ { -+ int b1, b2 = 42; -+ }; -+ -+ struct base2 -+ { -+ base2() { -+ b3 = 42; -+ } -+ int b3; -+ }; -+ -+ struct derived : base1, base2 -+ { -+ int d; -+ }; -+ -+ derived d1 {{1, 2}, {}, 4}; // full initialization -+ derived d2 {{}, {}, 4}; // value-initialized bases -+ -+ } -+ -+ namespace test_general_range_based_for_loop -+ { -+ -+ struct iter -+ { -+ int i; -+ -+ int& operator* () -+ { -+ return i; -+ } -+ -+ const int& operator* () const -+ { -+ return i; -+ } -+ -+ iter& operator++() -+ { -+ ++i; -+ return *this; -+ } -+ }; -+ -+ struct sentinel -+ { -+ int i; -+ }; -+ -+ bool operator== (const iter& i, const sentinel& s) -+ { -+ return i.i == s.i; -+ } -+ -+ bool operator!= (const iter& i, const sentinel& s) -+ { -+ return !(i == s); -+ } -+ -+ struct range -+ { -+ iter begin() const -+ { -+ return {0}; -+ } -+ -+ sentinel end() const -+ { -+ return {5}; -+ } -+ }; -+ -+ void f() -+ { -+ range r {}; -+ -+ for (auto i : r) -+ { -+ [[maybe_unused]] auto v = i; -+ } -+ } -+ -+ } -+ -+ namespace test_lambda_capture_asterisk_this_by_value -+ { -+ -+ struct t -+ { -+ int i; -+ int foo() -+ { -+ return [*this]() -+ { -+ return i; -+ }(); -+ } -+ }; -+ -+ } -+ -+ namespace test_enum_class_construction -+ { -+ -+ enum class byte : unsigned char -+ {}; -+ -+ byte foo {42}; -+ -+ } -+ -+ namespace test_constexpr_if -+ { -+ -+ template -+ int f () -+ { -+ if constexpr(cond) -+ { -+ return 13; -+ } -+ else -+ { -+ return 42; -+ } -+ } -+ -+ } -+ -+ namespace test_selection_statement_with_initializer -+ { -+ -+ int f() -+ { -+ return 13; -+ } -+ -+ int f2() -+ { -+ if (auto i = f(); i > 0) -+ { -+ return 3; -+ } -+ -+ switch (auto i = f(); i + 4) -+ { -+ case 17: -+ return 2; -+ -+ default: -+ return 1; -+ } -+ } -+ -+ } -+ -+ namespace test_template_argument_deduction_for_class_templates -+ { -+ -+ template -+ struct pair -+ { -+ pair (T1 p1, T2 p2) -+ : m1 {p1}, -+ m2 {p2} -+ {} -+ -+ T1 m1; -+ T2 m2; -+ }; -+ -+ void f() -+ { -+ [[maybe_unused]] auto p = pair{13, 42u}; -+ } -+ -+ } -+ -+ namespace test_non_type_auto_template_parameters -+ { -+ -+ template -+ struct B -+ {}; -+ -+ B<5> b1; -+ B<'a'> b2; -+ -+ } -+ -+ namespace test_structured_bindings -+ { -+ -+ int arr[2] = { 1, 2 }; -+ std::pair pr = { 1, 2 }; -+ -+ auto f1() -> int(&)[2] -+ { -+ return arr; -+ } -+ -+ auto f2() -> std::pair& -+ { -+ return pr; -+ } -+ -+ struct S -+ { -+ int x1 : 2; -+ volatile double y1; -+ }; -+ -+ S f3() -+ { -+ return {}; -+ } -+ -+ auto [ x1, y1 ] = f1(); -+ auto& [ xr1, yr1 ] = f1(); -+ auto [ x2, y2 ] = f2(); -+ auto& [ xr2, yr2 ] = f2(); -+ const auto [ x3, y3 ] = f3(); -+ -+ } -+ -+ namespace test_exception_spec_type_system -+ { -+ -+ struct Good {}; -+ struct Bad {}; -+ -+ void g1() noexcept; -+ void g2(); -+ -+ template -+ Bad -+ f(T*, T*); -+ -+ template -+ Good -+ f(T1*, T2*); -+ -+ static_assert (std::is_same_v); -+ -+ } -+ -+ namespace test_inline_variables -+ { -+ -+ template void f(T) -+ {} -+ -+ template inline T g(T) -+ { -+ return T{}; -+ } -+ -+ template<> inline void f<>(int) -+ {} -+ -+ template<> int g<>(int) -+ { -+ return 5; -+ } -+ -+ } -+ -+} // namespace cxx17 -+ -+#endif // __cplusplus < 201703L -+ -+ -+ -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 202002L -+ -+#error "This is not a C++20 compiler" -+ -+#else -+ -+#include -+ -+namespace cxx20 -+{ -+ -+// As C++20 supports feature test macros in the standard, there is no -+// immediate need to actually test for feature availability on the -+// Autoconf side. -+ -+} // namespace cxx20 -+ -+#endif // __cplusplus < 202002L -+ -+ -+ -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ ax_cv_cxx_compile_cxx20=yes -+else case e in #( -+ e) ax_cv_cxx_compile_cxx20=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx20" >&5 -+printf "%s\n" "$ax_cv_cxx_compile_cxx20" >&6; } -+ if test x$ax_cv_cxx_compile_cxx20 = xyes; then -+ ac_success=yes -+ fi -+ -+ if test x$ac_success = xno; then -+ for alternative in ${ax_cxx_compile_alternatives}; do -+ switch="-std=gnu++${alternative}" -+ cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx20_$switch" | sed "$as_sed_sh"` -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++20 features with $switch" >&5 -+printf %s "checking whether $CXX supports C++20 features with $switch... " >&6; } -+if eval test \${$cachevar+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_save_CXX="$CXX" -+ CXX="$CXX $switch" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+// If the compiler admits that it is not ready for C++11, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201103L -+ -+#error "This is not a C++11 compiler" -+ -+#else -+ -+namespace cxx11 -+{ -+ -+ namespace test_static_assert -+ { -+ -+ template -+ struct check -+ { -+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); -+ }; -+ -+ } -+ -+ namespace test_final_override -+ { -+ -+ struct Base -+ { -+ virtual ~Base() {} -+ virtual void f() {} -+ }; -+ -+ struct Derived : public Base -+ { -+ virtual ~Derived() override {} -+ virtual void f() override {} -+ }; -+ -+ } -+ -+ namespace test_double_right_angle_brackets -+ { -+ -+ template < typename T > -+ struct check {}; -+ -+ typedef check single_type; -+ typedef check> double_type; -+ typedef check>> triple_type; -+ typedef check>>> quadruple_type; -+ -+ } -+ -+ namespace test_decltype -+ { -+ -+ int -+ f() -+ { -+ int a = 1; -+ decltype(a) b = 2; -+ return a + b; -+ } -+ -+ } -+ -+ namespace test_type_deduction -+ { -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static const bool value = false; -+ }; -+ -+ template < typename T > -+ struct is_same -+ { -+ static const bool value = true; -+ }; -+ -+ template < typename T1, typename T2 > -+ auto -+ add(T1 a1, T2 a2) -> decltype(a1 + a2) -+ { -+ return a1 + a2; -+ } -+ -+ int -+ test(const int c, volatile int v) -+ { -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == false, ""); -+ auto ac = c; -+ auto av = v; -+ auto sumi = ac + av + 'x'; -+ auto sumf = ac + av + 1.0; -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == true, ""); -+ return (sumf > 0.0) ? sumi : add(c, v); -+ } -+ -+ } -+ -+ namespace test_noexcept -+ { -+ -+ int f() { return 0; } -+ int g() noexcept { return 0; } -+ -+ static_assert(noexcept(f()) == false, ""); -+ static_assert(noexcept(g()) == true, ""); -+ -+ } -+ -+ namespace test_constexpr -+ { -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c_r(const CharT *const s, const unsigned long acc) noexcept -+ { -+ return *s ? strlen_c_r(s + 1, acc + 1) : acc; -+ } -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c(const CharT *const s) noexcept -+ { -+ return strlen_c_r(s, 0UL); -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("1") == 1UL, ""); -+ static_assert(strlen_c("example") == 7UL, ""); -+ static_assert(strlen_c("another\0example") == 7UL, ""); -+ -+ } -+ -+ namespace test_rvalue_references -+ { -+ -+ template < int N > -+ struct answer -+ { -+ static constexpr int value = N; -+ }; -+ -+ answer<1> f(int&) { return answer<1>(); } -+ answer<2> f(const int&) { return answer<2>(); } -+ answer<3> f(int&&) { return answer<3>(); } -+ -+ void -+ test() -+ { -+ int i = 0; -+ const int c = 0; -+ static_assert(decltype(f(i))::value == 1, ""); -+ static_assert(decltype(f(c))::value == 2, ""); -+ static_assert(decltype(f(0))::value == 3, ""); -+ } -+ -+ } -+ -+ namespace test_uniform_initialization -+ { -+ -+ struct test -+ { -+ static const int zero {}; -+ static const int one {1}; -+ }; -+ -+ static_assert(test::zero == 0, ""); -+ static_assert(test::one == 1, ""); -+ -+ } -+ -+ namespace test_lambdas -+ { -+ -+ void -+ test1() -+ { -+ auto lambda1 = [](){}; -+ auto lambda2 = lambda1; -+ lambda1(); -+ lambda2(); -+ } -+ -+ int -+ test2() -+ { -+ auto a = [](int i, int j){ return i + j; }(1, 2); -+ auto b = []() -> int { return '0'; }(); -+ auto c = [=](){ return a + b; }(); -+ auto d = [&](){ return c; }(); -+ auto e = [a, &b](int x) mutable { -+ const auto identity = [](int y){ return y; }; -+ for (auto i = 0; i < a; ++i) -+ a += b--; -+ return x + identity(a + b); -+ }(0); -+ return a + b + c + d + e; -+ } -+ -+ int -+ test3() -+ { -+ const auto nullary = [](){ return 0; }; -+ const auto unary = [](int x){ return x; }; -+ using nullary_t = decltype(nullary); -+ using unary_t = decltype(unary); -+ const auto higher1st = [](nullary_t f){ return f(); }; -+ const auto higher2nd = [unary](nullary_t f1){ -+ return [unary, f1](unary_t f2){ return f2(unary(f1())); }; -+ }; -+ return higher1st(nullary) + higher2nd(nullary)(unary); -+ } -+ -+ } -+ -+ namespace test_variadic_templates -+ { -+ -+ template -+ struct sum; -+ -+ template -+ struct sum -+ { -+ static constexpr auto value = N0 + sum::value; -+ }; -+ -+ template <> -+ struct sum<> -+ { -+ static constexpr auto value = 0; -+ }; -+ -+ static_assert(sum<>::value == 0, ""); -+ static_assert(sum<1>::value == 1, ""); -+ static_assert(sum<23>::value == 23, ""); -+ static_assert(sum<1, 2>::value == 3, ""); -+ static_assert(sum<5, 5, 11>::value == 21, ""); -+ static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); -+ -+ } -+ -+ // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae -+ // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function -+ // because of this. -+ namespace test_template_alias_sfinae -+ { -+ -+ struct foo {}; -+ -+ template -+ using member = typename T::member_type; -+ -+ template -+ void func(...) {} -+ -+ template -+ void func(member*) {} -+ -+ void test(); -+ -+ void test() { func(0); } -+ -+ } -+ -+} // namespace cxx11 -+ -+#endif // __cplusplus >= 201103L -+ -+ -+ -+ -+// If the compiler admits that it is not ready for C++14, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201402L -+ -+#error "This is not a C++14 compiler" -+ -+#else -+ -+namespace cxx14 -+{ -+ -+ namespace test_polymorphic_lambdas -+ { -+ -+ int -+ test() -+ { -+ const auto lambda = [](auto&&... args){ -+ const auto istiny = [](auto x){ -+ return (sizeof(x) == 1UL) ? 1 : 0; -+ }; -+ const int aretiny[] = { istiny(args)... }; -+ return aretiny[0]; -+ }; -+ return lambda(1, 1L, 1.0f, '1'); -+ } -+ -+ } -+ -+ namespace test_binary_literals -+ { -+ -+ constexpr auto ivii = 0b0000000000101010; -+ static_assert(ivii == 42, "wrong value"); -+ -+ } -+ -+ namespace test_generalized_constexpr -+ { -+ -+ template < typename CharT > -+ constexpr unsigned long -+ strlen_c(const CharT *const s) noexcept -+ { -+ auto length = 0UL; -+ for (auto p = s; *p; ++p) -+ ++length; -+ return length; -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("x") == 1UL, ""); -+ static_assert(strlen_c("test") == 4UL, ""); -+ static_assert(strlen_c("another\0test") == 7UL, ""); -+ -+ } -+ -+ namespace test_lambda_init_capture -+ { -+ -+ int -+ test() -+ { -+ auto x = 0; -+ const auto lambda1 = [a = x](int b){ return a + b; }; -+ const auto lambda2 = [a = lambda1(x)](){ return a; }; -+ return lambda2(); -+ } -+ -+ } -+ -+ namespace test_digit_separators -+ { -+ -+ constexpr auto ten_million = 100'000'000; -+ static_assert(ten_million == 100000000, ""); -+ -+ } -+ -+ namespace test_return_type_deduction -+ { -+ -+ auto f(int& x) { return x; } -+ decltype(auto) g(int& x) { return x; } -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static constexpr auto value = false; -+ }; -+ -+ template < typename T > -+ struct is_same -+ { -+ static constexpr auto value = true; -+ }; -+ -+ int -+ test() -+ { -+ auto x = 0; -+ static_assert(is_same::value, ""); -+ static_assert(is_same::value, ""); -+ return x; -+ } -+ -+ } -+ -+} // namespace cxx14 -+ -+#endif // __cplusplus >= 201402L -+ -+ -+ -+ -+// If the compiler admits that it is not ready for C++17, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201703L -+ -+#error "This is not a C++17 compiler" -+ -+#else -+ -+#include -+#include -+#include -+ -+namespace cxx17 -+{ -+ -+ namespace test_constexpr_lambdas -+ { -+ -+ constexpr int foo = [](){return 42;}(); -+ -+ } -+ -+ namespace test::nested_namespace::definitions -+ { -+ -+ } -+ -+ namespace test_fold_expression -+ { -+ -+ template -+ int multiply(Args... args) -+ { -+ return (args * ... * 1); -+ } -+ -+ template -+ bool all(Args... args) -+ { -+ return (args && ...); -+ } -+ -+ } -+ -+ namespace test_extended_static_assert -+ { -+ -+ static_assert (true); -+ -+ } -+ -+ namespace test_auto_brace_init_list -+ { -+ -+ auto foo = {5}; -+ auto bar {5}; -+ -+ static_assert(std::is_same, decltype(foo)>::value); -+ static_assert(std::is_same::value); -+ } -+ -+ namespace test_typename_in_template_template_parameter -+ { -+ -+ template typename X> struct D; -+ -+ } -+ -+ namespace test_fallthrough_nodiscard_maybe_unused_attributes -+ { -+ -+ int f1() -+ { -+ return 42; -+ } -+ -+ [[nodiscard]] int f2() -+ { -+ [[maybe_unused]] auto unused = f1(); -+ -+ switch (f1()) -+ { -+ case 17: -+ f1(); -+ [[fallthrough]]; -+ case 42: -+ f1(); -+ } -+ return f1(); -+ } -+ -+ } -+ -+ namespace test_extended_aggregate_initialization -+ { -+ -+ struct base1 -+ { -+ int b1, b2 = 42; -+ }; -+ -+ struct base2 -+ { -+ base2() { -+ b3 = 42; -+ } -+ int b3; -+ }; -+ -+ struct derived : base1, base2 -+ { -+ int d; -+ }; -+ -+ derived d1 {{1, 2}, {}, 4}; // full initialization -+ derived d2 {{}, {}, 4}; // value-initialized bases -+ -+ } -+ -+ namespace test_general_range_based_for_loop -+ { -+ -+ struct iter -+ { -+ int i; -+ -+ int& operator* () -+ { -+ return i; -+ } -+ -+ const int& operator* () const -+ { -+ return i; -+ } -+ -+ iter& operator++() -+ { -+ ++i; -+ return *this; -+ } -+ }; -+ -+ struct sentinel -+ { -+ int i; -+ }; -+ -+ bool operator== (const iter& i, const sentinel& s) -+ { -+ return i.i == s.i; -+ } -+ -+ bool operator!= (const iter& i, const sentinel& s) -+ { -+ return !(i == s); -+ } -+ -+ struct range -+ { -+ iter begin() const -+ { -+ return {0}; -+ } -+ -+ sentinel end() const -+ { -+ return {5}; -+ } -+ }; -+ -+ void f() -+ { -+ range r {}; -+ -+ for (auto i : r) -+ { -+ [[maybe_unused]] auto v = i; -+ } -+ } -+ -+ } -+ -+ namespace test_lambda_capture_asterisk_this_by_value -+ { -+ -+ struct t -+ { -+ int i; -+ int foo() -+ { -+ return [*this]() -+ { -+ return i; -+ }(); -+ } -+ }; -+ -+ } -+ -+ namespace test_enum_class_construction -+ { -+ -+ enum class byte : unsigned char -+ {}; -+ -+ byte foo {42}; -+ -+ } -+ -+ namespace test_constexpr_if -+ { -+ -+ template -+ int f () -+ { -+ if constexpr(cond) -+ { -+ return 13; -+ } -+ else -+ { -+ return 42; -+ } -+ } -+ -+ } -+ -+ namespace test_selection_statement_with_initializer -+ { -+ -+ int f() -+ { -+ return 13; -+ } -+ -+ int f2() -+ { -+ if (auto i = f(); i > 0) -+ { -+ return 3; -+ } -+ -+ switch (auto i = f(); i + 4) -+ { -+ case 17: -+ return 2; -+ -+ default: -+ return 1; -+ } -+ } -+ -+ } -+ -+ namespace test_template_argument_deduction_for_class_templates -+ { -+ -+ template -+ struct pair -+ { -+ pair (T1 p1, T2 p2) -+ : m1 {p1}, -+ m2 {p2} -+ {} -+ -+ T1 m1; -+ T2 m2; -+ }; -+ -+ void f() -+ { -+ [[maybe_unused]] auto p = pair{13, 42u}; -+ } -+ -+ } -+ -+ namespace test_non_type_auto_template_parameters -+ { -+ -+ template -+ struct B -+ {}; -+ -+ B<5> b1; -+ B<'a'> b2; -+ -+ } -+ -+ namespace test_structured_bindings -+ { -+ -+ int arr[2] = { 1, 2 }; -+ std::pair pr = { 1, 2 }; -+ -+ auto f1() -> int(&)[2] -+ { -+ return arr; -+ } -+ -+ auto f2() -> std::pair& -+ { -+ return pr; -+ } -+ -+ struct S -+ { -+ int x1 : 2; -+ volatile double y1; -+ }; -+ -+ S f3() -+ { -+ return {}; -+ } -+ -+ auto [ x1, y1 ] = f1(); -+ auto& [ xr1, yr1 ] = f1(); -+ auto [ x2, y2 ] = f2(); -+ auto& [ xr2, yr2 ] = f2(); -+ const auto [ x3, y3 ] = f3(); -+ -+ } -+ -+ namespace test_exception_spec_type_system -+ { -+ -+ struct Good {}; -+ struct Bad {}; -+ -+ void g1() noexcept; -+ void g2(); -+ -+ template -+ Bad -+ f(T*, T*); -+ -+ template -+ Good -+ f(T1*, T2*); -+ -+ static_assert (std::is_same_v); -+ -+ } -+ -+ namespace test_inline_variables -+ { -+ -+ template void f(T) -+ {} -+ -+ template inline T g(T) -+ { -+ return T{}; -+ } -+ -+ template<> inline void f<>(int) -+ {} -+ -+ template<> int g<>(int) -+ { -+ return 5; -+ } -+ -+ } -+ -+} // namespace cxx17 -+ -+#endif // __cplusplus < 201703L -+ -+ -+ -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 202002L -+ -+#error "This is not a C++20 compiler" -+ -+#else -+ -+#include -+ -+namespace cxx20 -+{ -+ -+// As C++20 supports feature test macros in the standard, there is no -+// immediate need to actually test for feature availability on the -+// Autoconf side. -+ -+} // namespace cxx20 -+ -+#endif // __cplusplus < 202002L -+ -+ -+ -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ eval $cachevar=yes -+else case e in #( -+ e) eval $cachevar=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ CXX="$ac_save_CXX" ;; -+esac -+fi -+eval ac_res=\$$cachevar -+ { 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 -+ CXX="$CXX $switch" -+ if test -n "$CXXCPP" ; then -+ CXXCPP="$CXXCPP $switch" -+ fi -+ ac_success=yes -+ break -+ fi -+ done -+ fi -+ -+ if test x$ac_success = xno; then -+ for alternative in ${ax_cxx_compile_alternatives}; do -+ for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do -+ cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx20_$switch" | sed "$as_sed_sh"` -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++20 features with $switch" >&5 -+printf %s "checking whether $CXX supports C++20 features with $switch... " >&6; } -+if eval test \${$cachevar+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_save_CXX="$CXX" -+ CXX="$CXX $switch" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+// If the compiler admits that it is not ready for C++11, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201103L -+ -+#error "This is not a C++11 compiler" -+ -+#else -+ -+namespace cxx11 -+{ -+ -+ namespace test_static_assert -+ { -+ -+ template -+ struct check -+ { -+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); -+ }; -+ -+ } -+ -+ namespace test_final_override -+ { -+ -+ struct Base -+ { -+ virtual ~Base() {} -+ virtual void f() {} -+ }; -+ -+ struct Derived : public Base -+ { -+ virtual ~Derived() override {} -+ virtual void f() override {} -+ }; -+ -+ } -+ -+ namespace test_double_right_angle_brackets -+ { -+ -+ template < typename T > -+ struct check {}; -+ -+ typedef check single_type; -+ typedef check> double_type; -+ typedef check>> triple_type; -+ typedef check>>> quadruple_type; -+ -+ } -+ -+ namespace test_decltype -+ { -+ -+ int -+ f() -+ { -+ int a = 1; -+ decltype(a) b = 2; -+ return a + b; -+ } -+ -+ } -+ -+ namespace test_type_deduction -+ { -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static const bool value = false; -+ }; -+ -+ template < typename T > -+ struct is_same -+ { -+ static const bool value = true; -+ }; -+ -+ template < typename T1, typename T2 > -+ auto -+ add(T1 a1, T2 a2) -> decltype(a1 + a2) -+ { -+ return a1 + a2; -+ } -+ -+ int -+ test(const int c, volatile int v) -+ { -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == false, ""); -+ auto ac = c; -+ auto av = v; -+ auto sumi = ac + av + 'x'; -+ auto sumf = ac + av + 1.0; -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == true, ""); -+ return (sumf > 0.0) ? sumi : add(c, v); -+ } -+ -+ } -+ -+ namespace test_noexcept -+ { -+ -+ int f() { return 0; } -+ int g() noexcept { return 0; } -+ -+ static_assert(noexcept(f()) == false, ""); -+ static_assert(noexcept(g()) == true, ""); -+ -+ } -+ -+ namespace test_constexpr -+ { -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c_r(const CharT *const s, const unsigned long acc) noexcept -+ { -+ return *s ? strlen_c_r(s + 1, acc + 1) : acc; -+ } -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c(const CharT *const s) noexcept -+ { -+ return strlen_c_r(s, 0UL); -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("1") == 1UL, ""); -+ static_assert(strlen_c("example") == 7UL, ""); -+ static_assert(strlen_c("another\0example") == 7UL, ""); -+ -+ } -+ -+ namespace test_rvalue_references -+ { -+ -+ template < int N > -+ struct answer -+ { -+ static constexpr int value = N; -+ }; -+ -+ answer<1> f(int&) { return answer<1>(); } -+ answer<2> f(const int&) { return answer<2>(); } -+ answer<3> f(int&&) { return answer<3>(); } -+ -+ void -+ test() -+ { -+ int i = 0; -+ const int c = 0; -+ static_assert(decltype(f(i))::value == 1, ""); -+ static_assert(decltype(f(c))::value == 2, ""); -+ static_assert(decltype(f(0))::value == 3, ""); -+ } -+ -+ } -+ -+ namespace test_uniform_initialization -+ { -+ -+ struct test -+ { -+ static const int zero {}; -+ static const int one {1}; -+ }; -+ -+ static_assert(test::zero == 0, ""); -+ static_assert(test::one == 1, ""); -+ -+ } -+ -+ namespace test_lambdas -+ { -+ -+ void -+ test1() -+ { -+ auto lambda1 = [](){}; -+ auto lambda2 = lambda1; -+ lambda1(); -+ lambda2(); -+ } -+ -+ int -+ test2() -+ { -+ auto a = [](int i, int j){ return i + j; }(1, 2); -+ auto b = []() -> int { return '0'; }(); -+ auto c = [=](){ return a + b; }(); -+ auto d = [&](){ return c; }(); -+ auto e = [a, &b](int x) mutable { -+ const auto identity = [](int y){ return y; }; -+ for (auto i = 0; i < a; ++i) -+ a += b--; -+ return x + identity(a + b); -+ }(0); -+ return a + b + c + d + e; -+ } -+ -+ int -+ test3() -+ { -+ const auto nullary = [](){ return 0; }; -+ const auto unary = [](int x){ return x; }; -+ using nullary_t = decltype(nullary); -+ using unary_t = decltype(unary); -+ const auto higher1st = [](nullary_t f){ return f(); }; -+ const auto higher2nd = [unary](nullary_t f1){ -+ return [unary, f1](unary_t f2){ return f2(unary(f1())); }; -+ }; -+ return higher1st(nullary) + higher2nd(nullary)(unary); -+ } -+ -+ } -+ -+ namespace test_variadic_templates -+ { -+ -+ template -+ struct sum; -+ -+ template -+ struct sum -+ { -+ static constexpr auto value = N0 + sum::value; -+ }; -+ -+ template <> -+ struct sum<> -+ { -+ static constexpr auto value = 0; -+ }; -+ -+ static_assert(sum<>::value == 0, ""); -+ static_assert(sum<1>::value == 1, ""); -+ static_assert(sum<23>::value == 23, ""); -+ static_assert(sum<1, 2>::value == 3, ""); -+ static_assert(sum<5, 5, 11>::value == 21, ""); -+ static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); -+ -+ } -+ -+ // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae -+ // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function -+ // because of this. -+ namespace test_template_alias_sfinae -+ { -+ -+ struct foo {}; -+ -+ template -+ using member = typename T::member_type; -+ -+ template -+ void func(...) {} -+ -+ template -+ void func(member*) {} -+ -+ void test(); -+ -+ void test() { func(0); } -+ -+ } -+ -+} // namespace cxx11 -+ -+#endif // __cplusplus >= 201103L -+ -+ -+ -+ -+// If the compiler admits that it is not ready for C++14, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201402L -+ -+#error "This is not a C++14 compiler" -+ -+#else -+ -+namespace cxx14 -+{ -+ -+ namespace test_polymorphic_lambdas -+ { -+ -+ int -+ test() -+ { -+ const auto lambda = [](auto&&... args){ -+ const auto istiny = [](auto x){ -+ return (sizeof(x) == 1UL) ? 1 : 0; -+ }; -+ const int aretiny[] = { istiny(args)... }; -+ return aretiny[0]; -+ }; -+ return lambda(1, 1L, 1.0f, '1'); -+ } -+ -+ } -+ -+ namespace test_binary_literals -+ { -+ -+ constexpr auto ivii = 0b0000000000101010; -+ static_assert(ivii == 42, "wrong value"); -+ -+ } -+ -+ namespace test_generalized_constexpr -+ { -+ -+ template < typename CharT > -+ constexpr unsigned long -+ strlen_c(const CharT *const s) noexcept -+ { -+ auto length = 0UL; -+ for (auto p = s; *p; ++p) -+ ++length; -+ return length; -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("x") == 1UL, ""); -+ static_assert(strlen_c("test") == 4UL, ""); -+ static_assert(strlen_c("another\0test") == 7UL, ""); -+ -+ } -+ -+ namespace test_lambda_init_capture -+ { -+ -+ int -+ test() -+ { -+ auto x = 0; -+ const auto lambda1 = [a = x](int b){ return a + b; }; -+ const auto lambda2 = [a = lambda1(x)](){ return a; }; -+ return lambda2(); -+ } -+ -+ } -+ -+ namespace test_digit_separators -+ { -+ -+ constexpr auto ten_million = 100'000'000; -+ static_assert(ten_million == 100000000, ""); -+ -+ } -+ -+ namespace test_return_type_deduction -+ { -+ -+ auto f(int& x) { return x; } -+ decltype(auto) g(int& x) { return x; } -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static constexpr auto value = false; -+ }; -+ -+ template < typename T > -+ struct is_same -+ { -+ static constexpr auto value = true; -+ }; -+ -+ int -+ test() -+ { -+ auto x = 0; -+ static_assert(is_same::value, ""); -+ static_assert(is_same::value, ""); -+ return x; -+ } -+ -+ } -+ -+} // namespace cxx14 -+ -+#endif // __cplusplus >= 201402L -+ -+ -+ -+ -+// If the compiler admits that it is not ready for C++17, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201703L -+ -+#error "This is not a C++17 compiler" -+ -+#else -+ -+#include -+#include -+#include -+ -+namespace cxx17 -+{ -+ -+ namespace test_constexpr_lambdas -+ { -+ -+ constexpr int foo = [](){return 42;}(); -+ -+ } -+ -+ namespace test::nested_namespace::definitions -+ { -+ -+ } -+ -+ namespace test_fold_expression -+ { -+ -+ template -+ int multiply(Args... args) -+ { -+ return (args * ... * 1); -+ } -+ -+ template -+ bool all(Args... args) -+ { -+ return (args && ...); -+ } -+ -+ } -+ -+ namespace test_extended_static_assert -+ { -+ -+ static_assert (true); -+ -+ } -+ -+ namespace test_auto_brace_init_list -+ { -+ -+ auto foo = {5}; -+ auto bar {5}; -+ -+ static_assert(std::is_same, decltype(foo)>::value); -+ static_assert(std::is_same::value); -+ } -+ -+ namespace test_typename_in_template_template_parameter -+ { -+ -+ template typename X> struct D; -+ -+ } -+ -+ namespace test_fallthrough_nodiscard_maybe_unused_attributes -+ { -+ -+ int f1() -+ { -+ return 42; -+ } -+ -+ [[nodiscard]] int f2() -+ { -+ [[maybe_unused]] auto unused = f1(); -+ -+ switch (f1()) -+ { -+ case 17: -+ f1(); -+ [[fallthrough]]; -+ case 42: -+ f1(); -+ } -+ return f1(); -+ } -+ -+ } -+ -+ namespace test_extended_aggregate_initialization -+ { -+ -+ struct base1 -+ { -+ int b1, b2 = 42; -+ }; -+ -+ struct base2 -+ { -+ base2() { -+ b3 = 42; -+ } -+ int b3; -+ }; -+ -+ struct derived : base1, base2 -+ { -+ int d; -+ }; -+ -+ derived d1 {{1, 2}, {}, 4}; // full initialization -+ derived d2 {{}, {}, 4}; // value-initialized bases -+ -+ } -+ -+ namespace test_general_range_based_for_loop -+ { -+ -+ struct iter -+ { -+ int i; -+ -+ int& operator* () -+ { -+ return i; -+ } -+ -+ const int& operator* () const -+ { -+ return i; -+ } -+ -+ iter& operator++() -+ { -+ ++i; -+ return *this; -+ } -+ }; -+ -+ struct sentinel -+ { -+ int i; -+ }; -+ -+ bool operator== (const iter& i, const sentinel& s) -+ { -+ return i.i == s.i; -+ } -+ -+ bool operator!= (const iter& i, const sentinel& s) -+ { -+ return !(i == s); -+ } -+ -+ struct range -+ { -+ iter begin() const -+ { -+ return {0}; -+ } -+ -+ sentinel end() const -+ { -+ return {5}; -+ } -+ }; -+ -+ void f() -+ { -+ range r {}; -+ -+ for (auto i : r) -+ { -+ [[maybe_unused]] auto v = i; -+ } -+ } -+ -+ } -+ -+ namespace test_lambda_capture_asterisk_this_by_value -+ { -+ -+ struct t -+ { -+ int i; -+ int foo() -+ { -+ return [*this]() -+ { -+ return i; -+ }(); -+ } -+ }; -+ -+ } -+ -+ namespace test_enum_class_construction -+ { -+ -+ enum class byte : unsigned char -+ {}; -+ -+ byte foo {42}; -+ -+ } -+ -+ namespace test_constexpr_if -+ { -+ -+ template -+ int f () -+ { -+ if constexpr(cond) -+ { -+ return 13; -+ } -+ else -+ { -+ return 42; -+ } -+ } -+ -+ } -+ -+ namespace test_selection_statement_with_initializer -+ { -+ -+ int f() -+ { -+ return 13; -+ } -+ -+ int f2() -+ { -+ if (auto i = f(); i > 0) -+ { -+ return 3; -+ } -+ -+ switch (auto i = f(); i + 4) -+ { -+ case 17: -+ return 2; -+ -+ default: -+ return 1; -+ } -+ } -+ -+ } -+ -+ namespace test_template_argument_deduction_for_class_templates -+ { -+ -+ template -+ struct pair -+ { -+ pair (T1 p1, T2 p2) -+ : m1 {p1}, -+ m2 {p2} -+ {} -+ -+ T1 m1; -+ T2 m2; -+ }; -+ -+ void f() -+ { -+ [[maybe_unused]] auto p = pair{13, 42u}; -+ } -+ -+ } -+ -+ namespace test_non_type_auto_template_parameters -+ { -+ -+ template -+ struct B -+ {}; -+ -+ B<5> b1; -+ B<'a'> b2; -+ -+ } -+ -+ namespace test_structured_bindings -+ { -+ -+ int arr[2] = { 1, 2 }; -+ std::pair pr = { 1, 2 }; -+ -+ auto f1() -> int(&)[2] -+ { -+ return arr; -+ } -+ -+ auto f2() -> std::pair& -+ { -+ return pr; -+ } -+ -+ struct S -+ { -+ int x1 : 2; -+ volatile double y1; -+ }; -+ -+ S f3() -+ { -+ return {}; -+ } -+ -+ auto [ x1, y1 ] = f1(); -+ auto& [ xr1, yr1 ] = f1(); -+ auto [ x2, y2 ] = f2(); -+ auto& [ xr2, yr2 ] = f2(); -+ const auto [ x3, y3 ] = f3(); -+ -+ } -+ -+ namespace test_exception_spec_type_system -+ { -+ -+ struct Good {}; -+ struct Bad {}; -+ -+ void g1() noexcept; -+ void g2(); -+ -+ template -+ Bad -+ f(T*, T*); -+ -+ template -+ Good -+ f(T1*, T2*); -+ -+ static_assert (std::is_same_v); -+ -+ } -+ -+ namespace test_inline_variables -+ { -+ -+ template void f(T) -+ {} -+ -+ template inline T g(T) -+ { -+ return T{}; -+ } -+ -+ template<> inline void f<>(int) -+ {} -+ -+ template<> int g<>(int) -+ { -+ return 5; -+ } -+ -+ } -+ -+} // namespace cxx17 -+ -+#endif // __cplusplus < 201703L -+ -+ -+ -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 202002L -+ -+#error "This is not a C++20 compiler" -+ -+#else -+ -+#include -+ -+namespace cxx20 -+{ -+ -+// As C++20 supports feature test macros in the standard, there is no -+// immediate need to actually test for feature availability on the -+// Autoconf side. -+ -+} // namespace cxx20 -+ -+#endif // __cplusplus < 202002L -+ -+ -+ -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ eval $cachevar=yes -+else case e in #( -+ e) eval $cachevar=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ CXX="$ac_save_CXX" ;; -+esac -+fi -+eval ac_res=\$$cachevar -+ { 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 -+ CXX="$CXX $switch" -+ if test -n "$CXXCPP" ; then -+ CXXCPP="$CXXCPP $switch" -+ fi -+ ac_success=yes -+ break -+ fi -+ done -+ if test x$ac_success = xyes; then -+ break -+ fi -+ done -+ 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 -+ -+ if test x$ax_cxx_compile_cxx20_required = xtrue; then -+ if test x$ac_success = xno; then -+ as_fn_error $? "*** A compiler with support for C++20 language features is required." "$LINENO" 5 -+ fi -+ fi -+ if test x$ac_success = xno; then -+ HAVE_CXX20=0 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: No compiler with C++20 support was found" >&5 -+printf "%s\n" "$as_me: No compiler with C++20 support was found" >&6;} -+ else -+ HAVE_CXX20=1 -+ -+printf "%s\n" "#define HAVE_CXX20 1" >>confdefs.h -+ -+ fi -+ -+ -+ HAVE_CXX11=1 -+ ;; -+ -+ *) -+ as_fn_error $? "Invalid --with-cxx=$wxWITH_CXX option value, only 11, 14, 17 or 20 supported" "$LINENO" 5 -+ esac -+ -+ if test "$HAVE_CXX11" = "1" ; then -+ OBJCXXFLAGS="$OBJCXXFLAGS $switch" -+ fi -+fi -+ -+case "$wxWITH_DPI_MANIFEST" in -+ none) -+ USE_DPI_AWARE_MANIFEST=0 ;; -+ system) -+ USE_DPI_AWARE_MANIFEST=1 ;; -+ ''|per-monitor) -+ USE_DPI_AWARE_MANIFEST=2 ;; -+ *) -+ USE_DPI_AWARE_MANIFEST=0 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Unsupported DPI awareness value \"$wxWITH_DPI_MANIFEST\" ignored." >&5 -+printf "%s\n" "$as_me: WARNING: Unsupported DPI awareness value \"$wxWITH_DPI_MANIFEST\" ignored." >&2;} -+esac -+ -+if test "x$SUNCXX" != xyes; then -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -+set dummy ${ac_tool_prefix}ar; ac_word=$2 -+{ 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 case e in #( -+ e) if test -n "$AR"; then -+ ac_cv_prog_AR="$AR" # 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_AR="${ac_tool_prefix}ar" -+ 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 ;; -+esac -+fi -+AR=$ac_cv_prog_AR -+if test -n "$AR"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -+printf "%s\n" "$AR" >&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_AR"; then -+ ac_ct_AR=$AR -+ # Extract the first word of "ar", so it can be a program name with args. -+set dummy ar; ac_word=$2 -+{ 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 case e in #( -+ e) if test -n "$ac_ct_AR"; then -+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # 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_AR="ar" -+ 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 ;; -+esac -+fi -+ac_ct_AR=$ac_cv_prog_ac_ct_AR -+if test -n "$ac_ct_AR"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -+printf "%s\n" "$ac_ct_AR" >&6; } -+else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+fi -+ -+ if test "x$ac_ct_AR" = x; then -+ AR="" -+ 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 -+ AR=$ac_ct_AR -+ fi -+else -+ AR="$ac_cv_prog_AR" -+fi -+ -+ if test "x$AR" = "x" ; then -+ as_fn_error $? "ar is needed to build wxWidgets" "$LINENO" 5 -+ fi -+fi -+ -+ -+export_compiler_flags=no -+ -+if test "$USE_DARWIN" = 1; then -+ -+retest_macosx_linking=no -+ -+OSX_ARCH_OPTS="" -+ -+if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then -+ if test "x$wxUSE_MAC_ARCH" != xno; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: --enable-macosx_arch is ignored when --enable-universal_binary is used." >&5 -+printf "%s\n" "$as_me: WARNING: --enable-macosx_arch is ignored when --enable-universal_binary is used." >&2;} -+ fi -+ -+ if test "x$wxUSE_UNIVERSAL_BINARY" != xyes; then -+ OSX_ARCH_OPTS=$wxUSE_UNIVERSAL_BINARY -+ else OSX_ARCH_OPTS="i386" -+ if test "$wxUSE_OSX_COCOA" = 1; then -+ OSX_ARCH_OPTS="$OSX_ARCH_OPTS,x86_64" -+ fi -+ fi -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for architectures to use in universal binary" >&5 -+printf %s "checking for architectures to use in universal binary... " >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OSX_ARCH_OPTS" >&5 -+printf "%s\n" "$OSX_ARCH_OPTS" >&6; } -+ -+ retest_macosx_linking=yes -+else -+ if test "x$wxUSE_MAC_ARCH" != xno; then -+ OSX_ARCH_OPTS=$wxUSE_MAC_ARCH -+ fi -+fi -+ -+if test "x$OSX_ARCH_OPTS" != "x"; then -+ if echo $OSX_ARCH_OPTS | grep -q ","; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Disabling dependency tracking due to universal binary build." >&5 -+printf "%s\n" "$as_me: WARNING: Disabling dependency tracking due to universal binary build." >&2;} -+ disable_macosx_deps=yes -+ -+ if test "x$wxUSE_PCH" = "xyes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Disabling precompiled headers due to universal binary build." >&5 -+printf "%s\n" "$as_me: WARNING: Disabling precompiled headers due to universal binary build." >&2;} -+ wxUSE_PCH=no -+ fi -+ fi -+ -+ OSX_ARCH_OPTS=`echo $OSX_ARCH_OPTS | sed -e 's/^/-arch /' -e 's/,/ -arch /g'` -+ -+ CXXFLAGS="$OSX_ARCH_OPTS $CXXFLAGS" -+ CFLAGS="$OSX_ARCH_OPTS $CFLAGS" -+ OBJCXXFLAGS="$OSX_ARCH_OPTS $OBJCXXFLAGS" -+ OBJCFLAGS="$OSX_ARCH_OPTS $OBJCFLAGS" -+ LDFLAGS="$OSX_ARCH_OPTS $LDFLAGS" -+ -+ export_compiler_flags=yes -+fi -+ -+if test "$wxUSE_MAC" = 1; then -+ -+if test "x$wxUSE_MACOSX_SDK" = "xno"; then -+ wxUSE_MACOSX_SDK= -+elif test "x$wxUSE_MACOSX_SDK" = "xyes"; then -+ wxUSE_MACOSX_SDK="`xcode-select -p`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" -+elif test "x$wxUSE_MACOSX_SDK" != "x"; then -+ macosx_sdk_specified=yes -+fi -+ -+ -+if test "x$wxUSE_MACOSX_SDK" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SDK directory $wxUSE_MACOSX_SDK" >&5 -+printf %s "checking for SDK directory $wxUSE_MACOSX_SDK... " >&6; } -+ if ! test -d "$wxUSE_MACOSX_SDK"; 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 $? "not found -+See 'config.log' for more details" "$LINENO" 5; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: exists" >&5 -+printf "%s\n" "exists" >&6; } -+ fi -+ MACOSX_SDK_OPTS="-isysroot $wxUSE_MACOSX_SDK" -+ retest_macosx_linking=yes -+ fi -+ -+fi -+if test "x$wxUSE_MACOSX_VERSION_MIN" = "xno"; then -+ wxUSE_MACOSX_VERSION_MIN= -+elif test "x$wxUSE_MACOSX_VERSION_MIN" = "xyes"; then -+ if test "x$wxUSE_MACOSX_SDK" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking SDK deployment version" >&5 -+printf %s "checking SDK deployment version... " >&6; } -+ -+ MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" buildSettings | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'` -+ -+ # If that failed, try again with the new key -+ if test "x$MACOSX_SDK_PLIST_VERSION_MIN" = "x"; then -+ -+ MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" DefaultProperties | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'` -+ -+ fi -+ -+ if test "x$MACOSX_SDK_PLIST_VERSION_MIN" != "x"; then -+ wxUSE_MACOSX_VERSION_MIN=$MACOSX_SDK_PLIST_VERSION_MIN -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wxUSE_MACOSX_VERSION_MIN" >&5 -+printf "%s\n" "$wxUSE_MACOSX_VERSION_MIN" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Could not determine deployment target from SDKSettings.plist" >&5 -+printf "%s\n" "$as_me: WARNING: Could not determine deployment target from SDKSettings.plist" >&2;} -+ wxUSE_MACOSX_VERSION_MIN= -+ fi -+ else -+ wxUSE_MACOSX_VERSION_MIN= -+ fi -+elif test "x$wxUSE_MACOSX_VERSION_MIN" = "x"; then -+ wxUSE_MACOSX_VERSION_MIN=10.10 -+else -+ macosx_minver_specified=yes -+fi -+ -+if test "x$MACOSX_SDK_OPTS" != "x"; then -+ eval "CPP=\"$CPP $MACOSX_SDK_OPTS\"" -+ eval "CC=\"$CC $MACOSX_SDK_OPTS\"" -+ eval "CXX=\"$CXX $MACOSX_SDK_OPTS\"" -+ eval "LD=\"$LD $MACOSX_SDK_OPTS\"" -+ retest_macosx_linking=yes -+fi -+ -+if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then -+ if test "$wxUSE_OSX_IPHONE" = 1; then -+ MACOSX_VERSION_MIN_OPTS="-miphoneos-version-min=$wxUSE_MACOSX_VERSION_MIN" -+ else -+ MACOSX_VERSION_MIN_OPTS="-mmacosx-version-min=$wxUSE_MACOSX_VERSION_MIN" -+ fi -+ eval "CPP=\"$CPP $MACOSX_VERSION_MIN_OPTS\"" -+ eval "CC=\"$CC $MACOSX_VERSION_MIN_OPTS\"" -+ eval "CXX=\"$CXX $MACOSX_VERSION_MIN_OPTS\"" -+ eval "LD=\"$LD $MACOSX_VERSION_MIN_OPTS\"" -+ retest_macosx_linking=yes -+fi -+ -+if test "x$retest_macosx_linking" = "xyes"; then -+ if test "x$macosx_sdk_specified" = "xyes"; then -+ error_message="try using --with-macosx-sdk with a different SDK or \ -+omitting it entirely to use the default one." -+ elif test "x$macosx_minver_specified" = "xyes"; then -+ error_message="try using --with-macosx-version-min with a different OS \ -+version or omitting it entirely." -+ else -+ error_message="check that command line tools from Xcode 7.2.1 or later are installed." -+ fi -+ -+ error_message="building C++ programs doesn't work, $error_message" -+ -+ 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 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if C compiler ($CC) works with SDK/version options" >&5 -+printf %s "checking if C compiler ($CC) works with SDK/version options... " >&6; } -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+else case e in #( -+ e) { { 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 $? "$error_message -+See 'config.log' for more details" "$LINENO" 5; } ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ 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 -+ -+ -+ ac_ext=cpp -+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 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if C++ compiler ($CXX) works with SDK/version options" >&5 -+printf %s "checking if C++ compiler ($CXX) works with SDK/version options... " >&6; } -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ -+int -+main (void) -+{ -+ -+ #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) -+ #if __MAC_OS_X_VERSION_MIN_REQUIRED < 101000 -+ #error macOS versions < 10.10 are not supported. -+ #endif -+ #if __MAC_OS_X_VERSION_MAX_ALLOWED < 101100 -+ #error macOS SDK version is too low, 10.11 or later is required. -+ #endif -+ #elif !defined(__IPHONE_OS_VERSION_MIN_REQUIRED) -+ #error unrecognized platform -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_link "$LINENO" -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+else case e in #( -+ e) { { 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 $? "$error_message -+See 'config.log' for more details" "$LINENO" 5; } -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ 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 -+ -+ -+ export_compiler_flags=yes -+fi -+ -+fi -+case "${host}" in -+ -+ *-*-darwin* ) -+ INSTALL_PROGRAM="cp -fp" -+ INSTALL_DATA="cp -fp" -+ ;; -+ *) -+ ;; -+esac -+ -+ -+if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then -+ printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h -+ -+ -+ GNU_SOURCE_FLAG="-D_GNU_SOURCE" -+ CFLAGS="$GNU_SOURCE_FLAG $CFLAGS" -+fi -+ -+if test "x$USE_AIX" = "x1"; then -+ if test "x$XLCXX" = "xyes"; then -+ CXXFLAGS="-qunique $CXXFLAGS" -+ fi -+ -+ CPPFLAGS="-D_LINUX_SOURCE_COMPAT $CPPFLAGS" -+fi -+ -+case "${host}" in -+ powerpc-*-darwin* ) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if __POWERPC__ is already defined" >&5 -+printf %s "checking if __POWERPC__ is already defined... " >&6; } -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+#ifndef __POWERPC__ -+ choke me for lack of PowerPC -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+else case e in #( -+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ printf "%s\n" "#define __POWERPC__ 1" >>confdefs.h -+ -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+ -+case "${host}" in -+ *-*-darwin* ) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if CoreFoundation/CFBase.h is usable" >&5 -+printf %s "checking if CoreFoundation/CFBase.h is usable... " >&6; } -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+ -+int -+main (void) -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+else case e in #( -+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if __CF_USE_FRAMEWORK_INCLUDES__ is required" >&5 -+printf %s "checking if __CF_USE_FRAMEWORK_INCLUDES__ is required... " >&6; } -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#define __CF_USE_FRAMEWORK_INCLUDES__ -+#include -+ -+int -+main (void) -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ CPPFLAGS="-D__CF_USE_FRAMEWORK_INCLUDES__ $CPPFLAGS" -+else case e in #( -+ e) { { 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. CoreFoundation not available. -+See 'config.log' for more details" "$LINENO" 5; } -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+ -+wants_win32=0 -+doesnt_want_win32=0 -+case "${host}" in -+ *-*-cygwin*) -+ if test "$wxUSE_MSW" = 1 ; then -+ wants_win32=1 -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if -mno-cygwin is in effect" >&5 -+printf %s "checking if -mno-cygwin is in effect... " >&6; } -+if test ${wx_cv_nocygwin+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #ifdef __MINGW32__ -+ choke me -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ wx_cv_nocygwin=no -+else case e in #( -+ e) wx_cv_nocygwin=yes -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_nocygwin" >&5 -+printf "%s\n" "$wx_cv_nocygwin" >&6; } -+ -+ if test "$wx_cv_nocygwin" = "yes"; then -+ wants_win32=1 -+ else -+ doesnt_want_win32=1 -+ fi -+ fi -+ if test "$wants_win32" = 1 ; then -+ BAKEFILE_FORCE_PLATFORM=win32 -+ fi -+ ;; -+ *-*-mingw*) -+ wants_win32=1 -+ ;; -+esac -+ -+if test "$wxUSE_WINE" = "yes"; then -+ wants_win32=1 -+ LDFLAGS_GUI="-mwindows" -+fi -+ -+if test "$wants_win32" = 1 ; then -+ USE_UNIX=0 -+ USE_WIN32=1 -+ printf "%s\n" "#define __WIN32__ 1" >>confdefs.h -+ -+ printf "%s\n" "#define __WINDOWS__ 1" >>confdefs.h -+ -+ printf "%s\n" "#define __GNUWIN32__ 1" >>confdefs.h -+ -+ printf "%s\n" "#define STRICT 1" >>confdefs.h -+ -+fi -+if test "$doesnt_want_win32" = 1 ; then -+ USE_UNIX=1 -+ USE_WIN32=0 -+fi -+ -+if test "$USE_UNIX" = 1 ; then -+ wxUSE_UNIX=yes -+ printf "%s\n" "#define __UNIX__ 1" >>confdefs.h -+ -+fi -+ -+if test "$export_compiler_flags" = "yes"; then -+ export CC CFLAGS CPP CPPFLAGS CXX CXXFLAGS LDD LDFLAGS OBJCFLAGS OBJCXXFLAGS -+ -+ if test "$cache_file" != "/dev/null"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Disabling caching due to a change in compiler options." >&5 -+printf "%s\n" "$as_me: WARNING: Disabling caching due to a change in compiler options." >&2;} -+ cache_file="/dev/null" -+ fi -+fi -+ -+ -+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 -+ -+ -+ -+ -+ -+ -+ -+ -+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" "langinfo.h" "ac_cv_header_langinfo_h" "$ac_includes_default -+" -+if test "x$ac_cv_header_langinfo_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_LANGINFO_H 1" >>confdefs.h -+ -+fi -+ac_fn_c_check_header_compile "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default -+" -+if test "x$ac_cv_header_wchar_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_WCHAR_H 1" >>confdefs.h -+ -+fi -+ -+ -+if test "$ac_cv_header_wchar_h" != "yes"; then -+ ac_fn_c_check_header_compile "$LINENO" "wcstr.h" "ac_cv_header_wcstr_h" "$ac_includes_default -+" -+if test "x$ac_cv_header_wcstr_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_WCSTR_H 1" >>confdefs.h -+ -+fi -+ -+fi -+ -+if test "$USE_UNIX" = 1 ; then -+ ac_fn_c_check_header_compile "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default -+" -+if test "x$ac_cv_header_sys_select_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_SYS_SELECT_H 1" >>confdefs.h -+ -+fi -+ -+ -+ ac_ext=cpp -+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 -+ -+ ac_fn_cxx_check_header_compile "$LINENO" "cxxabi.h" "ac_cv_header_cxxabi_h" "$ac_includes_default -+" -+if test "x$ac_cv_header_cxxabi_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_CXXABI_H 1" >>confdefs.h -+ -+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 -+ -+fi -+ -+ -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 -+printf %s "checking for an ANSI C-conforming const... " >&6; } -+if test ${ac_cv_c_const+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+#ifndef __cplusplus -+ /* Ultrix mips cc rejects this sort of thing. */ -+ typedef int charset[2]; -+ const charset cs = { 0, 0 }; -+ /* SunOS 4.1.1 cc rejects this. */ -+ char const *const *pcpcc; -+ char **ppc; -+ /* NEC SVR4.0.2 mips cc rejects this. */ -+ struct point {int x, y;}; -+ static struct point const zero = {0,0}; -+ /* IBM XL C 1.02.0.0 rejects this. -+ It does not let you subtract one const X* pointer from another in -+ an arm of an if-expression whose if-part is not a constant -+ expression */ -+ const char *g = "string"; -+ pcpcc = &g + (g ? g-g : 0); -+ /* HPUX 7.0 cc rejects these. */ -+ ++pcpcc; -+ ppc = (char**) pcpcc; -+ pcpcc = (char const *const *) ppc; -+ { /* SCO 3.2v4 cc rejects this sort of thing. */ -+ char tx; -+ char *t = &tx; -+ char const *s = 0 ? (char *) 0 : (char const *) 0; -+ -+ *t++ = 0; -+ if (s) return 0; -+ } -+ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ -+ int x[] = {25, 17}; -+ const int *foo = &x[0]; -+ ++foo; -+ } -+ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ -+ typedef const int *iptr; -+ iptr p = 0; -+ ++p; -+ } -+ { /* IBM XL C 1.02.0.0 rejects this sort of thing, saying -+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ -+ struct s { int j; const int *ap[3]; } bx; -+ struct s *b = &bx; b->j = 5; -+ } -+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ -+ const int foo = 10; -+ if (!foo) return 0; -+ } -+ return !cs[0] && !zero.x; -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ ac_cv_c_const=yes -+else case e in #( -+ e) ac_cv_c_const=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 -+printf "%s\n" "$ac_cv_c_const" >&6; } -+if test $ac_cv_c_const = no; then -+ -+printf "%s\n" "#define const /**/" >>confdefs.h -+ -+fi -+ -+{ 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 case e in #( -+ e) 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 (void) {return 0; } -+$ac_kw foo_t foo (void) {return 0; } -+#endif -+ -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ ac_cv_c_inline=$ac_kw -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ test "$ac_cv_c_inline" != no && break -+done -+ ;; -+esac -+fi -+{ 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) ;; -+ *) -+ case $ac_cv_c_inline in -+ no) ac_val=;; -+ *) ac_val=$ac_cv_c_inline;; -+ esac -+ cat >>confdefs.h <<_ACEOF -+#ifndef __cplusplus -+#define inline $ac_val -+#endif -+_ACEOF -+ ;; -+esac -+ -+ -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 -+printf %s "checking size of short... " >&6; } -+if test ${ac_cv_sizeof_short+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default" -+then : -+ -+else case e in #( -+ e) if test "$ac_cv_type_short" = yes; 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 77 "cannot compute sizeof (short) -+See 'config.log' for more details" "$LINENO" 5; } -+ else -+ ac_cv_sizeof_short=0 -+ fi ;; -+esac -+fi -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5 -+printf "%s\n" "$ac_cv_sizeof_short" >&6; } -+ -+ -+ -+printf "%s\n" "#define SIZEOF_SHORT $ac_cv_sizeof_short" >>confdefs.h -+ -+ -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 -+printf %s "checking size of void *... " >&6; } -+if test ${ac_cv_sizeof_void_p+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default" -+then : -+ -+else case e in #( -+ e) if test "$ac_cv_type_void_p" = yes; 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 77 "cannot compute sizeof (void *) -+See 'config.log' for more details" "$LINENO" 5; } -+ else -+ ac_cv_sizeof_void_p=0 -+ fi ;; -+esac -+fi -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5 -+printf "%s\n" "$ac_cv_sizeof_void_p" >&6; } -+ -+ -+ -+printf "%s\n" "#define SIZEOF_VOID_P $ac_cv_sizeof_void_p" >>confdefs.h -+ -+ -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 -+printf %s "checking size of int... " >&6; } -+if test ${ac_cv_sizeof_int+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default" -+then : -+ -+else case e in #( -+ e) if test "$ac_cv_type_int" = yes; 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 77 "cannot compute sizeof (int) -+See 'config.log' for more details" "$LINENO" 5; } -+ else -+ ac_cv_sizeof_int=0 -+ fi ;; -+esac -+fi -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 -+printf "%s\n" "$ac_cv_sizeof_int" >&6; } -+ -+ -+ -+printf "%s\n" "#define SIZEOF_INT $ac_cv_sizeof_int" >>confdefs.h -+ -+ -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 -+printf %s "checking size of long... " >&6; } -+if test ${ac_cv_sizeof_long+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default" -+then : -+ -+else case e in #( -+ e) if test "$ac_cv_type_long" = yes; 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 77 "cannot compute sizeof (long) -+See 'config.log' for more details" "$LINENO" 5; } -+ else -+ ac_cv_sizeof_long=0 -+ fi ;; -+esac -+fi -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 -+printf "%s\n" "$ac_cv_sizeof_long" >&6; } -+ -+ -+ -+printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h -+ -+ -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5 -+printf %s "checking size of size_t... " >&6; } -+if test ${ac_cv_sizeof_size_t+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default" -+then : -+ -+else case e in #( -+ e) if test "$ac_cv_type_size_t" = yes; 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 77 "cannot compute sizeof (size_t) -+See 'config.log' for more details" "$LINENO" 5; } -+ else -+ ac_cv_sizeof_size_t=0 -+ fi ;; -+esac -+fi -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5 -+printf "%s\n" "$ac_cv_sizeof_size_t" >&6; } -+ -+ -+ -+printf "%s\n" "#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t" >>confdefs.h -+ -+ -+ -+case "${host}" in -+ arm-*-linux* ) -+ # The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 -+printf %s "checking size of long long... " >&6; } -+if test ${ac_cv_sizeof_long_long+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default" -+then : -+ -+else case e in #( -+ e) if test "$ac_cv_type_long_long" = yes; 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 77 "cannot compute sizeof (long long) -+See 'config.log' for more details" "$LINENO" 5; } -+ else -+ ac_cv_sizeof_long_long=0 -+ fi ;; -+esac -+fi -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 -+printf "%s\n" "$ac_cv_sizeof_long_long" >&6; } -+ -+ -+ -+printf "%s\n" "#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long" >>confdefs.h -+ -+ -+ ;; -+ *-hp-hpux* ) -+ # The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 -+printf %s "checking size of long long... " >&6; } -+if test ${ac_cv_sizeof_long_long+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default" -+then : -+ -+else case e in #( -+ e) if test "$ac_cv_type_long_long" = yes; 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 77 "cannot compute sizeof (long long) -+See 'config.log' for more details" "$LINENO" 5; } -+ else -+ ac_cv_sizeof_long_long=0 -+ fi ;; -+esac -+fi -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 -+printf "%s\n" "$ac_cv_sizeof_long_long" >&6; } -+ -+ -+ -+printf "%s\n" "#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long" >>confdefs.h -+ -+ -+ if test "$ac_cv_sizeof_long_long" != 0; then -+ CPPFLAGS="-D_INCLUDE_LONGLONG $CPPFLAGS" -+ fi -+ ;; -+ * ) -+ # The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 -+printf %s "checking size of long long... " >&6; } -+if test ${ac_cv_sizeof_long_long+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default" -+then : -+ -+else case e in #( -+ e) if test "$ac_cv_type_long_long" = yes; 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 77 "cannot compute sizeof (long long) -+See 'config.log' for more details" "$LINENO" 5; } -+ else -+ ac_cv_sizeof_long_long=0 -+ fi ;; -+esac -+fi -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 -+printf "%s\n" "$ac_cv_sizeof_long_long" >&6; } -+ -+ -+ -+printf "%s\n" "#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long" >>confdefs.h -+ -+ -+esac -+ -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of wchar_t" >&5 -+printf %s "checking size of wchar_t... " >&6; } -+if test ${ac_cv_sizeof_wchar_t+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (wchar_t))" "ac_cv_sizeof_wchar_t" " -+ /* DJGPP's wchar_t is now a keyword in C++ (still not C though) */ -+ #if defined(__DJGPP__) && !( (__GNUC_MINOR__ >= 8 && __GNUC__ == 2 ) || __GNUC__ >= 3 ) -+ # error \"fake wchar_t\" -+ #endif -+ #ifdef HAVE_WCHAR_H -+ # ifdef __CYGWIN__ -+ # include -+ # endif -+ # include -+ #endif -+ #ifdef HAVE_STDLIB_H -+ # include -+ #endif -+ #include -+ -+ -+" -+then : -+ -+else case e in #( -+ e) if test "$ac_cv_type_wchar_t" = yes; 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 77 "cannot compute sizeof (wchar_t) -+See 'config.log' for more details" "$LINENO" 5; } -+ else -+ ac_cv_sizeof_wchar_t=0 -+ fi ;; -+esac -+fi -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_wchar_t" >&5 -+printf "%s\n" "$ac_cv_sizeof_wchar_t" >&6; } -+ -+ -+ -+printf "%s\n" "#define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t" >>confdefs.h -+ -+ -+if test "$ac_cv_sizeof_wchar_t" = 0; then -+ as_fn_error $? "wxWidgets requires wchar_t support." "$LINENO" 5 -+fi -+ -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5 -+printf %s "checking for va_copy... " >&6; } -+if test ${wx_cv_func_va_copy+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ ac_ext=cpp -+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 -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+ #include -+ void foo(char *f, ...) -+ { -+ va_list ap1, ap2; -+ va_start(ap1, f); -+ va_copy(ap2, ap1); -+ va_end(ap2); -+ va_end(ap1); -+ } -+ int main() -+ { -+ foo("hi", 17); -+ return 0; -+ } -+ -+_ACEOF -+if ac_fn_cxx_try_link "$LINENO" -+then : -+ wx_cv_func_va_copy=yes -+else case e in #( -+ e) wx_cv_func_va_copy=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ 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 -+ -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_va_copy" >&5 -+printf "%s\n" "$wx_cv_func_va_copy" >&6; } -+ -+if test $wx_cv_func_va_copy = "yes"; then -+ printf "%s\n" "#define HAVE_VA_COPY 1" >>confdefs.h -+ -+else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if va_list can be copied by value" >&5 -+printf %s "checking if va_list can be copied by value... " >&6; } -+if test ${wx_cv_type_va_list_lvalue+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ if test "$cross_compiling" = yes -+then : -+ wx_cv_type_va_list_lvalue=yes -+ -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+ #include -+ int foo(char *f, ...) -+ { -+ va_list ap1, ap2; -+ va_start(ap1, f); -+ ap2 = ap1; -+ if ( va_arg(ap1, int) != 17 || va_arg(ap2, int) != 17 ) -+ return 1; -+ va_end(ap2); -+ va_end(ap1); -+ return 0; -+ } -+ int main() -+ { -+ return foo("hi", 17); -+ } -+ -+_ACEOF -+if ac_fn_c_try_run "$LINENO" -+then : -+ wx_cv_type_va_list_lvalue=yes -+else case e in #( -+ e) wx_cv_type_va_list_lvalue=no ;; -+esac -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+ -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_va_list_lvalue" >&5 -+printf "%s\n" "$wx_cv_type_va_list_lvalue" >&6; } -+ -+ if test $wx_cv_type_va_list_lvalue != "yes"; then -+ printf "%s\n" "#define VA_LIST_IS_ARRAY 1" >>confdefs.h -+ -+ fi -+fi -+ -+if test "$wxUSE_VARARG_MACROS" != "yes"; then -+ printf "%s\n" "#define wxNO_VARIADIC_MACROS 1" >>confdefs.h -+ -+fi -+ -+LARGEFILE_CPPFLAGS= -+# Check whether --enable-largefile was given. -+if test ${enable_largefile+y} -+then : -+ enableval=$enable_largefile; -+fi -+ -+if test "$enable_largefile" != no; then -+ wx_largefile=no -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -+printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -+if test ${ac_cv_sys_file_offset_bits+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#define _FILE_OFFSET_BITS 64 -+ #include -+int -+main (void) -+{ -+typedef struct { -+ unsigned int field: sizeof(off_t) == 8; -+} wxlf; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ ac_cv_sys_file_offset_bits=64 -+else case e in #( -+ e) ac_cv_sys_file_offset_bits=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 -+printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; } -+ -+ if test "$ac_cv_sys_file_offset_bits" != no; then -+ wx_largefile=yes -+ printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h -+ -+ fi -+ -+ if test "x$wx_largefile" != "xyes"; then -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 -+printf %s "checking for _LARGE_FILES value needed for large files... " >&6; } -+if test ${ac_cv_sys_large_files+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#define _LARGE_FILES 1 -+ #include -+int -+main (void) -+{ -+typedef struct { -+ unsigned int field: sizeof(off_t) == 8; -+} wxlf; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ ac_cv_sys_large_files=1 -+else case e in #( -+ e) ac_cv_sys_large_files=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 -+printf "%s\n" "$ac_cv_sys_large_files" >&6; } -+ -+ if test "$ac_cv_sys_large_files" != no; then -+ wx_largefile=yes -+ printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h -+ -+ fi -+ -+ fi -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if large file support is available" >&5 -+printf %s "checking if large file support is available... " >&6; } -+ if test "x$wx_largefile" = "xyes"; then -+ printf "%s\n" "#define HAVE_LARGEFILE_SUPPORT 1" >>confdefs.h -+ -+ fi -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_largefile" >&5 -+printf "%s\n" "$wx_largefile" >&6; } -+fi -+ -+if test "$ac_cv_sys_file_offset_bits" = "64"; then -+ LARGEFILE_CPPFLAGS="-D_FILE_OFFSET_BITS=64" -+elif test "$ac_cv_sys_large_files" = 1; then -+ LARGEFILE_CPPFLAGS="-D_LARGE_FILES" -+fi -+ -+if test -n "$LARGEFILE_CPPFLAGS"; then -+ WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $LARGEFILE_CPPFLAGS" -+ -+ if test "$USE_HPUX" = 1 -a "$GXX" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if -D__STDC_EXT__ is required" >&5 -+printf %s "checking if -D__STDC_EXT__ is required... " >&6; } -+if test ${wx_cv_STDC_EXT_required+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ ac_ext=cpp -+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 -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #ifndef __STDC_EXT__ -+ choke me -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_STDC_EXT_required=no -+else case e in #( -+ e) wx_cv_STDC_EXT_required=yes -+ ;; -+esac -+fi -+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' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_STDC_EXT_required" >&5 -+printf "%s\n" "$wx_cv_STDC_EXT_required" >&6; } -+ if test "x$wx_cv_STDC_EXT_required" = "xyes"; then -+ WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -D__STDC_EXT__" -+ fi -+ fi -+fi -+ -+ac_ext=cpp -+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 -+ -+old_CPPFLAGS="$CPPFLAGS" -+CPPFLAGS="$CPPFLAGS $LARGEFILE_CPPFLAGS" -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for declarations of fseeko and ftello" >&5 -+printf %s "checking for declarations of fseeko and ftello... " >&6; } -+if test ${ac_cv_func_fseeko_ftello+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+#if defined __hpux && !defined _LARGEFILE_SOURCE -+# include -+# if LONG_MAX >> 31 == 0 -+# error "32-bit HP-UX 11/ia64 needs _LARGEFILE_SOURCE for fseeko in C++" -+# endif -+#endif -+#include /* for off_t */ -+#include -+ -+int -+main (void) -+{ -+ -+ int (*fp1) (FILE *, off_t, int) = fseeko; -+ off_t (*fp2) (FILE *) = ftello; -+ return fseeko (stdin, 0, 0) -+ && fp1 (stdin, 0, 0) -+ && ftello (stdin) >= 0 -+ && fp2 (stdin) >= 0; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ ac_cv_func_fseeko_ftello=yes -+else case e in #( -+ e) ac_save_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE=1" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+#if defined __hpux && !defined _LARGEFILE_SOURCE -+# include -+# if LONG_MAX >> 31 == 0 -+# error "32-bit HP-UX 11/ia64 needs _LARGEFILE_SOURCE for fseeko in C++" -+# endif -+#endif -+#include /* for off_t */ -+#include -+ -+int -+main (void) -+{ -+ -+ int (*fp1) (FILE *, off_t, int) = fseeko; -+ off_t (*fp2) (FILE *) = ftello; -+ return fseeko (stdin, 0, 0) -+ && fp1 (stdin, 0, 0) -+ && ftello (stdin) >= 0 -+ && fp2 (stdin) >= 0; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ ac_cv_func_fseeko_ftello="need _LARGEFILE_SOURCE" -+else case e in #( -+ e) ac_cv_func_fseeko_ftello=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fseeko_ftello" >&5 -+printf "%s\n" "$ac_cv_func_fseeko_ftello" >&6; } -+if test "$ac_cv_func_fseeko_ftello" != no -+then : -+ -+printf "%s\n" "#define HAVE_FSEEKO 1" >>confdefs.h -+ -+fi -+if test "$ac_cv_func_fseeko_ftello" = "need _LARGEFILE_SOURCE" -+then : -+ -+printf "%s\n" "#define _LARGEFILE_SOURCE 1" >>confdefs.h -+ -+fi -+ -+CPPFLAGS="$old_CPPFLAGS" -+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 -+ -+if test "$ac_cv_sys_largefile_source" != no; then -+ WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_LARGEFILE_SOURCE=$ac_cv_sys_largefile_source" -+fi -+ -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 -+printf %s "checking whether byte ordering is bigendian... " >&6; } -+if test ${ac_cv_c_bigendian+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_cv_c_bigendian=unknown -+# See if sys/param.h defines the BYTE_ORDER macro. -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+#include -+int -+main (void) -+{ -+ -+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN -+ bogus endian macros -+#endif -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ # It does; now see whether it defined to BIG_ENDIAN or not. -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+#include -+int -+main (void) -+{ -+ -+#if BYTE_ORDER != BIG_ENDIAN -+ not big endian -+#endif -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ ac_cv_c_bigendian=yes -+else case e in #( -+ e) ac_cv_c_bigendian=no ;; -+esac -+fi -+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 -+if test $ac_cv_c_bigendian = unknown; then -+if test "$cross_compiling" = yes -+then : -+ ac_cv_c_bigendian=unknown -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+main () { -+ /* Are we little or big endian? From Harbison&Steele. */ -+ union -+ { -+ long l; -+ char c[sizeof (long)]; -+ } u; -+ u.l = 1; -+ exit (u.c[sizeof (long) - 1] == 1); -+} -+_ACEOF -+if ac_fn_c_try_run "$LINENO" -+then : -+ ac_cv_c_bigendian=no -+else case e in #( -+ e) ac_cv_c_bigendian=yes ;; -+esac -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+ -+fi ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 -+printf "%s\n" "$ac_cv_c_bigendian" >&6; } -+if test $ac_cv_c_bigendian = unknown; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Assuming little-endian target machine - this may be overridden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&5 -+printf "%s\n" "$as_me: WARNING: Assuming little-endian target machine - this may be overridden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&2;} -+fi -+if test $ac_cv_c_bigendian = yes; then -+ printf "%s\n" "#define WORDS_BIGENDIAN 1" >>confdefs.h -+ -+fi -+ -+ -+if test "x$SUNCXX" = xyes; then -+ CXXFLAGS="-features=tmplife $GNU_SOURCE_FLAG $CXXFLAGS" -+fi -+ -+if test "x$SUNCC" = xyes; then -+ CFLAGS="-erroff=E_NO_EXPLICIT_TYPE_GIVEN $CFLAGS" -+fi -+ -+if test "x$SGICC" = "xyes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if cc version is 7.4.4 or greater" >&5 -+printf %s "checking if cc version is 7.4.4 or greater... " >&6; } -+if test ${wx_cv_prog_sgicc744+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #if _SGI_COMPILER_VERSION >= 744 -+ chock me: mipsPro is 7.4.4 or later -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ wx_cv_prog_sgicc744=no -+else case e in #( -+ e) wx_cv_prog_sgicc744=yes -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_prog_sgicc744" >&5 -+printf "%s\n" "$wx_cv_prog_sgicc744" >&6; } -+ -+ if test "x$wx_cv_prog_sgicc744" = "xyes"; then -+ CFLAGS="-woff 3970 $CFLAGS" -+ fi -+fi -+if test "x$SGICXX" = "xyes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if CC version is 7.4.4 or greater" >&5 -+printf %s "checking if CC version is 7.4.4 or greater... " >&6; } -+if test ${wx_cv_prog_sgicxx744+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ ac_ext=cpp -+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 -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #if _SGI_COMPILER_VERSION >= 744 -+ chock me: mipsPro is 7.4.4 or later -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_prog_sgicxx744=no -+else case e in #( -+ e) wx_cv_prog_sgicxx744=yes -+ ;; -+esac -+fi -+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' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_prog_sgicxx744" >&5 -+printf "%s\n" "$wx_cv_prog_sgicxx744" >&6; } -+ -+ if test "x$wx_cv_prog_sgicxx744" = "xyes"; then -+ CXXFLAGS="-woff 3970 $CXXFLAGS" -+ fi -+fi -+ -+if test "x$HPCC" = "xyes"; then -+ CFLAGS="+W 2011,2450 $CFLAGS" -+fi -+if test "x$HPCXX" = "xyes"; then -+ CXXFLAGS="+W 2340,4232 $CXXFLAGS" -+fi -+ -+if test "x$COMPAQCXX" = "xyes"; then -+ CXXFLAGS="-w0 -msg_disable basclsnondto,unrimpret,intconlosbit" -+fi -+ -+if test "$HAVE_CXX11" = "1" ; then -+ -+printf "%s\n" "#define HAVE_STD_WSTRING 1" >>confdefs.h -+ -+printf "%s\n" "#define HAVE_STD_STRING_COMPARE 1" >>confdefs.h -+ -+printf "%s\n" "#define HAVE_STD_UNORDERED_MAP 1" >>confdefs.h -+ -+printf "%s\n" "#define HAVE_STD_UNORDERED_SET 1" >>confdefs.h -+ -+printf "%s\n" "#define HAVE_TYPE_TRAITS 1" >>confdefs.h -+ -+ -+else -+ac_ext=cpp -+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 -+ -+ -+if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then -+ if test "$wxUSE_UNICODE" = "yes"; then -+ std_string="std::wstring" -+ char_type="wchar_t" -+ else -+ std_string="std::string" -+ char_type="char" -+ fi -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $std_string in " >&5 -+printf %s "checking for $std_string in ... " >&6; } -+if test ${wx_cv_class_stdstring+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+$std_string foo; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_class_stdstring=yes -+else case e in #( -+ e) wx_cv_class_stdstring=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_class_stdstring" >&5 -+printf "%s\n" "$wx_cv_class_stdstring" >&6; } -+ -+ if test "$wx_cv_class_stdstring" = yes; then -+ if test "$wxUSE_UNICODE" = "yes"; then -+ printf "%s\n" "#define HAVE_STD_WSTRING 1" >>confdefs.h -+ -+ fi -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if std::basic_string<$char_type> works" >&5 -+printf %s "checking if std::basic_string<$char_type> works... " >&6; } -+if test ${wx_cv_class_stdbasicstring+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #ifdef HAVE_WCHAR_H -+ # ifdef __CYGWIN__ -+ # include -+ # endif -+ # include -+ #endif -+ #ifdef HAVE_STDLIB_H -+ # include -+ #endif -+ #include -+ #include -+ -+int -+main (void) -+{ -+std::basic_string<$char_type> foo; -+ const $char_type* dummy = foo.c_str(); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_class_stdbasicstring=yes -+else case e in #( -+ e) wx_cv_class_stdbasicstring=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_class_stdbasicstring" >&5 -+printf "%s\n" "$wx_cv_class_stdbasicstring" >&6; } -+ -+ if test "$wx_cv_class_stdbasicstring" != yes; then -+ if test "$wxUSE_STL" = "yes"; then -+ as_fn_error $? "Can't use --enable-stl without $std_string or std::basic_string<$char_type>" "$LINENO" 5 -+ elif test "$wxUSE_STD_STRING" = "yes"; then -+ as_fn_error $? "Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" "$LINENO" 5 -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&5 -+printf "%s\n" "$as_me: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&2;} -+ wxUSE_STD_STRING=no -+ fi -+ fi -+ fi -+fi -+ -+if test "$wxUSE_STD_IOSTREAM" = "yes"; then -+ ac_fn_cxx_check_type "$LINENO" "std::istream" "ac_cv_type_std__istream" "#include -+" -+if test "x$ac_cv_type_std__istream" = xyes -+then : -+ -+printf "%s\n" "#define HAVE_STD__ISTREAM 1" >>confdefs.h -+ -+ -+else case e in #( -+ e) wxUSE_STD_IOSTREAM=no ;; -+esac -+fi -+ac_fn_cxx_check_type "$LINENO" "std::ostream" "ac_cv_type_std__ostream" "#include -+" -+if test "x$ac_cv_type_std__ostream" = xyes -+then : -+ -+printf "%s\n" "#define HAVE_STD__OSTREAM 1" >>confdefs.h -+ -+ -+else case e in #( -+ e) wxUSE_STD_IOSTREAM=no ;; -+esac -+fi -+ -+ -+ if test "$wxUSE_STD_IOSTREAM" != "yes"; then -+ if test "$wxUSE_STD_IOSTREAM" = "yes"; then -+ as_fn_error $? "Can't use --enable-std_iostreams without std::istream and std::ostream" "$LINENO" 5 -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&5 -+printf "%s\n" "$as_me: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&2;} -+ fi -+ fi -+fi -+ -+if test "$wxUSE_STL" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compliant std::string::compare" >&5 -+printf %s "checking for compliant std::string::compare... " >&6; } -+if test ${wx_cv_func_stdstring_compare+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+std::string foo, bar; -+ foo.compare(bar); -+ foo.compare(1, 1, bar); -+ foo.compare(1, 1, bar, 1, 1); -+ foo.compare(""); -+ foo.compare(1, 1, ""); -+ foo.compare(1, 1, "", 2); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_func_stdstring_compare=yes -+else case e in #( -+ e) wx_cv_func_stdstring_compare=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_stdstring_compare" >&5 -+printf "%s\n" "$wx_cv_func_stdstring_compare" >&6; } -+ -+ if test "$wx_cv_func_stdstring_compare" = yes; then -+ printf "%s\n" "#define HAVE_STD_STRING_COMPARE 1" >>confdefs.h -+ -+ fi -+ -+ if test "$wx_cv_class_gnuhashmapset" = yes; then -+ printf "%s\n" "#define HAVE_EXT_HASH_MAP 1" >>confdefs.h -+ -+ printf "%s\n" "#define HAVE_GNU_CXX_HASH_MAP 1" >>confdefs.h -+ -+ fi -+ -+ ac_fn_cxx_check_header_compile "$LINENO" "unordered_map" "ac_cv_header_unordered_map" " -+ -+" -+if test "x$ac_cv_header_unordered_map" = xyes -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for unordered_map and unordered_set in std" >&5 -+printf %s "checking for unordered_map and unordered_set in std... " >&6; } -+if test ${wx_cv_class_stdunorderedmapset+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+ #include -+int -+main (void) -+{ -+std::unordered_map test1; -+ std::unordered_set test2; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_class_stdunorderedmapset=yes -+else case e in #( -+ e) wx_cv_class_stdunorderedmapset=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_class_stdunorderedmapset" >&5 -+printf "%s\n" "$wx_cv_class_stdunorderedmapset" >&6; } -+fi -+ -+ -+ if test "$wx_cv_class_stdunorderedmapset" = yes; then -+ printf "%s\n" "#define HAVE_STD_UNORDERED_MAP 1" >>confdefs.h -+ -+ printf "%s\n" "#define HAVE_STD_UNORDERED_SET 1" >>confdefs.h -+ -+ else -+ ac_fn_cxx_check_header_compile "$LINENO" "tr1/unordered_map" "ac_cv_header_tr1_unordered_map" " -+ -+" -+if test "x$ac_cv_header_tr1_unordered_map" = xyes -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for unordered_map and unordered_set in std::tr1" >&5 -+printf %s "checking for unordered_map and unordered_set in std::tr1... " >&6; } -+if test ${wx_cv_class_tr1unorderedmapset+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+ #include -+int -+main (void) -+{ -+std::tr1::unordered_map test1; -+ std::tr1::unordered_set test2; -+ #if defined(__GNUC__) && (__GNUC__==4) && (__GNUC_MINOR__<2) -+ #error can't use unordered_{map,set} with gcc-4.[01]: http://gcc.gnu.org/PR24389 -+ #endif -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_class_tr1unorderedmapset=yes -+else case e in #( -+ e) wx_cv_class_tr1unorderedmapset=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_class_tr1unorderedmapset" >&5 -+printf "%s\n" "$wx_cv_class_tr1unorderedmapset" >&6; } -+fi -+ -+ -+ if test "$wx_cv_class_tr1unorderedmapset" = yes; then -+ printf "%s\n" "#define HAVE_TR1_UNORDERED_MAP 1" >>confdefs.h -+ -+ printf "%s\n" "#define HAVE_TR1_UNORDERED_SET 1" >>confdefs.h -+ -+ else -+ ac_fn_cxx_check_header_compile "$LINENO" "hash_map" "ac_cv_header_hash_map" " -+ -+" -+if test "x$ac_cv_header_hash_map" = xyes -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for std::hash_map and hash_set" >&5 -+printf %s "checking for std::hash_map and hash_set... " >&6; } -+if test ${wx_cv_class_stdhashmapset+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+ #include -+int -+main (void) -+{ -+std::hash_map, std::equal_to > test1; -+ std::hash_set, std::equal_to > test2; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_class_stdhashmapset=yes -+else case e in #( -+ e) wx_cv_class_stdhashmapset=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_class_stdhashmapset" >&5 -+printf "%s\n" "$wx_cv_class_stdhashmapset" >&6; } -+fi -+ -+ -+ if test "$wx_cv_class_stdhashmapset" = yes; then -+ printf "%s\n" "#define HAVE_HASH_MAP 1" >>confdefs.h -+ -+ printf "%s\n" "#define HAVE_STD_HASH_MAP 1" >>confdefs.h -+ -+ fi -+ -+ ac_fn_cxx_check_header_compile "$LINENO" "ext/hash_map" "ac_cv_header_ext_hash_map" " -+ -+" -+if test "x$ac_cv_header_ext_hash_map" = xyes -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU hash_map and hash_set" >&5 -+printf %s "checking for GNU hash_map and hash_set... " >&6; } -+if test ${wx_cv_class_gnuhashmapset+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+ #include -+int -+main (void) -+{ -+__gnu_cxx::hash_map, std::equal_to > test1; -+ __gnu_cxx::hash_set, std::equal_to > test2; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_class_gnuhashmapset=yes -+else case e in #( -+ e) wx_cv_class_gnuhashmapset=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_class_gnuhashmapset" >&5 -+printf "%s\n" "$wx_cv_class_gnuhashmapset" >&6; } -+fi -+ -+ -+ fi -+ fi -+fi -+ -+ for ac_header in type_traits tr1/type_traits -+do : -+ as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | sed "$as_sed_sh"` -+ac_fn_cxx_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 `printf "%s\n" "HAVE_$ac_header" | sed "$as_sed_cpp"` 1 -+_ACEOF -+ break -+fi -+ -+done -+ -+fi -+ -+ -+ if test -n "$GCC"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __sync_xxx_and_fetch builtins" >&5 -+printf %s "checking for __sync_xxx_and_fetch builtins... " >&6; } -+ if test ${wx_cv_cc_gcc_atomic_builtins+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ unsigned int value=0; -+ volatile unsigned int r1 = __sync_add_and_fetch(&value, 2); -+ volatile unsigned int r2 = __sync_sub_and_fetch(&value, 1); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_link "$LINENO" -+then : -+ wx_cv_cc_gcc_atomic_builtins=yes -+else case e in #( -+ e) wx_cv_cc_gcc_atomic_builtins=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ ;; -+esac -+fi -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_cc_gcc_atomic_builtins" >&5 -+printf "%s\n" "$wx_cv_cc_gcc_atomic_builtins" >&6; } -+ if test $wx_cv_cc_gcc_atomic_builtins = yes; then -+ printf "%s\n" "#define HAVE_GCC_ATOMIC_BUILTINS 1" >>confdefs.h -+ -+ fi -+ 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 -+ -+ -+ -+SEARCH_INCLUDE="\ -+ /usr/local/include \ -+ /usr/local/X11/include \ -+ /usr/local/include/X11 \ -+ /usr/local/X11R7/include \ -+ /usr/local/X11R6/include \ -+ /usr/local/include/X11R7 \ -+ /usr/local/include/X11R6 \ -+ \ -+ /usr/Motif-2.1/include \ -+ /usr/Motif-1.2/include \ -+ /usr/include/Motif1.2 \ -+ \ -+ /usr/dt/include \ -+ /usr/openwin/include \ -+ \ -+ /usr/include/Xm \ -+ \ -+ /usr/X11R7/include \ -+ /usr/X11R6/include \ -+ /usr/X11R6.4/include \ -+ \ -+ /usr/include/X11R7 \ -+ /usr/include/X11R6 \ -+ \ -+ /usr/X11/include \ -+ /usr/include/X11 \ -+ \ -+ /usr/XFree86/include/X11 \ -+ /usr/pkg/include \ -+ \ -+ /usr/local/X1R5/include \ -+ /usr/local/include/X11R5 \ -+ /usr/X11R5/include \ -+ /usr/include/X11R5 \ -+ \ -+ /usr/local/X11R4/include \ -+ /usr/local/include/X11R4 \ -+ /usr/X11R4/include \ -+ /usr/include/X11R4 \ -+ \ -+ /usr/openwin/share/include" -+ -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libraries directories" >&5 -+printf %s "checking for libraries directories... " >&6; } -+ -+case "${host}" in -+ *-*-irix6* ) -+ if test ${wx_cv_std_libpath+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ for d in /usr/lib /usr/lib32 /usr/lib/64 /usr/lib64; do -+ for e in a so sl dylib dll.a; do -+ libc="$d/libc.$e" -+ if test -f $libc; then -+ save_LIBS="$LIBS" -+ LIBS="$libc" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ int main() { return 0; } -+ -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ wx_cv_std_libpath=`echo $d | sed s@/usr/@@` -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ LIBS="$save_LIBS" -+ if test "x$wx_cv_std_libpath" != "x"; then -+ break 2 -+ fi -+ fi -+ done -+ done -+ -+ ;; -+esac -+fi -+ -+ ;; -+ -+ *-*-solaris2* ) -+ if test "$ac_cv_sizeof_void_p" = 8 -a -d "/usr/lib/64"; then -+ wx_cv_std_libpath="lib/64" -+ if test -n "$PKG_CONFIG_PATH"; then -+ PKG_CONFIG_PATH="/usr/$wx_cv_std_libpath/pkgconfig:$PKG_CONFIG_PATH" -+ else -+ PKG_CONFIG_PATH="/usr/$wx_cv_std_libpath/pkgconfig" -+ fi -+ export PKG_CONFIG_PATH -+ fi -+ ;; -+ -+ *-*-linux* ) -+ if test "$ac_cv_sizeof_void_p" = 8; then -+ if test -d "/usr/lib/`uname -m`-linux-gnu"; then -+ wx_cv_std_libfullpath="/usr/lib/`uname -m`-linux-gnu" -+ elif test -d "/usr/lib64" -a ! -h "/usr/lib64"; then -+ wx_cv_std_libpath="lib64" -+ fi -+ else -+ case "${host}" in -+ i*86-*-linux* ) -+ if test -d '/usr/lib/i386-linux-gnu'; then -+ wx_cv_std_libfullpath='/usr/lib/i386-linux-gnu' -+ fi -+ esac -+ fi -+ -+ if test -n "$wx_cv_std_libfullpath" -a -d "/usr/lib"; then -+ wx_cv_std_libfullpath="$wx_cv_std_libfullpath /usr/lib" -+ fi -+ ;; -+esac -+ -+if test -z "$wx_cv_std_libpath"; then -+ wx_cv_std_libpath="lib" -+fi -+ -+if test -z "$wx_cv_std_libfullpath"; then -+ wx_cv_std_libfullpath="/usr/$wx_cv_std_libpath" -+fi -+ -+ -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_std_libfullpath" >&5 -+printf "%s\n" "$wx_cv_std_libfullpath" >&6; } -+ -+SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` $wx_cv_std_libfullpath" -+ -+if test "$build" != "$host" -a "$GCC" = yes; then -+ if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then -+ cross_root=`dirname $cross_root` -+ cross_root=`dirname $cross_root` -+ -+ SEARCH_LIB=`for x in $SEARCH_LIB; do echo $x; done | sed -ne "s|^/usr|$cross_root|p"` -+ SEARCH_INCLUDE=`for x in $SEARCH_INCLUDE; do echo $x; done | sed -ne "s|^/usr|$cross_root|p"` -+ SEARCH_INCLUDE="$SEARCH_INCLUDE $cross_root/include" -+ -+ if test -z "$PKG_CONFIG_PATH"; then -+ PKG_CONFIG_PATH="$cross_root/local/lib/pkgconfig:$cross_root/lib/pkgconfig" -+ export PKG_CONFIG_PATH -+ fi -+ -+ if test -z "$x_includes" -o "$x_includes" = NONE; then -+ -+ac_find_includes= -+for ac_dir in $SEARCH_INCLUDE /usr/include -+ do -+ if test -f "$ac_dir/X11/Intrinsic.h"; then -+ ac_find_includes=$ac_dir -+ break -+ fi -+ done -+ -+ x_includes=$ac_find_includes -+ fi -+ if test -z "$x_libraries" -o "$x_libraries" = NONE; then -+ -+ ac_find_libraries= -+ for ac_dir in $SEARCH_LIB -+ do -+ for ac_extension in a so sl dylib dll.a; do -+ if test -f "$ac_dir/libXt.$ac_extension"; then -+ ac_find_libraries=$ac_dir -+ break 2 -+ fi -+ done -+ done -+ -+ x_libraries=$ac_find_libraries -+ fi -+ fi -+fi -+ -+ -+cat >confcache <<\_ACEOF -+# This file is a shell script that caches the results of configure -+# tests run on this system so they can be shared between configure -+# scripts and configure runs, see configure's option --config-cache. -+# It is not useful on other systems. If it contains results you don't -+# want to keep, you may remove or edit it. -+# -+# config.status only pays attention to the cache file if you give it -+# the --recheck option to rerun configure. -+# -+# 'ac_cv_env_foo' variables (set or unset) will be overridden when -+# loading this file, other *unset* 'ac_cv_foo' will be assigned the -+# following values. -+ -+_ACEOF -+ -+# The following way of writing the cache mishandles newlines in values, -+# but we know of no workaround that is simple, portable, and efficient. -+# So, we kill variables containing newlines. -+# Ultrix sh set writes to stderr and can't be redirected directly, -+# and sets the high bit in the cache file unless we assign to the vars. -+( -+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_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) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done -+ -+ (set) 2>&1 | -+ case $as_nl`(ac_space=' '; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) -+ # 'set' does not quote correctly, so add quotes: double-quote -+ # substitution turns \\\\ into \\, and sed turns \\ into \. -+ sed -n \ -+ "s/'/'\\\\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -+ ;; #( -+ *) -+ # 'set' quotes correctly as required by POSIX, so do not add quotes. -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" -+ ;; -+ esac | -+ sort -+) | -+ sed ' -+ /^ac_cv_env_/b end -+ t clear -+ :clear -+ 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 -+ { 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 -+ case $cache_file in #( -+ */* | ?:*) -+ mv -f confcache "$cache_file"$$ && -+ mv -f "$cache_file"$$ "$cache_file" ;; #( -+ *) -+ mv -f confcache "$cache_file" ;; -+ esac -+ fi -+ fi -+ else -+ { 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 -+ -+have_cos=0 -+have_floor=0 -+ -+ for ac_func in cos -+do : -+ ac_fn_c_check_func "$LINENO" "cos" "ac_cv_func_cos" -+if test "x$ac_cv_func_cos" = xyes -+then : -+ printf "%s\n" "#define HAVE_COS 1" >>confdefs.h -+ have_cos=1 -+fi -+ -+done -+ -+ for ac_func in floor -+do : -+ ac_fn_c_check_func "$LINENO" "floor" "ac_cv_func_floor" -+if test "x$ac_cv_func_floor" = xyes -+then : -+ printf "%s\n" "#define HAVE_FLOOR 1" >>confdefs.h -+ have_floor=1 -+fi -+ -+done -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if floating point functions link without -lm" >&5 -+printf %s "checking if floating point functions link without -lm... " >&6; } -+if test "$have_cos" = 1 -a "$have_floor" = 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ save_LIBS="$LIBS" -+ LIBS="$LIBS -lm" -+ have_sin=0 -+ have_ceil=0 -+ -+ for ac_func in sin -+do : -+ ac_fn_c_check_func "$LINENO" "sin" "ac_cv_func_sin" -+if test "x$ac_cv_func_sin" = xyes -+then : -+ printf "%s\n" "#define HAVE_SIN 1" >>confdefs.h -+ have_sin=1 -+fi -+ -+done -+ -+ for ac_func in ceil -+do : -+ ac_fn_c_check_func "$LINENO" "ceil" "ac_cv_func_ceil" -+if test "x$ac_cv_func_ceil" = xyes -+then : -+ printf "%s\n" "#define HAVE_CEIL 1" >>confdefs.h -+ have_ceil=1 -+fi -+ -+done -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if floating point functions link with -lm" >&5 -+printf %s "checking if floating point functions link with -lm... " >&6; } -+ if test "$have_sin" = 1 -a "$have_ceil" = 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ LIBS="$save_LIBS" -+ fi -+fi -+ -+if test "$HAVE_CXX11" != "1" ; then -+ -+ac_ext=cpp -+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 -+ -+if test "wxUSE_UNICODE" = "yes"; then -+ -+ for wx_func in wcstoull -+ do -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+ -+ $ac_includes_default -+ -+int -+main (void) -+{ -+ -+ #ifndef $wx_func -+ &$wx_func; -+ #endif -+ -+ -+ ; -+ return 0; -+} -+ -+_ACEOF -+if ac_fn_cxx_try_link "$LINENO" -+then : -+ eval wx_cv_func_$wx_func=yes -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ ;; -+esac -+fi -+eval ac_res=\$wx_cv_func_$wx_func -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+printf "%s\n" "$ac_res" >&6; } -+ -+ if eval test \$wx_cv_func_$wx_func = yes -+ then -+ cat >>confdefs.h <<_ACEOF -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 -+_ACEOF -+ -+ -+ else -+ : -+ -+ fi -+ done -+ -+else -+ -+ for wx_func in strtoull -+ do -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+ -+ $ac_includes_default -+ -+int -+main (void) -+{ -+ -+ #ifndef $wx_func -+ &$wx_func; -+ #endif -+ -+ -+ ; -+ return 0; -+} -+ -+_ACEOF -+if ac_fn_cxx_try_link "$LINENO" -+then : -+ eval wx_cv_func_$wx_func=yes -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ ;; -+esac -+fi -+eval ac_res=\$wx_cv_func_$wx_func -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+printf "%s\n" "$ac_res" >&6; } -+ -+ if eval test \$wx_cv_func_$wx_func = yes -+ then -+ cat >>confdefs.h <<_ACEOF -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 -+_ACEOF -+ -+ -+ else -+ : -+ -+ fi -+ done -+ -+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 -+ -+ -+fi -+ -+ -+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 -+{ 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 case e in #( -+ e) case $PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ 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_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 -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac ;; -+esac -+fi -+PKG_CONFIG=$ac_cv_path_PKG_CONFIG -+if test -n "$PKG_CONFIG"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -+printf "%s\n" "$PKG_CONFIG" >&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_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 -+{ 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 case e in #( -+ e) 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. -+ ;; -+ *) -+ 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_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 -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac ;; -+esac -+fi -+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -+if test -n "$ac_pt_PKG_CONFIG"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -+printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } -+else -+ { 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 -+ PKG_CONFIG="" -+ 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 -+ PKG_CONFIG=$ac_pt_PKG_CONFIG -+ fi -+else -+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -+fi -+ -+fi -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=0.9.0 -+ { 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 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ PKG_CONFIG="" -+ fi -+ -+fi -+ -+if test "$build" != "$host"; then -+ case "${host}" in -+ *-linux-*) -+ ;; -+ -+ * ) -+ case "$PKG_CONFIG" in -+ */$host-pkg-config ) -+ ;; -+ -+ * ) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Not using native pkg-config when cross-compiling." >&5 -+printf "%s\n" "$as_me: WARNING: Not using native pkg-config when cross-compiling." >&2;} -+ -+ -+ -+ if test -z "$PKG_CONFIG_LIBDIR"; then -+ PKG_CONFIG_LIBDIR=/dev/null -+ export PKG_CONFIG_LIBDIR -+ fi -+ ;; -+ esac -+ ;; -+ esac -+fi -+ -+ -+ -+if test "$wxUSE_REGEX" != "no"; then -+ printf "%s\n" "#define wxUSE_REGEX 1" >>confdefs.h -+ -+ -+ if test "$wxUSE_UNICODE" = "yes"; then -+ if test "$wxUSE_UNICODE_UTF8" = "yes"; then -+ pcre_suffix=8 -+ else -+ if test "$ac_cv_sizeof_wchar_t" = 2; then -+ pcre_suffix=16 -+ elif test "$ac_cv_sizeof_wchar_t" = 4; then -+ pcre_suffix=32 -+ else -+ as_fn_error $? "unknown sizeof(wchar_t)" "$LINENO" 5 -+ fi -+ fi -+ else -+ pcre_suffix=8 -+ fi -+ -+ if test "$wxUSE_REGEX" != "builtin"; then -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBPCRE" >&5 -+printf %s "checking for LIBPCRE... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$LIBPCRE_CFLAGS"; then -+ pkg_cv_LIBPCRE_CFLAGS="$LIBPCRE_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-\$pcre_suffix\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libpcre2-$pcre_suffix") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_LIBPCRE_CFLAGS=`$PKG_CONFIG --cflags "libpcre2-$pcre_suffix" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$LIBPCRE_LIBS"; then -+ pkg_cv_LIBPCRE_LIBS="$LIBPCRE_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-\$pcre_suffix\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libpcre2-$pcre_suffix") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_LIBPCRE_LIBS=`$PKG_CONFIG --libs "libpcre2-$pcre_suffix" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ LIBPCRE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpcre2-$pcre_suffix"` -+ else -+ LIBPCRE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpcre2-$pcre_suffix"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$LIBPCRE_PKG_ERRORS" >&5 -+ -+ -+ wxUSE_REGEX=builtin -+ -+ -+elif test $pkg_failed = untried; then -+ -+ wxUSE_REGEX=builtin -+ -+ -+else -+ LIBPCRE_CFLAGS=$pkg_cv_LIBPCRE_CFLAGS -+ LIBPCRE_LIBS=$pkg_cv_LIBPCRE_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ PCRE_LINK=$LIBPCRE_LIBS -+ CXXFLAGS="$LIBPCRE_CFLAGS $CXXFLAGS" -+ wxUSE_REGEX=sys -+ -+fi -+ fi -+ -+ if test "$wxUSE_REGEX" = "builtin"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pcre submodule exists" >&5 -+printf %s "checking whether pcre submodule exists... " >&6; } -+ if ! test -f "$srcdir/3rdparty/pcre/pcre2-config.in" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ as_fn_error $? " -+ Configured to use built-in PCRE library, but the file -+ $srcdir/3rdparty/pcre/pcre2-config.in couldn't be found. -+ You might need to run: -+ -+ git submodule update --init 3rdparty/pcre -+ -+ to fix this." "$LINENO" 5 -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ fi -+ -+ if test $pcre_suffix != 8; then -+ pcre_config_disable="--disable-pcre2-8" -+ pcre_config_enable="--enable-pcre2-$pcre_suffix" -+ fi -+ -+ wxPCRE2_CODE_UNIT_WIDTH=$pcre_suffix -+ -+ -+ -+ -+ -+ -+ -+ # Various preliminary checks. -+ -+ -+ -+ -+ -+ ax_dir="3rdparty/pcre" -+ -+ # Do not complain, so a configure script can configure whichever parts of a -+ # large source tree are present. -+ if test -d "$srcdir/$ax_dir"; then -+ ac_builddir=. -+ -+case "$ax_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`printf "%s\n" "$ax_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ 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/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix -+ -+case $srcdir in -+ .) # We are building in place. -+ ac_srcdir=. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. -+ ac_srcdir=$srcdir$ac_dir_suffix; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -+esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -+ -+ # Remove --cache-file, --srcdir, and --disable-option-checking arguments -+ # so they do not pile up. -+ ax_args= -+ ax_prev= -+ eval "set x $ac_configure_args" -+ shift -+ for ax_arg; do -+ if test -n "$ax_prev"; then -+ ax_prev= -+ continue -+ fi -+ case $ax_arg in -+ -cache-file | --cache-file | --cache-fil | --cache-fi | --cache-f \ -+ | --cache- | --cache | --cach | --cac | --ca | --c) -+ ax_prev=cache_file ;; -+ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ -+ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \ -+ | --c=*) -+ ;; -+ --config-cache | -C) -+ ;; -+ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) -+ ax_prev=srcdir ;; -+ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) -+ ;; -+ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) -+ ax_prev=prefix ;; -+ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* \ -+ | --p=*) -+ ;; -+ --disable-option-checking) -+ ;; -+ *) case $ax_arg in -+ *\'*) ax_arg=$(printf "%s\n" "$ax_arg" | sed "s/'/'\\\\\\\\''/g");; -+ esac -+ as_fn_append ax_args " '$ax_arg'" ;; -+ esac -+ done -+ # Always prepend --disable-option-checking to silence warnings, since -+ # different subdirs can have different --enable and --with options. -+ ax_args="--disable-option-checking $ax_args" -+ # Options that must be added as they are provided. -+ as_fn_append ax_args " '$pcre_config_disable'" -+ as_fn_append ax_args " '$pcre_config_enable'" -+ -+ # New options that may need to be merged with existing options. -+ -+ # New options that must replace existing options. -+ -+ # Options that must be removed. -+ -+ as_fn_append ax_args " '--srcdir=$ac_srcdir'" -+ -+ # Add the subdirectory to the list of target subdirectories. -+ ax_subconfigures="$ax_subconfigures $ax_dir" -+ # Save the argument list for this subdirectory. -+ ax_var=$(printf "$ax_dir" | tr -c "0-9a-zA-Z_" "_") -+ eval "ax_sub_configure_args_$ax_var=\"$ax_args\"" -+ eval "ax_sub_configure_$ax_var=\"yes\"" -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: could not find source tree for $ax_dir" >&5 -+printf "%s\n" "$as_me: WARNING: could not find source tree for $ax_dir" >&2;} -+ fi -+ -+ -+ -+ -+ fi -+fi -+ -+ -+ZLIB_LINK= -+if test "$wxUSE_ZLIB" != "no" ; then -+ printf "%s\n" "#define wxUSE_ZLIB 1" >>confdefs.h -+ -+ -+ if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zlib.h >= 1.1.4" >&5 -+printf %s "checking for zlib.h >= 1.1.4... " >&6; } -+if test ${ac_cv_header_zlib_h+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if test "$cross_compiling" = yes -+then : -+ unset ac_cv_header_zlib_h -+ -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ #include -+ #include -+ -+ int main() -+ { -+ FILE *f=fopen("conftestval", "w"); -+ if (!f) return 1; -+ fprintf(f, "%s", -+ ZLIB_VERSION[0] == '1' && -+ (ZLIB_VERSION[2] > '1' || -+ (ZLIB_VERSION[2] == '1' && -+ ZLIB_VERSION[4] >= '4')) ? "yes" : "no"); -+ return 0; -+ } -+ -+_ACEOF -+if ac_fn_c_try_run "$LINENO" -+then : -+ ac_cv_header_zlib_h=`cat conftestval` -+else case e in #( -+ e) ac_cv_header_zlib_h=no ;; -+esac -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_zlib_h" >&5 -+printf "%s\n" "$ac_cv_header_zlib_h" >&6; } -+ ac_fn_c_check_header_compile "$LINENO" "zlib.h" "ac_cv_header_zlib_h" " -+" -+if test "x$ac_cv_header_zlib_h" = xyes -+then : -+ -+fi -+ -+ -+ if test "$ac_cv_header_zlib_h" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5 -+printf %s "checking for deflate in -lz... " >&6; } -+if test ${ac_cv_lib_z_deflate+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lz $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char deflate (void); -+int -+main (void) -+{ -+return deflate (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_z_deflate=yes -+else case e in #( -+ e) ac_cv_lib_z_deflate=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5 -+printf "%s\n" "$ac_cv_lib_z_deflate" >&6; } -+if test "x$ac_cv_lib_z_deflate" = xyes -+then : -+ ZLIB_LINK=" -lz" -+fi -+ -+ fi -+ -+ if test "x$ZLIB_LINK" = "x" ; then -+ if test "$wxUSE_ZLIB" = "sys" ; then -+ as_fn_error $? "zlib library not found or too old! Use --with-zlib=builtin to use built-in version" "$LINENO" 5 -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: zlib library not found or too old, will use built-in instead" >&5 -+printf "%s\n" "$as_me: WARNING: zlib library not found or too old, will use built-in instead" >&2;} -+ wxUSE_ZLIB=builtin -+ fi -+ else -+ wxUSE_ZLIB=sys -+ fi -+ fi -+ -+ if test "$wxUSE_ZLIB" = "builtin" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether zlib.h file exists" >&5 -+printf %s "checking whether zlib.h file exists... " >&6; } -+ if ! test -f "$srcdir/src/zlib/zlib.h" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ as_fn_error $? " -+ Configured to use built-in zlib library, but the required file -+ $srcdir/src/zlib/zlib.h couldn't be found. -+ You might need to run -+ -+ git submodule update --init src/zlib -+ -+ to fix this." "$LINENO" 5 -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ fi -+ fi -+fi -+ -+ -+PNG_LINK= -+if test "$wxUSE_LIBPNG" != "no" ; then -+ printf "%s\n" "#define wxUSE_LIBPNG 1" >>confdefs.h -+ -+ -+ if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: system png library doesn't work without system zlib, will use built-in instead" >&5 -+printf "%s\n" "$as_me: WARNING: system png library doesn't work without system zlib, will use built-in instead" >&2;} -+ wxUSE_LIBPNG=builtin -+ fi -+ -+ if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for png.h > 0.90" >&5 -+printf %s "checking for png.h > 0.90... " >&6; } -+if test ${ac_cv_header_png_h+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if test "$cross_compiling" = yes -+then : -+ unset ac_cv_header_png_h -+ -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ #include -+ #include -+ -+ int main() -+ { -+ FILE *f=fopen("conftestval", "w"); -+ if (!f) return 1; -+ fprintf(f, "%s", -+ PNG_LIBPNG_VER > 90 ? "yes" : "no"); -+ return 0; -+ } -+ -+_ACEOF -+if ac_fn_c_try_run "$LINENO" -+then : -+ ac_cv_header_png_h=`cat conftestval` -+else case e in #( -+ e) ac_cv_header_png_h=no ;; -+esac -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_png_h" >&5 -+printf "%s\n" "$ac_cv_header_png_h" >&6; } -+ ac_fn_c_check_header_compile "$LINENO" "png.h" "ac_cv_header_png_h" " -+" -+if test "x$ac_cv_header_png_h" = xyes -+then : -+ -+fi -+ -+ -+ if test "$ac_cv_header_png_h" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for png_sig_cmp in -lpng" >&5 -+printf %s "checking for png_sig_cmp in -lpng... " >&6; } -+if test ${ac_cv_lib_png_png_sig_cmp+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lpng -lz -lm $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char png_sig_cmp (void); -+int -+main (void) -+{ -+return png_sig_cmp (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_png_png_sig_cmp=yes -+else case e in #( -+ e) ac_cv_lib_png_png_sig_cmp=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_sig_cmp" >&5 -+printf "%s\n" "$ac_cv_lib_png_png_sig_cmp" >&6; } -+if test "x$ac_cv_lib_png_png_sig_cmp" = xyes -+then : -+ PNG_LINK=" -lpng -lz" -+fi -+ -+ fi -+ -+ if test "x$PNG_LINK" = "x" ; then -+ if test "$wxUSE_LIBPNG" = "sys" ; then -+ as_fn_error $? "system png library not found or too old! Use --with-libpng=builtin to use built-in version" "$LINENO" 5 -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: system png library not found or too old, will use built-in instead" >&5 -+printf "%s\n" "$as_me: WARNING: system png library not found or too old, will use built-in instead" >&2;} -+ wxUSE_LIBPNG=builtin -+ fi -+ else -+ wxUSE_LIBPNG=sys -+ fi -+ fi -+ -+ if test "$wxUSE_LIBPNG" = "builtin" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether png.c file exists" >&5 -+printf %s "checking whether png.c file exists... " >&6; } -+ if ! test -f "$srcdir/src/png/png.c" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ as_fn_error $? " -+ Configured to use built-in png library, but the required file -+ $srcdir/src/png/png.c couldn't be found. -+ You might need to run -+ -+ git submodule update --init src/png -+ -+ to fix this." "$LINENO" 5 -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ fi -+ fi -+fi -+ -+ -+JPEG_LINK= -+if test "$wxUSE_LIBJPEG" != "no" ; then -+ printf "%s\n" "#define wxUSE_LIBJPEG 1" >>confdefs.h -+ -+ -+ if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for jpeglib.h" >&5 -+printf %s "checking for jpeglib.h... " >&6; } -+ if test ${ac_cv_header_jpeglib_h+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #undef HAVE_STDLIB_H -+ #include -+ #include -+ -+int -+main (void) -+{ -+ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ ac_cv_header_jpeglib_h=yes -+else case e in #( -+ e) ac_cv_header_jpeglib_h=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+fi -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_jpeglib_h" >&5 -+printf "%s\n" "$ac_cv_header_jpeglib_h" >&6; } -+ -+ if test "$ac_cv_header_jpeglib_h" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for jpeg_read_header in -ljpeg" >&5 -+printf %s "checking for jpeg_read_header in -ljpeg... " >&6; } -+if test ${ac_cv_lib_jpeg_jpeg_read_header+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-ljpeg $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char jpeg_read_header (void); -+int -+main (void) -+{ -+return jpeg_read_header (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_jpeg_jpeg_read_header=yes -+else case e in #( -+ e) ac_cv_lib_jpeg_jpeg_read_header=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5 -+printf "%s\n" "$ac_cv_lib_jpeg_jpeg_read_header" >&6; } -+if test "x$ac_cv_lib_jpeg_jpeg_read_header" = xyes -+then : -+ JPEG_LINK=" -ljpeg" -+fi -+ -+ fi -+ -+ if test "x$JPEG_LINK" = "x" ; then -+ if test "$wxUSE_LIBJPEG" = "sys" ; then -+ as_fn_error $? "system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" "$LINENO" 5 -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: system jpeg library not found, will use built-in instead" >&5 -+printf "%s\n" "$as_me: WARNING: system jpeg library not found, will use built-in instead" >&2;} -+ wxUSE_LIBJPEG=builtin -+ fi -+ else -+ wxUSE_LIBJPEG=sys -+ -+ if test "$wxUSE_MSW" = 1; then -+ ac_fn_c_check_type "$LINENO" "boolean" "ac_cv_type_boolean" "#include -+" -+if test "x$ac_cv_type_boolean" = xyes -+then : -+ -+printf "%s\n" "#define HAVE_BOOLEAN 1" >>confdefs.h -+ -+ -+ # The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of boolean" >&5 -+printf %s "checking size of boolean... " >&6; } -+if test ${ac_cv_sizeof_boolean+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (boolean))" "ac_cv_sizeof_boolean" " -+ #undef HAVE_BOOLEAN -+ #include -+ #include -+ -+" -+then : -+ -+else case e in #( -+ e) if test "$ac_cv_type_boolean" = yes; 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 77 "cannot compute sizeof (boolean) -+See 'config.log' for more details" "$LINENO" 5; } -+ else -+ ac_cv_sizeof_boolean=0 -+ fi ;; -+esac -+fi -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_boolean" >&5 -+printf "%s\n" "$ac_cv_sizeof_boolean" >&6; } -+ -+ -+ -+printf "%s\n" "#define SIZEOF_BOOLEAN $ac_cv_sizeof_boolean" >>confdefs.h -+ -+ -+ cat >>confdefs.h <<_ACEOF -+#define wxHACK_BOOLEAN wxInt`expr 8 \* $ac_cv_sizeof_boolean` -+_ACEOF -+ -+ -+fi -+ -+ fi -+ fi -+ fi -+ -+ if test "$wxUSE_LIBJPEG" = "builtin" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether jpeglib.h file exists" >&5 -+printf %s "checking whether jpeglib.h file exists... " >&6; } -+ if ! test -f "$srcdir/src/jpeg/jpeglib.h" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ as_fn_error $? " -+ Configured to use built-in jpeg library, but the required file -+ $srcdir/src/jpeg/jpeglib.h couldn't be found. -+ You might need to run -+ -+ git submodule update --init src/jpeg -+ -+ to fix this." "$LINENO" 5 -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ fi -+ fi -+fi -+ -+ -+if test "$wxUSE_LIBLZMA" != "no"; then -+ ac_fn_c_check_header_compile "$LINENO" "lzma.h" "ac_cv_header_lzma_h" "$ac_includes_default" -+if test "x$ac_cv_header_lzma_h" = xyes -+then : -+ -+fi -+ -+ -+ if test "$ac_cv_header_lzma_h" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lzma_code in -llzma" >&5 -+printf %s "checking for lzma_code in -llzma... " >&6; } -+if test ${ac_cv_lib_lzma_lzma_code+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-llzma $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char lzma_code (void); -+int -+main (void) -+{ -+return lzma_code (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_lzma_lzma_code=yes -+else case e in #( -+ e) ac_cv_lib_lzma_lzma_code=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_code" >&5 -+printf "%s\n" "$ac_cv_lib_lzma_lzma_code" >&6; } -+if test "x$ac_cv_lib_lzma_lzma_code" = xyes -+then : -+ -+ LZMA_LINK="-llzma" -+ LIBS="$LZMA_LINK $LIBS" -+ printf "%s\n" "#define wxUSE_LIBLZMA 1" >>confdefs.h -+ -+ wxUSE_LIBLZMA=sys -+ -+fi -+ -+ fi -+ -+ if test -z "$LZMA_LINK"; then -+ wxUSE_LIBLZMA=no -+ fi -+fi -+ -+ -+JBIG_LINK= -+if test "$wxUSE_LIBJBIG" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for jbg_dec_init in -ljbig" >&5 -+printf %s "checking for jbg_dec_init in -ljbig... " >&6; } -+if test ${ac_cv_lib_jbig_jbg_dec_init+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-ljbig $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char jbg_dec_init (void); -+int -+main (void) -+{ -+return jbg_dec_init (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_jbig_jbg_dec_init=yes -+else case e in #( -+ e) ac_cv_lib_jbig_jbg_dec_init=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jbig_jbg_dec_init" >&5 -+printf "%s\n" "$ac_cv_lib_jbig_jbg_dec_init" >&6; } -+if test "x$ac_cv_lib_jbig_jbg_dec_init" = xyes -+then : -+ JBIG_LINK=" -ljbig" -+fi -+ -+fi -+ -+ -+TIFF_LINK= -+if test "$wxUSE_LIBTIFF" != "no" ; then -+ printf "%s\n" "#define wxUSE_LIBTIFF 1" >>confdefs.h -+ -+ -+ if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBTIFF" >&5 -+printf %s "checking for LIBTIFF... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$LIBTIFF_CFLAGS"; then -+ pkg_cv_LIBTIFF_CFLAGS="$LIBTIFF_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtiff-4\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libtiff-4") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_LIBTIFF_CFLAGS=`$PKG_CONFIG --cflags "libtiff-4" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$LIBTIFF_LIBS"; then -+ pkg_cv_LIBTIFF_LIBS="$LIBTIFF_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtiff-4\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libtiff-4") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_LIBTIFF_LIBS=`$PKG_CONFIG --libs "libtiff-4" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ LIBTIFF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libtiff-4"` -+ else -+ LIBTIFF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libtiff-4"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$LIBTIFF_PKG_ERRORS" >&5 -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found via pkg-config" >&5 -+printf "%s\n" "not found via pkg-config" >&6; } -+ -+ TIFF_PREREQ_LINKS=-lm -+ -+ if test "$wxUSE_LIBJPEG" = "sys"; then -+ TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK" -+ fi -+ if test "$wxUSE_ZLIB" = "sys"; then -+ TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK" -+ fi -+ if test -n "$LZMA_LINK"; then -+ TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $LZMA_LINK" -+ fi -+ if test "$wxUSE_LIBJBIG" = "yes"; then -+ TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JBIG_LINK" -+ fi -+ ac_fn_c_check_header_compile "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" " -+ -+" -+if test "x$ac_cv_header_tiffio_h" = xyes -+then : -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIFFError in -ltiff" >&5 -+printf %s "checking for TIFFError in -ltiff... " >&6; } -+if test ${ac_cv_lib_tiff_TIFFError+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-ltiff $TIFF_PREREQ_LINKS $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char TIFFError (void); -+int -+main (void) -+{ -+return TIFFError (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_tiff_TIFFError=yes -+else case e in #( -+ e) ac_cv_lib_tiff_TIFFError=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFError" >&5 -+printf "%s\n" "$ac_cv_lib_tiff_TIFFError" >&6; } -+if test "x$ac_cv_lib_tiff_TIFFError" = xyes -+then : -+ TIFF_LINK=" -ltiff" -+fi -+ -+ -+fi -+ -+ -+elif test $pkg_failed = untried; then -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found via pkg-config" >&5 -+printf "%s\n" "not found via pkg-config" >&6; } -+ -+ TIFF_PREREQ_LINKS=-lm -+ -+ if test "$wxUSE_LIBJPEG" = "sys"; then -+ TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK" -+ fi -+ if test "$wxUSE_ZLIB" = "sys"; then -+ TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK" -+ fi -+ if test -n "$LZMA_LINK"; then -+ TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $LZMA_LINK" -+ fi -+ if test "$wxUSE_LIBJBIG" = "yes"; then -+ TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JBIG_LINK" -+ fi -+ ac_fn_c_check_header_compile "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" " -+ -+" -+if test "x$ac_cv_header_tiffio_h" = xyes -+then : -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIFFError in -ltiff" >&5 -+printf %s "checking for TIFFError in -ltiff... " >&6; } -+if test ${ac_cv_lib_tiff_TIFFError+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-ltiff $TIFF_PREREQ_LINKS $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char TIFFError (void); -+int -+main (void) -+{ -+return TIFFError (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_tiff_TIFFError=yes -+else case e in #( -+ e) ac_cv_lib_tiff_TIFFError=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFError" >&5 -+printf "%s\n" "$ac_cv_lib_tiff_TIFFError" >&6; } -+if test "x$ac_cv_lib_tiff_TIFFError" = xyes -+then : -+ TIFF_LINK=" -ltiff" -+fi -+ -+ -+fi -+ -+ -+else -+ LIBTIFF_CFLAGS=$pkg_cv_LIBTIFF_CFLAGS -+ LIBTIFF_LIBS=$pkg_cv_LIBTIFF_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ TIFF_LINK=$LIBTIFF_LIBS -+ CFLAGS="$LIBTIFF_CFLAGS $CFLAGS" -+ -+fi -+ -+ if test "x$TIFF_LINK" = "x" ; then -+ if test "$wxUSE_LIBTIFF" = "sys" ; then -+ as_fn_error $? "system tiff library not found! Use --with-libtiff=builtin to use built-in version" "$LINENO" 5 -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: system tiff library not found, will use built-in instead" >&5 -+printf "%s\n" "$as_me: WARNING: system tiff library not found, will use built-in instead" >&2;} -+ wxUSE_LIBTIFF=builtin -+ fi -+ else -+ wxUSE_LIBTIFF=sys -+ fi -+ fi -+ if test "$wxUSE_LIBTIFF" = "builtin" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether tiff.h file exists" >&5 -+printf %s "checking whether tiff.h file exists... " >&6; } -+ if ! test -f "$srcdir/src/tiff/libtiff/tiff.h" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ as_fn_error $? " -+ Configured to use built-in tiff library, but the required file -+ $srcdir/src/tiff/libtiff/tiff.h couldn't be found. -+ You might need to run: -+ -+ git submodule update --init src/tiff -+ -+ to fix this." "$LINENO" 5 -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ fi -+ -+ if test "$wxUSE_LIBLZMA" = "no"; then -+ tiff_lzma_option=--disable-lzma -+ else -+ tiff_lzma_option=--enable-lzma -+ fi -+ if test "$wxUSE_LIBJPEG" = "no"; then -+ tiff_jpeg_option=--disable-jpeg -+ else -+ tiff_jpeg_option=--enable-jpeg -+ fi -+ -+ -+ -+ # Various preliminary checks. -+ -+ -+ -+ -+ -+ ax_dir="src/tiff" -+ -+ # Do not complain, so a configure script can configure whichever parts of a -+ # large source tree are present. -+ if test -d "$srcdir/$ax_dir"; then -+ ac_builddir=. -+ -+case "$ax_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`printf "%s\n" "$ax_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ 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/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix -+ -+case $srcdir in -+ .) # We are building in place. -+ ac_srcdir=. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. -+ ac_srcdir=$srcdir$ac_dir_suffix; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -+esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -+ -+ # Remove --cache-file, --srcdir, and --disable-option-checking arguments -+ # so they do not pile up. -+ ax_args= -+ ax_prev= -+ eval "set x $ac_configure_args" -+ shift -+ for ax_arg; do -+ if test -n "$ax_prev"; then -+ ax_prev= -+ continue -+ fi -+ case $ax_arg in -+ -cache-file | --cache-file | --cache-fil | --cache-fi | --cache-f \ -+ | --cache- | --cache | --cach | --cac | --ca | --c) -+ ax_prev=cache_file ;; -+ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ -+ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \ -+ | --c=*) -+ ;; -+ --config-cache | -C) -+ ;; -+ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) -+ ax_prev=srcdir ;; -+ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) -+ ;; -+ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) -+ ax_prev=prefix ;; -+ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* \ -+ | --p=*) -+ ;; -+ --disable-option-checking) -+ ;; -+ *) case $ax_arg in -+ *\'*) ax_arg=$(printf "%s\n" "$ax_arg" | sed "s/'/'\\\\\\\\''/g");; -+ esac -+ as_fn_append ax_args " '$ax_arg'" ;; -+ esac -+ done -+ # Always prepend --disable-option-checking to silence warnings, since -+ # different subdirs can have different --enable and --with options. -+ ax_args="--disable-option-checking $ax_args" -+ # Options that must be added as they are provided. -+ as_fn_append ax_args " '--disable-jbig'" -+ as_fn_append ax_args " '--disable-libdeflate'" -+ as_fn_append ax_args " '--disable-webp'" -+ as_fn_append ax_args " '--disable-zstd'" -+ as_fn_append ax_args " '$tiff_lzma_option'" -+ as_fn_append ax_args " '$tiff_jpeg_option'" -+ -+ # New options that may need to be merged with existing options. -+ -+ # New options that must replace existing options. -+ -+ # Options that must be removed. -+ -+ as_fn_append ax_args " '--srcdir=$ac_srcdir'" -+ -+ # Add the subdirectory to the list of target subdirectories. -+ ax_subconfigures="$ax_subconfigures $ax_dir" -+ # Save the argument list for this subdirectory. -+ ax_var=$(printf "$ax_dir" | tr -c "0-9a-zA-Z_" "_") -+ eval "ax_sub_configure_args_$ax_var=\"$ax_args\"" -+ eval "ax_sub_configure_$ax_var=\"yes\"" -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: could not find source tree for $ax_dir" >&5 -+printf "%s\n" "$as_me: WARNING: could not find source tree for $ax_dir" >&2;} -+ fi -+ -+ -+ -+ -+ fi -+fi -+ -+ -+if test "$wxUSE_EXPAT" != "no"; then -+ if test "$wxUSE_EXPAT" = "sys" -o "$wxUSE_EXPAT" = "yes" ; then -+ ac_fn_c_check_header_compile "$LINENO" "expat.h" "ac_cv_header_expat_h" " -+" -+if test "x$ac_cv_header_expat_h" = xyes -+then : -+ found_expat_h=1 -+fi -+ -+ if test "x$found_expat_h" = "x1"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if expat.h is valid C++ header" >&5 -+printf %s "checking if expat.h is valid C++ header... " >&6; } -+if test ${wx_cv_expat_is_not_broken+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ ac_ext=cpp -+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 -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_expat_is_not_broken=yes -+else case e in #( -+ e) wx_cv_expat_is_not_broken=no -+ ;; -+esac -+fi -+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' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_expat_is_not_broken" >&5 -+printf "%s\n" "$wx_cv_expat_is_not_broken" >&6; } -+ if test "$wx_cv_expat_is_not_broken" = "yes" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate in -lexpat" >&5 -+printf %s "checking for XML_ParserCreate in -lexpat... " >&6; } -+if test ${ac_cv_lib_expat_XML_ParserCreate+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lexpat $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char XML_ParserCreate (void); -+int -+main (void) -+{ -+return XML_ParserCreate (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_expat_XML_ParserCreate=yes -+else case e in #( -+ e) ac_cv_lib_expat_XML_ParserCreate=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate" >&5 -+printf "%s\n" "$ac_cv_lib_expat_XML_ParserCreate" >&6; } -+if test "x$ac_cv_lib_expat_XML_ParserCreate" = xyes -+then : -+ EXPAT_LINK=" -lexpat" -+fi -+ -+ fi -+ fi -+ if test "x$EXPAT_LINK" = "x" ; then -+ if test "$wxUSE_EXPAT" = "sys" ; then -+ as_fn_error $? "system expat library not found! Use --with-expat=builtin to use built-in version" "$LINENO" 5 -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: system expat library not found, will use built-in instead" >&5 -+printf "%s\n" "$as_me: WARNING: system expat library not found, will use built-in instead" >&2;} -+ wxUSE_EXPAT=builtin -+ fi -+ else -+ wxUSE_EXPAT=sys -+ fi -+ fi -+ if test "$wxUSE_EXPAT" = "builtin" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether expat.h file exists" >&5 -+printf %s "checking whether expat.h file exists... " >&6; } -+ if ! test -f "$srcdir/src/expat/expat/lib/expat.h" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ as_fn_error $? " -+ Configured to use built-in expat library, but the required file -+ $srcdir/src/expat/expat/lib/expat.h couldn't be found. -+ You might need to run: -+ -+ git submodule update --init src/expat -+ -+ to fix this." "$LINENO" 5 -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ fi -+ -+ save_CC="$CC" -+ -+ CC="$save_CC" -+ -+ wxCFLAGS_C99=$ac_cv_prog_cc_c99 -+ -+ -+ subdirs="$subdirs src/expat/expat" -+ -+ fi -+ -+ wxUSE_XML=yes -+ printf "%s\n" "#define wxUSE_XML 1" >>confdefs.h -+ -+else -+ wxUSE_XML=no -+fi -+ -+ -+if test "$wxUSE_NANOSVG" = "yes"; then -+ printf "%s\n" "#define wxUSE_NANOSVG 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_XML" != "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: XML library not built, cannot build wxrc" >&5 -+printf "%s\n" "$as_me: WARNING: XML library not built, cannot build wxrc" >&2;} -+ USE_XML=0 -+else -+ USE_XML=1 -+fi -+ -+ -+ -+if test "$wxUSE_LIBMSPACK" != "no"; then -+ ac_fn_c_check_header_compile "$LINENO" "mspack.h" "ac_cv_header_mspack_h" " -+" -+if test "x$ac_cv_header_mspack_h" = xyes -+then : -+ found_mspack_h=1 -+fi -+ -+ if test "x$found_mspack_h" = "x1"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mspack_create_chm_decompressor in -lmspack" >&5 -+printf %s "checking for mspack_create_chm_decompressor in -lmspack... " >&6; } -+if test ${ac_cv_lib_mspack_mspack_create_chm_decompressor+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lmspack $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char mspack_create_chm_decompressor (void); -+int -+main (void) -+{ -+return mspack_create_chm_decompressor (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_mspack_mspack_create_chm_decompressor=yes -+else case e in #( -+ e) ac_cv_lib_mspack_mspack_create_chm_decompressor=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mspack_mspack_create_chm_decompressor" >&5 -+printf "%s\n" "$ac_cv_lib_mspack_mspack_create_chm_decompressor" >&6; } -+if test "x$ac_cv_lib_mspack_mspack_create_chm_decompressor" = xyes -+then : -+ MSPACK_LINK=" -lmspack" -+fi -+ -+ fi -+ if test "x$MSPACK_LINK" = "x" ; then -+ wxUSE_LIBMSPACK=no -+ fi -+fi -+ -+if test "$wxUSE_LIBMSPACK" != "no"; then -+ printf "%s\n" "#define wxUSE_LIBMSPACK 1" >>confdefs.h -+ -+fi -+ -+ -+if test "$wxUSE_WEBREQUEST" = "yes" -a "$wxUSE_LIBCURL" != "no"; then -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBCURL" >&5 -+printf %s "checking for LIBCURL... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$LIBCURL_CFLAGS"; then -+ pkg_cv_LIBCURL_CFLAGS="$LIBCURL_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_LIBCURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$LIBCURL_LIBS"; then -+ pkg_cv_LIBCURL_LIBS="$LIBCURL_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_LIBCURL_LIBS=`$PKG_CONFIG --libs "libcurl" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ LIBCURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libcurl"` -+ else -+ LIBCURL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcurl"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$LIBCURL_PKG_ERRORS" >&5 -+ -+ -+ wxUSE_LIBCURL=no -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -+printf "%s\n" "not found" >&6; } -+ -+ -+elif test $pkg_failed = untried; then -+ -+ wxUSE_LIBCURL=no -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -+printf "%s\n" "not found" >&6; } -+ -+ -+else -+ LIBCURL_CFLAGS=$pkg_cv_LIBCURL_CFLAGS -+ LIBCURL_LIBS=$pkg_cv_LIBCURL_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ wxUSE_LIBCURL=yes -+ CXXFLAGS="$LIBCURL_CFLAGS $CXXFLAGS" -+ LIBS="$LIBCURL_LIBS $LIBS" -+ -+fi -+fi -+ -+ -+TOOLKIT= -+TOOLKIT_INCLUDE= -+WIDGET_SET= -+ -+if test "$USE_WIN32" = 1 ; then -+ ac_fn_c_check_header_compile "$LINENO" "windows.h" "ac_cv_header_windows_h" " -+" -+if test "x$ac_cv_header_windows_h" = xyes -+then : -+ -+else case e in #( -+ e) -+ as_fn_error $? "please set CFLAGS to contain the location of windows.h" "$LINENO" 5 -+ ;; -+esac -+fi -+ -+ -+ LIBS="$LIBS -luxtheme -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lcomdlg32 -ladvapi32 -lversion -lws2_32 -lgdi32" -+ case "${host}" in -+ x86_64-*-mingw* ) -+ WINDRES_CPU_DEFINE="--define WX_CPU_AMD64" -+ ;; -+ esac -+ if test "$wxUSE_ACCESSIBILITY" = "yes" ; then -+ LIBS="$LIBS -loleacc" -+ fi -+ if test "$wxUSE_WINHTTP" = "yes" ; then -+ ac_fn_c_check_header_compile "$LINENO" "winhttp.h" "ac_cv_header_winhttp_h" "#include -+" -+if test "x$ac_cv_header_winhttp_h" = xyes -+then : -+ -+else case e in #( -+ e) wxUSE_WINHTTP=no ;; -+esac -+fi -+ -+ -+ if test "$wxUSE_WINHTTP" = "yes" ; then -+ LIBS="$LIBS -lwinhttp" -+ fi -+ fi -+ -+ case "${host}" in -+ *-*-cygwin* ) -+ LIBS="$LIBS -lkernel32 -luser32" -+ esac -+ -+ WXCONFIG_RESFLAGS="--define __WIN32__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE" -+fi -+ -+if test "$wxUSE_GUI" = "yes"; then -+ USE_GUI=1 -+ -+ GUI_TK_LIBRARY= -+ -+ WXGTK1= -+ WXGTK127= -+ WXGTK2= -+ WXGTK3= -+ WXGTK4= -+ WXGPE= -+ -+ if test "$wxUSE_MSW" = 1 ; then -+ TOOLKIT=MSW -+ GUIDIST=MSW_DIST -+ -+ case "${host}" in -+ *-*-mingw* ) -+ WXCONFIG_LDFLAGS_GUI="$LDFLAGS -Wl,--subsystem,windows -mwindows" -+ esac -+ fi -+ -+ if test "$wxUSE_GTK" = 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK+ version" >&5 -+printf %s "checking for GTK+ version... " >&6; } -+ -+ gtk_version_cached=1 -+ if test ${wx_cv_lib_gtk+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ gtk_version_cached=0 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 -+printf "%s\n" "" >&6; } -+ -+ GTK_MODULES= -+ if test "$wxUSE_THREADS" = "yes"; then -+ GTK_MODULES=gthread -+ fi -+ -+ if test -z "$wxGTK_VERSION"; then -+ wxGTK_VERSION=any -+ fi -+ -+ wx_cv_lib_gtk= -+ if test "x$wxGTK_VERSION" != "x1" -+ then -+ case "${host}" in -+ *-*-solaris2* ) -+ if test "$wxUSE_THREADS" = "yes" -a "$GCC" = yes; then -+ enable_gtktest=no -+ fi -+ esac -+ -+ if test "$wxGTK_VERSION" = 3 -o "$wxGTK_VERSION" = any; then -+ -+# Check whether --enable-gtktest was given. -+if test ${enable_gtktest+y} -+then : -+ enableval=$enable_gtktest; -+else case e in #( -+ e) enable_gtktest=yes ;; -+esac -+fi -+ -+ min_gtk_version=3.0.0 -+ -+ pkg_config_args="gtk+-3.0 >= $min_gtk_version" -+ for module in . $GTK_MODULES -+ do -+ case "$module" in -+ gthread) -+ pkg_config_args="$pkg_config_args gthread-2.0" -+ ;; -+ esac -+ done -+ -+ no_gtk="" -+ -+ -+ -+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 -+{ 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 case e in #( -+ e) case $PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ 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_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 -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac ;; -+esac -+fi -+PKG_CONFIG=$ac_cv_path_PKG_CONFIG -+if test -n "$PKG_CONFIG"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -+printf "%s\n" "$PKG_CONFIG" >&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_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 -+{ 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 case e in #( -+ e) 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. -+ ;; -+ *) -+ 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_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 -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac ;; -+esac -+fi -+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -+if test -n "$ac_pt_PKG_CONFIG"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -+printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } -+else -+ { 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 -+ PKG_CONFIG="" -+ 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 -+ PKG_CONFIG=$ac_pt_PKG_CONFIG -+ fi -+else -+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -+fi -+ -+fi -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=0.16 -+ { 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 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ PKG_CONFIG="" -+ fi -+ -+fi -+ -+ if test -z "$PKG_CONFIG"; then -+ no_gtk=yes -+ fi -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5 -+printf %s "checking for GTK+ - version >= $min_gtk_version... " >&6; } -+ -+ if test -n "$PKG_CONFIG"; then -+ ## don't try to run the test against uninstalled libtool libs -+ if $PKG_CONFIG --uninstalled $pkg_config_args; then -+ echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" -+ enable_gtktest=no -+ fi -+ -+ if $PKG_CONFIG $pkg_config_args; then -+ : -+ else -+ no_gtk=yes -+ fi -+ fi -+ -+ if test x"$no_gtk" = x ; then -+ GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` -+ GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` -+ gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-3.0 | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -+ gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-3.0 | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` -+ gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-3.0 | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` -+ if test "x$enable_gtktest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$GTK_LIBS $LIBS" -+ rm -f conf.gtktest -+ if test "$cross_compiling" = yes -+then : -+ echo $ac_n "cross compiling; assumed OK... $ac_c" -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+#include -+#include -+#include -+ -+int -+main () -+{ -+ unsigned int major, minor, micro; -+ -+ fclose (fopen ("conf.gtktest", "w")); -+ -+ if (sscanf("$min_gtk_version", "%u.%u.%u", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_gtk_version"); -+ exit(1); -+ } -+ -+ if ((gtk_major_version != $gtk_config_major_version) || -+ (gtk_minor_version != $gtk_config_minor_version) || -+ (gtk_micro_version != $gtk_config_micro_version)) -+ { -+ printf("\n*** 'pkg-config --modversion gtk+-3.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", -+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ printf ("*** was found! If pkg-config was correct, then it is best\n"); -+ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); -+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -+ printf("*** required on your system.\n"); -+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); -+ printf("*** to point to the correct configuration files\n"); -+ } -+ else if ((gtk_major_version != GTK_MAJOR_VERSION) || -+ (gtk_minor_version != GTK_MINOR_VERSION) || -+ (gtk_micro_version != GTK_MICRO_VERSION)) -+ { -+ printf("*** GTK+ header files (version %d.%d.%d) do not match\n", -+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); -+ printf("*** library (version %d.%d.%d)\n", -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ } -+ else -+ { -+ if ((gtk_major_version > major) || -+ ((gtk_major_version == major) && (gtk_minor_version > minor)) || -+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** An old version of GTK+ (%u.%u.%u) was found.\n", -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ printf("*** You need a version of GTK+ newer than %u.%u.%u. The latest version of\n", -+ major, minor, micro); -+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); -+ printf("***\n"); -+ printf("*** If you have already installed a sufficiently new version, this error\n"); -+ printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); -+ printf("*** correct copy of pkg-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ } -+ } -+ return 1; -+} -+ -+_ACEOF -+if ac_fn_c_try_run "$LINENO" -+then : -+ -+else case e in #( -+ e) no_gtk=yes ;; -+esac -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+ -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_gtk" = x ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5 -+printf "%s\n" "yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; } -+ wx_cv_lib_gtk=3 -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ if test -z "$PKG_CONFIG"; then -+ echo "*** A new enough version of pkg-config was not found." -+ echo "*** See http://pkgconfig.sourceforge.net" -+ else -+ if test -f conf.gtktest ; then -+ : -+ else -+ echo "*** Could not run GTK+ test program, checking why..." -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$LIBS $GTK_LIBS" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+#include -+#include -+ -+int -+main (void) -+{ -+ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding GTK+ or finding the wrong" -+ echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -+else case e in #( -+ e) echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed." ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ GTK_CFLAGS="" -+ GTK_LIBS="" -+ : -+ fi -+ -+ -+ rm -f conf.gtktest -+ -+ fi -+ if test -z "$wx_cv_lib_gtk"; then -+ if test "$wxGTK_VERSION" = 2 -o "$wxGTK_VERSION" = any; then -+ # Check whether --enable-gtktest was given. -+if test ${enable_gtktest+y} -+then : -+ enableval=$enable_gtktest; -+else case e in #( -+ e) enable_gtktest=yes ;; -+esac -+fi -+ -+ -+ pkg_config_args=gtk+-2.0 -+ for module in . $GTK_MODULES -+ do -+ case "$module" in -+ gthread) -+ pkg_config_args="$pkg_config_args gthread-2.0" -+ ;; -+ esac -+ done -+ -+ no_gtk="" -+ -+ -+ -+ -+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 -+{ 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 case e in #( -+ e) case $PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ 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_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 -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac ;; -+esac -+fi -+PKG_CONFIG=$ac_cv_path_PKG_CONFIG -+if test -n "$PKG_CONFIG"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -+printf "%s\n" "$PKG_CONFIG" >&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_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 -+{ 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 case e in #( -+ e) 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. -+ ;; -+ *) -+ 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_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 -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac ;; -+esac -+fi -+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -+if test -n "$ac_pt_PKG_CONFIG"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -+printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } -+else -+ { 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 -+ PKG_CONFIG="" -+ 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 -+ PKG_CONFIG=$ac_pt_PKG_CONFIG -+ fi -+else -+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -+fi -+ -+fi -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=0.7 -+ { 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 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ PKG_CONFIG="" -+ fi -+ -+fi -+ -+ min_gtk_version=2.6.0 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5 -+printf %s "checking for GTK+ - version >= $min_gtk_version... " >&6; } -+ -+ if test x$PKG_CONFIG != xno ; then -+ ## don't try to run the test against uninstalled libtool libs -+ if $PKG_CONFIG --uninstalled $pkg_config_args; then -+ echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" -+ enable_gtktest=no -+ fi -+ -+ if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then -+ : -+ else -+ no_gtk=yes -+ fi -+ fi -+ -+ if test x"$no_gtk" = x ; then -+ GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` -+ GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` -+ gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -+ gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` -+ gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` -+ if test "x$enable_gtktest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$GTK_LIBS $LIBS" -+ rm -f conf.gtktest -+ if test "$cross_compiling" = yes -+then : -+ echo $ac_n "cross compiling; assumed OK... $ac_c" -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+#include -+#include -+#include -+ -+int -+main () -+{ -+ int major, minor, micro; -+ char *tmp_version; -+ -+ fclose (fopen ("conf.gtktest", "w")); -+ -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = g_strdup("$min_gtk_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_gtk_version"); -+ g_free(tmp_version); -+ exit(1); -+ } -+ g_free(tmp_version); -+ -+ if ((gtk_major_version != $gtk_config_major_version) || -+ (gtk_minor_version != $gtk_config_minor_version) || -+ (gtk_micro_version != $gtk_config_micro_version)) -+ { -+ printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", -+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ printf ("*** was found! If pkg-config was correct, then it is best\n"); -+ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); -+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -+ printf("*** required on your system.\n"); -+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); -+ printf("*** to point to the correct configuration files\n"); -+ } -+ else if ((gtk_major_version != GTK_MAJOR_VERSION) || -+ (gtk_minor_version != GTK_MINOR_VERSION) || -+ (gtk_micro_version != GTK_MICRO_VERSION)) -+ { -+ printf("*** GTK+ header files (version %d.%d.%d) do not match\n", -+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); -+ printf("*** library (version %d.%d.%d)\n", -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ } -+ else -+ { -+ if ((gtk_major_version > major) || -+ ((gtk_major_version == major) && (gtk_minor_version > minor)) || -+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", -+ major, minor, micro); -+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); -+ printf("***\n"); -+ printf("*** If you have already installed a sufficiently new version, this error\n"); -+ printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); -+ printf("*** correct copy of pkg-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ } -+ } -+ return 1; -+} -+ -+_ACEOF -+if ac_fn_c_try_run "$LINENO" -+then : -+ -+else case e in #( -+ e) no_gtk=yes ;; -+esac -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+ -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_gtk" = x ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5 -+printf "%s\n" "yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; } -+ wx_cv_lib_gtk=2.0 -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** A new enough version of pkg-config was not found." -+ echo "*** See http://pkgconfig.sourceforge.net" -+ else -+ if test -f conf.gtktest ; then -+ : -+ else -+ echo "*** Could not run GTK+ test program, checking why..." -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$LIBS $GTK_LIBS" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+#include -+#include -+ -+int -+main (void) -+{ -+ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding GTK+ or finding the wrong" -+ echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -+else case e in #( -+ e) echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means GTK+ is incorrectly installed." ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ GTK_CFLAGS="" -+ GTK_LIBS="" -+ : -+ fi -+ -+ -+ rm -f conf.gtktest -+ -+ fi -+ fi -+ if test -z "$wx_cv_lib_gtk"; then -+ if test "$wxGTK_VERSION" = 4 -o "$wxGTK_VERSION" = any; then -+ -+# Check whether --enable-gtktest was given. -+if test ${enable_gtktest+y} -+then : -+ enableval=$enable_gtktest; -+else case e in #( -+ e) enable_gtktest=yes ;; -+esac -+fi -+ -+ min_gtk_version=3.90.0 -+ -+ pkg_config_args="gtk4 >= $min_gtk_version" -+ for module in . $GTK_MODULES -+ do -+ case "$module" in -+ gthread) -+ pkg_config_args="$pkg_config_args gthread-2.0" -+ ;; -+ esac -+ done -+ -+ no_gtk="" -+ -+ # Extract the first word of "pkg-config", so it can be a program name with args. -+set dummy pkg-config; 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_path_PKG_CONFIG+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) case $PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ 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_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 -+ done -+IFS=$as_save_IFS -+ -+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" -+ ;; -+esac ;; -+esac -+fi -+PKG_CONFIG=$ac_cv_path_PKG_CONFIG -+if test -n "$PKG_CONFIG"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -+printf "%s\n" "$PKG_CONFIG" >&6; } -+else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+fi -+ -+ -+ -+ if test x$PKG_CONFIG != xno ; then -+ if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then -+ : -+ else -+ echo "*** pkg-config too old; version 0.7 or better required." -+ no_gtk=yes -+ PKG_CONFIG=no -+ fi -+ else -+ no_gtk=yes -+ fi -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5 -+printf %s "checking for GTK+ - version >= $min_gtk_version... " >&6; } -+ -+ if test x$PKG_CONFIG != xno ; then -+ ## don't try to run the test against uninstalled libtool libs -+ if $PKG_CONFIG --uninstalled $pkg_config_args; then -+ echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" -+ enable_gtktest=no -+ fi -+ -+ if $PKG_CONFIG $pkg_config_args; then -+ : -+ else -+ no_gtk=yes -+ fi -+ fi -+ -+ if test x"$no_gtk" = x ; then -+ GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` -+ GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` -+ gtk_config_major_version=`$PKG_CONFIG --modversion gtk4 | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -+ gtk_config_minor_version=`$PKG_CONFIG --modversion gtk4 | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` -+ gtk_config_micro_version=`$PKG_CONFIG --modversion gtk4 | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` -+ if test "x$enable_gtktest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$GTK_LIBS $LIBS" -+ rm -f conf.gtktest -+ if test "$cross_compiling" = yes -+then : -+ echo $ac_n "cross compiling; assumed OK... $ac_c" -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+#include -+#include -+#include -+ -+int -+main () -+{ -+ unsigned int major, minor, micro; -+ -+ fclose (fopen ("conf.gtktest", "w")); -+ -+ if (sscanf("$min_gtk_version", "%u.%u.%u", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_gtk_version"); -+ exit(1); -+ } -+ -+ if ((gtk_get_major_version() != $gtk_config_major_version) || -+ (gtk_get_minor_version() != $gtk_config_minor_version) || -+ (gtk_get_micro_version() != $gtk_config_micro_version)) -+ { -+ printf("\n*** 'pkg-config --modversion gtk4' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", -+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, -+ gtk_get_major_version(), gtk_get_minor_version(), gtk_get_micro_version()); -+ printf ("*** was found! If pkg-config was correct, then it is best\n"); -+ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); -+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -+ printf("*** required on your system.\n"); -+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); -+ printf("*** to point to the correct configuration files\n"); -+ } -+ else if ((gtk_get_major_version() != GTK_MAJOR_VERSION) || -+ (gtk_get_minor_version() != GTK_MINOR_VERSION) || -+ (gtk_get_micro_version() != GTK_MICRO_VERSION)) -+ { -+ printf("*** GTK+ header files (version %d.%d.%d) do not match\n", -+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); -+ printf("*** library (version %d.%d.%d)\n", -+ gtk_get_major_version(), gtk_get_minor_version(), gtk_get_micro_version()); -+ } -+ else -+ { -+ if ((gtk_get_major_version() > major) || -+ ((gtk_get_major_version() == major) && (gtk_get_minor_version() > minor)) || -+ ((gtk_get_major_version() == major) && (gtk_get_minor_version() == minor) && (gtk_get_micro_version() >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** An old version of GTK+ (%u.%u.%u) was found.\n", -+ gtk_get_major_version(), gtk_get_minor_version(), gtk_get_micro_version()); -+ printf("*** You need a version of GTK+ newer than %u.%u.%u. The latest version of\n", -+ major, minor, micro); -+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); -+ printf("***\n"); -+ printf("*** If you have already installed a sufficiently new version, this error\n"); -+ printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); -+ printf("*** correct copy of pkg-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ } -+ } -+ return 1; -+} -+ -+_ACEOF -+if ac_fn_c_try_run "$LINENO" -+then : -+ -+else case e in #( -+ e) no_gtk=yes ;; -+esac -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+ -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_gtk" = x ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5 -+printf "%s\n" "yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; } -+ wx_cv_lib_gtk=4 -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** A new enough version of pkg-config was not found." -+ echo "*** See http://pkgconfig.sourceforge.net" -+ else -+ if test -f conf.gtktest ; then -+ : -+ else -+ echo "*** Could not run GTK+ test program, checking why..." -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$LIBS $GTK_LIBS" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+#include -+#include -+ -+int -+main (void) -+{ -+ return ((gtk_get_major_version()) || (gtk_get_minor_version()) || (gtk_get_micro_version())); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding GTK+ or finding the wrong" -+ echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -+else case e in #( -+ e) echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed." ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ GTK_CFLAGS="" -+ GTK_LIBS="" -+ : -+ fi -+ -+ -+ rm -f conf.gtktest -+ -+ fi -+ fi -+ fi -+ -+ if test -z "$wx_cv_lib_gtk"; then -+ if test "x$wxGTK_VERSION" = "x1" -o "x$wxGTK_VERSION" = "xany" ; then -+ -+# Check whether --with-gtk-prefix was given. -+if test ${with_gtk_prefix+y} -+then : -+ withval=$with_gtk_prefix; gtk_config_prefix="$withval" -+else case e in #( -+ e) gtk_config_prefix="" ;; -+esac -+fi -+ -+ -+# Check whether --with-gtk-exec-prefix was given. -+if test ${with_gtk_exec_prefix+y} -+then : -+ withval=$with_gtk_exec_prefix; gtk_config_exec_prefix="$withval" -+else case e in #( -+ e) gtk_config_exec_prefix="" ;; -+esac -+fi -+ -+# Check whether --enable-gtktest was given. -+if test ${enable_gtktest+y} -+then : -+ enableval=$enable_gtktest; -+else case e in #( -+ e) enable_gtktest=yes ;; -+esac -+fi -+ -+ -+ for module in . $GTK_MODULES -+ do -+ case "$module" in -+ gthread) -+ gtk_config_args="$gtk_config_args gthread" -+ ;; -+ esac -+ done -+ -+ if test x$gtk_config_exec_prefix != x ; then -+ gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" -+ if test x${GTK_CONFIG+set} != xset ; then -+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config -+ fi -+ fi -+ if test x$gtk_config_prefix != x ; then -+ gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" -+ if test x${GTK_CONFIG+set} != xset ; then -+ GTK_CONFIG=$gtk_config_prefix/bin/gtk-config -+ fi -+ fi -+ -+ # Extract the first word of "gtk-config", so it can be a program name with args. -+set dummy gtk-config; 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_path_GTK_CONFIG+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) case $GTK_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ 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_path_GTK_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 -+ done -+IFS=$as_save_IFS -+ -+ test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" -+ ;; -+esac ;; -+esac -+fi -+GTK_CONFIG=$ac_cv_path_GTK_CONFIG -+if test -n "$GTK_CONFIG"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GTK_CONFIG" >&5 -+printf "%s\n" "$GTK_CONFIG" >&6; } -+else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+fi -+ -+ -+ min_gtk_version=1.2.7 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5 -+printf %s "checking for GTK - version >= $min_gtk_version... " >&6; } -+ no_gtk="" -+ if test "$GTK_CONFIG" = "no" ; then -+ no_gtk=yes -+ else -+ GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` -+ GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` -+ gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -+ gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` -+ gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` -+ if test "x$enable_gtktest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$GTK_LIBS $LIBS" -+ rm -f conf.gtktest -+ if test "$cross_compiling" = yes -+then : -+ echo $ac_n "cross compiling; assumed OK... $ac_c" -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+#include -+#include -+#include -+ -+int -+main () -+{ -+ int major, minor, micro; -+ char *tmp_version; -+ -+ system ("touch conf.gtktest"); -+ -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = g_strdup("$min_gtk_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ g_free(tmp_version); -+ printf("%s, bad version string\n", "$min_gtk_version"); -+ exit(1); -+ } -+ g_free(tmp_version); -+ -+ if ((gtk_major_version != $gtk_config_major_version) || -+ (gtk_minor_version != $gtk_config_minor_version) || -+ (gtk_micro_version != $gtk_config_micro_version)) -+ { -+ printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", -+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ printf ("*** was found! If gtk-config was correct, then it is best\n"); -+ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); -+ printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n"); -+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -+ printf("*** required on your system.\n"); -+ printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); -+ printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); -+ printf("*** before re-running configure\n"); -+ } -+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) -+ else if ((gtk_major_version != GTK_MAJOR_VERSION) || -+ (gtk_minor_version != GTK_MINOR_VERSION) || -+ (gtk_micro_version != GTK_MICRO_VERSION)) -+ { -+ printf("*** GTK+ header files (version %d.%d.%d) do not match\n", -+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); -+ printf("*** library (version %d.%d.%d)\n", -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ } -+#endif /* defined (GTK_MAJOR_VERSION) ... */ -+ else -+ { -+ if ((gtk_major_version > major) || -+ ((gtk_major_version == major) && (gtk_minor_version > minor)) || -+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", -+ major, minor, micro); -+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); -+ printf("***\n"); -+ printf("*** If you have already installed a sufficiently new version, this error\n"); -+ printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); -+ printf("*** correct copy of gtk-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ } -+ } -+ return 1; -+} -+ -+_ACEOF -+if ac_fn_c_try_run "$LINENO" -+then : -+ -+else case e in #( -+ e) no_gtk=yes ;; -+esac -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+ -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_gtk" = x ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ wx_cv_lib_gtk=1.2.7 -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ if test "$GTK_CONFIG" = "no" ; then -+ echo "*** The gtk-config script installed by GTK could not be found" -+ echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the GTK_CONFIG environment variable to the" -+ echo "*** full path to gtk-config." -+ else -+ if test -f conf.gtktest ; then -+ : -+ else -+ echo "*** Could not run GTK test program, checking why..." -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$LIBS $GTK_LIBS" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+#include -+#include -+ -+int -+main (void) -+{ -+ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding GTK or finding the wrong" -+ echo "*** version of GTK. If it is not finding GTK, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -+ echo "***" -+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" -+ echo "*** came with the system with the command" -+ echo "***" -+ echo "*** rpm --erase --nodeps gtk gtk-devel" -+else case e in #( -+ e) echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occurred. This usually means GTK was incorrectly installed" -+ echo "*** or that you have moved GTK since it was installed. In the latter case, you" -+ echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ GTK_CFLAGS="" -+ GTK_LIBS="" -+ : -+ fi -+ -+ -+ rm -f conf.gtktest -+ -+ -+ if test -z "$wx_cv_lib_gtk"; then -+ -+# Check whether --with-gtk-prefix was given. -+if test ${with_gtk_prefix+y} -+then : -+ withval=$with_gtk_prefix; gtk_config_prefix="$withval" -+else case e in #( -+ e) gtk_config_prefix="" ;; -+esac -+fi -+ -+ -+# Check whether --with-gtk-exec-prefix was given. -+if test ${with_gtk_exec_prefix+y} -+then : -+ withval=$with_gtk_exec_prefix; gtk_config_exec_prefix="$withval" -+else case e in #( -+ e) gtk_config_exec_prefix="" ;; -+esac -+fi -+ -+# Check whether --enable-gtktest was given. -+if test ${enable_gtktest+y} -+then : -+ enableval=$enable_gtktest; -+else case e in #( -+ e) enable_gtktest=yes ;; -+esac -+fi -+ -+ -+ for module in . $GTK_MODULES -+ do -+ case "$module" in -+ gthread) -+ gtk_config_args="$gtk_config_args gthread" -+ ;; -+ esac -+ done -+ -+ if test x$gtk_config_exec_prefix != x ; then -+ gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" -+ if test x${GTK_CONFIG+set} != xset ; then -+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config -+ fi -+ fi -+ if test x$gtk_config_prefix != x ; then -+ gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" -+ if test x${GTK_CONFIG+set} != xset ; then -+ GTK_CONFIG=$gtk_config_prefix/bin/gtk-config -+ fi -+ fi -+ -+ # Extract the first word of "gtk-config", so it can be a program name with args. -+set dummy gtk-config; 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_path_GTK_CONFIG+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) case $GTK_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ 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_path_GTK_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 -+ done -+IFS=$as_save_IFS -+ -+ test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" -+ ;; -+esac ;; -+esac -+fi -+GTK_CONFIG=$ac_cv_path_GTK_CONFIG -+if test -n "$GTK_CONFIG"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GTK_CONFIG" >&5 -+printf "%s\n" "$GTK_CONFIG" >&6; } -+else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+fi -+ -+ -+ min_gtk_version=1.2.3 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5 -+printf %s "checking for GTK - version >= $min_gtk_version... " >&6; } -+ no_gtk="" -+ if test "$GTK_CONFIG" = "no" ; then -+ no_gtk=yes -+ else -+ GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` -+ GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` -+ gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -+ gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` -+ gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` -+ if test "x$enable_gtktest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$GTK_LIBS $LIBS" -+ rm -f conf.gtktest -+ if test "$cross_compiling" = yes -+then : -+ echo $ac_n "cross compiling; assumed OK... $ac_c" -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+#include -+#include -+#include -+ -+int -+main () -+{ -+ int major, minor, micro; -+ char *tmp_version; -+ -+ system ("touch conf.gtktest"); -+ -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = g_strdup("$min_gtk_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ g_free(tmp_version); -+ printf("%s, bad version string\n", "$min_gtk_version"); -+ exit(1); -+ } -+ g_free(tmp_version); -+ -+ if ((gtk_major_version != $gtk_config_major_version) || -+ (gtk_minor_version != $gtk_config_minor_version) || -+ (gtk_micro_version != $gtk_config_micro_version)) -+ { -+ printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", -+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ printf ("*** was found! If gtk-config was correct, then it is best\n"); -+ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); -+ printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n"); -+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -+ printf("*** required on your system.\n"); -+ printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); -+ printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); -+ printf("*** before re-running configure\n"); -+ } -+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) -+ else if ((gtk_major_version != GTK_MAJOR_VERSION) || -+ (gtk_minor_version != GTK_MINOR_VERSION) || -+ (gtk_micro_version != GTK_MICRO_VERSION)) -+ { -+ printf("*** GTK+ header files (version %d.%d.%d) do not match\n", -+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); -+ printf("*** library (version %d.%d.%d)\n", -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ } -+#endif /* defined (GTK_MAJOR_VERSION) ... */ -+ else -+ { -+ if ((gtk_major_version > major) || -+ ((gtk_major_version == major) && (gtk_minor_version > minor)) || -+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", -+ major, minor, micro); -+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); -+ printf("***\n"); -+ printf("*** If you have already installed a sufficiently new version, this error\n"); -+ printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); -+ printf("*** correct copy of gtk-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ } -+ } -+ return 1; -+} -+ -+_ACEOF -+if ac_fn_c_try_run "$LINENO" -+then : -+ -+else case e in #( -+ e) no_gtk=yes ;; -+esac -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+ -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_gtk" = x ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ wx_cv_lib_gtk=1.2.3 -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ if test "$GTK_CONFIG" = "no" ; then -+ echo "*** The gtk-config script installed by GTK could not be found" -+ echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the GTK_CONFIG environment variable to the" -+ echo "*** full path to gtk-config." -+ else -+ if test -f conf.gtktest ; then -+ : -+ else -+ echo "*** Could not run GTK test program, checking why..." -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$LIBS $GTK_LIBS" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+#include -+#include -+ -+int -+main (void) -+{ -+ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding GTK or finding the wrong" -+ echo "*** version of GTK. If it is not finding GTK, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -+ echo "***" -+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" -+ echo "*** came with the system with the command" -+ echo "***" -+ echo "*** rpm --erase --nodeps gtk gtk-devel" -+else case e in #( -+ e) echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occurred. This usually means GTK was incorrectly installed" -+ echo "*** or that you have moved GTK since it was installed. In the latter case, you" -+ echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ GTK_CFLAGS="" -+ GTK_LIBS="" -+ : -+ fi -+ -+ -+ rm -f conf.gtktest -+ -+ fi -+ fi -+ fi -+ -+ if test -z "$wx_cv_lib_gtk"; then -+ wx_cv_lib_gtk=none -+ else -+ if test "$USE_WIN32" != 1 ; then -+ GTK_LIBS="$GTK_LIBS -lX11" -+ fi -+ -+ wx_cv_cflags_gtk=$GTK_CFLAGS -+ wx_cv_libs_gtk=$GTK_LIBS -+ fi -+ -+ ;; -+esac -+fi -+ -+ -+ if test "$gtk_version_cached" = 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_gtk" >&5 -+printf "%s\n" "$wx_cv_lib_gtk" >&6; } -+ fi -+ -+ case "$wx_cv_lib_gtk" in -+ 4) WXGTK4=1 -+ WXGTK3=1 -+ TOOLKIT_VERSION=4 -+ ;; -+ 3) WXGTK3=1 -+ TOOLKIT_VERSION=3 -+ ;; -+ 2.0) WXGTK2=1 -+ TOOLKIT_VERSION=2 -+ ;; -+ 1.2.7) WXGTK127=1 -+ WXGTK1=1 -+ ;; -+ 1.2*) WXGTK1=1 ;; -+ *) as_fn_error $? " -+The development files for GTK+ were not found. For GTK+ 2, please -+ensure that pkg-config is in the path and that gtk+-2.0.pc is -+installed. For GTK+ 1.2 please check that gtk-config is in the path, -+and that the version is 1.2.3 or above. Also check that the -+libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config -+--libs' are in the LD_LIBRARY_PATH or equivalent. -+ " "$LINENO" 5 -+ ;; -+ esac -+ -+ if test "$WXGTK3" = 1; then -+ printf "%s\n" "#define __WXGTK220__ 1" >>confdefs.h -+ -+ printf "%s\n" "#define __WXGTK218__ 1" >>confdefs.h -+ -+ printf "%s\n" "#define __WXGTK210__ 1" >>confdefs.h -+ -+ elif test "$WXGTK2" = 1; then -+ save_CFLAGS="$CFLAGS" -+ save_LIBS="$LIBS" -+ CFLAGS="$wx_cv_cflags_gtk $CFLAGS" -+ LIBS="$LIBS $wx_cv_libs_gtk" -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if GTK+ is version >= 2.20" >&5 -+printf %s "checking if GTK+ is version >= 2.20... " >&6; } -+if test ${wx_cv_gtk220+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ -+int -+main (void) -+{ -+ -+ #if !GTK_CHECK_VERSION(2,20,0) -+ Not GTK+ 2.20 -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ wx_cv_gtk220=yes -+else case e in #( -+ e) wx_cv_gtk220=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_gtk220" >&5 -+printf "%s\n" "$wx_cv_gtk220" >&6; } -+ -+ if test "$wx_cv_gtk220" = "yes"; then -+ printf "%s\n" "#define __WXGTK220__ 1" >>confdefs.h -+ -+ wx_cv_gtk218=yes -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if GTK+ is version >= 2.18" >&5 -+printf %s "checking if GTK+ is version >= 2.18... " >&6; } -+if test ${wx_cv_gtk218+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ -+int -+main (void) -+{ -+ -+ #if !GTK_CHECK_VERSION(2,18,0) -+ Not GTK+ 2.18 -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ wx_cv_gtk218=yes -+else case e in #( -+ e) wx_cv_gtk218=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_gtk218" >&5 -+printf "%s\n" "$wx_cv_gtk218" >&6; } -+ fi -+ -+ if test "$wx_cv_gtk218" = "yes"; then -+ printf "%s\n" "#define __WXGTK218__ 1" >>confdefs.h -+ -+ wx_cv_gtk210=yes -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if GTK+ is version >= 2.10" >&5 -+printf %s "checking if GTK+ is version >= 2.10... " >&6; } -+if test ${wx_cv_gtk210+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ -+int -+main (void) -+{ -+ -+ #if !GTK_CHECK_VERSION(2,10,0) -+ Not GTK+ 2.10 -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ wx_cv_gtk210=yes -+else case e in #( -+ e) wx_cv_gtk210=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_gtk210" >&5 -+printf "%s\n" "$wx_cv_gtk210" >&6; } -+ fi -+ -+ if test "$wx_cv_gtk210" = "yes"; then -+ printf "%s\n" "#define __WXGTK210__ 1" >>confdefs.h -+ -+ fi -+ -+ CFLAGS="$save_CFLAGS" -+ LIBS="$save_LIBS" -+ else -+ if test "$wxUSE_UNICODE" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Unicode configuration not supported with GTK+ 1.x" >&5 -+printf "%s\n" "$as_me: WARNING: Unicode configuration not supported with GTK+ 1.x" >&2;} -+ wxUSE_UNICODE=no -+ fi -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdk_im_open in -lgdk" >&5 -+printf %s "checking for gdk_im_open in -lgdk... " >&6; } -+if test ${ac_cv_lib_gdk_gdk_im_open+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lgdk $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char gdk_im_open (void); -+int -+main (void) -+{ -+return gdk_im_open (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_gdk_gdk_im_open=yes -+else case e in #( -+ e) ac_cv_lib_gdk_gdk_im_open=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdk_gdk_im_open" >&5 -+printf "%s\n" "$ac_cv_lib_gdk_gdk_im_open" >&6; } -+if test "x$ac_cv_lib_gdk_gdk_im_open" = xyes -+then : -+ printf "%s\n" "#define HAVE_XIM 1" >>confdefs.h -+ -+fi -+ -+ -+ if test "$USE_DARWIN" != 1; then -+ ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll" -+if test "x$ac_cv_func_poll" = xyes -+then : -+ printf "%s\n" "#define HAVE_POLL 1" >>confdefs.h -+ -+fi -+ -+ fi -+ fi -+ -+ TOOLKIT_INCLUDE="$wx_cv_cflags_gtk" -+ GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY" -+ TOOLKIT=GTK -+ GUIDIST=GTK_DIST -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GDK Wayland backend" >&5 -+printf %s "checking for GDK Wayland backend... " >&6; } -+if test ${wx_cv_gdk_wayland+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ save_CFLAGS=$CFLAGS -+ CFLAGS="$CFLAGS $TOOLKIT_INCLUDE" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ -+int -+main (void) -+{ -+ -+ #ifndef GDK_WINDOWING_WAYLAND -+ Not GDK Windowing Wayland -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ wx_cv_gdk_wayland=yes -+else case e in #( -+ e) wx_cv_gdk_wayland=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ CFLAGS=$save_CFLAGS -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_gdk_wayland" >&5 -+printf "%s\n" "$wx_cv_gdk_wayland" >&6; } -+ -+ if test "$wxUSE_GPE" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gpewidget library" >&5 -+printf %s "checking for gpewidget library... " >&6; } -+ -+ ac_find_libraries= -+ for ac_dir in $SEARCH_LIB -+ do -+ for ac_extension in a so sl dylib dll.a; do -+ if test -f "$ac_dir/libgpewidget.$ac_extension"; then -+ ac_find_libraries=$ac_dir -+ break 2 -+ fi -+ done -+ done -+ -+ if test "$ac_find_libraries" != "" ; then -+ -+ if test "$ac_find_libraries" = "default location"; then -+ ac_path_to_link="" -+ else -+ echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null -+ result=$? -+ if test $result = 0; then -+ ac_path_to_link="" -+ else -+ ac_path_to_link=" -L$ac_find_libraries" -+ fi -+ fi -+ -+ GUI_TK_LIBRARY="-L${prefix}/lib -lgpewidget $GUI_TK_LIBRARY" -+ WXGPE=1 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found in $ac_find_libraries" >&5 -+printf "%s\n" "found in $ac_find_libraries" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -+printf "%s\n" "not found" >&6; } -+ fi -+ -+ fi -+ fi -+ -+ if test "$wxUSE_DFB" = 1; then -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DIRECTFB" >&5 -+printf %s "checking for DIRECTFB... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$DIRECTFB_CFLAGS"; then -+ pkg_cv_DIRECTFB_CFLAGS="$DIRECTFB_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= 0.9.23\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "directfb >= 0.9.23") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags "directfb >= 0.9.23" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$DIRECTFB_LIBS"; then -+ pkg_cv_DIRECTFB_LIBS="$DIRECTFB_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= 0.9.23\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "directfb >= 0.9.23") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_DIRECTFB_LIBS=`$PKG_CONFIG --libs "directfb >= 0.9.23" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "directfb >= 0.9.23"` -+ else -+ DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "directfb >= 0.9.23"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$DIRECTFB_PKG_ERRORS" >&5 -+ -+ -+ as_fn_error $? "DirectFB not found." "$LINENO" 5 -+ -+ -+elif test $pkg_failed = untried; then -+ -+ as_fn_error $? "DirectFB not found." "$LINENO" 5 -+ -+ -+else -+ DIRECTFB_CFLAGS=$pkg_cv_DIRECTFB_CFLAGS -+ DIRECTFB_LIBS=$pkg_cv_DIRECTFB_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ wxUSE_UNIVERSAL="yes" -+ TOOLKIT_INCLUDE="$DIRECTFB_CFLAGS" -+ GUI_TK_LIBRARY="$DIRECTFB_LIBS" -+ TOOLKIT=DFB -+ GUIDIST=DFB_DIST -+ -+fi -+ fi -+ -+ if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then -+ 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 -+{ 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; } -+# On Suns, sometimes $CPP names a directory. -+if test -n "$CPP" && test -d "$CPP"; then -+ CPP= -+fi -+if test -z "$CPP"; then -+ if test ${ac_cv_prog_CPP+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) # Double quotes because $CC needs to be expanded -+ for CPP in "$CC -E" "$CC -E -traditional-cpp" 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. -+ # 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. */ -+#include -+ Syntax error -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO" -+then : -+ -+else case e in #( -+ e) # Broken: fails on valid input. -+continue ;; -+esac -+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 case e in #( -+ e) # Passes both tests. -+ac_preproc_ok=: -+break ;; -+esac -+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 -+ ;; -+esac -+fi -+ CPP=$ac_cv_prog_CPP -+else -+ ac_cv_prog_CPP=$CPP -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -+printf "%s\n" "$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. -+ # 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. */ -+#include -+ Syntax error -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO" -+then : -+ -+else case e in #( -+ e) # Broken: fails on valid input. -+continue ;; -+esac -+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 case e in #( -+ e) # Passes both tests. -+ac_preproc_ok=: -+break ;; -+esac -+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 case e in #( -+ e) { { 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 \"$CPP\" fails sanity check -+See 'config.log' for more details" "$LINENO" 5; } ;; -+esac -+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 -+ -+ -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X" >&5 -+printf %s "checking for X... " >&6; } -+ -+ -+# Check whether --with-x was given. -+if test ${with_x+y} -+then : -+ withval=$with_x; -+fi -+ -+# $have_x is 'yes', 'no', 'disabled', or empty when we do not yet know. -+if test "x$with_x" = xno; then -+ # The user explicitly disabled X. -+ have_x=disabled -+else -+ case $x_includes,$x_libraries in #( -+ *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( -+ *,NONE | NONE,*) if test ${ac_cv_have_x+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) # One or both of the vars are not set, and there is no cached value. -+ac_x_includes=no -+ac_x_libraries=no -+# Do we need to do anything special at all? -+ac_save_LIBS=$LIBS -+LIBS="-lX11 $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+XrmInitialize () -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ # We can compile and link X programs with no special options. -+ ac_x_includes= -+ ac_x_libraries= -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS="$ac_save_LIBS" -+# If that didn't work, only try xmkmf and file system searches -+# for native compilation. -+if test x"$ac_x_includes" = xno && test "$cross_compiling" = no -+then : -+ rm -f -r conftest.dir -+if mkdir conftest.dir; then -+ cd conftest.dir -+ cat >Imakefile <<'_ACEOF' -+incroot: -+ @echo incroot='${INCROOT}' -+usrlibdir: -+ @echo usrlibdir='${USRLIBDIR}' -+libdir: -+ @echo libdir='${LIBDIR}' -+_ACEOF -+ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then -+ # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. -+ for ac_var in incroot usrlibdir libdir; do -+ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" -+ done -+ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. -+ for ac_extension in a so sl dylib la dll; do -+ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && -+ test -f "$ac_im_libdir/libX11.$ac_extension"; then -+ ac_im_usrlibdir=$ac_im_libdir; break -+ fi -+ done -+ # Screen out bogus values from the imake configuration. They are -+ # bogus both because they are the default anyway, and because -+ # using them would break gcc on systems where it needs fixed includes. -+ case $ac_im_incroot in -+ /usr/include) ac_x_includes= ;; -+ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; -+ esac -+ case $ac_im_usrlibdir in -+ /usr/lib | /usr/lib64 | /lib | /lib64) ;; -+ *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; -+ esac -+ fi -+ cd .. -+ rm -f -r conftest.dir -+fi -+ -+ # Standard set of common directories for X headers. -+# Check X11 before X11Rn because it is often a symlink to the current release. -+ac_x_header_dirs=' -+/usr/X11/include -+/usr/X11R7/include -+/usr/X11R6/include -+/usr/X11R5/include -+/usr/X11R4/include -+ -+/usr/include/X11 -+/usr/include/X11R7 -+/usr/include/X11R6 -+/usr/include/X11R5 -+/usr/include/X11R4 -+ -+/usr/local/X11/include -+/usr/local/X11R7/include -+/usr/local/X11R6/include -+/usr/local/X11R5/include -+/usr/local/X11R4/include -+ -+/usr/local/include/X11 -+/usr/local/include/X11R7 -+/usr/local/include/X11R6 -+/usr/local/include/X11R5 -+/usr/local/include/X11R4 -+ -+/opt/X11/include -+ -+/usr/X386/include -+/usr/x386/include -+/usr/XFree86/include/X11 -+ -+/usr/include -+/usr/local/include -+/usr/unsupported/include -+/usr/athena/include -+/usr/local/x11r5/include -+/usr/lpp/Xamples/include -+ -+/usr/openwin/include -+/usr/openwin/share/include' -+ -+if test "$ac_x_includes" = no; then -+ # Guess where to find include files, by looking for Xlib.h. -+ # First, try using that file with no special directory specified. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO" -+then : -+ # We can compile using X headers with no special include directory. -+ac_x_includes= -+else case e in #( -+ e) for ac_dir in $ac_x_header_dirs; do -+ if test -r "$ac_dir/X11/Xlib.h"; then -+ ac_x_includes=$ac_dir -+ break -+ fi -+done ;; -+esac -+fi -+rm -f conftest.err conftest.i conftest.$ac_ext -+fi # $ac_x_includes = no -+ -+if test "$ac_x_libraries" = no; then -+ # Check for the libraries. -+ # See if we find them without any special options. -+ # Don't add to $LIBS permanently. -+ ac_save_LIBS=$LIBS -+ LIBS="-lX11 $LIBS" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+XrmInitialize () -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ LIBS=$ac_save_LIBS -+# We can link X programs with no special library path. -+ac_x_libraries= -+else case e in #( -+ e) LIBS=$ac_save_LIBS -+for ac_dir in `printf "%s\n" "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -+do -+ # Don't even attempt the hair of trying to link an X program! -+ for ac_extension in a so sl dylib la dll; do -+ if test -r "$ac_dir/libX11.$ac_extension"; then -+ ac_x_libraries=$ac_dir -+ break 2 -+ fi -+ done -+done ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+fi # $ac_x_libraries = no -+ -+fi -+# Record the results. -+case $ac_x_includes,$ac_x_libraries in #( -+ no,* | *,no | *\'*) : -+ # Didn't find X, or a directory has "'" in its name. -+ ac_cv_have_x="have_x=no" ;; #( -+ *) : -+ # Record where we found X for the cache. -+ ac_cv_have_x="have_x=yes\ -+ ac_x_includes='$ac_x_includes'\ -+ ac_x_libraries='$ac_x_libraries'" ;; -+esac ;; -+esac -+fi -+;; #( -+ *) have_x=yes;; -+ esac -+ eval "$ac_cv_have_x" -+fi # $with_x != no -+ -+if test "$have_x" != yes; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 -+printf "%s\n" "$have_x" >&6; } -+ no_x=yes -+else -+ # If each of the values was on the command line, it overrides each guess. -+ test "x$x_includes" = xNONE && x_includes=$ac_x_includes -+ test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries -+ # Update the cache value to reflect the command line values. -+ ac_cv_have_x="have_x=yes\ -+ ac_x_includes='$x_includes'\ -+ ac_x_libraries='$x_libraries'" -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 -+printf "%s\n" "libraries $x_libraries, headers $x_includes" >&6; } -+fi -+ -+if test "$no_x" = yes; then -+ # Not all programs may use this symbol, but it does not hurt to define it. -+ -+printf "%s\n" "#define X_DISPLAY_MISSING 1" >>confdefs.h -+ -+ X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= -+else -+ if test -n "$x_includes"; then -+ X_CFLAGS="$X_CFLAGS -I$x_includes" -+ fi -+ -+ # It would also be nice to do this for all -L options, not just this one. -+ if test -n "$x_libraries"; then -+ X_LIBS="$X_LIBS -L$x_libraries" -+ # For Solaris; some versions of Sun CC require a space after -R and -+ # others require no space. Words are not sufficient . . . . -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 -+printf %s "checking whether -R must be followed by a space... " >&6; } -+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" -+ ac_xsave_c_werror_flag=$ac_c_werror_flag -+ ac_c_werror_flag=yes -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ X_LIBS="$X_LIBS -R$x_libraries" -+else case e in #( -+ e) LIBS="$ac_xsave_LIBS -R $x_libraries" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ X_LIBS="$X_LIBS -R $x_libraries" -+else case e in #( -+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 -+printf "%s\n" "neither works" >&6; } ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ ac_c_werror_flag=$ac_xsave_c_werror_flag -+ LIBS=$ac_xsave_LIBS -+ fi -+ -+ # Check for system-dependent libraries X programs must link with. -+ # Do this before checking for the system-independent R6 libraries -+ # (-lICE), since we may need -lsocket or whatever for X linking. -+ -+ if test "$ISC" = yes; then -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" -+ else -+ # Martyn Johnson says this is needed for Ultrix, if the X -+ # libraries were built with DECnet support. And Karl Berry says -+ # the Alpha needs dnet_stub (dnet does not exist). -+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char XOpenDisplay (void); -+int -+main (void) -+{ -+return XOpenDisplay (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ -+else case e in #( -+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 -+printf %s "checking for dnet_ntoa in -ldnet... " >&6; } -+if test ${ac_cv_lib_dnet_dnet_ntoa+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldnet $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dnet_ntoa (void); -+int -+main (void) -+{ -+return dnet_ntoa (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_dnet_dnet_ntoa=yes -+else case e in #( -+ e) ac_cv_lib_dnet_dnet_ntoa=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -+printf "%s\n" "$ac_cv_lib_dnet_dnet_ntoa" >&6; } -+if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes -+then : -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -+fi -+ -+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 -+printf %s "checking for dnet_ntoa in -ldnet_stub... " >&6; } -+if test ${ac_cv_lib_dnet_stub_dnet_ntoa+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldnet_stub $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dnet_ntoa (void); -+int -+main (void) -+{ -+return dnet_ntoa (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_dnet_stub_dnet_ntoa=yes -+else case e in #( -+ e) ac_cv_lib_dnet_stub_dnet_ntoa=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -+printf "%s\n" "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } -+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes -+then : -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" -+fi -+ -+ fi ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ LIBS="$ac_xsave_LIBS" -+ -+ # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, -+ # to get the SysV transport functions. -+ # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) -+ # needs -lnsl. -+ # The nsl library prevents programs from opening the X display -+ # on Irix 5.2, according to T.E. Dickey. -+ # The functions gethostbyname, getservbyname, and inet_addr are -+ # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. -+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" -+if test "x$ac_cv_func_gethostbyname" = xyes -+then : -+ -+fi -+ -+ if test $ac_cv_func_gethostbyname = no; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 -+printf %s "checking for gethostbyname in -lnsl... " >&6; } -+if test ${ac_cv_lib_nsl_gethostbyname+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lnsl $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char gethostbyname (void); -+int -+main (void) -+{ -+return gethostbyname (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_nsl_gethostbyname=yes -+else case e in #( -+ e) ac_cv_lib_nsl_gethostbyname=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 -+printf "%s\n" "$ac_cv_lib_nsl_gethostbyname" >&6; } -+if test "x$ac_cv_lib_nsl_gethostbyname" = xyes -+then : -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" -+fi -+ -+ if test $ac_cv_lib_nsl_gethostbyname = no; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 -+printf %s "checking for gethostbyname in -lbsd... " >&6; } -+if test ${ac_cv_lib_bsd_gethostbyname+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lbsd $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char gethostbyname (void); -+int -+main (void) -+{ -+return gethostbyname (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_bsd_gethostbyname=yes -+else case e in #( -+ e) ac_cv_lib_bsd_gethostbyname=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 -+printf "%s\n" "$ac_cv_lib_bsd_gethostbyname" >&6; } -+if test "x$ac_cv_lib_bsd_gethostbyname" = xyes -+then : -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" -+fi -+ -+ fi -+ fi -+ -+ # lieder@skyler.mavd.honeywell.com says without -lsocket, -+ # socket/setsockopt and other routines are undefined under SCO ODT -+ # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary -+ # on later versions), says Simon Leinen: it contains gethostby* -+ # variants that don't use the name server (or something). -lsocket -+ # must be given before -lnsl if both are needed. We assume that -+ # if connect needs -lnsl, so does gethostbyname. -+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" -+if test "x$ac_cv_func_connect" = xyes -+then : -+ -+fi -+ -+ if test $ac_cv_func_connect = no; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 -+printf %s "checking for connect in -lsocket... " >&6; } -+if test ${ac_cv_lib_socket_connect+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char connect (void); -+int -+main (void) -+{ -+return connect (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_socket_connect=yes -+else case e in #( -+ e) ac_cv_lib_socket_connect=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 -+printf "%s\n" "$ac_cv_lib_socket_connect" >&6; } -+if test "x$ac_cv_lib_socket_connect" = xyes -+then : -+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -+fi -+ -+ fi -+ -+ # Guillermo Gomez says -lposix is necessary on A/UX. -+ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" -+if test "x$ac_cv_func_remove" = xyes -+then : -+ -+fi -+ -+ if test $ac_cv_func_remove = no; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 -+printf %s "checking for remove in -lposix... " >&6; } -+if test ${ac_cv_lib_posix_remove+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lposix $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char remove (void); -+int -+main (void) -+{ -+return remove (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_posix_remove=yes -+else case e in #( -+ e) ac_cv_lib_posix_remove=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 -+printf "%s\n" "$ac_cv_lib_posix_remove" >&6; } -+if test "x$ac_cv_lib_posix_remove" = xyes -+then : -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" -+fi -+ -+ fi -+ -+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. -+ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" -+if test "x$ac_cv_func_shmat" = xyes -+then : -+ -+fi -+ -+ if test $ac_cv_func_shmat = no; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 -+printf %s "checking for shmat in -lipc... " >&6; } -+if test ${ac_cv_lib_ipc_shmat+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lipc $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char shmat (void); -+int -+main (void) -+{ -+return shmat (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_ipc_shmat=yes -+else case e in #( -+ e) ac_cv_lib_ipc_shmat=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 -+printf "%s\n" "$ac_cv_lib_ipc_shmat" >&6; } -+if test "x$ac_cv_lib_ipc_shmat" = xyes -+then : -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" -+fi -+ -+ fi -+ fi -+ -+ # Check for libraries that X11R6 Xt/Xaw programs need. -+ ac_save_LDFLAGS=$LDFLAGS -+ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" -+ # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to -+ # check for ICE first), but we must link in the order -lSM -lICE or -+ # we get undefined symbols. So assume we have SM if we have ICE. -+ # These have to be linked with before -lX11, unlike the other -+ # libraries we check for below, so use a different variable. -+ # John Interrante, Karl Berry -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 -+printf %s "checking for IceConnectionNumber in -lICE... " >&6; } -+if test ${ac_cv_lib_ICE_IceConnectionNumber+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lICE $X_EXTRA_LIBS $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char IceConnectionNumber (void); -+int -+main (void) -+{ -+return IceConnectionNumber (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_ICE_IceConnectionNumber=yes -+else case e in #( -+ e) ac_cv_lib_ICE_IceConnectionNumber=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -+printf "%s\n" "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes -+then : -+ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -+fi -+ -+ LDFLAGS=$ac_save_LDFLAGS -+ -+fi -+ -+ -+ if test "$no_x" = "yes"; then -+ as_fn_error $? "X11 not found, please use --x-includes and/or --x-libraries options (see config.log for details)" "$LINENO" 5 -+ fi -+ -+ GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//' | sed 's/ -RNONE//'` -+ TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'` -+ COMPILED_X_PROGRAM=0 -+ -+ fi -+ -+ if test "$wxUSE_X11" = 1; then -+ if test "$wxUSE_NANOX" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MicroWindows/NanoX distribution" >&5 -+printf %s "checking for MicroWindows/NanoX distribution... " >&6; } -+ if test "x$MICROWIN" = x ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -+printf "%s\n" "not found" >&6; } -+ as_fn_error $? "Cannot find MicroWindows library. Make sure MICROWIN is set." "$LINENO" 5 -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MICROWIN" >&5 -+printf "%s\n" "$MICROWIN" >&6; } -+ printf "%s\n" "#define wxUSE_NANOX 1" >>confdefs.h -+ -+ fi -+ fi -+ -+ if test "$wxUSE_UNICODE" = "yes"; then -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PANGOXFT" >&5 -+printf %s "checking for PANGOXFT... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$PANGOXFT_CFLAGS"; then -+ pkg_cv_PANGOXFT_CFLAGS="$PANGOXFT_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangoxft\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "pangoxft") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_PANGOXFT_CFLAGS=`$PKG_CONFIG --cflags "pangoxft" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$PANGOXFT_LIBS"; then -+ pkg_cv_PANGOXFT_LIBS="$PANGOXFT_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangoxft\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "pangoxft") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_PANGOXFT_LIBS=`$PKG_CONFIG --libs "pangoxft" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ PANGOXFT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pangoxft"` -+ else -+ PANGOXFT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoxft"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$PANGOXFT_PKG_ERRORS" >&5 -+ -+ -+ as_fn_error $? "pangoxft library not found, library cannot be compiled in Unicode mode" "$LINENO" 5 -+ -+ -+elif test $pkg_failed = untried; then -+ -+ as_fn_error $? "pangoxft library not found, library cannot be compiled in Unicode mode" "$LINENO" 5 -+ -+ -+else -+ PANGOXFT_CFLAGS=$pkg_cv_PANGOXFT_CFLAGS -+ PANGOXFT_LIBS=$pkg_cv_PANGOXFT_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ printf "%s\n" "#define HAVE_PANGO_XFT 1" >>confdefs.h -+ -+ CFLAGS="$PANGOXFT_CFLAGS $CFLAGS" -+ CXXFLAGS="$PANGOXFT_CFLAGS $CXXFLAGS" -+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS" -+ -+fi -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PANGOFT2" >&5 -+printf %s "checking for PANGOFT2... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$PANGOFT2_CFLAGS"; then -+ pkg_cv_PANGOFT2_CFLAGS="$PANGOFT2_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangoft2\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "pangoft2") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$PANGOFT2_LIBS"; then -+ pkg_cv_PANGOFT2_LIBS="$PANGOFT2_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangoft2\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "pangoft2") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pangoft2"` -+ else -+ PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoft2"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$PANGOFT2_PKG_ERRORS" >&5 -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: pangoft2 library not found, library will be compiled without printing support" >&5 -+printf "%s\n" "$as_me: WARNING: pangoft2 library not found, library will be compiled without printing support" >&2;} -+ wxUSE_PRINTING_ARCHITECTURE="no" -+ -+ -+elif test $pkg_failed = untried; then -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: pangoft2 library not found, library will be compiled without printing support" >&5 -+printf "%s\n" "$as_me: WARNING: pangoft2 library not found, library will be compiled without printing support" >&2;} -+ wxUSE_PRINTING_ARCHITECTURE="no" -+ -+ -+else -+ PANGOFT2_CFLAGS=$pkg_cv_PANGOFT2_CFLAGS -+ PANGOFT2_LIBS=$pkg_cv_PANGOFT2_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ CFLAGS="$PANGOFT2_CFLAGS $CFLAGS" -+ CXXFLAGS="$PANGOFT2_CFLAGS $CXXFLAGS" -+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS" -+ -+fi -+ -+ ac_fn_c_check_func "$LINENO" "pango_font_family_is_monospace" "ac_cv_func_pango_font_family_is_monospace" -+if test "x$ac_cv_func_pango_font_family_is_monospace" = xyes -+then : -+ printf "%s\n" "#define HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE 1" >>confdefs.h -+ -+fi -+ -+ fi -+ -+ wxUSE_UNIVERSAL="yes" -+ -+ if test "$wxUSE_NANOX" = "yes"; then -+ TOOLKIT_INCLUDE="-I\$(top_srcdir)/include/wx/x11/nanox -I\$(MICROWIN)/src/include $TOOLKIT_INCLUDE" -+ TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1" -+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$(MICROWIN)/src/lib/libnano-X.a" -+ else -+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11" -+ fi -+ -+ TOOLKIT=X11 -+ GUIDIST=X11_DIST -+ fi -+ -+ if test "$wxUSE_MOTIF" = 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Motif/Lesstif headers" >&5 -+printf %s "checking for Motif/Lesstif headers... " >&6; } -+ -+ac_find_includes= -+for ac_dir in $SEARCH_INCLUDE /usr/include -+ do -+ if test -f "$ac_dir/Xm/Xm.h"; then -+ ac_find_includes=$ac_dir -+ break -+ fi -+ done -+ -+ if test "$ac_find_includes" != "" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found in $ac_find_includes" >&5 -+printf "%s\n" "found in $ac_find_includes" >&6; } -+ -+ if test "x$ac_find_includes" = "x/usr/include"; then -+ ac_path_to_include="" -+ else -+ echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null -+ result=$? -+ if test $result = 0; then -+ ac_path_to_include="" -+ else -+ ac_path_to_include=" -I$ac_find_includes" -+ fi -+ fi -+ -+ TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include" -+ else -+ save_CFLAGS=$CFLAGS -+ CFLAGS="$TOOLKIT_INCLUDE $CFLAGS" -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ -+int -+main (void) -+{ -+ -+ int version; -+ version = xmUseVersion; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found in default search path" >&5 -+printf "%s\n" "found in default search path" >&6; } -+ COMPILED_X_PROGRAM=1 -+ -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ as_fn_error $? "please set CPPFLAGS to contain the location of Xm/Xm.h" "$LINENO" 5 -+ -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ CFLAGS=$save_CFLAGS -+ fi -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Motif/Lesstif library" >&5 -+printf %s "checking for Motif/Lesstif library... " >&6; } -+ -+ ac_find_libraries= -+ for ac_dir in $SEARCH_LIB -+ do -+ for ac_extension in a so sl dylib dll.a; do -+ if test -f "$ac_dir/libXm.$ac_extension"; then -+ ac_find_libraries=$ac_dir -+ break 2 -+ fi -+ done -+ done -+ -+ -+ if test "x$ac_find_libraries" != "x" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found in $ac_find_libraries" >&5 -+printf "%s\n" "found in $ac_find_libraries" >&6; } -+ -+ -+ if test "$ac_find_libraries" = "default location"; then -+ ac_path_to_link="" -+ else -+ echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null -+ result=$? -+ if test $result = 0; then -+ ac_path_to_link="" -+ else -+ ac_path_to_link=" -L$ac_find_libraries" -+ fi -+ fi -+ -+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" -+ else -+ save_CFLAGS=$CFLAGS -+ CFLAGS="$TOOLKIT_INCLUDE $CFLAGS" -+ save_LIBS="$LIBS" -+ LIBS="$GUI_TK_LIBRARY -lXm -lXmu -lXext -lX11" -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ -+int -+main (void) -+{ -+ -+ int version; -+ version = xmUseVersion; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found in default search path" >&5 -+printf "%s\n" "found in default search path" >&6; } -+ COMPILED_X_PROGRAM=1 -+ -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ as_fn_error $? "please set LDFLAGS to contain the location of libXm" "$LINENO" 5 -+ -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ -+ CFLAGS=$save_CFLAGS -+ LIBS="$save_LIBS" -+ fi -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we need -lXp and/or -lSM -lICE" >&5 -+printf %s "checking if we need -lXp and/or -lSM -lICE... " >&6; } -+ libp_link="" -+ libsm_ice_link="" -+ libs_found=0 -+ for libp in "" " -lXp"; do -+ if test "$libs_found" = 0; then -+ for libsm_ice in "" " -lSM -lICE"; do -+ if test "$libs_found" = 0; then -+ save_LIBS="$LIBS" -+ LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt ${libsm_ice} -lX11" -+ save_CFLAGS=$CFLAGS -+ CFLAGS="$TOOLKIT_INCLUDE $CFLAGS" -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ #include -+ -+int -+main (void) -+{ -+ -+ XmString string = NULL; -+ Widget w = NULL; -+ int position = 0; -+ XmListAddItem(w, string, position); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ -+ libp_link="$libp" -+ libsm_ice_link="$libsm_ice" -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: need ${libp_link} ${libsm_ice_link}" >&5 -+printf "%s\n" "need ${libp_link} ${libsm_ice_link}" >&6; } -+ libs_found=1 -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ -+ LIBS="$save_LIBS" -+ CFLAGS=$save_CFLAGS -+ fi -+ done -+ fi -+ done -+ -+ if test "$libs_found" = 0; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: can't find the right libraries" >&5 -+printf "%s\n" "can't find the right libraries" >&6; } -+ as_fn_error $? "can't link a simple motif program" "$LINENO" 5 -+ fi -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SgCreateList in -lSgm" >&5 -+printf %s "checking for SgCreateList in -lSgm... " >&6; } -+if test ${ac_cv_lib_Sgm_SgCreateList+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lSgm $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char SgCreateList (void); -+int -+main (void) -+{ -+return SgCreateList (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_Sgm_SgCreateList=yes -+else case e in #( -+ e) ac_cv_lib_Sgm_SgCreateList=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Sgm_SgCreateList" >&5 -+printf "%s\n" "$ac_cv_lib_Sgm_SgCreateList" >&6; } -+if test "x$ac_cv_lib_Sgm_SgCreateList" = xyes -+then : -+ libsgm_link=" -lSgm" -+fi -+ -+ -+ save_CFLAGS=$CFLAGS -+ CFLAGS="$TOOLKIT_INCLUDE $CFLAGS" -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Motif 2" >&5 -+printf %s "checking for Motif 2... " >&6; } -+if test ${wx_cv_lib_motif2+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ -+int -+main (void) -+{ -+ -+ #if XmVersion < 2000 -+ Not Motif 2 -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ wx_cv_lib_motif2="yes" -+else case e in #( -+ e) wx_cv_lib_motif2="no" ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_motif2" >&5 -+printf "%s\n" "$wx_cv_lib_motif2" >&6; } -+ if test "$wx_cv_lib_motif2" = "yes"; then -+ printf "%s\n" "#define __WXMOTIF20__ 1" >>confdefs.h -+ -+ else -+ printf "%s\n" "#define __WXMOTIF20__ 0" >>confdefs.h -+ -+ fi -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Motif is Lesstif" >&5 -+printf %s "checking whether Motif is Lesstif... " >&6; } -+if test ${wx_cv_lib_lesstif+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ -+int -+main (void) -+{ -+ -+ #if !defined(LesstifVersion) || LesstifVersion <= 0 -+ Not Lesstif -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ wx_cv_lib_lesstif="yes" -+else case e in #( -+ e) wx_cv_lib_lesstif="no" ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_lesstif" >&5 -+printf "%s\n" "$wx_cv_lib_lesstif" >&6; } -+ if test "$wx_cv_lib_lesstif" = "yes"; then -+ printf "%s\n" "#define __WXLESSTIF__ 1" >>confdefs.h -+ -+ else -+ printf "%s\n" "#define __WXLESSTIF__ 0" >>confdefs.h -+ -+ fi -+ -+ CFLAGS=$save_CFLAGS -+ -+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY ${libsgm_link} -lXm ${libp_link} -lXmu -lXext -lXt ${libsm_ice_link} -lX11" -+ TOOLKIT=MOTIF -+ GUIDIST=MOTIF_DIST -+ fi -+ -+ if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then -+ if test "$wxUSE_LIBXPM" = "sys"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Xpm library" >&5 -+printf %s "checking for Xpm library... " >&6; } -+ -+ ac_find_libraries= -+ for ac_dir in $SEARCH_LIB -+ do -+ for ac_extension in a so sl dylib dll.a; do -+ if test -f "$ac_dir/libXpm.$ac_extension"; then -+ ac_find_libraries=$ac_dir -+ break 2 -+ fi -+ done -+ done -+ -+ if test "$ac_find_libraries" != "" ; then -+ -+ if test "$ac_find_libraries" = "default location"; then -+ ac_path_to_link="" -+ else -+ echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null -+ result=$? -+ if test $result = 0; then -+ ac_path_to_link="" -+ else -+ ac_path_to_link=" -L$ac_find_libraries" -+ fi -+ fi -+ -+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found in $ac_find_libraries" >&5 -+printf "%s\n" "found in $ac_find_libraries" >&6; } -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X11/xpm.h" >&5 -+printf %s "checking for X11/xpm.h... " >&6; } -+if test ${wx_cv_x11_xpm_h+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ save_CFLAGS=$CFLAGS -+ CFLAGS="$TOOLKIT_INCLUDE $CFLAGS" -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ -+int -+main (void) -+{ -+ -+ int version; -+ version = XpmLibraryVersion(); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ wx_cv_x11_xpm_h=yes -+else case e in #( -+ e) wx_cv_x11_xpm_h=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ CFLAGS=$save_CFLAGS -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_x11_xpm_h" >&5 -+printf "%s\n" "$wx_cv_x11_xpm_h" >&6; } -+ -+ if test $wx_cv_x11_xpm_h = "yes"; then -+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXpm" -+ printf "%s\n" "#define wxHAVE_LIB_XPM 1" >>confdefs.h -+ -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: built-in less efficient XPM decoder will be used" >&5 -+printf "%s\n" "$as_me: WARNING: built-in less efficient XPM decoder will be used" >&2;} -+ fi -+ fi -+ -+ fi -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XShapeQueryExtension in -lXext" >&5 -+printf %s "checking for XShapeQueryExtension in -lXext... " >&6; } -+if test ${ac_cv_lib_Xext_XShapeQueryExtension+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lXext $GUI_TK_LIBRARY -lX11 $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char XShapeQueryExtension (void); -+int -+main (void) -+{ -+return XShapeQueryExtension (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_Xext_XShapeQueryExtension=yes -+else case e in #( -+ e) ac_cv_lib_Xext_XShapeQueryExtension=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5 -+printf "%s\n" "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; } -+if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = xyes -+then : -+ -+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext" -+ wxHAVE_XEXT_LIB=1 -+ -+fi -+ -+ -+ if test "$wxHAVE_XEXT_LIB" = 1; then -+ save_CFLAGS="$CFLAGS" -+ CFLAGS="$TOOLKIT_INCLUDE $CFLAGS" -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X11/extensions/shape.h" >&5 -+printf %s "checking for X11/extensions/shape.h... " >&6; } -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ #include -+ -+int -+main (void) -+{ -+ -+ int dummy1, dummy2; -+ XShapeQueryExtension((Display*)NULL, -+ (int*)NULL, (int*)NULL); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ -+ printf "%s\n" "#define HAVE_XSHAPE 1" >>confdefs.h -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found" >&5 -+printf "%s\n" "found" >&6; } -+ -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -+printf "%s\n" "not found" >&6; } -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ CFLAGS="$save_CFLAGS" -+ -+ fi -+ fi -+ -+ if test "$wxUSE_OSX_COCOA" = 1; then -+ TOOLKIT=OSX_COCOA -+ GUIDIST=OSX_COCOA_DIST -+ -+ TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__" -+ fi -+ -+ if test "$wxUSE_OSX_IPHONE" = 1; then -+ TOOLKIT=OSX_IPHONE -+ fi -+ -+ -+ if test "$wxUSE_QT" = 1; then -+ TOOLKIT=QT -+ GUIDIST=QT_DIST -+ TOOLKIT_DIR="qt" -+ -+ if test -n "$QT5_CUSTOM_DIR" ; then -+ TOOLKIT_INCLUDE="${TOOLKIT_INCLUDE} -I${QT5_CUSTOM_DIR}/include" -+ GUI_TK_LIBRARY="${GUI_TK_LIBRARY} -L${QT5_CUSTOM_DIR}/lib \ -+ -lQt5Core -lQt5Widgets -lQt5Gui -lQt5OpenGL -lQt5Test \ -+ -Wl,-rpath,${QT5_CUSTOM_DIR}/lib" -+ -+ elif test -z "$PKG_CONFIG" ; then -+ as_fn_error $? "specify QT5_CUSTOM_DIR or make sure pkg-config is available to search for Qt5 libraries" "$LINENO" 5 -+ -+ else -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for QT5" >&5 -+printf %s "checking for QT5... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$QT5_CFLAGS"; then -+ pkg_cv_QT5_CFLAGS="$QT5_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core Qt5Widgets Qt5Gui Qt5OpenGL Qt5Test\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "Qt5Core Qt5Widgets Qt5Gui Qt5OpenGL Qt5Test") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_QT5_CFLAGS=`$PKG_CONFIG --cflags "Qt5Core Qt5Widgets Qt5Gui Qt5OpenGL Qt5Test" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$QT5_LIBS"; then -+ pkg_cv_QT5_LIBS="$QT5_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core Qt5Widgets Qt5Gui Qt5OpenGL Qt5Test\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "Qt5Core Qt5Widgets Qt5Gui Qt5OpenGL Qt5Test") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_QT5_LIBS=`$PKG_CONFIG --libs "Qt5Core Qt5Widgets Qt5Gui Qt5OpenGL Qt5Test" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ QT5_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "Qt5Core Qt5Widgets Qt5Gui Qt5OpenGL Qt5Test"` -+ else -+ QT5_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "Qt5Core Qt5Widgets Qt5Gui Qt5OpenGL Qt5Test"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$QT5_PKG_ERRORS" >&5 -+ -+ -+ as_fn_error $? "Qt5 libraries are not available" "$LINENO" 5 -+ -+ -+elif test $pkg_failed = untried; then -+ -+ as_fn_error $? "Qt5 libraries are not available" "$LINENO" 5 -+ -+ -+else -+ QT5_CFLAGS=$pkg_cv_QT5_CFLAGS -+ QT5_LIBS=$pkg_cv_QT5_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ TOOLKIT_INCLUDE="${TOOLKIT_INCLUDE} ${QT5_CFLAGS}" -+ GUI_TK_LIBRARY="${GUI_TK_LIBRARY} ${QT5_LIBS}" -+ if `pkg-config --variable qt_config Qt5Core | grep "reduce_relocations" >/dev/null`; then -+ wxUSE_PIC=yes -+ fi -+ -+fi -+ fi -+ fi -+ TOOLKIT_DIR=`echo ${TOOLKIT} | tr '[A-Z]' '[a-z]'` -+ -+ if test "$wxUSE_UNIVERSAL" = "yes"; then -+ TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__" -+ WIDGET_SET=univ -+ fi -+ -+ GUIDIST="${GUIDIST} SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST" -+ DISTDIR="wx\$(TOOLKIT)" -+else -+ USE_GUI=0 -+ -+ TOOLKIT_DIR="base" -+ -+ if test "$USE_WIN32" = 1 ; then -+ TOOLKIT="MSW" -+ fi -+ -+ GUIDIST="BASE_DIST" -+ DISTDIR="wxBase" -+fi -+ -+ -+ -+if test "$wxUSE_GUI" = "yes"; then -+ if test "$wxUSE_UNIX" = "yes"; then -+ ac_fn_c_check_header_compile "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" " -+" -+if test "x$ac_cv_header_X11_Xlib_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_X11_XLIB_H 1" >>confdefs.h -+ -+fi -+ -+ ac_fn_c_check_header_compile "$LINENO" "X11/XKBlib.h" "ac_cv_header_X11_XKBlib_h" " -+ #if HAVE_X11_XLIB_H -+ #include -+ #endif -+ -+" -+if test "x$ac_cv_header_X11_XKBlib_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_X11_XKBLIB_H 1" >>confdefs.h -+ -+fi -+ -+ fi -+fi -+ -+ -+ -+USE_XINERAMA=0 -+if test "$wxUSE_DISPLAY" = "yes"; then -+ if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$WXGTK1" = 1; then -+ -+ ac_find_libraries= -+ -+ fl_pkgname=`echo "Xinerama" | tr [:upper:] [:lower:]` -+ -+ -+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 -+{ 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 case e in #( -+ e) case $PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ 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_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 -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac ;; -+esac -+fi -+PKG_CONFIG=$ac_cv_path_PKG_CONFIG -+if test -n "$PKG_CONFIG"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -+printf "%s\n" "$PKG_CONFIG" >&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_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 -+{ 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 case e in #( -+ e) 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. -+ ;; -+ *) -+ 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_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 -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac ;; -+esac -+fi -+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -+if test -n "$ac_pt_PKG_CONFIG"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -+printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } -+else -+ { 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 -+ PKG_CONFIG="" -+ 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 -+ PKG_CONFIG=$ac_pt_PKG_CONFIG -+ fi -+else -+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -+fi -+ -+fi -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=0.9.0 -+ { 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 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ PKG_CONFIG="" -+ fi -+ -+fi 6> /dev/null -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Xinerama" >&5 -+printf %s "checking for Xinerama... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$Xinerama_CFLAGS"; then -+ pkg_cv_Xinerama_CFLAGS="$Xinerama_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_Xinerama_CFLAGS=`$PKG_CONFIG --cflags "$fl_pkgname" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$Xinerama_LIBS"; then -+ pkg_cv_Xinerama_LIBS="$Xinerama_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_Xinerama_LIBS=`$PKG_CONFIG --libs "$fl_pkgname" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ Xinerama_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$fl_pkgname"` -+ else -+ Xinerama_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$fl_pkgname"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$Xinerama_PKG_ERRORS" >&5 -+ -+ -+ if test "x$ac_find_libraries" = "x"; then -+ if test "xXineramaQueryScreens" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XineramaQueryScreens in -lXinerama" >&5 -+printf %s "checking for XineramaQueryScreens in -lXinerama... " >&6; } -+if test ${ac_cv_lib_Xinerama_XineramaQueryScreens+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lXinerama $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char XineramaQueryScreens (void); -+int -+main (void) -+{ -+return XineramaQueryScreens (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_Xinerama_XineramaQueryScreens=yes -+else case e in #( -+ e) ac_cv_lib_Xinerama_XineramaQueryScreens=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xinerama_XineramaQueryScreens" >&5 -+printf "%s\n" "$ac_cv_lib_Xinerama_XineramaQueryScreens" >&6; } -+if test "x$ac_cv_lib_Xinerama_XineramaQueryScreens" = xyes -+then : -+ ac_find_libraries="std" -+fi -+ -+ fi -+ fi -+ -+ if test "x$ac_find_libraries" = "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 -+printf %s "checking elsewhere... " >&6; } -+ -+ ac_find_libraries= -+ for ac_dir in $SEARCH_LIB -+ do -+ for ac_extension in a so sl dylib dll.a; do -+ if test -f "$ac_dir/libXinerama.$ac_extension"; then -+ ac_find_libraries=$ac_dir -+ break 2 -+ fi -+ done -+ done -+ -+ if test "x$ac_find_libraries" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ fi -+ fi -+ -+elif test $pkg_failed = untried; then -+ -+ if test "x$ac_find_libraries" = "x"; then -+ if test "xXineramaQueryScreens" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XineramaQueryScreens in -lXinerama" >&5 -+printf %s "checking for XineramaQueryScreens in -lXinerama... " >&6; } -+if test ${ac_cv_lib_Xinerama_XineramaQueryScreens+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lXinerama $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char XineramaQueryScreens (void); -+int -+main (void) -+{ -+return XineramaQueryScreens (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_Xinerama_XineramaQueryScreens=yes -+else case e in #( -+ e) ac_cv_lib_Xinerama_XineramaQueryScreens=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xinerama_XineramaQueryScreens" >&5 -+printf "%s\n" "$ac_cv_lib_Xinerama_XineramaQueryScreens" >&6; } -+if test "x$ac_cv_lib_Xinerama_XineramaQueryScreens" = xyes -+then : -+ ac_find_libraries="std" -+fi -+ -+ fi -+ fi -+ -+ if test "x$ac_find_libraries" = "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 -+printf %s "checking elsewhere... " >&6; } -+ -+ ac_find_libraries= -+ for ac_dir in $SEARCH_LIB -+ do -+ for ac_extension in a so sl dylib dll.a; do -+ if test -f "$ac_dir/libXinerama.$ac_extension"; then -+ ac_find_libraries=$ac_dir -+ break 2 -+ fi -+ done -+ done -+ -+ if test "x$ac_find_libraries" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ fi -+ fi -+ -+else -+ Xinerama_CFLAGS=$pkg_cv_Xinerama_CFLAGS -+ Xinerama_LIBS=$pkg_cv_Xinerama_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ ac_find_libraries="std" -+ -+ eval ac_find_cflags=\$Xinerama_CFLAGS -+ eval fl_libs=\$Xinerama_LIBS -+ -+ for fl_path in $fl_libs -+ do -+ if test `echo "$fl_path" | cut -c 1-2` = "-L"; then -+ ac_find_libraries=`echo "$fl_path" | cut -c 3-` -+ fi -+ done -+ -+fi -+ -+ if test "$ac_find_libraries" != "" ; then -+ if test "$ac_find_libraries" != "std" ; then -+ -+ if test "$ac_find_libraries" = "default location"; then -+ ac_path_to_link="" -+ else -+ echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null -+ result=$? -+ if test $result = 0; then -+ ac_path_to_link="" -+ else -+ ac_path_to_link=" -L$ac_find_libraries" -+ fi -+ fi -+ -+ if test "$ac_path_to_link" != " -L/usr/lib" ; then -+ LDFLAGS="$LDFLAGS $ac_path_to_link" -+ fi -+ fi -+ USE_XINERAMA=1 -+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama" -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Xinerama not found; disabling wxDisplay" >&5 -+printf "%s\n" "$as_me: WARNING: Xinerama not found; disabling wxDisplay" >&2;} -+ wxUSE_DISPLAY="no" -+ fi -+ fi -+fi -+ -+if test "$wxUSE_DISPLAY" = "yes"; then -+ if test "$USE_XINERAMA" = 1 -o "$wxUSE_GTK" = 1; then -+ -+ ac_find_libraries= -+ -+ fl_pkgname=`echo "Xxf86vm" | tr [:upper:] [:lower:]` -+ -+ -+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 -+{ 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 case e in #( -+ e) case $PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ 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_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 -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac ;; -+esac -+fi -+PKG_CONFIG=$ac_cv_path_PKG_CONFIG -+if test -n "$PKG_CONFIG"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -+printf "%s\n" "$PKG_CONFIG" >&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_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 -+{ 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 case e in #( -+ e) 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. -+ ;; -+ *) -+ 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_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 -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac ;; -+esac -+fi -+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -+if test -n "$ac_pt_PKG_CONFIG"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -+printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } -+else -+ { 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 -+ PKG_CONFIG="" -+ 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 -+ PKG_CONFIG=$ac_pt_PKG_CONFIG -+ fi -+else -+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -+fi -+ -+fi -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=0.9.0 -+ { 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 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ PKG_CONFIG="" -+ fi -+ -+fi 6> /dev/null -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Xxf86vm" >&5 -+printf %s "checking for Xxf86vm... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$Xxf86vm_CFLAGS"; then -+ pkg_cv_Xxf86vm_CFLAGS="$Xxf86vm_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_Xxf86vm_CFLAGS=`$PKG_CONFIG --cflags "$fl_pkgname" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$Xxf86vm_LIBS"; then -+ pkg_cv_Xxf86vm_LIBS="$Xxf86vm_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_Xxf86vm_LIBS=`$PKG_CONFIG --libs "$fl_pkgname" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ Xxf86vm_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$fl_pkgname"` -+ else -+ Xxf86vm_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$fl_pkgname"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$Xxf86vm_PKG_ERRORS" >&5 -+ -+ -+ if test "x$ac_find_libraries" = "x"; then -+ if test "xXF86VidModeQueryExtension" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 -+printf %s "checking for XF86VidModeQueryExtension in -lXxf86vm... " >&6; } -+if test ${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lXxf86vm $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char XF86VidModeQueryExtension (void); -+int -+main (void) -+{ -+return XF86VidModeQueryExtension (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes -+else case e in #( -+ e) ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 -+printf "%s\n" "$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6; } -+if test "x$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" = xyes -+then : -+ ac_find_libraries="std" -+fi -+ -+ fi -+ fi -+ -+ if test "x$ac_find_libraries" = "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 -+printf %s "checking elsewhere... " >&6; } -+ -+ ac_find_libraries= -+ for ac_dir in $SEARCH_LIB -+ do -+ for ac_extension in a so sl dylib dll.a; do -+ if test -f "$ac_dir/libXxf86vm.$ac_extension"; then -+ ac_find_libraries=$ac_dir -+ break 2 -+ fi -+ done -+ done -+ -+ if test "x$ac_find_libraries" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ fi -+ fi -+ -+elif test $pkg_failed = untried; then -+ -+ if test "x$ac_find_libraries" = "x"; then -+ if test "xXF86VidModeQueryExtension" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 -+printf %s "checking for XF86VidModeQueryExtension in -lXxf86vm... " >&6; } -+if test ${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lXxf86vm $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char XF86VidModeQueryExtension (void); -+int -+main (void) -+{ -+return XF86VidModeQueryExtension (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes -+else case e in #( -+ e) ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 -+printf "%s\n" "$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6; } -+if test "x$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" = xyes -+then : -+ ac_find_libraries="std" -+fi -+ -+ fi -+ fi -+ -+ if test "x$ac_find_libraries" = "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 -+printf %s "checking elsewhere... " >&6; } -+ -+ ac_find_libraries= -+ for ac_dir in $SEARCH_LIB -+ do -+ for ac_extension in a so sl dylib dll.a; do -+ if test -f "$ac_dir/libXxf86vm.$ac_extension"; then -+ ac_find_libraries=$ac_dir -+ break 2 -+ fi -+ done -+ done -+ -+ if test "x$ac_find_libraries" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ fi -+ fi -+ -+else -+ Xxf86vm_CFLAGS=$pkg_cv_Xxf86vm_CFLAGS -+ Xxf86vm_LIBS=$pkg_cv_Xxf86vm_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ ac_find_libraries="std" -+ -+ eval ac_find_cflags=\$Xxf86vm_CFLAGS -+ eval fl_libs=\$Xxf86vm_LIBS -+ -+ for fl_path in $fl_libs -+ do -+ if test `echo "$fl_path" | cut -c 1-2` = "-L"; then -+ ac_find_libraries=`echo "$fl_path" | cut -c 3-` -+ fi -+ done -+ -+fi -+ -+ if test "$ac_find_libraries" != "" ; then -+ for ac_header in X11/extensions/xf86vmode.h -+do : -+ ac_fn_c_check_header_compile "$LINENO" "X11/extensions/xf86vmode.h" "ac_cv_header_X11_extensions_xf86vmode_h" " -+ #if HAVE_X11_XLIB_H -+ #include -+ #endif -+ -+" -+if test "x$ac_cv_header_X11_extensions_xf86vmode_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_X11_EXTENSIONS_XF86VMODE_H 1" >>confdefs.h -+ -+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm" -+ -+fi -+ -+done -+ fi -+ fi -+fi -+ -+if test "$wxUSE_DETECT_SM" = "yes"; then -+ if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1; then -+ -+ ac_find_libraries= -+ -+ fl_pkgname=`echo "SM" | tr [:upper:] [:lower:]` -+ -+ -+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 -+{ 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 case e in #( -+ e) case $PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ 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_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 -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac ;; -+esac -+fi -+PKG_CONFIG=$ac_cv_path_PKG_CONFIG -+if test -n "$PKG_CONFIG"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -+printf "%s\n" "$PKG_CONFIG" >&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_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 -+{ 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 case e in #( -+ e) 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. -+ ;; -+ *) -+ 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_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 -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac ;; -+esac -+fi -+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -+if test -n "$ac_pt_PKG_CONFIG"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -+printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } -+else -+ { 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 -+ PKG_CONFIG="" -+ 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 -+ PKG_CONFIG=$ac_pt_PKG_CONFIG -+ fi -+else -+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -+fi -+ -+fi -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=0.9.0 -+ { 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 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ PKG_CONFIG="" -+ fi -+ -+fi 6> /dev/null -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SM" >&5 -+printf %s "checking for SM... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$SM_CFLAGS"; then -+ pkg_cv_SM_CFLAGS="$SM_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_SM_CFLAGS=`$PKG_CONFIG --cflags "$fl_pkgname" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$SM_LIBS"; then -+ pkg_cv_SM_LIBS="$SM_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_SM_LIBS=`$PKG_CONFIG --libs "$fl_pkgname" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ SM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$fl_pkgname"` -+ else -+ SM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$fl_pkgname"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$SM_PKG_ERRORS" >&5 -+ -+ -+ if test "x$ac_find_libraries" = "x"; then -+ if test "xSmcOpenConnection" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SmcOpenConnection in -lSM" >&5 -+printf %s "checking for SmcOpenConnection in -lSM... " >&6; } -+if test ${ac_cv_lib_SM_SmcOpenConnection+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lSM $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char SmcOpenConnection (void); -+int -+main (void) -+{ -+return SmcOpenConnection (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_SM_SmcOpenConnection=yes -+else case e in #( -+ e) ac_cv_lib_SM_SmcOpenConnection=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SM_SmcOpenConnection" >&5 -+printf "%s\n" "$ac_cv_lib_SM_SmcOpenConnection" >&6; } -+if test "x$ac_cv_lib_SM_SmcOpenConnection" = xyes -+then : -+ ac_find_libraries="std" -+fi -+ -+ fi -+ fi -+ -+ if test "x$ac_find_libraries" = "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 -+printf %s "checking elsewhere... " >&6; } -+ -+ ac_find_libraries= -+ for ac_dir in $SEARCH_LIB -+ do -+ for ac_extension in a so sl dylib dll.a; do -+ if test -f "$ac_dir/libSM.$ac_extension"; then -+ ac_find_libraries=$ac_dir -+ break 2 -+ fi -+ done -+ done -+ -+ if test "x$ac_find_libraries" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ fi -+ fi -+ -+elif test $pkg_failed = untried; then -+ -+ if test "x$ac_find_libraries" = "x"; then -+ if test "xSmcOpenConnection" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SmcOpenConnection in -lSM" >&5 -+printf %s "checking for SmcOpenConnection in -lSM... " >&6; } -+if test ${ac_cv_lib_SM_SmcOpenConnection+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lSM $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char SmcOpenConnection (void); -+int -+main (void) -+{ -+return SmcOpenConnection (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_SM_SmcOpenConnection=yes -+else case e in #( -+ e) ac_cv_lib_SM_SmcOpenConnection=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SM_SmcOpenConnection" >&5 -+printf "%s\n" "$ac_cv_lib_SM_SmcOpenConnection" >&6; } -+if test "x$ac_cv_lib_SM_SmcOpenConnection" = xyes -+then : -+ ac_find_libraries="std" -+fi -+ -+ fi -+ fi -+ -+ if test "x$ac_find_libraries" = "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 -+printf %s "checking elsewhere... " >&6; } -+ -+ ac_find_libraries= -+ for ac_dir in $SEARCH_LIB -+ do -+ for ac_extension in a so sl dylib dll.a; do -+ if test -f "$ac_dir/libSM.$ac_extension"; then -+ ac_find_libraries=$ac_dir -+ break 2 -+ fi -+ done -+ done -+ -+ if test "x$ac_find_libraries" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ fi -+ fi -+ -+else -+ SM_CFLAGS=$pkg_cv_SM_CFLAGS -+ SM_LIBS=$pkg_cv_SM_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ ac_find_libraries="std" -+ -+ eval ac_find_cflags=\$SM_CFLAGS -+ eval fl_libs=\$SM_LIBS -+ -+ for fl_path in $fl_libs -+ do -+ if test `echo "$fl_path" | cut -c 1-2` = "-L"; then -+ ac_find_libraries=`echo "$fl_path" | cut -c 3-` -+ fi -+ done -+ -+fi -+ -+ if test "$ac_find_libraries" != "" ; then -+ if test "$ac_find_libraries" != "std" ; then -+ -+ if test "$ac_find_libraries" = "default location"; then -+ ac_path_to_link="" -+ else -+ echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null -+ result=$? -+ if test $result = 0; then -+ ac_path_to_link="" -+ else -+ ac_path_to_link=" -L$ac_find_libraries" -+ fi -+ fi -+ -+ if test "$ac_path_to_link" != " -L/usr/lib" ; then -+ LDFLAGS="$LDFLAGS $ac_path_to_link" -+ fi -+ fi -+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lSM" -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libSM not found; disabling session management detection" >&5 -+printf "%s\n" "$as_me: WARNING: libSM not found; disabling session management detection" >&2;} -+ wxUSE_DETECT_SM="no" -+ fi -+ else -+ wxUSE_DETECT_SM="no" -+ fi -+fi -+ -+ -+ -+USE_OPENGL=0 -+if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then -+ -+ -+ if test "$wxUSE_OSX_COCOA" = 1; then -+ OPENGL_LIBS="-framework OpenGL -framework AGL" -+ elif test "$wxUSE_MSW" = 1; then -+ OPENGL_LIBS="-lopengl32 -lglu32" -+ elif test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_QT" = 1; then -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenGL headers" >&5 -+printf %s "checking for OpenGL headers... " >&6; } -+ -+ac_find_includes= -+for ac_dir in $SEARCH_INCLUDE /opt/graphics/OpenGL/include /usr/include -+ do -+ if test -f "$ac_dir/GL/gl.h"; then -+ ac_find_includes=$ac_dir -+ break -+ fi -+ done -+ -+ if test "$ac_find_includes" != "" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found in $ac_find_includes" >&5 -+printf "%s\n" "found in $ac_find_includes" >&6; } -+ -+ if test "x$ac_find_includes" = "x/usr/include"; then -+ ac_path_to_include="" -+ else -+ echo "$CPPFLAGS" | grep "\-I$ac_find_includes" > /dev/null -+ result=$? -+ if test $result = 0; then -+ ac_path_to_include="" -+ else -+ ac_path_to_include=" -I$ac_find_includes" -+ fi -+ fi -+ -+ CPPFLAGS="$CPPFLAGS $ac_path_to_include" -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -+printf "%s\n" "not found" >&6; } -+ fi -+ -+ ac_fn_c_check_header_compile "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" " -+" -+if test "x$ac_cv_header_GL_gl_h" = xyes -+then : -+ -+ ac_fn_c_check_header_compile "$LINENO" "GL/glu.h" "ac_cv_header_GL_glu_h" " -+" -+if test "x$ac_cv_header_GL_glu_h" = xyes -+then : -+ -+ found_gl=0 -+ -+ -+ ac_find_libraries= -+ -+ fl_pkgname=`echo "GL" | tr [:upper:] [:lower:]` -+ -+ -+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 -+{ 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 case e in #( -+ e) case $PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ 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_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 -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac ;; -+esac -+fi -+PKG_CONFIG=$ac_cv_path_PKG_CONFIG -+if test -n "$PKG_CONFIG"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -+printf "%s\n" "$PKG_CONFIG" >&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_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 -+{ 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 case e in #( -+ e) 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. -+ ;; -+ *) -+ 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_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 -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac ;; -+esac -+fi -+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -+if test -n "$ac_pt_PKG_CONFIG"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -+printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } -+else -+ { 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 -+ PKG_CONFIG="" -+ 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 -+ PKG_CONFIG=$ac_pt_PKG_CONFIG -+ fi -+else -+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -+fi -+ -+fi -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=0.9.0 -+ { 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 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ PKG_CONFIG="" -+ fi -+ -+fi 6> /dev/null -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GL" >&5 -+printf %s "checking for GL... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$GL_CFLAGS"; then -+ pkg_cv_GL_CFLAGS="$GL_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "$fl_pkgname" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$GL_LIBS"; then -+ pkg_cv_GL_LIBS="$GL_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "$fl_pkgname" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$fl_pkgname"` -+ else -+ GL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$fl_pkgname"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$GL_PKG_ERRORS" >&5 -+ -+ -+ if test "x$ac_find_libraries" = "x"; then -+ if test "xglBegin" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5 -+printf %s "checking for glBegin in -lGL... " >&6; } -+if test ${ac_cv_lib_GL_glBegin+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lGL $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char glBegin (void); -+int -+main (void) -+{ -+return glBegin (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_GL_glBegin=yes -+else case e in #( -+ e) ac_cv_lib_GL_glBegin=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glBegin" >&5 -+printf "%s\n" "$ac_cv_lib_GL_glBegin" >&6; } -+if test "x$ac_cv_lib_GL_glBegin" = xyes -+then : -+ ac_find_libraries="std" -+fi -+ -+ fi -+ fi -+ -+ if test "x$ac_find_libraries" = "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 -+printf %s "checking elsewhere... " >&6; } -+ -+ ac_find_libraries= -+ for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB -+ do -+ for ac_extension in a so sl dylib dll.a; do -+ if test -f "$ac_dir/libGL.$ac_extension"; then -+ ac_find_libraries=$ac_dir -+ break 2 -+ fi -+ done -+ done -+ -+ if test "x$ac_find_libraries" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ fi -+ fi -+ -+elif test $pkg_failed = untried; then -+ -+ if test "x$ac_find_libraries" = "x"; then -+ if test "xglBegin" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5 -+printf %s "checking for glBegin in -lGL... " >&6; } -+if test ${ac_cv_lib_GL_glBegin+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lGL $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char glBegin (void); -+int -+main (void) -+{ -+return glBegin (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_GL_glBegin=yes -+else case e in #( -+ e) ac_cv_lib_GL_glBegin=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glBegin" >&5 -+printf "%s\n" "$ac_cv_lib_GL_glBegin" >&6; } -+if test "x$ac_cv_lib_GL_glBegin" = xyes -+then : -+ ac_find_libraries="std" -+fi -+ -+ fi -+ fi -+ -+ if test "x$ac_find_libraries" = "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 -+printf %s "checking elsewhere... " >&6; } -+ -+ ac_find_libraries= -+ for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB -+ do -+ for ac_extension in a so sl dylib dll.a; do -+ if test -f "$ac_dir/libGL.$ac_extension"; then -+ ac_find_libraries=$ac_dir -+ break 2 -+ fi -+ done -+ done -+ -+ if test "x$ac_find_libraries" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ fi -+ fi -+ -+else -+ GL_CFLAGS=$pkg_cv_GL_CFLAGS -+ GL_LIBS=$pkg_cv_GL_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ ac_find_libraries="std" -+ -+ eval ac_find_cflags=\$GL_CFLAGS -+ eval fl_libs=\$GL_LIBS -+ -+ for fl_path in $fl_libs -+ do -+ if test `echo "$fl_path" | cut -c 1-2` = "-L"; then -+ ac_find_libraries=`echo "$fl_path" | cut -c 3-` -+ fi -+ done -+ -+fi -+ -+ if test "$ac_find_libraries" != "" ; then -+ if test "$ac_find_libraries" != "std" ; then -+ -+ if test "$ac_find_libraries" = "default location"; then -+ ac_path_to_link="" -+ else -+ echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null -+ result=$? -+ if test $result = 0; then -+ ac_path_to_link="" -+ else -+ ac_path_to_link=" -L$ac_find_libraries" -+ fi -+ fi -+ -+ if test "$ac_path_to_link" != " -L/usr/lib" ; then -+ LDFLAGS_GL="$ac_path_to_link" -+ fi -+ fi -+ -+ -+ ac_find_libraries= -+ -+ fl_pkgname=`echo "GLU" | tr [:upper:] [:lower:]` -+ -+ -+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 -+{ 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 case e in #( -+ e) case $PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ 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_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 -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac ;; -+esac -+fi -+PKG_CONFIG=$ac_cv_path_PKG_CONFIG -+if test -n "$PKG_CONFIG"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -+printf "%s\n" "$PKG_CONFIG" >&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_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 -+{ 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 case e in #( -+ e) 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. -+ ;; -+ *) -+ 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_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 -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac ;; -+esac -+fi -+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -+if test -n "$ac_pt_PKG_CONFIG"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -+printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } -+else -+ { 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 -+ PKG_CONFIG="" -+ 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 -+ PKG_CONFIG=$ac_pt_PKG_CONFIG -+ fi -+else -+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -+fi -+ -+fi -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=0.9.0 -+ { 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 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ PKG_CONFIG="" -+ fi -+ -+fi 6> /dev/null -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GLU" >&5 -+printf %s "checking for GLU... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$GLU_CFLAGS"; then -+ pkg_cv_GLU_CFLAGS="$GLU_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_GLU_CFLAGS=`$PKG_CONFIG --cflags "$fl_pkgname" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$GLU_LIBS"; then -+ pkg_cv_GLU_LIBS="$GLU_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_GLU_LIBS=`$PKG_CONFIG --libs "$fl_pkgname" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ GLU_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$fl_pkgname"` -+ else -+ GLU_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$fl_pkgname"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$GLU_PKG_ERRORS" >&5 -+ -+ -+ if test "x$ac_find_libraries" = "x"; then -+ if test "xgluBeginCurve" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gluBeginCurve in -lGLU" >&5 -+printf %s "checking for gluBeginCurve in -lGLU... " >&6; } -+if test ${ac_cv_lib_GLU_gluBeginCurve+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lGLU $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char gluBeginCurve (void); -+int -+main (void) -+{ -+return gluBeginCurve (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_GLU_gluBeginCurve=yes -+else case e in #( -+ e) ac_cv_lib_GLU_gluBeginCurve=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLU_gluBeginCurve" >&5 -+printf "%s\n" "$ac_cv_lib_GLU_gluBeginCurve" >&6; } -+if test "x$ac_cv_lib_GLU_gluBeginCurve" = xyes -+then : -+ ac_find_libraries="std" -+fi -+ -+ fi -+ fi -+ -+ if test "x$ac_find_libraries" = "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 -+printf %s "checking elsewhere... " >&6; } -+ -+ ac_find_libraries= -+ for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB -+ do -+ for ac_extension in a so sl dylib dll.a; do -+ if test -f "$ac_dir/libGLU.$ac_extension"; then -+ ac_find_libraries=$ac_dir -+ break 2 -+ fi -+ done -+ done -+ -+ if test "x$ac_find_libraries" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ fi -+ fi -+ -+elif test $pkg_failed = untried; then -+ -+ if test "x$ac_find_libraries" = "x"; then -+ if test "xgluBeginCurve" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gluBeginCurve in -lGLU" >&5 -+printf %s "checking for gluBeginCurve in -lGLU... " >&6; } -+if test ${ac_cv_lib_GLU_gluBeginCurve+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lGLU $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char gluBeginCurve (void); -+int -+main (void) -+{ -+return gluBeginCurve (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_GLU_gluBeginCurve=yes -+else case e in #( -+ e) ac_cv_lib_GLU_gluBeginCurve=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLU_gluBeginCurve" >&5 -+printf "%s\n" "$ac_cv_lib_GLU_gluBeginCurve" >&6; } -+if test "x$ac_cv_lib_GLU_gluBeginCurve" = xyes -+then : -+ ac_find_libraries="std" -+fi -+ -+ fi -+ fi -+ -+ if test "x$ac_find_libraries" = "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 -+printf %s "checking elsewhere... " >&6; } -+ -+ ac_find_libraries= -+ for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB -+ do -+ for ac_extension in a so sl dylib dll.a; do -+ if test -f "$ac_dir/libGLU.$ac_extension"; then -+ ac_find_libraries=$ac_dir -+ break 2 -+ fi -+ done -+ done -+ -+ if test "x$ac_find_libraries" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ fi -+ fi -+ -+else -+ GLU_CFLAGS=$pkg_cv_GLU_CFLAGS -+ GLU_LIBS=$pkg_cv_GLU_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ ac_find_libraries="std" -+ -+ eval ac_find_cflags=\$GLU_CFLAGS -+ eval fl_libs=\$GLU_LIBS -+ -+ for fl_path in $fl_libs -+ do -+ if test `echo "$fl_path" | cut -c 1-2` = "-L"; then -+ ac_find_libraries=`echo "$fl_path" | cut -c 3-` -+ fi -+ done -+ -+fi -+ -+ if test "$ac_find_libraries" != "" ; then -+ if test "$ac_find_libraries" != "std" ; then -+ -+ if test "$ac_find_libraries" = "default location"; then -+ ac_path_to_link="" -+ else -+ echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null -+ result=$? -+ if test $result = 0; then -+ ac_path_to_link="" -+ else -+ ac_path_to_link=" -L$ac_find_libraries" -+ fi -+ fi -+ -+ if test "$ac_path_to_link" != " -L/usr/lib" -a \ -+ "$ac_path_to_link" != "$LDFLAGS_GL" ; then -+ LDFLAGS_GL="$LDFLAGS_GL $ac_path_to_link" -+ fi -+ fi -+ -+ found_gl=1 -+ OPENGL_LIBS="-lGL -lGLU" -+ -+ if test "$WXGTK3" = 1; then -+ if test "$wxUSE_GLCANVAS_EGL" != "no"; then -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EGL" >&5 -+printf %s "checking for EGL... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$EGL_CFLAGS"; then -+ pkg_cv_EGL_CFLAGS="$EGL_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"egl >= 1.5\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "egl >= 1.5") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_EGL_CFLAGS=`$PKG_CONFIG --cflags "egl >= 1.5" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$EGL_LIBS"; then -+ pkg_cv_EGL_LIBS="$EGL_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"egl >= 1.5\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "egl >= 1.5") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_EGL_LIBS=`$PKG_CONFIG --libs "egl >= 1.5" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ EGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "egl >= 1.5"` -+ else -+ EGL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "egl >= 1.5"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$EGL_PKG_ERRORS" >&5 -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: EGL 1.5+ not available. Will use GLX." >&5 -+printf "%s\n" "$as_me: EGL 1.5+ not available. Will use GLX." >&6;} -+ -+ -+elif test $pkg_failed = untried; then -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: EGL 1.5+ not available. Will use GLX." >&5 -+printf "%s\n" "$as_me: EGL 1.5+ not available. Will use GLX." >&6;} -+ -+ -+else -+ EGL_CFLAGS=$pkg_cv_EGL_CFLAGS -+ EGL_LIBS=$pkg_cv_EGL_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ OPENGL_LIBS="$OPENGL_LIBS $EGL_LIBS" -+ printf "%s\n" "#define wxUSE_GLCANVAS_EGL 1" >>confdefs.h -+ -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for WAYLAND_EGL" >&5 -+printf %s "checking for WAYLAND_EGL... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$WAYLAND_EGL_CFLAGS"; then -+ pkg_cv_WAYLAND_EGL_CFLAGS="$WAYLAND_EGL_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-egl\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "wayland-egl") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_WAYLAND_EGL_CFLAGS=`$PKG_CONFIG --cflags "wayland-egl" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$WAYLAND_EGL_LIBS"; then -+ pkg_cv_WAYLAND_EGL_LIBS="$WAYLAND_EGL_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-egl\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "wayland-egl") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_WAYLAND_EGL_LIBS=`$PKG_CONFIG --libs "wayland-egl" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "wayland-egl"` -+ else -+ WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "wayland-egl"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$WAYLAND_EGL_PKG_ERRORS" >&5 -+ -+ : -+ -+elif test $pkg_failed = untried; then -+ : -+ -+else -+ WAYLAND_EGL_CFLAGS=$pkg_cv_WAYLAND_EGL_CFLAGS -+ WAYLAND_EGL_LIBS=$pkg_cv_WAYLAND_EGL_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ if test $wx_cv_gdk_wayland = "yes"; then -+ OPENGL_LIBS="$OPENGL_LIBS $WAYLAND_EGL_LIBS" -+ have_wayland=1 -+ fi -+ -+fi -+ -+fi -+ if test "$have_wayland" != 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: wxGLCanvas will not have Wayland support" >&5 -+printf "%s\n" "$as_me: wxGLCanvas will not have Wayland support" >&6;} -+ fi -+ fi -+ fi -+ fi -+ fi -+ -+ if test "$found_gl" != 1; then -+ -+ ac_find_libraries= -+ -+ fl_pkgname=`echo "MesaGL" | tr [:upper:] [:lower:]` -+ -+ -+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 -+{ 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 case e in #( -+ e) case $PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ 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_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 -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac ;; -+esac -+fi -+PKG_CONFIG=$ac_cv_path_PKG_CONFIG -+if test -n "$PKG_CONFIG"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -+printf "%s\n" "$PKG_CONFIG" >&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_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 -+{ 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 case e in #( -+ e) 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. -+ ;; -+ *) -+ 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_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 -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac ;; -+esac -+fi -+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -+if test -n "$ac_pt_PKG_CONFIG"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -+printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } -+else -+ { 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 -+ PKG_CONFIG="" -+ 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 -+ PKG_CONFIG=$ac_pt_PKG_CONFIG -+ fi -+else -+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -+fi -+ -+fi -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=0.9.0 -+ { 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 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ PKG_CONFIG="" -+ fi -+ -+fi 6> /dev/null -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MesaGL" >&5 -+printf %s "checking for MesaGL... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$MesaGL_CFLAGS"; then -+ pkg_cv_MesaGL_CFLAGS="$MesaGL_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_MesaGL_CFLAGS=`$PKG_CONFIG --cflags "$fl_pkgname" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$MesaGL_LIBS"; then -+ pkg_cv_MesaGL_LIBS="$MesaGL_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_MesaGL_LIBS=`$PKG_CONFIG --libs "$fl_pkgname" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ MesaGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$fl_pkgname"` -+ else -+ MesaGL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$fl_pkgname"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$MesaGL_PKG_ERRORS" >&5 -+ -+ -+ if test "x$ac_find_libraries" = "x"; then -+ if test "xglEnable" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glEnable in -lMesaGL" >&5 -+printf %s "checking for glEnable in -lMesaGL... " >&6; } -+if test ${ac_cv_lib_MesaGL_glEnable+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lMesaGL $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char glEnable (void); -+int -+main (void) -+{ -+return glEnable (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_MesaGL_glEnable=yes -+else case e in #( -+ e) ac_cv_lib_MesaGL_glEnable=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_MesaGL_glEnable" >&5 -+printf "%s\n" "$ac_cv_lib_MesaGL_glEnable" >&6; } -+if test "x$ac_cv_lib_MesaGL_glEnable" = xyes -+then : -+ ac_find_libraries="std" -+fi -+ -+ fi -+ fi -+ -+ if test "x$ac_find_libraries" = "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 -+printf %s "checking elsewhere... " >&6; } -+ -+ ac_find_libraries= -+ for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB -+ do -+ for ac_extension in a so sl dylib dll.a; do -+ if test -f "$ac_dir/libMesaGL.$ac_extension"; then -+ ac_find_libraries=$ac_dir -+ break 2 -+ fi -+ done -+ done -+ -+ if test "x$ac_find_libraries" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ fi -+ fi -+ -+elif test $pkg_failed = untried; then -+ -+ if test "x$ac_find_libraries" = "x"; then -+ if test "xglEnable" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glEnable in -lMesaGL" >&5 -+printf %s "checking for glEnable in -lMesaGL... " >&6; } -+if test ${ac_cv_lib_MesaGL_glEnable+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lMesaGL $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char glEnable (void); -+int -+main (void) -+{ -+return glEnable (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_MesaGL_glEnable=yes -+else case e in #( -+ e) ac_cv_lib_MesaGL_glEnable=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_MesaGL_glEnable" >&5 -+printf "%s\n" "$ac_cv_lib_MesaGL_glEnable" >&6; } -+if test "x$ac_cv_lib_MesaGL_glEnable" = xyes -+then : -+ ac_find_libraries="std" -+fi -+ -+ fi -+ fi -+ -+ if test "x$ac_find_libraries" = "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5 -+printf %s "checking elsewhere... " >&6; } -+ -+ ac_find_libraries= -+ for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB -+ do -+ for ac_extension in a so sl dylib dll.a; do -+ if test -f "$ac_dir/libMesaGL.$ac_extension"; then -+ ac_find_libraries=$ac_dir -+ break 2 -+ fi -+ done -+ done -+ -+ if test "x$ac_find_libraries" != "x"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ fi -+ fi -+ -+else -+ MesaGL_CFLAGS=$pkg_cv_MesaGL_CFLAGS -+ MesaGL_LIBS=$pkg_cv_MesaGL_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ ac_find_libraries="std" -+ -+ eval ac_find_cflags=\$MesaGL_CFLAGS -+ eval fl_libs=\$MesaGL_LIBS -+ -+ for fl_path in $fl_libs -+ do -+ if test `echo "$fl_path" | cut -c 1-2` = "-L"; then -+ ac_find_libraries=`echo "$fl_path" | cut -c 3-` -+ fi -+ done -+ -+fi -+ -+ if test "$ac_find_libraries" != "" ; then -+ if test "$ac_find_libraries" != "std" ; then -+ -+ if test "$ac_find_libraries" = "default location"; then -+ ac_path_to_link="" -+ else -+ echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null -+ result=$? -+ if test $result = 0; then -+ ac_path_to_link="" -+ else -+ ac_path_to_link=" -L$ac_find_libraries" -+ fi -+ fi -+ -+ if test "$ac_path_to_link" != " -L/usr/lib" ; then -+ LDFLAGS_GL="$LDFLAGS_GL $ac_path_to_link" -+ fi -+ fi -+ OPENGL_LIBS="-lMesaGL -lMesaGLU" -+ fi -+ fi -+ -+fi -+ -+ -+fi -+ -+ -+ if test "x$OPENGL_LIBS" = "x"; then -+ if test "$wxUSE_OPENGL" = "yes"; then -+ as_fn_error $? "OpenGL libraries not available" "$LINENO" 5 -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: OpenGL libraries not available, disabling support for OpenGL" >&5 -+printf "%s\n" "$as_me: WARNING: OpenGL libraries not available, disabling support for OpenGL" >&2;} -+ wxUSE_OPENGL=no -+ USE_OPENGL=0 -+ fi -+ fi -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5 -+printf "%s\n" "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;} -+ wxUSE_OPENGL="no" -+ fi -+ -+ if test "$wxUSE_OPENGL" = "auto"; then -+ wxUSE_OPENGL=yes -+ fi -+ -+ if test "$wxUSE_OPENGL" = "yes"; then -+ USE_OPENGL=1 -+ printf "%s\n" "#define wxUSE_OPENGL 1" >>confdefs.h -+ -+ printf "%s\n" "#define wxUSE_GLCANVAS 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl/cube opengl/penguin opengl/isosurf opengl/pyramid" -+ SAMPLES_SUBTREES="$SAMPLES_SUBTREES opengl" -+ fi -+fi -+ -+ -+if test -n "$TOOLKIT" ; then -+ TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WX${TOOLKIT}__" -+fi -+ -+ -+ -+if test "$wxUSE_SHARED" = "yes"; then -+ -+ -+ case "${host}" in -+ *-*-cygwin* | *-*-mingw* ) -+ wx_cv_version_script=no -+ ;; -+ -+ *) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker accepts --version-script" >&5 -+printf %s "checking if the linker accepts --version-script... " >&6; } -+if test ${wx_cv_version_script+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ echo "VER_1 { *; };" >conftest.sym -+ echo "int main() { return 0; }" >conftest.cpp -+ -+ if { ac_try=' -+ $CXX -o conftest.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp -+ -Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; } ; then -+ if test -s conftest.stderr ; then -+ wx_cv_version_script=no -+ else -+ wx_cv_version_script=yes -+ fi -+ else -+ wx_cv_version_script=no -+ fi -+ -+ if test $wx_cv_version_script = yes -+ then -+ echo "struct B { virtual ~B() { } }; \ -+ struct D : public B { }; \ -+ void F() { D d; }" > conftest.cpp -+ -+ if { ac_try=' -+ $CXX -shared -fPIC -o conftest1.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp -+ -Wl,--version-script,conftest.sym >/dev/null 2>/dev/null' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; } && -+ { ac_try=' -+ $CXX -shared -fPIC -o conftest2.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp -+ -Wl,--version-script,conftest.sym conftest1.output >/dev/null 2>/dev/null' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; } -+ then -+ if { ac_try=' -+ $CXX -shared -fPIC -o conftest3.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp -+ -Wl,--version-script,conftest.sym conftest2.output conftest1.output >/dev/null 2>/dev/null' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; } -+ then -+ wx_cv_version_script=yes -+ else -+ wx_cv_version_script=no -+ fi -+ fi -+ fi -+ -+ rm -f conftest.output conftest.stderr conftest.sym conftest.cpp -+ rm -f conftest1.output conftest2.output conftest3.output -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_version_script" >&5 -+printf "%s\n" "$wx_cv_version_script" >&6; } -+ -+ if test $wx_cv_version_script = yes ; then -+ LDFLAGS_VERSIONING="-Wl,--version-script,\$(wx_top_builddir)/version-script" -+ fi -+ ;; -+ esac -+ -+ -+ if test "$wxUSE_VISIBILITY" != "no"; then -+ -+ -+ if test -n "$GCC"; then -+ CFLAGS_VISIBILITY="-fvisibility=hidden" -+ CXXFLAGS_VISIBILITY="-fvisibility=hidden -fvisibility-inlines-hidden" -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for symbols visibility support" >&5 -+printf %s "checking for symbols visibility support... " >&6; } -+ if test ${wx_cv_cc_visibility+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ wx_save_CXXFLAGS="$CXXFLAGS" -+ CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY" -+ ac_ext=cpp -+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 -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ /* we need gcc >= 4.0, older versions with visibility support -+ didn't have class visibility: */ -+ #if defined(__GNUC__) && __GNUC__ < 4 -+ error this gcc is too old; -+ #endif -+ -+ /* visibility only makes sense for ELF shared libs: */ -+ #if !defined(__ELF__) && !defined(__APPLE__) -+ error this platform has no visibility; -+ #endif -+ -+ /* At the time of Xcode 4.1 / Clang 3, Clang++ still didn't -+ have the bugs sorted out. These were fixed starting with -+ Xcode 4.6.0 / Apple Clang 4.2 (which is based on Clang 3.2 so -+ check for that version too). */ -+ #ifdef __clang__ -+ #ifdef __APPLE__ -+ #if __clang_major__ < 4 \ -+ || (__clang_major__ == 4 && __clang_minor__ < 2) -+ error Clang compiler version < 4.2 is broken w.r.t. visibility; -+ #endif -+ #else -+ #if __clang_major__ < 3 \ -+ || (__clang_major__ == 3 && __clang_minor__ < 2) -+ error Clang compiler version < 3.2 is broken w.r.t. visibility; -+ #endif -+ #endif -+ #endif -+ -+ 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); -+ class __attribute__((__visibility__("default"))) Foo { -+ Foo() {} -+ }; -+ -+int -+main (void) -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_cc_visibility=yes -+else case e in #( -+ e) wx_cv_cc_visibility=no ;; -+esac -+fi -+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' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ CXXFLAGS="$wx_save_CXXFLAGS" ;; -+esac -+fi -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_cc_visibility" >&5 -+printf "%s\n" "$wx_cv_cc_visibility" >&6; } -+ if test $wx_cv_cc_visibility = yes; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for broken libstdc++ visibility" >&5 -+printf %s "checking for broken libstdc++ visibility... " >&6; } -+ if test ${wx_cv_cc_broken_libstdcxx_visibility+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ wx_save_CXXFLAGS="$CXXFLAGS" -+ wx_save_LDFLAGS="$LDFLAGS" -+ CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY" -+ LDFLAGS="$LDFLAGS -shared -fPIC" -+ ac_ext=cpp -+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 -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ -+int -+main (void) -+{ -+ -+ std::string s("hello"); -+ return s.length(); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_link "$LINENO" -+then : -+ wx_cv_cc_broken_libstdcxx_visibility=no -+else case e in #( -+ e) wx_cv_cc_broken_libstdcxx_visibility=yes ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ 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 -+ -+ CXXFLAGS="$wx_save_CXXFLAGS" -+ LDFLAGS="$wx_save_LDFLAGS" ;; -+esac -+fi -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_cc_broken_libstdcxx_visibility" >&5 -+printf "%s\n" "$wx_cv_cc_broken_libstdcxx_visibility" >&6; } -+ -+ if test $wx_cv_cc_broken_libstdcxx_visibility = yes; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we can work around it" >&5 -+printf %s "checking whether we can work around it... " >&6; } -+ if test ${wx_cv_cc_visibility_workaround+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ ac_ext=cpp -+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 -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #pragma GCC visibility push(default) -+ #include -+ #pragma GCC visibility pop -+ -+int -+main (void) -+{ -+ -+ std::string s("hello"); -+ return s.length(); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_link "$LINENO" -+then : -+ wx_cv_cc_visibility_workaround=no -+else case e in #( -+ e) wx_cv_cc_visibility_workaround=yes ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ 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 -+ -+ ;; -+esac -+fi -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_cc_visibility_workaround" >&5 -+printf "%s\n" "$wx_cv_cc_visibility_workaround" >&6; } -+ -+ if test $wx_cv_cc_visibility_workaround = no; then -+ wx_cv_cc_visibility=no -+ fi -+ fi -+ fi -+ -+ if test $wx_cv_cc_visibility = yes; then -+ printf "%s\n" "#define HAVE_VISIBILITY 1" >>confdefs.h -+ -+ if test $wx_cv_cc_broken_libstdcxx_visibility = yes; then -+ printf "%s\n" "#define HAVE_BROKEN_LIBSTDCXX_VISIBILITY 1" >>confdefs.h -+ -+ fi -+ else -+ CFLAGS_VISIBILITY="" -+ CXXFLAGS_VISIBILITY="" -+ fi -+ -+ -+ fi -+ -+ fi -+ -+ if test "x$SUNCXX" = xyes; then -+ SAMPLES_RPATH_FLAG="-R\$(wx_top_builddir)/lib" -+ WXCONFIG_RPATH="-R\$libdir" -+ else -+ case "${host}" in -+ *-*-linux* | *-*-gnu* ) -+ SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib" -+ WXCONFIG_RPATH="-Wl,-rpath,\$libdir" -+ ;; -+ -+ *-*-solaris2* ) -+ -+ CPPFLAGS="$CPPFLAGS -isystem /usr/openwin/include" -+ -+ saveLdflags="$LDFLAGS" -+ LDFLAGS="$saveLdflags -Wl,-rpath,/" -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker accepts -rpath" >&5 -+printf %s "checking if the linker accepts -rpath... " >&6; } -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib" -+ WXCONFIG_RPATH="-Wl,-rpath,\$libdir" -+ -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker accepts -R" >&5 -+printf %s "checking if the linker accepts -R... " >&6; } -+ LDFLAGS="$saveLdflags -Wl,-R,/" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ SAMPLES_RPATH_FLAG="-Wl,-R,\$(wx_top_builddir)/lib" -+ WXCONFIG_RPATH="-Wl,-R,\$libdir" -+ -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ LDFLAGS="$saveLdflags" -+ ;; -+ -+ *-*-darwin* ) -+ install_name_tool=`which ${HOST_PREFIX}install_name_tool` -+ if test "$install_name_tool" -a -x "$install_name_tool"; then -+ DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@" -+ cat <change-install-names -+#!/bin/sh -+libnames=\`cd lib ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\` -+changes='' -+for dep in \${libnames} ; do -+ changes="\${changes} -change \${4}/\${dep} \${3}/\${dep}" -+done -+for i in \${libnames} ; do -+ if test -L \${1}/\${i}; then -+ # skip symbolic links -+ continue -+ fi -+ ${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${1}/\${i} -+done -+ -+if test -f "\${2}/wxrc-${WX_RELEASE}" ; then -+ ${HOST_PREFIX}install_name_tool \${changes} \${2}/wxrc-${WX_RELEASE} -+fi -+EOF -+ chmod +x change-install-names -+ DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib" -+ fi -+ -+ HEADER_PAD_OPTION="-headerpad_max_install_names" -+ ;; -+ -+ *-*-cygwin* | *-*-mingw32* | *-*-mingw64* ) -+ ;; -+ -+ *-*-hpux* ) -+ SAMPLES_RPATH_FLAG="-Wl,+b,\$(wx_top_builddir)/lib" -+ WXCONFIG_RPATH="-Wl,+b,\$libdir" -+ ;; -+ -+ esac -+ fi -+ -+ if test $wxUSE_RPATH = "no"; then -+ SAMPLES_RPATH_FLAG='' -+ DYLIB_PATH_POSTLINK='' -+ WXCONFIG_RPATH='' -+ fi -+ -+ SHARED=1 -+ -+else -+ -+ config_linkage_component="-static" -+ SHARED=0 -+ -+fi -+ -+ -+UNICODE=0 -+lib_unicode_suffix= -+WX_CHARTYPE="ansi" -+if test "$wxUSE_UNICODE" = "yes"; then -+ lib_unicode_suffix=u -+ WX_CHARTYPE="unicode" -+ UNICODE=1 -+fi -+ -+WX_FLAVOUR=${WX_FLAVOUR:+-$WX_FLAVOUR} -+WX_LIB_FLAVOUR=`echo $WX_FLAVOUR | tr '-' '_'` -+ -+DEBUG_INFO=0 -+if test "$wxUSE_DEBUG_INFO" = "yes"; then -+ DEBUG_INFO=1 -+fi -+ -+WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[a-z]' '[A-Z]'` -+ -+TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}" -+ -+TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}" -+ -+ -+if test "$wxUSE_OSX_COCOA" = 1; then -+ WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${WX_LIB_FLAVOUR}" -+else -+ WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${WX_LIB_FLAVOUR}" -+fi -+WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}" -+ -+ -+ -+ -+ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default" -+if test "x$ac_cv_type_ssize_t" = xyes -+then : -+ -+printf "%s\n" "#define HAVE_SSIZE_T 1" >>confdefs.h -+ -+ -+fi -+ -+ -+ac_ext=cpp -+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 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if size_t is unsigned int" >&5 -+printf %s "checking if size_t is unsigned int... " >&6; } -+if test ${wx_cv_size_t_is_uint+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+ -+ return 0; } -+ -+ struct Foo { void foo(size_t); void foo(unsigned int); }; -+ -+ int bar() { -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_size_t_is_uint=no -+else case e in #( -+ e) wx_cv_size_t_is_uint=yes -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_size_t_is_uint" >&5 -+printf "%s\n" "$wx_cv_size_t_is_uint" >&6; } -+ -+if test "$wx_cv_size_t_is_uint" = "yes"; then -+ printf "%s\n" "#define wxSIZE_T_IS_UINT 1" >>confdefs.h -+ -+else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if size_t is unsigned long" >&5 -+printf %s "checking if size_t is unsigned long... " >&6; } -+if test ${wx_cv_size_t_is_ulong+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+ -+ return 0; } -+ -+ struct Foo { void foo(size_t); void foo(unsigned long); }; -+ -+ int bar() { -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_size_t_is_ulong=no -+else case e in #( -+ e) wx_cv_size_t_is_ulong=yes -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_size_t_is_ulong" >&5 -+printf "%s\n" "$wx_cv_size_t_is_ulong" >&6; } -+ -+ if test "$wx_cv_size_t_is_ulong" = "yes"; then -+ printf "%s\n" "#define wxSIZE_T_IS_ULONG 1" >>confdefs.h -+ -+ fi -+fi -+ -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if wchar_t is separate type" >&5 -+printf %s "checking if wchar_t is separate type... " >&6; } -+if test ${wx_cv_wchar_t_is_separate_type+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+ -+ return 0; } -+ -+ struct Foo { void foo(wchar_t); -+ void foo(unsigned short); -+ void foo(unsigned int); -+ void foo(unsigned long); }; -+ -+ int bar() { -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_wchar_t_is_separate_type=yes -+else case e in #( -+ e) wx_cv_wchar_t_is_separate_type=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_wchar_t_is_separate_type" >&5 -+printf "%s\n" "$wx_cv_wchar_t_is_separate_type" >&6; } -+ -+if test "$wx_cv_wchar_t_is_separate_type" = "yes"; then -+ printf "%s\n" "#define wxWCHAR_T_IS_REAL_TYPE 1" >>confdefs.h -+ -+else -+ printf "%s\n" "#define wxWCHAR_T_IS_REAL_TYPE 0" >>confdefs.h -+ -+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 -+ -+ -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pw_gecos in struct passwd" >&5 -+printf %s "checking for pw_gecos in struct passwd... " >&6; } -+if test ${wx_cv_struct_pw_gecos+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+ -+ char *p; -+ struct passwd *pw; -+ p = pw->pw_gecos; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ -+ wx_cv_struct_pw_gecos=yes -+ -+else case e in #( -+ e) -+ wx_cv_struct_pw_gecos=no -+ -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_struct_pw_gecos" >&5 -+printf "%s\n" "$wx_cv_struct_pw_gecos" >&6; } -+ -+if test "$wx_cv_struct_pw_gecos" = "yes"; then -+ printf "%s\n" "#define HAVE_PW_GECOS 1" >>confdefs.h -+ -+fi -+ -+ -+WCSLEN_FOUND=0 -+WCHAR_LINK= -+ -+ for ac_func in wcslen -+do : -+ ac_fn_c_check_func "$LINENO" "wcslen" "ac_cv_func_wcslen" -+if test "x$ac_cv_func_wcslen" = xyes -+then : -+ printf "%s\n" "#define HAVE_WCSLEN 1" >>confdefs.h -+ WCSLEN_FOUND=1 -+fi -+ -+done -+ -+if test "$WCSLEN_FOUND" = 0; then -+ if test "$TOOLKIT" = "MSW"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wcslen in -lmsvcrt" >&5 -+printf %s "checking for wcslen in -lmsvcrt... " >&6; } -+if test ${ac_cv_lib_msvcrt_wcslen+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lmsvcrt $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char wcslen (void); -+int -+main (void) -+{ -+return wcslen (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_msvcrt_wcslen=yes -+else case e in #( -+ e) ac_cv_lib_msvcrt_wcslen=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_msvcrt_wcslen" >&5 -+printf "%s\n" "$ac_cv_lib_msvcrt_wcslen" >&6; } -+if test "x$ac_cv_lib_msvcrt_wcslen" = xyes -+then : -+ WCHAR_OK=1 -+fi -+ -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wcslen in -lw" >&5 -+printf %s "checking for wcslen in -lw... " >&6; } -+if test ${ac_cv_lib_w_wcslen+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lw $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char wcslen (void); -+int -+main (void) -+{ -+return wcslen (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_w_wcslen=yes -+else case e in #( -+ e) ac_cv_lib_w_wcslen=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_w_wcslen" >&5 -+printf "%s\n" "$ac_cv_lib_w_wcslen" >&6; } -+if test "x$ac_cv_lib_w_wcslen" = xyes -+then : -+ -+ WCHAR_LINK=" -lw" -+ WCSLEN_FOUND=1 -+ -+fi -+ -+ fi -+fi -+ -+if test "$WCSLEN_FOUND" = 1; then -+ printf "%s\n" "#define HAVE_WCSLEN 1" >>confdefs.h -+ -+fi -+ -+ac_fn_c_check_func "$LINENO" "wcsftime" "ac_cv_func_wcsftime" -+if test "x$ac_cv_func_wcsftime" = xyes -+then : -+ printf "%s\n" "#define HAVE_WCSFTIME 1" >>confdefs.h -+ -+fi -+ -+ -+if test "$wxUSE_MAC" != 1; then -+ ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen" -+if test "x$ac_cv_func_strnlen" = xyes -+then : -+ printf "%s\n" "#define HAVE_STRNLEN 1" >>confdefs.h -+ -+fi -+ac_fn_c_check_func "$LINENO" "wcsdup" "ac_cv_func_wcsdup" -+if test "x$ac_cv_func_wcsdup" = xyes -+then : -+ printf "%s\n" "#define HAVE_WCSDUP 1" >>confdefs.h -+ -+fi -+ac_fn_c_check_func "$LINENO" "wcsnlen" "ac_cv_func_wcsnlen" -+if test "x$ac_cv_func_wcsnlen" = xyes -+then : -+ printf "%s\n" "#define HAVE_WCSNLEN 1" >>confdefs.h -+ -+fi -+ac_fn_c_check_func "$LINENO" "wcscasecmp" "ac_cv_func_wcscasecmp" -+if test "x$ac_cv_func_wcscasecmp" = xyes -+then : -+ printf "%s\n" "#define HAVE_WCSCASECMP 1" >>confdefs.h -+ -+fi -+ac_fn_c_check_func "$LINENO" "wcsncasecmp" "ac_cv_func_wcsncasecmp" -+if test "x$ac_cv_func_wcsncasecmp" = xyes -+then : -+ printf "%s\n" "#define HAVE_WCSNCASECMP 1" >>confdefs.h -+ -+fi -+ -+fi -+ -+if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then -+ CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS" -+fi -+ -+ac_fn_c_check_type "$LINENO" "mbstate_t" "ac_cv_type_mbstate_t" "#include -+" -+if test "x$ac_cv_type_mbstate_t" = xyes -+then : -+ -+printf "%s\n" "#define HAVE_MBSTATE_T 1" >>confdefs.h -+ -+ac_fn_c_check_func "$LINENO" "wcsrtombs" "ac_cv_func_wcsrtombs" -+if test "x$ac_cv_func_wcsrtombs" = xyes -+then : -+ printf "%s\n" "#define HAVE_WCSRTOMBS 1" >>confdefs.h -+ -+fi -+ -+fi -+ -+ -+ -+ for wx_func in snprintf vsnprintf vsscanf -+ do -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+ -+ $ac_includes_default -+ -+int -+main (void) -+{ -+ -+ #ifndef $wx_func -+ &$wx_func; -+ #endif -+ -+ -+ ; -+ return 0; -+} -+ -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ eval wx_cv_func_$wx_func=yes -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ ;; -+esac -+fi -+eval ac_res=\$wx_cv_func_$wx_func -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+printf "%s\n" "$ac_res" >&6; } -+ -+ if eval test \$wx_cv_func_$wx_func = yes -+ then -+ cat >>confdefs.h <<_ACEOF -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 -+_ACEOF -+ -+ -+ else -+ : -+ -+ fi -+ done -+ -+ -+ac_ext=cpp -+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 -+ -+if test "$wx_cv_func_vsnprintf" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if vsnprintf declaration is broken" >&5 -+printf %s "checking if vsnprintf declaration is broken... " >&6; } -+if test ${wx_cv_func_broken_vsnprintf_decl+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ #include -+ -+int -+main (void) -+{ -+ -+ char *buf; -+ va_list ap; -+ const char *fmt = "%s"; -+ vsnprintf(buf, 10u, fmt, ap); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_func_broken_vsnprintf_decl=no -+else case e in #( -+ e) wx_cv_func_broken_vsnprintf_decl=yes -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_broken_vsnprintf_decl" >&5 -+printf "%s\n" "$wx_cv_func_broken_vsnprintf_decl" >&6; } -+ -+ if test "$wx_cv_func_broken_vsnprintf_decl" = "yes"; then -+ printf "%s\n" "#define HAVE_BROKEN_VSNPRINTF_DECL 1" >>confdefs.h -+ -+ fi -+fi -+ -+if test "$wx_cv_func_snprintf" = "yes"; then -+ if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if snprintf supports positional arguments" >&5 -+printf %s "checking if snprintf supports positional arguments... " >&6; } -+if test ${wx_cv_func_snprintf_pos_params+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ if test "$cross_compiling" = yes -+then : -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Assuming Unix98 printf() is not available, -+define HAVE_UNIX98_PRINTF as 1 in setup.h if it is available." >&5 -+printf "%s\n" "$as_me: WARNING: Assuming Unix98 printf() is not available, -+define HAVE_UNIX98_PRINTF as 1 in setup.h if it is available." >&2;} -+ wx_cv_func_snprintf_pos_params=no -+ -+ -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ -+ int main (void) -+ { -+ char buffer[128]; -+ snprintf (buffer, 128, "%2$d %3$d %1$d", 1, 2, 3); -+ if (strcmp ("2 3 1", buffer) == 0) -+ exit (0); -+ exit (1); -+ } -+ -+_ACEOF -+if ac_fn_cxx_try_run "$LINENO" -+then : -+ wx_cv_func_snprintf_pos_params=no -+else case e in #( -+ e) wx_cv_func_snprintf_pos_params=yes ;; -+esac -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+ -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_snprintf_pos_params" >&5 -+printf "%s\n" "$wx_cv_func_snprintf_pos_params" >&6; } -+ -+ if test "$wx_cv_func_snprintf_pos_params" = "yes"; then -+ printf "%s\n" "#define HAVE_UNIX98_PRINTF 1" >>confdefs.h -+ -+ fi -+ fi -+fi -+ -+if test "$wx_cv_func_vsscanf" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if vsscanf() declaration is broken" >&5 -+printf %s "checking if vsscanf() declaration is broken... " >&6; } -+if test ${wx_cv_func_broken_vsscanf_decl+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ #include -+ -+int -+main (void) -+{ -+ -+ const char *buf; -+ va_list args; -+ vsscanf(buf, "%s", args); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_func_broken_vsscanf_decl=no -+else case e in #( -+ e) wx_cv_func_broken_vsscanf_decl=yes -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_broken_vsscanf_decl" >&5 -+printf "%s\n" "$wx_cv_func_broken_vsscanf_decl" >&6; } -+ -+ if test "$wx_cv_func_broken_vsscanf_decl" = "yes"; then -+ printf "%s\n" "#define HAVE_BROKEN_VSSCANF_DECL 1" >>confdefs.h -+ -+ fi -+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 -+ -+ -+wchar_headers="#include -+#include " -+case "${host}" in -+ *-*-solaris2* ) -+ ac_fn_c_check_header_compile "$LINENO" "widec.h" "ac_cv_header_widec_h" "$ac_includes_default -+" -+if test "x$ac_cv_header_widec_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_WIDEC_H 1" >>confdefs.h -+ -+fi -+ -+ if test "$ac_cv_header_widec_h" = "yes"; then -+ wchar_headers="$wchar_headers -+#include " -+ fi -+esac -+ -+ -+ for wx_func in putws fputws wprintf vswprintf vswscanf -+ do -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+ $wchar_headers -+ $ac_includes_default -+ -+int -+main (void) -+{ -+ -+ #ifndef $wx_func -+ &$wx_func; -+ #endif -+ -+ -+ ; -+ return 0; -+} -+ -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ eval wx_cv_func_$wx_func=yes -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ ;; -+esac -+fi -+eval ac_res=\$wx_cv_func_$wx_func -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+printf "%s\n" "$ac_res" >&6; } -+ -+ if eval test \$wx_cv_func_$wx_func = yes -+ then -+ cat >>confdefs.h <<_ACEOF -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 -+_ACEOF -+ -+ -+ else -+ : -+ -+ fi -+ done -+ -+ -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _vsnwprintf" >&5 -+printf %s "checking for _vsnwprintf... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+&_vsnwprintf; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ printf "%s\n" "#define HAVE__VSNWPRINTF 1" >>confdefs.h -+ -+else case e in #( -+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext; -+ -+if test "$wxUSE_FILE" = "yes"; then -+ -+ for wx_func in fsync -+ do -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+ -+ $ac_includes_default -+ -+int -+main (void) -+{ -+ -+ #ifndef $wx_func -+ &$wx_func; -+ #endif -+ -+ -+ ; -+ return 0; -+} -+ -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ eval wx_cv_func_$wx_func=yes -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ ;; -+esac -+fi -+eval ac_res=\$wx_cv_func_$wx_func -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+printf "%s\n" "$ac_res" >&6; } -+ -+ if eval test \$wx_cv_func_$wx_func = yes -+ then -+ cat >>confdefs.h <<_ACEOF -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 -+_ACEOF -+ -+ -+ else -+ : -+ -+ fi -+ done -+ -+fi -+ -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for round" >&5 -+printf %s "checking for round... " >&6; } -+if test ${wx_cv_func_round+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ac_ext=cpp -+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 -+ -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+return int(round(0.0)) -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_link "$LINENO" -+then : -+ wx_cv_func_round=yes -+else case e in #( -+ e) wx_cv_func_round=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+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 -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_round" >&5 -+printf "%s\n" "$wx_cv_func_round" >&6; } -+if test "$wx_cv_func_round" = yes; then -+ printf "%s\n" "#define HAVE_ROUND 1" >>confdefs.h -+ -+fi -+ -+if test "$TOOLKIT" != "MSW"; then -+ -+if test "$wxUSE_LIBICONV" != "no" ; then -+ ac_ext=cpp -+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 -+ -+ -+ -+ -+# Check whether --with-libiconv-prefix was given. -+if test ${with_libiconv_prefix+y} -+then : -+ withval=$with_libiconv_prefix; -+ for dir in `echo "$withval" | tr : ' '`; do -+ if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi -+ if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi -+ done -+ -+fi -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 -+printf %s "checking for iconv... " >&6; } -+if test ${am_cv_func_iconv+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ am_cv_func_iconv="no, consider installing GNU libiconv" -+ am_cv_lib_iconv=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+#include -+int -+main (void) -+{ -+iconv_t cd = iconv_open("",""); -+ iconv(cd,NULL,NULL,NULL,NULL); -+ iconv_close(cd); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_link "$LINENO" -+then : -+ am_cv_func_iconv=yes -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ if test "$am_cv_func_iconv" != yes; then -+ am_save_LIBS="$LIBS" -+ LIBS="$LIBS -liconv" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+#include -+int -+main (void) -+{ -+iconv_t cd = iconv_open("",""); -+ iconv(cd,NULL,NULL,NULL,NULL); -+ iconv_close(cd); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_link "$LINENO" -+then : -+ am_cv_lib_iconv=yes -+ am_cv_func_iconv=yes -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ LIBS="$am_save_LIBS" -+ fi -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 -+printf "%s\n" "$am_cv_func_iconv" >&6; } -+ if test "$am_cv_func_iconv" = yes; then -+ -+printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if iconv needs const" >&5 -+printf %s "checking if iconv needs const... " >&6; } -+if test ${wx_cv_func_iconv_const+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+#include -+#include -+extern -+#ifdef __cplusplus -+"C" -+#endif -+#if defined(__STDC__) || defined(__cplusplus) -+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -+#else -+size_t iconv(); -+#endif -+ -+int -+main (void) -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_func_iconv_const="no" -+else case e in #( -+ e) wx_cv_func_iconv_const="yes" -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_iconv_const" >&5 -+printf "%s\n" "$wx_cv_func_iconv_const" >&6; } -+ -+ iconv_const= -+ if test "x$wx_cv_func_iconv_const" = "xyes"; then -+ iconv_const="const" -+ fi -+ -+ -+printf "%s\n" "#define ICONV_CONST $iconv_const" >>confdefs.h -+ -+ fi -+ LIBICONV= -+ if test "$am_cv_lib_iconv" = yes; then -+ LIBICONV="-liconv" -+ 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 -+ -+ LIBS="$LIBICONV $LIBS" -+fi -+ -+if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then -+ ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction" -+if test "x$ac_cv_func_sigaction" = xyes -+then : -+ printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h -+ -+fi -+ -+ -+ if test "$ac_cv_func_sigaction" = "no"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: No POSIX signal functions on this system, wxApp::OnFatalException will not be called" >&5 -+printf "%s\n" "$as_me: WARNING: No POSIX signal functions on this system, wxApp::OnFatalException will not be called" >&2;} -+ wxUSE_ON_FATAL_EXCEPTION=no -+ fi -+ -+ if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sa_handler type" >&5 -+printf %s "checking for sa_handler type... " >&6; } -+if test ${wx_cv_type_sa_handler+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ ac_ext=cpp -+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 -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+ -+ extern void testSigHandler(int); -+ -+ struct sigaction sa; -+ sa.sa_handler = testSigHandler; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ -+ wx_cv_type_sa_handler=int -+ -+else case e in #( -+ e) -+ wx_cv_type_sa_handler=void -+ ;; -+esac -+fi -+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' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_sa_handler" >&5 -+printf "%s\n" "$wx_cv_type_sa_handler" >&6; } -+ -+ printf "%s\n" "#define wxTYPE_SA_HANDLER $wx_cv_type_sa_handler" >>confdefs.h -+ -+ fi -+fi -+ -+if test "$wxUSE_STACKWALKER" = "yes" -a "$wxUSE_UNIX" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for backtrace()" >&5 -+printf %s "checking for backtrace()... " >&6; } -+if test ${wx_cv_func_backtrace+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ ac_ext=cpp -+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 -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+ -+ void *trace[1]; -+ char **messages; -+ backtrace(trace, 1); -+ messages = backtrace_symbols(trace, 1); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_func_backtrace=yes -+else case e in #( -+ e) wx_cv_func_backtrace=no -+ ;; -+esac -+fi -+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' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_backtrace" >&5 -+printf "%s\n" "$wx_cv_func_backtrace" >&6; } -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing backtrace" >&5 -+printf %s "checking for library containing backtrace... " >&6; } -+if test ${ac_cv_search_backtrace+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_func_search_save_LIBS=$LIBS -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char backtrace (void); -+int -+main (void) -+{ -+return backtrace (); -+ ; -+ return 0; -+} -+_ACEOF -+for ac_lib in '' execinfo -+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 : -+ ac_cv_search_backtrace=$ac_res -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext -+ if test ${ac_cv_search_backtrace+y} -+then : -+ break -+fi -+done -+if test ${ac_cv_search_backtrace+y} -+then : -+ -+else case e in #( -+ e) ac_cv_search_backtrace=no ;; -+esac -+fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_backtrace" >&5 -+printf "%s\n" "$ac_cv_search_backtrace" >&6; } -+ac_res=$ac_cv_search_backtrace -+if test "$ac_res" != no -+then : -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+ -+else case e in #( -+ e) wx_cv_func_backtrace=no ;; -+esac -+fi -+ -+ -+ if test "$wx_cv_func_backtrace" = "no"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: backtrace() is not available, wxStackWalker will not be available" >&5 -+printf "%s\n" "$as_me: WARNING: backtrace() is not available, wxStackWalker will not be available" >&2;} -+ wxUSE_STACKWALKER=no -+ else -+ if test "$ac_cv_header_cxxabi_h" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __cxa_demangle() in " >&5 -+printf %s "checking for __cxa_demangle() in ... " >&6; } -+if test ${wx_cv_func_cxa_demangle+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ ac_ext=cpp -+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 -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+ -+ int rc; -+ __cxxabiv1::__cxa_demangle("foo", 0, 0, &rc); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_link "$LINENO" -+then : -+ wx_cv_func_cxa_demangle=yes -+else case e in #( -+ e) wx_cv_func_cxa_demangle=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ 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 -+ -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_cxa_demangle" >&5 -+printf "%s\n" "$wx_cv_func_cxa_demangle" >&6; } -+ else -+ wx_cv_func_cxa_demangle=no -+ fi -+ -+ if test "$wx_cv_func_cxa_demangle" = "yes"; then -+ printf "%s\n" "#define HAVE_CXA_DEMANGLE 1" >>confdefs.h -+ -+ fi -+ fi -+fi -+ -+if test "$wxUSE_STACKWALKER" = "yes" -a "$USE_WIN32" != 1 -a "$USE_UNIX" != 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&2;} -+ wxUSE_STACKWALKER=no -+fi -+ -+ -+ -+ for ac_func in mkstemp mktemp -+do : -+ as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | sed "$as_sed_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 `printf "%s\n" "HAVE_$ac_func" | sed "$as_sed_cpp"` 1 -+_ACEOF -+ break -+fi -+ -+done -+ -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for statfs" >&5 -+printf %s "checking for statfs... " >&6; } -+if test ${wx_cv_func_statfs+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #if defined(__BSD__) -+ #include -+ #include -+ #else -+ #include -+ #endif -+ -+int -+main (void) -+{ -+ -+ long l; -+ struct statfs fs; -+ statfs("/", &fs); -+ l = fs.f_bsize; -+ l += fs.f_blocks; -+ l += fs.f_bavail; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ wx_cv_func_statfs=yes -+else case e in #( -+ e) wx_cv_func_statfs=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_statfs" >&5 -+printf "%s\n" "$wx_cv_func_statfs" >&6; } -+ -+if test "$wx_cv_func_statfs" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for statfs declaration" >&5 -+printf %s "checking for statfs declaration... " >&6; } -+if test ${wx_cv_func_statfs_decl+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_ext=cpp -+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 -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #if defined(__BSD__) -+ #include -+ #include -+ #else -+ #include -+ #endif -+ -+int -+main (void) -+{ -+ -+ struct statfs fs; -+ statfs("", &fs); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_func_statfs_decl=yes -+else case e in #( -+ e) wx_cv_func_statfs_decl=no -+ ;; -+esac -+fi -+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' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_statfs_decl" >&5 -+printf "%s\n" "$wx_cv_func_statfs_decl" >&6; } -+ -+ if test "$wx_cv_func_statfs_decl" = "yes"; then -+ printf "%s\n" "#define HAVE_STATFS_DECL 1" >>confdefs.h -+ -+ fi -+ -+ wx_cv_type_statvfs_t="struct statfs" -+ printf "%s\n" "#define HAVE_STATFS 1" >>confdefs.h -+ -+else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for statvfs" >&5 -+printf %s "checking for statvfs... " >&6; } -+if test ${wx_cv_func_statvfs+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ #include -+ -+int -+main (void) -+{ -+ -+ statvfs("/", NULL); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ wx_cv_func_statvfs=yes -+else case e in #( -+ e) wx_cv_func_statvfs=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_statvfs" >&5 -+printf "%s\n" "$wx_cv_func_statvfs" >&6; } -+ -+ if test "$wx_cv_func_statvfs" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for statvfs argument type" >&5 -+printf %s "checking for statvfs argument type... " >&6; } -+if test ${wx_cv_type_statvfs_t+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_ext=cpp -+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 -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ -+int -+main (void) -+{ -+ -+ long l; -+ statvfs_t fs; -+ statvfs("/", &fs); -+ l = fs.f_bsize; -+ l += fs.f_blocks; -+ l += fs.f_bavail; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_type_statvfs_t=statvfs_t -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ -+int -+main (void) -+{ -+ -+ long l; -+ struct statvfs fs; -+ statvfs("/", &fs); -+ l = fs.f_bsize; -+ l += fs.f_blocks; -+ l += fs.f_bavail; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_type_statvfs_t="struct statvfs" -+else case e in #( -+ e) wx_cv_type_statvfs_t="unknown" -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+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' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_statvfs_t" >&5 -+printf "%s\n" "$wx_cv_type_statvfs_t" >&6; } -+ -+ if test "$wx_cv_type_statvfs_t" != "unknown"; then -+ printf "%s\n" "#define HAVE_STATVFS 1" >>confdefs.h -+ -+ fi -+ else -+ wx_cv_type_statvfs_t="unknown" -+ fi -+fi -+ -+if test "$wx_cv_type_statvfs_t" != "unknown"; then -+ printf "%s\n" "#define WX_STATFS_T $wx_cv_type_statvfs_t" >>confdefs.h -+ -+else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxGetDiskSpace() function won't work without statfs()" >&5 -+printf "%s\n" "$as_me: WARNING: wxGetDiskSpace() function won't work without statfs()" >&2;} -+fi -+ -+if test "$wxUSE_SNGLINST_CHECKER" = "yes" -a "$USE_WIN32" != 1 ; then -+ -+ for ac_func in fcntl flock -+do : -+ as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | sed "$as_sed_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 `printf "%s\n" "HAVE_$ac_func" | sed "$as_sed_cpp"` 1 -+_ACEOF -+ break -+fi -+ -+done -+ -+ if test "$ac_cv_func_fcntl" != "yes" -a "$ac_cv_func_flock" != "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxSingleInstanceChecker not available" >&5 -+printf "%s\n" "$as_me: WARNING: wxSingleInstanceChecker not available" >&2;} -+ wxUSE_SNGLINST_CHECKER=no -+ fi -+fi -+ -+ -+ for ac_func in setenv putenv -+do : -+ as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | sed "$as_sed_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 `printf "%s\n" "HAVE_$ac_func" | sed "$as_sed_cpp"` 1 -+_ACEOF -+ break -+fi -+ -+done -+if test "$ac_cv_func_setenv" = "yes"; then -+ ac_fn_c_check_func "$LINENO" "unsetenv" "ac_cv_func_unsetenv" -+if test "x$ac_cv_func_unsetenv" = xyes -+then : -+ printf "%s\n" "#define HAVE_UNSETENV 1" >>confdefs.h -+ -+fi -+ -+fi -+ -+if test "$USE_DARWIN" = 1; then -+ printf "%s\n" "#define HAVE_USLEEP 1" >>confdefs.h -+ -+else -+ POSIX4_LINK= -+ -+ for ac_func in nanosleep -+do : -+ ac_fn_c_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep" -+if test "x$ac_cv_func_nanosleep" = xyes -+then : -+ printf "%s\n" "#define HAVE_NANOSLEEP 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_NANOSLEEP 1" >>confdefs.h -+ -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lposix4" >&5 -+printf %s "checking for nanosleep in -lposix4... " >&6; } -+if test ${ac_cv_lib_posix4_nanosleep+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lposix4 $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char nanosleep (void); -+int -+main (void) -+{ -+return nanosleep (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_posix4_nanosleep=yes -+else case e in #( -+ e) ac_cv_lib_posix4_nanosleep=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_nanosleep" >&5 -+printf "%s\n" "$ac_cv_lib_posix4_nanosleep" >&6; } -+if test "x$ac_cv_lib_posix4_nanosleep" = xyes -+then : -+ -+ printf "%s\n" "#define HAVE_NANOSLEEP 1" >>confdefs.h -+ -+ POSIX4_LINK=" -lposix4" -+ -+else case e in #( -+ e) -+ -+ for wx_func in usleep -+ do -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+ -+ $ac_includes_default -+ -+int -+main (void) -+{ -+ -+ #ifndef $wx_func -+ &$wx_func; -+ #endif -+ -+ -+ ; -+ return 0; -+} -+ -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ eval wx_cv_func_$wx_func=yes -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ ;; -+esac -+fi -+eval ac_res=\$wx_cv_func_$wx_func -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+printf "%s\n" "$ac_res" >&6; } -+ -+ if eval test \$wx_cv_func_$wx_func = yes -+ then -+ cat >>confdefs.h <<_ACEOF -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 -+_ACEOF -+ -+ -+ else -+ : -+ as_fn_error $? "wxMicroSleep() can't be implemented" "$LINENO" 5 -+ -+ fi -+ done -+ -+ -+ ;; -+esac -+fi -+ -+ -+ ;; -+esac -+fi -+ -+done -+fi -+ -+ -+ for wx_func in uname -+ do -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+ #include -+ $ac_includes_default -+ -+int -+main (void) -+{ -+ -+ #ifndef $wx_func -+ &$wx_func; -+ #endif -+ -+ -+ ; -+ return 0; -+} -+ -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ eval wx_cv_func_$wx_func=yes -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ ;; -+esac -+fi -+eval ac_res=\$wx_cv_func_$wx_func -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+printf "%s\n" "$ac_res" >&6; } -+ -+ if eval test \$wx_cv_func_$wx_func = yes -+ then -+ cat >>confdefs.h <<_ACEOF -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 -+_ACEOF -+ -+ -+ else -+ : -+ -+ fi -+ done -+ -+if test "$wx_cv_func_uname" != yes; then -+ -+ for wx_func in gethostname -+ do -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+ -+ $ac_includes_default -+ -+int -+main (void) -+{ -+ -+ #ifndef $wx_func -+ &$wx_func; -+ #endif -+ -+ -+ ; -+ return 0; -+} -+ -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ eval wx_cv_func_$wx_func=yes -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ ;; -+esac -+fi -+eval ac_res=\$wx_cv_func_$wx_func -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+printf "%s\n" "$ac_res" >&6; } -+ -+ if eval test \$wx_cv_func_$wx_func = yes -+ then -+ cat >>confdefs.h <<_ACEOF -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 -+_ACEOF -+ -+ -+ else -+ : -+ -+ fi -+ done -+ -+fi -+ -+ -+ for wx_func in strtok_r -+ do -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+ #define _REENTRANT -+ $ac_includes_default -+ -+int -+main (void) -+{ -+ -+ #ifndef $wx_func -+ &$wx_func; -+ #endif -+ -+ -+ ; -+ return 0; -+} -+ -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ eval wx_cv_func_$wx_func=yes -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ ;; -+esac -+fi -+eval ac_res=\$wx_cv_func_$wx_func -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+printf "%s\n" "$ac_res" >&6; } -+ -+ if eval test \$wx_cv_func_$wx_func = yes -+ then -+ cat >>confdefs.h <<_ACEOF -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 -+_ACEOF -+ -+ -+ else -+ : -+ -+ fi -+ done -+ -+ -+INET_LINK= -+ -+ for ac_func in inet_addr -+do : -+ ac_fn_c_check_func "$LINENO" "inet_addr" "ac_cv_func_inet_addr" -+if test "x$ac_cv_func_inet_addr" = xyes -+then : -+ printf "%s\n" "#define HAVE_INET_ADDR 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_INET_ADDR 1" >>confdefs.h -+ -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inet_addr in -lnsl" >&5 -+printf %s "checking for inet_addr in -lnsl... " >&6; } -+if test ${ac_cv_lib_nsl_inet_addr+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lnsl $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char inet_addr (void); -+int -+main (void) -+{ -+return inet_addr (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_nsl_inet_addr=yes -+else case e in #( -+ e) ac_cv_lib_nsl_inet_addr=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_inet_addr" >&5 -+printf "%s\n" "$ac_cv_lib_nsl_inet_addr" >&6; } -+if test "x$ac_cv_lib_nsl_inet_addr" = xyes -+then : -+ INET_LINK="nsl" -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inet_addr in -lresolv" >&5 -+printf %s "checking for inet_addr in -lresolv... " >&6; } -+if test ${ac_cv_lib_resolv_inet_addr+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lresolv $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char inet_addr (void); -+int -+main (void) -+{ -+return inet_addr (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_resolv_inet_addr=yes -+else case e in #( -+ e) ac_cv_lib_resolv_inet_addr=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_addr" >&5 -+printf "%s\n" "$ac_cv_lib_resolv_inet_addr" >&6; } -+if test "x$ac_cv_lib_resolv_inet_addr" = xyes -+then : -+ INET_LINK="resolv" -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inet_addr in -lsocket" >&5 -+printf %s "checking for inet_addr in -lsocket... " >&6; } -+if test ${ac_cv_lib_socket_inet_addr+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lsocket $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char inet_addr (void); -+int -+main (void) -+{ -+return inet_addr (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_socket_inet_addr=yes -+else case e in #( -+ e) ac_cv_lib_socket_inet_addr=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_inet_addr" >&5 -+printf "%s\n" "$ac_cv_lib_socket_inet_addr" >&6; } -+if test "x$ac_cv_lib_socket_inet_addr" = xyes -+then : -+ INET_LINK="socket" -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inet_addr in -lnetwork" >&5 -+printf %s "checking for inet_addr in -lnetwork... " >&6; } -+if test ${ac_cv_lib_network_inet_addr+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lnetwork $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char inet_addr (void); -+int -+main (void) -+{ -+return inet_addr (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_network_inet_addr=yes -+else case e in #( -+ e) ac_cv_lib_network_inet_addr=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_inet_addr" >&5 -+printf "%s\n" "$ac_cv_lib_network_inet_addr" >&6; } -+if test "x$ac_cv_lib_network_inet_addr" = xyes -+then : -+ INET_LINK="network" -+ -+fi -+ -+ -+ ;; -+esac -+fi -+ -+ -+ ;; -+esac -+fi -+ -+ -+ ;; -+esac -+fi -+ -+ -+ ;; -+esac -+fi -+ -+done -+ -+ -+ for ac_func in inet_aton -+do : -+ ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton" -+if test "x$ac_cv_func_inet_aton" = xyes -+then : -+ printf "%s\n" "#define HAVE_INET_ATON 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_INET_ATON 1" >>confdefs.h -+ -+else case e in #( -+ e) -+ as_ac_Lib=`printf "%s\n" "ac_cv_lib_$INET_LINK""_inet_aton" | sed "$as_sed_sh"` -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -l$INET_LINK" >&5 -+printf %s "checking for inet_aton in -l$INET_LINK... " >&6; } -+if eval test \${$as_ac_Lib+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-l$INET_LINK $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char inet_aton (void); -+int -+main (void) -+{ -+return inet_aton (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ eval "$as_ac_Lib=yes" -+else case e in #( -+ e) eval "$as_ac_Lib=no" ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+eval ac_res=\$$as_ac_Lib -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+printf "%s\n" "$ac_res" >&6; } -+if eval test \"x\$"$as_ac_Lib"\" = x"yes" -+then : -+ printf "%s\n" "#define HAVE_INET_ATON 1" >>confdefs.h -+ -+fi -+ -+ ;; -+esac -+fi -+ -+done -+ -+if test "x$INET_LINK" != "x"; then -+ printf "%s\n" "#define HAVE_INET_ADDR 1" >>confdefs.h -+ -+ INET_LINK=" -l$INET_LINK" -+fi -+ -+ -+ for wx_func in fdopen -+ do -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+ -+ $ac_includes_default -+ -+int -+main (void) -+{ -+ -+ #ifndef $wx_func -+ &$wx_func; -+ #endif -+ -+ -+ ; -+ return 0; -+} -+ -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ eval wx_cv_func_$wx_func=yes -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ ;; -+esac -+fi -+eval ac_res=\$wx_cv_func_$wx_func -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+printf "%s\n" "$ac_res" >&6; } -+ -+ if eval test \$wx_cv_func_$wx_func = yes -+ then -+ cat >>confdefs.h <<_ACEOF -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 -+_ACEOF -+ -+ -+ else -+ : -+ -+ fi -+ done -+ -+ -+if test "$wxUSE_TARSTREAM" = "yes"; then -+ -+ for wx_func in sysconf -+ do -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+ -+ $ac_includes_default -+ -+int -+main (void) -+{ -+ -+ #ifndef $wx_func -+ &$wx_func; -+ #endif -+ -+ -+ ; -+ return 0; -+} -+ -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ eval wx_cv_func_$wx_func=yes -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ ;; -+esac -+fi -+eval ac_res=\$wx_cv_func_$wx_func -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+printf "%s\n" "$ac_res" >&6; } -+ -+ if eval test \$wx_cv_func_$wx_func = yes -+ then -+ cat >>confdefs.h <<_ACEOF -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 -+_ACEOF -+ -+ -+ else -+ : -+ -+ fi -+ done -+ -+ -+ -+ for wx_func in getpwuid_r -+ do -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+ -+ #define _REENTRANT -+ #include -+ -+ $ac_includes_default -+ -+int -+main (void) -+{ -+ -+ #ifndef $wx_func -+ &$wx_func; -+ #endif -+ -+ struct passwd pw, *ppw; -+ char buf[1024]; -+ getpwuid_r(0, &pw, buf, sizeof(buf), &ppw) -+ -+ -+ ; -+ return 0; -+} -+ -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ eval wx_cv_func_$wx_func=yes -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ ;; -+esac -+fi -+eval ac_res=\$wx_cv_func_$wx_func -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+printf "%s\n" "$ac_res" >&6; } -+ -+ if eval test \$wx_cv_func_$wx_func = yes -+ then -+ cat >>confdefs.h <<_ACEOF -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 -+_ACEOF -+ -+ -+ else -+ : -+ -+ fi -+ done -+ -+ -+ -+ for wx_func in getgrgid_r -+ do -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 -+printf %s "checking for $wx_func... " >&6; } -+if eval test \${wx_cv_func_$wx_func+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+ -+ #define _REENTRANT -+ #include -+ -+ $ac_includes_default -+ -+int -+main (void) -+{ -+ -+ #ifndef $wx_func -+ &$wx_func; -+ #endif -+ -+ struct group grp, *pgrp; -+ char buf[1024]; -+ getgrgid_r(0, &grp, buf, sizeof(buf), &pgrp) -+ -+ -+ ; -+ return 0; -+} -+ -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ eval wx_cv_func_$wx_func=yes -+else case e in #( -+ e) eval wx_cv_func_$wx_func=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ ;; -+esac -+fi -+eval ac_res=\$wx_cv_func_$wx_func -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+printf "%s\n" "$ac_res" >&6; } -+ -+ if eval test \$wx_cv_func_$wx_func = yes -+ then -+ cat >>confdefs.h <<_ACEOF -+#define `printf "%s\n" "HAVE_$wx_func" | sed "$as_sed_cpp"` 1 -+_ACEOF -+ -+ -+ else -+ : -+ -+ fi -+ done -+ -+fi -+ -+fi -+ -+ -+ -+cat >confcache <<\_ACEOF -+# This file is a shell script that caches the results of configure -+# tests run on this system so they can be shared between configure -+# scripts and configure runs, see configure's option --config-cache. -+# It is not useful on other systems. If it contains results you don't -+# want to keep, you may remove or edit it. -+# -+# config.status only pays attention to the cache file if you give it -+# the --recheck option to rerun configure. -+# -+# 'ac_cv_env_foo' variables (set or unset) will be overridden when -+# loading this file, other *unset* 'ac_cv_foo' will be assigned the -+# following values. -+ -+_ACEOF -+ -+# The following way of writing the cache mishandles newlines in values, -+# but we know of no workaround that is simple, portable, and efficient. -+# So, we kill variables containing newlines. -+# Ultrix sh set writes to stderr and can't be redirected directly, -+# and sets the high bit in the cache file unless we assign to the vars. -+( -+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_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) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done -+ -+ (set) 2>&1 | -+ case $as_nl`(ac_space=' '; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) -+ # 'set' does not quote correctly, so add quotes: double-quote -+ # substitution turns \\\\ into \\, and sed turns \\ into \. -+ sed -n \ -+ "s/'/'\\\\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -+ ;; #( -+ *) -+ # 'set' quotes correctly as required by POSIX, so do not add quotes. -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" -+ ;; -+ esac | -+ sort -+) | -+ sed ' -+ /^ac_cv_env_/b end -+ t clear -+ :clear -+ 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 -+ { 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 -+ case $cache_file in #( -+ */* | ?:*) -+ mv -f confcache "$cache_file"$$ && -+ mv -f "$cache_file"$$ "$cache_file" ;; #( -+ *) -+ mv -f confcache "$cache_file" ;; -+ esac -+ fi -+ fi -+ else -+ { 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 -+ -+ -+if test "$TOOLKIT" != "MSW"; then -+ -+ -+ THREADS_LINK= -+ THREADS_CFLAGS= -+ -+ if test "$wxUSE_THREADS" = "yes" ; then -+ if test "$USE_BEOS" = 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: BeOS threads are not yet supported... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: BeOS threads are not yet supported... disabled" >&2;} -+ wxUSE_THREADS="no" -+ fi -+ fi -+ -+ if test "$wxUSE_THREADS" = "yes" ; then -+ -+ -+ THREAD_OPTS="-pthread" -+ if test "x$SUNCXX" = xyes; then -+ THREAD_OPTS="-mt lthread $THREAD_OPTS" -+ fi -+ -+ case "${host}" in -+ *-*-solaris2* | *-*-sunos4* ) -+ if test "x$GCC" = "xyes"; then -+ THREAD_OPTS="-pthreads $THREAD_OPTS" -+ fi -+ ;; -+ *-*-freebsd*) -+ THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r" -+ ;; -+ *-*-darwin* | *-*-cygwin* ) -+ THREAD_OPTS="" -+ ;; -+ *-*-aix*) -+ THREAD_OPTS="pthreads" -+ ;; -+ *-hp-hpux* ) -+ if test "x$GCC" = "xyes"; then -+ $CXX -dumpspecs | grep 'pthread:' >/dev/null || -+ THREAD_OPTS="" -+ else -+ THREAD_OPTS="-mt" -+ fi -+ ;; -+ -+ *-*-irix* ) -+ if test "x$GCC" = "xyes"; then -+ THREAD_OPTS="" -+ fi -+ ;; -+ -+ *-*-qnx*) -+ THREAD_OPTS="" -+ ;; -+ -+ *-*-*UnixWare*) -+ if test "x$GCC" != "xyes"; then -+ THREAD_OPTS="-Ethread" -+ fi -+ ;; -+ esac -+ -+ case "${host}" in -+ *-*-qnx*) -+ THREAD_OPTS="none pthread" -+ ;; -+ -+ *) -+ THREAD_OPTS="$THREAD_OPTS pthread none" -+ ;; -+ esac -+ -+ THREADS_OK=no -+ for flag in $THREAD_OPTS; do -+ case $flag in -+ none) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 -+printf %s "checking whether pthreads work without any flags... " >&6; } -+ ;; -+ -+ -*) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5 -+printf %s "checking whether pthreads work with $flag... " >&6; } -+ THREADS_CFLAGS="$flag" -+ ;; -+ -+ *) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 -+printf %s "checking for the pthreads library -l$flag... " >&6; } -+ THREADS_LINK="-l$flag" -+ ;; -+ esac -+ -+ save_LIBS="$LIBS" -+ save_CFLAGS="$CFLAGS" -+ LIBS="$THREADS_LINK $LIBS" -+ CFLAGS="$THREADS_CFLAGS $CFLAGS" -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+pthread_create(0,0,0,0); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ THREADS_OK=yes -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ -+ LIBS="$save_LIBS" -+ CFLAGS="$save_CFLAGS" -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THREADS_OK" >&5 -+printf "%s\n" "$THREADS_OK" >&6; } -+ if test "x$THREADS_OK" = "xyes"; then -+ break; -+ fi -+ -+ THREADS_LINK="" -+ THREADS_CFLAGS="" -+ done -+ -+ if test "x$THREADS_OK" != "xyes"; then -+ wxUSE_THREADS=no -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: No thread support on this system... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: No thread support on this system... disabled" >&2;} -+ else -+ LDFLAGS="$THREADS_CFLAGS $LDFLAGS" -+ WXCONFIG_LDFLAGS="$THREADS_CFLAGS $WXCONFIG_LDFLAGS" -+ LIBS="$THREADS_LINK $LIBS" -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5 -+printf %s "checking if more special flags are required for pthreads... " >&6; } -+ flag=no -+ case "${host}" in -+ *-aix*) -+ LDFLAGS="-L/usr/lib/threads $LDFLAGS" -+ WXCONFIG_LDFLAGS="-L/usr/lib/threads $WXCONFIG_LDFLAGS" -+ flag="-D_THREAD_SAFE" -+ ;; -+ *-freebsd*) -+ flag="-D_THREAD_SAFE" -+ ;; -+ *-hp-hpux* ) -+ flag="-D_REENTRANT" -+ if test "x$GCC" != "xyes"; then -+ flag="$flag -D_RWSTD_MULTI_THREAD" -+ fi -+ ;; -+ *solaris* | alpha*-osf*) -+ flag="-D_REENTRANT" -+ ;; -+ esac -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5 -+printf "%s\n" "${flag}" >&6; } -+ if test "x$flag" != xno; then -+ THREADS_CFLAGS="$THREADS_CFLAGS $flag" -+ fi -+ -+ WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS $THREADS_CFLAGS" -+ fi -+ fi -+ -+ if test "$wxUSE_THREADS" = "yes" ; then -+ -+ for ac_func in pthread_setconcurrency -+do : -+ ac_fn_c_check_func "$LINENO" "pthread_setconcurrency" "ac_cv_func_pthread_setconcurrency" -+if test "x$ac_cv_func_pthread_setconcurrency" = xyes -+then : -+ printf "%s\n" "#define HAVE_PTHREAD_SETCONCURRENCY 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_PTHREAD_SET_CONCURRENCY 1" >>confdefs.h -+ -+else case e in #( -+ e) -+ -+ for ac_func in thr_setconcurrency -+do : -+ ac_fn_c_check_func "$LINENO" "thr_setconcurrency" "ac_cv_func_thr_setconcurrency" -+if test "x$ac_cv_func_thr_setconcurrency" = xyes -+then : -+ printf "%s\n" "#define HAVE_THR_SETCONCURRENCY 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_THR_SETCONCURRENCY 1" >>confdefs.h -+ -+else case e in #( -+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Setting thread concurrency will not work properly" >&5 -+printf "%s\n" "$as_me: WARNING: Setting thread concurrency will not work properly" >&2;} ;; -+esac -+fi -+ -+done -+ ;; -+esac -+fi -+ -+done -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_cleanup_push/pop" >&5 -+printf %s "checking for pthread_cleanup_push/pop... " >&6; } -+if test ${wx_cv_func_pthread_cleanup+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ ac_ext=cpp -+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 -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+ void ThreadCleanupFunc(void *p); -+ -+int -+main (void) -+{ -+ -+ void *p; -+ pthread_cleanup_push(ThreadCleanupFunc, p); -+ pthread_cleanup_pop(0); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ -+ wx_cv_func_pthread_cleanup=yes -+ -+else case e in #( -+ e) -+ wx_cv_func_pthread_cleanup=no -+ -+ ;; -+esac -+fi -+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' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_pthread_cleanup" >&5 -+printf "%s\n" "$wx_cv_func_pthread_cleanup" >&6; } -+ if test "x$wx_cv_func_pthread_cleanup" = "xyes"; then -+ printf "%s\n" "#define wxHAVE_PTHREAD_CLEANUP 1" >>confdefs.h -+ -+ fi -+ -+ ac_fn_c_check_header_compile "$LINENO" "sched.h" "ac_cv_header_sched_h" "$ac_includes_default -+" -+if test "x$ac_cv_header_sched_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_SCHED_H 1" >>confdefs.h -+ -+fi -+ -+ if test "$ac_cv_header_sched_h" = "yes"; then -+ ac_fn_c_check_func "$LINENO" "sched_yield" "ac_cv_func_sched_yield" -+if test "x$ac_cv_func_sched_yield" = xyes -+then : -+ printf "%s\n" "#define HAVE_SCHED_YIELD 1" >>confdefs.h -+ -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 -+printf %s "checking for sched_yield in -lposix4... " >&6; } -+if test ${ac_cv_lib_posix4_sched_yield+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lposix4 $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char sched_yield (void); -+int -+main (void) -+{ -+return sched_yield (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_posix4_sched_yield=yes -+else case e in #( -+ e) ac_cv_lib_posix4_sched_yield=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5 -+printf "%s\n" "$ac_cv_lib_posix4_sched_yield" >&6; } -+if test "x$ac_cv_lib_posix4_sched_yield" = xyes -+then : -+ printf "%s\n" "#define HAVE_SCHED_YIELD 1" >>confdefs.h -+ POSIX4_LINK=" -lposix4" -+else case e in #( -+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxThread::Yield will not work properly" >&5 -+printf "%s\n" "$as_me: WARNING: wxThread::Yield will not work properly" >&2;} -+ ;; -+esac -+fi -+ -+ -+ ;; -+esac -+fi -+ -+ fi -+ -+ HAVE_PRIOR_FUNCS=0 -+ ac_fn_c_check_func "$LINENO" "pthread_attr_getschedpolicy" "ac_cv_func_pthread_attr_getschedpolicy" -+if test "x$ac_cv_func_pthread_attr_getschedpolicy" = xyes -+then : -+ ac_fn_c_check_func "$LINENO" "pthread_attr_setschedparam" "ac_cv_func_pthread_attr_setschedparam" -+if test "x$ac_cv_func_pthread_attr_setschedparam" = xyes -+then : -+ ac_fn_c_check_func "$LINENO" "sched_get_priority_max" "ac_cv_func_sched_get_priority_max" -+if test "x$ac_cv_func_sched_get_priority_max" = xyes -+then : -+ HAVE_PRIOR_FUNCS=1 -+else case e in #( -+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_get_priority_max in -lposix4" >&5 -+printf %s "checking for sched_get_priority_max in -lposix4... " >&6; } -+if test ${ac_cv_lib_posix4_sched_get_priority_max+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lposix4 $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char sched_get_priority_max (void); -+int -+main (void) -+{ -+return sched_get_priority_max (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_posix4_sched_get_priority_max=yes -+else case e in #( -+ e) ac_cv_lib_posix4_sched_get_priority_max=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_get_priority_max" >&5 -+printf "%s\n" "$ac_cv_lib_posix4_sched_get_priority_max" >&6; } -+if test "x$ac_cv_lib_posix4_sched_get_priority_max" = xyes -+then : -+ -+ HAVE_PRIOR_FUNCS=1 -+ POSIX4_LINK=" -lposix4" -+ -+fi -+ -+ ;; -+esac -+fi -+ -+ -+fi -+ -+ -+fi -+ -+ -+ if test "$HAVE_PRIOR_FUNCS" = 1; then -+ printf "%s\n" "#define HAVE_THREAD_PRIORITY_FUNCTIONS 1" >>confdefs.h -+ -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Setting thread priority will not work" >&5 -+printf "%s\n" "$as_me: WARNING: Setting thread priority will not work" >&2;} -+ fi -+ -+ ac_fn_c_check_func "$LINENO" "pthread_cancel" "ac_cv_func_pthread_cancel" -+if test "x$ac_cv_func_pthread_cancel" = xyes -+then : -+ printf "%s\n" "#define HAVE_PTHREAD_CANCEL 1" >>confdefs.h -+ -+else case e in #( -+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxThread::Kill() will not work properly" >&5 -+printf "%s\n" "$as_me: WARNING: wxThread::Kill() will not work properly" >&2;} ;; -+esac -+fi -+ -+ -+ ac_fn_c_check_func "$LINENO" "pthread_mutex_timedlock" "ac_cv_func_pthread_mutex_timedlock" -+if test "x$ac_cv_func_pthread_mutex_timedlock" = xyes -+then : -+ printf "%s\n" "#define HAVE_PTHREAD_MUTEX_TIMEDLOCK 1" >>confdefs.h -+ -+else case e in #( -+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxMutex::LockTimeout() will not work" >&5 -+printf "%s\n" "$as_me: WARNING: wxMutex::LockTimeout() will not work" >&2;} ;; -+esac -+fi -+ -+ -+ ac_fn_c_check_func "$LINENO" "pthread_attr_setstacksize" "ac_cv_func_pthread_attr_setstacksize" -+if test "x$ac_cv_func_pthread_attr_setstacksize" = xyes -+then : -+ printf "%s\n" "#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1" >>confdefs.h -+ -+fi -+ -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_mutexattr_t" >&5 -+printf %s "checking for pthread_mutexattr_t... " >&6; } -+if test ${wx_cv_type_pthread_mutexattr_t+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+ -+ pthread_mutexattr_t attr; -+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ wx_cv_type_pthread_mutexattr_t=yes -+else case e in #( -+ e) wx_cv_type_pthread_mutexattr_t=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_pthread_mutexattr_t" >&5 -+printf "%s\n" "$wx_cv_type_pthread_mutexattr_t" >&6; } -+ -+ if test "$wx_cv_type_pthread_mutexattr_t" = "yes"; then -+ printf "%s\n" "#define HAVE_PTHREAD_MUTEXATTR_T 1" >>confdefs.h -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_mutexattr_settype declaration" >&5 -+printf %s "checking for pthread_mutexattr_settype declaration... " >&6; } -+if test ${wx_cv_func_pthread_mutexattr_settype_decl+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+ -+ pthread_mutexattr_t attr; -+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ wx_cv_func_pthread_mutexattr_settype_decl=yes -+else case e in #( -+ e) wx_cv_func_pthread_mutexattr_settype_decl=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_pthread_mutexattr_settype_decl" >&5 -+printf "%s\n" "$wx_cv_func_pthread_mutexattr_settype_decl" >&6; } -+ if test "$wx_cv_func_pthread_mutexattr_settype_decl" = "yes"; then -+ printf "%s\n" "#define HAVE_PTHREAD_MUTEXATTR_SETTYPE_DECL 1" >>confdefs.h -+ -+ fi -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5 -+printf %s "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER... " >&6; } -+if test ${wx_cv_type_pthread_rec_mutex_init+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+ -+ pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ -+ wx_cv_type_pthread_rec_mutex_init=yes -+ -+else case e in #( -+ e) -+ wx_cv_type_pthread_rec_mutex_init=no -+ -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_pthread_rec_mutex_init" >&5 -+printf "%s\n" "$wx_cv_type_pthread_rec_mutex_init" >&6; } -+ if test "$wx_cv_type_pthread_rec_mutex_init" = "yes"; then -+ printf "%s\n" "#define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1" >>confdefs.h -+ -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxMutex won't be recursive on this platform" >&5 -+printf "%s\n" "$as_me: WARNING: wxMutex won't be recursive on this platform" >&2;} -+ fi -+ fi -+ -+ if test "$wxUSE_COMPILER_TLS" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __thread keyword" >&5 -+printf %s "checking for __thread keyword... " >&6; } -+if test ${wx_cv_cc___thread+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+ -+ static __thread int n = 0; -+ static __thread int *p = 0; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ wx_cv_cc___thread=yes -+else case e in #( -+ e) wx_cv_cc___thread=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_cc___thread" >&5 -+printf "%s\n" "$wx_cv_cc___thread" >&6; } -+ -+ if test "$wx_cv_cc___thread" = "yes"; then -+ -+ GXX_VERSION="" -+ -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if gcc accepts -dumpversion option" >&5 -+printf %s "checking if gcc accepts -dumpversion option... " >&6; } -+ -+ if test "x$GCC" = "xyes" -+then : -+ -+ if test -z "" -+then : -+ -+ ax_gcc_option_test="int main() -+{ -+ return 0; -+}" -+ -+else case e in #( -+ e) -+ ax_gcc_option_test="" -+ ;; -+esac -+fi -+ -+ # Dump the test program to file -+ cat < conftest.c -+$ax_gcc_option_test -+EOF -+ -+ # Dump back the file to the log, useful for debugging purposes -+ { ac_try='cat conftest.c 1>&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; } -+ -+ if { ac_try='$CC -dumpversion -c conftest.c 1>&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; } -+then : -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ ax_gcc_version_option=yes -+ -+ -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ -+ ax_gcc_version_option=no -+ -+ ;; -+esac -+fi -+ -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no gcc available" >&5 -+printf "%s\n" "no gcc available" >&6; } -+ ;; -+esac -+fi -+ -+ if test "x$GXX" = "xyes" -+then : -+ -+ if test "x$ax_gxx_version_option" != "no" -+then : -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking gxx version" >&5 -+printf %s "checking gxx version... " >&6; } -+if test ${ax_cv_gxx_version+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ ax_cv_gxx_version="`$CXX -dumpversion`" -+ if test "x$ax_cv_gxx_version" = "x" -+then : -+ -+ ax_cv_gxx_version="" -+ -+fi -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_gxx_version" >&5 -+printf "%s\n" "$ax_cv_gxx_version" >&6; } -+ GXX_VERSION=$ax_cv_gxx_version -+ -+fi -+ -+fi -+ -+ -+ if test -n "$ax_cv_gxx_version"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether __thread support in g++ is usable" >&5 -+printf %s "checking whether __thread support in g++ is usable... " >&6; } -+ case "$ax_cv_gxx_version" in -+ 1.* | 2.* | 3.* ) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, it's broken" >&5 -+printf "%s\n" "no, it's broken" >&6; } -+ wx_cv_cc___thread=no -+ ;; -+ *) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, it works" >&5 -+printf "%s\n" "yes, it works" >&6; } -+ ;; -+ esac -+ fi -+ fi -+ -+ if test "$wx_cv_cc___thread" = "yes"; then -+ printf "%s\n" "#define HAVE___THREAD_KEYWORD 1" >>confdefs.h -+ -+ fi -+ fi -+ -+ if test "$ac_cv_header_cxxabi_h" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for abi::__forced_unwind() in " >&5 -+printf %s "checking for abi::__forced_unwind() in ... " >&6; } -+if test ${wx_cv_type_abi_forced_unwind+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ ac_ext=cpp -+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 -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+ -+ void foo(abi::__forced_unwind&); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_type_abi_forced_unwind=yes -+else case e in #( -+ e) wx_cv_type_abi_forced_unwind=no -+ ;; -+esac -+fi -+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' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_abi_forced_unwind" >&5 -+printf "%s\n" "$wx_cv_type_abi_forced_unwind" >&6; } -+ else -+ wx_cv_type_abi_forced_unwind=no -+ fi -+ -+ if test "$wx_cv_type_abi_forced_unwind" = "yes"; then -+ printf "%s\n" "#define HAVE_ABI_FORCEDUNWIND 1" >>confdefs.h -+ -+ fi -+ fi -+ -+else -+ if test "$wxUSE_THREADS" = "yes" ; then -+ case "${host}" in -+ x86_64-*-mingw* ) -+ ;; -+ *-*-mingw32* ) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler supports -mthreads" >&5 -+printf %s "checking if compiler supports -mthreads... " >&6; } -+if test ${wx_cv_cflags_mthread+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ CFLAGS_OLD="$CFLAGS" -+ CFLAGS="-mthreads $CFLAGS" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+#ifdef __clang__ -+#error no -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ wx_cv_cflags_mthread=yes -+else case e in #( -+ e) wx_cv_cflags_mthread=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_cflags_mthread" >&5 -+printf "%s\n" "$wx_cv_cflags_mthread" >&6; } -+ -+ if test "$wx_cv_cflags_mthread" = "yes"; then -+ WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -mthreads" -+ LDFLAGS="$LDFLAGS -mthreads" -+ else -+ CFLAGS="$CFLAGS_OLD" -+ fi -+ ;; -+ esac -+ fi -+fi -+ -+ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r" -+if test "x$ac_cv_func_localtime_r" = xyes -+then : -+ printf "%s\n" "#define HAVE_LOCALTIME_R 1" >>confdefs.h -+ -+fi -+ -+ac_fn_c_check_func "$LINENO" "gmtime_r" "ac_cv_func_gmtime_r" -+if test "x$ac_cv_func_gmtime_r" = xyes -+then : -+ printf "%s\n" "#define HAVE_GMTIME_R 1" >>confdefs.h -+ -+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 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how many arguments gethostbyname_r() takes" >&5 -+printf %s "checking how many arguments gethostbyname_r() takes... " >&6; } -+ -+ if test ${ac_cv_func_which_gethostbyname_r+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ -+################################################################ -+ -+ac_cv_func_which_gethostbyname_r=unknown -+ -+# -+# ONE ARGUMENT (sanity check) -+# -+ -+# This should fail, as there is no variant of gethostbyname_r() that takes -+# a single argument. If it actually compiles, then we can assume that -+# netdb.h is not declaring the function, and the compiler is thereby -+# assuming an implicit prototype. In which case, we're out of luck. -+# -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+ -+ char *name = "www.gnu.org"; -+ (void)gethostbyname_r(name) /* ; */ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ ac_cv_func_which_gethostbyname_r=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+# -+# SIX ARGUMENTS -+# (e.g. Linux) -+# -+ -+if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then -+ -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+ -+ char *name = "www.gnu.org"; -+ struct hostent ret, *retp; -+ char buf[1024]; -+ int buflen = 1024; -+ int my_h_errno; -+ (void)gethostbyname_r(name, &ret, buf, buflen, &retp, &my_h_errno) /* ; */ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ ac_cv_func_which_gethostbyname_r=six -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+fi -+ -+# -+# FIVE ARGUMENTS -+# (e.g. Solaris) -+# -+ -+if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then -+ -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+ -+ char *name = "www.gnu.org"; -+ struct hostent ret; -+ char buf[1024]; -+ int buflen = 1024; -+ int my_h_errno; -+ (void)gethostbyname_r(name, &ret, buf, buflen, &my_h_errno) /* ; */ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ ac_cv_func_which_gethostbyname_r=five -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+fi -+ -+# -+# THREE ARGUMENTS -+# (e.g. AIX, HP-UX, Tru64) -+# -+ -+if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then -+ -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+ -+ char *name = "www.gnu.org"; -+ struct hostent ret; -+ struct hostent_data data; -+ (void)gethostbyname_r(name, &ret, &data) /* ; */ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ ac_cv_func_which_gethostbyname_r=three -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+fi -+ -+################################################################ -+ -+ ;; -+esac -+fi -+ -+case "$ac_cv_func_which_gethostbyname_r" in -+ three|five|six) -+ -+printf "%s\n" "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h -+ -+ ;; -+esac -+ -+case "$ac_cv_func_which_gethostbyname_r" in -+ three) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: three" >&5 -+printf "%s\n" "three" >&6; } -+ -+printf "%s\n" "#define HAVE_FUNC_GETHOSTBYNAME_R_3 1" >>confdefs.h -+ -+ ;; -+ -+ five) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: five" >&5 -+printf "%s\n" "five" >&6; } -+ -+printf "%s\n" "#define HAVE_FUNC_GETHOSTBYNAME_R_5 1" >>confdefs.h -+ -+ ;; -+ -+ six) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: six" >&5 -+printf "%s\n" "six" >&6; } -+ -+printf "%s\n" "#define HAVE_FUNC_GETHOSTBYNAME_R_6 1" >>confdefs.h -+ -+ ;; -+ -+ no) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cannot find function declaration in netdb.h" >&5 -+printf "%s\n" "cannot find function declaration in netdb.h" >&6; } -+ ;; -+ -+ unknown) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: can't tell" >&5 -+printf "%s\n" "can't tell" >&6; } -+ ;; -+ -+ *) -+ as_fn_error $? "internal error" "$LINENO" 5 -+ ;; -+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 -+ -+ -+ -+ if test "x$ac_cv_func_which_gethostbyname_r" = "xno" -o \ -+ "x$ac_cv_func_which_gethostbyname_r" = "xunknown" ; then -+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" -+if test "x$ac_cv_func_gethostbyname" = xyes -+then : -+ printf "%s\n" "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h -+ -+else case e in #( -+ e) -+ case "${host}" in -+ *-*-haiku* ) -+ printf "%s\n" "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Defining HAVE_GETHOSTBYNAME unconditionally under ${host}." >&5 -+printf "%s\n" "$as_me: WARNING: Defining HAVE_GETHOSTBYNAME unconditionally under ${host}." >&2;} -+ ;; -+ esac -+ -+ ;; -+esac -+fi -+ -+ fi -+ -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how many arguments getservbyname_r() takes" >&5 -+printf %s "checking how many arguments getservbyname_r() takes... " >&6; } -+if test ${ac_cv_func_which_getservbyname_r+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ ac_ext=cpp -+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 -+ -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+ -+ char *name; -+ char *proto; -+ struct servent *se, *res; -+ char buffer[2048]; -+ int buflen = 2048; -+ (void) getservbyname_r(name, proto, se, buffer, buflen, &res) -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ ac_cv_func_which_getservbyname_r=six -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+ -+ char *name; -+ char *proto; -+ struct servent *se; -+ char buffer[2048]; -+ int buflen = 2048; -+ (void) getservbyname_r(name, proto, se, buffer, buflen) -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ ac_cv_func_which_getservbyname_r=five -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main (void) -+{ -+ -+ char *name; -+ char *proto; -+ struct servent *se; -+ struct servent_data data; -+ (void) getservbyname_r(name, proto, se, &data); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ ac_cv_func_which_getservbyname_r=four -+else case e in #( -+ e) ac_cv_func_which_getservbyname_r=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+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' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_which_getservbyname_r" >&5 -+printf "%s\n" "$ac_cv_func_which_getservbyname_r" >&6; } -+ -+if test $ac_cv_func_which_getservbyname_r = six; then -+ printf "%s\n" "#define HAVE_FUNC_GETSERVBYNAME_R_6 1" >>confdefs.h -+ -+elif test $ac_cv_func_which_getservbyname_r = five; then -+ printf "%s\n" "#define HAVE_FUNC_GETSERVBYNAME_R_5 1" >>confdefs.h -+ -+elif test $ac_cv_func_which_getservbyname_r = four; then -+ printf "%s\n" "#define HAVE_FUNC_GETSERVBYNAME_R_4 1" >>confdefs.h -+ -+fi -+ -+ -+ if test "x$ac_cv_func_which_getservbyname_r" = "xno" -o \ -+ "x$ac_cv_func_which_getservbyname_r" = "xunknown" ; then -+ -+ for ac_func in getservbyname -+do : -+ ac_fn_c_check_func "$LINENO" "getservbyname" "ac_cv_func_getservbyname" -+if test "x$ac_cv_func_getservbyname" = xyes -+then : -+ printf "%s\n" "#define HAVE_GETSERVBYNAME 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_GETSERVBYNAME 1" >>confdefs.h -+ -+else case e in #( -+ e) -+ case "${host}" in -+ *-*-haiku* ) -+ printf "%s\n" "#define HAVE_GETSERVBYNAME 1" >>confdefs.h -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Defining HAVE_GETSERVBYNAME unconditionally under ${host}." >&5 -+printf "%s\n" "$as_me: WARNING: Defining HAVE_GETSERVBYNAME unconditionally under ${host}." >&2;} -+ ;; -+ esac -+ -+ ;; -+esac -+fi -+ -+done -+ fi -+ -+printf "%s\n" "#define wxUSE_COMPILER_TLS 1" >>confdefs.h -+ -+ -+if test "$wxUSE_THREADS" = "yes"; then -+ printf "%s\n" "#define wxUSE_THREADS 1" >>confdefs.h -+ -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread" -+else -+ if test "$wx_cv_func_strtok_r" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if -D_REENTRANT is needed" >&5 -+printf %s "checking if -D_REENTRANT is needed... " >&6; } -+ if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then -+ WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_REENTRANT" -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ fi -+ fi -+fi -+ -+if test "$WXGTK4" = 1 ; then -+ printf "%s\n" "#define __WXGTK4__ 1" >>confdefs.h -+ -+fi -+if test "$WXGTK3" = 1 ; then -+ printf "%s\n" "#define __WXGTK3__ 1" >>confdefs.h -+ -+ WXGTK2=1 -+fi -+if test "$WXGTK2" = 1 ; then -+ printf "%s\n" "#define __WXGTK20__ $WXGTK2" >>confdefs.h -+ -+fi -+ -+if test "$WXGTK127" = 1 ; then -+ printf "%s\n" "#define __WXGTK127__ $WXGTK127" >>confdefs.h -+ -+fi -+ -+if test "$WXGPE" = 1 ; then -+ printf "%s\n" "#define __WXGPE__ $WXGPE" >>confdefs.h -+ -+fi -+ -+if test "$WXQT" = 1 ; then -+ printf "%s\n" "#define __WXQT__ $WXQT" >>confdefs.h -+ -+fi -+DEBUG_CFLAGS= -+if `echo $CXXFLAGS $CFLAGS | grep " -g" >/dev/null`; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: CXXFLAGS/CFLAGS already contains -g flag; ignoring the --enable-debug_info option" >&5 -+printf "%s\n" "$as_me: WARNING: CXXFLAGS/CFLAGS already contains -g flag; ignoring the --enable-debug_info option" >&2;} -+elif test "$wxUSE_DEBUG_INFO" = "yes" ; then -+ DEBUG_CFLAGS="-g" -+fi -+ -+if test "$wxUSE_DEBUG_GDB" = "yes" ; then -+ wxUSE_DEBUG_INFO=yes -+ if test "$GCC" = yes; then -+ DEBUG_CFLAGS="-ggdb" -+ fi -+fi -+ -+if test "$wxUSE_DEBUG_FLAG" = "no" ; then -+ WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DwxDEBUG_LEVEL=0" -+ -+ if test "$wxUSE_GTK" = 1 ; then -+ if test "$WXGTK2" = 1 ; then -+ CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS" -+ else -+ CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS" -+ fi -+ fi -+fi -+ -+if test "$wxUSE_MEM_TRACING" = "yes" ; then -+ printf "%s\n" "#define wxUSE_MEMORY_TRACING 1" >>confdefs.h -+ -+ printf "%s\n" "#define wxUSE_GLOBAL_MEMORY_OPERATORS 1" >>confdefs.h -+ -+ printf "%s\n" "#define wxUSE_DEBUG_NEW_ALWAYS 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck" -+fi -+ -+if test "$wxUSE_DMALLOC" = "yes" ; then -+ DMALLOC_LIBS="-ldmallocthcxx" -+fi -+ -+PROFILE_FLAGS= -+if test "$wxUSE_PROFILE" = "yes" ; then -+ PROFILE_FLAGS=" -pg" -+fi -+ -+if test "$GCC" = "yes" ; then -+ if test "$wxUSE_NO_RTTI" = "yes" ; then -+ WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -DwxNO_RTTI -fno-rtti" -+ fi -+ if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then -+ WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fno-exceptions" -+ fi -+ if test "$wxUSE_PERMISSIVE" = "yes" ; then -+ WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fpermissive" -+ fi -+ -+ case "${host}" in -+ powerpc*-*-aix* ) -+ WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -mminimal-toc" -+ ;; -+ *-hppa* ) -+ WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -ffunction-sections" -+ ;; -+ esac -+fi -+ -+OPTIMISE_CFLAGS= -+if `echo $CXXFLAGS $CFLAGS | grep " -O" >/dev/null`; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: CXXFLAGS/CFLAGS already contains -O flag; ignoring the --disable-optimise option" >&5 -+printf "%s\n" "$as_me: WARNING: CXXFLAGS/CFLAGS already contains -O flag; ignoring the --disable-optimise option" >&2;} -+else -+ if test "$wxUSE_OPTIMISE" = "no" ; then -+ if test "$GCC" = yes ; then -+ OPTIMISE_CFLAGS="-O0" -+ fi -+ else -+ if test "$GCC" = yes ; then -+ OPTIMISE_CFLAGS="-O2" -+ else -+ OPTIMISE_CFLAGS="-O" -+ fi -+ fi -+fi -+ -+if test "x$wxUSE_REPRODUCIBLE_BUILD" = "xyes"; then -+ printf "%s\n" "#define wxUSE_REPRODUCIBLE_BUILD 1" >>confdefs.h -+ -+fi -+ -+ -+if test "x$WXWIN_COMPATIBILITY_2_8" = "xyes"; then -+ printf "%s\n" "#define WXWIN_COMPATIBILITY_2_8 1" >>confdefs.h -+ -+ -+ WXWIN_COMPATIBILITY_3_0="yes" -+fi -+ -+if test "x$WXWIN_COMPATIBILITY_3_0" != "xno"; then -+ printf "%s\n" "#define WXWIN_COMPATIBILITY_3_0 1" >>confdefs.h -+ -+fi -+ -+ -+if test "$wxUSE_GUI" = "yes"; then -+ printf "%s\n" "#define wxUSE_GUI 1" >>confdefs.h -+ -+ -+ fi -+ -+ -+if test "$wxUSE_UNIX" = "yes"; then -+ printf "%s\n" "#define wxUSE_UNIX 1" >>confdefs.h -+ -+fi -+ -+ -+if test "$TOOLKIT" != "MSW"; then -+ -+ HAVE_DL_FUNCS=0 -+ HAVE_SHL_FUNCS=0 -+ if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then -+ if test "$USE_DOS" = 1; then -+ HAVE_DL_FUNCS=0 -+ else -+ -+ for ac_func in dlopen -+do : -+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -+if test "x$ac_cv_func_dlopen" = xyes -+then : -+ printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h -+ -+ printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h -+ -+ HAVE_DL_FUNCS=1 -+ -+else case e in #( -+ e) -+ { 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 case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldl $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dlopen (void); -+int -+main (void) -+{ -+return dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_dl_dlopen=yes -+else case e in #( -+ e) ac_cv_lib_dl_dlopen=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ 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 : -+ -+ printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h -+ -+ HAVE_DL_FUNCS=1 -+ DL_LINK="-ldl" -+ -+fi -+ -+ ;; -+esac -+fi -+ -+done -+ -+ if test "$HAVE_DL_FUNCS" = 1; then -+ -+ for ac_func in dladdr -+do : -+ ac_fn_c_check_func "$LINENO" "dladdr" "ac_cv_func_dladdr" -+if test "x$ac_cv_func_dladdr" = xyes -+then : -+ printf "%s\n" "#define HAVE_DLADDR 1" >>confdefs.h -+ printf "%s\n" "#define HAVE_DLADDR 1" >>confdefs.h -+ -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dladdr in -ldl" >&5 -+printf %s "checking for dladdr in -ldl... " >&6; } -+if test ${ac_cv_lib_dl_dladdr+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldl $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dladdr (void); -+int -+main (void) -+{ -+return dladdr (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_dl_dladdr=yes -+else case e in #( -+ e) ac_cv_lib_dl_dladdr=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dladdr" >&5 -+printf "%s\n" "$ac_cv_lib_dl_dladdr" >&6; } -+if test "x$ac_cv_lib_dl_dladdr" = xyes -+then : -+ -+ printf "%s\n" "#define HAVE_DLADDR 1" >>confdefs.h -+ -+ DL_LINK="-ldl" -+ -+fi -+ -+ -+ ;; -+esac -+fi -+ -+done -+ fi -+ fi -+ -+ if test "$USE_DARWIN" = 1; then -+ HAVE_DL_FUNCS=1 -+ fi -+ -+ if test "$HAVE_DL_FUNCS" = 0; then -+ if test "$HAVE_SHL_FUNCS" = 0; then -+ if test "$USE_UNIX" = 1 -o "$USE_DOS" = 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Missing dynamic loading support, several features will be disabled" >&5 -+printf "%s\n" "$as_me: WARNING: Missing dynamic loading support, several features will be disabled" >&2;} -+ wxUSE_DYNAMIC_LOADER=no -+ wxUSE_DYNLIB_CLASS=no -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Assuming wxLibrary class works on this platform" >&5 -+printf "%s\n" "$as_me: WARNING: Assuming wxLibrary class works on this platform" >&2;} -+ fi -+ fi -+ fi -+ fi -+fi -+ -+if test "$wxUSE_DYNAMIC_LOADER" = "yes" ; then -+ printf "%s\n" "#define wxUSE_DYNAMIC_LOADER 1" >>confdefs.h -+ -+fi -+if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then -+ printf "%s\n" "#define wxUSE_DYNLIB_CLASS 1" >>confdefs.h -+ -+fi -+ -+ -+ -+if test "$wxUSE_PLUGINS" = "yes" ; then -+ if test "$wxUSE_SHARED" = "no" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: plugins supported only in shared build, disabling" >&5 -+printf "%s\n" "$as_me: WARNING: plugins supported only in shared build, disabling" >&2;} -+ wxUSE_PLUGINS=no -+ fi -+ if test "$wxUSE_MONOLITHIC" = "yes" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: plugins not supported monolithic build, disabling" >&5 -+printf "%s\n" "$as_me: WARNING: plugins not supported monolithic build, disabling" >&2;} -+ wxUSE_PLUGINS=no -+ fi -+ if test "$wxUSE_DYNLIB_CLASS" = "no" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: plugins require wxDynamicLibrary, disabling" >&5 -+printf "%s\n" "$as_me: WARNING: plugins require wxDynamicLibrary, disabling" >&2;} -+ wxUSE_PLUGINS=no -+ fi -+ if test "$wxUSE_PLUGINS" = "yes" ; then -+ printf "%s\n" "#define wxUSE_PLUGINS 1" >>confdefs.h -+ -+ fi -+fi -+ -+if test "$wxUSE_PIC" = "no" -a "$wxUSE_SHARED" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: position independent code (PIC) can not be disabled for shared libraries" >&5 -+printf "%s\n" "$as_me: WARNING: position independent code (PIC) can not be disabled for shared libraries" >&2;} -+fi -+ -+ -+if test "$wxUSE_FSWATCHER" = "yes"; then -+ if test "$USE_WIN32" != 1; then -+ if test "$wxUSE_UNIX" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether inotify is usable" >&5 -+printf %s "checking whether inotify is usable... " >&6; } -+if test ${wx_cv_inotify_usable+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ int main() { return inotify_init(); } -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ wx_cv_inotify_usable=yes -+else case e in #( -+ e) wx_cv_inotify_usable=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_inotify_usable" >&5 -+printf "%s\n" "$wx_cv_inotify_usable" >&6; } -+ if test "$wx_cv_inotify_usable" = "yes"; then -+ printf "%s\n" "#define wxHAS_INOTIFY 1" >>confdefs.h -+ -+ else -+ ac_fn_c_check_header_compile "$LINENO" "sys/event.h" "ac_cv_header_sys_event_h" "$ac_includes_default -+" -+if test "x$ac_cv_header_sys_event_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_SYS_EVENT_H 1" >>confdefs.h -+ -+fi -+ -+ if test "$ac_cv_header_sys_event_h" = "yes"; then -+ printf "%s\n" "#define wxHAS_KQUEUE 1" >>confdefs.h -+ -+ else -+ wxUSE_FSWATCHER=no -+ fi -+ fi -+ else -+ wxUSE_FSWATCHER=no -+ fi -+ else -+ if test "$wxUSE_THREADS" != "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxFileSystemWatcher disabled due to --disable-threads" >&5 -+printf "%s\n" "$as_me: WARNING: wxFileSystemWatcher disabled due to --disable-threads" >&2;} -+ wxUSE_FSWATCHER=no -+ fi -+ fi -+ -+ if test "$wxUSE_FSWATCHER" = "yes"; then -+ printf "%s\n" "#define wxUSE_FSWATCHER 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS fswatcher" -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxFileSystemWatcher won't be available on this platform" >&5 -+printf "%s\n" "$as_me: WARNING: wxFileSystemWatcher won't be available on this platform" >&2;} -+ fi -+fi -+ -+if test "$wxUSE_GTK" = 1; then -+ if test "$USE_WIN32" != 1 -a "$USE_DARWIN" != 1; then -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XKBCOMMON" >&5 -+printf %s "checking for XKBCOMMON... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$XKBCOMMON_CFLAGS"; then -+ pkg_cv_XKBCOMMON_CFLAGS="$XKBCOMMON_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xkbcommon\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "xkbcommon") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_XKBCOMMON_CFLAGS=`$PKG_CONFIG --cflags "xkbcommon" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$XKBCOMMON_LIBS"; then -+ pkg_cv_XKBCOMMON_LIBS="$XKBCOMMON_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xkbcommon\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "xkbcommon") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_XKBCOMMON_LIBS=`$PKG_CONFIG --libs "xkbcommon" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ XKBCOMMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xkbcommon"` -+ else -+ XKBCOMMON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xkbcommon"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$XKBCOMMON_PKG_ERRORS" >&5 -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libxkbcommon not found, key codes in key events may be incorrect" >&5 -+printf "%s\n" "$as_me: WARNING: libxkbcommon not found, key codes in key events may be incorrect" >&2;} -+ -+ -+elif test $pkg_failed = untried; then -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libxkbcommon not found, key codes in key events may be incorrect" >&5 -+printf "%s\n" "$as_me: WARNING: libxkbcommon not found, key codes in key events may be incorrect" >&2;} -+ -+ -+else -+ XKBCOMMON_CFLAGS=$pkg_cv_XKBCOMMON_CFLAGS -+ XKBCOMMON_LIBS=$pkg_cv_XKBCOMMON_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ CFLAGS="$XKBCOMMON_CFLAGS $CFLAGS" -+ CXXFLAGS="$XKBCOMMON_CFLAGS $CXXFLAGS" -+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $XKBCOMMON_LIBS" -+ printf "%s\n" "#define HAVE_XKBCOMMON 1" >>confdefs.h -+ -+ -+fi -+ fi -+fi -+ -+ -+if test "$wxUSE_SECRETSTORE" = "yes"; then -+ if test "$WXGTK1" = "1"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libsecret is incompatible with GTK+ 1, disabled" >&5 -+printf "%s\n" "$as_me: WARNING: libsecret is incompatible with GTK+ 1, disabled" >&2;} -+ wxUSE_SECRETSTORE=no -+ elif test "$wxUSE_MSW" != "1" -a "$wxUSE_OSX_COCOA" != 1; then -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBSECRET" >&5 -+printf %s "checking for LIBSECRET... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$LIBSECRET_CFLAGS"; then -+ pkg_cv_LIBSECRET_CFLAGS="$LIBSECRET_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsecret-1\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libsecret-1") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_LIBSECRET_CFLAGS=`$PKG_CONFIG --cflags "libsecret-1" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$LIBSECRET_LIBS"; then -+ pkg_cv_LIBSECRET_LIBS="$LIBSECRET_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsecret-1\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libsecret-1") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_LIBSECRET_LIBS=`$PKG_CONFIG --libs "libsecret-1" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ LIBSECRET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsecret-1"` -+ else -+ LIBSECRET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsecret-1"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$LIBSECRET_PKG_ERRORS" >&5 -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libsecret not found, wxSecretStore won't be available" >&5 -+printf "%s\n" "$as_me: WARNING: libsecret not found, wxSecretStore won't be available" >&2;} -+ wxUSE_SECRETSTORE=no -+ -+ -+elif test $pkg_failed = untried; then -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libsecret not found, wxSecretStore won't be available" >&5 -+printf "%s\n" "$as_me: WARNING: libsecret not found, wxSecretStore won't be available" >&2;} -+ wxUSE_SECRETSTORE=no -+ -+ -+else -+ LIBSECRET_CFLAGS=$pkg_cv_LIBSECRET_CFLAGS -+ LIBSECRET_LIBS=$pkg_cv_LIBSECRET_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ CXXFLAGS="$LIBSECRET_CFLAGS $CXXFLAGS" -+ LIBS="$LIBSECRET_LIBS $LIBS" -+ -+fi -+ fi -+ -+ if test "$wxUSE_SECRETSTORE" = "yes"; then -+ if test "$USE_DARWIN" = 1; then -+ LIBS="-framework Security $LIBS" -+ fi -+ -+ printf "%s\n" "#define wxUSE_SECRETSTORE 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS secretstore" -+ fi -+fi -+ -+ -+ -+if test "$wxUSE_SPELLCHECK" = "yes"; then -+ -+ if test "$WXGTK3" = 1; then -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GSPELL" >&5 -+printf %s "checking for GSPELL... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$GSPELL_CFLAGS"; then -+ pkg_cv_GSPELL_CFLAGS="$GSPELL_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gspell-1\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "gspell-1") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_GSPELL_CFLAGS=`$PKG_CONFIG --cflags "gspell-1" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$GSPELL_LIBS"; then -+ pkg_cv_GSPELL_LIBS="$GSPELL_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gspell-1\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "gspell-1") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_GSPELL_LIBS=`$PKG_CONFIG --libs "gspell-1" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ GSPELL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gspell-1"` -+ else -+ GSPELL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gspell-1"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$GSPELL_PKG_ERRORS" >&5 -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: gspell-1 not found, spell checking in wxTextCtrl won't be available" >&5 -+printf "%s\n" "$as_me: WARNING: gspell-1 not found, spell checking in wxTextCtrl won't be available" >&2;} -+ wxUSE_SPELLCHECK=no -+ -+ -+elif test $pkg_failed = untried; then -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: gspell-1 not found, spell checking in wxTextCtrl won't be available" >&5 -+printf "%s\n" "$as_me: WARNING: gspell-1 not found, spell checking in wxTextCtrl won't be available" >&2;} -+ wxUSE_SPELLCHECK=no -+ -+ -+else -+ GSPELL_CFLAGS=$pkg_cv_GSPELL_CFLAGS -+ GSPELL_LIBS=$pkg_cv_GSPELL_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ CXXFLAGS="$GSPELL_CFLAGS $CXXFLAGS" -+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GSPELL_LIBS" -+ -+fi -+ fi -+ -+ if test "$wxUSE_SPELLCHECK" = "yes"; then -+ printf "%s\n" "#define wxUSE_SPELLCHECK 1" >>confdefs.h -+ -+ fi -+fi -+ -+ -+if test "$wxUSE_STL" = "yes"; then -+ printf "%s\n" "#define wxUSE_STL 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_EXTENDED_RTTI" = "yes"; then -+ printf "%s\n" "#define wxUSE_EXTENDED_RTTI 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_ANY" = "yes"; then -+ printf "%s\n" "#define wxUSE_ANY 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_APPLE_IEEE" = "yes"; then -+ printf "%s\n" "#define wxUSE_APPLE_IEEE 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_TIMER" = "yes"; then -+ printf "%s\n" "#define wxUSE_TIMER 1" >>confdefs.h -+ -+fi -+ -+if test "$USE_UNIX" = 1 ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SNDCTL_DSP_SPEED in sys/soundcard.h" >&5 -+printf %s "checking for SNDCTL_DSP_SPEED in sys/soundcard.h... " >&6; } -+if test ${ac_cv_header_sys_soundcard+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ #include -+ -+int -+main (void) -+{ -+ -+ ioctl(0, SNDCTL_DSP_SPEED, 0); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_header_sys_soundcard=yes -+else case e in #( -+ e) -+ saveLibs="$LIBS" -+ LIBS="$saveLibs -lossaudio" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ #include -+ -+int -+main (void) -+{ -+ -+ ioctl(0, SNDCTL_DSP_SPEED, 0); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_header_sys_soundcard=yes -+else case e in #( -+ e) -+ LIBS="$saveLibs" -+ ac_cv_header_sys_soundcard=no -+ -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_soundcard" >&5 -+printf "%s\n" "$ac_cv_header_sys_soundcard" >&6; } -+ -+ if test "$ac_cv_header_sys_soundcard" = "yes"; then -+ printf "%s\n" "#define HAVE_SYS_SOUNDCARD_H 1" >>confdefs.h -+ -+ fi -+fi -+ -+WITH_PLUGIN_SDL=0 -+if test "$wxUSE_SOUND" = "yes"; then -+ if test "$USE_UNIX" = 1 -a "$USE_MAC" != 1 ; then -+ if test "$wxUSE_LIBSDL" != "no"; then -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5 -+printf %s "checking for SDL... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$SDL_CFLAGS"; then -+ pkg_cv_SDL_CFLAGS="$SDL_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2 >= 2.0.0\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "sdl2 >= 2.0.0") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl2 >= 2.0.0" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$SDL_LIBS"; then -+ pkg_cv_SDL_LIBS="$SDL_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2 >= 2.0.0\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "sdl2 >= 2.0.0") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl2 >= 2.0.0" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sdl2 >= 2.0.0"` -+ else -+ SDL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sdl2 >= 2.0.0"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$SDL_PKG_ERRORS" >&5 -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: SDL 2.0 not available. Falling back to 1.2." >&5 -+printf "%s\n" "$as_me: SDL 2.0 not available. Falling back to 1.2." >&6;} -+ -+# Check whether --with-sdl-prefix was given. -+if test ${with_sdl_prefix+y} -+then : -+ withval=$with_sdl_prefix; sdl_prefix="$withval" -+else case e in #( -+ e) sdl_prefix="" ;; -+esac -+fi -+ -+ -+# Check whether --with-sdl-exec-prefix was given. -+if test ${with_sdl_exec_prefix+y} -+then : -+ withval=$with_sdl_exec_prefix; sdl_exec_prefix="$withval" -+else case e in #( -+ e) sdl_exec_prefix="" ;; -+esac -+fi -+ -+# Check whether --enable-sdltest was given. -+if test ${enable_sdltest+y} -+then : -+ enableval=$enable_sdltest; -+else case e in #( -+ e) enable_sdltest=yes ;; -+esac -+fi -+ -+ -+ if test x$sdl_exec_prefix != x ; then -+ sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" -+ if test x${SDL_CONFIG+set} != xset ; then -+ SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config -+ fi -+ fi -+ if test x$sdl_prefix != x ; then -+ sdl_args="$sdl_args --prefix=$sdl_prefix" -+ if test x${SDL_CONFIG+set} != xset ; then -+ SDL_CONFIG=$sdl_prefix/bin/sdl-config -+ fi -+ fi -+ -+ if test "x$prefix" != xNONE; then -+ PATH="$prefix/bin:$prefix/usr/bin:$PATH" -+ fi -+ # Extract the first word of "sdl-config", so it can be a program name with args. -+set dummy sdl-config; 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_path_SDL_CONFIG+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) case $SDL_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ 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_path_SDL_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 -+ done -+IFS=$as_save_IFS -+ -+ test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no" -+ ;; -+esac ;; -+esac -+fi -+SDL_CONFIG=$ac_cv_path_SDL_CONFIG -+if test -n "$SDL_CONFIG"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SDL_CONFIG" >&5 -+printf "%s\n" "$SDL_CONFIG" >&6; } -+else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+fi -+ -+ -+ min_sdl_version=1.2.0 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SDL - version >= $min_sdl_version" >&5 -+printf %s "checking for SDL - version >= $min_sdl_version... " >&6; } -+ no_sdl="" -+ if test "$SDL_CONFIG" = "no" ; then -+ no_sdl=yes -+ else -+ SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` -+ SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` -+ -+ sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -+ sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` -+ sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` -+ if test "x$enable_sdltest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_CXXFLAGS="$CXXFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $SDL_CFLAGS" -+ CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" -+ LIBS="$LIBS $SDL_LIBS" -+ rm -f conf.sdltest -+ if test "$cross_compiling" = yes -+then : -+ echo $ac_n "cross compiling; assumed OK... $ac_c" -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+#include -+#include -+#include -+#include "SDL.h" -+ -+char* -+my_strdup (char *str) -+{ -+ char *new_str; -+ -+ if (str) -+ { -+ new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); -+ strcpy (new_str, str); -+ } -+ else -+ new_str = NULL; -+ -+ return new_str; -+} -+ -+int main (int argc, char *argv[]) -+{ -+ int major, minor, micro; -+ char *tmp_version; -+ -+ /* This hangs on some systems (?) -+ system ("touch conf.sdltest"); -+ */ -+ { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } -+ -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = my_strdup("$min_sdl_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_sdl_version"); -+ exit(1); -+ } -+ -+ if (($sdl_major_version > major) || -+ (($sdl_major_version == major) && ($sdl_minor_version > minor)) || -+ (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); -+ printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); -+ printf("*** best to upgrade to the required version.\n"); -+ printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); -+ printf("*** to point to the correct copy of sdl-config, and remove the file\n"); -+ printf("*** config.cache before re-running configure\n"); -+ return 1; -+ } -+} -+ -+ -+_ACEOF -+if ac_fn_c_try_run "$LINENO" -+then : -+ -+else case e in #( -+ e) no_sdl=yes ;; -+esac -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+ -+ CFLAGS="$ac_save_CFLAGS" -+ CXXFLAGS="$ac_save_CXXFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_sdl" = x ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ EXTRALIBS_SDL="$SDL_LIBS" -+ CFLAGS="$SDL_CFLAGS $CFLAGS" -+ CXXFLAGS="$SDL_CFLAGS $CXXFLAGS" -+ printf "%s\n" "#define wxUSE_LIBSDL 1" >>confdefs.h -+ -+ -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ if test "$SDL_CONFIG" = "no" ; then -+ echo "*** The sdl-config script installed by SDL could not be found" -+ echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the SDL_CONFIG environment variable to the" -+ echo "*** full path to sdl-config." -+ else -+ if test -f conf.sdltest ; then -+ : -+ else -+ echo "*** Could not run SDL test program, checking why..." -+ CFLAGS="$CFLAGS $SDL_CFLAGS" -+ CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" -+ LIBS="$LIBS $SDL_LIBS" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+#include -+#include "SDL.h" -+ -+int main(int argc, char *argv[]) -+{ return 0; } -+#undef main -+#define main K_and_R_C_main -+ -+int -+main (void) -+{ -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding SDL or finding the wrong" -+ echo "*** version of SDL. If it is not finding SDL, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -+else case e in #( -+ e) echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occurred. This usually means SDL was incorrectly installed" -+ echo "*** or that you have moved SDL since it was installed. In the latter case, you" -+ echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ CFLAGS="$ac_save_CFLAGS" -+ CXXFLAGS="$ac_save_CXXFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ SDL_CFLAGS="" -+ SDL_LIBS="" -+ wxUSE_LIBSDL="no" -+ fi -+ -+ -+ rm -f conf.sdltest -+ -+ -+elif test $pkg_failed = untried; then -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: SDL 2.0 not available. Falling back to 1.2." >&5 -+printf "%s\n" "$as_me: SDL 2.0 not available. Falling back to 1.2." >&6;} -+ -+# Check whether --with-sdl-prefix was given. -+if test ${with_sdl_prefix+y} -+then : -+ withval=$with_sdl_prefix; sdl_prefix="$withval" -+else case e in #( -+ e) sdl_prefix="" ;; -+esac -+fi -+ -+ -+# Check whether --with-sdl-exec-prefix was given. -+if test ${with_sdl_exec_prefix+y} -+then : -+ withval=$with_sdl_exec_prefix; sdl_exec_prefix="$withval" -+else case e in #( -+ e) sdl_exec_prefix="" ;; -+esac -+fi -+ -+# Check whether --enable-sdltest was given. -+if test ${enable_sdltest+y} -+then : -+ enableval=$enable_sdltest; -+else case e in #( -+ e) enable_sdltest=yes ;; -+esac -+fi -+ -+ -+ if test x$sdl_exec_prefix != x ; then -+ sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" -+ if test x${SDL_CONFIG+set} != xset ; then -+ SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config -+ fi -+ fi -+ if test x$sdl_prefix != x ; then -+ sdl_args="$sdl_args --prefix=$sdl_prefix" -+ if test x${SDL_CONFIG+set} != xset ; then -+ SDL_CONFIG=$sdl_prefix/bin/sdl-config -+ fi -+ fi -+ -+ if test "x$prefix" != xNONE; then -+ PATH="$prefix/bin:$prefix/usr/bin:$PATH" -+ fi -+ # Extract the first word of "sdl-config", so it can be a program name with args. -+set dummy sdl-config; 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_path_SDL_CONFIG+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) case $SDL_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ 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_path_SDL_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 -+ done -+IFS=$as_save_IFS -+ -+ test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no" -+ ;; -+esac ;; -+esac -+fi -+SDL_CONFIG=$ac_cv_path_SDL_CONFIG -+if test -n "$SDL_CONFIG"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SDL_CONFIG" >&5 -+printf "%s\n" "$SDL_CONFIG" >&6; } -+else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+fi -+ -+ -+ min_sdl_version=1.2.0 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SDL - version >= $min_sdl_version" >&5 -+printf %s "checking for SDL - version >= $min_sdl_version... " >&6; } -+ no_sdl="" -+ if test "$SDL_CONFIG" = "no" ; then -+ no_sdl=yes -+ else -+ SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` -+ SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` -+ -+ sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -+ sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` -+ sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` -+ if test "x$enable_sdltest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_CXXFLAGS="$CXXFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $SDL_CFLAGS" -+ CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" -+ LIBS="$LIBS $SDL_LIBS" -+ rm -f conf.sdltest -+ if test "$cross_compiling" = yes -+then : -+ echo $ac_n "cross compiling; assumed OK... $ac_c" -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+#include -+#include -+#include -+#include "SDL.h" -+ -+char* -+my_strdup (char *str) -+{ -+ char *new_str; -+ -+ if (str) -+ { -+ new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); -+ strcpy (new_str, str); -+ } -+ else -+ new_str = NULL; -+ -+ return new_str; -+} -+ -+int main (int argc, char *argv[]) -+{ -+ int major, minor, micro; -+ char *tmp_version; -+ -+ /* This hangs on some systems (?) -+ system ("touch conf.sdltest"); -+ */ -+ { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } -+ -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = my_strdup("$min_sdl_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_sdl_version"); -+ exit(1); -+ } -+ -+ if (($sdl_major_version > major) || -+ (($sdl_major_version == major) && ($sdl_minor_version > minor)) || -+ (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); -+ printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); -+ printf("*** best to upgrade to the required version.\n"); -+ printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); -+ printf("*** to point to the correct copy of sdl-config, and remove the file\n"); -+ printf("*** config.cache before re-running configure\n"); -+ return 1; -+ } -+} -+ -+ -+_ACEOF -+if ac_fn_c_try_run "$LINENO" -+then : -+ -+else case e in #( -+ e) no_sdl=yes ;; -+esac -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -+esac -+fi -+ -+ CFLAGS="$ac_save_CFLAGS" -+ CXXFLAGS="$ac_save_CXXFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_sdl" = x ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ EXTRALIBS_SDL="$SDL_LIBS" -+ CFLAGS="$SDL_CFLAGS $CFLAGS" -+ CXXFLAGS="$SDL_CFLAGS $CXXFLAGS" -+ printf "%s\n" "#define wxUSE_LIBSDL 1" >>confdefs.h -+ -+ -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ if test "$SDL_CONFIG" = "no" ; then -+ echo "*** The sdl-config script installed by SDL could not be found" -+ echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the SDL_CONFIG environment variable to the" -+ echo "*** full path to sdl-config." -+ else -+ if test -f conf.sdltest ; then -+ : -+ else -+ echo "*** Could not run SDL test program, checking why..." -+ CFLAGS="$CFLAGS $SDL_CFLAGS" -+ CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" -+ LIBS="$LIBS $SDL_LIBS" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+#include -+#include "SDL.h" -+ -+int main(int argc, char *argv[]) -+{ return 0; } -+#undef main -+#define main K_and_R_C_main -+ -+int -+main (void) -+{ -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding SDL or finding the wrong" -+ echo "*** version of SDL. If it is not finding SDL, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -+else case e in #( -+ e) echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occurred. This usually means SDL was incorrectly installed" -+ echo "*** or that you have moved SDL since it was installed. In the latter case, you" -+ echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ CFLAGS="$ac_save_CFLAGS" -+ CXXFLAGS="$ac_save_CXXFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ SDL_CFLAGS="" -+ SDL_LIBS="" -+ wxUSE_LIBSDL="no" -+ fi -+ -+ -+ rm -f conf.sdltest -+ -+ -+else -+ SDL_CFLAGS=$pkg_cv_SDL_CFLAGS -+ SDL_LIBS=$pkg_cv_SDL_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ EXTRALIBS_SDL="$SDL_LIBS" -+ CFLAGS="$SDL_CFLAGS $CFLAGS" -+ CXXFLAGS="$SDL_CFLAGS $CXXFLAGS" -+ printf "%s\n" "#define wxUSE_LIBSDL 1" >>confdefs.h -+ -+ -+fi -+ if test "$wxUSE_LIBSDL" = "yes" -a "$wxUSE_PLUGINS" = "yes" ; then -+ WITH_PLUGIN_SDL=1 -+ fi -+ fi -+ fi -+fi -+ -+if test "$wxUSE_SOUND" = "yes"; then -+ printf "%s\n" "#define wxUSE_SOUND 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound" -+fi -+ -+if test "$WXGTK2" = 1; then -+ if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then -+ -+ if test "$wxUSE_GTKPRINT" = "yes" ; then -+ if test "$WXGTK3" = 1; then -+ gtk_unix_print="gtk+-unix-print-${TOOLKIT_VERSION}.0" -+ else -+ gtk_unix_print="gtk+-unix-print-2.0 >= 2.10" -+ fi -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTKPRINT" >&5 -+printf %s "checking for GTKPRINT... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$GTKPRINT_CFLAGS"; then -+ pkg_cv_GTKPRINT_CFLAGS="$GTKPRINT_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_unix_print\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "$gtk_unix_print") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_GTKPRINT_CFLAGS=`$PKG_CONFIG --cflags "$gtk_unix_print" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$GTKPRINT_LIBS"; then -+ pkg_cv_GTKPRINT_LIBS="$GTKPRINT_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_unix_print\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "$gtk_unix_print") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_GTKPRINT_LIBS=`$PKG_CONFIG --libs "$gtk_unix_print" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ GTKPRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gtk_unix_print"` -+ else -+ GTKPRINT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gtk_unix_print"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$GTKPRINT_PKG_ERRORS" >&5 -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&5 -+printf "%s\n" "$as_me: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&2;} -+ wxUSE_GTKPRINT="no" -+ -+ -+elif test $pkg_failed = untried; then -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&5 -+printf "%s\n" "$as_me: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&2;} -+ wxUSE_GTKPRINT="no" -+ -+ -+else -+ GTKPRINT_CFLAGS=$pkg_cv_GTKPRINT_CFLAGS -+ GTKPRINT_LIBS=$pkg_cv_GTKPRINT_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GTKPRINT_LIBS" -+ CFLAGS="$GTKPRINT_CFLAGS $CFLAGS" -+ CXXFLAGS="$GTKPRINT_CFLAGS $CXXFLAGS" -+ printf "%s\n" "#define wxUSE_GTKPRINT 1" >>confdefs.h -+ -+ -+fi -+ fi -+ fi -+ -+ if test "$wxUSE_MIMETYPE" = "yes" ; then -+ if test "$wxUSE_LIBGNOMEVFS" = "yes" ; then -+ -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNOMEVFS" >&5 -+printf %s "checking for GNOMEVFS... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$GNOMEVFS_CFLAGS"; then -+ pkg_cv_GNOMEVFS_CFLAGS="$GNOMEVFS_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.0\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= 2.0") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.0" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$GNOMEVFS_LIBS"; then -+ pkg_cv_GNOMEVFS_LIBS="$GNOMEVFS_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.0\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= 2.0") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_GNOMEVFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.0" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-vfs-2.0 >= 2.0"` -+ else -+ GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-vfs-2.0 >= 2.0"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$GNOMEVFS_PKG_ERRORS" >&5 -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&5 -+printf "%s\n" "$as_me: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&2;} -+ wxUSE_LIBGNOMEVFS="no" -+ -+ -+elif test $pkg_failed = untried; then -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&5 -+printf "%s\n" "$as_me: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&2;} -+ wxUSE_LIBGNOMEVFS="no" -+ -+ -+else -+ GNOMEVFS_CFLAGS=$pkg_cv_GNOMEVFS_CFLAGS -+ GNOMEVFS_LIBS=$pkg_cv_GNOMEVFS_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GNOMEVFS_LIBS" -+ CFLAGS="$GNOMEVFS_CFLAGS $CFLAGS" -+ CXXFLAGS="$GNOMEVFS_CFLAGS $CXXFLAGS" -+ printf "%s\n" "#define wxUSE_LIBGNOMEVFS 1" >>confdefs.h -+ -+ -+fi -+ fi -+ fi -+ -+ if test "$wxUSE_NOTIFICATION_MESSAGE" = "yes" ; then -+ if test "$wxUSE_LIBNOTIFY" = "yes" ; then -+ HAVE_LIBNOTIFY=0 -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5 -+printf %s "checking for LIBNOTIFY... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$LIBNOTIFY_CFLAGS"; then -+ pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.7\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libnotify >= 0.7") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= 0.7" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$LIBNOTIFY_LIBS"; then -+ pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.7\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libnotify >= 0.7") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= 0.7" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify >= 0.7"` -+ else -+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify >= 0.7"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$LIBNOTIFY_PKG_ERRORS" >&5 -+ -+ -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5 -+printf %s "checking for LIBNOTIFY... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$LIBNOTIFY_CFLAGS"; then -+ pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.4\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libnotify >= 0.4") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= 0.4" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$LIBNOTIFY_LIBS"; then -+ pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.4\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libnotify >= 0.4") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= 0.4" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify >= 0.4"` -+ else -+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify >= 0.4"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$LIBNOTIFY_PKG_ERRORS" >&5 -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5 -+printf "%s\n" "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;} -+ wxUSE_LIBNOTIFY="no" -+ -+ -+elif test $pkg_failed = untried; then -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5 -+printf "%s\n" "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;} -+ wxUSE_LIBNOTIFY="no" -+ -+ -+else -+ LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS -+ LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ HAVE_LIBNOTIFY=1 -+fi -+ -+ -+elif test $pkg_failed = untried; then -+ -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5 -+printf %s "checking for LIBNOTIFY... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$LIBNOTIFY_CFLAGS"; then -+ pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.4\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libnotify >= 0.4") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= 0.4" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$LIBNOTIFY_LIBS"; then -+ pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.4\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libnotify >= 0.4") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= 0.4" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify >= 0.4"` -+ else -+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify >= 0.4"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$LIBNOTIFY_PKG_ERRORS" >&5 -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5 -+printf "%s\n" "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;} -+ wxUSE_LIBNOTIFY="no" -+ -+ -+elif test $pkg_failed = untried; then -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5 -+printf "%s\n" "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;} -+ wxUSE_LIBNOTIFY="no" -+ -+ -+else -+ LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS -+ LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ HAVE_LIBNOTIFY=1 -+fi -+ -+ -+else -+ LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS -+ LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ HAVE_LIBNOTIFY=1 -+ printf "%s\n" "#define wxUSE_LIBNOTIFY_0_7 1" >>confdefs.h -+ -+ -+fi -+ -+ if test "$HAVE_LIBNOTIFY" = "1" ; then -+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $LIBNOTIFY_LIBS" -+ CFLAGS="$LIBNOTIFY_CFLAGS $CFLAGS" -+ CXXFLAGS="$LIBNOTIFY_CFLAGS $CXXFLAGS" -+ printf "%s\n" "#define wxUSE_LIBNOTIFY 1" >>confdefs.h -+ -+ fi -+ fi -+ fi -+ -+fi -+ -+if test "$wxUSE_CMDLINE_PARSER" = "yes"; then -+ printf "%s\n" "#define wxUSE_CMDLINE_PARSER 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_STOPWATCH" = "yes"; then -+ printf "%s\n" "#define wxUSE_STOPWATCH 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_DATETIME" = "yes"; then -+ printf "%s\n" "#define wxUSE_DATETIME 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_FILE" = "yes"; then -+ printf "%s\n" "#define wxUSE_FILE 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_FFILE" = "yes"; then -+ printf "%s\n" "#define wxUSE_FFILE 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_ARCHIVE_STREAMS" = "yes"; then -+ if test "$wxUSE_STREAMS" != yes; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxArchive requires wxStreams... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxArchive requires wxStreams... disabled" >&2;} -+ wxUSE_ARCHIVE_STREAMS=no -+ else -+ printf "%s\n" "#define wxUSE_ARCHIVE_STREAMS 1" >>confdefs.h -+ -+ fi -+fi -+ -+if test "$wxUSE_ZIPSTREAM" = "yes"; then -+ if test "$wxUSE_ARCHIVE_STREAMS" != "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxZip requires wxArchive... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxZip requires wxArchive... disabled" >&2;} -+ elif test "$wxUSE_ZLIB" = "no"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxZip requires wxZlib... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxZip requires wxZlib... disabled" >&2;} -+ else -+ printf "%s\n" "#define wxUSE_ZIPSTREAM 1" >>confdefs.h -+ -+ fi -+fi -+ -+if test "$wxUSE_TARSTREAM" = "yes"; then -+ if test "$wxUSE_ARCHIVE_STREAMS" != "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxTar requires wxArchive... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxTar requires wxArchive... disabled" >&2;} -+ else -+ printf "%s\n" "#define wxUSE_TARSTREAM 1" >>confdefs.h -+ -+ fi -+fi -+ -+if test "$wxUSE_FILE_HISTORY" = "yes"; then -+ printf "%s\n" "#define wxUSE_FILE_HISTORY 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_FILESYSTEM" = "yes"; then -+ if test "$wxUSE_STREAMS" != yes -o \( "$wxUSE_FILE" != yes -a "$wxUSE_FFILE" != yes \); then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxFileSystem requires wxStreams and wxFile or wxFFile... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxFileSystem requires wxStreams and wxFile or wxFFile... disabled" >&2;} -+ wxUSE_FILESYSTEM=no -+ else -+ printf "%s\n" "#define wxUSE_FILESYSTEM 1" >>confdefs.h -+ -+ fi -+fi -+ -+if test "$wxUSE_FS_ARCHIVE" = "yes"; then -+ if test "$wxUSE_FILESYSTEM" != yes -o "$wxUSE_ARCHIVE_STREAMS" != yes; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxArchiveFSHandler requires wxArchive and wxFileSystem... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxArchiveFSHandler requires wxArchive and wxFileSystem... disabled" >&2;} -+ else -+ printf "%s\n" "#define wxUSE_FS_ARCHIVE 1" >>confdefs.h -+ -+ fi -+fi -+ -+if test "$wxUSE_FS_ZIP" = "yes"; then -+ if test "$wxUSE_FS_ARCHIVE" != yes; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxZipFSHandler requires wxArchiveFSHandler... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxZipFSHandler requires wxArchiveFSHandler... disabled" >&2;} -+ else -+ printf "%s\n" "#define wxUSE_FS_ZIP 1" >>confdefs.h -+ -+ fi -+fi -+ -+if test "$wxUSE_FSVOLUME" = "yes"; then -+ printf "%s\n" "#define wxUSE_FSVOLUME 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then -+ if test "$USE_UNIX" != 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called" >&5 -+printf "%s\n" "$as_me: WARNING: Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called" >&2;} -+ wxUSE_ON_FATAL_EXCEPTION=no -+ else -+ printf "%s\n" "#define wxUSE_ON_FATAL_EXCEPTION 1" >>confdefs.h -+ -+ fi -+fi -+ -+if test "$wxUSE_STACKWALKER" = "yes"; then -+ printf "%s\n" "#define wxUSE_STACKWALKER 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_DEBUGREPORT" = "yes"; then -+ if test "$USE_UNIX" != 1 -a "$USE_WIN32" != 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Creating debug reports not currently supported on this system, disabled" >&5 -+printf "%s\n" "$as_me: WARNING: Creating debug reports not currently supported on this system, disabled" >&2;} -+ wxUSE_DEBUGREPORT=no -+ else -+ printf "%s\n" "#define wxUSE_DEBUGREPORT 1" >>confdefs.h -+ -+ if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS debugrpt" -+ fi -+ fi -+fi -+ -+if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then -+ printf "%s\n" "#define wxUSE_SNGLINST_CHECKER 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_BUSYINFO" = "yes"; then -+ printf "%s\n" "#define wxUSE_BUSYINFO 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_HOTKEY" = "yes"; then -+ if test "$wxUSE_MSW" != 1 -a "$wxUSE_OSX_COCOA" != 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Hot keys not supported by the current toolkit, disabled" >&5 -+printf "%s\n" "$as_me: WARNING: Hot keys not supported by the current toolkit, disabled" >&2;} -+ wxUSE_HOTKEY=no -+ fi -+elif test "$wxUSE_HOTKEY" = "auto"; then -+ if test "$wxUSE_MSW" = 1 -o "$wxUSE_OSX_COCOA" = 1; then -+ wxUSE_HOTKEY=yes -+ fi -+fi -+if test "$wxUSE_HOTKEY" = "yes"; then -+ printf "%s\n" "#define wxUSE_HOTKEY 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_STD_CONTAINERS" = "yes"; then -+ printf "%s\n" "#define wxUSE_STD_CONTAINERS 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_STD_CONTAINERS_COMPATIBLY" = "yes"; then -+ printf "%s\n" "#define wxUSE_STD_CONTAINERS_COMPATIBLY 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_STD_IOSTREAM" = "yes"; then -+ printf "%s\n" "#define wxUSE_STD_IOSTREAM 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_STD_STRING" = "yes"; then -+ printf "%s\n" "#define wxUSE_STD_STRING 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_STD_STRING_CONV_IN_WXSTRING" = "yes"; then -+ printf "%s\n" "#define wxUSE_STD_STRING_CONV_IN_WXSTRING 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_UNSAFE_WXSTRING_CONV" = "yes"; then -+ printf "%s\n" "#define wxUSE_UNSAFE_WXSTRING_CONV 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_STDPATHS" = "yes"; then -+ printf "%s\n" "#define wxUSE_STDPATHS 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_TEXTBUFFER" = "yes"; then -+ printf "%s\n" "#define wxUSE_TEXTBUFFER 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_TEXTFILE" = "yes"; then -+ if test "$wxUSE_FILE" != "yes" -o "$wxUSE_TEXTBUFFER" != "yes" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxTextFile requires wxFile and wxTextBuffer... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxTextFile requires wxFile and wxTextBuffer... disabled" >&2;} -+ else -+ printf "%s\n" "#define wxUSE_TEXTFILE 1" >>confdefs.h -+ -+ fi -+fi -+ -+if test "$wxUSE_CONFIG" = "yes" ; then -+ if test "$wxUSE_TEXTFILE" != "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxConfig requires wxTextFile... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxConfig requires wxTextFile... disabled" >&2;} -+ else -+ printf "%s\n" "#define wxUSE_CONFIG 1" >>confdefs.h -+ -+ printf "%s\n" "#define wxUSE_CONFIG_NATIVE 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config" -+ fi -+fi -+ -+if test "$wxUSE_INTL" = "yes" ; then -+ if test "$wxUSE_FILE" != "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: I18n code requires wxFile... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: I18n code requires wxFile... disabled" >&2;} -+ else -+ printf "%s\n" "#define wxUSE_INTL 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat" -+ GUIDIST="$GUIDIST INTL_DIST" -+ fi -+fi -+ -+if test "$wxUSE_XLOCALE" = "yes" ; then -+ ac_fn_c_check_header_compile "$LINENO" "xlocale.h" "ac_cv_header_xlocale_h" "$ac_includes_default" -+if test "x$ac_cv_header_xlocale_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_XLOCALE_H 1" >>confdefs.h -+ -+fi -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for locale_t" >&5 -+printf %s "checking for locale_t... " >&6; } -+if test ${wx_cv_type_locale_t+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ ac_ext=cpp -+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 -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #ifdef HAVE_XLOCALE_H -+ #include -+ #endif -+ #include -+ #include -+ -+int -+main (void) -+{ -+ -+ locale_t t; -+ strtod_l(NULL, NULL, t); -+ strtol_l(NULL, NULL, 0, t); -+ strtoul_l(NULL, NULL, 0, t); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_type_locale_t=yes -+else case e in #( -+ e) wx_cv_type_locale_t=no -+ ;; -+esac -+fi -+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' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_locale_t" >&5 -+printf "%s\n" "$wx_cv_type_locale_t" >&6; } -+ -+ if test "$wx_cv_type_locale_t" = "yes" ; then -+ printf "%s\n" "#define wxUSE_XLOCALE 1" >>confdefs.h -+ -+ -+ printf "%s\n" "#define HAVE_LOCALE_T 1" >>confdefs.h -+ -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: No locale_t support, wxXLocale won't be available" >&5 -+printf "%s\n" "$as_me: WARNING: No locale_t support, wxXLocale won't be available" >&2;} -+ fi -+fi -+ -+if test "$wxUSE_LOG" = "yes"; then -+ printf "%s\n" "#define wxUSE_LOG 1" >>confdefs.h -+ -+ -+ if test "$wxUSE_LOGGUI" = "yes"; then -+ printf "%s\n" "#define wxUSE_LOGGUI 1" >>confdefs.h -+ -+ fi -+ -+ if test "$wxUSE_LOGWINDOW" = "yes"; then -+ printf "%s\n" "#define wxUSE_LOGWINDOW 1" >>confdefs.h -+ -+ fi -+ -+ if test "$wxUSE_LOGDIALOG" = "yes"; then -+ printf "%s\n" "#define wxUSE_LOG_DIALOG 1" >>confdefs.h -+ -+ fi -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS keyboard" -+fi -+ -+if test "$wxUSE_LONGLONG" = "yes"; then -+ printf "%s\n" "#define wxUSE_LONGLONG 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_GEOMETRY" = "yes"; then -+ printf "%s\n" "#define wxUSE_GEOMETRY 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_BASE64" = "yes"; then -+ printf "%s\n" "#define wxUSE_BASE64 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_STREAMS" = "yes" ; then -+ printf "%s\n" "#define wxUSE_STREAMS 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then -+ printf "%s\n" "#define wxUSE_PRINTF_POS_PARAMS 1" >>confdefs.h -+ -+fi -+ -+ -+if test "$wxUSE_CONSOLE_EVENTLOOP" = "yes"; then -+ printf "%s\n" "#define wxUSE_CONSOLE_EVENTLOOP 1" >>confdefs.h -+ -+ -+ if test "$wxUSE_UNIX" = "yes"; then -+ if test "$wxUSE_SELECT_DISPATCHER" = "yes"; then -+ printf "%s\n" "#define wxUSE_SELECT_DISPATCHER 1" >>confdefs.h -+ -+ fi -+ -+ if test "$wxUSE_EPOLL_DISPATCHER" = "yes"; then -+ ac_fn_c_check_header_compile "$LINENO" "sys/epoll.h" "ac_cv_header_sys_epoll_h" "$ac_includes_default -+" -+if test "x$ac_cv_header_sys_epoll_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_SYS_EPOLL_H 1" >>confdefs.h -+ -+fi -+ -+ if test "$ac_cv_header_sys_epoll_h" = "yes"; then -+ case "${host}" in -+ *-*-linux*) -+ printf "%s\n" "#define wxUSE_EPOLL_DISPATCHER 1" >>confdefs.h -+ -+ ;; -+ *) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxEpollDispatcher disabled, because OS is not Linux" >&5 -+printf "%s\n" "$as_me: WARNING: wxEpollDispatcher disabled, because OS is not Linux" >&2;} -+ ;; -+ esac -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: sys/epoll.h not available, wxEpollDispatcher disabled" >&5 -+printf "%s\n" "$as_me: WARNING: sys/epoll.h not available, wxEpollDispatcher disabled" >&2;} -+ fi -+ fi -+ fi -+fi -+ -+ -+ -+ for ac_func in gettimeofday ftime -+do : -+ as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | sed "$as_sed_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 `printf "%s\n" "HAVE_$ac_func" | sed "$as_sed_cpp"` 1 -+_ACEOF -+ break -+fi -+ -+done -+ -+if test "$ac_cv_func_gettimeofday" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday takes two arguments" >&5 -+printf %s "checking whether gettimeofday takes two arguments... " >&6; } -+if test ${wx_cv_func_gettimeofday_has_2_args+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ #include -+ -+int -+main (void) -+{ -+ -+ struct timeval tv; -+ gettimeofday(&tv, NULL); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ wx_cv_func_gettimeofday_has_2_args=yes -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ #include -+ -+int -+main (void) -+{ -+ -+ struct timeval tv; -+ gettimeofday(&tv); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ wx_cv_func_gettimeofday_has_2_args=no -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: failed to determine number of gettimeofday() arguments" >&5 -+printf "%s\n" "$as_me: WARNING: failed to determine number of gettimeofday() arguments" >&2;} -+ wx_cv_func_gettimeofday_has_2_args=unknown -+ -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_gettimeofday_has_2_args" >&5 -+printf "%s\n" "$wx_cv_func_gettimeofday_has_2_args" >&6; } -+ -+ if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then -+ printf "%s\n" "#define WX_GETTIMEOFDAY_NO_TZ 1" >>confdefs.h -+ -+ fi -+fi -+ -+if test "$wxUSE_DATETIME" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for timezone variable in " >&5 -+printf %s "checking for timezone variable in ... " >&6; } -+if test ${wx_cv_var_timezone+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ ac_ext=cpp -+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 -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ -+int -+main (void) -+{ -+ -+ int tz; -+ tz = timezone; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ -+ wx_cv_var_timezone=timezone -+ -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ -+int -+main (void) -+{ -+ -+ int tz; -+ tz = _timezone; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ -+ wx_cv_var_timezone=_timezone -+ -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ -+int -+main (void) -+{ -+ -+ int tz; -+ tz = __timezone; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ -+ wx_cv_var_timezone=__timezone -+ -+else case e in #( -+ e) -+ if test "$USE_DOS" = 0 ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: no timezone variable" >&5 -+printf "%s\n" "$as_me: WARNING: no timezone variable" >&2;} -+ fi -+ -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+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' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_var_timezone" >&5 -+printf "%s\n" "$wx_cv_var_timezone" >&6; } -+ -+ if test "x$wx_cv_var_timezone" != x ; then -+ printf "%s\n" "#define WX_TIMEZONE $wx_cv_var_timezone" >>confdefs.h -+ -+ fi -+ -+ ac_fn_c_check_func "$LINENO" "localtime" "ac_cv_func_localtime" -+if test "x$ac_cv_func_localtime" = xyes -+then : -+ printf "%s\n" "#define HAVE_LOCALTIME 1" >>confdefs.h -+ -+fi -+ -+ -+ if test "$ac_cv_func_localtime" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tm_gmtoff in struct tm" >&5 -+printf %s "checking for tm_gmtoff in struct tm... " >&6; } -+if test ${wx_cv_struct_tm_has_gmtoff+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ -+int -+main (void) -+{ -+ -+ struct tm tm; -+ tm.tm_gmtoff++; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ -+ wx_cv_struct_tm_has_gmtoff=yes -+ -+else case e in #( -+ e) wx_cv_struct_tm_has_gmtoff=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_struct_tm_has_gmtoff" >&5 -+printf "%s\n" "$wx_cv_struct_tm_has_gmtoff" >&6; } -+ fi -+ -+ if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then -+ printf "%s\n" "#define WX_GMTOFF_IN_TM 1" >>confdefs.h -+ -+ fi -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _NL_TIME_FIRST_WEEKDAY in langinfo.h" >&5 -+printf %s "checking for _NL_TIME_FIRST_WEEKDAY in langinfo.h... " >&6; } -+if test ${wx_cv_have_nl_time_first_weekday+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #define _GNU_SOURCE -+ #include -+ -+int -+main (void) -+{ -+ -+ _NL_TIME_FIRST_WEEKDAY; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ -+ wx_cv_have_nl_time_first_weekday=yes -+ -+else case e in #( -+ e) wx_cv_have_nl_time_first_weekday=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_have_nl_time_first_weekday" >&5 -+printf "%s\n" "$wx_cv_have_nl_time_first_weekday" >&6; } -+ -+ if test "$wx_cv_have_nl_time_first_weekday" = "yes"; then -+ printf "%s\n" "#define HAVE_NL_TIME_FIRST_WEEKDAY 1" >>confdefs.h -+ -+ fi -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest" -+fi -+ -+ -+ac_fn_c_check_func "$LINENO" "setpriority" "ac_cv_func_setpriority" -+if test "x$ac_cv_func_setpriority" = xyes -+then : -+ printf "%s\n" "#define HAVE_SETPRIORITY 1" >>confdefs.h -+ -+fi -+ -+ -+ -+if test "$wxUSE_SOCKETS" = "yes"; then -+ if test "$USE_WIN32" != 1 ; then -+ ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket" -+if test "x$ac_cv_func_socket" = xyes -+then : -+ -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 -+printf %s "checking for socket in -lsocket... " >&6; } -+if test ${ac_cv_lib_socket_socket+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lsocket $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char socket (void); -+int -+main (void) -+{ -+return socket (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_socket_socket=yes -+else case e in #( -+ e) ac_cv_lib_socket_socket=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 -+printf "%s\n" "$ac_cv_lib_socket_socket" >&6; } -+if test "x$ac_cv_lib_socket_socket" = xyes -+then : -+ if test "$INET_LINK" != " -lsocket"; then -+ INET_LINK="$INET_LINK -lsocket" -+ fi -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socket in -lnetwork" >&5 -+printf %s "checking for socket in -lnetwork... " >&6; } -+if test ${ac_cv_lib_network_socket+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_check_lib_save_LIBS=$LIBS -+LIBS="-lnetwork $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char socket (void); -+int -+main (void) -+{ -+return socket (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_network_socket=yes -+else case e in #( -+ e) ac_cv_lib_network_socket=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_socket" >&5 -+printf "%s\n" "$ac_cv_lib_network_socket" >&6; } -+if test "x$ac_cv_lib_network_socket" = xyes -+then : -+ if test "$INET_LINK" != " -lnetwork"; then -+ INET_LINK="$INET_LINK -lnetwork" -+ fi -+else case e in #( -+ e) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: socket library not found - sockets will be disabled" >&5 -+printf "%s\n" "$as_me: WARNING: socket library not found - sockets will be disabled" >&2;} -+ wxUSE_SOCKETS=no -+ -+ ;; -+esac -+fi -+ -+ -+ ;; -+esac -+fi -+ -+ -+ ;; -+esac -+fi -+ -+ fi -+fi -+ -+if test "$wxUSE_SOCKETS" = "yes" ; then -+ if test "$USE_WIN32" != 1 ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what is the type of the third argument of getsockname" >&5 -+printf %s "checking what is the type of the third argument of getsockname... " >&6; } -+if test ${wx_cv_type_getsockname3+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ ac_ext=cpp -+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 -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ #include -+ -+int -+main (void) -+{ -+ -+ socklen_t len; -+ getsockname(0, 0, &len); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_type_getsockname3=socklen_t -+else case e in #( -+ e) -+ CFLAGS_OLD="$CFLAGS" -+ if test "$GCC" = yes ; then -+ CFLAGS="-Werror $CFLAGS" -+ fi -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ #include -+ -+int -+main (void) -+{ -+ -+ size_t len; -+ getsockname(0, 0, &len); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_type_getsockname3=size_t -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ #include -+ -+int -+main (void) -+{ -+ -+ int len; -+ getsockname(0, 0, &len); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_type_getsockname3=int -+else case e in #( -+ e) wx_cv_type_getsockname3=unknown -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ CFLAGS="$CFLAGS_OLD" -+ -+ ;; -+esac -+fi -+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' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_getsockname3" >&5 -+printf "%s\n" "$wx_cv_type_getsockname3" >&6; } -+ -+ if test "$wx_cv_type_getsockname3" = "unknown"; then -+ wxUSE_SOCKETS=no -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Couldn't find socklen_t synonym for this system" >&5 -+printf "%s\n" "$as_me: WARNING: Couldn't find socklen_t synonym for this system" >&2;} -+ else -+ printf "%s\n" "#define WX_SOCKLEN_T $wx_cv_type_getsockname3" >>confdefs.h -+ -+ fi -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what is the type of the fifth argument of getsockopt" >&5 -+printf %s "checking what is the type of the fifth argument of getsockopt... " >&6; } -+if test ${wx_cv_type_getsockopt5+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ ac_ext=cpp -+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 -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ #include -+ -+int -+main (void) -+{ -+ -+ socklen_t len; -+ getsockopt(0, 0, 0, 0, &len); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_type_getsockopt5=socklen_t -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ #include -+ -+int -+main (void) -+{ -+ -+ size_t len; -+ getsockopt(0, 0, 0, 0, &len); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_type_getsockopt5=size_t -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ #include -+ -+int -+main (void) -+{ -+ -+ int len; -+ getsockopt(0, 0, 0, 0, &len); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_type_getsockopt5=int -+else case e in #( -+ e) wx_cv_type_getsockopt5=unknown -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+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' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_getsockopt5" >&5 -+printf "%s\n" "$wx_cv_type_getsockopt5" >&6; } -+ -+ if test "$wx_cv_type_getsockopt5" = "unknown"; then -+ wxUSE_SOCKETS=no -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Couldn't find socklen_t synonym for this system" >&5 -+printf "%s\n" "$as_me: WARNING: Couldn't find socklen_t synonym for this system" >&2;} -+ else -+ printf "%s\n" "#define SOCKOPTLEN_T $wx_cv_type_getsockopt5" >>confdefs.h -+ -+ fi -+ fi -+fi -+ -+if test "$wxUSE_SOCKETS" = "yes" ; then -+ if test "$wxUSE_IPV6" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we have sockaddr_in6" >&5 -+printf %s "checking whether we have sockaddr_in6... " >&6; } -+if test ${wx_cv_type_sockaddr_in6+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ #include -+ #include -+ -+int -+main (void) -+{ -+ -+ struct sockaddr_in6 sa6; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ wx_cv_type_sockaddr_in6=yes -+else case e in #( -+ e) wx_cv_type_sockaddr_in6=no -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_sockaddr_in6" >&5 -+printf "%s\n" "$wx_cv_type_sockaddr_in6" >&6; } -+ -+ if test "$wx_cv_type_sockaddr_in6"="yes"; then -+ printf "%s\n" "#define wxUSE_IPV6 1" >>confdefs.h -+ -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: IPv6 support not available... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: IPv6 support not available... disabled" >&2;} -+ fi -+ fi -+ -+ printf "%s\n" "#define wxUSE_SOCKETS 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets" -+fi -+ -+if test "$wxUSE_PROTOCOL" = "yes"; then -+ if test "$wxUSE_SOCKETS" != "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Protocol classes require sockets... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: Protocol classes require sockets... disabled" >&2;} -+ wxUSE_PROTOCOL=no -+ fi -+fi -+ -+if test "$wxUSE_PROTOCOL" = "yes"; then -+ printf "%s\n" "#define wxUSE_PROTOCOL 1" >>confdefs.h -+ -+ -+ if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then -+ printf "%s\n" "#define wxUSE_PROTOCOL_HTTP 1" >>confdefs.h -+ -+ fi -+ if test "$wxUSE_PROTOCOL_FTP" = "yes"; then -+ printf "%s\n" "#define wxUSE_PROTOCOL_FTP 1" >>confdefs.h -+ -+ fi -+ if test "$wxUSE_PROTOCOL_FILE" = "yes"; then -+ printf "%s\n" "#define wxUSE_PROTOCOL_FILE 1" >>confdefs.h -+ -+ fi -+else -+ if test "$wxUSE_FS_INET" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: HTTP filesystem require protocol classes... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: HTTP filesystem require protocol classes... disabled" >&2;} -+ wxUSE_FS_INET="no" -+ fi -+fi -+ -+if test "$wxUSE_URL" = "yes"; then -+ if test "$wxUSE_PROTOCOL" != "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxURL class requires wxProtocol... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxURL class requires wxProtocol... disabled" >&2;} -+ wxUSE_URL=no -+ fi -+ if test "$wxUSE_URL" = "yes"; then -+ printf "%s\n" "#define wxUSE_URL 1" >>confdefs.h -+ -+ fi -+fi -+ -+if test "$wxUSE_VARIANT" = "yes"; then -+ printf "%s\n" "#define wxUSE_VARIANT 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_FS_INET" = "yes"; then -+ printf "%s\n" "#define wxUSE_FS_INET 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_WEBREQUEST" = "yes"; then -+ if test "$wxUSE_LIBCURL" = "yes"; then -+ printf "%s\n" "#define wxUSE_WEBREQUEST_CURL 1" >>confdefs.h -+ -+ have_webrequest_backend=1 -+ fi -+ -+ if test "$USE_DARWIN" = 1 -a "$wxUSE_URLSESSION" = "yes"; then -+ printf "%s\n" "#define wxUSE_WEBREQUEST_URLSESSION 1" >>confdefs.h -+ -+ have_webrequest_backend=1 -+ fi -+ -+ if test "$USE_WIN32" = 1 -a "$wxUSE_WINHTTP" = "yes"; then -+ printf "%s\n" "#define wxUSE_WEBREQUEST_WINHTTP 1" >>confdefs.h -+ -+ have_webrequest_backend=1 -+ fi -+ -+ if test "$have_webrequest_backend" = 1; then -+ printf "%s\n" "#define wxUSE_WEBREQUEST 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS webrequest" -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Disabling wxWebRequest because no backends are available" >&5 -+printf "%s\n" "$as_me: WARNING: Disabling wxWebRequest because no backends are available" >&2;} -+ fi -+fi -+ -+ -+if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then -+ wxUSE_JOYSTICK=no -+ -+ if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "OSX_COCOA" -o "$TOOLKIT" = "COCOA"; then -+ wxUSE_JOYSTICK=yes -+ -+ else -+ for ac_header in linux/joystick.h -+do : -+ ac_fn_c_check_header_compile "$LINENO" "linux/joystick.h" "ac_cv_header_linux_joystick_h" "$ac_includes_default -+" -+if test "x$ac_cv_header_linux_joystick_h" = xyes -+then : -+ printf "%s\n" "#define HAVE_LINUX_JOYSTICK_H 1" >>confdefs.h -+ wxUSE_JOYSTICK=yes -+fi -+ -+done -+ fi -+ -+ if test "$wxUSE_JOYSTICK" = "yes"; then -+ printf "%s\n" "#define wxUSE_JOYSTICK 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest" -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Joystick not supported by this system... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: Joystick not supported by this system... disabled" >&2;} -+ fi -+fi -+ -+ -+ -+if test "$wxUSE_FONTENUM" = "yes" ; then -+ printf "%s\n" "#define wxUSE_FONTENUM 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_FONTMAP" = "yes" ; then -+ printf "%s\n" "#define wxUSE_FONTMAP 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_UNICODE" = "yes" ; then -+ printf "%s\n" "#define wxUSE_UNICODE 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "yes"; then -+ printf "%s\n" "#define wxUSE_UNICODE_UTF8 1" >>confdefs.h -+ -+ -+ if test "$wxUSE_UNICODE_UTF8_LOCALE" = "yes"; then -+ printf "%s\n" "#define wxUSE_UTF8_LOCALE_ONLY 1" >>confdefs.h -+ -+ fi -+fi -+ -+ -+if test "$wxUSE_CONSTRAINTS" = "yes"; then -+ printf "%s\n" "#define wxUSE_CONSTRAINTS 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout" -+fi -+ -+if test "$wxUSE_MDI" = "yes"; then -+ printf "%s\n" "#define wxUSE_MDI 1" >>confdefs.h -+ -+ -+ if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then -+ printf "%s\n" "#define wxUSE_MDI_ARCHITECTURE 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi" -+ fi -+fi -+ -+if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then -+ printf "%s\n" "#define wxUSE_DOC_VIEW_ARCHITECTURE 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview" -+fi -+ -+if test "$wxUSE_HELP" = "yes"; then -+ printf "%s\n" "#define wxUSE_HELP 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help" -+ -+ if test "$wxUSE_MSW" = 1; then -+ if test "$wxUSE_MS_HTML_HELP" = "yes"; then -+ printf "%s\n" "#define wxUSE_MS_HTML_HELP 1" >>confdefs.h -+ -+ fi -+ fi -+ -+ if test "$wxUSE_WXHTML_HELP" = "yes"; then -+ if test "$wxUSE_HTML" = "yes"; then -+ printf "%s\n" "#define wxUSE_WXHTML_HELP 1" >>confdefs.h -+ -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Cannot use wxHTML-based help without wxHTML so it won't be compiled" >&5 -+printf "%s\n" "$as_me: WARNING: Cannot use wxHTML-based help without wxHTML so it won't be compiled" >&2;} -+ wxUSE_WXHTML_HELP=no -+ fi -+ fi -+fi -+ -+if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then -+ printf "%s\n" "#define wxUSE_PRINTING_ARCHITECTURE 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing" -+fi -+ -+if test "$wxUSE_POSTSCRIPT" = "yes" ; then -+ printf "%s\n" "#define wxUSE_POSTSCRIPT 1" >>confdefs.h -+ -+fi -+ -+printf "%s\n" "#define wxUSE_AFM_FOR_POSTSCRIPT 1" >>confdefs.h -+ -+ -+if test "$wxUSE_SVG" = "yes"; then -+ printf "%s\n" "#define wxUSE_SVG 1" >>confdefs.h -+ -+fi -+ -+ -+if test "$wxUSE_METAFILE" = "yes"; then -+ if test "$wxUSE_MSW" != 1 -a "$wxUSE_MAC" != 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxMetafile is not available on this system... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxMetafile is not available on this system... disabled" >&2;} -+ wxUSE_METAFILE=no -+ fi -+elif test "$wxUSE_METAFILE" = "auto"; then -+ if test "$wxUSE_MSW" = 1 -o "$wxUSE_MAC" = 1; then -+ wxUSE_METAFILE=yes -+ fi -+fi -+ -+if test "$wxUSE_METAFILE" = "yes"; then -+ printf "%s\n" "#define wxUSE_METAFILE 1" >>confdefs.h -+ -+ if test "$wxUSE_MSW" = 1; then -+ printf "%s\n" "#define wxUSE_ENH_METAFILE 1" >>confdefs.h -+ -+ fi -+fi -+ -+ -+if test "$USE_WIN32" = 1 ; then -+ if test "$wxUSE_OLE" = "yes" ; then -+ LIBS="-lrpcrt4 -loleaut32 -lole32 -luuid $LIBS" -+ -+ printf "%s\n" "#define wxUSE_OLE 1" >>confdefs.h -+ -+ printf "%s\n" "#define wxUSE_OLE_AUTOMATION 1" >>confdefs.h -+ -+ printf "%s\n" "#define wxUSE_ACTIVEX 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS oleauto" -+ else -+ wxUSE_CLIPBOARD=no -+ wxUSE_DRAG_AND_DROP=no -+ wxUSE_DATAOBJ=no -+ -+ if test "$wxUSE_MEDIACTRL" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxMediaCtrl requires wxUSE_OLE... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxMediaCtrl requires wxUSE_OLE... disabled" >&2;} -+ wxUSE_MEDIACTRL=no -+ fi -+ -+ if test "$wxUSE_WEBVIEW" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxWebView requires wxUSE_OLE... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxWebView requires wxUSE_OLE... disabled" >&2;} -+ wxUSE_WEBVIEW=no -+ fi -+ fi -+fi -+ -+if test "$wxUSE_IPC" = "yes"; then -+ if test "$wxUSE_SOCKETS" != "yes" -a "$USE_WIN32" != 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxWidgets IPC classes require sockets... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxWidgets IPC classes require sockets... disabled" >&2;} -+ wxUSE_IPC=no -+ fi -+ -+ if test "$wxUSE_IPC" = "yes"; then -+ printf "%s\n" "#define wxUSE_IPC 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ipc" -+ fi -+fi -+ -+if test "$wxUSE_DATAOBJ" = "yes"; then -+ if test "$wxUSE_DFB" = 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&2;} -+ wxUSE_DATAOBJ=no -+ else -+ printf "%s\n" "#define wxUSE_DATAOBJ 1" >>confdefs.h -+ -+ fi -+else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Clipboard and drag-and-drop require wxDataObject -- disabled" >&5 -+printf "%s\n" "$as_me: WARNING: Clipboard and drag-and-drop require wxDataObject -- disabled" >&2;} -+ wxUSE_CLIPBOARD=no -+ wxUSE_DRAG_AND_DROP=no -+fi -+ -+if test "$wxUSE_CLIPBOARD" = "yes"; then -+ if test "$wxUSE_DFB" = 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Clipboard not yet supported under $TOOLKIT... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: Clipboard not yet supported under $TOOLKIT... disabled" >&2;} -+ wxUSE_CLIPBOARD=no -+ fi -+ -+ if test "$wxUSE_CLIPBOARD" = "yes"; then -+ printf "%s\n" "#define wxUSE_CLIPBOARD 1" >>confdefs.h -+ -+ fi -+fi -+ -+if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then -+ if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_DFB" = 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&2;} -+ wxUSE_DRAG_AND_DROP=no -+ fi -+ -+ if test "$wxUSE_DRAG_AND_DROP" = "yes"; then -+ printf "%s\n" "#define wxUSE_DRAG_AND_DROP 1" >>confdefs.h -+ -+ fi -+ -+fi -+ -+if test "$wxUSE_DRAG_AND_DROP" = "yes" -o "$wxUSE_CLIPBOARD" = "yes"; then -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd" -+fi -+ -+if test "$wxUSE_CLIPBOARD" = "yes"; then -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS clipboard" -+fi -+ -+if test "$wxUSE_SPLINES" = "yes" ; then -+ printf "%s\n" "#define wxUSE_SPLINES 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_MOUSEWHEEL" = "yes" ; then -+ printf "%s\n" "#define wxUSE_MOUSEWHEEL 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_UIACTIONSIMULATOR" = "yes" ; then -+ if test "$wxUSE_GTK" = 1 -o "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1; then -+ if test "$wxUSE_XTEST" = "yes" ; then -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XTST" >&5 -+printf %s "checking for XTST... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$XTST_CFLAGS"; then -+ pkg_cv_XTST_CFLAGS="$XTST_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xtst\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "xtst") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_XTST_CFLAGS=`$PKG_CONFIG --cflags "xtst" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$XTST_LIBS"; then -+ pkg_cv_XTST_LIBS="$XTST_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xtst\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "xtst") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_XTST_LIBS=`$PKG_CONFIG --libs "xtst" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ XTST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xtst"` -+ else -+ XTST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xtst"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$XTST_PKG_ERRORS" >&5 -+ -+ -+ if test "$WXGTK3" = 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: XTest not found, disabling wxUIActionSimulator" >&5 -+printf "%s\n" "$as_me: WARNING: XTest not found, disabling wxUIActionSimulator" >&2;} -+ wxUSE_UIACTIONSIMULATOR=no -+ fi -+ wxUSE_XTEST="no" -+ -+ -+elif test $pkg_failed = untried; then -+ -+ if test "$WXGTK3" = 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: XTest not found, disabling wxUIActionSimulator" >&5 -+printf "%s\n" "$as_me: WARNING: XTest not found, disabling wxUIActionSimulator" >&2;} -+ wxUSE_UIACTIONSIMULATOR=no -+ fi -+ wxUSE_XTEST="no" -+ -+ -+else -+ XTST_CFLAGS=$pkg_cv_XTST_CFLAGS -+ XTST_LIBS=$pkg_cv_XTST_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $XTST_LIBS" -+ CFLAGS="$XTST_CFLAGS $CFLAGS" -+ CXXFLAGS="$XTST_CFLAGS $CXXFLAGS" -+ printf "%s\n" "#define wxUSE_XTEST 1" >>confdefs.h -+ -+ -+fi -+ elif test "$WXGTK3" = 1; then -+ wxUSE_UIACTIONSIMULATOR=no -+ fi -+ elif test "$wxUSE_DFB" = 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxUIActionSimulator not yet supported under $TOOLKIT... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxUIActionSimulator not yet supported under $TOOLKIT... disabled" >&2;} -+ wxUSE_UIACTIONSIMULATOR=no -+ fi -+ -+ if test "$wxUSE_UIACTIONSIMULATOR" = "yes" ; then -+ printf "%s\n" "#define wxUSE_UIACTIONSIMULATOR 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS uiaction" -+ fi -+fi -+ -+if test "$wxUSE_DC_TRANSFORM_MATRIX" = "yes" ; then -+ printf "%s\n" "#define wxUSE_DC_TRANSFORM_MATRIX 1" >>confdefs.h -+ -+fi -+ -+ -+USES_CONTROLS=0 -+if test "$wxUSE_CONTROLS" = "yes"; then -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_MARKUP" = "yes"; then -+ printf "%s\n" "#define wxUSE_MARKUP 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_ACCEL" = "yes"; then -+ printf "%s\n" "#define wxUSE_ACCEL 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_ACTIVITYINDICATOR" = "yes"; then -+ printf "%s\n" "#define wxUSE_ACTIVITYINDICATOR 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_ADDREMOVECTRL" = "yes"; then -+ printf "%s\n" "#define wxUSE_ADDREMOVECTRL 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_ANIMATIONCTRL" = "yes"; then -+ printf "%s\n" "#define wxUSE_ANIMATIONCTRL 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS animate" -+fi -+ -+if test "$wxUSE_BANNERWINDOW" = "yes"; then -+ printf "%s\n" "#define wxUSE_BANNERWINDOW 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_BUTTON" = "yes"; then -+ printf "%s\n" "#define wxUSE_BUTTON 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_BMPBUTTON" = "yes"; then -+ printf "%s\n" "#define wxUSE_BMPBUTTON 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_CALCTRL" = "yes"; then -+ printf "%s\n" "#define wxUSE_CALENDARCTRL 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS calendar" -+fi -+ -+if test "$wxUSE_CARET" = "yes"; then -+ printf "%s\n" "#define wxUSE_CARET 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret" -+fi -+ -+if test "$wxUSE_COLLPANE" = "yes"; then -+ printf "%s\n" "#define wxUSE_COLLPANE 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS collpane" -+fi -+ -+if test "$wxUSE_COMBOBOX" = "yes"; then -+ printf "%s\n" "#define wxUSE_COMBOBOX 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_COMBOCTRL" = "yes"; then -+ printf "%s\n" "#define wxUSE_COMBOCTRL 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_COMMANDLINKBUTTON" = "yes"; then -+ printf "%s\n" "#define wxUSE_COMMANDLINKBUTTON 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_CHOICE" = "yes"; then -+ printf "%s\n" "#define wxUSE_CHOICE 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_CHOICEBOOK" = "yes"; then -+ printf "%s\n" "#define wxUSE_CHOICEBOOK 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_CHECKBOX" = "yes"; then -+ printf "%s\n" "#define wxUSE_CHECKBOX 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_CHECKLST" = "yes"; then -+ printf "%s\n" "#define wxUSE_CHECKLISTBOX 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_COLOURPICKERCTRL" = "yes"; then -+ printf "%s\n" "#define wxUSE_COLOURPICKERCTRL 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_DATEPICKCTRL" = "yes"; then -+ printf "%s\n" "#define wxUSE_DATEPICKCTRL 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_DIRPICKERCTRL" = "yes"; then -+ printf "%s\n" "#define wxUSE_DIRPICKERCTRL 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_FILECTRL" = "yes"; then -+ printf "%s\n" "#define wxUSE_FILECTRL 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_FILEPICKERCTRL" = "yes"; then -+ printf "%s\n" "#define wxUSE_FILEPICKERCTRL 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_FONTPICKERCTRL" = "yes"; then -+ printf "%s\n" "#define wxUSE_FONTPICKERCTRL 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_DISPLAY" = "yes"; then -+ if test "$wxUSE_DFB" = 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >&2;} -+ wxUSE_DISPLAY=no -+ else -+ printf "%s\n" "#define wxUSE_DISPLAY 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display" -+ fi -+fi -+ -+if test "$wxUSE_DETECT_SM" = "yes"; then -+ printf "%s\n" "#define wxUSE_DETECT_SM 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_GAUGE" = "yes"; then -+ printf "%s\n" "#define wxUSE_GAUGE 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_GRID" = "yes"; then -+ printf "%s\n" "#define wxUSE_GRID 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid" -+fi -+ -+if test "$wxUSE_HEADERCTRL" = "yes"; then -+ printf "%s\n" "#define wxUSE_HEADERCTRL 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_HYPERLINKCTRL" = "yes"; then -+ printf "%s\n" "#define wxUSE_HYPERLINKCTRL 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_BITMAPCOMBOBOX" = "yes"; then -+ printf "%s\n" "#define wxUSE_BITMAPCOMBOBOX 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_DATAVIEWCTRL" = "yes"; then -+ printf "%s\n" "#define wxUSE_DATAVIEWCTRL 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dataview" -+ -+ if test "$wxUSE_NATIVE_DATAVIEWCTRL" = "yes"; then -+ printf "%s\n" "#define wxUSE_NATIVE_DATAVIEWCTRL 1" >>confdefs.h -+ -+ fi -+fi -+ -+if test "$wxUSE_IMAGLIST" = "yes"; then -+ printf "%s\n" "#define wxUSE_IMAGLIST 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_INFOBAR" = "yes"; then -+ printf "%s\n" "#define wxUSE_INFOBAR 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_LISTBOOK" = "yes"; then -+ printf "%s\n" "#define wxUSE_LISTBOOK 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_LISTBOX" = "yes"; then -+ printf "%s\n" "#define wxUSE_LISTBOX 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_LISTCTRL" = "yes"; then -+ if test "$wxUSE_IMAGLIST" = "yes"; then -+ printf "%s\n" "#define wxUSE_LISTCTRL 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listctrl" -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxListCtrl requires wxImageList and won't be compiled without it" >&5 -+printf "%s\n" "$as_me: WARNING: wxListCtrl requires wxImageList and won't be compiled without it" >&2;} -+ fi -+fi -+ -+if test "$wxUSE_EDITABLELISTBOX" = "yes"; then -+ printf "%s\n" "#define wxUSE_EDITABLELISTBOX 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_NOTEBOOK" = "yes"; then -+ printf "%s\n" "#define wxUSE_NOTEBOOK 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook" -+fi -+ -+if test "$wxUSE_NOTIFICATION_MESSAGE" = "yes"; then -+ printf "%s\n" "#define wxUSE_NOTIFICATION_MESSAGE 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_ODCOMBOBOX" = "yes"; then -+ printf "%s\n" "#define wxUSE_ODCOMBOBOX 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS combo" -+fi -+ -+if test "$wxUSE_RADIOBOX" = "yes"; then -+ printf "%s\n" "#define wxUSE_RADIOBOX 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_RADIOBTN" = "yes"; then -+ printf "%s\n" "#define wxUSE_RADIOBTN 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_REARRANGECTRL" = "yes"; then -+ printf "%s\n" "#define wxUSE_REARRANGECTRL 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_RICHMSGDLG" = "yes"; then -+ printf "%s\n" "#define wxUSE_RICHMSGDLG 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_RICHTOOLTIP" = "yes"; then -+ printf "%s\n" "#define wxUSE_RICHTOOLTIP 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_SASH" = "yes"; then -+ printf "%s\n" "#define wxUSE_SASH 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sashtest" -+fi -+ -+if test "$wxUSE_SCROLLBAR" = "yes"; then -+ printf "%s\n" "#define wxUSE_SCROLLBAR 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll" -+fi -+ -+if test "$wxUSE_SEARCHCTRL" = "yes"; then -+ printf "%s\n" "#define wxUSE_SEARCHCTRL 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_SLIDER" = "yes"; then -+ printf "%s\n" "#define wxUSE_SLIDER 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_SPINBTN" = "yes"; then -+ printf "%s\n" "#define wxUSE_SPINBTN 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_SPINCTRL" = "yes"; then -+ printf "%s\n" "#define wxUSE_SPINCTRL 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_SPLITTER" = "yes"; then -+ printf "%s\n" "#define wxUSE_SPLITTER 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splitter" -+fi -+ -+if test "$wxUSE_STATBMP" = "yes"; then -+ printf "%s\n" "#define wxUSE_STATBMP 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_STATBOX" = "yes"; then -+ printf "%s\n" "#define wxUSE_STATBOX 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_STATTEXT" = "yes"; then -+ printf "%s\n" "#define wxUSE_STATTEXT 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_STATLINE" = "yes"; then -+ printf "%s\n" "#define wxUSE_STATLINE 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_STATUSBAR" = "yes"; then -+ printf "%s\n" "#define wxUSE_NATIVE_STATUSBAR 1" >>confdefs.h -+ -+ printf "%s\n" "#define wxUSE_STATUSBAR 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar" -+fi -+ -+if test "$wxUSE_TEXTCTRL" = "yes"; then -+ printf "%s\n" "#define wxUSE_TEXTCTRL 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text" -+ -+ printf "%s\n" "#define wxUSE_RICHEDIT 1" >>confdefs.h -+ -+ printf "%s\n" "#define wxUSE_RICHEDIT2 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_TIMEPICKCTRL" = "yes"; then -+ printf "%s\n" "#define wxUSE_TIMEPICKCTRL 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_TOGGLEBTN" = "yes"; then -+ printf "%s\n" "#define wxUSE_TOGGLEBTN 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_TOOLBAR" = "yes"; then -+ printf "%s\n" "#define wxUSE_TOOLBAR 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+ -+ if test "$wxUSE_UNIVERSAL" = "yes"; then -+ wxUSE_TOOLBAR_NATIVE="no" -+ else -+ wxUSE_TOOLBAR_NATIVE="yes" -+ printf "%s\n" "#define wxUSE_TOOLBAR_NATIVE 1" >>confdefs.h -+ -+ fi -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar" -+fi -+ -+if test "$wxUSE_TOOLTIPS" = "yes"; then -+ if test "$wxUSE_MOTIF" = 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxTooltip not supported yet under Motif... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxTooltip not supported yet under Motif... disabled" >&2;} -+ else -+ if test "$wxUSE_UNIVERSAL" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxTooltip not supported yet in wxUniversal... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxTooltip not supported yet in wxUniversal... disabled" >&2;} -+ else -+ printf "%s\n" "#define wxUSE_TOOLTIPS 1" >>confdefs.h -+ -+ fi -+ fi -+fi -+ -+if test "$wxUSE_TREEBOOK" = "yes"; then -+ printf "%s\n" "#define wxUSE_TREEBOOK 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_TOOLBOOK" = "yes"; then -+ printf "%s\n" "#define wxUSE_TOOLBOOK 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_TREECTRL" = "yes"; then -+ if test "$wxUSE_IMAGLIST" = "yes"; then -+ printf "%s\n" "#define wxUSE_TREECTRL 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treectrl" -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxTreeCtrl requires wxImageList and won't be compiled without it" >&5 -+printf "%s\n" "$as_me: WARNING: wxTreeCtrl requires wxImageList and won't be compiled without it" >&2;} -+ fi -+fi -+ -+if test "$wxUSE_TREELISTCTRL" = "yes"; then -+ printf "%s\n" "#define wxUSE_TREELISTCTRL 1" >>confdefs.h -+ -+ USES_CONTROLS=1 -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelist" -+fi -+ -+if test "$wxUSE_POPUPWIN" = "yes"; then -+ printf "%s\n" "#define wxUSE_POPUPWIN 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS popup" -+ -+ USES_CONTROLS=1 -+fi -+ -+if test "$wxUSE_PREFERENCES_EDITOR" = "yes"; then -+ printf "%s\n" "#define wxUSE_PREFERENCES_EDITOR 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS preferences" -+fi -+ -+if test "$wxUSE_PRIVATE_FONTS" = "yes"; then -+ if test "$wxUSE_GTK" = 1; then -+ if test "$wxUSE_PRIVATE_FONTS" = "yes"; then -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PRIVATE_FONTS" >&5 -+printf %s "checking for PRIVATE_FONTS... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$PRIVATE_FONTS_CFLAGS"; then -+ pkg_cv_PRIVATE_FONTS_CFLAGS="$PRIVATE_FONTS_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 2.8.0 pangoft2 >= 1.38.0\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "fontconfig >= 2.8.0 pangoft2 >= 1.38.0") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_PRIVATE_FONTS_CFLAGS=`$PKG_CONFIG --cflags "fontconfig >= 2.8.0 pangoft2 >= 1.38.0" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$PRIVATE_FONTS_LIBS"; then -+ pkg_cv_PRIVATE_FONTS_LIBS="$PRIVATE_FONTS_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 2.8.0 pangoft2 >= 1.38.0\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "fontconfig >= 2.8.0 pangoft2 >= 1.38.0") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_PRIVATE_FONTS_LIBS=`$PKG_CONFIG --libs "fontconfig >= 2.8.0 pangoft2 >= 1.38.0" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ PRIVATE_FONTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "fontconfig >= 2.8.0 pangoft2 >= 1.38.0"` -+ else -+ PRIVATE_FONTS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fontconfig >= 2.8.0 pangoft2 >= 1.38.0"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$PRIVATE_FONTS_PKG_ERRORS" >&5 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: run-time font loading won't be supported by wxFont" >&5 -+printf "%s\n" "$as_me: WARNING: run-time font loading won't be supported by wxFont" >&2;} -+elif test $pkg_failed = untried; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: run-time font loading won't be supported by wxFont" >&5 -+printf "%s\n" "$as_me: WARNING: run-time font loading won't be supported by wxFont" >&2;} -+else -+ PRIVATE_FONTS_CFLAGS=$pkg_cv_PRIVATE_FONTS_CFLAGS -+ PRIVATE_FONTS_LIBS=$pkg_cv_PRIVATE_FONTS_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ printf "%s\n" "#define wxUSE_PRIVATE_FONTS 1" >>confdefs.h -+ -+ CXXFLAGS="$PRIVATE_FONTS_CFLAGS $CXXFLAGS" -+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PRIVATE_FONTS_LIBS" -+ -+fi -+ fi -+ elif test "$wxUSE_MAC" = 1 -o "$wxUSE_MSW" = 1; then -+ printf "%s\n" "#define wxUSE_PRIVATE_FONTS 1" >>confdefs.h -+ -+ fi -+ fi -+ -+if test "$wxUSE_DIALUP_MANAGER" = "yes"; then -+ if test "$wxUSE_MAC" = 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Dialup manager not supported on this platform... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: Dialup manager not supported on this platform... disabled" >&2;} -+ else -+ printf "%s\n" "#define wxUSE_DIALUP_MANAGER 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup" -+ fi -+fi -+ -+if test "$wxUSE_TIPWINDOW" = "yes"; then -+ printf "%s\n" "#define wxUSE_TIPWINDOW 1" >>confdefs.h -+ -+fi -+ -+if test "$USES_CONTROLS" = 1; then -+ printf "%s\n" "#define wxUSE_CONTROLS 1" >>confdefs.h -+ -+fi -+ -+ -+if test "$wxUSE_ACCESSIBILITY" = "yes"; then -+ printf "%s\n" "#define wxUSE_ACCESSIBILITY 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access" -+fi -+ -+if test "$wxUSE_ARTPROVIDER_STD" = "yes"; then -+ printf "%s\n" "#define wxUSE_ARTPROVIDER_STD 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_ARTPROVIDER_TANGO" = "auto"; then -+ if test "$wxUSE_GTK" != 1; then -+ if test "$wxUSE_LIBPNG" != no -a \ -+ "$wxUSE_IMAGE" = yes -a \ -+ "$wxUSE_STREAMS" = yes; then -+ wxUSE_ARTPROVIDER_TANGO="yes" -+ fi -+ fi -+fi -+ -+if test "$wxUSE_ARTPROVIDER_TANGO" = "yes"; then -+ printf "%s\n" "#define wxUSE_ARTPROVIDER_TANGO 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_DRAGIMAGE" = "yes"; then -+ printf "%s\n" "#define wxUSE_DRAGIMAGE 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag" -+fi -+ -+if test "$wxUSE_EXCEPTIONS" = "yes"; then -+ if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: --enable-exceptions can't be used with --enable-no_exceptions" >&5 -+printf "%s\n" "$as_me: WARNING: --enable-exceptions can't be used with --enable-no_exceptions" >&2;} -+ else -+ printf "%s\n" "#define wxUSE_EXCEPTIONS 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS except" -+ fi -+fi -+ -+USE_HTML=0 -+if test "$wxUSE_HTML" = "yes"; then -+ printf "%s\n" "#define wxUSE_HTML 1" >>confdefs.h -+ -+ USE_HTML=1 -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox" -+ SAMPLES_SUBTREES="$SAMPLES_SUBTREES html" -+fi -+ -+USE_XRC=0 -+if test "$wxUSE_XRC" = "yes"; then -+ if test "$wxUSE_XML" != "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: XML library not built, XRC resources disabled" >&5 -+printf "%s\n" "$as_me: WARNING: XML library not built, XRC resources disabled" >&2;} -+ wxUSE_XRC=no -+ else -+ printf "%s\n" "#define wxUSE_XRC 1" >>confdefs.h -+ -+ USE_XRC=1 -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS xrc" -+ fi -+fi -+ -+USE_AUI=0 -+if test "$wxUSE_AUI" = "yes"; then -+ printf "%s\n" "#define wxUSE_AUI 1" >>confdefs.h -+ -+ USE_AUI=1 -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS aui" -+fi -+ -+USE_PROPGRID=0 -+if test "$wxUSE_PROPGRID" = "yes"; then -+ printf "%s\n" "#define wxUSE_PROPGRID 1" >>confdefs.h -+ -+ USE_PROPGRID=1 -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS propgrid" -+fi -+ -+USE_RIBBON=0 -+if test "$wxUSE_RIBBON" = "yes"; then -+ printf "%s\n" "#define wxUSE_RIBBON 1" >>confdefs.h -+ -+ USE_RIBBON=1 -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ribbon" -+fi -+ -+USE_STC=0 -+if test "$wxUSE_STC" = "yes"; then -+ printf "%s\n" "#define wxUSE_STC 1" >>confdefs.h -+ -+ USE_STC=1 -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS stc" -+ -+ # Extract the first word of "python", so it can be a program name with args. -+set dummy python; 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_path_PYTHON+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) case $PYTHON in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. -+ ;; -+ *) -+ 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_path_PYTHON="$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 -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac ;; -+esac -+fi -+PYTHON=$ac_cv_path_PYTHON -+if test -n "$PYTHON"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 -+printf "%s\n" "$PYTHON" >&6; } -+else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+fi -+ -+ -+ if test "x$PYTHON" = "x"; then -+ COND_PYTHON="#" -+ fi -+ -+fi -+ -+if test "$wxUSE_MENUS" = "yes"; then -+ printf "%s\n" "#define wxUSE_MENUS 1" >>confdefs.h -+ -+ if test "$wxUSE_MENUBAR" = "yes"; then -+ printf "%s\n" "#define wxUSE_MENUBAR 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu" -+ fi -+elif test "$wxUSE_MENUBAR" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxMenuBar can't be used without wxMenu and will be disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxMenuBar can't be used without wxMenu and will be disabled" >&2;} -+fi -+ -+if test "$wxUSE_MIMETYPE" = "yes"; then -+ printf "%s\n" "#define wxUSE_MIMETYPE 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_MINIFRAME" = "yes"; then -+ printf "%s\n" "#define wxUSE_MINIFRAME 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then -+ printf "%s\n" "#define wxUSE_SYSTEM_OPTIONS 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_TASKBARICON" = "yes"; then -+ printf "%s\n" "#define wxUSE_TASKBARICON 1" >>confdefs.h -+ -+ printf "%s\n" "#define wxUSE_TASKBARICON_BALLOONS 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar" -+fi -+ -+ -+if test "$wxUSE_VALIDATORS" = "yes"; then -+ printf "%s\n" "#define wxUSE_VALIDATORS 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate" -+fi -+ -+if test "$wxUSE_PALETTE" = "yes" ; then -+ if test "$wxUSE_DFB" = 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxPalette not yet supported under DFB... disabled" >&5 -+printf "%s\n" "$as_me: WARNING: wxPalette not yet supported under DFB... disabled" >&2;} -+ wxUSE_PALETTE=no -+ else -+ printf "%s\n" "#define wxUSE_PALETTE 1" >>confdefs.h -+ -+ fi -+fi -+ -+USE_RICHTEXT=0 -+if test "$wxUSE_RICHTEXT" = "yes"; then -+ printf "%s\n" "#define wxUSE_RICHTEXT 1" >>confdefs.h -+ -+ USE_RICHTEXT=1 -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext" -+fi -+ -+if test "$wxUSE_WEBVIEW" = "yes"; then -+ USE_WEBVIEW_WEBKIT=0 -+ USE_WEBVIEW_WEBKIT2=0 -+ if test "$wxUSE_WEBVIEW_WEBKIT" = "yes"; then -+ if test "$wxUSE_GTK" = 1; then -+ if test "$WXGTK3" = 1; then -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for WEBKIT" >&5 -+printf %s "checking for WEBKIT... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$WEBKIT_CFLAGS"; then -+ pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-4.1\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "webkit2gtk-4.1") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "webkit2gtk-4.1" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$WEBKIT_LIBS"; then -+ pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-4.1\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "webkit2gtk-4.1") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "webkit2gtk-4.1" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "webkit2gtk-4.1"` -+ else -+ WEBKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "webkit2gtk-4.1"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$WEBKIT_PKG_ERRORS" >&5 -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: webkit2gtk-4.1 not found, falling back to webkit2gtk-4.0" >&5 -+printf "%s\n" "$as_me: WARNING: webkit2gtk-4.1 not found, falling back to webkit2gtk-4.0" >&2;} -+ -+elif test $pkg_failed = untried; then -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: webkit2gtk-4.1 not found, falling back to webkit2gtk-4.0" >&5 -+printf "%s\n" "$as_me: WARNING: webkit2gtk-4.1 not found, falling back to webkit2gtk-4.0" >&2;} -+ -+else -+ WEBKIT_CFLAGS=$pkg_cv_WEBKIT_CFLAGS -+ WEBKIT_LIBS=$pkg_cv_WEBKIT_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ USE_WEBVIEW_WEBKIT2=1 -+ CXXFLAGS="$CXXFLAGS $WEBKIT_CFLAGS" -+ EXTRALIBS_WEBVIEW="$WEBKIT_LIBS" -+ -+fi -+ if test "$USE_WEBVIEW_WEBKIT2" = 0; then -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for WEBKIT" >&5 -+printf %s "checking for WEBKIT... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$WEBKIT_CFLAGS"; then -+ pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-4.0\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "webkit2gtk-4.0") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "webkit2gtk-4.0" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$WEBKIT_LIBS"; then -+ pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-4.0\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "webkit2gtk-4.0") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "webkit2gtk-4.0" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "webkit2gtk-4.0"` -+ else -+ WEBKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "webkit2gtk-4.0"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$WEBKIT_PKG_ERRORS" >&5 -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: webkit2gtk-4.0 not found, falling back to webkitgtk" >&5 -+printf "%s\n" "$as_me: WARNING: webkit2gtk-4.0 not found, falling back to webkitgtk" >&2;} -+ -+elif test $pkg_failed = untried; then -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: webkit2gtk-4.0 not found, falling back to webkitgtk" >&5 -+printf "%s\n" "$as_me: WARNING: webkit2gtk-4.0 not found, falling back to webkitgtk" >&2;} -+ -+else -+ WEBKIT_CFLAGS=$pkg_cv_WEBKIT_CFLAGS -+ WEBKIT_LIBS=$pkg_cv_WEBKIT_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ USE_WEBVIEW_WEBKIT2=1 -+ CXXFLAGS="$CXXFLAGS $WEBKIT_CFLAGS" -+ EXTRALIBS_WEBVIEW="$WEBKIT_LIBS" -+ -+fi -+ fi -+ fi -+ if test "$USE_WEBVIEW_WEBKIT2" = 0; then -+ webkitgtk=webkit-1.0 -+ if test "$WXGTK3" = 1; then -+ webkitgtk="webkitgtk-${TOOLKIT_VERSION}.0" -+ fi -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for WEBKIT" >&5 -+printf %s "checking for WEBKIT... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$WEBKIT_CFLAGS"; then -+ pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$webkitgtk >= 1.3.1\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "$webkitgtk >= 1.3.1") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "$webkitgtk >= 1.3.1" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$WEBKIT_LIBS"; then -+ pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$webkitgtk >= 1.3.1\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "$webkitgtk >= 1.3.1") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "$webkitgtk >= 1.3.1" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$webkitgtk >= 1.3.1"` -+ else -+ WEBKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$webkitgtk >= 1.3.1"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$WEBKIT_PKG_ERRORS" >&5 -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: webkitgtk not found." >&5 -+printf "%s\n" "$as_me: WARNING: webkitgtk not found." >&2;} -+ -+elif test $pkg_failed = untried; then -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: webkitgtk not found." >&5 -+printf "%s\n" "$as_me: WARNING: webkitgtk not found." >&2;} -+ -+else -+ WEBKIT_CFLAGS=$pkg_cv_WEBKIT_CFLAGS -+ WEBKIT_LIBS=$pkg_cv_WEBKIT_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ USE_WEBVIEW_WEBKIT=1 -+ CXXFLAGS="$CXXFLAGS $WEBKIT_CFLAGS" -+ EXTRALIBS_WEBVIEW="$WEBKIT_LIBS" -+ -+fi -+ fi -+ elif test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then -+ USE_WEBVIEW_WEBKIT=1 -+ WEBKIT_LINK="-framework WebKit" -+ fi -+ fi -+ -+ wxUSE_WEBVIEW="no" -+ if test "$wxUSE_GTK" = 1 -o "$wxUSE_MAC" = 1; then -+ if test "$USE_WEBVIEW_WEBKIT" = 1; then -+ wxUSE_WEBVIEW="yes" -+ printf "%s\n" "#define wxUSE_WEBVIEW_WEBKIT 1" >>confdefs.h -+ -+ elif test "$USE_WEBVIEW_WEBKIT2" = 1; then -+ wxUSE_WEBVIEW="yes" -+ printf "%s\n" "#define wxUSE_WEBVIEW_WEBKIT2 1" >>confdefs.h -+ -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: WebKit not available, disabling wxWebView" >&5 -+printf "%s\n" "$as_me: WARNING: WebKit not available, disabling wxWebView" >&2;} -+ fi -+ elif test "$wxUSE_MSW" = 1; then -+ if test "$wxUSE_WEBVIEW_IE" = "yes"; then -+ wxUSE_WEBVIEW="yes" -+ printf "%s\n" "#define wxUSE_WEBVIEW_IE 1" >>confdefs.h -+ -+ fi -+ if test "$wxUSE_WEBVIEW_EDGE" = "yes"; then -+ wxUSE_WEBVIEW="yes" -+ printf "%s\n" "#define wxUSE_WEBVIEW_EDGE 1" >>confdefs.h -+ -+ fi -+ fi -+fi -+ -+if test "$wxUSE_WEBVIEW" = "yes"; then -+ USE_WEBVIEW=1 -+ printf "%s\n" "#define wxUSE_WEBVIEW 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS webview" -+else -+ USE_WEBVIEW=0 -+fi -+ -+ -+if test "$wxUSE_IMAGE" = "yes" ; then -+ printf "%s\n" "#define wxUSE_IMAGE 1" >>confdefs.h -+ -+ -+ if test "$wxUSE_GIF" = "yes" ; then -+ printf "%s\n" "#define wxUSE_GIF 1" >>confdefs.h -+ -+ fi -+ -+ if test "$wxUSE_PCX" = "yes" ; then -+ printf "%s\n" "#define wxUSE_PCX 1" >>confdefs.h -+ -+ fi -+ -+ if test "$wxUSE_TGA" = "yes" ; then -+ printf "%s\n" "#define wxUSE_TGA 1" >>confdefs.h -+ -+ fi -+ -+ if test "$wxUSE_IFF" = "yes" ; then -+ printf "%s\n" "#define wxUSE_IFF 1" >>confdefs.h -+ -+ fi -+ -+ if test "$wxUSE_PNM" = "yes" ; then -+ printf "%s\n" "#define wxUSE_PNM 1" >>confdefs.h -+ -+ fi -+ -+ if test "$wxUSE_XPM" = "yes" ; then -+ printf "%s\n" "#define wxUSE_XPM 1" >>confdefs.h -+ -+ fi -+ -+ if test "$wxUSE_ICO_CUR" = "yes" ; then -+ printf "%s\n" "#define wxUSE_ICO_CUR 1" >>confdefs.h -+ -+ fi -+fi -+ -+ -+if test "$wxUSE_ABOUTDLG" = "yes"; then -+ printf "%s\n" "#define wxUSE_ABOUTDLG 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_CHOICEDLG" = "yes"; then -+ printf "%s\n" "#define wxUSE_CHOICEDLG 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_COLOURDLG" = "yes"; then -+ printf "%s\n" "#define wxUSE_COLOURDLG 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_CREDENTIALDLG" = "yes"; then -+ printf "%s\n" "#define wxUSE_CREDENTIALDLG 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_FILEDLG" = "yes"; then -+ printf "%s\n" "#define wxUSE_FILEDLG 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_FINDREPLDLG" = "yes"; then -+ printf "%s\n" "#define wxUSE_FINDREPLDLG 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_FONTDLG" = "yes"; then -+ printf "%s\n" "#define wxUSE_FONTDLG 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_DIRDLG" = "yes"; then -+ if test "$wxUSE_TREECTRL" != "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" >&5 -+printf "%s\n" "$as_me: WARNING: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" >&2;} -+ else -+ printf "%s\n" "#define wxUSE_DIRDLG 1" >>confdefs.h -+ -+ fi -+fi -+ -+if test "$wxUSE_MSGDLG" = "yes"; then -+ printf "%s\n" "#define wxUSE_MSGDLG 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_NUMBERDLG" = "yes"; then -+ printf "%s\n" "#define wxUSE_NUMBERDLG 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_PROGRESSDLG" = "yes"; then -+ printf "%s\n" "#define wxUSE_PROGRESSDLG 1" >>confdefs.h -+ -+ printf "%s\n" "#define wxUSE_NATIVE_PROGRESSDLG 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_SPLASH" = "yes"; then -+ printf "%s\n" "#define wxUSE_SPLASH 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splash" -+fi -+ -+if test "$wxUSE_STARTUP_TIPS" = "yes"; then -+ printf "%s\n" "#define wxUSE_STARTUP_TIPS 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_TEXTDLG" = "yes"; then -+ printf "%s\n" "#define wxUSE_TEXTDLG 1" >>confdefs.h -+ -+fi -+ -+if test "$wxUSE_WIZARDDLG" = "yes"; then -+ printf "%s\n" "#define wxUSE_WIZARDDLG 1" >>confdefs.h -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard" -+fi -+ -+ -+if test "$wxUSE_MSW" = 1; then -+ if test "$wxUSE_OWNER_DRAWN" = "yes"; then -+ printf "%s\n" "#define wxUSE_OWNER_DRAWN 1" >>confdefs.h -+ -+ fi -+fi -+ -+ -+if test "$wxUSE_MSW" = 1 ; then -+ -+ if test "$wxUSE_DC_CACHEING" = "yes"; then -+ printf "%s\n" "#define wxUSE_DC_CACHEING 1" >>confdefs.h -+ -+ fi -+ -+ if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then -+ printf "%s\n" "#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1" >>confdefs.h -+ -+ fi -+ -+ if test "$wxUSE_TASKBARBUTTON" = "yes"; then -+ printf "%s\n" "#define wxUSE_TASKBARBUTTON 1" >>confdefs.h -+ -+ fi -+ -+ if test "$wxUSE_UXTHEME" = "yes"; then -+ printf "%s\n" "#define wxUSE_UXTHEME 1" >>confdefs.h -+ -+ fi -+ -+fi -+ -+if test "$wxUSE_AUTOID_MANAGEMENT" = "yes"; then -+ printf "%s\n" "#define wxUSE_AUTOID_MANAGEMENT 1" >>confdefs.h -+ -+fi -+ -+if test "$USE_WIN32" = 1 ; then -+ if test "$wxUSE_DBGHELP" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if debug help API is available" >&5 -+printf %s "checking if debug help API is available... " >&6; } -+if test ${wx_cv_lib_debughlp+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ ac_ext=cpp -+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 -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+ #include -+int -+main (void) -+{ -+ -+ #ifndef API_VERSION_NUMBER -+ #error API_VERSION_NUMBER not defined! -+ #endif -+ #if API_VERSION_NUMBER < 9 -+ #error API_VERSION_NUMBER at least 9 required. -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_lib_debughlp=yes -+else case e in #( -+ e) wx_cv_lib_debughlp=no -+ ;; -+esac -+fi -+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' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_debughlp" >&5 -+printf "%s\n" "$wx_cv_lib_debughlp" >&6; } -+ -+ if test "$wx_cv_lib_debughlp" = yes; then -+ printf "%s\n" "#define wxUSE_DBGHELP 1" >>confdefs.h -+ -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Debug help API and wxStackWalker won't be available" >&5 -+printf "%s\n" "$as_me: WARNING: Debug help API and wxStackWalker won't be available" >&2;} -+ fi -+ fi -+ -+ if test "$wxUSE_DIB" = "yes"; then -+ printf "%s\n" "#define wxUSE_WXDIB 1" >>confdefs.h -+ -+ fi -+ -+ if test "$wxUSE_INICONF" = "yes"; then -+ printf "%s\n" "#define wxUSE_INICONF 1" >>confdefs.h -+ -+ fi -+ -+ if test "$wxUSE_REGKEY" = "yes"; then -+ printf "%s\n" "#define wxUSE_REGKEY 1" >>confdefs.h -+ -+ fi -+fi -+ -+ -+if test "$wxUSE_MAC" = 1; then -+ wxUSE_GRAPHICS_CONTEXT="yes" -+fi -+ -+if test "$wx_needs_cairo_for_gc" = 1 -a "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then -+ wx_needs_cairo=1 -+fi -+ -+if test "$wxUSE_CAIRO" = "yes" -o "$wx_needs_cairo" = 1; then -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5 -+printf %s "checking for CAIRO... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$CAIRO_CFLAGS"; then -+ pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "cairo") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$CAIRO_LIBS"; then -+ pkg_cv_CAIRO_LIBS="$CAIRO_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "cairo") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cairo"` -+ else -+ CAIRO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$CAIRO_PKG_ERRORS" >&5 -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ -+elif test $pkg_failed = untried; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ -+else -+ CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS -+ CAIRO_LIBS=$pkg_cv_CAIRO_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ wx_has_cairo=1 -+fi -+ if test "$wx_has_cairo" = 1; then -+ save_LIBS="$LIBS" -+ LIBS="$LIBS $CAIRO_LIBS" -+ ac_fn_c_check_func "$LINENO" "cairo_push_group" "ac_cv_func_cairo_push_group" -+if test "x$ac_cv_func_cairo_push_group" = xyes -+then : -+ printf "%s\n" "#define HAVE_CAIRO_PUSH_GROUP 1" >>confdefs.h -+ -+fi -+ -+ LIBS="$save_LIBS" -+ if test "$ac_cv_func_cairo_push_group" = "no"; then -+ wx_has_cairo=0 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Cairo library is too old and misses cairo_push_group()" >&5 -+printf "%s\n" "$as_me: WARNING: Cairo library is too old and misses cairo_push_group()" >&2;} -+ else -+ printf "%s\n" "#define wxUSE_CAIRO 1" >>confdefs.h -+ -+ -+ if test "$wxUSE_GTK" != 1; then -+ CXXFLAGS="$CXXFLAGS $CAIRO_CFLAGS" -+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $CAIRO_LIBS" -+ fi -+ fi -+ fi -+fi -+ -+if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then -+ wx_has_graphics=0 -+ if test "$wxUSE_MSW" = 1; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if GDI+ is available" >&5 -+printf %s "checking if GDI+ is available... " >&6; } -+if test ${wx_cv_lib_gdiplus+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ ac_ext=cpp -+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 -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+ #include -+int -+main (void) -+{ -+ -+ using namespace Gdiplus; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_lib_gdiplus=yes -+else case e in #( -+ e) wx_cv_lib_gdiplus=no -+ ;; -+esac -+fi -+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' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_gdiplus" >&5 -+printf "%s\n" "$wx_cv_lib_gdiplus" >&6; } -+ if test "$wx_cv_lib_gdiplus" = "yes"; then -+ wx_has_graphics=1 -+ fi -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if Direct2D is available" >&5 -+printf %s "checking if Direct2D is available... " >&6; } -+if test ${wx_cv_lib_direct2d+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ ac_ext=cpp -+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 -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+ #include -+ #include -+ -+int -+main (void) -+{ -+ -+ ID2D1Factory* factory = NULL; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ wx_cv_lib_direct2d=yes -+else case e in #( -+ e) wx_cv_lib_direct2d=no -+ ;; -+esac -+fi -+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' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_direct2d" >&5 -+printf "%s\n" "$wx_cv_lib_direct2d" >&6; } -+ if test "$wx_cv_lib_direct2d" = "yes"; then -+ printf "%s\n" "#define wxUSE_GRAPHICS_DIRECT2D 1" >>confdefs.h -+ -+ fi -+ elif test "$WXGTK1" = "1"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxGraphicsContext not supported with GTK +1" >&5 -+printf "%s\n" "$as_me: WARNING: wxGraphicsContext not supported with GTK +1" >&2;} -+ elif test "$wx_needs_cairo_for_gc" = 1; then -+ wx_has_graphics=$wx_has_cairo -+ else -+ wx_has_graphics=1 -+ fi -+ -+ if test "$wx_has_graphics" = 1; then -+ printf "%s\n" "#define wxUSE_GRAPHICS_CONTEXT 1" >>confdefs.h -+ -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: wxGraphicsContext won't be available" >&5 -+printf "%s\n" "$as_me: WARNING: wxGraphicsContext won't be available" >&2;} -+ fi -+fi -+ -+ -+USE_MEDIA=0 -+ -+if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then -+ USE_MEDIA=1 -+ -+ if test "$wxUSE_GTK" = 1; then -+ wxUSE_GSTREAMER="no" -+ -+ GST_VERSION_MAJOR=1 -+ GST_VERSION_MINOR=0 -+ GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR -+ -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GST" >&5 -+printf %s "checking for GST... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$GST_CFLAGS"; then -+ pkg_cv_GST_CFLAGS="$GST_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-video-\$GST_VERSION gstreamer-player-\$GST_VERSION >= 1.7.2.1\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION gstreamer-player-$GST_VERSION >= 1.7.2.1") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_GST_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION gstreamer-player-$GST_VERSION >= 1.7.2.1" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$GST_LIBS"; then -+ pkg_cv_GST_LIBS="$GST_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-video-\$GST_VERSION gstreamer-player-\$GST_VERSION >= 1.7.2.1\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION gstreamer-player-$GST_VERSION >= 1.7.2.1") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_GST_LIBS=`$PKG_CONFIG --libs "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION gstreamer-player-$GST_VERSION >= 1.7.2.1" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ GST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION gstreamer-player-$GST_VERSION >= 1.7.2.1"` -+ else -+ GST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION gstreamer-player-$GST_VERSION >= 1.7.2.1"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$GST_PKG_ERRORS" >&5 -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: GStreamer 1.7.2+ not available. Not using GstPlayer and falling back to 1.0" >&5 -+printf "%s\n" "$as_me: GStreamer 1.7.2+ not available. Not using GstPlayer and falling back to 1.0" >&6;} -+ -+ -+elif test $pkg_failed = untried; then -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: GStreamer 1.7.2+ not available. Not using GstPlayer and falling back to 1.0" >&5 -+printf "%s\n" "$as_me: GStreamer 1.7.2+ not available. Not using GstPlayer and falling back to 1.0" >&6;} -+ -+ -+else -+ GST_CFLAGS=$pkg_cv_GST_CFLAGS -+ GST_LIBS=$pkg_cv_GST_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ wxUSE_GSTREAMER="yes" -+ printf "%s\n" "#define wxUSE_GSTREAMER_PLAYER 1" >>confdefs.h -+ -+ -+fi -+ -+ if test $wxUSE_GSTREAMER = "no"; then -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GST" >&5 -+printf %s "checking for GST... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$GST_CFLAGS"; then -+ pkg_cv_GST_CFLAGS="$GST_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-video-\$GST_VERSION\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_GST_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$GST_LIBS"; then -+ pkg_cv_GST_LIBS="$GST_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-video-\$GST_VERSION\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_GST_LIBS=`$PKG_CONFIG --libs "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ GST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION"` -+ else -+ GST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$GST_PKG_ERRORS" >&5 -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer 1.0 not available, falling back to 0.10" >&5 -+printf "%s\n" "$as_me: WARNING: GStreamer 1.0 not available, falling back to 0.10" >&2;} -+ GST_VERSION_MAJOR=0 -+ GST_VERSION_MINOR=10 -+ GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR -+ -+ -+elif test $pkg_failed = untried; then -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer 1.0 not available, falling back to 0.10" >&5 -+printf "%s\n" "$as_me: WARNING: GStreamer 1.0 not available, falling back to 0.10" >&2;} -+ GST_VERSION_MAJOR=0 -+ GST_VERSION_MINOR=10 -+ GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR -+ -+ -+else -+ GST_CFLAGS=$pkg_cv_GST_CFLAGS -+ GST_LIBS=$pkg_cv_GST_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ wxUSE_GSTREAMER="yes" -+ -+fi -+ fi -+ -+ if test $GST_VERSION_MINOR = "10"; then -+ -+pkg_failed=no -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GST" >&5 -+printf %s "checking for GST... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$GST_CFLAGS"; then -+ pkg_cv_GST_CFLAGS="$GST_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-plugins-base-\$GST_VERSION\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_GST_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$GST_LIBS"; then -+ pkg_cv_GST_LIBS="$GST_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-plugins-base-\$GST_VERSION\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_GST_LIBS=`$PKG_CONFIG --libs "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ GST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION"` -+ else -+ GST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$GST_PKG_ERRORS" >&5 -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer 0.10 not available" >&5 -+printf "%s\n" "$as_me: WARNING: GStreamer 0.10 not available" >&2;} -+ -+ -+elif test $pkg_failed = untried; then -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer 0.10 not available" >&5 -+printf "%s\n" "$as_me: WARNING: GStreamer 0.10 not available" >&2;} -+ -+ -+else -+ GST_CFLAGS=$pkg_cv_GST_CFLAGS -+ GST_LIBS=$pkg_cv_GST_LIBS -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ -+ wxUSE_GSTREAMER="yes" -+ GST_LIBS="$GST_LIBS -lgstinterfaces-$GST_VERSION" -+ -+fi -+ fi -+ -+ if test "$wxUSE_GSTREAMER" = "yes"; then -+ CXXFLAGS="$CXXFLAGS $GST_CFLAGS" -+ EXTRALIBS_MEDIA="$GST_LIBS" -+ -+ printf "%s\n" "#define wxUSE_GSTREAMER 1" >>confdefs.h -+ -+ else -+ USE_MEDIA=0 -+ fi -+ -+ elif test "$wxUSE_MAC" = 1; then -+ GST_LIBS="-framework AVFoundation -framework CoreMedia" -+ if test "$wxUSE_OSX_IPHONE" != 1; then -+ old_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="-x objective-c++ $CPPFLAGS" -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if AVKit is available" >&5 -+printf %s "checking if AVKit is available... " >&6; } -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include "AvailabilityMacros.h" -+int -+main (void) -+{ -+ -+ #if defined(MAC_OS_X_VERSION_10_9) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9 -+ // AVKit available -+ #else -+ choke me -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ GST_LIBS="$GST_LIBS -weak_framework AVKit"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+else case e in #( -+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ CPPFLAGS="$old_CPPFLAGS" -+ fi -+ fi -+ -+ if test $USE_MEDIA = 1; then -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mediaplayer" -+ printf "%s\n" "#define wxUSE_MEDIACTRL 1" >>confdefs.h -+ -+ else -+ if test "$wxUSE_MEDIACTRL" = "yes"; then -+ as_fn_error $? "GStreamer not available" "$LINENO" 5 -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer not available... disabling wxMediaCtrl" >&5 -+printf "%s\n" "$as_me: WARNING: GStreamer not available... disabling wxMediaCtrl" >&2;} -+ fi -+ fi -+fi -+ -+ -+if test "$wxUSE_MSW" = 1 ; then -+ EXTRALIBS_STC="-limm32" -+fi -+ -+ -+if test "x$prefix" != "xNONE"; then -+ wxPREFIX=$prefix -+else -+ wxPREFIX=$ac_default_prefix -+fi -+ -+printf "%s\n" "#define wxINSTALL_PREFIX \"$wxPREFIX\"" >>confdefs.h -+ -+ -+ -+ -+STD_BASE_LIBS="base" -+STD_GUI_LIBS="" -+BUILT_WX_LIBS="base" -+ -+if test "$wxUSE_SOCKETS" = "yes" ; then -+ STD_BASE_LIBS="net $STD_BASE_LIBS" -+ BUILT_WX_LIBS="net $BUILT_WX_LIBS" -+fi -+if test "$wxUSE_XML" = "yes" ; then -+ STD_BASE_LIBS="xml $STD_BASE_LIBS" -+ BUILT_WX_LIBS="xml $BUILT_WX_LIBS" -+fi -+ -+if test "$wxUSE_GUI" = "yes"; then -+ STD_GUI_LIBS="adv core" -+ BUILT_WX_LIBS="$STD_GUI_LIBS $BUILT_WX_LIBS" -+ -+ if test "$wxUSE_DEBUGREPORT" = "yes" ; then -+ STD_GUI_LIBS="qa $STD_GUI_LIBS" -+ BUILT_WX_LIBS="qa $BUILT_WX_LIBS" -+ fi -+ if test "$wxUSE_HTML" = "yes" ; then -+ STD_GUI_LIBS="html $STD_GUI_LIBS" -+ BUILT_WX_LIBS="html $BUILT_WX_LIBS" -+ fi -+ if test "$wxUSE_MEDIACTRL" = "yes" ; then -+ BUILT_WX_LIBS="media $BUILT_WX_LIBS" -+ fi -+ if test "$wxUSE_OPENGL" = "yes" ; then -+ BUILT_WX_LIBS="gl $BUILT_WX_LIBS" -+ fi -+ if test "$wxUSE_AUI" = "yes" ; then -+ BUILT_WX_LIBS="aui $BUILT_WX_LIBS" -+ fi -+ if test "$wxUSE_PROPGRID" = "yes" ; then -+ BUILT_WX_LIBS="propgrid $BUILT_WX_LIBS" -+ fi -+ if test "$wxUSE_RIBBON" = "yes" ; then -+ BUILT_WX_LIBS="ribbon $BUILT_WX_LIBS" -+ fi -+ if test "$wxUSE_RICHTEXT" = "yes" ; then -+ BUILT_WX_LIBS="richtext $BUILT_WX_LIBS" -+ fi -+ if test "$wxUSE_STC" = "yes" ; then -+ BUILT_WX_LIBS="stc $BUILT_WX_LIBS" -+ fi -+ if test "$wxUSE_WEBVIEW" = "yes" ; then -+ BUILT_WX_LIBS="webview $BUILT_WX_LIBS" -+ fi -+ if test "$wxUSE_XRC" = "yes" ; then -+ STD_GUI_LIBS="xrc $STD_GUI_LIBS" -+ BUILT_WX_LIBS="xrc $BUILT_WX_LIBS" -+ fi -+fi -+ -+ -+ -+ -+ -+ -+EXTRA_FRAMEWORKS= -+if test "$wxUSE_MAC" = 1 ; then -+ if test "$USE_DARWIN" = 1; then -+ if test "$wxUSE_OSX_IPHONE" = 1; then -+ EXTRA_FRAMEWORKS="-framework IOKit -framework UIKit -framework CFNetwork -framework AudioToolbox -framework CoreFoundation -framework CoreGraphics -framework OpenGLES -framework Foundation -framework QuartzCore -framework GLKit -framework CoreText" -+ else -+ EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework QuartzCore -framework AudioToolbox -framework System -framework OpenGL" -+ -+ if test "$wxUSE_MEDIACTRL" = "yes"; then -+ -+ if test "$cross_compiling" != "no"; then -+ wx_cv_target_x86_64=no -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we target only x86_64" >&5 -+printf %s "checking if we target only x86_64... " >&6; } -+if test ${wx_cv_target_x86_64+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+int main() { return 0; } -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ if file conftest$ac_exeext|grep -q 'i386\|ppc'; then -+ wx_cv_target_x86_64=no -+ else -+ wx_cv_target_x86_64=yes -+ fi -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wx_cv_target_x86_64" >&5 -+printf "%s\n" "$wx_cv_target_x86_64" >&6; } -+ fi -+ -+ if test "$wx_cv_target_x86_64" != "yes"; then -+ EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework QuickTime" -+ fi -+ -+ fi -+ fi -+ fi -+fi -+if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1 ; then -+ EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices -framework Foundation" -+fi -+ -+LDFLAGS="$LDFLAGS $EXTRA_FRAMEWORKS" -+WXCONFIG_LDFLAGS="$WXCONFIG_LDFLAGS $EXTRA_FRAMEWORKS" -+ -+LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK $LIBS" -+ -+if test "$wxUSE_GUI" = "yes"; then -+ -+ -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS archive artprov dialogs drawing \ -+ erase event exec font image minimal power render \ -+ shaped svg taborder vscroll widgets wrapsizer" -+ -+ if test "$wxUSE_MONOLITHIC" != "yes"; then -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console" -+ fi -+ if test "$TOOLKIT" = "MSW"; then -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS regtest" -+ if test "$wxUSE_UNIVERSAL" != "yes"; then -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw nativdlg dll" -+ fi -+ fi -+else -+ SAMPLES_SUBDIRS="console" -+ if test "$wxUSE_SOCKETS" = "yes" ; then -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets" -+ fi -+ if test "$wxUSE_IPC" = "yes" ; then -+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ipc" -+ fi -+fi -+ -+ -+if test "x$INTELCC" = "xyes" ; then -+ CWARNINGS="-Wall -wd810,869,981,1418,1572,1684,2259" -+elif test "$GCC" = yes ; then -+ CWARNINGS="-Wall -Wundef" -+fi -+ -+if test "x$INTELCXX" = "xyes" ; then -+ CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419,1881,2259" -+elif test "$GXX" = yes ; then -+ CXXWARNINGS="-Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy" -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking CXXWARNINGS for gcc -Woverloaded-virtual" >&5 -+printf %s "checking CXXWARNINGS for gcc -Woverloaded-virtual... " >&6; } -+if test ${ac_cv_cxxflags_gcc_option__Woverloaded_virtual+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) ac_cv_cxxflags_gcc_option__Woverloaded_virtual="no, unknown" -+ -+ ac_ext=cpp -+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 -+ -+ ac_save_CXXFLAGS="$CXXFLAGS" -+for ac_arg in "-pedantic -Werror % -Woverloaded-virtual" "-pedantic % -Woverloaded-virtual %% no, obsolete" # -+do CXXFLAGS="$ac_save_CXXFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+return 0; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO" -+then : -+ ac_cv_cxxflags_gcc_option__Woverloaded_virtual=`echo $ac_arg | sed -e 's,.*% *,,'` ; break -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+done -+ CXXFLAGS="$ac_save_CXXFLAGS" -+ 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 -+ -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxxflags_gcc_option__Woverloaded_virtual" >&5 -+printf "%s\n" "$ac_cv_cxxflags_gcc_option__Woverloaded_virtual" >&6; } -+case ".$ac_cv_cxxflags_gcc_option__Woverloaded_virtual" in -+ .ok|.ok,*) ;; -+ .|.no|.no,*) ;; -+ *) -+ if echo " $CXXWARNINGS " | grep " $ac_cv_cxxflags_gcc_option__Woverloaded_virtual " 2>&1 >/dev/null -+ then { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXWARNINGS does contain \$ac_cv_cxxflags_gcc_option__Woverloaded_virtual"; } >&5 -+ (: CXXWARNINGS does contain $ac_cv_cxxflags_gcc_option__Woverloaded_virtual) 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ else { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXWARNINGS=\"\$CXXWARNINGS \$ac_cv_cxxflags_gcc_option__Woverloaded_virtual\""; } >&5 -+ (: CXXWARNINGS="$CXXWARNINGS $ac_cv_cxxflags_gcc_option__Woverloaded_virtual") 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ CXXWARNINGS="$CXXWARNINGS $ac_cv_cxxflags_gcc_option__Woverloaded_virtual" -+ fi -+ ;; -+esac -+ -+ -+ if test "$WXGTK1" = "1"; then -+ CXXWARNINGS="$CXXWARNINGS -Wno-deprecated-declarations -Wno-narrowing -Wno-write-strings" -+ fi -+ -+ if test "$WXGTK4" != 1 -a \( "$WXGTK3" = 1 -o "$wxUSE_MAC" = 1 \) ; then -+ CXXWARNINGS="$CXXWARNINGS -Wno-deprecated-declarations" -+ -+ OBJCXXFLAGS="$OBJCXXFLAGS -Wno-deprecated-declarations" -+ fi -+fi -+ -+ -+WXCONFIG_CFLAGS=`echo $WXCONFIG_CFLAGS` -+WXCONFIG_CXXFLAGS=`echo $WXCONFIG_CFLAGS $WXCONFIG_CXXFLAGS` -+ -+ -+CPPFLAGS=`echo \ -+ -I\\${wx_top_builddir}/lib/wx/include/${TOOLCHAIN_FULLNAME} \ -+ -I\\${top_srcdir}/include \ -+ $CPPFLAGS \ -+ $WXCONFIG_CPPFLAGS \ -+ $TOOLKIT_INCLUDE` -+ -+C_AND_CXX_FLAGS="$DEBUG_CFLAGS $PROFILE_FLAGS $OPTIMISE_CFLAGS" -+CFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $CFLAGS ` -+CXXFLAGS=`echo $WXCONFIG_CXXFLAGS $CXXWARNINGS $C_AND_CXX_FLAGS $CXXFLAGS ` -+OBJCFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $OBJCFLAGS ` -+OBJCXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $OBJCXXFLAGS ` -+ -+if test "$SHARED" = 1; then -+ WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DWXUSINGDLL" -+fi -+ -+LIBS=`echo $LIBS` -+EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $PCRE_LINK $DMALLOC_LIBS" -+EXTRALIBS_XML="$EXPAT_LINK" -+EXTRALIBS_HTML="$MSPACK_LINK" -+EXTRALIBS_MEDIA="$GST_LIBS" -+if test "$wxUSE_GUI" = "yes"; then -+ EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $SDL_LIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $LZMA_LINK $JBIG_LINK $WEBKIT_LINK` -+fi -+if test "$wxUSE_OPENGL" = "yes"; then -+ EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS" -+fi -+ -+LDFLAGS="$LDFLAGS $PROFILE_FLAGS" -+ -+WXCONFIG_LIBS="$LIBS" -+ -+if test "$wxUSE_GUI" = "yes"; then -+ case "$wxUSE_LIBTIFF" in -+ builtin) -+ wxconfig_3rdparty="tiff $wxconfig_3rdparty" -+ ;; -+ sys) -+ WXCONFIG_LIBS="$TIFF_LINK $LZMA_LINK $JBIG_LINK $WXCONFIG_LIBS" -+ ;; -+ esac -+ case "$wxUSE_LIBJPEG" in -+ builtin) -+ wxconfig_3rdparty="jpeg $wxconfig_3rdparty" -+ ;; -+ sys) -+ WXCONFIG_LIBS="$JPEG_LINK $WXCONFIG_LIBS" -+ ;; -+ esac -+ case "$wxUSE_LIBPNG" in -+ builtin) -+ wxconfig_3rdparty="png $wxconfig_3rdparty" -+ ;; -+ sys) -+ WXCONFIG_LIBS="$PNG_LINK $WXCONFIG_LIBS" -+ ;; -+ esac -+fi -+case "$wxUSE_REGEX" in -+ builtin) -+ wxconfig_3rdparty="regex${lib_unicode_suffix} $wxconfig_3rdparty" -+ ;; -+ sys) -+ WXCONFIG_LIBS="$PCRE_LINK $WXCONFIG_LIBS" -+ ;; -+esac -+if test "$wxUSE_STC" = "yes" ; then -+ wxconfig_3rdparty="scintilla $wxconfig_3rdparty" -+fi -+case "$wxUSE_EXPAT" in -+ builtin) -+ wxconfig_3rdparty="expat $wxconfig_3rdparty" -+ ;; -+ sys) -+ WXCONFIG_LIBS="$EXPAT_LINK $WXCONFIG_LIBS" -+ ;; -+esac -+if test "$wxUSE_LIBLZMA" = "yes"; then -+ if test "$wxUSE_GUI" != "yes" -o "$wxUSE_LIBTIFF" != "sys"; then -+ WXCONFIG_LIBS="$LZMA_LINK $WXCONFIG_LIBS" -+ fi -+fi -+case "$wxUSE_ZLIB" in -+ builtin) -+ wxconfig_3rdparty="zlib $wxconfig_3rdparty" -+ ;; -+ sys) -+ WXCONFIG_LIBS="$ZLIB_LINK $WXCONFIG_LIBS" -+ ;; -+esac -+ -+for i in $wxconfig_3rdparty ; do -+ WXCONFIG_LIBS="-lwx${i}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_LIBS" -+done -+ -+ -+if test "x$wxUSE_UNIVERSAL" = "xyes" ; then -+ WXUNIV=1 -+ -+ case "$wxUNIV_THEMES" in -+ ''|all) -+ printf "%s\n" "#define wxUSE_ALL_THEMES 1" >>confdefs.h -+ -+ ;; -+ -+ *) -+ for t in `echo $wxUNIV_THEMES | tr , ' ' | tr '[a-z]' '[A-Z]'`; do -+ printf "%s\n" "#define wxUSE_THEME_$t 1" >>confdefs.h -+ -+ done -+ esac -+else -+ WXUNIV=0 -+fi -+ -+ -+ -+ -+ -+ -+ -+ -+ -+if test $wxUSE_MONOLITHIC = "yes" ; then -+ MONOLITHIC=1 -+else -+ MONOLITHIC=0 -+fi -+ -+if test $wxUSE_PLUGINS = "yes" ; then -+ USE_PLUGINS=1 -+else -+ USE_PLUGINS=0 -+fi -+ -+if test "$wxUSE_DEBUGREPORT" = "yes" ; then -+ USE_QA=1 -+else -+ USE_QA=0 -+fi -+ -+if test $wxUSE_OFFICIAL_BUILD = "yes" ; then -+ OFFICIAL_BUILD=1 -+else -+ OFFICIAL_BUILD=0 -+fi -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'` -+ -+ -+ -+ -+ -+ -+ -+ -+ -+case "$TOOLKIT" in -+ GTK) -+ TOOLKIT_DESC="GTK+" -+ if test "$WXGTK2" = 1; then -+ if test "$WXGTK3" = 1; then -+ TOOLKIT_DESC="$TOOLKIT_DESC ${TOOLKIT_VERSION}" -+ else -+ TOOLKIT_DESC="$TOOLKIT_DESC 2" -+ fi -+ if test "$wxUSE_GTKPRINT" = "yes" ; then -+ TOOLKIT_EXTRA="$TOOLKIT_EXTRA GTK+ printing"; -+ fi -+ if test "$wxUSE_LIBGNOMEVFS" = "yes" ; then -+ TOOLKIT_EXTRA="$TOOLKIT_EXTRA gnomevfs" -+ fi -+ if test "$wxUSE_LIBNOTIFY" = "yes" ; then -+ TOOLKIT_EXTRA="$TOOLKIT_EXTRA libnotify" -+ fi -+ -+ if test "$TOOLKIT_EXTRA" != ""; then -+ TOOLKIT_DESC="$TOOLKIT_DESC with support for `echo $TOOLKIT_EXTRA | tr -s ' '`" -+ fi -+ fi -+ ;; -+ -+ ?*) -+ TOOLKIT_DESC=$TOOLKIT_LOWERCASE -+ ;; -+ -+ *) -+ TOOLKIT_DESC="base only" -+ ;; -+esac -+ -+ -+if test "$wxUSE_PCH" != "yes"; then -+ bk_use_pch=no -+fi -+ -+if test "$wxUSE_WINE" = "yes"; then -+ BAKEFILE_FORCE_PLATFORM=win32 -+fi -+ -+ -+ # Find a good install program. We prefer a C program (faster), -+# so one script is as good as another. But avoid the broken or -+# incompatible versions: -+# SysV /etc/install, /usr/sbin/install -+# SunOS /usr/etc/install -+# IRIX /sbin/install -+# AIX /bin/install -+# AmigaOS /C/install, which installs bootblocks on floppy discs -+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -+# AFS /usr/afsws/bin/install, which mishandles nonexistent args -+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -+# OS/2's system install, which has a completely different semantic -+# ./install, which can be erroneously created by make from ./install.sh. -+# Reject install programs that cannot install multiple files. -+{ 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 test ${ac_cv_path_install+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) 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 -+ # 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/* ) ;; -+ *) -+ # OSF1 and SCO ODT 3.0 have their own names for install. -+ # Don't use installbsd from OSF since it installs stuff as root -+ # by default. -+ for ac_prog in ginstall scoinst install; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if 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 -+ # AIX install. It has an incompatible calling convention. -+ : -+ elif test $ac_prog = install && -+ grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -+ # program-specific install script used by HP pwplus--don't use. -+ : -+ else -+ rm -rf conftest.one conftest.two conftest.dir -+ echo one > conftest.one -+ echo two > conftest.two -+ mkdir conftest.dir -+ if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" && -+ test -s conftest.one && test -s conftest.two && -+ test -s conftest.dir/conftest.one && -+ test -s conftest.dir/conftest.two -+ then -+ ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c" -+ break 3 -+ fi -+ fi -+ fi -+ done -+ done -+ ;; -+esac -+ -+ done -+IFS=$as_save_IFS -+ -+rm -rf conftest.one conftest.two conftest.dir -+ ;; -+esac -+fi -+ 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 -+ # value for INSTALL within a source directory, because that will -+ # break other packages using the cache if that directory is -+ # removed, or if the value is a relative name. -+ INSTALL=$ac_install_sh -+ fi -+fi -+{ 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. -+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -+ -+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -+ -+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -+ -+ -+ -+ -+ -+ -+ -+ if test "x$BAKEFILE_HOST" = "x"; then -+ if test "x${host}" = "x" ; then -+ as_fn_error $? "You must call the autoconf \"CANONICAL_HOST\" macro in your configure.ac (or .in) file." "$LINENO" 5 -+ fi -+ -+ BAKEFILE_HOST="${host}" -+ fi -+ -+ if test "x$BAKEFILE_CHECK_BASICS" != "xno"; then -+ -+ 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 -+{ 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 case e in #( -+ e) if test -n "$RANLIB"; then -+ ac_cv_prog_RANLIB="$RANLIB" # 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_RANLIB="${ac_tool_prefix}ranlib" -+ 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 ;; -+esac -+fi -+RANLIB=$ac_cv_prog_RANLIB -+if test -n "$RANLIB"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -+printf "%s\n" "$RANLIB" >&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_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 -+{ 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 case e in #( -+ e) if test -n "$ac_ct_RANLIB"; then -+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # 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_RANLIB="ranlib" -+ 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 ;; -+esac -+fi -+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -+if test -n "$ac_ct_RANLIB"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -+printf "%s\n" "$ac_ct_RANLIB" >&6; } -+else -+ { 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 -+ RANLIB=":" -+ 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 -+ RANLIB=$ac_ct_RANLIB -+ fi -+else -+ RANLIB="$ac_cv_prog_RANLIB" -+fi -+ -+ -+ { 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 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -+printf "%s\n" "no, using $LN_S" >&6; } -+fi -+ -+ -+ { 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=`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 case e in #( -+ e) cat >conftest.make <<\_ACEOF -+SHELL = /bin/sh -+all: -+ @echo '@@@%%%=$(MAKE)=@@@%%%' -+_ACEOF -+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. -+case `${MAKE-make} -f conftest.make 2>/dev/null` in -+ *@@@%%%=?*=@@@%%%*) -+ eval ac_cv_prog_make_${ac_make}_set=yes;; -+ *) -+ eval ac_cv_prog_make_${ac_make}_set=no;; -+esac -+rm -f conftest.make ;; -+esac -+fi -+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ SET_MAKE= -+else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ SET_MAKE="MAKE=${MAKE-make}" -+fi -+ -+ -+ -+ if test "x$SUNCXX" = "xyes"; then -+ AR=$CXX -+ AROPTIONS="-xar -o" -+ -+ elif test "x$SGICC" = "xyes"; then -+ AR=$CXX -+ AROPTIONS="-ar -o" -+ -+ else -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -+set dummy ${ac_tool_prefix}ar; ac_word=$2 -+{ 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 case e in #( -+ e) if test -n "$AR"; then -+ ac_cv_prog_AR="$AR" # 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_AR="${ac_tool_prefix}ar" -+ 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 ;; -+esac -+fi -+AR=$ac_cv_prog_AR -+if test -n "$AR"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -+printf "%s\n" "$AR" >&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_AR"; then -+ ac_ct_AR=$AR -+ # Extract the first word of "ar", so it can be a program name with args. -+set dummy ar; ac_word=$2 -+{ 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 case e in #( -+ e) if test -n "$ac_ct_AR"; then -+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # 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_AR="ar" -+ 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 ;; -+esac -+fi -+ac_ct_AR=$ac_cv_prog_ac_ct_AR -+if test -n "$ac_ct_AR"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -+printf "%s\n" "$ac_ct_AR" >&6; } -+else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+fi -+ -+ if test "x$ac_ct_AR" = x; then -+ AR="ar" -+ 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 -+ AR=$ac_ct_AR -+ fi -+else -+ AR="$ac_cv_prog_AR" -+fi -+ -+ AROPTIONS=rc -+ 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 -+{ 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 case e in #( -+ e) if test -n "$STRIP"; then -+ ac_cv_prog_STRIP="$STRIP" # 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_STRIP="${ac_tool_prefix}strip" -+ 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 ;; -+esac -+fi -+STRIP=$ac_cv_prog_STRIP -+if test -n "$STRIP"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -+printf "%s\n" "$STRIP" >&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_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 -+{ 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 case e in #( -+ e) if test -n "$ac_ct_STRIP"; then -+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # 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_STRIP="strip" -+ 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 ;; -+esac -+fi -+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -+if test -n "$ac_ct_STRIP"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -+printf "%s\n" "$ac_ct_STRIP" >&6; } -+else -+ { 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 -+ STRIP=":" -+ 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 -+ STRIP=$ac_ct_STRIP -+ fi -+else -+ STRIP="$ac_cv_prog_STRIP" -+fi -+ -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args. -+set dummy ${ac_tool_prefix}nm; 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_NM+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if test -n "$NM"; then -+ ac_cv_prog_NM="$NM" # 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_NM="${ac_tool_prefix}nm" -+ 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 ;; -+esac -+fi -+NM=$ac_cv_prog_NM -+if test -n "$NM"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NM" >&5 -+printf "%s\n" "$NM" >&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_NM"; then -+ ac_ct_NM=$NM -+ # Extract the first word of "nm", so it can be a program name with args. -+set dummy nm; 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_NM+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if test -n "$ac_ct_NM"; then -+ ac_cv_prog_ac_ct_NM="$ac_ct_NM" # 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_NM="nm" -+ 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 ;; -+esac -+fi -+ac_ct_NM=$ac_cv_prog_ac_ct_NM -+if test -n "$ac_ct_NM"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NM" >&5 -+printf "%s\n" "$ac_ct_NM" >&6; } -+else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+fi -+ -+ if test "x$ac_ct_NM" = x; then -+ NM=":" -+ 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 -+ NM=$ac_ct_NM -+ fi -+else -+ NM="$ac_cv_prog_NM" -+fi -+ -+ -+ INSTALL_DIR="mkdir -p" -+ -+ -+ LDFLAGS_GUI= -+ case ${BAKEFILE_HOST} in -+ *-*-cygwin* | *-*-mingw32* | *-*-mingw64* ) -+ LDFLAGS_GUI="-mwindows" -+ esac -+ -+ -+ fi -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if make is GNU make" >&5 -+printf %s "checking if make is GNU make... " >&6; } -+if test ${bakefile_cv_prog_makeisgnu+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null | -+ grep -sE GNU > /dev/null); then -+ bakefile_cv_prog_makeisgnu="yes" -+ else -+ bakefile_cv_prog_makeisgnu="no" -+ fi -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_prog_makeisgnu" >&5 -+printf "%s\n" "$bakefile_cv_prog_makeisgnu" >&6; } -+ -+ if test "x$bakefile_cv_prog_makeisgnu" = "xyes"; then -+ IF_GNU_MAKE="" -+ else -+ IF_GNU_MAKE="#" -+ fi -+ -+ -+ -+ PLATFORM_UNIX=0 -+ PLATFORM_WIN32=0 -+ PLATFORM_MAC=0 -+ PLATFORM_MACOS=0 -+ PLATFORM_MACOSX=0 -+ PLATFORM_BEOS=0 -+ -+ if test "x$BAKEFILE_FORCE_PLATFORM" = "x"; then -+ case "${BAKEFILE_HOST}" in -+ *-*-mingw* ) -+ PLATFORM_WIN32=1 -+ ;; -+ *-*-darwin* ) -+ PLATFORM_MAC=1 -+ PLATFORM_MACOSX=1 -+ ;; -+ *-*-beos* ) -+ PLATFORM_BEOS=1 -+ ;; -+ powerpc-apple-macos* ) -+ PLATFORM_MAC=1 -+ PLATFORM_MACOS=1 -+ ;; -+ * ) -+ PLATFORM_UNIX=1 -+ ;; -+ esac -+ else -+ case "$BAKEFILE_FORCE_PLATFORM" in -+ win32 ) -+ PLATFORM_WIN32=1 -+ ;; -+ darwin ) -+ PLATFORM_MAC=1 -+ PLATFORM_MACOSX=1 -+ ;; -+ unix ) -+ PLATFORM_UNIX=1 -+ ;; -+ beos ) -+ PLATFORM_BEOS=1 -+ ;; -+ * ) -+ as_fn_error $? "Unknown platform: $BAKEFILE_FORCE_PLATFORM" "$LINENO" 5 -+ ;; -+ esac -+ fi -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ case "${BAKEFILE_HOST}" in -+ *-*-darwin* ) -+ if test "x$GCC" = "xyes"; then -+ CFLAGS="$CFLAGS -fno-common" -+ CXXFLAGS="$CXXFLAGS -fno-common" -+ fi -+ if test "x$XLCC" = "xyes"; then -+ CFLAGS="$CFLAGS -qnocommon" -+ CXXFLAGS="$CXXFLAGS -qnocommon" -+ fi -+ ;; -+ -+ i*86-*-beos* ) -+ LDFLAGS="-L/boot/develop/lib/x86 $LDFLAGS" -+ ;; -+ esac -+ -+ -+ SO_SUFFIX="so" -+ SO_SUFFIX_MODULE="so" -+ EXEEXT="" -+ LIBPREFIX="lib" -+ LIBEXT=".a" -+ DLLPREFIX="lib" -+ DLLPREFIX_MODULE="" -+ DLLIMP_SUFFIX="" -+ dlldir="$libdir" -+ -+ case "${BAKEFILE_HOST}" in -+ ia64-hp-hpux* ) -+ ;; -+ *-hp-hpux* ) -+ SO_SUFFIX="sl" -+ SO_SUFFIX_MODULE="sl" -+ ;; -+ *-*-aix* ) -+ SO_SUFFIX="a" -+ SO_SUFFIX_MODULE="a" -+ ;; -+ *-*-cygwin* ) -+ SO_SUFFIX="dll" -+ SO_SUFFIX_MODULE="dll" -+ DLLIMP_SUFFIX="dll.a" -+ EXEEXT=".exe" -+ DLLPREFIX="cyg" -+ dlldir="$bindir" -+ ;; -+ *-*-mingw* ) -+ SO_SUFFIX="dll" -+ SO_SUFFIX_MODULE="dll" -+ DLLIMP_SUFFIX="dll.a" -+ EXEEXT=".exe" -+ DLLPREFIX="" -+ dlldir="$bindir" -+ ;; -+ *-*-darwin* ) -+ SO_SUFFIX="dylib" -+ SO_SUFFIX_MODULE="bundle" -+ ;; -+ esac -+ -+ if test "x$DLLIMP_SUFFIX" = "x" ; then -+ DLLIMP_SUFFIX="$SO_SUFFIX" -+ fi -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ PIC_FLAG="" -+ if test "x$GCC" = "xyes"; then -+ PIC_FLAG="-fPIC" -+ fi -+ -+ SHARED_LD_CC="\$(CC) -shared ${PIC_FLAG} -o" -+ SHARED_LD_CXX="\$(CXX) -shared ${PIC_FLAG} -o" -+ WINDOWS_IMPLIB=0 -+ -+ case "${BAKEFILE_HOST}" in -+ *-hp-hpux* ) -+ if test "x$GCC" != "xyes"; then -+ LDFLAGS="$LDFLAGS -L/usr/lib" -+ -+ SHARED_LD_CC="${CC} -b -o" -+ SHARED_LD_CXX="${CXX} -b -o" -+ PIC_FLAG="+Z" -+ fi -+ ;; -+ -+ *-*-linux* ) -+ if test "$INTELCC" = "yes" -a "$INTELCC8" != "yes"; then -+ PIC_FLAG="-KPIC" -+ elif test "x$SUNCXX" = "xyes"; then -+ SHARED_LD_CC="${CC} -G -o" -+ SHARED_LD_CXX="${CXX} -G -o" -+ PIC_FLAG="-KPIC" -+ fi -+ ;; -+ -+ *-*-solaris2* ) -+ if test "x$SUNCXX" = xyes ; then -+ SHARED_LD_CC="${CC} -G -o" -+ SHARED_LD_CXX="${CXX} -G -o" -+ PIC_FLAG="-KPIC" -+ fi -+ ;; -+ -+ *-*-darwin* ) -+ SHARED_LD_MODULE_CC="\${CC} -bundle -single_module -headerpad_max_install_names -o" -+ SHARED_LD_MODULE_CXX="\${CXX} -bundle -single_module -headerpad_max_install_names -o" -+ -+ SHARED_LD_CC="\${CC} -dynamiclib -single_module -headerpad_max_install_names -o" -+ SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o" -+ -+ if test "x$GCC" = "xyes"; then -+ PIC_FLAG="-dynamic -fPIC" -+ fi -+ if test "x$XLCC" = "xyes"; then -+ PIC_FLAG="-dynamic -DPIC" -+ fi -+ ;; -+ -+ *-*-aix* ) -+ if test "x$GCC" = "xyes"; then -+ PIC_FLAG="" -+ -+ case "${BAKEFILE_HOST}" in -+ *-*-aix5* ) -+ LD_EXPFULL="-Wl,-bexpfull" -+ ;; -+ esac -+ -+ SHARED_LD_CC="\$(CC) -shared $LD_EXPFULL -o" -+ SHARED_LD_CXX="\$(CXX) -shared $LD_EXPFULL -o" -+ else -+ # Extract the first word of "makeC++SharedLib", so it can be a program name with args. -+set dummy makeC++SharedLib; 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_AIX_CXX_LD+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if test -n "$AIX_CXX_LD"; then -+ ac_cv_prog_AIX_CXX_LD="$AIX_CXX_LD" # 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_AIX_CXX_LD="makeC++SharedLib" -+ 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 -+ -+ test -z "$ac_cv_prog_AIX_CXX_LD" && ac_cv_prog_AIX_CXX_LD="/usr/lpp/xlC/bin/makeC++SharedLib" -+fi ;; -+esac -+fi -+AIX_CXX_LD=$ac_cv_prog_AIX_CXX_LD -+if test -n "$AIX_CXX_LD"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AIX_CXX_LD" >&5 -+printf "%s\n" "$AIX_CXX_LD" >&6; } -+else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+fi -+ -+ -+ SHARED_LD_CC="$AIX_CC_LD -p 0 -o" -+ SHARED_LD_CXX="$AIX_CXX_LD -p 0 -o" -+ fi -+ ;; -+ -+ *-*-beos* ) -+ SHARED_LD_CC="${LD} -nostart -o" -+ SHARED_LD_CXX="${LD} -nostart -o" -+ ;; -+ -+ *-*-irix* ) -+ if test "x$GCC" != "xyes"; then -+ PIC_FLAG="-KPIC" -+ fi -+ ;; -+ -+ *-*-cygwin* | *-*-mingw32* | *-*-mingw64* ) -+ PIC_FLAG="" -+ SHARED_LD_CC="\$(CC) -shared -o" -+ SHARED_LD_CXX="\$(CXX) -shared -o" -+ WINDOWS_IMPLIB=1 -+ ;; -+ -+ powerpc-apple-macos* | \ -+ *-*-freebsd* | *-*-openbsd* | *-*-haiku* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \ -+ *-*-mirbsd* | \ -+ *-*-sunos4* | \ -+ *-*-osf* | \ -+ *-*-dgux5* | \ -+ *-*-sysv5* | \ -+ *-*-emscripten ) -+ ;; -+ -+ *) -+ as_fn_error $? "unknown system type $BAKEFILE_HOST." "$LINENO" 5 -+ esac -+ -+ if test "x$PIC_FLAG" != "x" ; then -+ PIC_FLAG="$PIC_FLAG -DPIC" -+ fi -+ -+ if test "x$SHARED_LD_MODULE_CC" = "x" ; then -+ SHARED_LD_MODULE_CC="$SHARED_LD_CC" -+ fi -+ if test "x$SHARED_LD_MODULE_CXX" = "x" ; then -+ SHARED_LD_MODULE_CXX="$SHARED_LD_CXX" -+ fi -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ USE_SOVERSION=0 -+ USE_SOVERLINUX=0 -+ USE_SOVERSOLARIS=0 -+ USE_SOVERCYGWIN=0 -+ USE_SOTWOSYMLINKS=0 -+ USE_MACVERSION=0 -+ SONAME_FLAG= -+ -+ case "${BAKEFILE_HOST}" in -+ *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-haiku* | *-*-netbsd* | \ -+ *-*-k*bsd*-gnu | *-*-mirbsd* | *-*-gnu* ) -+ if test "x$SUNCXX" = "xyes"; then -+ SONAME_FLAG="-h " -+ else -+ SONAME_FLAG="-Wl,-soname," -+ fi -+ USE_SOVERSION=1 -+ USE_SOVERLINUX=1 -+ USE_SOTWOSYMLINKS=1 -+ ;; -+ -+ *-*-solaris2* ) -+ SONAME_FLAG="-h " -+ USE_SOVERSION=1 -+ USE_SOVERSOLARIS=1 -+ ;; -+ -+ *-*-darwin* ) -+ USE_MACVERSION=1 -+ USE_SOVERSION=1 -+ USE_SOTWOSYMLINKS=1 -+ ;; -+ -+ *-*-cygwin* ) -+ USE_SOVERSION=1 -+ USE_SOVERCYGWIN=1 -+ ;; -+ esac -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ # Check whether --enable-dependency-tracking was given. -+if test ${enable_dependency_tracking+y} -+then : -+ enableval=$enable_dependency_tracking; bk_use_trackdeps="$enableval" -+fi -+ -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dependency tracking method" >&5 -+printf %s "checking for dependency tracking method... " >&6; } -+ -+ BK_DEPS="" -+ if test "x$bk_use_trackdeps" = "xno" ; then -+ DEPS_TRACKING=0 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -+printf "%s\n" "disabled" >&6; } -+ else -+ DEPS_TRACKING=1 -+ -+ if test "x$GCC" = "xyes"; then -+ DEPSMODE=gcc -+ DEPSFLAG="-MMD" -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: gcc" >&5 -+printf "%s\n" "gcc" >&6; } -+ elif test "x$SUNCC" = "xyes"; then -+ DEPSMODE=unixcc -+ DEPSFLAG="-xM1" -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Sun cc" >&5 -+printf "%s\n" "Sun cc" >&6; } -+ elif test "x$SGICC" = "xyes"; then -+ DEPSMODE=unixcc -+ DEPSFLAG="-M" -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SGI cc" >&5 -+printf "%s\n" "SGI cc" >&6; } -+ elif test "x$HPCC" = "xyes"; then -+ DEPSMODE=unixcc -+ DEPSFLAG="+make" -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: HP cc" >&5 -+printf "%s\n" "HP cc" >&6; } -+ elif test "x$COMPAQCC" = "xyes"; then -+ DEPSMODE=gcc -+ DEPSFLAG="-MD" -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Compaq cc" >&5 -+printf "%s\n" "Compaq cc" >&6; } -+ else -+ DEPS_TRACKING=0 -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 -+printf "%s\n" "none" >&6; } -+ fi -+ -+ if test $DEPS_TRACKING = 1 ; then -+ -+D='$' -+cat <bk-deps -+#!/bin/sh -+ -+# This script is part of Bakefile (http://www.bakefile.org) autoconf -+# script. It is used to track C/C++ files dependencies in portable way. -+# -+# Permission is given to use this file in any way. -+ -+DEPSMODE=${DEPSMODE} -+DEPSFLAG="${DEPSFLAG}" -+DEPSDIRBASE=.deps -+ -+if test ${D}DEPSMODE = gcc ; then -+ ${D}* ${D}{DEPSFLAG} -+ status=${D}? -+ -+ # determine location of created files: -+ while test ${D}# -gt 0; do -+ case "${D}1" in -+ -o ) -+ shift -+ objfile=${D}1 -+ ;; -+ -* ) -+ ;; -+ * ) -+ srcfile=${D}1 -+ ;; -+ esac -+ shift -+ done -+ objfilebase=\`basename ${D}objfile\` -+ builddir=\`dirname ${D}objfile\` -+ depfile=\`basename ${D}srcfile | sed -e 's/\\..*${D}/.d/g'\` -+ depobjname=\`echo ${D}depfile |sed -e 's/\\.d/.o/g'\` -+ depsdir=${D}builddir/${D}DEPSDIRBASE -+ mkdir -p ${D}depsdir -+ -+ # if the compiler failed, we're done: -+ if test ${D}{status} != 0 ; then -+ rm -f ${D}depfile -+ exit ${D}{status} -+ fi -+ -+ # move created file to the location we want it in: -+ if test -f ${D}depfile ; then -+ sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{depsdir}/${D}{objfilebase}.d -+ rm -f ${D}depfile -+ else -+ # "g++ -MMD -o fooobj.o foosrc.cpp" produces fooobj.d -+ depfile=\`echo "${D}objfile" | sed -e 's/\\..*${D}/.d/g'\` -+ if test ! -f ${D}depfile ; then -+ # "cxx -MD -o fooobj.o foosrc.cpp" creates fooobj.o.d (Compaq C++) -+ depfile="${D}objfile.d" -+ fi -+ if test -f ${D}depfile ; then -+ sed -e "\\,^${D}objfile,!s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{depsdir}/${D}{objfilebase}.d -+ rm -f ${D}depfile -+ fi -+ fi -+ exit 0 -+ -+elif test ${D}DEPSMODE = unixcc; then -+ ${D}* || exit ${D}? -+ # Run compiler again with deps flag and redirect into the dep file. -+ # It doesn't work if the '-o FILE' option is used, but without it the -+ # dependency file will contain the wrong name for the object. So it is -+ # removed from the command line, and the dep file is fixed with sed. -+ cmd="" -+ while test ${D}# -gt 0; do -+ case "${D}1" in -+ -o ) -+ shift -+ objfile=${D}1 -+ ;; -+ * ) -+ eval arg${D}#=\\${D}1 -+ cmd="${D}cmd \\${D}arg${D}#" -+ ;; -+ esac -+ shift -+ done -+ -+ objfilebase=\`basename ${D}objfile\` -+ builddir=\`dirname ${D}objfile\` -+ depsdir=${D}builddir/${D}DEPSDIRBASE -+ mkdir -p ${D}depsdir -+ -+ eval "${D}cmd ${D}DEPSFLAG" | sed "s|.*:|${D}objfile:|" >${D}{depsdir}/${D}{objfilebase}.d -+ exit 0 -+ -+else -+ ${D}* -+ exit ${D}? -+fi -+EOF -+ -+ chmod +x bk-deps -+ BK_DEPS="`pwd`/bk-deps" -+ fi -+ fi -+ -+ -+ -+ -+ -+ case ${BAKEFILE_HOST} in -+ *-*-cygwin* | *-*-mingw32* | *-*-mingw64* ) -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. -+set dummy ${ac_tool_prefix}windres; 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_WINDRES+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if test -n "$WINDRES"; then -+ ac_cv_prog_WINDRES="$WINDRES" # 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_WINDRES="${ac_tool_prefix}windres" -+ 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 ;; -+esac -+fi -+WINDRES=$ac_cv_prog_WINDRES -+if test -n "$WINDRES"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5 -+printf "%s\n" "$WINDRES" >&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_WINDRES"; then -+ ac_ct_WINDRES=$WINDRES -+ # Extract the first word of "windres", so it can be a program name with args. -+set dummy windres; 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_WINDRES+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) if test -n "$ac_ct_WINDRES"; then -+ ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # 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_WINDRES="windres" -+ 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 ;; -+esac -+fi -+ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES -+if test -n "$ac_ct_WINDRES"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5 -+printf "%s\n" "$ac_ct_WINDRES" >&6; } -+else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+fi -+ -+ if test "x$ac_ct_WINDRES" = x; then -+ WINDRES="" -+ 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 -+ WINDRES=$ac_ct_WINDRES -+ fi -+else -+ WINDRES="$ac_cv_prog_WINDRES" -+fi -+ -+ ;; -+ esac -+ -+ -+ -+ -+ -+ -+ -+ BAKEFILE_BAKEFILE_M4_VERSION="0.2.13" -+ -+ -+BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.13" -+ -+ -+ -+ # Check whether --enable-precomp-headers was given. -+if test ${enable_precomp_headers+y} -+then : -+ enableval=$enable_precomp_headers; bk_use_pch="$enableval" -+fi -+ -+ -+ GCC_PCH=0 -+ ICC_PCH=0 -+ USE_PCH=0 -+ BK_MAKE_PCH="" -+ -+ case ${BAKEFILE_HOST} in -+ *-*-cygwin* ) -+ bk_use_pch="no" -+ ;; -+ esac -+ -+ if test "x$bk_use_pch" = "x" -o "x$bk_use_pch" = "xyes" ; then -+ if test "x$GCC" = "xyes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the compiler supports precompiled headers" >&5 -+printf %s "checking if the compiler supports precompiled headers... " >&6; } -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main (void) -+{ -+ -+ #if !defined(__GNUC__) || !defined(__GNUC_MINOR__) -+ There is no PCH support -+ #endif -+ #if (__GNUC__ < 3) -+ There is no PCH support -+ #endif -+ #if (__GNUC__ == 3) && \ -+ ((!defined(__APPLE_CC__) && (__GNUC_MINOR__ < 4)) || \ -+ ( defined(__APPLE_CC__) && (__GNUC_MINOR__ < 3))) || \ -+ ( defined(__INTEL_COMPILER) ) -+ There is no PCH support -+ #endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ GCC_PCH=1 -+ -+else case e in #( -+ e) -+ if test "$INTELCXX8" = "yes"; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ ICC_PCH=1 -+ if test "$INTELCXX10" = "yes"; then -+ ICC_PCH_CREATE_SWITCH="-pch-create" -+ ICC_PCH_USE_SWITCH="-pch-use" -+ else -+ ICC_PCH_CREATE_SWITCH="-create-pch" -+ ICC_PCH_USE_SWITCH="-use-pch" -+ fi -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ fi -+ ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ if test $GCC_PCH = 1 -o $ICC_PCH = 1 ; then -+ USE_PCH=1 -+ -+D='$' -+cat <bk-make-pch -+#!/bin/sh -+ -+# This script is part of Bakefile (http://www.bakefile.org) autoconf -+# script. It is used to generated precompiled headers. -+# -+# Permission is given to use this file in any way. -+ -+outfile="${D}{1}" -+header="${D}{2}" -+shift -+shift -+ -+builddir=\`echo ${D}outfile | sed -e 's,/\\.pch/.*${D},,g'\` -+ -+compiler="" -+headerfile="" -+ -+while test ${D}{#} -gt 0; do -+ add_to_cmdline=1 -+ case "${D}{1}" in -+ -I* ) -+ incdir=\`echo ${D}{1} | sed -e 's/-I\\(.*\\)/\\1/g'\` -+ if test "x${D}{headerfile}" = "x" -a -f "${D}{incdir}/${D}{header}" ; then -+ headerfile="${D}{incdir}/${D}{header}" -+ fi -+ ;; -+ -use-pch|-use_pch|-pch-use ) -+ shift -+ add_to_cmdline=0 -+ ;; -+ esac -+ if test ${D}add_to_cmdline = 1 ; then -+ compiler="${D}{compiler} ${D}{1}" -+ fi -+ shift -+done -+ -+if test "x${D}{headerfile}" = "x" ; then -+ echo "error: can't find header ${D}{header} in include paths" >&2 -+else -+ if test -f ${D}{outfile} ; then -+ rm -f ${D}{outfile} -+ else -+ mkdir -p \`dirname ${D}{outfile}\` -+ fi -+ depsfile="${D}{builddir}/.deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d" -+ mkdir -p ${D}{builddir}/.deps -+ if test "x${GCC_PCH}" = "x1" ; then -+ # can do this because gcc is >= 3.4: -+ ${D}{compiler} -o ${D}{outfile} -MMD -MF "${D}{depsfile}" "${D}{headerfile}" -+ elif test "x${ICC_PCH}" = "x1" ; then -+ filename=pch_gen-${D}${D} -+ file=${D}{filename}.c -+ dfile=${D}{filename}.d -+ cat > ${D}file < ${D}depsfile && \\ -+ rm -f ${D}file ${D}dfile ${D}{filename}.o -+ fi -+ exit ${D}{?} -+fi -+EOF -+ -+ chmod +x bk-make-pch -+ BK_MAKE_PCH="`pwd`/bk-make-pch" -+ fi -+ fi -+ fi -+ -+ -+ -+ -+ -+ -+ -+ COND_BUILD_debug="#" -+ if test "x$BUILD" = "xdebug" ; then -+ COND_BUILD_debug="" -+ fi -+ -+ COND_BUILD_debug_DEBUG_INFO_default="#" -+ if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then -+ COND_BUILD_debug_DEBUG_INFO_default="" -+ fi -+ -+ COND_BUILD_release="#" -+ if test "x$BUILD" = "xrelease" ; then -+ COND_BUILD_release="" -+ fi -+ -+ COND_BUILD_release_DEBUG_INFO_default="#" -+ if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then -+ COND_BUILD_release_DEBUG_INFO_default="" -+ fi -+ -+ COND_DEBUG_FLAG_0="#" -+ if test "x$DEBUG_FLAG" = "x0" ; then -+ COND_DEBUG_FLAG_0="" -+ fi -+ -+ COND_DEBUG_INFO_0="#" -+ if test "x$DEBUG_INFO" = "x0" ; then -+ COND_DEBUG_INFO_0="" -+ fi -+ -+ COND_DEBUG_INFO_1="#" -+ if test "x$DEBUG_INFO" = "x1" ; then -+ COND_DEBUG_INFO_1="" -+ fi -+ -+ COND_DEPS_TRACKING_0="#" -+ if test "x$DEPS_TRACKING" = "x0" ; then -+ COND_DEPS_TRACKING_0="" -+ fi -+ -+ COND_DEPS_TRACKING_1="#" -+ if test "x$DEPS_TRACKING" = "x1" ; then -+ COND_DEPS_TRACKING_1="" -+ fi -+ -+ COND_GCC_PCH_1="#" -+ if test "x$GCC_PCH" = "x1" ; then -+ COND_GCC_PCH_1="" -+ fi -+ -+ COND_ICC_PCH_1="#" -+ if test "x$ICC_PCH" = "x1" ; then -+ COND_ICC_PCH_1="" -+ fi -+ -+ COND_MONOLITHIC_0="#" -+ if test "x$MONOLITHIC" = "x0" ; then -+ COND_MONOLITHIC_0="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_0="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" ; then -+ COND_MONOLITHIC_0_SHARED_0="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_0_USE_AUI_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_AUI" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_0_USE_AUI_1="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_HTML" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_MEDIA" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_WEBVIEW" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_PROPGRID" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RIBBON" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_0_USE_STC_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_STC" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_0_USE_STC_1="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_0_USE_XML_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_XML" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_0_USE_XML_1="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_0_USE_XRC_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_XRC" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_0_USE_XRC_1="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_1="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_1_USE_AUI_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_AUI" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_1_USE_AUI_1="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_HTML" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_MEDIA" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_WEBVIEW" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_PROPGRID" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RIBBON" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1_USE_XML_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RICHTEXT" = "x1" -a "x$USE_XML" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1_USE_XML_1="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_1_USE_STC_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_STC" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_1_USE_STC_1="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_1_USE_XML_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_XML" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_1_USE_XML_1="" -+ fi -+ -+ COND_MONOLITHIC_0_SHARED_1_USE_XML_1_USE_XRC_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_XML" = "x1" -a "x$USE_XRC" = "x1" ; then -+ COND_MONOLITHIC_0_SHARED_1_USE_XML_1_USE_XRC_1="" -+ fi -+ -+ COND_MONOLITHIC_0_USE_AUI_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$USE_AUI" = "x1" ; then -+ COND_MONOLITHIC_0_USE_AUI_1="" -+ fi -+ -+ COND_MONOLITHIC_0_USE_GUI_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$USE_GUI" = "x1" ; then -+ COND_MONOLITHIC_0_USE_GUI_1="" -+ fi -+ -+ COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_MEDIA" = "x1" ; then -+ COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1="" -+ fi -+ -+ COND_MONOLITHIC_0_USE_HTML_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$USE_HTML" = "x1" ; then -+ COND_MONOLITHIC_0_USE_HTML_1="" -+ fi -+ -+ COND_MONOLITHIC_0_USE_MEDIA_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$USE_MEDIA" = "x1" ; then -+ COND_MONOLITHIC_0_USE_MEDIA_1="" -+ fi -+ -+ COND_MONOLITHIC_0_USE_PROPGRID_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$USE_PROPGRID" = "x1" ; then -+ COND_MONOLITHIC_0_USE_PROPGRID_1="" -+ fi -+ -+ COND_MONOLITHIC_0_USE_QA_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$USE_QA" = "x1" ; then -+ COND_MONOLITHIC_0_USE_QA_1="" -+ fi -+ -+ COND_MONOLITHIC_0_USE_RIBBON_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$USE_RIBBON" = "x1" ; then -+ COND_MONOLITHIC_0_USE_RIBBON_1="" -+ fi -+ -+ COND_MONOLITHIC_0_USE_RICHTEXT_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then -+ COND_MONOLITHIC_0_USE_RICHTEXT_1="" -+ fi -+ -+ COND_MONOLITHIC_0_USE_STC_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$USE_STC" = "x1" ; then -+ COND_MONOLITHIC_0_USE_STC_1="" -+ fi -+ -+ COND_MONOLITHIC_0_USE_WEBVIEW_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$USE_WEBVIEW" = "x1" ; then -+ COND_MONOLITHIC_0_USE_WEBVIEW_1="" -+ fi -+ -+ COND_MONOLITHIC_0_USE_XML_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$USE_XML" = "x1" ; then -+ COND_MONOLITHIC_0_USE_XML_1="" -+ fi -+ -+ COND_MONOLITHIC_0_USE_XRC_1="#" -+ if test "x$MONOLITHIC" = "x0" -a "x$USE_XRC" = "x1" ; then -+ COND_MONOLITHIC_0_USE_XRC_1="" -+ fi -+ -+ COND_MONOLITHIC_1="#" -+ if test "x$MONOLITHIC" = "x1" ; then -+ COND_MONOLITHIC_1="" -+ fi -+ -+ COND_MONOLITHIC_1_SHARED_0="#" -+ if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x0" ; then -+ COND_MONOLITHIC_1_SHARED_0="" -+ fi -+ -+ COND_MONOLITHIC_1_SHARED_1="#" -+ if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x1" ; then -+ COND_MONOLITHIC_1_SHARED_1="" -+ fi -+ -+ COND_MONOLITHIC_1_USE_STC_1="#" -+ if test "x$MONOLITHIC" = "x1" -a "x$USE_STC" = "x1" ; then -+ COND_MONOLITHIC_1_USE_STC_1="" -+ fi -+ -+ COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="#" -+ if test "x$OFFICIAL_BUILD" = "x0" -a "x$PLATFORM_WIN32" = "x1" ; then -+ COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="" -+ fi -+ -+ COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1="#" -+ if test "x$OFFICIAL_BUILD" = "x1" -a "x$PLATFORM_WIN32" = "x1" ; then -+ COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1="" -+ fi -+ -+ COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1="#" -+ if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERCYGWIN" = "x0" -a "x$USE_SOVERSION" = "x1" ; then -+ COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1="" -+ fi -+ -+ COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#" -+ if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERSION" = "x1" ; then -+ COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="" -+ fi -+ -+ COND_PLATFORM_MACOSX_1="#" -+ if test "x$PLATFORM_MACOSX" = "x1" ; then -+ COND_PLATFORM_MACOSX_1="" -+ fi -+ -+ COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0="#" -+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$PLATFORM_WIN32" = "x1" -a "x$SHARED" = "x0" ; then -+ COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0="" -+ fi -+ -+ COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#" -+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then -+ COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="" -+ fi -+ -+ COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#" -+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then -+ COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="" -+ fi -+ -+ COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="#" -+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$USE_GUI" = "x1" ; then -+ COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="" -+ fi -+ -+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1="#" -+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" ; then -+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1="" -+ fi -+ -+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#" -+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then -+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="" -+ fi -+ -+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1="#" -+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" ; then -+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1="" -+ fi -+ -+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0="#" -+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then -+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0="" -+ fi -+ -+ COND_PLATFORM_MACOSX_1_USE_GUI_1="#" -+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_GUI" = "x1" ; then -+ COND_PLATFORM_MACOSX_1_USE_GUI_1="" -+ fi -+ -+ COND_PLATFORM_MACOSX_1_USE_OPENGL_1="#" -+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_OPENGL" = "x1" ; then -+ COND_PLATFORM_MACOSX_1_USE_OPENGL_1="" -+ fi -+ -+ COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#" -+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then -+ COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="" -+ fi -+ -+ COND_PLATFORM_OS2_1="#" -+ if test "x$PLATFORM_OS2" = "x1" ; then -+ COND_PLATFORM_OS2_1="" -+ fi -+ -+ COND_PLATFORM_UNIX_0="#" -+ if test "x$PLATFORM_UNIX" = "x0" ; then -+ COND_PLATFORM_UNIX_0="" -+ fi -+ -+ COND_PLATFORM_UNIX_1="#" -+ if test "x$PLATFORM_UNIX" = "x1" ; then -+ COND_PLATFORM_UNIX_1="" -+ fi -+ -+ COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#" -+ if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then -+ COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="" -+ fi -+ -+ COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#" -+ if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then -+ COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="" -+ fi -+ -+ COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="#" -+ if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$USE_GUI" = "x1" ; then -+ COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="" -+ fi -+ -+ COND_PLATFORM_UNIX_1_USE_GUI_1="#" -+ if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_GUI" = "x1" ; then -+ COND_PLATFORM_UNIX_1_USE_GUI_1="" -+ fi -+ -+ COND_PLATFORM_UNIX_1_USE_PLUGINS_0="#" -+ if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_PLUGINS" = "x0" ; then -+ COND_PLATFORM_UNIX_1_USE_PLUGINS_0="" -+ fi -+ -+ COND_PLATFORM_WIN32_0="#" -+ if test "x$PLATFORM_WIN32" = "x0" ; then -+ COND_PLATFORM_WIN32_0="" -+ fi -+ -+ COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_3="#" -+ if test "x$PLATFORM_WIN32" = "x0" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then -+ COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_3="" -+ fi -+ -+ COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_4="#" -+ if test "x$PLATFORM_WIN32" = "x0" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" ; then -+ COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_4="" -+ fi -+ -+ COND_PLATFORM_WIN32_1="#" -+ if test "x$PLATFORM_WIN32" = "x1" ; then -+ COND_PLATFORM_WIN32_1="" -+ fi -+ -+ COND_PLATFORM_WIN32_1_SHARED_0="#" -+ if test "x$PLATFORM_WIN32" = "x1" -a "x$SHARED" = "x0" ; then -+ COND_PLATFORM_WIN32_1_SHARED_0="" -+ fi -+ -+ COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#" -+ if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then -+ COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="" -+ fi -+ -+ COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#" -+ if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then -+ COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="" -+ fi -+ -+ COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="#" -+ if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$USE_GUI" = "x1" ; then -+ COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="" -+ fi -+ -+ COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="#" -+ if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xQT" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then -+ COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="" -+ fi -+ -+ COND_SHARED_0="#" -+ if test "x$SHARED" = "x0" ; then -+ COND_SHARED_0="" -+ fi -+ -+ COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0="#" -+ if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xMAC" -a "x$WXUNIV" = "x0" ; then -+ COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0="" -+ fi -+ -+ COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0="#" -+ if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xMSW" -a "x$WXUNIV" = "x0" ; then -+ COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0="" -+ fi -+ -+ COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#" -+ if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then -+ COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="" -+ fi -+ -+ COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin="#" -+ if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then -+ COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin="" -+ fi -+ -+ COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin="#" -+ if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then -+ COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin="" -+ fi -+ -+ COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin="#" -+ if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then -+ COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin="" -+ fi -+ -+ COND_SHARED_0_USE_STC_1="#" -+ if test "x$SHARED" = "x0" -a "x$USE_STC" = "x1" ; then -+ COND_SHARED_0_USE_STC_1="" -+ fi -+ -+ COND_SHARED_0_wxUSE_EXPAT_builtin="#" -+ if test "x$SHARED" = "x0" -a "x$wxUSE_EXPAT" = "xbuiltin" ; then -+ COND_SHARED_0_wxUSE_EXPAT_builtin="" -+ fi -+ -+ COND_SHARED_0_wxUSE_REGEX_builtin="#" -+ if test "x$SHARED" = "x0" -a "x$wxUSE_REGEX" = "xbuiltin" ; then -+ COND_SHARED_0_wxUSE_REGEX_builtin="" -+ fi -+ -+ COND_SHARED_0_wxUSE_ZLIB_builtin="#" -+ if test "x$SHARED" = "x0" -a "x$wxUSE_ZLIB" = "xbuiltin" ; then -+ COND_SHARED_0_wxUSE_ZLIB_builtin="" -+ fi -+ -+ COND_SHARED_1="#" -+ if test "x$SHARED" = "x1" ; then -+ COND_SHARED_1="" -+ fi -+ -+ COND_SHARED_1_USE_GUI_1="#" -+ if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" ; then -+ COND_SHARED_1_USE_GUI_1="" -+ fi -+ -+ COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="#" -+ if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then -+ COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="" -+ fi -+ -+ COND_TOOLKIT_="#" -+ if test "x$TOOLKIT" = "x" ; then -+ COND_TOOLKIT_="" -+ fi -+ -+ COND_TOOLKIT_COCOA="#" -+ if test "x$TOOLKIT" = "xCOCOA" ; then -+ COND_TOOLKIT_COCOA="" -+ fi -+ -+ COND_TOOLKIT_DFB="#" -+ if test "x$TOOLKIT" = "xDFB" ; then -+ COND_TOOLKIT_DFB="" -+ fi -+ -+ COND_TOOLKIT_DFB_USE_GUI_1="#" -+ if test "x$TOOLKIT" = "xDFB" -a "x$USE_GUI" = "x1" ; then -+ COND_TOOLKIT_DFB_USE_GUI_1="" -+ fi -+ -+ COND_TOOLKIT_GTK="#" -+ if test "x$TOOLKIT" = "xGTK" ; then -+ COND_TOOLKIT_GTK="" -+ fi -+ -+ COND_TOOLKIT_GTK_TOOLKIT_VERSION_="#" -+ if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x" ; then -+ COND_TOOLKIT_GTK_TOOLKIT_VERSION_="" -+ fi -+ -+ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2="#" -+ if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then -+ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2="" -+ fi -+ -+ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#" -+ if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then -+ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="" -+ fi -+ -+ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0="#" -+ if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then -+ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0="" -+ fi -+ -+ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3="#" -+ if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then -+ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3="" -+ fi -+ -+ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#" -+ if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then -+ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="" -+ fi -+ -+ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0="#" -+ if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then -+ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0="" -+ fi -+ -+ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4="#" -+ if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" ; then -+ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4="" -+ fi -+ -+ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="#" -+ if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$USE_GUI" = "x1" ; then -+ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="" -+ fi -+ -+ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0="#" -+ if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then -+ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0="" -+ fi -+ -+ COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1="#" -+ if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x" -a "x$USE_GUI" = "x1" ; then -+ COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1="" -+ fi -+ -+ COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0="#" -+ if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then -+ COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0="" -+ fi -+ -+ COND_TOOLKIT_GTK_USE_GUI_1="#" -+ if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" ; then -+ COND_TOOLKIT_GTK_USE_GUI_1="" -+ fi -+ -+ COND_TOOLKIT_MAC="#" -+ if test "x$TOOLKIT" = "xMAC" ; then -+ COND_TOOLKIT_MAC="" -+ fi -+ -+ COND_TOOLKIT_MOTIF="#" -+ if test "x$TOOLKIT" = "xMOTIF" ; then -+ COND_TOOLKIT_MOTIF="" -+ fi -+ -+ COND_TOOLKIT_MOTIF_USE_GUI_1="#" -+ if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" ; then -+ COND_TOOLKIT_MOTIF_USE_GUI_1="" -+ fi -+ -+ COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0="#" -+ if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then -+ COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0="" -+ fi -+ -+ COND_TOOLKIT_MSW="#" -+ if test "x$TOOLKIT" = "xMSW" ; then -+ COND_TOOLKIT_MSW="" -+ fi -+ -+ COND_TOOLKIT_MSW_USE_GUI_1="#" -+ if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" ; then -+ COND_TOOLKIT_MSW_USE_GUI_1="" -+ fi -+ -+ COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0="#" -+ if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then -+ COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0="" -+ fi -+ -+ COND_TOOLKIT_OSX_CARBON="#" -+ if test "x$TOOLKIT" = "xOSX_CARBON" ; then -+ COND_TOOLKIT_OSX_CARBON="" -+ fi -+ -+ COND_TOOLKIT_OSX_COCOA="#" -+ if test "x$TOOLKIT" = "xOSX_COCOA" ; then -+ COND_TOOLKIT_OSX_COCOA="" -+ fi -+ -+ COND_TOOLKIT_OSX_COCOA_USE_GUI_1="#" -+ if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" ; then -+ COND_TOOLKIT_OSX_COCOA_USE_GUI_1="" -+ fi -+ -+ COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#" -+ if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then -+ COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="" -+ fi -+ -+ COND_TOOLKIT_OSX_COCOA_WXUNIV_0="#" -+ if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$WXUNIV" = "x0" ; then -+ COND_TOOLKIT_OSX_COCOA_WXUNIV_0="" -+ fi -+ -+ COND_TOOLKIT_OSX_IPHONE="#" -+ if test "x$TOOLKIT" = "xOSX_IPHONE" ; then -+ COND_TOOLKIT_OSX_IPHONE="" -+ fi -+ -+ COND_TOOLKIT_OSX_IPHONE_USE_GUI_1="#" -+ if test "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" ; then -+ COND_TOOLKIT_OSX_IPHONE_USE_GUI_1="" -+ fi -+ -+ COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0="#" -+ if test "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then -+ COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0="" -+ fi -+ -+ COND_TOOLKIT_QT="#" -+ if test "x$TOOLKIT" = "xQT" ; then -+ COND_TOOLKIT_QT="" -+ fi -+ -+ COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="#" -+ if test "x$TOOLKIT" = "xQT" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then -+ COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="" -+ fi -+ -+ COND_TOOLKIT_X11="#" -+ if test "x$TOOLKIT" = "xX11" ; then -+ COND_TOOLKIT_X11="" -+ fi -+ -+ COND_TOOLKIT_X11_USE_GUI_1="#" -+ if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" ; then -+ COND_TOOLKIT_X11_USE_GUI_1="" -+ fi -+ -+ COND_UNICODE_1="#" -+ if test "x$UNICODE" = "x1" ; then -+ COND_UNICODE_1="" -+ fi -+ -+ COND_USE_CAIRO_1="#" -+ if test "x$USE_CAIRO" = "x1" ; then -+ COND_USE_CAIRO_1="" -+ fi -+ -+ COND_USE_EXCEPTIONS_0="#" -+ if test "x$USE_EXCEPTIONS" = "x0" ; then -+ COND_USE_EXCEPTIONS_0="" -+ fi -+ -+ COND_USE_EXCEPTIONS_1="#" -+ if test "x$USE_EXCEPTIONS" = "x1" ; then -+ COND_USE_EXCEPTIONS_1="" -+ fi -+ -+ COND_USE_GUI_0="#" -+ if test "x$USE_GUI" = "x0" ; then -+ COND_USE_GUI_0="" -+ fi -+ -+ COND_USE_GUI_1="#" -+ if test "x$USE_GUI" = "x1" ; then -+ COND_USE_GUI_1="" -+ fi -+ -+ COND_USE_GUI_1_USE_OPENGL_1="#" -+ if test "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then -+ COND_USE_GUI_1_USE_OPENGL_1="" -+ fi -+ -+ COND_USE_GUI_1_WXUNIV_0="#" -+ if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then -+ COND_USE_GUI_1_WXUNIV_0="" -+ fi -+ -+ COND_USE_GUI_1_WXUNIV_1="#" -+ if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then -+ COND_USE_GUI_1_WXUNIV_1="" -+ fi -+ -+ COND_USE_GUI_1_wxUSE_LIBJPEG_builtin="#" -+ if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then -+ COND_USE_GUI_1_wxUSE_LIBJPEG_builtin="" -+ fi -+ -+ COND_USE_GUI_1_wxUSE_LIBPNG_builtin="#" -+ if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then -+ COND_USE_GUI_1_wxUSE_LIBPNG_builtin="" -+ fi -+ -+ COND_USE_GUI_1_wxUSE_LIBTIFF_builtin="#" -+ if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then -+ COND_USE_GUI_1_wxUSE_LIBTIFF_builtin="" -+ fi -+ -+ COND_USE_OPENGL_1="#" -+ if test "x$USE_OPENGL" = "x1" ; then -+ COND_USE_OPENGL_1="" -+ fi -+ -+ COND_USE_PCH_1="#" -+ if test "x$USE_PCH" = "x1" ; then -+ COND_USE_PCH_1="" -+ fi -+ -+ COND_USE_PLUGINS_0="#" -+ if test "x$USE_PLUGINS" = "x0" ; then -+ COND_USE_PLUGINS_0="" -+ fi -+ -+ COND_USE_RTTI_0="#" -+ if test "x$USE_RTTI" = "x0" ; then -+ COND_USE_RTTI_0="" -+ fi -+ -+ COND_USE_RTTI_1="#" -+ if test "x$USE_RTTI" = "x1" ; then -+ COND_USE_RTTI_1="" -+ fi -+ -+ COND_USE_SOTWOSYMLINKS_1="#" -+ if test "x$USE_SOTWOSYMLINKS" = "x1" ; then -+ COND_USE_SOTWOSYMLINKS_1="" -+ fi -+ -+ COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1="#" -+ if test "x$USE_SOVERCYGWIN" = "x1" -a "x$USE_SOVERSION" = "x1" ; then -+ COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1="" -+ fi -+ -+ COND_USE_SOVERLINUX_1="#" -+ if test "x$USE_SOVERLINUX" = "x1" ; then -+ COND_USE_SOVERLINUX_1="" -+ fi -+ -+ COND_USE_SOVERSION_0="#" -+ if test "x$USE_SOVERSION" = "x0" ; then -+ COND_USE_SOVERSION_0="" -+ fi -+ -+ COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1="#" -+ if test "x$USE_SOVERSION" = "x1" -a "x$USE_SOVERSOLARIS" = "x1" ; then -+ COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1="" -+ fi -+ -+ COND_USE_SOVERSOLARIS_1="#" -+ if test "x$USE_SOVERSOLARIS" = "x1" ; then -+ COND_USE_SOVERSOLARIS_1="" -+ fi -+ -+ COND_USE_STC_1="#" -+ if test "x$USE_STC" = "x1" ; then -+ COND_USE_STC_1="" -+ fi -+ -+ COND_USE_THREADS_0="#" -+ if test "x$USE_THREADS" = "x0" ; then -+ COND_USE_THREADS_0="" -+ fi -+ -+ COND_USE_THREADS_1="#" -+ if test "x$USE_THREADS" = "x1" ; then -+ COND_USE_THREADS_1="" -+ fi -+ -+ COND_USE_WEBVIEW_WEBKIT2_1="#" -+ if test "x$USE_WEBVIEW_WEBKIT2" = "x1" ; then -+ COND_USE_WEBVIEW_WEBKIT2_1="" -+ fi -+ -+ COND_USE_XML_1="#" -+ if test "x$USE_XML" = "x1" ; then -+ COND_USE_XML_1="" -+ fi -+ -+ COND_USE_XRC_1="#" -+ if test "x$USE_XRC" = "x1" ; then -+ COND_USE_XRC_1="" -+ fi -+ -+ COND_WINDOWS_IMPLIB_1="#" -+ if test "x$WINDOWS_IMPLIB" = "x1" ; then -+ COND_WINDOWS_IMPLIB_1="" -+ fi -+ -+ COND_WITH_PLUGIN_SDL_1="#" -+ if test "x$WITH_PLUGIN_SDL" = "x1" ; then -+ COND_WITH_PLUGIN_SDL_1="" -+ fi -+ -+ COND_WXUNIV_1="#" -+ if test "x$WXUNIV" = "x1" ; then -+ COND_WXUNIV_1="" -+ fi -+ -+ COND_wxUSE_EXPAT_builtin="#" -+ if test "x$wxUSE_EXPAT" = "xbuiltin" ; then -+ COND_wxUSE_EXPAT_builtin="" -+ fi -+ -+ COND_wxUSE_LIBJPEG_builtin="#" -+ if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then -+ COND_wxUSE_LIBJPEG_builtin="" -+ fi -+ -+ COND_wxUSE_LIBPNG_builtin="#" -+ if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then -+ COND_wxUSE_LIBPNG_builtin="" -+ fi -+ -+ COND_wxUSE_LIBTIFF_builtin="#" -+ if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then -+ COND_wxUSE_LIBTIFF_builtin="" -+ fi -+ -+ COND_wxUSE_REGEX_builtin="#" -+ if test "x$wxUSE_REGEX" = "xbuiltin" ; then -+ COND_wxUSE_REGEX_builtin="" -+ fi -+ -+ COND_wxUSE_ZLIB_builtin="#" -+ if test "x$wxUSE_ZLIB" = "xbuiltin" ; then -+ COND_wxUSE_ZLIB_builtin="" -+ fi -+ -+ -+ -+ if test "$BAKEFILE_AUTOCONF_INC_M4_VERSION" = "" ; then -+ as_fn_error $? "No version found in autoconf_inc.m4 - bakefile macro was changed to take additional argument, perhaps configure.in wasn't updated (see the documentation)?" "$LINENO" 5 -+ fi -+ -+ if test "$BAKEFILE_BAKEFILE_M4_VERSION" != "$BAKEFILE_AUTOCONF_INC_M4_VERSION" ; then -+ as_fn_error $? "Versions of Bakefile used to generate makefiles ($BAKEFILE_AUTOCONF_INC_M4_VERSION) and configure ($BAKEFILE_BAKEFILE_M4_VERSION) do not match." "$LINENO" 5 -+ fi -+ -+ -+case ${INSTALL} in -+ /* ) # Absolute -+ ;; -+ ?:* ) # Drive letter, considered as absolute. -+ ;; -+ *) -+ INSTALL=`pwd`/${INSTALL} ;; -+esac -+ -+if test "$wxUSE_GUI" = "yes"; then -+ -+if test "$wxUSE_MSW" = 1 ; then -+ if test "x$WINDRES" = "x"; then -+ as_fn_error $? "Required windres program not found" "$LINENO" 5 -+ fi -+ -+ RESCOMP="$WINDRES" -+fi -+ -+fi -+ -+ -+if test $GCC_PCH = 1 -+then -+ # Our WX_PRECOMP flag does not make sense for any language except C++ because -+ # the headers that benefit from precompilation are mostly C++ headers. -+ CXXFLAGS="-DWX_PRECOMP $CXXFLAGS" -+ # When Bakefile can do multi-language PCH (e.g. C++ and Objective-C++) enable this: -+ #OBJCXXFLAGS="-DWX_PRECOMP $CXXFLAGS" -+fi -+ -+if test "$wxUSE_PIC" = "yes" ; then -+ if test "$wxUSE_SHARED" = "no" ; then -+ CFLAGS="$CFLAGS $PIC_FLAG" -+ CXXFLAGS="$CXXFLAGS $PIC_FLAG" -+ fi -+ SAMPLES_CXXFLAGS="$SAMPLES_CXXFLAGS $PIC_FLAG" -+fi -+ -+ -+if test "$DEPS_TRACKING" = 1 -a "$wxUSE_MAC" = 1 ; then -+ if test "x$wxUSE_UNIVERSAL_BINARY" != "xno" ; then -+ if test "x$disable_macosx_deps" = "xyes"; then -+ sed "s/DEPSMODE=gcc/DEPSMODE=none/" < bk-deps > temp -+ mv temp bk-deps -+ chmod +x bk-deps -+ fi -+ fi -+fi -+ -+WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $TOOLCHAIN_DEFS" -+ -+ -+case "${host}" in -+ *-*-solaris2* ) -+ if test "$GCC" = yes; then -+ CPPFLAGS=`echo $CPPFLAGS | sed 's/-mt//g'` -+ LIBS=`echo $LIBS | sed 's/-mt//g'` -+ EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-mt//g'` -+ fi -+ ;; -+ -+ *-*-linux* ) -+ if test "x$SUNCXX" = xyes; then -+ CPPFLAGS=`echo $CPPFLAGS | sed 's/-pthread//g'` -+ LIBS=`echo $LIBS | sed 's/-pthread//g'` -+ EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-pthread//g'` -+ fi -+ ;; -+esac -+ -+dedup_flags() -+{ -+ printf "%s " "$@" | -+ awk 'BEGIN { RS=" "; ORS=" " } -+ { -+ if ($0=="") next -+ if ($0=="-arch" || $0=="-framework") { x=$0; next } -+ if (x!="") x=x " " $0; else x=$0; if (!seen[x]++) print x; x="" -+ }' -+} -+ -+WX_CPPFLAGS=`dedup_flags "$CPPFLAGS"` -+WX_CFLAGS=`dedup_flags "$CFLAGS"` -+WX_CXXFLAGS=`dedup_flags "$CXXFLAGS"` -+WX_LDFLAGS=`dedup_flags "$LDFLAGS"` -+ -+CPPFLAGS=$USER_CPPFLAGS -+CFLAGS=$USER_CFLAGS -+CXXFLAGS=$USER_CXXFLAGS -+LDFLAGS=$USER_LDFLAGS -+ -+WX_CFLAGS="$WX_CFLAGS $CFLAGS_VISIBILITY" -+WX_CXXFLAGS="$WX_CXXFLAGS $CXXFLAGS_VISIBILITY" -+OBJCFLAGS="$OBJCFLAGS $CFLAGS_VISIBILITY" -+OBJCXXFLAGS="$OBJCXXFLAGS $CXXFLAGS_VISIBILITY" -+ -+SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`" -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ 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=`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 case e in #( -+ e) cat >conftest.make <<\_ACEOF -+SHELL = /bin/sh -+all: -+ @echo '@@@%%%=$(MAKE)=@@@%%%' -+_ACEOF -+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. -+case `${MAKE-make} -f conftest.make 2>/dev/null` in -+ *@@@%%%=?*=@@@%%%*) -+ eval ac_cv_prog_make_${ac_make}_set=yes;; -+ *) -+ eval ac_cv_prog_make_${ac_make}_set=no;; -+esac -+rm -f conftest.make ;; -+esac -+fi -+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ SET_MAKE= -+else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ SET_MAKE="MAKE=${MAKE-make}" -+fi -+ -+ -+ -+ac_config_headers="$ac_config_headers lib/wx/include/${TOOLCHAIN_FULLNAME}/wx/setup.h:setup.h.in" -+ -+ -+if test "$USE_WIN32" = 1; then -+ ac_config_commands="$ac_config_commands rcdefs.h" -+ -+fi -+ -+ac_config_files="$ac_config_files lib/wx/config/${TOOLCHAIN_FULLNAME}:wx-config.in" -+ -+ -+ac_config_files="$ac_config_files lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}:wx-config-inplace.in" -+ -+ -+ac_config_files="$ac_config_files utils/ifacecheck/rungccxml.sh" -+ -+ -+if test "$wx_cv_version_script" = "yes"; then -+ ac_config_files="$ac_config_files version-script" -+ -+fi -+ac_config_files="$ac_config_files Makefile" -+ -+ -+ac_config_commands="$ac_config_commands wx-config" -+ -+ -+ -+if test "$wxWITH_SUBDIRS" != "no"; then -+if test "$wxUSE_GUI" = "yes"; then -+ SUBDIRS="samples demos utils" -+else -+ SUBDIRS="samples utils" -+fi -+ -+if test "$wxUSE_TESTS_SUBDIR" != "no"; then -+ SUBDIRS="$SUBDIRS tests" -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether catch.hpp file exists" >&5 -+printf %s "checking whether catch.hpp file exists... " >&6; } -+ if ! test -f "$srcdir/3rdparty/catch/include/catch.hpp" ; then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+ as_fn_error $? " -+ CATCH (C++ Automated Test Cases in Headers) is required, the required file -+ $srcdir/3rdparty/catch/include/catch.hpp couldn't be found. -+ -+ You might need to run -+ -+ git submodule update --init 3rdparty/catch -+ -+ to fix this." "$LINENO" 5 -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+ fi -+fi -+ -+for subdir in $SUBDIRS; do -+ if test -d ${srcdir}/${subdir} ; then -+ if test "$wxUSE_GUI" = "yes"; then -+ if test ${subdir} = "samples"; then -+ makefiles="samples/Makefile.in $makefiles" -+ for sample in $SAMPLES_SUBDIRS; do -+ if test -d $srcdir/samples/$sample; then -+ makefiles="samples/$sample/Makefile.in $makefiles" -+ fi -+ done -+ -+ for subtree in $SAMPLES_SUBTREES; do -+ makefiles="samples/$subtree/Makefile.in $makefiles" -+ done -+ else -+ makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)` -+ fi -+ else -+ if test ${subdir} = "samples"; then -+ makefiles="samples/Makefile.in $makefiles" -+ for sample in `echo $SAMPLES_SUBDIRS`; do -+ if test -d $srcdir/samples/$sample; then -+ makefiles="samples/$sample/Makefile.in $makefiles" -+ fi -+ done -+ elif test ${subdir} = "utils"; then -+ makefiles="" -+ for util in ifacecheck wxrc ; do -+ if test -d $srcdir/utils/$util ; then -+ if test -f $srcdir/utils/$util/src/Makefile.in; then -+ makefiles="utils/$util/src/Makefile.in \ -+ $makefiles" -+ else -+ makefiles="utils/$util/Makefile.in $makefiles" -+ fi -+ fi -+ done -+ else -+ makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)` -+ fi -+ fi -+ -+ for mkin in $makefiles ; do -+ mk=`echo $mkin | sed 's/Makefile\.in/Makefile/g'` -+ ac_config_files="$ac_config_files $mk" -+ -+ done -+ fi -+done -+fi -+cat >confcache <<\_ACEOF -+# This file is a shell script that caches the results of configure -+# tests run on this system so they can be shared between configure -+# scripts and configure runs, see configure's option --config-cache. -+# It is not useful on other systems. If it contains results you don't -+# want to keep, you may remove or edit it. -+# -+# config.status only pays attention to the cache file if you give it -+# the --recheck option to rerun configure. -+# -+# 'ac_cv_env_foo' variables (set or unset) will be overridden when -+# loading this file, other *unset* 'ac_cv_foo' will be assigned the -+# following values. -+ -+_ACEOF -+ -+# The following way of writing the cache mishandles newlines in values, -+# but we know of no workaround that is simple, portable, and efficient. -+# So, we kill variables containing newlines. -+# Ultrix sh set writes to stderr and can't be redirected directly, -+# and sets the high bit in the cache file unless we assign to the vars. -+( -+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_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) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done -+ -+ (set) 2>&1 | -+ case $as_nl`(ac_space=' '; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) -+ # 'set' does not quote correctly, so add quotes: double-quote -+ # substitution turns \\\\ into \\, and sed turns \\ into \. -+ sed -n \ -+ "s/'/'\\\\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -+ ;; #( -+ *) -+ # 'set' quotes correctly as required by POSIX, so do not add quotes. -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" -+ ;; -+ esac | -+ sort -+) | -+ sed ' -+ /^ac_cv_env_/b end -+ t clear -+ :clear -+ 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 -+ { 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 -+ case $cache_file in #( -+ */* | ?:*) -+ mv -f confcache "$cache_file"$$ && -+ mv -f "$cache_file"$$ "$cache_file" ;; #( -+ *) -+ mv -f confcache "$cache_file" ;; -+ esac -+ fi -+ fi -+ else -+ { 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 -+ -+test "x$prefix" = xNONE && prefix=$ac_default_prefix -+# Let make expand exec_prefix. -+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -+ -+DEFS=-DHAVE_CONFIG_H -+ -+ac_libobjs= -+ac_ltlibobjs= -+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=`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" -+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' -+done -+LIBOBJS=$ac_libobjs -+ -+LTLIBOBJS=$ac_ltlibobjs -+ -+ -+ ax_dir="3rdparty/pcre" -+ -+ # Convert the path to the subdirectory into a shell variable name. -+ ax_var=$(printf "$ax_dir" | tr -c "0-9a-zA-Z_" "_") -+ ax_configure_ax_var=$(eval "echo \"\$ax_sub_configure_$ax_var\"") -+ if test "$no_recursion" != "yes" -a "x$ax_configure_ax_var" = "xyes"; then -+ subdirs_extra="$subdirs_extra $ax_dir" -+ -+ ax_msg="=== configuring in $ax_dir ($(pwd)/$ax_dir)" -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ax_msg" >&5 -+ printf "%s\n" "$ax_msg" >&6 -+ as_dir="$ax_dir"; as_fn_mkdir_p -+ ac_builddir=. -+ -+case "$ax_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`printf "%s\n" "$ax_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ 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/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix -+ -+case $srcdir in -+ .) # We are building in place. -+ ac_srcdir=. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. -+ ac_srcdir=$srcdir$ac_dir_suffix; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -+esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -+ -+ -+ ax_popdir=$(pwd) -+ cd "$ax_dir" -+ -+ # Check for guested configure; otherwise get Cygnus style configure. -+ if test -f "$ac_srcdir/configure.gnu"; then -+ ax_sub_configure=$ac_srcdir/configure.gnu -+ elif test -f "$ac_srcdir/configure"; then -+ ax_sub_configure=$ac_srcdir/configure -+ elif test -f "$ac_srcdir/configure.in"; then -+ # This should be Cygnus configure. -+ ax_sub_configure=$ac_aux_dir/configure -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ax_dir" >&5 -+printf "%s\n" "$as_me: WARNING: no configuration information is in $ax_dir" >&2;} -+ ax_sub_configure= -+ fi -+ -+ if test -n "$ax_sub_configure"; then -+ # Get the configure arguments for the current configure. -+ eval "ax_sub_configure_args=\"\$ax_sub_configure_args_${ax_var}\"" -+ -+ # Always prepend --prefix to ensure using the same prefix -+ # in subdir configurations. -+ ax_arg="--prefix=$prefix" -+ case $ax_arg in -+ *\'*) ax_arg=$(printf "%s\n" "$ax_arg" | sed "s/'/'\\\\\\\\''/g");; -+ esac -+ ax_sub_configure_args="'$ax_arg' $ax_sub_configure_args" -+ if test "$silent" = yes; then -+ ax_sub_configure_args="--silent $ax_sub_configure_args" -+ fi -+ # Make the cache file name correct relative to the subdirectory. -+ case $cache_file in -+ [\\/]* | ?:[\\/]* ) -+ ax_sub_cache_file=$cache_file ;; -+ *) # Relative name. -+ ax_sub_cache_file=$ac_top_build_prefix$cache_file ;; -+ esac -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ac_sub_cache_file" >&5 -+printf "%s\n" "$as_me: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ac_sub_cache_file" >&6;} -+ eval "\$SHELL \"$ax_sub_configure\" $ax_sub_configure_args --cache-file=\"$ax_sub_cache_file\"" \ -+ || as_fn_error $? "$ax_sub_configure failed for $ax_dir" "$LINENO" 5 -+ fi -+ -+ cd "$ax_popdir" -+ fi -+ -+ ax_dir="src/tiff" -+ -+ # Convert the path to the subdirectory into a shell variable name. -+ ax_var=$(printf "$ax_dir" | tr -c "0-9a-zA-Z_" "_") -+ ax_configure_ax_var=$(eval "echo \"\$ax_sub_configure_$ax_var\"") -+ if test "$no_recursion" != "yes" -a "x$ax_configure_ax_var" = "xyes"; then -+ subdirs_extra="$subdirs_extra $ax_dir" -+ -+ ax_msg="=== configuring in $ax_dir ($(pwd)/$ax_dir)" -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ax_msg" >&5 -+ printf "%s\n" "$ax_msg" >&6 -+ as_dir="$ax_dir"; as_fn_mkdir_p -+ ac_builddir=. -+ -+case "$ax_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`printf "%s\n" "$ax_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ 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/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix -+ -+case $srcdir in -+ .) # We are building in place. -+ ac_srcdir=. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. -+ ac_srcdir=$srcdir$ac_dir_suffix; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -+esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -+ -+ -+ ax_popdir=$(pwd) -+ cd "$ax_dir" -+ -+ # Check for guested configure; otherwise get Cygnus style configure. -+ if test -f "$ac_srcdir/configure.gnu"; then -+ ax_sub_configure=$ac_srcdir/configure.gnu -+ elif test -f "$ac_srcdir/configure"; then -+ ax_sub_configure=$ac_srcdir/configure -+ elif test -f "$ac_srcdir/configure.in"; then -+ # This should be Cygnus configure. -+ ax_sub_configure=$ac_aux_dir/configure -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ax_dir" >&5 -+printf "%s\n" "$as_me: WARNING: no configuration information is in $ax_dir" >&2;} -+ ax_sub_configure= -+ fi -+ -+ if test -n "$ax_sub_configure"; then -+ # Get the configure arguments for the current configure. -+ eval "ax_sub_configure_args=\"\$ax_sub_configure_args_${ax_var}\"" -+ -+ # Always prepend --prefix to ensure using the same prefix -+ # in subdir configurations. -+ ax_arg="--prefix=$prefix" -+ case $ax_arg in -+ *\'*) ax_arg=$(printf "%s\n" "$ax_arg" | sed "s/'/'\\\\\\\\''/g");; -+ esac -+ ax_sub_configure_args="'$ax_arg' $ax_sub_configure_args" -+ if test "$silent" = yes; then -+ ax_sub_configure_args="--silent $ax_sub_configure_args" -+ fi -+ # Make the cache file name correct relative to the subdirectory. -+ case $cache_file in -+ [\\/]* | ?:[\\/]* ) -+ ax_sub_cache_file=$cache_file ;; -+ *) # Relative name. -+ ax_sub_cache_file=$ac_top_build_prefix$cache_file ;; -+ esac -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ac_sub_cache_file" >&5 -+printf "%s\n" "$as_me: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ac_sub_cache_file" >&6;} -+ eval "\$SHELL \"$ax_sub_configure\" $ax_sub_configure_args --cache-file=\"$ax_sub_cache_file\"" \ -+ || as_fn_error $? "$ax_sub_configure failed for $ax_dir" "$LINENO" 5 -+ fi -+ -+ cd "$ax_popdir" -+ fi -+ -+ -+: "${CONFIG_STATUS=./config.status}" -+ac_write_fail=0 -+ac_clean_files_save=$ac_clean_files -+ac_clean_files="$ac_clean_files $CONFIG_STATUS" -+{ 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 -+# Generated by $as_me. -+# Run this file to recreate the current configuration. -+# Compiler output produced by configure, useful for debugging -+# configure, is in config.log if it exists. -+ -+debug=false -+ac_cs_recheck=false -+ac_cs_silent=false -+ -+SHELL=\${CONFIG_SHELL-$SHELL} -+export SHELL -+_ASEOF -+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## -+ -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test ${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 case e in #( -+ e) case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac ;; -+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 -+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 ${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 || -+ PATH_SEPARATOR=';' -+ } -+fi -+ -+ -+# Find who we are. Look in the path if we contain no directory separator. -+as_myself= -+case $0 in #(( -+ *[\\/]* ) as_myself=$0 ;; -+ *) 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 -+ test -r "$as_dir$0" && as_myself=$as_dir$0 && break -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as 'sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ exit 1 -+fi -+ -+ -+ -+# as_fn_error STATUS ERROR [LINENO LOG_FD] -+# ---------------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with STATUS, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$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 -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 -+ fi -+ 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. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status -+ -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset -+ -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null -+then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else case e in #( -+ e) as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } ;; -+esac -+fi # as_fn_append -+ -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null -+then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else case e in #( -+ e) as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } ;; -+esac -+fi # as_fn_arith -+ -+ -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then -+ as_basename=basename -+else -+ as_basename=false -+fi -+ -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi -+ -+as_me=`$as_basename -- "$0" || -+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+printf "%s\n" X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ -+ -+# 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*) -+ case `echo 'xy\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; -+ esac;; -+*) -+ 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 -+else -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null -+fi -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. -+ # In both cases, we have to default to 'cp -pR'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -pR' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -pR' -+ fi -+else -+ as_ln_s='cp -pR' -+fi -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null -+ -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ -+ -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+printf "%s\n" X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -+ -+ -+} # as_fn_mkdir_p -+if mkdir -p . 2>/dev/null; then -+ as_mkdir_p='mkdir -p "$as_dir"' -+else -+ test -d ./-p && rmdir ./-p -+ as_mkdir_p=false -+fi -+ -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p -+ -+# Sed expression to map a string onto a valid CPP name. -+as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -+as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated -+ -+# Sed expression to map a string onto a valid variable name. -+as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -+as_tr_sh="eval sed '$as_sed_sh'" # deprecated -+ -+ -+exec 6>&1 -+## ----------------------------------- ## -+## Main body of $CONFIG_STATUS script. ## -+## ----------------------------------- ## -+_ASEOF -+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# Save the log message, to keep $0 and so on meaningful, and to -+# report actual input values of CONFIG_FILES etc. instead of their -+# values after options handling. -+ac_log=" -+This file was extended by wxWidgets $as_me 3.2.6, which was -+generated by GNU Autoconf 2.72. Invocation command line was -+ -+ CONFIG_FILES = $CONFIG_FILES -+ CONFIG_HEADERS = $CONFIG_HEADERS -+ CONFIG_LINKS = $CONFIG_LINKS -+ CONFIG_COMMANDS = $CONFIG_COMMANDS -+ $ $0 $@ -+ -+on `(hostname || uname -n) 2>/dev/null | sed 1q` -+" -+ -+_ACEOF -+ -+case $ac_config_files in *" -+"*) set x $ac_config_files; shift; ac_config_files=$*;; -+esac -+ -+case $ac_config_headers in *" -+"*) set x $ac_config_headers; shift; ac_config_headers=$*;; -+esac -+ -+ -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+# Files that config.status was made for. -+config_files="$ac_config_files" -+config_headers="$ac_config_headers" -+config_commands="$ac_config_commands" -+ -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+ac_cs_usage="\ -+'$as_me' instantiates files and other configuration actions -+from templates according to the current configuration. Unless the files -+and actions are specified as TAGs, all are instantiated by default. -+ -+Usage: $0 [OPTION]... [TAG]... -+ -+ -h, --help print this help, then exit -+ -V, --version print version number and configuration settings, then exit -+ --config print configuration, then exit -+ -q, --quiet, --silent -+ do not print progress messages -+ -d, --debug don't remove temporary files -+ --recheck update $as_me by reconfiguring in the same conditions -+ --file=FILE[:TEMPLATE] -+ instantiate the configuration file FILE -+ --header=FILE[:TEMPLATE] -+ instantiate the configuration header FILE -+ -+Configuration files: -+$config_files -+ -+Configuration headers: -+$config_headers -+ -+Configuration commands: -+$config_commands -+ -+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='$ac_cs_config_escaped' -+ac_cs_version="\\ -+wxWidgets config.status 3.2.6 -+configured by $0, generated by GNU Autoconf 2.72, -+ with options \\"\$ac_cs_config\\" -+ -+Copyright (C) 2023 Free Software Foundation, Inc. -+This config.status script is free software; the Free Software Foundation -+gives unlimited permission to copy, distribute and modify it." -+ -+ac_pwd='$ac_pwd' -+srcdir='$srcdir' -+INSTALL='$INSTALL' -+test -n "\$AWK" || AWK=awk -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# The default lists apply if the user does not specify any file. -+ac_need_defaults=: -+while test $# != 0 -+do -+ case $1 in -+ --*=?*) -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` -+ ac_shift=: -+ ;; -+ --*=) -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg= -+ ac_shift=: -+ ;; -+ *) -+ ac_option=$1 -+ ac_optarg=$2 -+ ac_shift=shift -+ ;; -+ esac -+ -+ case $ac_option in -+ # Handling of the options. -+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ ac_cs_recheck=: ;; -+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) -+ printf "%s\n" "$ac_cs_version"; exit ;; -+ --config | --confi | --conf | --con | --co | --c ) -+ 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=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ '') as_fn_error $? "missing file argument" ;; -+ esac -+ as_fn_append CONFIG_FILES " '$ac_optarg'" -+ ac_need_defaults=false;; -+ --header | --heade | --head | --hea ) -+ $ac_shift -+ case $ac_optarg in -+ *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ as_fn_append CONFIG_HEADERS " '$ac_optarg'" -+ ac_need_defaults=false;; -+ --he | --h) -+ # Conflict between --help and --header -+ as_fn_error $? "ambiguous option: '$1' -+Try '$0 --help' for more information.";; -+ --help | --hel | -h ) -+ printf "%s\n" "$ac_cs_usage"; exit ;; -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil | --si | --s) -+ ac_cs_silent=: ;; -+ -+ # This is an error. -+ -*) as_fn_error $? "unrecognized option: '$1' -+Try '$0 --help' for more information." ;; -+ -+ *) as_fn_append ac_config_targets " $1" -+ ac_need_defaults=false ;; -+ -+ esac -+ shift -+done -+ -+ac_configure_extra_args= -+ -+if $ac_cs_silent; then -+ exec 6>/dev/null -+ ac_configure_extra_args="$ac_configure_extra_args --silent" -+fi -+ -+_ACEOF -+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 -+ \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 -+ CONFIG_SHELL='$SHELL' -+ export CONFIG_SHELL -+ exec "\$@" -+fi -+ -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+exec 5>>config.log -+{ -+ echo -+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -+## Running $as_me. ## -+_ASBOX -+ printf "%s\n" "$ac_log" -+} >&5 -+ -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+# -+# INIT-COMMANDS -+# -+ -+ CPP="$CPP" -+ infile="$srcdir/include/wx/msw/genrcdefs.h" -+ outdir="lib/wx/include/$TOOLCHAIN_FULLNAME/wx/msw" -+ -+ -+ TOOLCHAIN_FULLNAME="${TOOLCHAIN_FULLNAME}" -+ TOOLCHAIN_FULLNAME="${TOOLCHAIN_FULLNAME}" -+ TOOLCHAIN_FULLNAME="${TOOLCHAIN_FULLNAME}" -+ LN_S="${LN_S}" -+ -+ -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+ -+# Handling of arguments. -+for ac_config_target in $ac_config_targets -+do -+ case $ac_config_target in -+ "lib/wx/include/${TOOLCHAIN_FULLNAME}/wx/setup.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/wx/include/${TOOLCHAIN_FULLNAME}/wx/setup.h:setup.h.in" ;; -+ "rcdefs.h") CONFIG_COMMANDS="$CONFIG_COMMANDS rcdefs.h" ;; -+ "lib/wx/config/${TOOLCHAIN_FULLNAME}") CONFIG_FILES="$CONFIG_FILES lib/wx/config/${TOOLCHAIN_FULLNAME}:wx-config.in" ;; -+ "lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}") CONFIG_FILES="$CONFIG_FILES lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}:wx-config-inplace.in" ;; -+ "utils/ifacecheck/rungccxml.sh") CONFIG_FILES="$CONFIG_FILES utils/ifacecheck/rungccxml.sh" ;; -+ "version-script") CONFIG_FILES="$CONFIG_FILES version-script" ;; -+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -+ "wx-config") CONFIG_COMMANDS="$CONFIG_COMMANDS wx-config" ;; -+ "$mk") CONFIG_FILES="$CONFIG_FILES $mk" ;; -+ -+ *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;; -+ esac -+done -+ -+ -+# If the user did not use the arguments to specify the items to instantiate, -+# then the envvar interface is used. Set only those that are not. -+# 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+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 -+# simply because there is no reason against having it here, and in addition, -+# creating and moving files from /tmp can sometimes cause problems. -+# Hook for its removal unless debugging. -+# Note that there is a small window in which the directory will not be cleaned: -+# after its creation but before its name has been assigned to '$tmp'. -+$debug || -+{ -+ tmp= ac_tmp= -+ trap 'exit_status=$? -+ : "${ac_tmp:=$tmp}" -+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status -+' 0 -+ trap 'as_fn_exit 1' 1 2 13 15 -+} -+# Create a (secure) tmp directory for tmp files. -+ -+{ -+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && -+ test -d "$tmp" -+} || -+{ -+ tmp=./conf$$-$RANDOM -+ (umask 077 && mkdir "$tmp") -+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -+ac_tmp=$tmp -+ -+# Set up the scripts for CONFIG_FILES section. -+# No need to generate them if there are no CONFIG_FILES. -+# This happens for instance with './config.status config.h'. -+if test -n "$CONFIG_FILES"; then -+ -+ -+ac_cr=`echo X | tr X '\015'` -+# On cygwin, bash can eat \r inside `` if the user requested igncr. -+# But we know of no other shell where ac_cr would be empty at this -+# point, so we can use a bashism as a fallback. -+if test "x$ac_cr" = x; then -+ eval ac_cr=\$\'\\r\' -+fi -+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then -+ ac_cs_awk_cr='\\r' -+else -+ ac_cs_awk_cr=$ac_cr -+fi -+ -+echo 'BEGIN {' >"$ac_tmp/subs1.awk" && -+_ACEOF -+ -+ -+{ -+ echo "cat >conf$$subs.awk <<_ACEOF" && -+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && -+ echo "_ACEOF" -+} >conf$$subs.sh || -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ . ./conf$$subs.sh || -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ -+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` -+ if test $ac_delim_n = $ac_delim_num; then -+ break -+ elif $ac_last_try; then -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -+ fi -+done -+rm -f conf$$subs.sh -+ -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && -+_ACEOF -+sed -n ' -+h -+s/^/S["/; s/!.*/"]=/ -+p -+g -+s/^[^!]*!// -+:repl -+t repl -+s/'"$ac_delim"'$// -+t delim -+:nl -+h -+s/\(.\{148\}\)..*/\1/ -+t more1 -+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -+p -+n -+b repl -+:more1 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t nl -+:delim -+h -+s/\(.\{148\}\)..*/\1/ -+t more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"/ -+p -+b -+:more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t delim -+' >$CONFIG_STATUS || ac_write_fail=1 -+rm -f conf$$subs.awk -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACAWK -+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && -+ for (key in S) S_is_set[key] = 1 -+ FS = "" -+ -+} -+{ -+ line = $ 0 -+ nfields = split(line, field, "@") -+ substed = 0 -+ len = length(field[1]) -+ for (i = 2; i < nfields; i++) { -+ key = field[i] -+ keylen = length(key) -+ if (S_is_set[key]) { -+ value = S[key] -+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) -+ len += length(value) + length(field[++i]) -+ substed = 1 -+ } else -+ len += 1 + keylen -+ } -+ -+ print line -+} -+ -+_ACAWK -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then -+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -+else -+ cat -+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ -+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 -+_ACEOF -+ -+# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and -+# trailing colons and then remove the whole line if VPATH becomes empty -+# (actually we leave an empty line to preserve line numbers). -+if test "x$srcdir" = x.; then -+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -+h -+s/// -+s/^/:/ -+s/[ ]*$/:/ -+s/:\$(srcdir):/:/g -+s/:\${srcdir}:/:/g -+s/:@srcdir@:/:/g -+s/^:*// -+s/:*$// -+x -+s/\(=[ ]*\).*/\1/ -+G -+s/\n// -+s/^[^=]*=[ ]*$// -+}' -+fi -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+fi # test -n "$CONFIG_FILES" -+ -+# Set up the scripts for CONFIG_HEADERS section. -+# No need to generate them if there are no CONFIG_HEADERS. -+# This happens for instance with './config.status Makefile'. -+if test -n "$CONFIG_HEADERS"; then -+cat >"$ac_tmp/defines.awk" <<\_ACAWK || -+BEGIN { -+_ACEOF -+ -+# Transform confdefs.h into an awk script 'defines.awk', embedded as -+# here-document in config.status, that substitutes the proper values into -+# config.h.in to produce config.h. -+ -+# Create a delimiter string that does not exist in confdefs.h, to ease -+# handling of long lines. -+ac_delim='%!_!# ' -+for ac_last_try in false false :; do -+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h` -+ if test -z "$ac_tt"; then -+ break -+ elif $ac_last_try; then -+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -+ fi -+done -+ -+# For the awk script, D is an array of macro values keyed by name, -+# likewise P contains macro parameters if any. Preserve backslash -+# newline sequences. -+ -+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -+sed -n ' -+s/.\{148\}/&'"$ac_delim"'/g -+t rset -+:rset -+s/^[ ]*#[ ]*define[ ][ ]*/ / -+t def -+d -+:def -+s/\\$// -+t bsnl -+s/["\\]/\\&/g -+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -+D["\1"]=" \3"/p -+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p -+d -+:bsnl -+s/["\\]/\\&/g -+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -+D["\1"]=" \3\\\\\\n"\\/p -+t cont -+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p -+t cont -+d -+:cont -+n -+s/.\{148\}/&'"$ac_delim"'/g -+t clear -+:clear -+s/\\$// -+t bsnlc -+s/["\\]/\\&/g; s/^/"/; s/$/"/p -+d -+:bsnlc -+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p -+b cont -+' >$CONFIG_STATUS || ac_write_fail=1 -+ -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ for (key in D) D_is_set[key] = 1 -+ FS = "" -+} -+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { -+ line = \$ 0 -+ split(line, arg, " ") -+ if (arg[1] == "#") { -+ defundef = arg[2] -+ mac1 = arg[3] -+ } else { -+ defundef = substr(arg[1], 2) -+ mac1 = arg[2] -+ } -+ split(mac1, mac2, "(") #) -+ macro = mac2[1] -+ prefix = substr(line, 1, index(line, defundef) - 1) -+ if (D_is_set[macro]) { -+ # Preserve the white space surrounding the "#". -+ print prefix "define", macro P[macro] D[macro] -+ next -+ } else { -+ # Replace #undef with comments. This is necessary, for example, -+ # in the case of _POSIX_SOURCE, which is predefined and required -+ # on some systems where configure will not decide to define it. -+ if (defundef == "undef") { -+ print "/*", prefix defundef, macro, "*/" -+ next -+ } -+ } -+} -+{ print } -+_ACAWK -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 -+fi # test -n "$CONFIG_HEADERS" -+ -+ -+eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" -+shift -+for ac_tag -+do -+ case $ac_tag in -+ :[FHLC]) ac_mode=$ac_tag; continue;; -+ esac -+ case $ac_mode$ac_tag in -+ :[FHL]*:*);; -+ :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;; -+ :[FH]-) ac_tag=-:-;; -+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -+ esac -+ ac_save_IFS=$IFS -+ IFS=: -+ set x $ac_tag -+ IFS=$ac_save_IFS -+ shift -+ ac_file=$1 -+ shift -+ -+ case $ac_mode in -+ :L) ac_source=$1;; -+ :[FH]) -+ ac_file_inputs= -+ for ac_f -+ do -+ case $ac_f in -+ -) ac_f="$ac_tmp/stdin";; -+ *) # Look for the file first in the build tree, then in the source tree -+ # (if the path is not absolute). The absolute path cannot be DOS-style, -+ # because $ac_f cannot contain ':'. -+ test -f "$ac_f" || -+ case $ac_f in -+ [\\/$]*) false;; -+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; -+ esac || -+ as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;; -+ 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 -+ -+ # Let's still pretend it is 'configure' which instantiates (i.e., don't -+ # use $as_me), people would be surprised to read: -+ # /* config.h. Generated by config.status. */ -+ configure_input='Generated from '` -+ printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' -+ `' by configure.' -+ if test x"$ac_file" != x-; then -+ configure_input="$ac_file. $configure_input" -+ { 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=`printf "%s\n" "$configure_input" | -+ sed 's/[\\\\&|]/\\\\&/g'`;; #( -+ *) ac_sed_conf_input=$configure_input;; -+ esac -+ -+ case $ac_tag in -+ *:-:* | *:-) cat >"$ac_tmp/stdin" \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; -+ esac -+ ;; -+ esac -+ -+ ac_dir=`$as_dirname -- "$ac_file" || -+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$ac_file" : 'X\(//\)[^/]' \| \ -+ X"$ac_file" : 'X\(//\)$' \| \ -+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -+printf "%s\n" X"$ac_file" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ as_dir="$ac_dir"; as_fn_mkdir_p -+ ac_builddir=. -+ -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ 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/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix -+ -+case $srcdir in -+ .) # We are building in place. -+ ac_srcdir=. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. -+ ac_srcdir=$srcdir$ac_dir_suffix; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -+esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -+ -+ -+ case $ac_mode in -+ :F) -+ # -+ # CONFIG_FILE -+ # -+ -+ case $INSTALL in -+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; -+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; -+ esac -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# If the template does not know about datarootdir, expand it. -+# FIXME: This hack should be removed a few years after 2.60. -+ac_datarootdir_hack=; ac_datarootdir_seen= -+ac_sed_dataroot=' -+/datarootdir/ { -+ p -+ q -+} -+/@datadir@/p -+/@docdir@/p -+/@infodir@/p -+/@localedir@/p -+/@mandir@/p' -+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -+*datarootdir*) ac_datarootdir_seen=yes;; -+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -+ { 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=' -+ s&@datadir@&$datadir&g -+ s&@docdir@&$docdir&g -+ s&@infodir@&$infodir&g -+ s&@localedir@&$localedir&g -+ s&@mandir@&$mandir&g -+ s&\\\${datarootdir}&$datarootdir&g' ;; -+esac -+_ACEOF -+ -+# Neutralize VPATH when '$srcdir' = '.'. -+# Shell code in configure.ac might set extrasub. -+# FIXME: do we really want to maintain this feature? -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_sed_extra="$ac_vpsub -+$extrasub -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+:t -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -+s|@configure_input@|$ac_sed_conf_input|;t t -+s&@top_builddir@&$ac_top_builddir_sub&;t t -+s&@top_build_prefix@&$ac_top_build_prefix&;t t -+s&@srcdir@&$ac_srcdir&;t t -+s&@abs_srcdir@&$ac_abs_srcdir&;t t -+s&@top_srcdir@&$ac_top_srcdir&;t t -+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -+s&@builddir@&$ac_builddir&;t t -+s&@abs_builddir@&$ac_abs_builddir&;t t -+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -+s&@INSTALL@&$ac_INSTALL&;t t -+$ac_datarootdir_hack -+" -+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ -+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 -+ -+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"; } && -+ { 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 -+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" -+ case $ac_file in -+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; -+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; -+ esac \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 -+ ;; -+ :H) -+ # -+ # CONFIG_HEADER -+ # -+ if test x"$ac_file" != x-; then -+ { -+ 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 -+ { 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 -+ 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 -+ ;; -+ -+ :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 -+ -+ -+ case $ac_file$ac_mode in -+ "rcdefs.h":C) -+ mkdir -p $outdir && -+ $CPP $infile | sed 's/^# *[1-9].*//;s/^ *//;/./,/^$/!d' > $outdir/rcdefs.h -+ ;; -+ "lib/wx/config/${TOOLCHAIN_FULLNAME}":F) chmod +x lib/wx/config/${TOOLCHAIN_FULLNAME} ;; -+ "lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}":F) chmod +x lib/wx/config/inplace-${TOOLCHAIN_FULLNAME} ;; -+ "utils/ifacecheck/rungccxml.sh":F) chmod +x utils/ifacecheck/rungccxml.sh ;; -+ "wx-config":C) rm -f wx-config -+ ${LN_S} lib/wx/config/inplace-${TOOLCHAIN_FULLNAME} wx-config -+ ;; -+ -+ esac -+done # for ac_tag -+ -+ -+as_fn_exit 0 -+_ACEOF -+ac_clean_files=$ac_clean_files_save -+ -+test $ac_write_fail = 0 || -+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 -+ -+ -+# configure is writing to config.log, and then calls config.status. -+# config.status does its own redirection, appending to config.log. -+# Unfortunately, on DOS this fails, as config.log is still kept open -+# by configure, so config.status won't be able to write to it; its -+# output is simply discarded. So we exec the FD to /dev/null, -+# effectively closing config.log, so it can be properly (re)opened and -+# appended to by config.status. When coming back to configure, we -+# need to make the FD available again. -+if test "$no_create" != yes; then -+ ac_cs_success=: -+ ac_config_status_args= -+ test "$silent" = yes && -+ ac_config_status_args="$ac_config_status_args --quiet" -+ exec 5>/dev/null -+ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false -+ exec 5>>config.log -+ # Use ||, not &&, to avoid exiting from the if with $? = 1, which -+ # would make configure fail if this is the last instruction. -+ $ac_cs_success || as_fn_exit 1 -+fi -+ -+# -+# CONFIG_SUBDIRS section. -+# -+if test "$no_recursion" != yes; then -+ -+ # Remove --cache-file, --srcdir, and --disable-option-checking arguments -+ # so they do not pile up. -+ ac_sub_configure_args= -+ ac_prev= -+ eval "set x $ac_configure_args" -+ shift -+ for ac_arg -+ do -+ if test -n "$ac_prev"; then -+ ac_prev= -+ continue -+ fi -+ case $ac_arg in -+ -cache-file | --cache-file | --cache-fil | --cache-fi \ -+ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) -+ ac_prev=cache_file ;; -+ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ -+ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \ -+ | --c=*) -+ ;; -+ --config-cache | -C) -+ ;; -+ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) -+ ac_prev=srcdir ;; -+ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) -+ ;; -+ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) -+ ac_prev=prefix ;; -+ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) -+ ;; -+ --disable-option-checking) -+ ;; -+ *) -+ case $ac_arg in -+ *\'*) ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ as_fn_append ac_sub_configure_args " '$ac_arg'" ;; -+ esac -+ done -+ -+ # Always prepend --prefix to ensure using the same prefix -+ # in subdir configurations. -+ ac_arg="--prefix=$prefix" -+ case $ac_arg in -+ *\'*) ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args" -+ -+ # Pass --silent -+ if test "$silent" = yes; then -+ ac_sub_configure_args="--silent $ac_sub_configure_args" -+ fi -+ -+ # Always prepend --disable-option-checking to silence warnings, since -+ # different subdirs can have different --enable and --with options. -+ ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args" -+ -+ ac_popdir=`pwd` -+ for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue -+ -+ # Do not complain, so a configure script can configure whichever -+ # parts of a large source tree are present. -+ test -d "$srcdir/$ac_dir" || continue -+ -+ ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)" -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5 -+ printf "%s\n" "$ac_msg" >&6 -+ as_dir="$ac_dir"; as_fn_mkdir_p -+ ac_builddir=. -+ -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ 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/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix -+ -+case $srcdir in -+ .) # We are building in place. -+ ac_srcdir=. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. -+ ac_srcdir=$srcdir$ac_dir_suffix; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -+esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -+ -+ -+ cd "$ac_dir" -+ -+ # 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 -+ ac_sub_configure=$ac_srcdir/configure.gnu -+ elif test -f "$ac_srcdir/configure"; then -+ ac_sub_configure=$ac_srcdir/configure -+ else -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5 -+printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} -+ ac_sub_configure= -+ fi -+ -+ # The recursion is here. -+ if test -n "$ac_sub_configure"; then -+ # Make the cache file name correct relative to the subdirectory. -+ case $cache_file in -+ [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;; -+ *) # Relative name. -+ ac_sub_cache_file=$ac_top_build_prefix$cache_file ;; -+ esac -+ -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 -+printf "%s\n" "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} -+ # The eval makes quoting arguments work. -+ eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ -+ --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || -+ as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5 -+ fi -+ -+ cd "$ac_popdir" -+ done -+fi -+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then -+ { 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 -+ -+ -+ -+ -+echo -+echo "Configured wxWidgets ${WX_VERSION} for \`${host}'" -+echo "" -+echo " Which GUI toolkit should wxWidgets use? ${TOOLKIT_DESC}" -+echo " Should wxWidgets be compiled into single library? ${wxUSE_MONOLITHIC:-yes}" -+echo " Should wxWidgets be linked as a shared library? ${wxUSE_SHARED:-no}" -+echo $ECHO_N " Should wxWidgets support Unicode? ${wxUSE_UNICODE:-no}$ECHO_C" -+if test "$wxUSE_UNICODE" = "yes"; then -+ if test "$wxUSE_UNICODE_UTF8" = "yes"; then -+ echo " (using UTF-8)" -+ else -+ echo " (using wchar_t)" -+ fi -+else -+ echo -+fi -+ -+echo " What level of wxWidgets compatibility should be enabled?" -+echo " wxWidgets 2.8 ${WXWIN_COMPATIBILITY_2_8:-no}" -+echo " wxWidgets 3.0 ${WXWIN_COMPATIBILITY_3_0:-yes}" -+ -+echo " Which libraries should wxWidgets use?" -+echo " STL ${wxUSE_STL}" -+echo " jpeg ${wxUSE_LIBJPEG-none}" -+echo " png ${wxUSE_LIBPNG-none}" -+echo " regex ${wxUSE_REGEX}" -+echo " tiff ${wxUSE_LIBTIFF-none}" -+if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then -+echo " xpm ${wxUSE_LIBXPM-none}" -+fi -+echo " lzma ${wxUSE_LIBLZMA}" -+echo " zlib ${wxUSE_ZLIB}" -+echo " expat ${wxUSE_EXPAT}" -+echo " libmspack ${wxUSE_LIBMSPACK}" -+echo " sdl ${wxUSE_LIBSDL}" -+ -+echo "" -+ -+ -diff --git a/include/wx/accel.h b/include/wx/accel.h -index 6011c39c6a..e4fb3ca680 100644 ---- a/include/wx/accel.h -+++ b/include/wx/accel.h -@@ -152,6 +152,8 @@ private: - #include "wx/osx/accel.h" - #elif defined(__WXQT__) - #include "wx/qt/accel.h" -+#elif defined(__WXWASM__) -+ #include "wx/generic/accel.h" - #endif - - extern WXDLLIMPEXP_DATA_CORE(wxAcceleratorTable) wxNullAcceleratorTable; -diff --git a/include/wx/app.h b/include/wx/app.h -index a2ee467636..c41a0e1993 100644 ---- a/include/wx/app.h -+++ b/include/wx/app.h -@@ -759,6 +759,8 @@ protected: - #include "wx/osx/app.h" - #elif defined(__WXQT__) - #include "wx/qt/app.h" -+#elif defined(__WXWASM__) -+ #include "wx/wasm/app.h" - #endif - - #else // !GUI -diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h -index b5960c5397..b66a6c0f71 100644 ---- a/include/wx/bitmap.h -+++ b/include/wx/bitmap.h -@@ -75,7 +75,8 @@ protected: - defined(__WXGTK__) || \ - defined(__WXMOTIF__) || \ - defined(__WXX11__) || \ -- defined(__WXQT__) -+ defined(__WXQT__) || \ -+ defined(__WXWASM__) - #define wxUSE_BITMAP_BASE 1 - #else - #define wxUSE_BITMAP_BASE 0 -@@ -331,6 +332,9 @@ protected: - #elif defined(__WXQT__) - #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_XPM - #include "wx/qt/bitmap.h" -+#elif defined(__WXWASM__) -+ #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_XPM -+ #include "wx/wasm/bitmap.h" - #endif - - #if wxUSE_IMAGE -diff --git a/include/wx/brush.h b/include/wx/brush.h -index 98c204cc8f..4c52fbe0a6 100644 ---- a/include/wx/brush.h -+++ b/include/wx/brush.h -@@ -84,6 +84,8 @@ public: - #include "wx/osx/brush.h" - #elif defined(__WXQT__) - #include "wx/qt/brush.h" -+#elif defined(__WXWASM__) -+ #include "wx/wasm/brush.h" - #endif - - class WXDLLIMPEXP_CORE wxBrushList: public wxGDIObjListBase -diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h -index 2c37937c58..7494378090 100644 ---- a/include/wx/clipbrd.h -+++ b/include/wx/clipbrd.h -@@ -163,6 +163,8 @@ typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&); - #include "wx/osx/clipbrd.h" - #elif defined(__WXQT__) - #include "wx/qt/clipbrd.h" -+#elif defined(__WXWASM__) -+ #include "wx/wasm/clipbrd.h" - #endif - - // ---------------------------------------------------------------------------- -diff --git a/include/wx/colour.h b/include/wx/colour.h -index 7413b28000..a45e951e38 100644 ---- a/include/wx/colour.h -+++ b/include/wx/colour.h -@@ -242,6 +242,8 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxColourBase* col); - #include "wx/osx/colour.h" - #elif defined(__WXQT__) - #include "wx/qt/colour.h" -+#elif defined(__WXWASM__) -+ #include "wx/wasm/colour.h" - #endif - - #define wxColor wxColour -diff --git a/include/wx/config.h b/include/wx/config.h -index 2a28e0715a..f6361b09d1 100644 ---- a/include/wx/config.h -+++ b/include/wx/config.h -@@ -24,6 +24,9 @@ - #if defined(__WINDOWS__) && wxUSE_CONFIG_NATIVE - #include "wx/msw/regconf.h" - #define wxConfig wxRegConfig -+#elif defined(__WXWASM__) && wxUSE_CONFIG_NATIVE -+ #include "wx/wasm/config.h" -+ #define wxConfig wxLocalStorageConfig - #else // either we're under Unix or wish to always use config files - #include "wx/fileconf.h" - #define wxConfig wxFileConfig -diff --git a/include/wx/cursor.h b/include/wx/cursor.h -index df0c57423e..bce5512cb3 100644 ---- a/include/wx/cursor.h -+++ b/include/wx/cursor.h -@@ -70,6 +70,9 @@ public: - #elif defined(__WXQT__) - #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR - #include "wx/qt/cursor.h" -+#elif defined(__WXWASM__) -+ #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR -+ #include "wx/wasm/cursor.h" - #endif - - #include "wx/utils.h" -diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h -index ef0c385df5..2a9c19b0b4 100644 ---- a/include/wx/dataobj.h -+++ b/include/wx/dataobj.h -@@ -87,6 +87,8 @@ public: - #include "wx/osx/dataform.h" - #elif defined(__WXQT__) - #include "wx/qt/dataform.h" -+#elif defined(__WXWASM__) -+ #include "wx/wasm/dataform.h" - #endif - - // the value for default argument to some functions (corresponds to -@@ -173,6 +175,8 @@ public: - #include "wx/osx/dataobj.h" - #elif defined(__WXQT__) - #include "wx/qt/dataobj.h" -+#elif defined(__WXWASM__) -+ #include "wx/wasm/dataobj.h" - #endif - - // ---------------------------------------------------------------------------- -@@ -585,6 +589,8 @@ private: - #include "wx/osx/dataobj2.h" - #elif defined(__WXQT__) - #include "wx/qt/dataobj2.h" -+ #elif defined(__WXWASM__) -+ #include "wx/wasm/dataobj2.h" - #endif - - // wxURLDataObject is simply wxTextDataObject with a different name -diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h -index 8fc23d66cd..1b54ade88e 100644 ---- a/include/wx/dcbuffer.h -+++ b/include/wx/dcbuffer.h -@@ -17,7 +17,7 @@ - - // Split platforms into two groups - those which have well-working - // double-buffering by default, and those which do not. --#if defined(__WXMAC__) || defined(__WXGTK20__) || defined(__WXDFB__) || defined(__WXQT__) -+#if defined(__WXMAC__) || defined(__WXGTK20__) || defined(__WXDFB__) || defined(__WXQT__) || defined(__WXWASM__) - #define wxALWAYS_NATIVE_DOUBLE_BUFFER 1 - #else - #define wxALWAYS_NATIVE_DOUBLE_BUFFER 0 -diff --git a/include/wx/defs.h b/include/wx/defs.h -index 39ce129477..bea156dee9 100644 ---- a/include/wx/defs.h -+++ b/include/wx/defs.h -@@ -57,6 +57,7 @@ - !defined(__WXDFB__) && \ - !defined(__WXX11__) && \ - !defined(__WXQT__) && \ -+ !defined(__WXWASM__) && \ - wxUSE_GUI - # ifdef __UNIX__ - # error "No Target! You should use wx-config program for compilation flags!" -@@ -3223,6 +3224,10 @@ typedef const void* WXWidget; - #include "wx/qt/defs.h" - #endif - -+#ifdef __WXWASM__ -+typedef const void *WXWidget; -+#endif /* __WXWASM__ */ -+ - /* include the feature test macros */ - #include "wx/features.h" - -diff --git a/include/wx/dialog.h b/include/wx/dialog.h -index e56174c5b0..475701dc70 100644 ---- a/include/wx/dialog.h -+++ b/include/wx/dialog.h -@@ -11,6 +11,8 @@ - #ifndef _WX_DIALOG_H_BASE_ - #define _WX_DIALOG_H_BASE_ - -+#include -+ - #include "wx/toplevel.h" - #include "wx/containr.h" - #include "wx/sharedptr.h" -@@ -69,6 +71,7 @@ public: - - // define public wxDialog methods to be implemented by the derived classes - virtual int ShowModal() = 0; -+ virtual void ShowModal(std::function callback) = 0; - virtual void EndModal(int retCode) = 0; - virtual bool IsModal() const = 0; - // show the dialog frame-modally (needs a parent), using app-modal -diff --git a/include/wx/dnd.h b/include/wx/dnd.h -index c43083645b..c6b5daa319 100644 ---- a/include/wx/dnd.h -+++ b/include/wx/dnd.h -@@ -224,6 +224,8 @@ protected: - #include "wx/osx/dnd.h" - #elif defined(__WXQT__) - #include "wx/qt/dnd.h" -+#elif defined(__WXWASM__) -+ #include "wx/wasm/dnd.h" - #endif - - // ---------------------------------------------------------------------------- -diff --git a/include/wx/encinfo.h b/include/wx/encinfo.h -index 176da52e83..742362a28e 100644 ---- a/include/wx/encinfo.h -+++ b/include/wx/encinfo.h -@@ -38,7 +38,8 @@ struct WXDLLIMPEXP_CORE wxNativeEncodingInfo - - #if defined(__WXMSW__) || \ - defined(__WXMAC__) || \ -- defined(__WXQT__) -+ defined(__WXQT__) || \ -+ defined(__WXWASM__) - - wxNativeEncodingInfo() - : facename() -diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h -index 257b7574dc..d622bd3e10 100644 ---- a/include/wx/evtloop.h -+++ b/include/wx/evtloop.h -@@ -298,6 +298,8 @@ private: - #include "wx/gtk/evtloop.h" - #elif defined(__WXQT__) - #include "wx/qt/evtloop.h" -+#elif defined(__WXWASM__) -+ #include "wx/wasm/evtloop.h" - #else // other platform - - #include "wx/stopwatch.h" // for wxMilliClock_t -diff --git a/include/wx/font.h b/include/wx/font.h -index 23f2cdb2d7..05f5a04fbc 100644 ---- a/include/wx/font.h -+++ b/include/wx/font.h -@@ -640,6 +640,8 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font); - #include "wx/osx/font.h" - #elif defined(__WXQT__) - #include "wx/qt/font.h" -+#elif defined(__WXWASM__) -+ #include "wx/wasm/font.h" - #endif - - class WXDLLIMPEXP_CORE wxFontList: public wxGDIObjListBase -diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h -index 30529db8ce..6b56db2470 100644 ---- a/include/wx/fontutil.h -+++ b/include/wx/fontutil.h -@@ -218,6 +218,12 @@ public : - bool strikethrough; - wxString faceName; - wxFontEncoding encoding; -+ -+#if defined(__WXWASM__) -+ mutable bool m_isRendered; -+ mutable wxString m_renderedString; -+#endif -+ - #endif // platforms - - // default ctor (default copy ctor is ok) -diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h -index 2f5f8ee99f..46a5beed65 100644 ---- a/include/wx/gdicmn.h -+++ b/include/wx/gdicmn.h -@@ -137,7 +137,7 @@ enum wxStockCursor - wxCURSOR_BASED_ARROW_DOWN, - #endif // X11 - wxCURSOR_ARROWWAIT, --#ifdef __WXMAC__ -+#if defined(__WXMAC__) || defined(__WXWASM__) - wxCURSOR_OPEN_HAND, - wxCURSOR_CLOSED_HAND, - #endif -@@ -149,7 +149,7 @@ enum wxStockCursor - #define wxCURSOR_DEFAULT wxCURSOR_ARROW - #endif - --#ifndef __WXMAC__ -+#if !defined(__WXMAC__) && !defined(__WXWASM__) - // TODO CS supply openhand and closedhand cursors - #define wxCURSOR_OPEN_HAND wxCURSOR_HAND - #define wxCURSOR_CLOSED_HAND wxCURSOR_HAND -@@ -227,6 +227,9 @@ enum wxEllipsizeMode - #elif defined(__WXQT__) - // Initialize from an included XPM - #define wxICON(X) wxIcon( X##_xpm ) -+#elif defined(__WXWASM__) -+ // Initialize from an included XPM -+ #define wxICON(X) wxIcon( X##_xpm ) - #else - // This will usually mean something on any platform - #define wxICON(X) wxIcon(wxT(#X)) -@@ -242,7 +245,8 @@ enum wxEllipsizeMode - defined(__WXMOTIF__) || \ - defined(__WXX11__) || \ - defined(__WXMAC__) || \ -- defined(__WXDFB__) -+ defined(__WXDFB__) || \ -+ defined(__WXWASM__) - // Initialize from an included XPM - #define wxBITMAP(name) wxBitmap(name##_xpm) - #else // other platforms -diff --git a/include/wx/generic/msgdlgg.h b/include/wx/generic/msgdlgg.h -index e85744a3f6..3828d8cd42 100644 ---- a/include/wx/generic/msgdlgg.h -+++ b/include/wx/generic/msgdlgg.h -@@ -11,6 +11,8 @@ - #ifndef _WX_GENERIC_MSGDLGG_H_ - #define _WX_GENERIC_MSGDLGG_H_ - -+#include -+ - class WXDLLIMPEXP_FWD_CORE wxSizer; - - class WXDLLIMPEXP_CORE wxGenericMessageDialog : public wxMessageDialogBase -@@ -23,6 +25,7 @@ public: - const wxPoint& pos = wxDefaultPosition); - - virtual int ShowModal() wxOVERRIDE; -+ virtual void ShowModal(std::function callback) wxOVERRIDE; - - protected: - // Creates a message dialog taking any options that have been set after -diff --git a/include/wx/icon.h b/include/wx/icon.h -index 27dc369141..52e9c27ca7 100644 ---- a/include/wx/icon.h -+++ b/include/wx/icon.h -@@ -58,6 +58,9 @@ - #elif defined(__WXQT__) - #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM - #include "wx/generic/icon.h" -+#elif defined(__WXWASM__) -+ #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM -+ #include "wx/generic/icon.h" - #endif - - #ifndef wxICON_DIFFERENT_FROM_BITMAP -diff --git a/include/wx/kbdstate.h b/include/wx/kbdstate.h -index 43444269cb..fa8b1ede4d 100644 ---- a/include/wx/kbdstate.h -+++ b/include/wx/kbdstate.h -@@ -28,7 +28,7 @@ public: - m_shiftDown(shiftDown), - m_altDown(altDown), - m_metaDown(metaDown) --#ifdef __WXOSX__ -+#if defined(__WXOSX__) || defined(__WXWASM__) - ,m_rawControlDown(false) - #endif - { -@@ -48,7 +48,7 @@ public: - return (m_controlDown ? wxMOD_CONTROL : 0) | - (m_shiftDown ? wxMOD_SHIFT : 0) | - (m_metaDown ? wxMOD_META : 0) | --#ifdef __WXOSX__ -+#if defined(__WXOSX__) || defined(__WXWASM__) - (m_rawControlDown ? wxMOD_RAW_CONTROL : 0) | - #endif - (m_altDown ? wxMOD_ALT : 0); -@@ -68,7 +68,7 @@ public: - bool ControlDown() const { return m_controlDown; } - bool RawControlDown() const - { --#ifdef __WXOSX__ -+#if defined(__WXOSX__) || defined(__WXWASM__) - return m_rawControlDown; - #else - return m_controlDown; -@@ -94,7 +94,7 @@ public: - void SetControlDown(bool down) { m_controlDown = down; } - void SetRawControlDown(bool down) - { --#ifdef __WXOSX__ -+#if defined(__WXOSX__) || defined(__WXWASM__) - m_rawControlDown = down; - #else - m_controlDown = down; -@@ -113,7 +113,7 @@ public: - bool m_shiftDown : 1; - bool m_altDown : 1; - bool m_metaDown : 1; --#ifdef __WXOSX__ -+#if defined(__WXOSX__) || defined(__WXWASM__) - bool m_rawControlDown : 1; - #endif - }; -diff --git a/include/wx/nonownedwnd.h b/include/wx/nonownedwnd.h -index 0840fce538..f1d27065b9 100644 ---- a/include/wx/nonownedwnd.h -+++ b/include/wx/nonownedwnd.h -@@ -104,6 +104,8 @@ protected: - #include "wx/msw/nonownedwnd.h" - #elif defined(__WXQT__) - #include "wx/qt/nonownedwnd.h" -+#elif defined(__WXWASM__) -+ #include "wx/wasm/nonownedwnd.h" - #else - // No special class needed in other ports, they can derive both wxTLW and - // wxPopupWindow directly from wxWindow and don't implement SetShape(). -diff --git a/include/wx/palette.h b/include/wx/palette.h -index dd5d4ce18d..0b959a6556 100644 ---- a/include/wx/palette.h -+++ b/include/wx/palette.h -@@ -33,7 +33,7 @@ public: - #include "wx/msw/palette.h" - #elif defined(__WXX11__) || defined(__WXMOTIF__) - #include "wx/x11/palette.h" --#elif defined(__WXGTK__) -+#elif defined(__WXGTK__) || defined(__WXWASM__) - #include "wx/generic/paletteg.h" - #elif defined(__WXMAC__) - #include "wx/osx/palette.h" -diff --git a/include/wx/pen.h b/include/wx/pen.h -index c5c751d4db..5344d27218 100644 ---- a/include/wx/pen.h -+++ b/include/wx/pen.h -@@ -114,6 +114,8 @@ public: - #include "wx/osx/pen.h" - #elif defined(__WXQT__) - #include "wx/qt/pen.h" -+#elif defined(__WXWASM__) -+ #include "wx/wasm/pen.h" - #endif - - class WXDLLIMPEXP_CORE wxPenList: public wxGDIObjListBase -diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h -index c3964098b6..0f85a11947 100644 ---- a/include/wx/popupwin.h -+++ b/include/wx/popupwin.h -@@ -76,6 +76,8 @@ public: - #include "wx/osx/popupwin.h" - #elif defined(__WXQT__) - #include "wx/qt/popupwin.h" -+#elif defined(__WXWASM__) -+ #include "wx/wasm/popupwin.h" - #else - #error "wxPopupWindow is not supported under this platform." - #endif -diff --git a/include/wx/region.h b/include/wx/region.h -index 7db620b49d..4be85255f2 100644 ---- a/include/wx/region.h -+++ b/include/wx/region.h -@@ -224,6 +224,8 @@ protected: - #include "wx/osx/region.h" - #elif defined(__WXQT__) - #include "wx/qt/region.h" -+#elif defined(__WXWASM__) -+ #include "wx/wasm/region.h" - #endif - - // ---------------------------------------------------------------------------- -diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h -index 174937fdb5..7f144c1ffc 100644 ---- a/include/wx/toplevel.h -+++ b/include/wx/toplevel.h -@@ -396,6 +396,9 @@ protected: - #elif defined(__WXQT__) - #include "wx/qt/toplevel.h" - #define wxTopLevelWindowNative wxTopLevelWindowQt -+#elif defined(__WXWASM__) -+ #include "wx/wasm/toplevel.h" -+#define wxTopLevelWindowNative wxTopLevelWindowWasm - #endif - - #ifdef __WXUNIVERSAL__ -diff --git a/include/wx/univ/dialog.h b/include/wx/univ/dialog.h -index fa79b88ff4..757a93d389 100644 ---- a/include/wx/univ/dialog.h -+++ b/include/wx/univ/dialog.h -@@ -10,6 +10,8 @@ - #ifndef _WX_UNIV_DIALOG_H_ - #define _WX_UNIV_DIALOG_H_ - -+#include -+ - extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[]; - class WXDLLIMPEXP_FWD_CORE wxWindowDisabler; - class WXDLLIMPEXP_FWD_CORE wxEventLoop; -@@ -47,6 +49,8 @@ public: - // For now, same as Show(true) but returns return code - virtual int ShowModal() wxOVERRIDE; - -+ virtual void ShowModal(std::function callback) wxOVERRIDE; -+ - // may be called to terminate the dialog with the given return code - virtual void EndModal(int retCode) wxOVERRIDE; - -@@ -76,6 +80,8 @@ private: - // modal dialog runs its own event loop - wxEventLoop *m_eventLoop; - -+ std::function m_modalCallback; -+ - // is modal right now? - bool m_isShowingModal; - -diff --git a/include/wx/univ/radiobut.h b/include/wx/univ/radiobut.h -index 711e0a676c..e6ea79f798 100644 ---- a/include/wx/univ/radiobut.h -+++ b/include/wx/univ/radiobut.h -@@ -65,6 +65,12 @@ protected: - // another radiobutton - void ClearValue(); - -+ void Toggle(); -+ -+ virtual bool PerformAction(const wxControlAction& action, -+ long numArg, -+ const wxString& strArg) wxOVERRIDE; -+ - // called when the radio button becomes checked: we clear all the buttons - // in the same group with us here - virtual void OnCheck() wxOVERRIDE; -diff --git a/include/wx/univ/renderer.h b/include/wx/univ/renderer.h -index 986535c2be..9f0e47d2e1 100644 ---- a/include/wx/univ/renderer.h -+++ b/include/wx/univ/renderer.h -@@ -63,6 +63,8 @@ public: - // get the total size of the menu - virtual wxSize GetSize() const = 0; - -+ virtual wxCoord GetOverflowHeight() const { return 0; } -+ - virtual ~wxMenuGeometryInfo(); - }; - -@@ -248,6 +250,7 @@ public: - // draw the slider shaft - virtual void DrawSliderShaft(wxDC& dc, - const wxRect& rect, -+ double fracValue, - int lenThumb, - wxOrientation orient, - int flags = 0, -@@ -297,6 +300,11 @@ public: - virtual void DrawMenuSeparator(wxDC& dc, - wxCoord y, - const wxMenuGeometryInfo& geomInfo) = 0; -+ -+ // draw menu overflow arrow -+ virtual void DrawMenuOverflowArrow(wxDC& WXUNUSED(dc), -+ const wxRect& WXUNUSED(rect), -+ wxDirection WXUNUSED(direction)) {} - #endif // wxUSE_MENUS - - #if wxUSE_STATUSBAR -@@ -375,7 +383,7 @@ public: - - #if wxUSE_SCROLLBAR - // get the size of a scrollbar arrow -- virtual wxSize GetScrollbarArrowSize() const = 0; -+ virtual wxSize GetScrollbarArrowSize(wxOrientation orientation) const = 0; - #endif // wxUSE_SCROLLBAR - - // get the height of a listbox item from the base font height -@@ -649,12 +657,13 @@ public: - - virtual void DrawSliderShaft(wxDC& dc, - const wxRect& rect, -+ double fracValue, - int lenThumb, - wxOrientation orient, - int flags = 0, - long style = 0, - wxRect *rectShaft = NULL) wxOVERRIDE -- { m_renderer->DrawSliderShaft(dc, rect, lenThumb, orient, flags, style, rectShaft); } -+ { m_renderer->DrawSliderShaft(dc, rect, fracValue, lenThumb, orient, flags, style, rectShaft); } - virtual void DrawSliderThumb(wxDC& dc, - const wxRect& rect, - wxOrientation orient, -@@ -695,6 +704,12 @@ public: - wxCoord y, - const wxMenuGeometryInfo& geomInfo) wxOVERRIDE - { m_renderer->DrawMenuSeparator(dc, y, geomInfo); } -+ -+ virtual void DrawMenuOverflowArrow(wxDC& dc, -+ const wxRect& rect, -+ wxDirection direction) wxOVERRIDE -+ { m_renderer->DrawMenuOverflowArrow(dc, rect, direction); } -+ - #endif // wxUSE_MENUS - - #if wxUSE_STATUSBAR -@@ -755,8 +770,8 @@ public: - { return m_renderer->AreScrollbarsInsideBorder(); } - - #if wxUSE_SCROLLBAR -- virtual wxSize GetScrollbarArrowSize() const wxOVERRIDE -- { return m_renderer->GetScrollbarArrowSize(); } -+ virtual wxSize GetScrollbarArrowSize(wxOrientation orientation) const wxOVERRIDE -+ { return m_renderer->GetScrollbarArrowSize(orientation); } - #endif // wxUSE_SCROLLBAR - - virtual wxCoord GetListboxItemHeight(wxCoord fontHeight) wxOVERRIDE -diff --git a/include/wx/univ/scrolbar.h b/include/wx/univ/scrolbar.h -index acc1d3a1cb..acaf794e90 100644 ---- a/include/wx/univ/scrolbar.h -+++ b/include/wx/univ/scrolbar.h -@@ -91,6 +91,9 @@ public: - bool ScrollLines(int nLines) wxOVERRIDE; - bool ScrollPages(int nPages) wxOVERRIDE; - -+ // get the size of a scrollbar arrow (using orientation) -+ wxSize GetScrollbarArrowSize() const; -+ - virtual bool PerformAction(const wxControlAction& action, - long numArg = 0, - const wxString& strArg = wxEmptyString) wxOVERRIDE; -diff --git a/include/wx/univ/slider.h b/include/wx/univ/slider.h -index 1bc6c181bd..d98c74be7b 100644 ---- a/include/wx/univ/slider.h -+++ b/include/wx/univ/slider.h -@@ -84,6 +84,9 @@ public: - // is this a vertical slider? - bool IsVert() const { return (GetWindowStyle() & wxSL_VERTICAL) != 0; } - -+ // is slider direction inverted? (vertical sliders are naturally inverted) -+ bool IsInverted() const { return IsVert() != HasFlag(wxSL_INVERSE); } -+ - // get the slider orientation - wxOrientation GetOrientation() const - { return IsVert() ? wxVERTICAL : wxHORIZONTAL; } -diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h -index 7b59237332..36a3e17080 100644 ---- a/include/wx/univ/textctrl.h -+++ b/include/wx/univ/textctrl.h -@@ -248,7 +248,7 @@ public: - - protected: - // ensure we have correct default border -- virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_SUNKEN; } -+ virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_STATIC; } - - // override base class methods - virtual void DoDrawBorder(wxDC& dc, const wxRect& rect) wxOVERRIDE; -@@ -257,6 +257,8 @@ protected: - // calc the size from the text extent - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; - -+ virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen) const wxOVERRIDE; -+ - // implements Set/ChangeValue() - virtual void DoSetValue(const wxString& value, int flags = 0) wxOVERRIDE; - virtual wxString DoGetValue() const wxOVERRIDE; -diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h -index 5909cbcba6..1758836e8a 100644 ---- a/include/wx/univ/window.h -+++ b/include/wx/univ/window.h -@@ -13,6 +13,8 @@ - #ifndef _WX_UNIV_WINDOW_H_ - #define _WX_UNIV_WINDOW_H_ - -+#include -+ - #include "wx/bitmap.h" // for m_bitmapBg - - class WXDLLIMPEXP_FWD_CORE wxControlRenderer; -@@ -47,6 +49,8 @@ class WXDLLIMPEXP_FWD_CORE wxRenderer; - #define wxWindowNative wxWindowX11 - #elif defined(__WXMAC__) - #define wxWindowNative wxWindowMac -+#elif defined(__WXWASM__) -+#define wxWindowNative wxWindowWasm - #endif - - class WXDLLIMPEXP_CORE wxWindow : public wxWindowNative -@@ -205,6 +209,7 @@ protected: - - #if wxUSE_MENUS - virtual bool DoPopupMenu(wxMenu *menu, int x, int y) wxOVERRIDE; -+ virtual void DoPopupMenu(wxMenu *menu, int x, int y, std::function callback) wxOVERRIDE; - #endif // wxUSE_MENUS - - // we deal with the scrollbars in these functions -@@ -281,6 +286,8 @@ private: - - // the last window over which Alt was pressed (used by OnKeyUp) - static wxWindow *ms_winLastAltPress; -+ -+ std::function m_popupCallback; - #endif // wxUSE_MENUS - - wxDECLARE_DYNAMIC_CLASS(wxWindow); -diff --git a/include/wx/wasm/app.h b/include/wx/wasm/app.h -new file mode 100644 -index 0000000000..2898540bf4 ---- /dev/null -+++ b/include/wx/wasm/app.h -@@ -0,0 +1,73 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/app.h -+// Purpose: wxApp class -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#ifndef _WX_WASM_APP_H_ -+#define _WX_WASM_APP_H_ -+ -+#include "wx/event.h" -+#include "wx/hashset.h" -+#include "wx/kbdstate.h" -+#include "wx/mousestate.h" -+#include "wx/timer.h" -+ -+class EmscriptenKeyboardEvent; -+class wxWasmDisplay; -+ -+//----------------------------------------------------------------------------- -+// wxApp -+//----------------------------------------------------------------------------- -+ -+class WXDLLIMPEXP_CORE wxApp: public wxAppBase -+{ -+public: -+ wxApp(); -+ virtual ~wxApp(); -+ -+ void Paint(); -+ -+ bool IsKeyPressed(long keyCode); -+ -+ void GetMousePosition(int *x, int *y); -+ void GetMouseState(wxMouseState *mouseState); -+ wxWindow *GetMouseWindow(const wxPoint& position) const; -+ -+ // Internal use only -+ wxWasmDisplay* GetDisplay() { return m_display; } -+ -+ bool HandleKeyEvent(wxKeyEvent *event); -+ void HandleMouseEvent(wxMouseEvent *event); -+ void HandleMouseWheelEvent(wxMouseEvent *event); -+ void HandleSizeEvent(const wxSizeEvent& event); -+ void HandleActivateEvent(wxActivateEvent *event); -+ void HandleCloseEvent(wxCloseEvent* event); -+ -+protected: -+ void SetKeyPressed(long keyCode, bool pressed); -+ -+ void SendMouseEventToWindow(wxMouseEvent *event, wxWindow *window); -+ -+ void UpdateMouseState(const wxMouseEvent& event); -+ void UpdateMouseState(const wxKeyEvent& event); -+ -+private: -+ wxDECLARE_DYNAMIC_CLASS(wxApp); -+ -+ // Display -+ wxWasmDisplay *m_display; -+ -+ // Keyboard -+ WX_DECLARE_HASH_SET(long, wxIntegerHash, wxIntegerEqual, KeyCodeSet); -+ KeyCodeSet m_keyCodeSet; -+ -+ // Mouse -+ wxMouseState m_mouseState; -+ -+ friend class wxDropSource; -+}; -+ -+#endif // _WX_WASM_APP_H_ -diff --git a/include/wx/wasm/bitmap.h b/include/wx/wasm/bitmap.h -new file mode 100644 -index 0000000000..fcf26a5e53 ---- /dev/null -+++ b/include/wx/wasm/bitmap.h -@@ -0,0 +1,138 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/bitmap.h -+// Purpose: wxBitmap class -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#ifndef _WX_WASM_BITMAP_H_ -+#define _WX_WASM_BITMAP_H_ -+ -+class WXDLLIMPEXP_FWD_CORE wxPixelDataBase; -+ -+//----------------------------------------------------------------------------- -+// wxBitmap -+//----------------------------------------------------------------------------- -+ -+class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase -+{ -+public: -+ wxBitmap(); -+ wxBitmap(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); -+ wxBitmap(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH); -+ wxBitmap(const char bits[], int width, int height, int depth = 1); -+ wxBitmap(const char* const* bits); -+ wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM); -+ wxBitmap(const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH, double scale = 1.0); -+ wxBitmap(const wxImage& image, const wxDC& dc); -+ -+ virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); -+ virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH); -+ virtual bool Create(int width, int height, const wxDC& dc); -+ virtual bool Create(const char bits[], int width, int height, int depth = 1); -+ virtual bool CreateScaled(int width, int height, int depth, double scale); -+ -+ virtual int GetHeight() const; -+ virtual int GetWidth() const; -+ virtual int GetDepth() const; -+ -+ virtual double GetScaleFactor() const; -+ virtual double GetScaledWidth() const; -+ virtual double GetScaledHeight() const; -+ -+ double GetLogicalWidth() const { return GetWidth(); } -+ double GetLogicalHeight() const { return GetHeight(); } -+ wxSize GetLogicalSize() const { return wxSize(GetWidth(), GetHeight()); } -+ -+#if wxUSE_IMAGE -+ virtual bool Create(const wxImage& image, -+ int depth = wxBITMAP_SCREEN_DEPTH, -+ double scale = 1.0); -+ virtual wxImage ConvertToImage() const; -+#endif // wxUSE_IMAGE -+ -+ virtual wxMask *GetMask() const; -+ virtual void SetMask(wxMask *mask); -+ -+ virtual wxBitmap GetSubBitmap(const wxRect& rect) const; -+ -+ virtual bool SaveFile(const wxString &name, wxBitmapType type, -+ const wxPalette *palette = NULL) const; -+ virtual bool LoadFile(const wxString &name, wxBitmapType type); -+ -+ virtual void* GetRawData(wxPixelDataBase& data, int bpp); -+ virtual void UngetRawData(wxPixelDataBase& data); -+ -+ virtual void *BeginRawAccess() const; -+ virtual void EndRawAccess() const; -+ -+ int GetBytesPerPixel() const; -+ int GetBytesPerRow() const; -+ -+#if wxUSE_PALETTE -+ virtual wxPalette *GetPalette() const; -+ virtual void SetPalette(const wxPalette& palette); -+#endif // wxUSE_PALETTE -+ -+ // copies the contents and mask of the given (colour) icon to the bitmap -+ virtual bool CopyFromIcon(const wxIcon& icon); -+ -+ // implementation: -+ virtual void SetHeight(int height); -+ virtual void SetWidth(int width); -+ virtual void SetDepth(int depth); -+ -+ static void InitStandardHandlers(); -+ -+ bool HasAlpha() const { return GetDepth() == 32; } -+ -+ void SyncToCpp() const; -+ void SyncToJs() const; -+ int GetJavascriptId() const; -+ -+protected: -+ virtual wxGDIRefData* CreateGDIRefData() const; -+ virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const; -+ -+ // implementation -+ void AllocateData() const; -+ -+private: -+ wxDECLARE_DYNAMIC_CLASS(wxBitmap); -+}; -+ -+//----------------------------------------------------------------------------- -+// wxMask -+//----------------------------------------------------------------------------- -+ -+class WXDLLIMPEXP_CORE wxMask : public wxMaskBase -+{ -+public: -+ wxMask(); -+ wxMask(const wxMask& mask); -+ wxMask(const wxBitmap& bitmap, const wxColour& colour); -+#if wxUSE_PALETTE -+ wxMask(const wxBitmap& bitmap, int paletteIndex); -+#endif // wxUSE_PALETTE -+ wxMask(const wxBitmap& bitmap); -+ virtual ~wxMask(); -+ -+ wxBitmap GetBitmap() const; -+ -+ int GetDataSize() const { return m_dataSize; } -+ uint32_t* GetData() const; -+ -+private: -+ virtual void FreeData(); -+ virtual bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour); -+ virtual bool InitFromMonoBitmap(const wxBitmap& bitmap); -+ -+ wxDECLARE_DYNAMIC_CLASS(wxMask); -+ -+ int m_dataSize; -+ uint32_t* m_data; -+ wxBitmap m_bitmap; -+}; -+ -+#endif // _WX_WASM_BITMAP_H_ -diff --git a/include/wx/wasm/brush.h b/include/wx/wasm/brush.h -new file mode 100644 -index 0000000000..d32adee400 ---- /dev/null -+++ b/include/wx/wasm/brush.h -@@ -0,0 +1,53 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/brush.h -+// Purpose: wxBrush class -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#ifndef _WX_WASM_BRUSH_H_ -+#define _WX_WASM_BRUSH_H_ -+ -+class WXDLLIMPEXP_FWD_CORE wxBitmap; -+class WXDLLIMPEXP_FWD_CORE wxColour; -+ -+//----------------------------------------------------------------------------- -+// wxBrush -+//----------------------------------------------------------------------------- -+ -+class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase -+{ -+public: -+ wxBrush() : wxBrush(*wxBLACK) { } -+ wxBrush(const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID); -+ wxBrush(const wxBitmap &stippleBitmap); -+ virtual ~wxBrush(); -+ -+ bool operator==(const wxBrush& brush) const; -+ bool operator!=(const wxBrush& brush) const { return !(*this == brush); } -+ -+ void SetColour(const wxColour& col); -+ void SetColour(unsigned char r, unsigned char g, unsigned char b); -+ -+ void SetStyle(wxBrushStyle style); -+ void SetStipple(const wxBitmap& stipple); -+ -+ wxColour GetColour() const; -+ wxBrushStyle GetStyle() const; -+ wxBitmap *GetStipple() const; -+ -+ wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants") -+ wxBrush(const wxColour& col, int style); -+ -+ wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants") -+ void SetStyle(int style) { SetStyle((wxBrushStyle)style); } -+ -+protected: -+ virtual wxGDIRefData *CreateGDIRefData() const; -+ virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; -+ -+ wxDECLARE_DYNAMIC_CLASS(wxBrush); -+}; -+ -+#endif // _WX_WASM_BRUSH_H_ -diff --git a/include/wx/wasm/chkconf.h b/include/wx/wasm/chkconf.h -new file mode 100644 -index 0000000000..11974256e2 ---- /dev/null -+++ b/include/wx/wasm/chkconf.h -@@ -0,0 +1,7 @@ -+/* -+ * Name: wx/wasm/chkconf.h -+ * Purpose: wxWasm-specific settings consistency checks -+ * Author: Adam Hilss -+ * Copyright: (c) 2022 Adam Hilss -+ * Licence: LGPL v2 -+ */ -diff --git a/include/wx/wasm/clipbrd.h b/include/wx/wasm/clipbrd.h -new file mode 100644 -index 0000000000..f1d2f95cae ---- /dev/null -+++ b/include/wx/wasm/clipbrd.h -@@ -0,0 +1,60 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/clipbrd.h -+// Purpose: -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+ -+#ifndef _WX_CLIPBRD_H_ -+#define _WX_CLIPBRD_H_ -+ -+#if wxUSE_CLIPBOARD -+ -+//----------------------------------------------------------------------------- -+// wxClipboard -+//----------------------------------------------------------------------------- -+ -+class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase -+{ -+public: -+ wxClipboard() {} -+ virtual ~wxClipboard() {} -+ -+ // open the clipboard before SetData() and GetData() -+ virtual bool Open() { return false; } -+ -+ // close the clipboard after SetData() and GetData() -+ virtual void Close() {} -+ -+ // query whether the clipboard is opened -+ virtual bool IsOpened() const { return false; } -+ -+ // set the clipboard data. all other formats will be deleted. -+ virtual bool SetData(wxDataObject *WXUNUSED(data)) { return false; } -+ -+ // add to the clipboard data. -+ virtual bool AddData(wxDataObject *WXUNUSED(data)) { return false; } -+ -+ // ask if data in correct format is available -+ virtual bool IsSupported(const wxDataFormat& WXUNUSED(format)) { return false; } -+ -+ // fill data with data on the clipboard (if available) -+ virtual bool GetData(wxDataObject& WXUNUSED(data)) { return false; } -+ -+ // clears wxTheClipboard and the system's clipboard if possible -+ virtual void Clear() {} -+ -+ // flushes the clipboard: this means that the data which is currently on -+ // clipboard will stay available even after the application exits (possibly -+ // eating memory), otherwise the clipboard will be emptied on exit -+ virtual bool Flush() { return false; } -+ -+private: -+ wxDECLARE_DYNAMIC_CLASS(wxClipboard); -+}; -+ -+#endif // wxUSE_CLIPBOARD -+ -+#endif // _WX_CLIPBRD_H_ -diff --git a/include/wx/wasm/colour.h b/include/wx/wasm/colour.h -new file mode 100644 -index 0000000000..f33e28b807 ---- /dev/null -+++ b/include/wx/wasm/colour.h -@@ -0,0 +1,73 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/colour.h -+// Purpose: -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#ifndef _WX_WASM_COLOUR_H_ -+#define _WX_WASM_COLOUR_H_ -+ -+//----------------------------------------------------------------------------- -+// wxColour -+//----------------------------------------------------------------------------- -+ -+class WXDLLIMPEXP_CORE wxColour : public wxColourBase -+{ -+public: -+ // constructors -+ // ------------ -+ DEFINE_STD_WXCOLOUR_CONSTRUCTORS -+ -+ // copy ctors and assignment operators -+ wxColour(const wxColour& col) -+ { -+ Init(); -+ *this = col; -+ } -+ -+ virtual ~wxColour(); -+ -+ wxColour& operator=(const wxColour& col); -+ -+ // accessors -+ virtual bool IsOk() const { return m_isInit; } -+ -+ unsigned char Red() const { return m_red; } -+ unsigned char Green() const { return m_green; } -+ unsigned char Blue() const { return m_blue; } -+ unsigned char Alpha() const { return m_alpha; } -+ -+ // comparison -+ bool operator==(const wxColour& colour) const -+ { -+ return (m_red == colour.m_red && -+ m_green == colour.m_green && -+ m_blue == colour.m_blue && -+ m_alpha == colour.m_alpha && -+ m_isInit == colour.m_isInit); -+ } -+ -+ bool operator!=(const wxColour& colour) const { return !(*this == colour); } -+ -+protected: -+ -+ // Helper function -+ void Init(); -+ -+ virtual void -+ InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); -+ -+private: -+ bool m_isInit; -+ unsigned char m_red; -+ unsigned char m_blue; -+ unsigned char m_green; -+ unsigned char m_alpha; -+ -+private: -+ wxDECLARE_DYNAMIC_CLASS(wxColour); -+}; -+ -+#endif // _WX_WASM_COLOUR_H_ -diff --git a/include/wx/wasm/config.h b/include/wx/wasm/config.h -new file mode 100644 -index 0000000000..842efeb47b ---- /dev/null -+++ b/include/wx/wasm/config.h -@@ -0,0 +1,102 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/config.h -+// Purpose: wxLocalStorageConfig class -+// Author: Adam Hilss -+// Copyright: (c) 2019 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+ -+#ifndef _WX_WASM_CONFIG_H_ -+#define _WX_WASM_CONFIG_H_ -+ -+#include "wx/defs.h" -+ -+#if wxUSE_CONFIG -+ -+#include "wx/string.h" -+#include "wx/confbase.h" -+ -+// ---------------------------------------------------------------------------- -+// wxLocalStorageConfig -+// ---------------------------------------------------------------------------- -+ -+/* -+*/ -+ -+class WXDLLIMPEXP_BASE wxLocalStorageConfig : public wxConfigBase -+{ -+public: -+ // ctor & dtor -+ wxLocalStorageConfig(const wxString& appName = wxEmptyString, -+ const wxString& vendorName = wxEmptyString, -+ const wxString& localFilename = wxEmptyString, -+ const wxString& globalFilename = wxEmptyString, -+ long style = 0); -+ -+ virtual ~wxLocalStorageConfig(); -+ -+ // implement inherited pure virtual functions -+ // ------------------------------------------ -+ -+ // path management -+ virtual void SetPath(const wxString& strPath) wxOVERRIDE; -+ virtual const wxString& GetPath() const wxOVERRIDE { return m_strPath; } -+ -+ // entry/subgroup info -+ // enumerate all of them -+ virtual bool GetFirstGroup(wxString& str, long& lIndex) const wxOVERRIDE; -+ virtual bool GetNextGroup (wxString& str, long& lIndex) const wxOVERRIDE; -+ virtual bool GetFirstEntry(wxString& str, long& lIndex) const wxOVERRIDE; -+ virtual bool GetNextEntry (wxString& str, long& lIndex) const wxOVERRIDE; -+ -+ // tests for existence -+ virtual bool HasGroup(const wxString& strName) const wxOVERRIDE; -+ virtual bool HasEntry(const wxString& strName) const wxOVERRIDE; -+ -+ // get number of entries/subgroups in the current group, with or without -+ // it's subgroups -+ virtual size_t GetNumberOfEntries(bool bRecursive = false) const wxOVERRIDE; -+ virtual size_t GetNumberOfGroups(bool bRecursive = false) const wxOVERRIDE; -+ -+ virtual bool Flush(bool WXUNUSED(bCurrentOnly) = false) wxOVERRIDE { return true; } -+ -+ // rename -+ virtual bool RenameEntry(const wxString& oldName, const wxString& newName) wxOVERRIDE; -+ virtual bool RenameGroup(const wxString& oldName, const wxString& newName) wxOVERRIDE; -+ -+ // delete -+ virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso = true) wxOVERRIDE; -+ virtual bool DeleteGroup(const wxString& key) wxOVERRIDE; -+ virtual bool DeleteAll() wxOVERRIDE; -+ -+protected: -+ virtual bool DoReadString(const wxString& key, wxString *pstr) const wxOVERRIDE; -+ virtual bool DoReadLong(const wxString& key, long *pl) const wxOVERRIDE; -+ virtual bool DoReadBool(const wxString& key, bool *pb) const wxOVERRIDE; -+#if wxUSE_BASE64 -+ virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const wxOVERRIDE; -+#endif // wxUSE_BASE64 -+ -+ virtual bool DoWriteString(const wxString& key, const wxString& str) wxOVERRIDE; -+ virtual bool DoWriteLong(const wxString& key, long l) wxOVERRIDE; -+ virtual bool DoWriteBool(const wxString& key, bool b) wxOVERRIDE; -+#if wxUSE_BASE64 -+ virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf) wxOVERRIDE; -+#endif // wxUSE_BASE64 -+ -+ wxString MakeEntryKey(const wxString& key) const; -+ wxString MakeGroupKey(const wxString& key) const; -+ -+private: -+ // member variables -+ // ---------------- -+ wxString m_strPath; -+ -+ wxDECLARE_NO_COPY_CLASS(wxLocalStorageConfig); -+ wxDECLARE_ABSTRACT_CLASS(wxLocalStorageConfig); -+}; -+ -+#endif // wxUSE_CONFIG -+ -+#endif // _WX_WASM_CONFIG_H_ -diff --git a/include/wx/wasm/cursor.h b/include/wx/wasm/cursor.h -new file mode 100644 -index 0000000000..90d2c0fb16 ---- /dev/null -+++ b/include/wx/wasm/cursor.h -@@ -0,0 +1,56 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/cursor.h -+// Purpose: wxCursor class -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#ifndef _WX_WASM_CURSOR_H_ -+#define _WX_WASM_CURSOR_H_ -+ -+#include "wx/gdiobj.h" -+#include "wx/gdicmn.h" -+ -+class WXDLLIMPEXP_FWD_CORE wxColour; -+class WXDLLIMPEXP_FWD_CORE wxImage; -+ -+//----------------------------------------------------------------------------- -+// wxCursor -+//----------------------------------------------------------------------------- -+ -+class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject -+{ -+public: -+ wxCursor(); -+ wxCursor(wxStockCursor id) { InitFromStock(id); } -+#if wxUSE_IMAGE -+ wxCursor(const wxImage & image); -+ wxCursor(const wxString& filename, -+ wxBitmapType type = wxCURSOR_DEFAULT_TYPE, -+ int hotSpotX = 0, int hotSpotY = 0); -+#endif -+ wxCursor(const char bits[], int width, int height, -+ int hotSpotX = -1, int hotSpotY = -1, -+ const char maskBits[] = NULL); -+ wxCursor(int cursorType); -+ virtual ~wxCursor() {} -+ -+ void Install() const; -+ -+protected: -+ void InitFromStock(wxStockCursor); -+#if wxUSE_IMAGE -+ void InitFromImage(const wxImage& image); -+#endif -+ -+ virtual wxGDIRefData *CreateGDIRefData() const; -+ virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; -+ -+private: -+ wxDECLARE_DYNAMIC_CLASS(wxCursor); -+}; -+ -+wxCursor wxGetCursor(); -+ -+#endif // _WX_WASM_CURSOR_H_ -diff --git a/include/wx/wasm/dataform.h b/include/wx/wasm/dataform.h -new file mode 100644 -index 0000000000..a7dcd7084d ---- /dev/null -+++ b/include/wx/wasm/dataform.h -@@ -0,0 +1,49 @@ -+/////////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/dataform.h -+// Purpose: wxDataFormat class -+// Author: Adam Hilss -+// Copyright: (c) 2019 Adam Hilss -+// Licence: LGPL v2 -+/////////////////////////////////////////////////////////////////////////////// -+ -+#ifndef _WX_WASM_DATAFORM_H -+#define _WX_WASM_DATAFORM_H -+ -+class WXDLLIMPEXP_CORE wxDataFormat -+{ -+public: -+ wxDataFormat(); -+ wxDataFormat(wxDataFormatId type); -+ wxDataFormat(const wxDataFormat& format); -+ -+ // we have to provide all the overloads to allow using strings instead of -+ // data formats (as a lot of existing code does) -+ wxDataFormat(const wxString& id) { InitFromString(id); } -+ wxDataFormat(const char *id) { InitFromString(id); } -+ wxDataFormat(const wchar_t *id) { InitFromString(id); } -+ wxDataFormat(const wxCStrData& id) { InitFromString(id); } -+ -+ wxDataFormat& operator=(const wxDataFormat& format); -+ -+ // comparison (must have both versions) -+ bool operator==(wxDataFormat format) const; -+ bool operator!=(wxDataFormat format) const; -+ bool operator==(wxDataFormatId type) const; -+ bool operator!=(wxDataFormatId type) const; -+ -+ // string ids are used for custom types - this SetId() must be used for -+ // application-specific formats -+ wxString GetId() const; -+ void SetId(const wxString& id); -+ -+ wxDataFormatId GetType() const; -+ void SetType(wxDataFormatId type); -+ -+private: -+ void InitFromString(const wxString& id); -+ -+ wxDataFormatId m_type; -+ wxString m_id; -+}; -+ -+#endif // _WX_WASM_DATAFORM_H -diff --git a/include/wx/wasm/dataobj.h b/include/wx/wasm/dataobj.h -new file mode 100644 -index 0000000000..2a8c1e52a3 ---- /dev/null -+++ b/include/wx/wasm/dataobj.h -@@ -0,0 +1,28 @@ -+/////////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/dataobj.h -+// Purpose: wxDataObject class -+// Author: Adam Hilss -+// Copyright: (c) Adam Hilss -+// Licence: LGPL v2 -+/////////////////////////////////////////////////////////////////////////////// -+ -+#ifndef _WX_WASM_DATAOBJ_H_ -+#define _WX_WASM_DATAOBJ_H_ -+ -+// ---------------------------------------------------------------------------- -+// wxDataObject is the same as wxDataObjectBase under wxWebAssembly -+// ---------------------------------------------------------------------------- -+ -+class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase -+{ -+public: -+ wxDataObject() {} -+ virtual ~wxDataObject() {} -+ -+ virtual wxDataFormat GetPreferredFormatForObject(const wxDataObject& obj, Direction dir) const; -+ -+ wxDataFormat GetSupportedFormatInSource(wxDataObject *source) const; -+}; -+ -+#endif // _WX_WASM_DATAOBJ_H_ -+ -diff --git a/include/wx/wasm/dataobj2.h b/include/wx/wasm/dataobj2.h -new file mode 100644 -index 0000000000..595c2ae943 ---- /dev/null -+++ b/include/wx/wasm/dataobj2.h -@@ -0,0 +1,95 @@ -+/////////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/dataobj2.h -+// Purpose: wxDataObject derived classes -+// Author: Adam Hilss -+// Copyright: (c) 2019 Adam Hilss -+// Licence: LGPL v2 -+/////////////////////////////////////////////////////////////////////////////// -+ -+#ifndef _WX_WASM_DATAOBJ2_H_ -+#define _WX_WASM_DATAOBJ2_H_ -+ -+// ---------------------------------------------------------------------------- -+// wxBitmapDataObject is a specialization of wxDataObject for bitmaps -+// ---------------------------------------------------------------------------- -+ -+class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase -+{ -+public: -+ // ctors -+ wxBitmapDataObject(); -+ wxBitmapDataObject(const wxBitmap& bitmap); -+ -+ // destr -+ virtual ~wxBitmapDataObject(); -+ -+ // override base class virtual to update PNG data too -+ virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE; -+ -+ // implement base class pure virtuals -+ // ---------------------------------- -+ -+ virtual size_t GetDataSize() const wxOVERRIDE { return m_pngSize; } -+ virtual bool GetDataHere(void *buf) const wxOVERRIDE; -+ virtual bool SetData(size_t len, const void *buf) wxOVERRIDE; -+ // Must provide overloads to avoid hiding them (and warnings about it) -+ virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE -+ { -+ return GetDataSize(); -+ } -+ virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE -+ { -+ return GetDataHere(buf); -+ } -+ virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE -+ { -+ return SetData(len, buf); -+ } -+ -+protected: -+ void Clear() { delete [] m_pngData; } -+ void ClearAll() { Clear(); Init(); } -+ -+ size_t m_pngSize; -+ char *m_pngData; -+ -+ void DoConvertToPng(); -+ -+private: -+ void Init() { m_pngData = NULL; m_pngSize = 0; } -+}; -+ -+// ---------------------------------------------------------------------------- -+// wxFileDataObject is a specialization of wxDataObject for file names -+// ---------------------------------------------------------------------------- -+ -+class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase -+{ -+public: -+ // implement base class pure virtuals -+ // ---------------------------------- -+ -+ void AddFile(const wxString &filename); -+ -+ virtual size_t GetDataSize() const; -+ virtual bool GetDataHere(void *buf) const; -+ virtual bool SetData(size_t len, const void *buf); -+ -+private: -+ // Must provide overloads to avoid hiding them (and warnings about it) -+ virtual size_t GetDataSize(const wxDataFormat&) const -+ { -+ return GetDataSize(); -+ } -+ virtual bool GetDataHere(const wxDataFormat&, void *buf) const -+ { -+ return GetDataHere(buf); -+ } -+ virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) -+ { -+ return SetData(len, buf); -+ } -+}; -+ -+#endif // _WX_WASM_DATAOBJ2_H_ -+ -diff --git a/include/wx/wasm/dc.h b/include/wx/wasm/dc.h -new file mode 100644 -index 0000000000..aaaa4aeaa7 ---- /dev/null -+++ b/include/wx/wasm/dc.h -@@ -0,0 +1,145 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/dc.h -+// Purpose: wxDC class -+// Author: Adam Hilss -+// Copyright: (c) 2019 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#ifndef _WX_WASM_DC_H_ -+#define _WX_WASM_DC_H_ -+ -+#include "wx/dc.h" -+ -+enum wxPointMode { -+ wxPOINTMODE_POINTS, -+ wxPOINTMODE_LINES, -+ wxPOINTMODE_POLYGON -+}; -+ -+//----------------------------------------------------------------------------- -+// wxDC -+//----------------------------------------------------------------------------- -+ -+class WXDLLIMPEXP_CORE wxWasmDCImpl: public wxDCImpl -+{ -+public: -+ wxWasmDCImpl(wxDC *owner); -+ virtual ~wxWasmDCImpl() {} -+ -+public: -+ // implement base class pure virtuals -+ // ---------------------------------- -+ -+ virtual void Clear(); -+ -+ virtual bool StartDoc(const wxString& WXUNUSED(message)) { return true; } -+ virtual void EndDoc(void) {} -+ -+ virtual void StartPage(void) {} -+ virtual void EndPage(void) {} -+ -+ virtual void SetFont(const wxFont& font); -+ virtual void SetPen(const wxPen& pen); -+ virtual void SetBrush(const wxBrush& brush); -+ virtual void SetBackground(const wxBrush& brush); -+ virtual void SetBackgroundMode(int mode) { m_backgroundMode = mode; } -+ virtual void SetPalette(const wxPalette& palette); -+ -+ virtual void DestroyClippingRegion(); -+ -+ virtual wxCoord GetCharHeight() const; -+ virtual wxCoord GetCharWidth() const; -+ virtual void DoGetTextExtent(const wxString& string, -+ wxCoord *x, wxCoord *y, -+ wxCoord *descent = NULL, -+ wxCoord *externalLeading = NULL, -+ const wxFont *theFont = NULL) const; -+ -+ virtual bool CanDrawBitmap() const; -+ virtual bool CanGetTextExtent() const; -+ virtual int GetDepth() const; -+ virtual wxSize GetPPI() const; -+ -+ virtual void SetLogicalFunction(wxRasterOperationMode function); -+ -+ virtual void SetTextForeground(const wxColour& colour) ; -+ virtual void SetTextBackground(const wxColour& colour) ; -+ -+protected: -+ virtual void DoSetDeviceClippingRegion(const wxRegion& region); -+ virtual void DoSetClippingRegion(wxCoord x, wxCoord y, -+ wxCoord width, wxCoord height); -+ -+ virtual void DoGetSizeMM(int* width, int* height) const; -+ -+ virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const; -+ -+ virtual void DoDrawPoint(wxCoord x, wxCoord y); -+ -+ virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2); -+ virtual void DoDrawLines(int n, const wxPoint points[], -+ wxCoord xoffset, wxCoord yoffset); -+ -+ virtual void DoDrawPolygon(int n, const wxPoint points[], -+ wxCoord xoffset, wxCoord yoffset, -+ wxPolygonFillMode fillStyle = wxODDEVEN_RULE); -+ -+ virtual void DoDrawRectangle(wxCoord x, wxCoord y, -+ wxCoord width, wxCoord height); -+ virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y, -+ wxCoord width, wxCoord height, -+ double radius); -+ -+ virtual void DoDrawArc(wxCoord x1, wxCoord y1, -+ wxCoord x2, wxCoord y2, -+ wxCoord xc, wxCoord yc); -+ -+ virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, -+ double sa, double ea); -+ -+ virtual void DoDrawEllipse(wxCoord x, wxCoord y, -+ wxCoord width, wxCoord height); -+ -+ virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y); -+ virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, -+ bool useMask = false); -+ -+ virtual bool DoBlit(wxCoord xdest, wxCoord ydest, -+ wxCoord width, wxCoord height, -+ wxDC *source, -+ wxCoord xsrc, wxCoord ysrc, -+ wxRasterOperationMode rop = wxCOPY, -+ bool useMask = false, -+ wxCoord xsrcMask = -1, wxCoord ysrcMask = -1); -+ -+ virtual void DoCrossHair(wxCoord x, wxCoord y); -+ -+ virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y); -+ virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, -+ double angle); -+ -+ virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, -+ wxFloodFillStyle style = wxFLOOD_SURFACE); -+ -+ inline double LogicalToDeviceDoubleX(wxCoord x) { -+ return static_cast(LogicalToDeviceX(x)); -+ } -+ -+ inline double LogicalToDeviceDoubleY(wxCoord y) { -+ return static_cast(LogicalToDeviceY(y)); -+ } -+ -+ // implementation -+ int GetJavascriptId() { return m_jsId; } -+ void SetJavascriptId(int jsId) { m_jsId = jsId; m_ok = true; } -+ -+protected: -+ int m_jsId; -+ bool m_fontDirty; -+ -+ DECLARE_ABSTRACT_CLASS(wxWasmDCImpl) -+ wxDECLARE_NO_COPY_CLASS(wxWasmDCImpl); -+}; -+ -+#endif // _WX_WASM_DC_H_ -diff --git a/include/wx/wasm/dcclient.h b/include/wx/wasm/dcclient.h -new file mode 100644 -index 0000000000..fcea0236ac ---- /dev/null -+++ b/include/wx/wasm/dcclient.h -@@ -0,0 +1,63 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/dcclient.h -+// Purpose: wxWindowDC, wxClientDC, wxPaintDC classes -+// Author: Adam Hilss -+// Copyright: (c) 2019 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#ifndef __WX_WASM_DCCLIENT_H__ -+#define __WX_WASM_DCCLIENT_H__ -+ -+#include "wx/wasm/dc.h" -+ -+//----------------------------------------------------------------------------- -+// wxWindowDCImpl -+//----------------------------------------------------------------------------- -+ -+class WXDLLIMPEXP_CORE wxWindowDCImpl: public wxWasmDCImpl -+{ -+public: -+ wxWindowDCImpl(wxDC *owner, wxWindow *win, bool isClient = false); -+ virtual ~wxWindowDCImpl(void); -+ -+ virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; -+ -+protected: -+ wxDECLARE_DYNAMIC_CLASS(wxWindowDCImpl); -+ wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl); -+ -+ void Create(const wxRect& rect); -+}; -+ -+//----------------------------------------------------------------------------- -+// wxClientDCImpl -+//----------------------------------------------------------------------------- -+ -+class WXDLLIMPEXP_CORE wxClientDCImpl: public wxWindowDCImpl -+{ -+public: -+ wxClientDCImpl(wxDC *owner, wxWindow *win); -+ virtual ~wxClientDCImpl(void); -+ -+protected: -+ wxDECLARE_DYNAMIC_CLASS(wxClientDCImpl); -+ wxDECLARE_NO_COPY_CLASS(wxClientDCImpl); -+}; -+ -+//----------------------------------------------------------------------------- -+// wxPaintDCImpl -+//----------------------------------------------------------------------------- -+ -+class WXDLLIMPEXP_CORE wxPaintDCImpl: public wxClientDCImpl -+{ -+public: -+ wxPaintDCImpl(wxDC *owner, wxWindow *win); -+ virtual ~wxPaintDCImpl(void); -+ -+protected: -+ wxDECLARE_DYNAMIC_CLASS(wxPaintDCImpl); -+ wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl); -+}; -+ -+#endif // __WX_WASM_DCCLIENT_H__ -diff --git a/include/wx/wasm/dcmemory.h b/include/wx/wasm/dcmemory.h -new file mode 100644 -index 0000000000..60e683178c ---- /dev/null -+++ b/include/wx/wasm/dcmemory.h -@@ -0,0 +1,47 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/dcmemory.h -+// Purpose: wxMemoryDC class -+// Author: Adam Hilss -+// Copyright: (c) 2019 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#ifndef __WX_WASM_DCMEMORY_H__ -+#define __WX_WASM_DCMEMORY_H__ -+ -+#include "wx/wasm/dc.h" -+ -+#include "wx/bitmap.h" -+#include "wx/dcmemory.h" -+ -+//----------------------------------------------------------------------------- -+// wxMemoryDCImpl -+//----------------------------------------------------------------------------- -+ -+class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxWasmDCImpl -+{ -+public: -+ wxMemoryDCImpl(wxMemoryDC *owner); -+ wxMemoryDCImpl(wxMemoryDC *owner, wxBitmap& bitmap); -+ wxMemoryDCImpl(wxMemoryDC *owner, wxDC *dc); -+ -+ virtual ~wxMemoryDCImpl(void); -+ -+ virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; -+ virtual void DoSelect(const wxBitmap& WXUNUSED(bmp)) wxOVERRIDE; -+ -+ virtual const wxBitmap& GetSelectedBitmap() const wxOVERRIDE { return m_bitmap; } -+ virtual wxBitmap& GetSelectedBitmap() wxOVERRIDE { return m_bitmap; } -+ -+protected: -+ void Init(); -+ -+ void Deselect(); -+ -+ wxBitmap m_bitmap; -+ -+ wxDECLARE_DYNAMIC_CLASS(wxMemoryDCImpl); -+ wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl); -+}; -+ -+#endif // __WX_WASM_DCMEMORY_H__ -diff --git a/include/wx/wasm/dcscreen.h b/include/wx/wasm/dcscreen.h -new file mode 100644 -index 0000000000..9efb8d3456 ---- /dev/null -+++ b/include/wx/wasm/dcscreen.h -@@ -0,0 +1,32 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/dcscreen.h -+// Purpose: wxScreenDC class -+// Author: Adam Hilss -+// Copyright: (c) 2019 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#ifndef __WX_WASM_DCSCREEN_H__ -+#define __WX_WASM_DCSCREEN_H__ -+ -+#include "wx/dcscreen.h" -+#include "wx/wasm/dc.h" -+ -+//----------------------------------------------------------------------------- -+// wxScreenDCImpl -+//----------------------------------------------------------------------------- -+ -+class WXDLLIMPEXP_CORE wxScreenDCImpl: public wxWasmDCImpl -+{ -+public: -+ wxScreenDCImpl(wxScreenDC *owner); -+ virtual ~wxScreenDCImpl(void); -+ -+ virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; -+ -+protected: -+ wxDECLARE_DYNAMIC_CLASS(wxScreenDCImpl); -+ wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl); -+}; -+ -+#endif // __WX_WASM_DCSCREEN_H__ -diff --git a/include/wx/wasm/dnd.h b/include/wx/wasm/dnd.h -new file mode 100644 -index 0000000000..bb095f629d ---- /dev/null -+++ b/include/wx/wasm/dnd.h -@@ -0,0 +1,89 @@ -+/////////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/dnd.h -+// Purpose: -+// Author: Adam Hilss -+// Copyright: (c) 2019 Adam Hilss -+// Licence: LGPL v2 -+/////////////////////////////////////////////////////////////////////////////// -+ -+#ifndef _WX_WASM_DND_H_ -+#define _WX_WASM_DND_H_ -+ -+#include "wx/event.h" -+#include "wx/icon.h" -+ -+// ---------------------------------------------------------------------------- -+// macros -+// ---------------------------------------------------------------------------- -+ -+// this macro may be used instead for wxDropSource ctor arguments: it will use -+// the cursor 'name' from an XPM file under Wasm, but will expand to something -+// else under MSW. If you don't use it, you will have to use #ifdef in the -+// application code. -+#define wxDROP_ICON(name) wxCursor(X##_xpm) -+ -+//------------------------------------------------------------------------- -+// wxDropTarget -+//------------------------------------------------------------------------- -+ -+//------------------------------------------------------------------------- -+// wxDropSource -+//------------------------------------------------------------------------- -+ -+class WXDLLIMPEXP_CORE wxDropSource: public wxDropSourceBase -+{ -+public: -+ wxDropSource(wxWindow *win = NULL, -+ const wxCursor © = wxNullCursor, -+ const wxCursor &move = wxNullCursor, -+ const wxCursor &none = wxNullCursor); -+ -+ virtual ~wxDropSource(); -+ -+ virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly); -+ -+ virtual void OnDragResult(wxDragResult WXUNUSED(result)) { } -+ -+ static bool IsDragInProgress(); -+ static void HandleMouseEvent(wxMouseEvent *event); -+ -+private: -+ void StartDrag(); -+ void EndDrag(wxDragResult result); -+ -+ const wxCursor& GetCursor(wxDragResult res) const; -+ -+ bool UseAlternateResult(); -+ wxDragResult GetDefaultDragResult(); -+ void UpdateDesiredDragResult(wxDragResult desiredResult); -+ -+ bool HandleMouseEvent(wxMouseEvent* event, wxDragResult* result); -+ -+ int m_dropFlags; -+ -+ wxWindow *m_overWindow; // Current mouse over window -+ -+ wxPoint m_startPosition; // Mouse position when drag started -+ wxCursor m_startCursor; // Cursor when drag started -+ -+ bool m_lastMouseEventValid; -+ wxMouseEvent m_lastMouseEvent; // Last mouse event received during drag -+ -+ wxDragResult m_desiredResult; -+}; -+ -+class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase -+{ -+public: -+ wxDropTarget(wxDataObject *dataObject = NULL); -+ -+ virtual bool OnDrop(wxCoord x, wxCoord y); -+ virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def); -+ virtual bool GetData(); -+ -+ virtual wxDataFormat GetMatchingPair(); -+}; -+ -+ -+#endif // _WX_WASM_DND_H_ -+ -diff --git a/include/wx/wasm/evtloop.h b/include/wx/wasm/evtloop.h -new file mode 100644 -index 0000000000..2fc41240aa ---- /dev/null -+++ b/include/wx/wasm/evtloop.h -@@ -0,0 +1,39 @@ -+/////////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/evtloop.h -+// Purpose: -+// Author: Adam Hilss -+// Copyright: (c) 2019 Adam Hilss -+// Licence: LGPL v2 -+/////////////////////////////////////////////////////////////////////////////// -+ -+#ifndef _WX_WASM_EVTLOOP_H_ -+#define _WX_WASM_EVTLOOP_H_ -+ -+#include "wx/evtloop.h" -+ -+// ---------------------------------------------------------------------------- -+// wxGUIEventLoop for wxWebAssembly -+// ---------------------------------------------------------------------------- -+ -+class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopBase -+{ -+public: -+ wxGUIEventLoop() {} -+ -+ virtual bool IsOk() const { return true; } -+ -+ virtual void ScheduleExit(int rc = 0); -+ virtual bool Pending() const; -+ virtual bool Dispatch(); -+ virtual int DispatchTimeout(unsigned long timeout); -+ virtual void WakeUp(); -+ -+protected: -+ virtual int DoRun(); -+ virtual void DoYieldFor(long eventsToProcess); -+ -+private: -+ wxDECLARE_NO_COPY_CLASS(wxGUIEventLoop); -+}; -+ -+#endif // _WX_WASM_EVTLOOP_H_ -diff --git a/include/wx/wasm/font.h b/include/wx/wasm/font.h -new file mode 100644 -index 0000000000..92287c13d7 ---- /dev/null -+++ b/include/wx/wasm/font.h -@@ -0,0 +1,98 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/font.h -+// Purpose: -+// Author: Adam Hilss -+// Copyright: (c) 1998 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#ifndef _WX_WASM_FONT_H_ -+#define _WX_WASM_FONT_H_ -+ -+// ---------------------------------------------------------------------------- -+// wxFont -+// ---------------------------------------------------------------------------- -+ -+class WXDLLIMPEXP_CORE wxFont : public wxFontBase -+{ -+public: -+ wxFont(); -+ wxFont(const wxFontInfo& info); -+ wxFont(const wxString& nativeFontInfoString); -+ wxFont(const wxNativeFontInfo& info); -+ wxFont(int size, -+ wxFontFamily family, -+ wxFontStyle style, -+ wxFontWeight weight, -+ bool underlined = false, -+ const wxString& face = wxEmptyString, -+ wxFontEncoding encoding = wxFONTENCODING_DEFAULT); -+ wxFont(const wxSize& pixelSize, -+ wxFontFamily family, -+ wxFontStyle style, -+ wxFontWeight weight, -+ bool underlined = false, -+ const wxString& face = wxEmptyString, -+ wxFontEncoding encoding = wxFONTENCODING_DEFAULT); -+ virtual ~wxFont(); -+ -+ bool Create(int size, -+ wxFontFamily family, -+ wxFontStyle style, -+ wxFontWeight weight, -+ bool underlined = false, -+ const wxString& face = wxEmptyString, -+ wxFontEncoding encoding = wxFONTENCODING_DEFAULT); -+ -+ // implement base class pure virtuals -+ virtual double GetFractionalPointSize() const; -+ virtual wxFontStyle GetStyle() const; -+ virtual wxFontWeight GetWeight() const; -+ virtual int GetNumericWeight() const; -+ virtual bool GetUnderlined() const; -+ virtual bool GetStrikethrough() const; -+ virtual wxString GetFaceName() const; -+ virtual wxFontEncoding GetEncoding() const; -+ virtual const wxNativeFontInfo *GetNativeFontInfo() const; -+ -+ virtual void SetFractionalPointSize(double pointSize); -+ virtual void SetFamily(wxFontFamily family); -+ virtual void SetStyle(wxFontStyle style); -+ virtual void SetWeight(wxFontWeight weight); -+ virtual void SetNumericWeight(int weight); -+ virtual void SetUnderlined(bool underlined); -+ virtual void SetStrikethrough(bool strikethrough); -+ virtual bool SetFaceName(const wxString& faceName); -+ virtual void SetEncoding(wxFontEncoding encoding); -+ -+ wxDECLARE_COMMON_FONT_METHODS(); -+ -+ wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants") -+ wxFont(int size, -+ int family, -+ int style, -+ int weight, -+ bool underlined = false, -+ const wxString& face = wxEmptyString, -+ wxFontEncoding encoding = wxFONTENCODING_DEFAULT) -+ { -+ (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding); -+ } -+ -+ void GetTextExtent(const wxString &string, -+ wxCoord *x, wxCoord *y, -+ wxCoord *descent, -+ wxCoord *externalLeading) const; -+ -+ void GetCharSize(wxCoord *x, wxCoord *y) const; -+ -+protected: -+ virtual wxFontFamily DoGetFamily() const; -+ -+ virtual wxGDIRefData* CreateGDIRefData() const; -+ virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const; -+ -+ wxDECLARE_DYNAMIC_CLASS(wxFont); -+}; -+ -+#endif // _WX_WASM_FONT_H_ -diff --git a/include/wx/wasm/nonownedwnd.h b/include/wx/wasm/nonownedwnd.h -new file mode 100644 -index 0000000000..9b76fa8fd5 ---- /dev/null -+++ b/include/wx/wasm/nonownedwnd.h -@@ -0,0 +1,71 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/nonownedwnd.h -+// Purpose: -+// Author: Adam Hilss -+// Copyright: (c) 2019 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#ifndef _WX_WASM_NONOWNEDWND_H_ -+#define _WX_WASM_NONOWNEDWND_H_ -+ -+#include -+ -+class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxNonOwnedWindowBase -+{ -+public: -+ // construction -+ wxNonOwnedWindow() { Init(); } -+ wxNonOwnedWindow(wxWindow *parent, -+ wxWindowID id, -+ const wxPoint& pos = wxDefaultPosition, -+ const wxSize& size = wxDefaultSize, -+ long style = 0, -+ const wxString& name = wxPanelNameStr) -+ { -+ Init(); -+ Create(parent, id, pos, size, style, name); -+ } -+ -+ bool Create(wxWindow *parent, -+ wxWindowID id, -+ const wxPoint& pos = wxDefaultPosition, -+ const wxSize& size = wxDefaultSize, -+ long style = 0, -+ const wxString& name = wxPanelNameStr); -+ -+ virtual ~wxNonOwnedWindow(); -+ -+ virtual bool Show(bool show = true) wxOVERRIDE; -+ -+ virtual void Raise() wxOVERRIDE; -+ virtual void Lower() wxOVERRIDE; -+ -+ virtual void SetSizer(wxSizer *sizer, bool deleteOld = true); -+ -+ virtual wxString GetCSSClassList() const { return "window"; } -+ -+ bool IsMainFrame() const; -+ -+ int GetCSSId() const { return m_cssId; } -+ -+ void HandlePaintRequests(); -+ -+protected: -+ virtual void DoSetSize(int x, int y, -+ int width, int height, -+ int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; -+ -+ virtual void OnAnimationFrame() {} -+ -+ void SetCSSId(int cssId) { m_cssId = cssId; } -+ -+private: -+ void Init(); -+ -+ int m_cssId; -+ -+ friend class wxApp; -+}; -+ -+#endif // _WX_WASM_NONOWNEDWND_H_ -diff --git a/include/wx/wasm/pen.h b/include/wx/wasm/pen.h -new file mode 100644 -index 0000000000..904e5a54fe ---- /dev/null -+++ b/include/wx/wasm/pen.h -@@ -0,0 +1,63 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/pen.h -+// Purpose: -+// Author: Adam Hilss -+// Copyright: (c) 2019 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#ifndef _WX_WASM_PEN_H_ -+#define _WX_WASM_PEN_H_ -+ -+typedef signed char wxWasmDash; -+ -+//----------------------------------------------------------------------------- -+// wxPen -+//----------------------------------------------------------------------------- -+ -+class WXDLLIMPEXP_CORE wxPen: public wxPenBase -+{ -+public: -+ wxPen() : wxPen(*wxBLACK) { } -+ wxPen(const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID); -+ -+ wxPen(const wxBitmap& stipple, int width); -+ -+ virtual ~wxPen(); -+ -+ bool operator==(const wxPen& pen) const; -+ bool operator!=(const wxPen& pen) const { return !(*this == pen); } -+ -+ void SetColour(const wxColour &colour); -+ void SetColour(unsigned char red, unsigned char green, unsigned char blue); -+ void SetWidth(int width); -+ void SetStyle(wxPenStyle style); -+ void SetStipple(const wxBitmap& stipple); -+ void SetDashes(int number_of_dashes, const wxDash *dash); -+ void SetJoin(wxPenJoin join); -+ void SetCap(wxPenCap cap); -+ -+ wxColour GetColour() const; -+ int GetWidth() const; -+ wxPenStyle GetStyle() const; -+ wxBitmap *GetStipple() const; -+ int GetDashes(wxDash **ptr) const; -+ int GetDashCount() const; -+ wxDash* GetDash() const; -+ wxPenJoin GetJoin() const; -+ wxPenCap GetCap() const; -+ -+ wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants") -+ wxPen(const wxColour& col, int width, int style); -+ -+ wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants") -+ void SetStyle(int style) { SetStyle((wxPenStyle)style); } -+ -+protected: -+ virtual wxGDIRefData *CreateGDIRefData() const; -+ virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; -+ -+ wxDECLARE_DYNAMIC_CLASS(wxPen); -+}; -+ -+#endif // _WX_WASM_PEN_H_ -diff --git a/include/wx/wasm/popupwin.h b/include/wx/wasm/popupwin.h -new file mode 100644 -index 0000000000..931cc617c0 ---- /dev/null -+++ b/include/wx/wasm/popupwin.h -@@ -0,0 +1,37 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/popupwin.h -+// Purpose: -+// Author: Adam Hilss -+// Copyright: (c) 2019 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#ifndef _WX_WASM_POPUPWIN_H_ -+#define _WX_WASM_POPUPWIN_H_ -+ -+//----------------------------------------------------------------------------- -+// wxPopUpWindow -+//----------------------------------------------------------------------------- -+ -+class WXDLLIMPEXP_CORE wxPopupWindow: public wxPopupWindowBase -+{ -+public: -+ wxPopupWindow() { } -+ wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE) -+ { (void)Create(parent, flags); } -+ virtual ~wxPopupWindow(); -+ -+ bool Create(wxWindow *parent, int flags = wxBORDER_NONE); -+ -+ virtual wxString GetCSSClassList() const wxOVERRIDE { -+ return wxNonOwnedWindow::GetCSSClassList() + " popup"; -+ } -+ -+protected: -+#ifdef __WXUNIVERSAL__ -+ wxDECLARE_EVENT_TABLE(); -+#endif -+ wxDECLARE_DYNAMIC_CLASS(wxPopupWindow); -+}; -+ -+#endif // _WX_WASM_POPUPWIN_H_ -diff --git a/include/wx/wasm/private.h b/include/wx/wasm/private.h -new file mode 100644 -index 0000000000..d71b852b0f ---- /dev/null -+++ b/include/wx/wasm/private.h -@@ -0,0 +1,18 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/private.h -+// Purpose: -+// Author: Adam Hilss -+// Copyright: (c) 2019 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#ifndef _WX_WASM_PRIVATE_H_ -+#define _WX_WASM_PRIVATE_H_ -+ -+#include -+ -+/* -+pp::FileSystem *GetFileSystem(); -+*/ -+ -+#endif // _WX_WASM_PRIVATE_H_ -diff --git a/include/wx/wasm/private/display.h b/include/wx/wasm/private/display.h -new file mode 100644 -index 0000000000..a94c61519b ---- /dev/null -+++ b/include/wx/wasm/private/display.h -@@ -0,0 +1,37 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/private/display.h -+// Purpose: -+// Author: Adam Hilss -+// Copyright: (c) 2019 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#ifndef _WX_WASM_PRIVATE_DISPLAY_H_ -+#define _WX_WASM_PRIVATE_DISPLAY_H_ -+ -+#include "wx/gdicmn.h" -+ -+// ---------------------------------------------------------------------------- -+// wxWasmDisplay -+// ---------------------------------------------------------------------------- -+ -+class wxWasmDisplay -+{ -+public: -+ wxWasmDisplay(); -+ virtual ~wxWasmDisplay() { } -+ -+ inline wxSize GetScreenSize() const { return m_screenSize; } -+ void SetScreenSize(const wxSize& screenSize) { m_screenSize = screenSize; } -+ -+ inline double GetDeviceScaleFactor() const { return m_deviceScaleFactor; } -+ inline double GetContentScaleFactor() const { return m_contentScaleFactor; } -+ void UpdateScaleFactor(); -+ -+private: -+ wxSize m_screenSize; -+ double m_deviceScaleFactor; -+ double m_contentScaleFactor; -+}; -+ -+#endif // _WX_WASM_PRIVATE_DISPLAY_H_ -diff --git a/include/wx/wasm/private/keyboard.h b/include/wx/wasm/private/keyboard.h -new file mode 100644 -index 0000000000..149bc7233a ---- /dev/null -+++ b/include/wx/wasm/private/keyboard.h -@@ -0,0 +1,21 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/private/keyboard.h -+// Purpose: Keyboard event converter -+// Author: Adam Hilss -+// Copyright: (c) 2019 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#ifndef _WX_WASM_PRIVATE_KEYBOARD_H_ -+#define _WX_WASM_PRIVATE_KEYBOARD_H_ -+ -+#include "wx/event.h" -+ -+bool EmscriptenKeyboardEventToWXEvent(int emscriptenEventType, -+ const EmscriptenKeyboardEvent &emscriptenEvent, -+ wxKeyEvent *keyEvent); -+ -+bool KeyCodeNeedsKeyDownEvent(int keyCode); -+bool KeyCodeNeedsCharEvent(int keyCode); -+ -+#endif // _WX_WASM_PRIVATE_KEYBOARD_H_ -diff --git a/include/wx/wasm/private/mouse.h b/include/wx/wasm/private/mouse.h -new file mode 100644 -index 0000000000..fecf59f566 ---- /dev/null -+++ b/include/wx/wasm/private/mouse.h -@@ -0,0 +1,28 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/private/mouse.h -+// Purpose: Mouse event converter -+// Author: Adam Hilss -+// Copyright: (c) 2019 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#ifndef _WX_WASM_PRIVATE_MOUSE_H_ -+#define _WX_WASM_PRIVATE_MOUSE_H_ -+ -+#include "wx/event.h" -+ -+#include -+ -+bool EmscriptenMouseEventToWXEvent(int emscriptenEventType, -+ const EmscriptenMouseEvent &emscriptenEvent, -+ wxMouseEvent *mouseEvent); -+ -+bool EmscriptenWheelEventToWXEvent(const EmscriptenWheelEvent &emscriptenEvent, -+ wxOrientation orientation, -+ wxMouseEvent *mouseEvent); -+ -+bool EmscriptenTouchEventToWXEvent(int touchEventType, -+ const EmscriptenTouchEvent &touchEvent, -+ wxMouseEvent *mouseEvent); -+ -+#endif // _WX_WASM_PRIVATE_MOUSE_H_ -diff --git a/include/wx/wasm/private/timer.h b/include/wx/wasm/private/timer.h -new file mode 100644 -index 0000000000..6dea1b278b ---- /dev/null -+++ b/include/wx/wasm/private/timer.h -@@ -0,0 +1,66 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/private/timer.h -+// Purpose: -+// Author: Adam Hilss -+// Copyright: (c) 2019 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#ifndef _WX_WASM_PRIVATE_TIMER_H_ -+#define _WX_WASM_PRIVATE_TIMER_H_ -+ -+#if wxUSE_TIMER -+ -+#include "wx/private/timer.h" -+ -+class WXDLLIMPEXP_FWD_CORE TimerCallbackFunc; -+ -+//----------------------------------------------------------------------------- -+// wxTimerImpl -+//----------------------------------------------------------------------------- -+ -+class WXDLLIMPEXP_CORE wxWasmTimerImpl : public wxTimerImpl -+{ -+public: -+ wxWasmTimerImpl(wxTimer* timer) -+ : wxTimerImpl(timer), -+ m_callbackFunc(NULL) { } -+ -+ virtual bool Start(int millisecs = -1, bool oneShot = false); -+ virtual void Stop(); -+ virtual bool IsRunning() const { return m_callbackFunc != NULL; } -+ -+protected: -+ void ScheduleFirstInterval(); -+ void ScheduleNextInterval(); -+ -+ void ScheduleTimerCallback(int millisecs, TimerCallbackFunc *callbackFunc); -+ -+ TimerCallbackFunc *m_callbackFunc; -+ wxLongLong m_deadlineMs; -+ -+ friend class TimerCallbackFunc; -+}; -+ -+class WXDLLIMPEXP_CORE TimerCallbackFunc : public wxObject -+{ -+public: -+ TimerCallbackFunc(wxWasmTimerImpl* timer) -+ : m_timer(timer), -+ m_canceled(false) { } -+ -+ void Run(); -+ -+ wxWasmTimerImpl *GetTimerImpl() const { return m_timer; } -+ -+ bool IsCanceled() const { return m_canceled; } -+ void Cancel() { m_canceled = true; } -+ -+private: -+ wxWasmTimerImpl *m_timer; -+ bool m_canceled; -+}; -+ -+#endif // wxUSE_TIMER -+ -+#endif // _WX_WASM_PRIVATE_TIMER_H_ -diff --git a/include/wx/wasm/pthread.h b/include/wx/wasm/pthread.h -new file mode 100644 -index 0000000000..ce00caf8a6 ---- /dev/null -+++ b/include/wx/wasm/pthread.h -@@ -0,0 +1,35 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/thread.h -+// Purpose: Dummy implementations of unsupported pthread functions. -+// Author: Adam Hilss -+// Copyright: (c) 2019 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#ifndef _WX_WASM_PTHREAD_H__ -+#define _WX_WASM_PTHREAD_H__ -+ -+#include -+#include -+ -+int pthread_attr_getschedpolicy(const pthread_attr_t *attr, -+ int *policy); -+ -+//int pthread_attr_getschedparam(const pthread_attr_t *attr, -+// struct sched_param *param); -+ -+int pthread_attr_setschedparam(pthread_attr_t *attr, -+ const struct sched_param *param); -+ -+int pthread_setschedparam(pthread_t thread, -+ int policy, -+ const struct sched_param *param); -+ -+int pthread_setconcurrency(int new_level); -+ -+int sched_get_priority_min(int policy); -+ -+int sched_get_priority_max(int policy); -+ -+ -+#endif // _WX_WASM_PTHREAD_H__ -diff --git a/include/wx/wasm/region.h b/include/wx/wasm/region.h -new file mode 100644 -index 0000000000..c6714486f8 ---- /dev/null -+++ b/include/wx/wasm/region.h -@@ -0,0 +1,64 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/region.h -+// Purpose: -+// Author: Adam Hilss -+// Copyright: (c) 2019 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#ifndef _WX_WASM_REGION_H__ -+#define _WX_WASM_REGION_H__ -+ -+#include "wx/generic/region.h" -+ -+class WXDLLIMPEXP_CORE wxRegion : public wxRegionGeneric -+{ -+public: -+ wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h) -+ : wxRegionGeneric(x,y,w,h) -+ {} -+ wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight) -+ : wxRegionGeneric(topLeft, bottomRight) -+ {} -+ wxRegion(const wxRect& rect) -+ : wxRegionGeneric(rect) -+ {} -+ wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE) -+ : wxRegionGeneric(n, points, fillStyle) -+ {} -+ wxRegion(const wxBitmap& bmp) -+ : wxRegionGeneric() -+ { Union(bmp); } -+ wxRegion(const wxBitmap& bmp, -+ const wxColour& transColour, int tolerance = 0) -+ : wxRegionGeneric() -+ { Union(bmp, transColour, tolerance); } -+ virtual ~wxRegion() {} -+ wxRegion(const wxRegion& r) -+ : wxRegionGeneric(r) -+ {} -+ wxRegion() {} -+ wxRegion& operator= (const wxRegion& r) -+ { return *(wxRegion*)&(this->wxRegionGeneric::operator=(r)); } -+ -+private: -+ wxDECLARE_DYNAMIC_CLASS(wxRegion); -+}; -+ -+class WXDLLIMPEXP_CORE wxRegionIterator : public wxRegionIteratorGeneric -+{ -+public: -+ wxRegionIterator() {} -+ wxRegionIterator(const wxRegion& region) -+ : wxRegionIteratorGeneric(region) -+ {} -+ wxRegionIterator(const wxRegionIterator& iterator) -+ : wxRegionIteratorGeneric(iterator) -+ {} -+ virtual ~wxRegionIterator() {} -+ -+ wxRegionIterator& operator=(const wxRegionIterator& iter) -+ { return *(wxRegionIterator*)&(this->wxRegionIteratorGeneric::operator=(iter)); } -+}; -+ -+#endif // _WX_WASM_REGION_H__ -diff --git a/include/wx/wasm/setup.h b/include/wx/wasm/setup.h -new file mode 100644 -index 0000000000..5a68a22ce3 ---- /dev/null -+++ b/include/wx/wasm/setup.h -@@ -0,0 +1,1500 @@ -+/////////////////////////////////////////////////////////////////////////////// -+// Name: wx/setup_inc.h -+// Purpose: setup.h settings -+// Author: Vadim Zeitlin -+// Modified by: -+// Created: -+// Copyright: (c) Vadim Zeitlin -+// Licence: LGPL v2 -+/////////////////////////////////////////////////////////////////////////////// -+ -+// ---------------------------------------------------------------------------- -+// global settings -+// ---------------------------------------------------------------------------- -+ -+// define this to 0 when building wxBase library - this can also be done from -+// makefile/project file overriding the value here -+#ifndef wxUSE_GUI -+ #define wxUSE_GUI 1 -+#endif // wxUSE_GUI -+ -+// ---------------------------------------------------------------------------- -+// compatibility settings -+// ---------------------------------------------------------------------------- -+ -+// This setting determines the compatibility with 2.6 API: set it to 0 to -+// flag all cases of using deprecated functions. -+// -+// Default is 1 but please try building your code with 0 as the default will -+// change to 0 in the next version and the deprecated functions will disappear -+// in the version after it completely. -+// -+// Recommended setting: 0 (please update your code) -+#define WXWIN_COMPATIBILITY_2_6 0 -+ -+// This setting determines the compatibility with 2.8 API: set it to 0 to -+// flag all cases of using deprecated functions. -+// -+// Default is 1 but please try building your code with 0 as the default will -+// change to 0 in the next version and the deprecated functions will disappear -+// in the version after it completely. -+// -+// Recommended setting: 0 (please update your code) -+#define WXWIN_COMPATIBILITY_2_8 1 -+ -+// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when -+// default system font is used for wxWindow::GetCharWidth/Height() instead of -+// the current font. -+// -+// Default is 0 -+// -+// Recommended setting: 0 -+#define wxDIALOG_UNIT_COMPATIBILITY 0 -+ -+// ---------------------------------------------------------------------------- -+// debugging settings -+// ---------------------------------------------------------------------------- -+ -+// wxDEBUG_LEVEL will be defined as 1 in wx/debug.h so normally there is no -+// need to define it here. You may do it for two reasons: either completely -+// disable/compile out the asserts in release version (then do it inside #ifdef -+// NDEBUG) or, on the contrary, enable more asserts, including the usually -+// disabled ones, in the debug build (then do it inside #ifndef NDEBUG) -+// -+// #ifdef NDEBUG -+// #define wxDEBUG_LEVEL 0 -+// #else -+// #define wxDEBUG_LEVEL 2 -+// #endif -+ -+// wxHandleFatalExceptions() may be used to catch the program faults at run -+// time and, instead of terminating the program with a usual GPF message box, -+// call the user-defined wxApp::OnFatalException() function. If you set -+// wxUSE_ON_FATAL_EXCEPTION to 0, wxHandleFatalExceptions() will not work. -+// -+// This setting is for Win32 only and can only be enabled if your compiler -+// supports Win32 structured exception handling (currently only VC++ does) -+// -+// Default is 1 -+// -+// Recommended setting: 1 if your compiler supports it. -+#define wxUSE_ON_FATAL_EXCEPTION 1 -+ -+// Set this to 1 to be able to generate a human-readable (unlike -+// machine-readable minidump created by wxCrashReport::Generate()) stack back -+// trace when your program crashes using wxStackWalker -+// -+// Default is 1 if supported by the compiler. -+// -+// Recommended setting: 1, set to 0 if your programs never crash -+#define wxUSE_STACKWALKER 1 -+ -+// Set this to 1 to compile in wxDebugReport class which allows you to create -+// and optionally upload to your web site a debug report consisting of back -+// trace of the crash (if wxUSE_STACKWALKER == 1) and other information. -+// -+// Default is 1 if supported by the compiler. -+// -+// Recommended setting: 1, it is compiled into a separate library so there -+// is no overhead if you don't use it -+#define wxUSE_DEBUGREPORT 1 -+ -+// Generic comment about debugging settings: they are very useful if you don't -+// use any other memory leak detection tools such as Purify/BoundsChecker, but -+// are probably redundant otherwise. Also, Visual C++ CRT has the same features -+// as wxWidgets memory debugging subsystem built in since version 5.0 and you -+// may prefer to use it instead of built in memory debugging code because it is -+// faster and more fool proof. -+// -+// Using VC++ CRT memory debugging is enabled by default in debug build (_DEBUG -+// is defined) if wxUSE_GLOBAL_MEMORY_OPERATORS is *not* enabled (i.e. is 0) -+// and if __NO_VC_CRTDBG__ is not defined. -+ -+// The rest of the options in this section are obsolete and not supported, -+// enable them at your own risk. -+ -+// If 1, enables wxDebugContext, for writing error messages to file, etc. If -+// __WXDEBUG__ is not defined, will still use the normal memory operators. -+// -+// Default is 0 -+// -+// Recommended setting: 0 -+#define wxUSE_DEBUG_CONTEXT 0 -+ -+// If 1, enables debugging versions of wxObject::new and wxObject::delete *IF* -+// __WXDEBUG__ is also defined. -+// -+// WARNING: this code may not work with all architectures, especially if -+// alignment is an issue. This switch is currently ignored for mingw / cygwin -+// -+// Default is 0 -+// -+// Recommended setting: 1 if you are not using a memory debugging tool, else 0 -+#define wxUSE_MEMORY_TRACING 0 -+ -+// In debug mode, cause new and delete to be redefined globally. -+// If this causes problems (e.g. link errors which is a common problem -+// especially if you use another library which also redefines the global new -+// and delete), set this to 0. -+// This switch is currently ignored for mingw / cygwin -+// -+// Default is 0 -+// -+// Recommended setting: 0 -+#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 -+ -+// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If -+// this causes problems (e.g. link errors), set this to 0. You may need to set -+// this to 0 if using templates (at least for VC++). This switch is currently -+// ignored for MinGW/Cygwin. -+// -+// Default is 0 -+// -+// Recommended setting: 0 -+#define wxUSE_DEBUG_NEW_ALWAYS 0 -+ -+ -+// ---------------------------------------------------------------------------- -+// Unicode support -+// ---------------------------------------------------------------------------- -+ -+// These settings are obsolete: the library is always built in Unicode mode -+// now, only set wxUSE_UNICODE to 0 to compile legacy code in ANSI mode if -+// absolutely necessary -- updating it is strongly recommended as the ANSI mode -+// will disappear completely in future wxWidgets releases. -+#ifndef wxUSE_UNICODE -+ #define wxUSE_UNICODE 1 -+#endif -+ -+// wxUSE_WCHAR_T is required by wxWidgets now, don't change. -+#define wxUSE_WCHAR_T 1 -+ -+// ---------------------------------------------------------------------------- -+// global features -+// ---------------------------------------------------------------------------- -+ -+// Compile library in exception-safe mode? If set to 1, the library will try to -+// behave correctly in presence of exceptions (even though it still will not -+// use the exceptions itself) and notify the user code about any unhandled -+// exceptions. If set to 0, propagation of the exceptions through the library -+// code will lead to undefined behaviour -- but the code itself will be -+// slightly smaller and faster. -+// -+// Note that like wxUSE_THREADS this option is automatically set to 0 if -+// wxNO_EXCEPTIONS is defined. -+// -+// Default is 1 -+// -+// Recommended setting: depends on whether you intend to use C++ exceptions -+// in your own code (1 if you do, 0 if you don't) -+#define wxUSE_EXCEPTIONS 1 -+ -+// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI -+// -+// Default is 0 -+// -+// Recommended setting: 0 (this is still work in progress...) -+#define wxUSE_EXTENDED_RTTI 0 -+ -+// Support for message/error logging. This includes wxLogXXX() functions and -+// wxLog and derived classes. Don't set this to 0 unless you really know what -+// you are doing. -+// -+// Default is 1 -+// -+// Recommended setting: 1 (always) -+#define wxUSE_LOG 1 -+ -+// Recommended setting: 1 -+#define wxUSE_LOGWINDOW 1 -+ -+// Recommended setting: 1 -+#define wxUSE_LOGGUI 1 -+ -+// Recommended setting: 1 -+#define wxUSE_LOG_DIALOG 1 -+ -+// Support for command line parsing using wxCmdLineParser class. -+// -+// Default is 1 -+// -+// Recommended setting: 1 (can be set to 0 if you don't use the cmd line) -+#define wxUSE_CMDLINE_PARSER 1 -+ -+// Support for multithreaded applications: if 1, compile in thread classes -+// (thread.h) and make the library a bit more thread safe. Although thread -+// support is quite stable by now, you may still consider recompiling the -+// library without it if you have no use for it - this will result in a -+// somewhat smaller and faster operation. -+// -+// Notice that if wxNO_THREADS is defined, wxUSE_THREADS is automatically reset -+// to 0 in wx/chkconf.h, so, for example, if you set USE_THREADS to 0 in -+// build/msw/config.* file this value will have no effect. -+// -+// Default is 1 -+// -+// Recommended setting: 0 unless you do plan to develop MT applications -+#define wxUSE_THREADS 1 -+ -+// If enabled, compiles wxWidgets streams classes -+// -+// wx stream classes are used for image IO, process IO redirection, network -+// protocols implementation and much more and so disabling this results in a -+// lot of other functionality being lost. -+// -+// Default is 1 -+// -+// Recommended setting: 1 as setting it to 0 disables many other things -+#define wxUSE_STREAMS 1 -+ -+// Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf. -+// Note that if the system's implementation does not support positional -+// parameters, setting this to 1 forces the use of the wxWidgets implementation -+// of wxVsnprintf. The standard vsnprintf() supports positional parameters on -+// many Unix systems but usually doesn't under Windows. -+// -+// Positional parameters are very useful when translating a program since using -+// them in formatting strings allow translators to correctly reorder the -+// translated sentences. -+// -+// Default is 1 -+// -+// Recommended setting: 1 if you want to support multiple languages -+#define wxUSE_PRINTF_POS_PARAMS 1 -+ -+// Enable the use of compiler-specific thread local storage keyword, if any. -+// This is used for wxTLS_XXX() macros implementation and normally should use -+// the compiler-provided support as it's simpler and more efficient, but is -+// disabled under Windows in wx/msw/chkconf.h as it can't be used if wxWidgets -+// is used in a dynamically loaded Win32 DLL (i.e. using LoadLibrary()) under -+// XP as this triggers a bug in compiler TLS support that results in crashes -+// when any TLS variables are used. -+// -+// If you're absolutely sure that your build of wxWidgets is never going to be -+// used in such situation, either because it's not going to be linked from any -+// kind of plugin or because you only target Vista or later systems, you can -+// set this to 2 to force the use of compiler TLS even under MSW. -+// -+// Default is 1 meaning that compiler TLS is used only if it's 100% safe. -+// -+// Recommended setting: 2 if you want to have maximal performance and don't -+// care about the scenario described above. -+#define wxUSE_COMPILER_TLS 1 -+ -+// ---------------------------------------------------------------------------- -+// Interoperability with the standard library. -+// ---------------------------------------------------------------------------- -+ -+// Set wxUSE_STL to 1 to enable maximal interoperability with the standard -+// library, even at the cost of backwards compatibility. -+// -+// Default is 0 -+// -+// Recommended setting: 0 as the options below already provide a relatively -+// good level of interoperability and changing this option arguably isn't worth -+// diverging from the official builds of the library. -+#define wxUSE_STL 0 -+ -+// This is not a real option but is used as the default value for -+// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS. -+// -+// Currently the Digital Mars and Watcom compilers come without standard C++ -+// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have -+// them (e.g. from STLPort). -+// -+// VC++ 5.0 does include standard C++ library headers, however they produce -+// many warnings that can't be turned off when compiled at warning level 4. -+#if defined(__DMC__) || defined(__WATCOMC__) \ -+ || (defined(_MSC_VER) && _MSC_VER < 1200) -+ #define wxUSE_STD_DEFAULT 0 -+#else -+ #define wxUSE_STD_DEFAULT 1 -+#endif -+ -+// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<> -+// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but -+// usually more limited) implementations are used which allows to avoid the -+// dependency on the C++ run-time library. -+// -+// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't -+// support using standard containers and that VC6 needs non-default options for -+// such build to avoid getting "fatal error C1076: compiler limit : internal -+// heap limit reached; use /Zm to specify a higher limit" in its own standard -+// headers, so you need to ensure you do increase the heap size before enabling -+// this option for this compiler. -+// -+// Default is 0 for compatibility reasons. -+// -+// Recommended setting: 1 unless compatibility with the official wxWidgets -+// build and/or the existing code is a concern. -+#define wxUSE_STD_CONTAINERS 0 -+ -+// Use standard C++ streams if 1 instead of wx streams in some places. If -+// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the -+// standard streams library. -+// -+// Notice that enabling this does not replace wx streams with std streams -+// everywhere, in a lot of places wx streams are used no matter what. -+// -+// Default is 1 if compiler supports it. -+// -+// Recommended setting: 1 if you use the standard streams anyhow and so -+// dependency on the standard streams library is not a -+// problem -+#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT -+ -+// Enable minimal interoperability with the standard C++ string class if 1. -+// "Minimal" means that wxString can be constructed from std::string or -+// std::wstring but can't be implicitly converted to them. You need to enable -+// the option below for the latter. -+// -+// Default is 1 for most compilers. -+// -+// Recommended setting: 1 unless you want to ensure your program doesn't use -+// the standard C++ library at all. -+#define wxUSE_STD_STRING wxUSE_STD_DEFAULT -+ -+// Make wxString as much interchangeable with std::[w]string as possible, in -+// particular allow implicit conversion of wxString to either of these classes. -+// This comes at a price (or a benefit, depending on your point of view) of not -+// allowing implicit conversion to "const char *" and "const wchar_t *". -+// -+// Because a lot of existing code relies on these conversions, this option is -+// disabled by default but can be enabled for your build if you don't care -+// about compatibility. -+// -+// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled. -+// -+// Recommended setting: 0 to remain compatible with the official builds of -+// wxWidgets. -+#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL -+ -+// VC++ 4.2 and above allows and but you can't mix -+// them. Set this option to 1 to use , 0 to use . -+// -+// Note that newer compilers (including VC++ 7.1 and later) don't support -+// wxUSE_IOSTREAMH == 1 and so will be used anyhow. -+// -+// Default is 0. -+// -+// Recommended setting: 0, only set to 1 if you use a really old compiler -+#define wxUSE_IOSTREAMH 0 -+ -+ -+// ---------------------------------------------------------------------------- -+// non GUI features selection -+// ---------------------------------------------------------------------------- -+ -+// Set wxUSE_LONGLONG to 1 to compile the wxLongLong class. This is a 64 bit -+// integer which is implemented in terms of native 64 bit integers if any or -+// uses emulation otherwise. -+// -+// This class is required by wxDateTime and so you should enable it if you want -+// to use wxDateTime. For most modern platforms, it will use the native 64 bit -+// integers in which case (almost) all of its functions are inline and it -+// almost does not take any space, so there should be no reason to switch it -+// off. -+// -+// Recommended setting: 1 -+#define wxUSE_LONGLONG 1 -+ -+// Set wxUSE_BASE64 to 1, to compile in Base64 support. This is required for -+// storing binary data in wxConfig on most platforms. -+// -+// Default is 1. -+// -+// Recommended setting: 1 (but can be safely disabled if you don't use it) -+#define wxUSE_BASE64 1 -+ -+// Set this to 1 to be able to use wxEventLoop even in console applications -+// (i.e. using base library only, without GUI). This is mostly useful for -+// processing socket events but is also necessary to use timers in console -+// applications -+// -+// Default is 1. -+// -+// Recommended setting: 1 (but can be safely disabled if you don't use it) -+#define wxUSE_CONSOLE_EVENTLOOP 1 -+ -+// Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level -+// POSIX functions for file access, wxFFile uses ANSI C stdio.h functions. -+// -+// Default is 1 -+// -+// Recommended setting: 1 (wxFile is highly recommended as it is required by -+// i18n code, wxFileConfig and others) -+#define wxUSE_FILE 1 -+#define wxUSE_FFILE 1 -+ -+// Use wxFSVolume class providing access to the configured/active mount points -+// -+// Default is 1 -+// -+// Recommended setting: 1 (but may be safely disabled if you don't use it) -+#define wxUSE_FSVOLUME 1 -+ -+// Use wxStandardPaths class which allows to retrieve some standard locations -+// in the file system -+// -+// Default is 1 -+// -+// Recommended setting: 1 (may be disabled to save space, but not much) -+#define wxUSE_STDPATHS 1 -+ -+// use wxTextBuffer class: required by wxTextFile -+#define wxUSE_TEXTBUFFER 1 -+ -+// use wxTextFile class: requires wxFile and wxTextBuffer, required by -+// wxFileConfig -+#define wxUSE_TEXTFILE 1 -+ -+// i18n support: _() macro, wxLocale class. Requires wxTextFile. -+#define wxUSE_INTL 1 -+ -+// Provide wxFoo_l() functions similar to standard foo() functions but taking -+// an extra locale parameter. -+// -+// Notice that this is fully implemented only for the systems providing POSIX -+// xlocale support or Microsoft Visual C++ >= 8 (which provides proprietary -+// almost-equivalent of xlocale functions), otherwise wxFoo_l() functions will -+// only work for the current user locale and "C" locale. You can use -+// wxHAS_XLOCALE_SUPPORT to test whether the full support is available. -+// -+// Default is 1 -+// -+// Recommended setting: 1 but may be disabled if you are writing programs -+// running only in C locale anyhow -+#define wxUSE_XLOCALE 1 -+ -+// Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which -+// allow to manipulate dates, times and time intervals. wxDateTime replaces the -+// old wxTime and wxDate classes which are still provided for backwards -+// compatibility (and implemented in terms of wxDateTime). -+// -+// Note that this class is relatively new and is still officially in alpha -+// stage because some features are not yet (fully) implemented. It is already -+// quite useful though and should only be disabled if you are aiming at -+// absolutely minimal version of the library. -+// -+// Requires: wxUSE_LONGLONG -+// -+// Default is 1 -+// -+// Recommended setting: 1 -+#define wxUSE_DATETIME 1 -+ -+// Set wxUSE_TIMER to 1 to compile wxTimer class -+// -+// Default is 1 -+// -+// Recommended setting: 1 -+#define wxUSE_TIMER 1 -+ -+// Use wxStopWatch clas. -+// -+// Default is 1 -+// -+// Recommended setting: 1 (needed by wxSocket) -+#define wxUSE_STOPWATCH 1 -+ -+// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher -+// -+// Default is 1 -+// -+// Recommended setting: 1 -+#define wxUSE_FSWATCHER 1 -+ -+// Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes -+// which allow the application to store its settings in the persistent -+// storage. Setting this to 1 will also enable on-demand creation of the -+// global config object in wxApp. -+// -+// See also wxUSE_CONFIG_NATIVE below. -+// -+// Recommended setting: 1 -+#define wxUSE_CONFIG 1 -+ -+// If wxUSE_CONFIG is 1, you may choose to use either the native config -+// classes under Windows (using .INI files under Win16 and the registry under -+// Win32) or the portable text file format used by the config classes under -+// Unix. -+// -+// Default is 1 to use native classes. Note that you may still use -+// wxFileConfig even if you set this to 1 - just the config object created by -+// default for the applications needs will be a wxRegConfig or wxIniConfig and -+// not wxFileConfig. -+// -+// Recommended setting: 1 -+#define wxUSE_CONFIG_NATIVE 1 -+ -+// If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows -+// to connect/disconnect from the network and be notified whenever the dial-up -+// network connection is established/terminated. Requires wxUSE_DYNAMIC_LOADER. -+// -+// Default is 1. -+// -+// Recommended setting: 1 -+#define wxUSE_DIALUP_MANAGER 1 -+ -+// Compile in classes for run-time DLL loading and function calling. -+// Required by wxUSE_DIALUP_MANAGER. -+// -+// This setting is for Win32 only -+// -+// Default is 1. -+// -+// Recommended setting: 1 -+#define wxUSE_DYNLIB_CLASS 1 -+ -+// experimental, don't use for now -+#define wxUSE_DYNAMIC_LOADER 1 -+ -+// Set to 1 to use socket classes -+#define wxUSE_SOCKETS 1 -+ -+// Set to 1 to use ipv6 socket classes (requires wxUSE_SOCKETS) -+// -+// Notice that currently setting this option under Windows will result in -+// programs which can only run on recent OS versions (with ws2_32.dll -+// installed) which is why it is disabled by default. -+// -+// Default is 1. -+// -+// Recommended setting: 1 if you need IPv6 support -+#define wxUSE_IPV6 0 -+ -+// Set to 1 to enable virtual file systems (required by wxHTML) -+#define wxUSE_FILESYSTEM 1 -+ -+// Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM) -+#define wxUSE_FS_ZIP 1 -+ -+// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM) -+#define wxUSE_FS_ARCHIVE 1 -+ -+// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM) -+#define wxUSE_FS_INET 1 -+ -+// wxArchive classes for accessing archives such as zip and tar -+#define wxUSE_ARCHIVE_STREAMS 1 -+ -+// Set to 1 to compile wxZipInput/OutputStream classes. -+#define wxUSE_ZIPSTREAM 1 -+ -+// Set to 1 to compile wxTarInput/OutputStream classes. -+#define wxUSE_TARSTREAM 1 -+ -+// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by -+// wxUSE_LIBPNG -+#define wxUSE_ZLIB 1 -+ -+// If enabled, the code written by Apple will be used to write, in a portable -+// way, float on the disk. See extended.c for the license which is different -+// from wxWidgets one. -+// -+// Default is 1. -+// -+// Recommended setting: 1 unless you don't like the license terms (unlikely) -+#define wxUSE_APPLE_IEEE 1 -+ -+// Joystick support class -+#define wxUSE_JOYSTICK 1 -+ -+// wxFontEnumerator class -+#define wxUSE_FONTENUM 1 -+ -+// wxFontMapper class -+#define wxUSE_FONTMAP 1 -+ -+// wxMimeTypesManager class -+#define wxUSE_MIMETYPE 1 -+ -+// wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP -+// or wxURL you need to set this to 1. -+// -+// Default is 1. -+// -+// Recommended setting: 1 -+#define wxUSE_PROTOCOL 1 -+ -+// The settings for the individual URL schemes -+#define wxUSE_PROTOCOL_FILE 1 -+#define wxUSE_PROTOCOL_FTP 1 -+#define wxUSE_PROTOCOL_HTTP 1 -+ -+// Define this to use wxURL class. -+#define wxUSE_URL 1 -+ -+// Define this to use native platform url and protocol support. -+// Currently valid only for MS-Windows. -+// Note: if you set this to 1, you can open ftp/http/gopher sites -+// and obtain a valid input stream for these sites -+// even when you set wxUSE_PROTOCOL_FTP/HTTP to 0. -+// Doing so reduces the code size. -+// -+// This code is experimental and subject to change. -+#define wxUSE_URL_NATIVE 0 -+ -+// Support for wxVariant class used in several places throughout the library, -+// notably in wxDataViewCtrl API. -+// -+// Default is 1. -+// -+// Recommended setting: 1 unless you want to reduce the library size as much as -+// possible in which case setting this to 0 can gain up to 100KB. -+#define wxUSE_VARIANT 1 -+ -+// Support for wxAny class, the successor for wxVariant. -+// -+// Default is 1. -+// -+// Recommended setting: 1 unless you want to reduce the library size by a small amount, -+// or your compiler cannot for some reason cope with complexity of templates used. -+#define wxUSE_ANY 1 -+ -+// Support for regular expression matching via wxRegEx class: enable this to -+// use POSIX regular expressions in your code. You need to compile regex -+// library from src/regex to use it under Windows. -+// -+// Default is 0 -+// -+// Recommended setting: 1 if your compiler supports it, if it doesn't please -+// contribute us a makefile for src/regex for it -+#define wxUSE_REGEX 1 -+ -+// wxSystemOptions class -+#define wxUSE_SYSTEM_OPTIONS 1 -+ -+// wxSound class -+#define wxUSE_SOUND 1 -+ -+// Use wxMediaCtrl -+// -+// Default is 1. -+// -+// Recommended setting: 1 -+#define wxUSE_MEDIACTRL 1 -+ -+// Use wxWidget's XRC XML-based resource system. Recommended. -+// -+// Default is 1 -+// -+// Recommended setting: 1 (requires wxUSE_XML) -+#define wxUSE_XRC 1 -+ -+// XML parsing classes. Note that their API will change in the future, so -+// using wxXmlDocument and wxXmlNode in your app is not recommended. -+// -+// Default is the same as wxUSE_XRC, i.e. 1 by default. -+// -+// Recommended setting: 1 (required by XRC) -+#define wxUSE_XML wxUSE_XRC -+ -+// Use wxWidget's AUI docking system -+// -+// Default is 1 -+// -+// Recommended setting: 1 -+#define wxUSE_AUI 1 -+ -+// Use wxWidget's Ribbon classes for interfaces -+// -+// Default is 1 -+// -+// Recommended setting: 1 -+#define wxUSE_RIBBON 1 -+ -+// Use wxPropertyGrid. -+// -+// Default is 1 -+// -+// Recommended setting: 1 -+#define wxUSE_PROPGRID 1 -+ -+// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla. -+// -+// Default is 1 -+// -+// Recommended setting: 1 -+#define wxUSE_STC 1 -+ -+// Use wxWidget's web viewing classes -+// -+// Default is 1 -+// -+// Recommended setting: 1 -+#define wxUSE_WEBVIEW 1 -+ -+// Use the IE wxWebView backend -+// -+// Default is 1 on MSW -+// -+// Recommended setting: 1 -+#ifdef __WXMSW__ -+#define wxUSE_WEBVIEW_IE 1 -+#else -+#define wxUSE_WEBVIEW_IE 0 -+#endif -+ -+// Use the WebKit wxWebView backend -+// -+// Default is 1 on GTK and OSX -+// -+// Recommended setting: 1 -+#if defined(__WXGTK__) || defined(__WXOSX__) -+#define wxUSE_WEBVIEW_WEBKIT 1 -+#else -+#define wxUSE_WEBVIEW_WEBKIT 0 -+#endif -+ -+// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced -+// 2D drawing API. (Still somewhat experimental) -+// -+// Please note that on Windows gdiplus.dll is loaded dynamically which means -+// that nothing special needs to be done as long as you don't use -+// wxGraphicsContext at all or only use it on XP and later systems but you -+// still do need to distribute it yourself for an application using -+// wxGraphicsContext to be runnable on pre-XP systems. -+// -+// Default is 1 except if you're using a non-Microsoft compiler under Windows -+// as only MSVC7+ is known to ship with gdiplus.h. For other compilers (e.g. -+// mingw32) you may need to install the headers (and just the headers) -+// yourself. If you do, change the setting below manually. -+// -+// Recommended setting: 1 if supported by the compilation environment -+ -+// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is -+// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined -+#ifdef _MSC_VER -+# if _MSC_VER >= 1310 -+ // MSVC7.1+ comes with new enough Platform SDK, enable -+ // wxGraphicsContext support for it -+# define wxUSE_GRAPHICS_CONTEXT 1 -+# else -+ // MSVC 6 didn't include GDI+ headers so disable by default, enable it -+ // here if you use MSVC 6 with a newer SDK -+# define wxUSE_GRAPHICS_CONTEXT 0 -+# endif -+#else -+ // Disable support for other Windows compilers, enable it if your compiler -+ // comes with new enough SDK or you installed the headers manually. -+ // -+ // Notice that this will be set by configure under non-Windows platforms -+ // anyhow so the value there is not important. -+# define wxUSE_GRAPHICS_CONTEXT 0 -+#endif -+ -+// Enable wxGraphicsContext implementation using Cairo library. -+// -+// This is not needed under Windows and detected automatically by configure -+// under other systems, however you may set this to 1 manually if you installed -+// Cairo under Windows yourself and prefer to use it instead the native GDI+ -+// implementation. -+// -+// Default is 0 -+// -+// Recommended setting: 0 -+#define wxUSE_CAIRO 0 -+ -+ -+// ---------------------------------------------------------------------------- -+// Individual GUI controls -+// ---------------------------------------------------------------------------- -+ -+// You must set wxUSE_CONTROLS to 1 if you are using any controls at all -+// (without it, wxControl class is not compiled) -+// -+// Default is 1 -+// -+// Recommended setting: 1 (don't change except for very special programs) -+#define wxUSE_CONTROLS 1 -+ -+// Support markup in control labels, i.e. provide wxControl::SetLabelMarkup(). -+// Currently markup is supported only by a few controls and only some ports but -+// their number will increase with time. -+// -+// Default is 1 -+// -+// Recommended setting: 1 (may be set to 0 if you want to save on code size) -+#define wxUSE_MARKUP 1 -+ -+// wxPopupWindow class is a top level transient window. It is currently used -+// to implement wxTipWindow -+// -+// Default is 1 -+// -+// Recommended setting: 1 (may be set to 0 if you don't wxUSE_TIPWINDOW) -+#define wxUSE_POPUPWIN 1 -+ -+// wxTipWindow allows to implement the custom tooltips, it is used by the -+// context help classes. Requires wxUSE_POPUPWIN. -+// -+// Default is 1 -+// -+// Recommended setting: 1 (may be set to 0) -+#define wxUSE_TIPWINDOW 1 -+ -+// Each of the settings below corresponds to one wxWidgets control. They are -+// all switched on by default but may be disabled if you are sure that your -+// program (including any standard dialogs it can show!) doesn't need them and -+// if you desperately want to save some space. If you use any of these you must -+// set wxUSE_CONTROLS as well. -+// -+// Default is 1 -+// -+// Recommended setting: 1 -+#define wxUSE_ANIMATIONCTRL 1 // wxAnimationCtrl -+#define wxUSE_BANNERWINDOW 1 // wxBannerWindow -+#define wxUSE_BUTTON 1 // wxButton -+#define wxUSE_BMPBUTTON 1 // wxBitmapButton -+#define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl -+#define wxUSE_CHECKBOX 1 // wxCheckBox -+#define wxUSE_CHECKLISTBOX 1 // wxCheckListBox (requires wxUSE_OWNER_DRAWN) -+#define wxUSE_CHOICE 1 // wxChoice -+#define wxUSE_COLLPANE 1 // wxCollapsiblePane -+#define wxUSE_COLOURPICKERCTRL 1 // wxColourPickerCtrl -+#define wxUSE_COMBOBOX 1 // wxComboBox -+#define wxUSE_COMMANDLINKBUTTON 1 // wxCommandLinkButton -+#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl -+#define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl -+#define wxUSE_DIRPICKERCTRL 1 // wxDirPickerCtrl -+#define wxUSE_EDITABLELISTBOX 1 // wxEditableListBox -+#define wxUSE_FILECTRL 1 // wxFileCtrl -+#define wxUSE_FILEPICKERCTRL 1 // wxFilePickerCtrl -+#define wxUSE_FONTPICKERCTRL 1 // wxFontPickerCtrl -+#define wxUSE_GAUGE 1 // wxGauge -+#define wxUSE_HEADERCTRL 1 // wxHeaderCtrl -+#define wxUSE_HYPERLINKCTRL 1 // wxHyperlinkCtrl -+#define wxUSE_LISTBOX 1 // wxListBox -+#define wxUSE_LISTCTRL 1 // wxListCtrl -+#define wxUSE_RADIOBOX 1 // wxRadioBox -+#define wxUSE_RADIOBTN 1 // wxRadioButton -+#define wxUSE_RICHMSGDLG 1 // wxRichMessageDialog -+#define wxUSE_SCROLLBAR 1 // wxScrollBar -+#define wxUSE_SEARCHCTRL 1 // wxSearchCtrl -+#define wxUSE_SLIDER 1 // wxSlider -+#define wxUSE_SPINBTN 1 // wxSpinButton -+#define wxUSE_SPINCTRL 1 // wxSpinCtrl -+#define wxUSE_STATBOX 1 // wxStaticBox -+#define wxUSE_STATLINE 1 // wxStaticLine -+#define wxUSE_STATTEXT 1 // wxStaticText -+#define wxUSE_STATBMP 1 // wxStaticBitmap -+#define wxUSE_TEXTCTRL 1 // wxTextCtrl -+#define wxUSE_TIMEPICKCTRL 1 // wxTimePickerCtrl -+#define wxUSE_TOGGLEBTN 1 // requires wxButton -+#define wxUSE_TREECTRL 1 // wxTreeCtrl -+#define wxUSE_TREELISTCTRL 1 // wxTreeListCtrl -+ -+// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR -+// below either wxStatusBar95 or a generic wxStatusBar will be used. -+// -+// Default is 1 -+// -+// Recommended setting: 1 -+#define wxUSE_STATUSBAR 1 -+ -+// Two status bar implementations are available under Win32: the generic one -+// or the wrapper around native control. For native look and feel the native -+// version should be used. -+// -+// Default is 1 for the platforms where native status bar is supported. -+// -+// Recommended setting: 1 (there is no advantage in using the generic one) -+#define wxUSE_NATIVE_STATUSBAR 1 -+ -+// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar -+// classes at all. Otherwise, use the native toolbar class unless -+// wxUSE_TOOLBAR_NATIVE is 0. -+// -+// Default is 1 for all settings. -+// -+// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE. -+#define wxUSE_TOOLBAR 1 -+#define wxUSE_TOOLBAR_NATIVE 1 -+ -+// wxNotebook is a control with several "tabs" located on one of its sides. It -+// may be used to logically organise the data presented to the user instead of -+// putting everything in one huge dialog. It replaces wxTabControl and related -+// classes of wxWin 1.6x. -+// -+// Default is 1. -+// -+// Recommended setting: 1 -+#define wxUSE_NOTEBOOK 1 -+ -+// wxListbook control is similar to wxNotebook but uses wxListCtrl instead of -+// the tabs -+// -+// Default is 1. -+// -+// Recommended setting: 1 -+#define wxUSE_LISTBOOK 1 -+ -+// wxChoicebook control is similar to wxNotebook but uses wxChoice instead of -+// the tabs -+// -+// Default is 1. -+// -+// Recommended setting: 1 -+#define wxUSE_CHOICEBOOK 1 -+ -+// wxTreebook control is similar to wxNotebook but uses wxTreeCtrl instead of -+// the tabs -+// -+// Default is 1. -+// -+// Recommended setting: 1 -+#define wxUSE_TREEBOOK 1 -+ -+// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of -+// tabs -+// -+// Default is 1. -+// -+// Recommended setting: 1 -+#define wxUSE_TOOLBOOK 1 -+ -+// wxTaskBarIcon is a small notification icon shown in the system toolbar or -+// dock. -+// -+// Default is 1. -+// -+// Recommended setting: 1 (but can be set to 0 if you don't need it) -+#define wxUSE_TASKBARICON 1 -+ -+// wxGrid class -+// -+// Default is 1, set to 0 to cut down compilation time and binaries size if you -+// don't use it. -+// -+// Recommended setting: 1 -+// -+#define wxUSE_GRID 1 -+ -+// wxMiniFrame class: a frame with narrow title bar -+// -+// Default is 1. -+// -+// Recommended setting: 1 (it doesn't cost almost anything) -+#define wxUSE_MINIFRAME 1 -+ -+// wxComboCtrl and related classes: combobox with custom popup window and -+// not necessarily a listbox. -+// -+// Default is 1. -+// -+// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it -+// it used by wxComboBox -+#define wxUSE_COMBOCTRL 1 -+ -+// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox -+// items. -+// -+// Default is 1. -+// -+// Recommended setting: 1 but can be safely set to 0, except where it is -+// needed as a base class for generic wxBitmapComboBox. -+#define wxUSE_ODCOMBOBOX 1 -+ -+// wxBitmapComboBox is a combobox that can have images in front of text items. -+// -+// Default is 1. -+// -+// Recommended setting: 1 but can be safely set to 0 -+#define wxUSE_BITMAPCOMBOBOX 1 -+ -+// wxRearrangeCtrl is a wxCheckListBox with two buttons allowing to move items -+// up and down in it. It is also used as part of wxRearrangeDialog. -+// -+// Default is 1. -+// -+// Recommended setting: 1 but can be safely set to 0 (currently used only by -+// wxHeaderCtrl) -+#define wxUSE_REARRANGECTRL 1 -+ -+// ---------------------------------------------------------------------------- -+// Miscellaneous GUI stuff -+// ---------------------------------------------------------------------------- -+ -+// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar) -+#define wxUSE_ACCEL 1 -+ -+// Use the standard art provider. The icons returned by this provider are -+// embedded into the library as XPMs so disabling it reduces the library size -+// somewhat but this should only be done if you use your own custom art -+// provider returning the icons or never use any icons not provided by the -+// native art provider (which might not be implemented at all for some -+// platforms) or by the Tango icons provider (if it's not itself disabled -+// below). -+// -+// Default is 1. -+// -+// Recommended setting: 1 unless you use your own custom art provider. -+#define wxUSE_ARTPROVIDER_STD 1 -+ -+// Use art provider providing Tango icons: this art provider has higher quality -+// icons than the default ones using smaller size XPM icons without -+// transparency but the embedded PNG icons add to the library size. -+// -+// Default is 1 under non-GTK ports. Under wxGTK the native art provider using -+// the GTK+ stock icons replaces it so it is normally not necessary. -+// -+// Recommended setting: 1 but can be turned off to reduce the library size. -+#define wxUSE_ARTPROVIDER_TANGO 1 -+ -+// Hotkey support (currently Windows only) -+#define wxUSE_HOTKEY 1 -+ -+// Use wxCaret: a class implementing a "cursor" in a text control (called caret -+// under Windows). -+// -+// Default is 1. -+// -+// Recommended setting: 1 (can be safely set to 0, not used by the library) -+#define wxUSE_CARET 1 -+ -+// Use wxDisplay class: it allows enumerating all displays on a system and -+// their geometries as well as finding the display on which the given point or -+// window lies. -+// -+// Default is 1. -+// -+// Recommended setting: 1 if you need it, can be safely set to 0 otherwise -+#define wxUSE_DISPLAY 1 -+ -+// Miscellaneous geometry code: needed for Canvas library -+#define wxUSE_GEOMETRY 1 -+ -+// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and -+// wxListCtrl. -+// -+// Default is 1. -+// -+// Recommended setting: 1 (set it to 0 if you don't use any of the controls -+// enumerated above, then this class is mostly useless too) -+#define wxUSE_IMAGLIST 1 -+ -+// Use wxInfoBar class. -+// -+// Default is 1. -+// -+// Recommended setting: 1 (but can be disabled without problems as nothing -+// depends on it) -+#define wxUSE_INFOBAR 1 -+ -+// Use wxMenu, wxMenuBar, wxMenuItem. -+// -+// Default is 1. -+// -+// Recommended setting: 1 (can't be disabled under MSW) -+#define wxUSE_MENUS 1 -+ -+// Use wxNotificationMessage. -+// -+// wxNotificationMessage allows to show non-intrusive messages to the user -+// using balloons, banners, popups or whatever is the appropriate method for -+// the current platform. -+// -+// Default is 1. -+// -+// Recommended setting: 1 -+#define wxUSE_NOTIFICATION_MESSAGE 1 -+ -+// wxPreferencesEditor provides a common API for different ways of presenting -+// the standard "Preferences" or "Properties" dialog under different platforms -+// (e.g. some use modal dialogs, some use modeless ones; some apply the changes -+// immediately while others require an explicit "Apply" button). -+// -+// Default is 1. -+// -+// Recommended setting: 1 (but can be safely disabled if you don't use it) -+#define wxUSE_PREFERENCES_EDITOR 1 -+ -+// wxRichToolTip is a customizable tooltip class which has more functionality -+// than the stock (but native, unlike this class) wxToolTip. -+// -+// Default is 1. -+// -+// Recommended setting: 1 (but can be safely set to 0 if you don't need it) -+#define wxUSE_RICHTOOLTIP 1 -+ -+// Use wxSashWindow class. -+// -+// Default is 1. -+// -+// Recommended setting: 1 -+#define wxUSE_SASH 1 -+ -+// Use wxSplitterWindow class. -+// -+// Default is 1. -+// -+// Recommended setting: 1 -+#define wxUSE_SPLITTER 1 -+ -+// Use wxToolTip and wxWindow::Set/GetToolTip() methods. -+// -+// Default is 1. -+// -+// Recommended setting: 1 -+#define wxUSE_TOOLTIPS 1 -+ -+// wxValidator class and related methods -+#define wxUSE_VALIDATORS 1 -+ -+// Use reference counted ID management: this means that wxWidgets will track -+// the automatically allocated ids (those used when you use wxID_ANY when -+// creating a window, menu or toolbar item &c) instead of just supposing that -+// the program never runs out of them. This is mostly useful only under wxMSW -+// where the total ids range is limited to SHRT_MIN..SHRT_MAX and where -+// long-running programs can run into problems with ids reuse without this. On -+// the other platforms, where the ids have the full int range, this shouldn't -+// be necessary. -+#ifdef __WXMSW__ -+#define wxUSE_AUTOID_MANAGEMENT 1 -+#else -+#define wxUSE_AUTOID_MANAGEMENT 0 -+#endif -+ -+// ---------------------------------------------------------------------------- -+// common dialogs -+// ---------------------------------------------------------------------------- -+ -+// On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g. -+// file selector, printer dialog). Switching this off also switches off the -+// printing architecture and interactive wxPrinterDC. -+// -+// Default is 1 -+// -+// Recommended setting: 1 (unless it really doesn't work) -+#define wxUSE_COMMON_DIALOGS 1 -+ -+// wxBusyInfo displays window with message when app is busy. Works in same way -+// as wxBusyCursor -+#define wxUSE_BUSYINFO 1 -+ -+// Use single/multiple choice dialogs. -+// -+// Default is 1 -+// -+// Recommended setting: 1 (used in the library itself) -+#define wxUSE_CHOICEDLG 1 -+ -+// Use colour picker dialog -+// -+// Default is 1 -+// -+// Recommended setting: 1 -+#define wxUSE_COLOURDLG 1 -+ -+// wxDirDlg class for getting a directory name from user -+#define wxUSE_DIRDLG 1 -+ -+// TODO: setting to choose the generic or native one -+ -+// Use file open/save dialogs. -+// -+// Default is 1 -+// -+// Recommended setting: 1 (used in many places in the library itself) -+#define wxUSE_FILEDLG 1 -+ -+// Use find/replace dialogs. -+// -+// Default is 1 -+// -+// Recommended setting: 1 (but may be safely set to 0) -+#define wxUSE_FINDREPLDLG 1 -+ -+// Use font picker dialog -+// -+// Default is 1 -+// -+// Recommended setting: 1 (used in the library itself) -+#define wxUSE_FONTDLG 1 -+ -+// Use wxMessageDialog and wxMessageBox. -+// -+// Default is 1 -+// -+// Recommended setting: 1 (used in the library itself) -+#define wxUSE_MSGDLG 1 -+ -+// progress dialog class for lengthy operations -+#define wxUSE_PROGRESSDLG 1 -+ -+// support for startup tips (wxShowTip &c) -+#define wxUSE_STARTUP_TIPS 1 -+ -+// text entry dialog and wxGetTextFromUser function -+#define wxUSE_TEXTDLG 1 -+ -+// number entry dialog -+#define wxUSE_NUMBERDLG 1 -+ -+// splash screen class -+#define wxUSE_SPLASH 1 -+ -+// wizards -+#define wxUSE_WIZARDDLG 1 -+ -+// Compile in wxAboutBox() function showing the standard "About" dialog. -+// -+// Default is 1 -+// -+// Recommended setting: 1 but can be set to 0 to save some space if you don't -+// use this function -+#define wxUSE_ABOUTDLG 1 -+ -+// wxFileHistory class -+// -+// Default is 1 -+// -+// Recommended setting: 1 -+#define wxUSE_FILE_HISTORY 1 -+ -+// ---------------------------------------------------------------------------- -+// Metafiles support -+// ---------------------------------------------------------------------------- -+ -+// Windows supports the graphics format known as metafile which is, though not -+// portable, is widely used under Windows and so is supported by wxWin (under -+// Windows only, of course). Win16 (Win3.1) used the so-called "Window -+// MetaFiles" or WMFs which were replaced with "Enhanced MetaFiles" or EMFs in -+// Win32 (Win9x, NT, 2000). Both of these are supported in wxWin and, by -+// default, WMFs will be used under Win16 and EMFs under Win32. This may be -+// changed by setting wxUSE_WIN_METAFILES_ALWAYS to 1 and/or setting -+// wxUSE_ENH_METAFILE to 0. You may also set wxUSE_METAFILE to 0 to not compile -+// in any metafile related classes at all. -+// -+// Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS. -+// -+// Recommended setting: default or 0 for everything for portable programs. -+#define wxUSE_METAFILE 1 -+#define wxUSE_ENH_METAFILE 1 -+#define wxUSE_WIN_METAFILES_ALWAYS 0 -+ -+// ---------------------------------------------------------------------------- -+// Big GUI components -+// ---------------------------------------------------------------------------- -+ -+// Set to 0 to disable MDI support. -+// -+// Requires wxUSE_NOTEBOOK under platforms other than MSW. -+// -+// Default is 1. -+// -+// Recommended setting: 1, can be safely set to 0. -+#define wxUSE_MDI 1 -+ -+// Set to 0 to disable document/view architecture -+#define wxUSE_DOC_VIEW_ARCHITECTURE 1 -+ -+// Set to 0 to disable MDI document/view architecture -+// -+// Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE -+#define wxUSE_MDI_ARCHITECTURE 1 -+ -+// Set to 0 to disable print/preview architecture code -+#define wxUSE_PRINTING_ARCHITECTURE 1 -+ -+// wxHTML sublibrary allows to display HTML in wxWindow programs and much, -+// much more. -+// -+// Default is 1. -+// -+// Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a -+// smaller library. -+#define wxUSE_HTML 1 -+ -+// Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL -+// headers and libraries to be able to compile the library with wxUSE_GLCANVAS -+// set to 1 and, under Windows, also to add opengl32.lib and glu32.lib to the -+// list of libraries used to link your application (although this is done -+// implicitly for Microsoft Visual C++ users). -+// -+// Default is 1 unless the compiler is known to ship without the necessary -+// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE). -+// -+// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0 -+// otherwise. -+#define wxUSE_GLCANVAS 1 -+ -+// wxRichTextCtrl allows editing of styled text. -+// -+// Default is 1. -+// -+// Recommended setting: 1, set to 0 if you want compile a -+// smaller library. -+#define wxUSE_RICHTEXT 1 -+ -+// ---------------------------------------------------------------------------- -+// Data transfer -+// ---------------------------------------------------------------------------- -+ -+// Use wxClipboard class for clipboard copy/paste. -+// -+// Default is 1. -+// -+// Recommended setting: 1 -+#define wxUSE_CLIPBOARD 1 -+ -+// Use wxDataObject and related classes. Needed for clipboard and OLE drag and -+// drop -+// -+// Default is 1. -+// -+// Recommended setting: 1 -+#define wxUSE_DATAOBJ 1 -+ -+// Use wxDropTarget and wxDropSource classes for drag and drop (this is -+// different from "built in" drag and drop in wxTreeCtrl which is always -+// available). Requires wxUSE_DATAOBJ. -+// -+// Default is 1. -+// -+// Recommended setting: 1 -+#define wxUSE_DRAG_AND_DROP 1 -+ -+// Use wxAccessible for enhanced and customisable accessibility. -+// Depends on wxUSE_OLE. -+// -+// Default is 0. -+// -+// Recommended setting (at present): 0 -+#define wxUSE_ACCESSIBILITY 0 -+ -+// ---------------------------------------------------------------------------- -+// miscellaneous settings -+// ---------------------------------------------------------------------------- -+ -+// wxSingleInstanceChecker class allows to verify at startup if another program -+// instance is running. -+// -+// Default is 1 -+// -+// Recommended setting: 1 (the class is tiny, disabling it won't save much -+// space) -+#define wxUSE_SNGLINST_CHECKER 1 -+ -+#define wxUSE_DRAGIMAGE 1 -+ -+#define wxUSE_IPC 1 -+ // 0 for no interprocess comms -+#define wxUSE_HELP 1 -+ // 0 for no help facility -+ -+// Should we use MS HTML help for wxHelpController? If disabled, neither -+// wxCHMHelpController nor wxBestHelpController are available. -+// -+// Default is 1 under MSW, 0 is always used for the other platforms. -+// -+// Recommended setting: 1, only set to 0 if you have trouble compiling -+// wxCHMHelpController (could be a problem with really ancient compilers) -+#define wxUSE_MS_HTML_HELP 1 -+ -+ -+// Use wxHTML-based help controller? -+#define wxUSE_WXHTML_HELP 1 -+ -+#define wxUSE_CONSTRAINTS 1 -+ // 0 for no window layout constraint system -+ -+#define wxUSE_SPLINES 1 -+ // 0 for no splines -+ -+#define wxUSE_MOUSEWHEEL 1 -+ // Include mouse wheel support -+ -+// Compile wxUIActionSimulator class? -+#define wxUSE_UIACTIONSIMULATOR 1 -+ -+// ---------------------------------------------------------------------------- -+// wxDC classes for various output formats -+// ---------------------------------------------------------------------------- -+ -+// Set to 1 for PostScript device context. -+#define wxUSE_POSTSCRIPT 0 -+ -+// Set to 1 to use font metric files in GetTextExtent -+#define wxUSE_AFM_FOR_POSTSCRIPT 1 -+ -+// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows -+// to create files in SVG (Scalable Vector Graphics) format. -+#define wxUSE_SVG 1 -+ -+// Should wxDC provide SetTransformMatrix() and related methods? -+// -+// Default is 1 but can be set to 0 if this functionality is not used. Notice -+// that currently only wxMSW supports this so setting this to 0 doesn't change -+// much for non-MSW platforms (although it will still save a few bytes -+// probably). -+// -+// Recommended setting: 1. -+#define wxUSE_DC_TRANSFORM_MATRIX 1 -+ -+// ---------------------------------------------------------------------------- -+// image format support -+// ---------------------------------------------------------------------------- -+ -+// wxImage supports many different image formats which can be configured at -+// compile-time. BMP is always supported, others are optional and can be safely -+// disabled if you don't plan to use images in such format sometimes saving -+// substantial amount of code in the final library. -+// -+// Some formats require an extra library which is included in wxWin sources -+// which is mentioned if it is the case. -+ -+// Set to 1 for wxImage support (recommended). -+#define wxUSE_IMAGE 1 -+ -+// Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB. -+#define wxUSE_LIBPNG 1 -+ -+// Set to 1 for JPEG format support (requires libjpeg) -+#define wxUSE_LIBJPEG 1 -+ -+// Set to 1 for TIFF format support (requires libtiff) -+#define wxUSE_LIBTIFF 1 -+ -+// Set to 1 for TGA format support (loading only) -+#define wxUSE_TGA 1 -+ -+// Set to 1 for GIF format support -+#define wxUSE_GIF 1 -+ -+// Set to 1 for PNM format support -+#define wxUSE_PNM 1 -+ -+// Set to 1 for PCX format support -+#define wxUSE_PCX 1 -+ -+// Set to 1 for IFF format support (Amiga format) -+#define wxUSE_IFF 0 -+ -+// Set to 1 for XPM format support -+#define wxUSE_XPM 1 -+ -+// Set to 1 for MS Icons and Cursors format support -+#define wxUSE_ICO_CUR 1 -+ -+// Set to 1 to compile in wxPalette class -+#define wxUSE_PALETTE 1 -+ -+// ---------------------------------------------------------------------------- -+// wxUniversal-only options -+// ---------------------------------------------------------------------------- -+ -+// Set to 1 to enable compilation of all themes, this is the default -+#define wxUSE_ALL_THEMES 1 -+ -+// Set to 1 to enable the compilation of individual theme if wxUSE_ALL_THEMES -+// is unset, if it is set these options are not used; notice that metal theme -+// uses Win32 one -+#define wxUSE_THEME_GTK 0 -+#define wxUSE_THEME_METAL 0 -+#define wxUSE_THEME_MONO 0 -+#define wxUSE_THEME_WASM 0 -+#define wxUSE_THEME_WIN32 0 -+ -+ -diff --git a/include/wx/wasm/toplevel.h b/include/wx/wasm/toplevel.h -new file mode 100644 -index 0000000000..7a593c6ee6 ---- /dev/null -+++ b/include/wx/wasm/toplevel.h -@@ -0,0 +1,108 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/toplevel.h -+// Purpose: -+// Author: Adam Hilss -+// Copyright: (c) 2019 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#ifndef _WX_WASM_TOPLEVEL_H_ -+#define _WX_WASM_TOPLEVEL_H_ -+ -+//----------------------------------------------------------------------------- -+// wxTopLevelWindowWasm -+//----------------------------------------------------------------------------- -+ -+class WXDLLIMPEXP_CORE wxTopLevelWindowWasm : public wxTopLevelWindowBase -+{ -+ typedef wxTopLevelWindowBase base_type; -+public: -+ // construction -+ wxTopLevelWindowWasm() { Init(); } -+ wxTopLevelWindowWasm(wxWindow *parent, -+ wxWindowID id, -+ const wxString& title, -+ const wxPoint& pos = wxDefaultPosition, -+ const wxSize& size = wxDefaultSize, -+ long style = wxDEFAULT_FRAME_STYLE, -+ const wxString& name = wxFrameNameStr) -+ { -+ Init(); -+ Create(parent, id, title, pos, size, style, name); -+ } -+ -+ bool Create(wxWindow *parent, -+ wxWindowID id, -+ const wxString& title, -+ const wxPoint& pos = wxDefaultPosition, -+ const wxSize& size = wxDefaultSize, -+ long style = wxDEFAULT_FRAME_STYLE, -+ const wxString& name = wxFrameNameStr); -+ -+ virtual ~wxTopLevelWindowWasm() { } -+ -+ virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE; -+ -+ // implement base class pure virtuals -+ virtual void Maximize(bool WXUNUSED(maximize) = true) wxOVERRIDE { } -+ virtual bool IsMaximized() const wxOVERRIDE { return false; } -+ virtual bool IsAlwaysMaximized() const wxOVERRIDE { return IsMainFrame(); } -+ virtual void Iconize(bool WXUNUSED(iconize) = true) wxOVERRIDE { } -+ virtual bool IsIconized() const wxOVERRIDE { return false; } -+ virtual void Restore() wxOVERRIDE { } -+ -+ virtual void SetIcons(const wxIconBundle& icons) wxOVERRIDE; -+ -+ virtual void ShowWithoutActivating() wxOVERRIDE; -+ virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE; -+ virtual bool IsFullScreen() const wxOVERRIDE; -+ -+ virtual bool IsActive() wxOVERRIDE { return m_isActive; } -+ -+ virtual void SetTitle(const wxString &title) wxOVERRIDE; -+ virtual wxString GetTitle() const wxOVERRIDE { return m_title; } -+ -+ virtual wxString GetCSSClassList() const wxOVERRIDE { -+ return wxNonOwnedWindow::GetCSSClassList() + " toplevel"; -+ } -+ -+protected: -+ virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; -+ virtual void DoSetClientSize(int width, int height) wxOVERRIDE; -+ -+ virtual void DoScreenToClient(int *x, int *y) const wxOVERRIDE; -+ virtual void DoClientToScreen(int *x, int *y) const wxOVERRIDE; -+ -+ virtual bool HasTitleBar() const; -+ -+private: -+ void Init(); -+ -+ void SetActive(bool active) { m_isActive = active; } -+ -+ void DrawTitleText(wxDC& dc, const wxRect& rect); -+ void DrawMinimizeButton(wxDC& dc, const wxRect& rect); -+ -+ void StartDrag(const wxPoint& pos); -+ void EndDrag(); -+ void DragMove(const wxPoint& pos); -+ -+ void OnNcPaint(wxNcPaintEvent& event); -+ void OnMouseDown(wxMouseEvent& event); -+ void OnMouseUp(wxMouseEvent& event); -+ void OnMotion(wxMouseEvent& event); -+ -+ bool m_isActive; -+ wxString m_title; -+ -+ wxRect m_minimizeButtonRect; -+ -+ bool m_isDragging; -+ wxPoint m_dragOffset; -+ -+ friend class wxApp; -+ -+ wxDECLARE_EVENT_TABLE(); -+}; -+ -+#endif // _WX_WASM_TOPLEVEL_H_ -diff --git a/include/wx/wasm/window.h b/include/wx/wasm/window.h -new file mode 100644 -index 0000000000..7f7b9fcd89 ---- /dev/null -+++ b/include/wx/wasm/window.h -@@ -0,0 +1,129 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/window.h -+// Purpose: wxWindowWasm -+// Author: Adam Hilss -+// Copyright: (c) 2019 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#ifndef __WX_WASM_WINDOW_H__ -+#define __WX_WASM_WINDOW_H__ -+ -+class wxNonOwnedWindow; -+ -+class WXDLLIMPEXP_CORE wxWindowWasm : public wxWindowBase -+{ -+public: -+ // creating the window -+ // ------------------- -+ wxWindowWasm(); -+ wxWindowWasm(wxWindow *parent, -+ wxWindowID id, -+ const wxPoint& pos = wxDefaultPosition, -+ const wxSize& size = wxDefaultSize, -+ long style = 0, -+ const wxString& name = wxPanelNameStr); -+ virtual ~wxWindowWasm(); -+ -+ bool Create(wxWindow *parent, -+ wxWindowID id, -+ const wxPoint& pos = wxDefaultPosition, -+ const wxSize& size = wxDefaultSize, -+ long style = 0, -+ const wxString& name = wxPanelNameStr); -+ -+ // implement base class pure virtuals -+ virtual void SetLabel(const wxString& label) wxOVERRIDE { m_label = label; } -+ virtual wxString GetLabel() const wxOVERRIDE { return m_label; } -+ -+ virtual void Raise() wxOVERRIDE; -+ virtual void Lower() wxOVERRIDE; -+ -+ virtual bool Show(bool show = true) wxOVERRIDE; -+ -+ virtual void SetFocus() wxOVERRIDE; -+ -+ virtual void WarpPointer(int x, int y) wxOVERRIDE; -+ -+ virtual void Refresh(bool eraseBackground = true, -+ const wxRect *rect = (const wxRect *) NULL) wxOVERRIDE; -+ -+ virtual bool SetFont(const wxFont& font) wxOVERRIDE; -+ -+ virtual bool SetCursor(const wxCursor &cursor) wxOVERRIDE; -+ -+ virtual int GetCharHeight() const wxOVERRIDE; -+ virtual int GetCharWidth() const wxOVERRIDE; -+ -+ virtual double GetContentScaleFactor() const wxOVERRIDE; -+ virtual double GetDPIScaleFactor() const wxOVERRIDE; -+ -+#if wxUSE_DRAG_AND_DROP -+ virtual void SetDropTarget(wxDropTarget *dropTarget) wxOVERRIDE; -+#endif // wxUSE_DRAG_AND_DROP -+ -+ virtual bool IsDoubleBuffered() const wxOVERRIDE { return true; } -+ -+ virtual WXWidget GetHandle() const wxOVERRIDE { return NULL; } -+ -+ virtual bool HasTransparentBackground() wxOVERRIDE; -+ -+ wxNonOwnedWindow* GetTopLevelWindow(); -+ -+ bool NeedsPaint() const { return m_childNeedsPaint; } -+ bool SelfNeedsPaint() const { return m_selfNeedsPaint; } -+ void Invalidate(bool needsPaint); -+ -+protected: -+ virtual void DoGetTextExtent(const wxString& string, -+ int *x, int *y, -+ int *descent = NULL, -+ int *externalLeading = NULL, -+ const wxFont *theFont = NULL) const wxOVERRIDE; -+ -+ virtual void DoClientToScreen(int *x, int *y) const wxOVERRIDE; -+ virtual void DoScreenToClient(int *x, int *y) const wxOVERRIDE; -+ -+ virtual void DoGetPosition(int *x, int *y) const wxOVERRIDE; -+ virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; -+ virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; -+ virtual void DoSetSize(int x, int y, -+ int width, int height, -+ int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; -+ virtual void DoSetClientSize(int width, int height) wxOVERRIDE; -+ -+ virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; -+ virtual void DoEnable(bool enable) wxOVERRIDE; -+ -+ virtual void DoCaptureMouse() wxOVERRIDE; -+ virtual void DoReleaseMouse() wxOVERRIDE; -+ -+ virtual void DoFreeze() wxOVERRIDE { } -+ virtual void DoThaw() wxOVERRIDE; -+ -+ // implementation -+ void KillFocus(); -+ -+ void EraseBackgroundWindow(); -+ void PaintSelf(); -+ void PaintChildren(bool selfWasPainted); -+ void DoPaint(bool parentWasPainted); -+ -+private: -+ void Init(); -+ -+ int m_x, m_y; // window position -+ int m_width, m_height; // window size -+ -+ wxString m_label; -+ -+ bool m_childNeedsPaint; -+ bool m_selfNeedsPaint; -+ -+ wxDECLARE_DYNAMIC_CLASS(wxWindowWasm); -+ wxDECLARE_NO_COPY_CLASS(wxWindowWasm); -+}; -+ -+extern wxWindow *g_mouseWindow; -+ -+#endif // __WX_WASM_WINDOW_H__ -diff --git a/include/wx/window.h b/include/wx/window.h -index d7283458b1..df399d7b50 100644 ---- a/include/wx/window.h -+++ b/include/wx/window.h -@@ -29,6 +29,8 @@ - #include "wx/validate.h" // for wxDefaultValidator (always include it) - #include "wx/windowid.h" - -+#include -+ - #if wxUSE_PALETTE - #include "wx/palette.h" - #endif // wxUSE_PALETTE -@@ -1369,6 +1371,14 @@ public: - bool PopupMenu(wxMenu *menu, const wxPoint& pos = wxDefaultPosition) - { return PopupMenu(menu, pos.x, pos.y); } - bool PopupMenu(wxMenu *menu, int x, int y); -+ void PopupMenu(wxMenu *menu, -+ const wxPoint& pos, -+ std::function callback) -+ { return PopupMenu(menu, pos.x, pos.y, callback); } -+ void PopupMenu(wxMenu *menu, -+ int x, -+ int y, -+ std::function callback); - - // simply return the id of the selected item or wxID_NONE without - // generating any events -@@ -1978,6 +1988,7 @@ protected: - - #if wxUSE_MENUS - virtual bool DoPopupMenu(wxMenu *menu, int x, int y) = 0; -+ virtual void DoPopupMenu(wxMenu *menu, int x, int y, std::function callback) = 0; - #endif // wxUSE_MENUS - - // Makes an adjustment to the window position to make it relative to the -@@ -2114,6 +2125,13 @@ inline void wxWindowBase::SetInitialBestSize(const wxSize& size) - #define wxWindowQt wxWindow - #endif // wxUniv - #include "wx/qt/window.h" -+#elif defined(__WXWASM__) -+ #ifdef __WXUNIVERSAL__ -+ #define wxWindowNative wxWindowWasm -+ #else // !wxUniv -+ #define wxWindowWasm wxWindow -+ #endif // wxUniv -+ #include "wx/wasm/window.h" - #endif - - // for wxUniversal, we now derive the real wxWindow from wxWindow, -diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp -index 8f443bc180..5939f5a674 100644 ---- a/src/common/combocmn.cpp -+++ b/src/common/combocmn.cpp -@@ -162,6 +162,18 @@ wxCONSTRUCTOR_5( wxComboBox, wxWindow*, Parent, wxWindowID, Id, \ - #undef COMBO_MARGIN - #define COMBO_MARGIN FOCUS_RING - -+#elif defined(__WXWASM__) -+ -+#include "wx/dialog.h" -+#define wxComboCtrlGenericTLW wxDialog -+ -+#define USE_TRANSIENT_POPUP 1 // Use wxPopupWindowTransient (preferred, if it works properly on platform) -+#define TRANSIENT_POPUPWIN_IS_PERFECT 1 // wxPopupTransientWindow works, its child can have focus, and common -+ // native controls work on it like normal. -+#define POPUPWIN_IS_PERFECT 1 // Same, but for non-transient popup window. -+#define TEXTCTRL_TEXT_CENTERED 0 // 1 if text in textctrl is vertically centered -+#define FOCUS_RING 0 // No focus ring on wxWASM -+ - #else - - #include "wx/dialog.h" -diff --git a/src/common/config.cpp b/src/common/config.cpp -index a5e04ec1ca..df6adf31ad 100644 ---- a/src/common/config.cpp -+++ b/src/common/config.cpp -@@ -60,6 +60,8 @@ wxConfigBase *wxAppTraitsBase::CreateConfig() - return new - #if defined(__WINDOWS__) && wxUSE_CONFIG_NATIVE - wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName()); -+ #elif defined(__WXWASM__) && wxUSE_CONFIG_NATIVE -+ wxLocalStorageConfig(wxTheApp->GetAppName()); - #else // either we're under Unix or wish to use files even under Windows - wxFileConfig(wxTheApp->GetAppName()); - #endif -diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp -index a94ecbac0a..d19df8b84e 100644 ---- a/src/common/dcbase.cpp -+++ b/src/common/dcbase.cpp -@@ -87,6 +87,12 @@ - #include "wx/qt/dcmemory.h" - #include "wx/qt/dcscreen.h" - #endif -+ -+#ifdef __WXWASM__ -+ #include "wx/wasm/dcclient.h" -+ #include "wx/wasm/dcmemory.h" -+ #include "wx/wasm/dcscreen.h" -+#endif - //---------------------------------------------------------------------------- - // wxDCFactory - //---------------------------------------------------------------------------- -diff --git a/src/common/event.cpp b/src/common/event.cpp -index 327f7e669f..ec0f8458a3 100644 ---- a/src/common/event.cpp -+++ b/src/common/event.cpp -@@ -612,6 +612,8 @@ void wxMouseEvent::Assign(const wxMouseEvent& event) - m_aux1Down = event.m_aux1Down; - m_aux2Down = event.m_aux2Down; - -+ m_clickCount = event.m_clickCount; -+ - m_wheelRotation = event.m_wheelRotation; - m_wheelDelta = event.m_wheelDelta; - m_wheelInverted = event.m_wheelInverted; -diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp -index 6c7b49e7b8..442852c52a 100644 ---- a/src/common/fontcmn.cpp -+++ b/src/common/fontcmn.cpp -@@ -732,6 +732,8 @@ void wxNativeFontInfo::SetPointSize(int pointsize) - - #ifdef wxNO_NATIVE_FONTINFO - -+#if !defined(__WXWASM__) -+ - // These are the generic forms of FromString()/ToString. - // - // convert to/from the string representation: the general format is -@@ -822,6 +824,8 @@ wxString wxNativeFontInfo::ToString() const - return s; - } - -+#endif // !defined(__WXWASM__) -+ - void wxNativeFontInfo::Init() - { - pointSize = 0.0f; -@@ -832,6 +836,9 @@ void wxNativeFontInfo::Init() - strikethrough = false; - faceName.clear(); - encoding = wxFONTENCODING_DEFAULT; -+#if defined(__WXWASM__) -+ m_isRendered = false; -+#endif - } - - double wxNativeFontInfo::GetFractionalPointSize() const -@@ -874,6 +881,8 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const - return encoding; - } - -+#if !defined(__WXWASM__) -+ - void wxNativeFontInfo::SetFractionalPointSize(double pointsize) - { - pointSize = pointsize; -@@ -915,6 +924,8 @@ void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding_) - encoding = encoding_; - } - -+#endif // !defined(__WXWASM__) -+ - #endif // generic wxNativeFontInfo implementation - - // conversion to/from user-readable string: this is used in the generic -diff --git a/src/common/intl.cpp b/src/common/intl.cpp -index 1a9038a6b9..92443193cb 100644 ---- a/src/common/intl.cpp -+++ b/src/common/intl.cpp -@@ -391,7 +391,9 @@ bool wxLocale::DoCommonPostInit(bool success, - { - if ( !success ) - { -+#ifndef __WXWASM__ - wxLogWarning(_("Cannot set locale to language \"%s\"."), name); -+#endif - - // As we failed to change locale, there is no need to restore the - // previous one: it's still valid. -diff --git a/src/common/wxcrt.cpp b/src/common/wxcrt.cpp -index db3c9f4e58..244d21fbb7 100644 ---- a/src/common/wxcrt.cpp -+++ b/src/common/wxcrt.cpp -@@ -118,7 +118,11 @@ WXDLLIMPEXP_BASE size_t wxWC2MB(char *buf, const wchar_t *pwz, size_t n) - - char* wxSetlocale(int category, const char *locale) - { -+#ifdef __WXWASM__ -+ char *rv = NULL; -+#else - char *rv = setlocale(category, locale); -+#endif - if ( locale != NULL /* setting locale, not querying */ && - rv /* call was successful */ ) - { -diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp -index 87fdacf45b..f9828e95df 100644 ---- a/src/generic/msgdlgg.cpp -+++ b/src/generic/msgdlgg.cpp -@@ -29,6 +29,7 @@ - - #include - #include -+#include - - #define __WX_COMPILING_MSGDLGG_CPP__ 1 - #include "wx/msgdlg.h" -@@ -275,4 +276,15 @@ int wxGenericMessageDialog::ShowModal() - return wxMessageDialogBase::ShowModal(); - } - -+void wxGenericMessageDialog::ShowModal(std::function callback) -+{ -+ if ( !m_created ) -+ { -+ m_created = true; -+ DoCreateMsgdialog(); -+ } -+ -+ return wxMessageDialogBase::ShowModal(callback); -+} -+ - #endif // wxUSE_MSGDLG -diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp -index 77539dd1a3..e46bdd53bb 100644 ---- a/src/generic/renderg.cpp -+++ b/src/generic/renderg.cpp -@@ -260,7 +260,7 @@ wxRendererGeneric* wxRendererGeneric::sm_rendererGeneric = NULL; - - wxRendererGeneric::wxRendererGeneric() - : m_penBlack(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW)), -- m_penDarkGrey(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)), -+ m_penDarkGrey(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT)), - m_penLightGrey(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)), - m_penHighlight(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT)) - { -@@ -315,10 +315,11 @@ wxRendererGeneric::DrawHeaderButton(wxWindow* win, - - dc.SetBrush(*wxTRANSPARENT_BRUSH); - -- dc.SetPen(m_penBlack); -+ dc.SetPen(m_penDarkGrey); - dc.DrawLine( x+w-1, y, x+w-1, y+h ); // right (outer) - dc.DrawLine( x, y+h-1, x+w, y+h-1 ); // bottom (outer) - -+/* - dc.SetPen(m_penDarkGrey); - dc.DrawLine( x+w-2, y+1, x+w-2, y+h-1 ); // right (inner) - dc.DrawLine( x+1, y+h-2, x+w-1, y+h-2 ); // bottom (inner) -@@ -326,6 +327,7 @@ wxRendererGeneric::DrawHeaderButton(wxWindow* win, - dc.SetPen(m_penHighlight); - dc.DrawLine( x, y, x, y+h-1 ); // left (outer) - dc.DrawLine( x, y, x+w-1, y ); // top (outer) -+*/ - - return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params); - } -@@ -814,7 +816,7 @@ wxRendererGeneric::DrawItemSelectionRect(wxWindow * WXUNUSED(win), - } - else // !focused - { -- brush = wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW)); -+ brush = wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT)); - } - } - else // !selected -@@ -825,8 +827,8 @@ wxRendererGeneric::DrawItemSelectionRect(wxWindow * WXUNUSED(win), - wxDCBrushChanger setBrush(dc, brush); - bool drawFocusRect = (flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED); - -- bool blackPen = drawFocusRect && !(flags & wxCONTROL_CELL); -- wxDCPenChanger setPen(dc, *(blackPen ? wxBLACK_PEN : wxTRANSPARENT_PEN)); -+ //bool blackPen = drawFocusRect && !(flags & wxCONTROL_CELL); -+ wxDCPenChanger setPen(dc, *wxTRANSPARENT_PEN); - - dc.DrawRectangle( rect ); - -diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp -index 0dc60a9102..59dea7eea9 100644 ---- a/src/generic/spinctlg.cpp -+++ b/src/generic/spinctlg.cpp -@@ -54,7 +54,7 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxSpinDoubleEvent, wxNotifyEvent); - // so the generic control looks similarly to the native one there, we might - // need to use different value for the other platforms (and maybe even - // determine it dynamically?). --static const wxCoord MARGIN = 1; -+static const wxCoord MARGIN = 0; - - #define SPINCTRLBUT_MAX 32000 // large to avoid wrap around trouble - -@@ -318,11 +318,15 @@ void wxSpinCtrlGenericBase::DoMoveWindow(int x, int y, int width, int height) - // that the control should be. Normally, GetBestSize and GetSize should - // always return the same value because the size of the spinButton never - // changes. -- wxSize sizeBtn = m_spinButton->GetBestSize(); - -- wxCoord wText = width - sizeBtn.x - MARGIN; -- m_textCtrl->SetSize(0, 0, wText, height); -- m_spinButton->SetSize(0 + wText + MARGIN, 0, wxDefaultCoord, height); -+ if (m_spinButton) -+ { -+ wxSize sizeBtn = m_spinButton->GetBestSize(); -+ -+ wxCoord wText = width - sizeBtn.x - MARGIN; -+ m_textCtrl->SetSize(0, 0, wText, height); -+ m_spinButton->SetSize(0 + wText + MARGIN, 0, sizeBtn.x, height); -+ } - } - - // ---------------------------------------------------------------------------- -diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp -index d54a81b2fb..0e3c3b562f 100644 ---- a/src/generic/treectlg.cpp -+++ b/src/generic/treectlg.cpp -@@ -981,8 +981,8 @@ void wxGenericTreeCtrl::Init() - m_dirty = false; - - m_lineHeight = 10; -- m_indent = 15; -- m_spacing = 18; -+ m_indent = 10; -+ m_spacing = 10; - - m_dragCount = 0; - m_isDragging = false; -@@ -1081,7 +1081,7 @@ void wxGenericTreeCtrl::InitVisualAttributes() - m_hilightBrush = wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT)); - m_hilightUnfocusedBrush = wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW)); - -- m_dottedPen = wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT), 1, wxPENSTYLE_DOT); -+ m_dottedPen = wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT), 1, wxPENSTYLE_TRANSPARENT); - - #if defined(__WXOSX__) - m_normalFont = wxFont(wxOSX_SYSTEM_FONT_VIEWS); -diff --git a/src/generic/vlbox.cpp b/src/generic/vlbox.cpp -index fe1467dc4d..fdf2503c8e 100644 ---- a/src/generic/vlbox.cpp -+++ b/src/generic/vlbox.cpp -@@ -85,7 +85,8 @@ bool wxVListBox::Create(wxWindow *parent, - - // make sure the native widget has the right colour since we do - // transparent drawing by default -- SetBackgroundColour(GetBackgroundColour()); -+ //SetBackgroundColour(GetBackgroundColour()); -+ SetBackgroundColour(*wxWHITE); - - // leave m_colBgSel in an invalid state: it means for OnDrawBackground() - // to use wxRendererNative instead of painting selection bg ourselves -diff --git a/src/univ/anybutton.cpp b/src/univ/anybutton.cpp -index e1412ab3dd..81d5585c83 100644 ---- a/src/univ/anybutton.cpp -+++ b/src/univ/anybutton.cpp -@@ -52,12 +52,13 @@ void wxAnyButton::Toggle() - else - Press(); - -+ Refresh(); -+ - if ( !m_isPressed ) - { - // releasing button after it had been pressed generates a click event - Click(); - } -- Refresh(); - } - - bool wxAnyButton::PerformAction(const wxControlAction& action, -@@ -94,7 +95,7 @@ wxSize wxAnyButton::DoGetBestClientSize() const - { - wxClientDC dc(wxConstCast(this, wxAnyButton)); - wxCoord width, height; -- dc.GetMultiLineTextExtent(GetLabel(), &width, &height); -+ dc.GetMultiLineTextExtent(GetLabelText(), &width, &height); - - if ( m_bitmap.IsOk() ) - { -diff --git a/src/univ/checkbox.cpp b/src/univ/checkbox.cpp -index ed10526c55..e27a3f1070 100644 ---- a/src/univ/checkbox.cpp -+++ b/src/univ/checkbox.cpp -@@ -158,7 +158,7 @@ void wxCheckBox::DoDraw(wxControlRenderer *renderer) - - renderer->GetRenderer()-> - DrawCheckButton(dc, -- GetLabel(), -+ GetLabelText(), - bitmap, - renderer->GetRect(), - flags, -@@ -183,7 +183,7 @@ wxSize wxCheckBox::DoGetBestClientSize() const - wxClientDC dc(wxConstCast(this, wxCheckBox)); - dc.SetFont(GetFont()); - wxCoord width, height; -- dc.GetMultiLineTextExtent(GetLabel(), &width, &height); -+ dc.GetMultiLineTextExtent(GetLabelText(), &width, &height); - - wxSize sizeBmp = GetBitmapSize(); - if ( height < sizeBmp.y ) -diff --git a/src/univ/ctrlrend.cpp b/src/univ/ctrlrend.cpp -index 70b27679fa..e1c2d6a4bc 100644 ---- a/src/univ/ctrlrend.cpp -+++ b/src/univ/ctrlrend.cpp -@@ -69,13 +69,12 @@ void wxControlRenderer::DrawLabel() - m_dc.SetFont(m_window->GetFont()); - m_dc.SetTextForeground(m_window->GetForegroundColour()); - -- wxString label = m_window->GetLabel(); -- if ( !label.empty() ) -+ if ( !m_window->GetLabel().empty() ) - { - wxControl *ctrl = wxStaticCast(m_window, wxControl); - - m_renderer->DrawLabel(m_dc, -- label, -+ ctrl->GetLabelText(), - m_rect, - m_window->GetStateFlags(), - ctrl->GetAlignment(), -@@ -90,8 +89,7 @@ void wxControlRenderer::DrawButtonLabel(const wxBitmap& bitmap, - m_dc.SetFont(m_window->GetFont()); - m_dc.SetTextForeground(m_window->GetForegroundColour()); - -- wxString label = m_window->GetLabel(); -- if ( !label.empty() || bitmap.IsOk() ) -+ if ( !m_window->GetLabel().empty() || bitmap.IsOk() ) - { - wxRect rectLabel = m_rect; - if ( bitmap.IsOk() ) -@@ -102,7 +100,7 @@ void wxControlRenderer::DrawButtonLabel(const wxBitmap& bitmap, - wxControl *ctrl = wxStaticCast(m_window, wxControl); - - m_renderer->DrawButtonLabel(m_dc, -- label, -+ ctrl->GetLabelText(), - bitmap, - rectLabel, - m_window->GetStateFlags(), -@@ -120,7 +118,7 @@ void wxControlRenderer::DrawFrame() - wxControl *ctrl = wxStaticCast(m_window, wxControl); - - m_renderer->DrawFrame(m_dc, -- m_window->GetLabel(), -+ ctrl->GetLabelText(), - m_rect, - m_window->GetStateFlags(), - ctrl->GetAlignment(), -diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp -index 5a11d0c78e..e54b08faff 100644 ---- a/src/univ/dialog.cpp -+++ b/src/univ/dialog.cpp -@@ -27,6 +27,8 @@ - #include "wx/evtloop.h" - #include "wx/modalhook.h" - -+#include -+ - //----------------------------------------------------------------------------- - // wxDialog - //----------------------------------------------------------------------------- -@@ -43,6 +45,7 @@ void wxDialog::Init() - m_returnCode = 0; - m_windowDisabler = NULL; - m_eventLoop = NULL; -+ m_modalCallback = NULL; - m_isShowingModal = false; - } - -@@ -164,6 +167,26 @@ bool wxDialog::IsModal() const - return m_isShowingModal; - } - -+EM_JS(int, startModal, (), { -+ return Asyncify.handleAsync(async () => { -+ console.log('startModal'); -+ -+ var runEventLoop = function () { -+ modalTimer = setTimeout(function () { -+ ccall('ProcessEvents', 'void', [], []); -+ runEventLoop(); -+ }, 17); -+ }; -+ -+ const result = await new Promise((resolve, reject) => { -+ runEventLoop(); -+ endModal = resolve; -+ }); -+ console.log('modal result: ' + result); -+ return result; -+ }); -+}); -+ - int wxDialog::ShowModal() - { - WX_HOOK_MODAL_DIALOG(); -@@ -184,12 +207,15 @@ int wxDialog::ShowModal() - m_isShowingModal = true; - Show(true); - -+ //int result = startModal(); -+ -+ return wxID_CANCEL; -+/* - wxASSERT_MSG( !m_windowDisabler, wxT("disabling windows twice?") ); - - #if defined(__WXGTK__) - wxBusyCursorSuspender suspender; - #endif -- - m_windowDisabler = new wxWindowDisabler(this); - if ( !m_eventLoop ) - m_eventLoop = new wxEventLoop; -@@ -197,11 +223,20 @@ int wxDialog::ShowModal() - m_eventLoop->Run(); - - return GetReturnCode(); -+*/ -+} -+ -+void wxDialog::ShowModal(std::function callback) -+{ -+ ShowModal(); -+ -+ m_modalCallback = callback; - } - - void wxDialog::EndModal(int retCode) - { -- wxASSERT_MSG( m_eventLoop, wxT("wxDialog is not modal") ); -+ wxLogDebug(wxT("EndModal: %d"), retCode); -+ //wxASSERT_MSG( m_eventLoop, wxT("wxDialog is not modal") ); - - SetReturnCode(retCode); - -@@ -213,7 +248,21 @@ void wxDialog::EndModal(int retCode) - - m_isShowingModal = false; - -- m_eventLoop->Exit(); -+ //m_eventLoop->Exit(); -+ -+/* -+ EM_ASM({ -+ clearTimeout(modalTimer); -+ endModal($0); -+ }, retCode); -+*/ - - Show(false); -+ -+ if (m_modalCallback) -+ { -+ auto callback = m_modalCallback; -+ m_modalCallback = NULL; -+ callback(retCode); -+ } - } -diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp -index d6d019c68b..0582d90084 100644 ---- a/src/univ/menu.cpp -+++ b/src/univ/menu.cpp -@@ -32,6 +32,7 @@ - #include "wx/log.h" - #include "wx/frame.h" - #include "wx/dcclient.h" -+ #include "wx/timer.h" - #endif // WX_PRECOMP - - #include "wx/popupwin.h" -@@ -39,10 +40,17 @@ - - #include "wx/univ/renderer.h" - -+#include -+#include -+ - #ifdef __WXMSW__ - #include "wx/msw/private.h" - #endif // __WXMSW__ - -+#define SUBMENU_TIMEOUT 50 -+#define OVERFLOW_INITIAL_TIMEOUT 100 -+#define OVERFLOW_REPEAT_TIMEOUT 10 -+ - typedef wxMenuItemList::compatibility_iterator wxMenuItemIter; - - // ---------------------------------------------------------------------------- -@@ -114,6 +122,11 @@ private: - - WX_DEFINE_OBJARRAY(wxMenuInfoArray); - -+enum { -+ wxID_SUBMENU_TIMER, -+ wxID_OVERFLOW_TIMER -+}; -+ - // ---------------------------------------------------------------------------- - // wxPopupMenuWindow: a popup window showing a menu - // ---------------------------------------------------------------------------- -@@ -141,6 +154,10 @@ public: - void OnIdle(wxIdleEvent& WXUNUSED(event)) { } - #endif - -+ void OnSubMenuTimer(wxTimerEvent& event); -+ -+ void OnOverflowTimer(wxTimerEvent& event); -+ - // get the currently selected item (may be NULL) - wxMenuItem *GetCurrentItem() const - { -@@ -165,6 +182,12 @@ public: - // don't dismiss the popup window if the parent menu was clicked - virtual bool ProcessLeftDown(wxMouseEvent& event); - -+ virtual bool ShouldSendClickToUnderlyingOnDismiss() const { return false; } -+ -+ wxCoord GetMaxClientHeight() const { -+ return wxGetClientDisplayRect().GetSize().y - GetScreenPosition().y - GetClientAreaOrigin().y; -+ } -+ - protected: - // how did we perform this operation? - enum InputMethod -@@ -184,9 +207,12 @@ protected: - void OnLeftUp(wxMouseEvent& event); - void OnMouseMove(wxMouseEvent& event); - void OnMouseLeave(wxMouseEvent& event); -+ void OnMouseWheel(wxMouseEvent& event); - void OnKeyDown(wxKeyEvent& event); - void OnCaptureLost(wxMouseCaptureLostEvent& event); - -+ bool IsPointTrackingToSubMenu(const wxPoint& target); -+ - // reset the current item and node - void ResetCurrent(); - -@@ -235,6 +261,41 @@ protected: - // get next node after the given one, wrapping if it's the last one - wxMenuItemIter GetNextNode(wxMenuItemIter node) const; - -+ bool HasOverflow() const { return GetClientSize().y > GetMaxClientHeight(); } -+ -+ bool HasOverflowArrowUp() const -+ { -+ return HasOverflow() && GetOffsetY() < 0; -+ } -+ -+ bool HasOverflowArrowDown() const -+ { -+ return HasOverflow() && GetClientSize().y + GetOffsetY() > GetMaxClientHeight(); -+ } -+ -+ wxRect GetOverflowArrowUpRect(const wxMenuGeometryInfo& gi) const -+ { -+ return wxRect(0, 0, gi.GetSize().x, gi.GetOverflowHeight()); -+ } -+ -+ wxRect GetOverflowArrowDownRect(const wxMenuGeometryInfo& gi) const -+ { -+ wxCoord y = GetMaxClientHeight() - gi.GetOverflowHeight(); -+ return wxRect(0, y, gi.GetSize().x, gi.GetOverflowHeight()); -+ } -+ -+ bool OverflowArrowHitTest(const wxPoint&) const; -+ -+ int GetOffsetY() const { return m_offsetY; } -+ void SetOffsetY(int offset) -+ { -+ if (offset != m_offsetY) -+ { -+ m_offsetY = offset; -+ Refresh(); -+ } -+ } -+ - private: - // the menu we show - wxMenu *m_menu; -@@ -245,6 +306,12 @@ private: - // do we currently have an opened submenu? - bool m_hasOpenSubMenu; - -+ wxPoint m_subMenuPoint; -+ wxTimer m_subMenuTimer; -+ wxTimer m_overflowTimer; -+ -+ int m_offsetY; -+ - wxDECLARE_EVENT_TABLE(); - }; - -@@ -285,20 +352,23 @@ wxBEGIN_EVENT_TABLE(wxPopupMenuWindow, wxPopupTransientWindow) - EVT_LEFT_DOWN(wxPopupMenuWindow::OnLeftDown) - EVT_LEFT_UP(wxPopupMenuWindow::OnLeftUp) - EVT_MOTION(wxPopupMenuWindow::OnMouseMove) -+ EVT_MOUSEWHEEL(wxPopupMenuWindow::OnMouseWheel) - EVT_LEAVE_WINDOW(wxPopupMenuWindow::OnMouseLeave) -- EVT_MOUSE_CAPTURE_LOST(wxPopupMenuWindow::OnCaptureLost) - #ifdef __WXMSW__ - EVT_IDLE(wxPopupMenuWindow::OnIdle) - #endif -+ EVT_TIMER(wxID_SUBMENU_TIMER, wxPopupMenuWindow::OnSubMenuTimer) -+ EVT_TIMER(wxID_OVERFLOW_TIMER, wxPopupMenuWindow::OnOverflowTimer) -+ EVT_MOUSE_CAPTURE_LOST(wxPopupMenuWindow::OnCaptureLost) - wxEND_EVENT_TABLE() - - wxBEGIN_EVENT_TABLE(wxMenuBar, wxMenuBarBase) - EVT_KILL_FOCUS(wxMenuBar::OnKillFocus) - EVT_KEY_DOWN(wxMenuBar::OnKeyDown) -+ - EVT_LEFT_DOWN(wxMenuBar::OnLeftDown) -- EVT_LEFT_UP(wxMenuBar::OnLeftUp) -+ EVT_LEFT_DCLICK(wxMenuBar::OnLeftDown) - EVT_MOTION(wxMenuBar::OnMouseMove) -- EVT_MOUSE_CAPTURE_LOST(wxMenuBar::OnCaptureLost) - wxEND_EVENT_TABLE() - - // ============================================================================ -@@ -314,9 +384,14 @@ wxPopupMenuWindow::wxPopupMenuWindow(wxWindow *parent, wxMenu *menu) - m_menu = menu; - m_hasOpenSubMenu = false; - -+ m_subMenuTimer.SetOwner(this, wxID_SUBMENU_TIMER); -+ m_overflowTimer.SetOwner(this, wxID_OVERFLOW_TIMER); -+ -+ m_offsetY = 0; -+ - ResetCurrent(); - -- (void)Create(parent, wxBORDER_RAISED); -+ (void)Create(parent, wxBORDER_STATIC); - - SetCursor(wxCURSOR_ARROW); - } -@@ -347,8 +422,11 @@ void wxPopupMenuWindow::SetCurrentItem(wxMenuItemIter node) - - void wxPopupMenuWindow::ChangeCurrent(wxMenuItemIter node) - { -- if ( !m_nodeCurrent || !node || (node != m_nodeCurrent) ) -+ if ( node != m_nodeCurrent ) - { -+ m_subMenuTimer.Stop(); -+ m_overflowTimer.Stop(); -+ - wxMenuItemIter nodeOldCurrent = m_nodeCurrent; - - m_nodeCurrent = node; -@@ -521,9 +599,10 @@ wxPopupMenuWindow::GetMenuItemFromPoint(const wxPoint& pt) const - { - // we only use the y coord normally, but still check x in case the point is - // outside the window completely -- if ( wxWindow::HitTest(pt) == wxHT_WINDOW_INSIDE ) -+ if ( wxWindow::HitTest(pt) == wxHT_WINDOW_INSIDE && -+ !OverflowArrowHitTest(pt) ) - { -- wxCoord y = 0; -+ wxCoord y = GetOffsetY(); - for ( wxMenuItemIter node = m_menu->GetMenuItems().GetFirst(); - node; - node = node->GetNext() ) -@@ -541,6 +620,26 @@ wxPopupMenuWindow::GetMenuItemFromPoint(const wxPoint& pt) const - return wxMenuItemIter(); - } - -+bool wxPopupMenuWindow::OverflowArrowHitTest(const wxPoint& pt) const -+{ -+ if (HasOverflowArrowUp()) -+ { -+ if (GetOverflowArrowUpRect(m_menu->GetGeometryInfo()).Contains(pt)) -+ { -+ return true; -+ } -+ } -+ if (HasOverflowArrowDown()) -+ { -+ if (GetOverflowArrowDownRect(m_menu->GetGeometryInfo()).Contains(pt)) -+ { -+ return true; -+ } -+ } -+ -+ return false; -+} -+ - // ---------------------------------------------------------------------------- - // wxPopupMenuWindow drawing - // ---------------------------------------------------------------------------- -@@ -566,11 +665,11 @@ void wxPopupMenuWindow::DoDraw(wxControlRenderer *renderer) - - // FIXME: this should be done in the renderer, however when it is fixed - // wxPopupMenuWindow::RefreshItem() should be changed too! -- dc.SetLogicalOrigin(1, 1); -+ //dc.SetLogicalOrigin(1, 1); - - wxRenderer *rend = renderer->GetRenderer(); - -- wxCoord y = 0; -+ wxCoord y = GetOffsetY(); - const wxMenuGeometryInfo& gi = m_menu->GetGeometryInfo(); - for ( wxMenuItemIter node = m_menu->GetMenuItems().GetFirst(); - node; -@@ -578,61 +677,75 @@ void wxPopupMenuWindow::DoDraw(wxControlRenderer *renderer) - { - wxMenuItem *item = node->GetData(); - -- if ( item->IsSeparator() ) -- { -- rend->DrawMenuSeparator(dc, y, gi); -+ if (y + item->GetHeight() >= 0 && y < GetMaxClientHeight()) { -+ if ( item->IsSeparator() ) -+ { -+ rend->DrawMenuSeparator(dc, y, gi); -+ } -+ else // not a separator -+ { -+ int flags = 0; -+ if ( item->IsCheckable() ) -+ { -+ flags |= wxCONTROL_CHECKABLE; -+ -+ if ( item->IsChecked() ) -+ { -+ flags |= wxCONTROL_CHECKED; -+ } -+ } -+ -+ if ( !item->IsEnabled() ) -+ flags |= wxCONTROL_DISABLED; -+ -+ if ( item->IsSubMenu() ) -+ flags |= wxCONTROL_ISSUBMENU; -+ -+ if ( item == GetCurrentItem() ) -+ flags |= wxCONTROL_SELECTED; -+ -+ wxBitmap bmp; -+ -+ if ( !item->IsEnabled() ) -+ { -+ bmp = item->GetDisabledBitmap(); -+ } -+ -+ if ( !bmp.IsOk() ) -+ { -+ // strangely enough, for unchecked item we use the -+ // "checked" bitmap because this is the default one - this -+ // explains this strange boolean expression -+ bmp = item->GetBitmap(!item->IsCheckable() || item->IsChecked()); -+ } -+ -+ rend->DrawMenuItem -+ ( -+ dc, -+ y, -+ gi, -+ item->GetItemLabelText(), -+ item->GetAccelString(), -+ bmp, -+ flags, -+ item->GetAccelIndex() -+ ); -+ } - } -- else // not a separator -- { -- int flags = 0; -- if ( item->IsCheckable() ) -- { -- flags |= wxCONTROL_CHECKABLE; - -- if ( item->IsChecked() ) -- { -- flags |= wxCONTROL_CHECKED; -- } -- } -- -- if ( !item->IsEnabled() ) -- flags |= wxCONTROL_DISABLED; -- -- if ( item->IsSubMenu() ) -- flags |= wxCONTROL_ISSUBMENU; -- -- if ( item == GetCurrentItem() ) -- flags |= wxCONTROL_SELECTED; -- -- wxBitmap bmp; -- -- if ( !item->IsEnabled() ) -- { -- bmp = item->GetDisabledBitmap(); -- } -- -- if ( !bmp.IsOk() ) -- { -- // strangely enough, for unchecked item we use the -- // "checked" bitmap because this is the default one - this -- // explains this strange boolean expression -- bmp = item->GetBitmap(!item->IsCheckable() || item->IsChecked()); -- } -+ y += item->GetHeight(); -+ } - -- rend->DrawMenuItem -- ( -- dc, -- y, -- gi, -- item->GetItemLabelText(), -- item->GetAccelString(), -- bmp, -- flags, -- item->GetAccelIndex() -- ); -- } -+ if (HasOverflowArrowUp()) -+ { -+ wxRect rect = GetOverflowArrowUpRect(gi); -+ rend->DrawMenuOverflowArrow(dc, rect, wxUP); -+ } - -- y += item->GetHeight(); -+ if (HasOverflowArrowDown()) -+ { -+ wxRect rect = GetOverflowArrowDownRect(gi); -+ rend->DrawMenuOverflowArrow(dc, rect, wxDOWN); - } - } - -@@ -647,12 +760,10 @@ void wxPopupMenuWindow::ClickItem(wxMenuItem *item) - wxASSERT_MSG( !item->IsSeparator() && !item->IsSubMenu(), - wxT("can't click this item") ); - -- wxMenu* menu = m_menu; -+ m_menu->ClickItem(item); - - // close all menus - DismissAndNotify(); -- -- menu->ClickItem(item); - } - - void wxPopupMenuWindow::OpenSubmenu(wxMenuItem *item, InputMethod how) -@@ -663,7 +774,7 @@ void wxPopupMenuWindow::OpenSubmenu(wxMenuItem *item, InputMethod how) - wxCHECK_RET( submenu, wxT("can only open submenus!") ); - - // FIXME: should take into account the border width -- submenu->Popup(ClientToScreen(wxPoint(0, item->GetPosition())), -+ submenu->Popup(ClientToScreen(wxPoint(0, item->GetPosition() + GetOffsetY())), - wxSize(m_menu->GetGeometryInfo().GetSize().x, 0), - how == WithKeyboard /* preselect first item then */); - -@@ -787,8 +898,47 @@ void wxPopupMenuWindow::OnMouseMove(wxMouseEvent& event) - event.Skip(); - } - -+bool wxPopupMenuWindow::IsPointTrackingToSubMenu(const wxPoint& target) { -+ wxMenuItem *item = GetCurrentItem(); -+ wxCHECK_MSG( CanOpen(item), false, wxT("where is our open submenu?") ); -+ -+ wxPopupMenuWindow *win = item->GetSubMenu()->m_popupMenu; -+ wxCHECK_MSG( win, false, wxT("submenu is opened but not shown?") ); -+ -+ wxRect popupRect = win->GetScreenRect(); -+ wxPoint pt1 = popupRect.GetPosition(); -+ pt1.y -= 10; -+ wxPoint pt2 = wxPoint(pt1.x, pt1.y + popupRect.height + 10); -+ -+ if (m_subMenuPoint.x >= pt1.x || target.x < m_subMenuPoint.x) -+ { -+ return false; -+ } -+ -+ double ox = m_subMenuPoint.x; -+ double oy = m_subMenuPoint.y; -+ -+ double d1 = (pt1.y - oy) / (pt1.x - ox); -+ double d2 = (pt2.y - oy) / (pt2.x - ox); -+ -+ double y1 = oy + d1 * (target.x - ox); -+ double y2 = oy + d2 * (target.x - ox); -+ -+ return target.y >= y1 && target.y <= y2; -+} -+ -+ - void wxPopupMenuWindow::ProcessMouseMove(const wxPoint& pt) - { -+ if (OverflowArrowHitTest(pt)) -+ { -+ if (!m_overflowTimer.IsRunning()) -+ { -+ m_overflowTimer.StartOnce(OVERFLOW_INITIAL_TIMEOUT); -+ } -+ return; -+ } -+ - wxMenuItemIter node = GetMenuItemFromPoint(pt); - - // don't reset current to NULL here, we only do it when the mouse leaves -@@ -797,54 +947,110 @@ void wxPopupMenuWindow::ProcessMouseMove(const wxPoint& pt) - { - if ( !m_nodeCurrent || (node != m_nodeCurrent) ) - { -- ChangeCurrent(node); -+ if (!HasOpenSubmenu()) -+ { -+ ChangeCurrent(node); - -- wxMenuItem *item = GetCurrentItem(); -- if ( CanOpen(item) ) -+ wxMenuItem *item = GetCurrentItem(); -+ if ( CanOpen(item) ) -+ { -+ OpenSubmenu(item, WithMouse); -+ } -+ } -+ else - { -- OpenSubmenu(item, WithMouse); -+ if (!m_subMenuTimer.IsRunning()) -+ { -+ m_subMenuPoint = ClientToScreen(pt); -+ m_subMenuTimer.StartOnce(SUBMENU_TIMEOUT); -+ } -+ else -+ { -+ wxPoint screenPt = ClientToScreen(pt); -+ -+ int diff = abs(screenPt.x - m_subMenuPoint.x) + abs(screenPt.y - m_subMenuPoint.y); -+ -+ if (diff >= 10) { -+ if (!IsPointTrackingToSubMenu(screenPt)) -+ { -+ m_subMenuTimer.Stop(); -+ -+ ChangeCurrent(node); -+ -+ wxMenuItem *item = GetCurrentItem(); -+ if ( CanOpen(item) ) -+ { -+ OpenSubmenu(item, WithMouse); -+ } -+ } -+ else -+ { -+ m_subMenuTimer.StartOnce(SUBMENU_TIMEOUT); -+ } -+ } else { -+ m_subMenuTimer.StartOnce(SUBMENU_TIMEOUT); -+ } -+ } - } - } - //else: same item, nothing to do - } - else // not on an item - { -- // the last open submenu forwards the mouse move messages to its -- // parent, so if the mouse moves to another item of the parent menu, -- // this menu is closed and this other item is selected - in the similar -- // manner, the top menu forwards the mouse moves to the menubar which -- // allows to select another top level menu by just moving the mouse -- -- // we need to translate our client coords to the client coords of the -- // window we forward this event to -- wxPoint ptScreen = ClientToScreen(pt); -+ if (HasOpenSubmenu()) -+ { -+ if (!IsPointTrackingToSubMenu(ClientToScreen(pt))) { -+ ChangeCurrent(wxMenuItemIter()); -+ } -+ else -+ { -+ m_subMenuTimer.StartOnce(SUBMENU_TIMEOUT); -+ } -+ } -+ else if (m_nodeCurrent) -+ { -+ ChangeCurrent(wxMenuItemIter()); -+ } - -- // if the mouse is outside this menu, let the parent one to -- // process it -- wxMenu *menuParent = m_menu->GetParent(); -- if ( menuParent ) -+ if (!HasOpenSubmenu()) - { -- wxPopupMenuWindow *win = menuParent->m_popupMenu; -+ // the last open submenu forwards the mouse move messages to its -+ // parent, so if the mouse moves to another item of the parent menu, -+ // this menu is closed and this other item is selected - in the similar -+ // manner, the top menu forwards the mouse moves to the menubar which -+ // allows to select another top level menu by just moving the mouse -+ -+ // we need to translate our client coords to the client coords of the -+ // window we forward this event to -+ wxPoint ptScreen = ClientToScreen(pt); -+ -+ // if the mouse is outside this menu, let the parent one to -+ // process it -+ wxMenu *menuParent = m_menu->GetParent(); -+ if ( menuParent ) -+ { -+ wxPopupMenuWindow *win = menuParent->m_popupMenu; - -- // if we're shown, the parent menu must be also shown -- wxCHECK_RET( win, wxT("parent menu is not shown?") ); -+ // if we're shown, the parent menu must be also shown -+ wxCHECK_RET( win, wxT("parent menu is not shown?") ); - -- win->ProcessMouseMove(win->ScreenToClient(ptScreen)); -- } -- else // no parent menu -- { -- wxMenuBar *menubar = m_menu->GetMenuBar(); -- if ( menubar ) -+ win->ProcessMouseMove(win->ScreenToClient(ptScreen)); -+ } -+ else // no parent menu - { -- if ( menubar->ProcessMouseEvent( -- menubar->ScreenToClient(ptScreen)) ) -+ wxMenuBar *menubar = m_menu->GetMenuBar(); -+ if ( menubar ) - { -- // menubar has closed this menu and opened another one, probably -- return; -+ if ( menubar->ProcessMouseEvent( -+ menubar->ScreenToClient(ptScreen)) ) -+ { -+ // menubar has closed this menu and opened another one, probably -+ return; -+ } - } - } -+ //else: top level popup menu, no other processing to do - } -- //else: top level popup menu, no other processing to do - } - } - -@@ -858,8 +1064,8 @@ void wxPopupMenuWindow::OnMouseLeave(wxMouseEvent& event) - // we shouldn't change the current them if our submenu is opened and - // mouse moved there, in this case the submenu is responsable for - // handling it -- bool resetCurrent; -- if ( HasOpenSubmenu() ) -+ bool resetCurrent = false; -+ if ( HasOpenSubmenu() && !m_subMenuTimer.IsRunning()) - { - wxMenuItem *item = GetCurrentItem(); - wxCHECK_RET( CanOpen(item), wxT("where is our open submenu?") ); -@@ -867,10 +1073,15 @@ void wxPopupMenuWindow::OnMouseLeave(wxMouseEvent& event) - wxPopupMenuWindow *win = item->GetSubMenu()->m_popupMenu; - wxCHECK_RET( win, wxT("submenu is opened but not shown?") ); - -- // only handle this event if the mouse is not inside the submenu -- wxPoint pt = ClientToScreen(event.GetPosition()); -- resetCurrent = -- win->HitTest(win->ScreenToClient(pt)) == wxHT_WINDOW_OUTSIDE; -+ wxMenuItemIter node = GetMenuItemFromPoint(event.GetPosition()); -+ if (node && node->GetData() == item) { -+ resetCurrent = false; -+ } else { -+ // only handle this event if the mouse is not inside the submenu -+ wxPoint pt = ClientToScreen(event.GetPosition()); -+ resetCurrent = -+ win->HitTest(win->ScreenToClient(pt)) == wxHT_WINDOW_OUTSIDE; -+ } - } - else - { -@@ -887,6 +1098,77 @@ void wxPopupMenuWindow::OnMouseLeave(wxMouseEvent& event) - event.Skip(); - } - -+void wxPopupMenuWindow::OnMouseWheel(wxMouseEvent& event) -+{ -+ if (GetClientRect().Contains(event.GetPosition()) && HasOverflow()) -+ { -+ double rotation = event.GetWheelRotation(); -+ double delta = event.GetWheelDelta(); -+ int pixels = ceill(10 * rotation / delta * event.GetLinesPerAction()); -+ -+ if (pixels > 0) -+ { -+ SetOffsetY(wxMin(GetOffsetY() + pixels, 0)); -+ } -+ else -+ { -+ SetOffsetY(wxMax(GetOffsetY() + pixels, GetMaxClientHeight() - GetClientSize().y)); -+ } -+ } -+} -+ -+void wxPopupMenuWindow::OnSubMenuTimer(wxTimerEvent& WXUNUSED(event)) -+{ -+ wxPoint pt = ScreenToClient(wxGetMousePosition()); -+ -+ wxMenuItemIter node = GetMenuItemFromPoint(pt); -+ -+ if ( node ) -+ { -+ if ( !m_nodeCurrent || (node != m_nodeCurrent) ) -+ { -+ ChangeCurrent(node); -+ -+ wxMenuItem *item = GetCurrentItem(); -+ if ( CanOpen(item) ) -+ { -+ OpenSubmenu(item, WithMouse); -+ } -+ } -+ } -+ else if ( HasOpenSubmenu() ) -+ { -+ wxMenuItem *item = GetCurrentItem(); -+ wxCHECK_RET( CanOpen(item), wxT("where is our open submenu?") ); -+ -+ wxPopupMenuWindow *win = item->GetSubMenu()->m_popupMenu; -+ wxCHECK_RET( win, wxT("submenu is opened but not shown?") ); -+ -+ if (win->HitTest(win->ScreenToClient(wxGetMousePosition())) == wxHT_WINDOW_OUTSIDE) -+ { -+ ChangeCurrent(wxMenuItemIter()); -+ } -+ } -+} -+ -+void wxPopupMenuWindow::OnOverflowTimer(wxTimerEvent& WXUNUSED(event)) -+{ -+ wxPoint pt = ScreenToClient(wxGetMousePosition()); -+ -+ if (OverflowArrowHitTest(pt)) -+ { -+ if (GetOverflowArrowUpRect(m_menu->GetGeometryInfo()).Contains(pt)) -+ { -+ SetOffsetY(wxMin(GetOffsetY() + 4, 0)); -+ } -+ else -+ { -+ SetOffsetY(wxMax(GetOffsetY() - 4, GetMaxClientHeight() - GetClientSize().y)); -+ } -+ m_overflowTimer.StartOnce(OVERFLOW_REPEAT_TIMEOUT); -+ } -+} -+ - void wxPopupMenuWindow::OnKeyDown(wxKeyEvent& event) - { - wxMenuBar *menubar = m_menu->GetMenuBar(); -@@ -1326,7 +1608,7 @@ void wxMenu::Detach() - - wxWindow *wxMenu::GetRootWindow() const - { -- return GetMenuBar() ? GetMenuBar() : GetInvokingWindow(); -+ return GetMenuBar() ? GetMenuBar() : GetWindow(); - } - - wxRenderer *wxMenu::GetRenderer() const -@@ -1780,6 +2062,11 @@ void wxMenuBar::Attach(wxFrame *frame) - - void wxMenuBar::Detach() - { -+ if (GetParent()) -+ { -+ GetParent()->RemoveChild(this); -+ } -+ - // don't delete the window because we may be reattached later, just hide it - if ( m_frameLast ) - { -@@ -2141,9 +2428,10 @@ void wxMenuBar::OnKillFocus(wxFocusEvent& event) - - void wxMenuBar::OnLeftDown(wxMouseEvent& event) - { -- if ( HasCapture() ) -+ if ( IsShowingMenu() ) - { -- OnDismiss(); -+ DismissMenu(); -+ - event.Skip(); - } - else // we didn't have mouse capture, capture it now -@@ -2616,6 +2904,7 @@ wxEventLoop *wxWindow::ms_evtLoopPopup = NULL; - - bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y) - { -+#ifndef __WXWASM__ - wxCHECK_MSG( !ms_evtLoopPopup, false, - wxT("can't show more than one popup menu at a time") ); - -@@ -2642,8 +2931,11 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y) - Update(); - #endif // 0 - -+#endif // __WXWASM__ -+ - menu->Popup(ClientToScreen(wxPoint(x, y)), wxSize(0,0)); - -+#ifndef __WXWASM__ - // this is not very useful if the menu was popped up because of the mouse - // click but I think it is nice to do when it appears because of a key - // press (i.e. Windows menu key) -@@ -2667,14 +2959,29 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y) - SetCursor(cursorOld); - #endif // __WXMSW__ - -+#endif // __WXWASM__ -+ - return true; - } - -+void wxWindow::DoPopupMenu(wxMenu *menu, int x, int y, std::function callback) -+{ -+ m_popupCallback = callback; -+ menu->Popup(ClientToScreen(wxPoint(x, y)), wxSize(0,0)); -+} -+ - void wxWindow::DismissPopupMenu() - { -+ if (m_popupCallback) -+ { -+ m_popupCallback(true); -+ m_popupCallback = NULL; -+ } -+/* - wxCHECK_RET( ms_evtLoopPopup, wxT("no popup menu shown") ); - - ms_evtLoopPopup->Exit(); -+*/ - } - - #endif // wxUSE_MENUS -diff --git a/src/univ/radiobut.cpp b/src/univ/radiobut.cpp -index bae966edb5..f9d525bd6c 100644 ---- a/src/univ/radiobut.cpp -+++ b/src/univ/radiobut.cpp -@@ -95,6 +95,17 @@ void wxRadioButton::ChangeValue(bool value) - } - } - -+void wxRadioButton::Toggle() { -+ if (Get3StateValue() == wxCHK_CHECKED) -+ { -+ Release(); -+ } -+ else -+ { -+ wxCheckBox::Toggle(); -+ } -+} -+ - void wxRadioButton::ClearValue() - { - if ( IsChecked() ) -@@ -115,6 +126,26 @@ void wxRadioButton::SendEvent() - // overridden wxCheckBox methods - // ---------------------------------------------------------------------------- - -+bool wxRadioButton::PerformAction(const wxControlAction& action, -+ long numArg, -+ const wxString& strArg) -+{ -+ if ( action == wxACTION_BUTTON_PRESS ) -+ Press(); -+ else if ( action == wxACTION_BUTTON_RELEASE ) -+ Release(); -+ if ( action == wxACTION_CHECKBOX_CHECK ) -+ ChangeValue(true); -+ else if ( action == wxACTION_CHECKBOX_CLEAR ) -+ ChangeValue(false); -+ else if ( action == wxACTION_CHECKBOX_TOGGLE ) -+ Toggle(); -+ else -+ return wxControl::PerformAction(action, numArg, strArg); -+ -+ return true; -+} -+ - wxSize wxRadioButton::GetBitmapSize() const - { - wxBitmap bmp = GetBitmap(State_Normal, Status_Checked); -@@ -135,7 +166,7 @@ void wxRadioButton::DoDraw(wxControlRenderer *renderer) - - renderer->GetRenderer()-> - DrawRadioButton(dc, -- GetLabel(), -+ GetLabelText(), - GetBitmap(GetState(flags), status), - renderer->GetRect(), - flags, -diff --git a/src/univ/scrolbar.cpp b/src/univ/scrolbar.cpp -index c75626ac92..a09b179d4d 100644 ---- a/src/univ/scrolbar.cpp -+++ b/src/univ/scrolbar.cpp -@@ -244,6 +244,8 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, - int range, int pageSize, - bool refresh) - { -+ thumbSize = wxMax(wxMin(thumbSize, range), 0); -+ - // we only refresh everything when the range changes, thumb position - // changes are handled in OnIdle - bool needsRefresh = (range != m_range) || -@@ -272,19 +274,24 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, - // geometry - // ---------------------------------------------------------------------------- - -+wxSize wxScrollBar::GetScrollbarArrowSize() const -+{ -+ return m_renderer->GetScrollbarArrowSize(IsVertical() ? wxVERTICAL : wxHORIZONTAL); -+} -+ - wxSize wxScrollBar::DoGetBestClientSize() const - { - // this dimension is completely arbitrary - static const wxCoord SIZE = 140; - -- wxSize size = m_renderer->GetScrollbarArrowSize(); -+ wxSize size = GetScrollbarArrowSize(); - if ( IsVertical() ) - { - size.y = SIZE; - } - else // horizontal - { -- size.x = SIZE; -+ size.y = 15; - } - - return size; -@@ -310,7 +317,7 @@ wxHitTest wxScrollBar::HitTestBar(const wxPoint& pt) const - // we only need to work with either x or y coord depending on the - // orientation, choose one (but still check the other one to verify if the - // mouse is in the window at all) -- const wxSize sizeArrowSB = m_renderer->GetScrollbarArrowSize(); -+ const wxSize sizeArrowSB = GetScrollbarArrowSize(); - - wxCoord coord, sizeArrow, sizeTotal; - wxSize size = GetSize(); -@@ -417,7 +424,7 @@ wxRect wxScrollBar::GetScrollbarRect(wxScrollBar::Element elem, - thumbPos = GetThumbPosition(); - } - -- const wxSize sizeArrow = m_renderer->GetScrollbarArrowSize(); -+ const wxSize sizeArrow = GetScrollbarArrowSize(); - - wxSize sizeTotal = GetClientSize(); - wxCoord *start, *width; -@@ -513,7 +520,7 @@ wxRect wxScrollBar::GetScrollbarRect(wxScrollBar::Element elem, - - wxCoord wxScrollBar::GetScrollbarSize() const - { -- const wxSize sizeArrowSB = m_renderer->GetScrollbarArrowSize(); -+ const wxSize sizeArrowSB = GetScrollbarArrowSize(); - - wxCoord sizeArrow, sizeTotal; - if ( GetWindowStyle() & wxVERTICAL ) -@@ -546,14 +553,14 @@ wxCoord wxScrollBar::ScrollbarToPixel(int thumbPos) - thumbPos = GetThumbPosition(); - } - -- const wxSize sizeArrow = m_renderer->GetScrollbarArrowSize(); -+ const wxSize sizeArrow = GetScrollbarArrowSize(); - return (thumbPos * GetScrollbarSize()) / range - + (IsVertical() ? sizeArrow.y : sizeArrow.x); - } - - int wxScrollBar::PixelToScrollbar(wxCoord coord) - { -- const wxSize sizeArrow = m_renderer->GetScrollbarArrowSize(); -+ const wxSize sizeArrow = GetScrollbarArrowSize(); - return ((coord - (IsVertical() ? sizeArrow.y : sizeArrow.x)) * - GetRange() ) / GetScrollbarSize(); - } -diff --git a/src/univ/settingsuniv.cpp b/src/univ/settingsuniv.cpp -index 3ac673bb88..a49ac561bf 100644 ---- a/src/univ/settingsuniv.cpp -+++ b/src/univ/settingsuniv.cpp -@@ -98,9 +98,9 @@ int wxSystemSettings::GetMetric(wxSystemMetric index, const wxWindow* win) - switch ( index ) - { - case wxSYS_VSCROLL_X: -- return wxTheme::Get()->GetRenderer()->GetScrollbarArrowSize().x; -+ return wxTheme::Get()->GetRenderer()->GetScrollbarArrowSize(wxVERTICAL).x; - case wxSYS_HSCROLL_Y: -- return wxTheme::Get()->GetRenderer()->GetScrollbarArrowSize().y; -+ return wxTheme::Get()->GetRenderer()->GetScrollbarArrowSize(wxHORIZONTAL).y; - - default: - return wxSystemSettingsNative::GetMetric(index, win); -diff --git a/src/univ/slider.cpp b/src/univ/slider.cpp -index 90e9099ed9..3b48165774 100644 ---- a/src/univ/slider.cpp -+++ b/src/univ/slider.cpp -@@ -648,14 +648,13 @@ void wxSlider::CalcThumbRect(const wxRect *rectShaftIn, - // position is not at lenShaft but at lenShaft - thumbSize - if ( m_max != m_min ) - { -- if ( isVertical ) -- { -- *p += ((lenShaft - lenThumb)*(m_max - value))/(m_max - m_min); -- } -+ int offset; -+ if (IsInverted()) -+ offset = m_max - value; - else -- { // horz -- *p += ((lenShaft - lenThumb)*(value - m_min))/(m_max - m_min); -- } -+ offset = value - m_min; -+ -+ *p += ((lenShaft - lenThumb) * offset)/(m_max - m_min); - } - - // calc the label rect -@@ -704,11 +703,15 @@ void wxSlider::DoDraw(wxControlRenderer *renderer) - wxSize sz = GetThumbSize(); - int len = IsVert() ? sz.x : sz.y; - -+ int offset = IsInverted() ? m_max - m_value : m_value - m_min; -+ int range = m_max - m_min; -+ double fracValue = range > 0 ? static_cast(offset) / range : 0.0; -+ - // first draw the shaft - wxRect rectShaft = rend->GetSliderShaftRect(m_rectSlider, len, orient, style); - if ( rectUpdate.Intersects(rectShaft) ) - { -- rend->DrawSliderShaft(dc, m_rectSlider, len, orient, flags, style); -+ rend->DrawSliderShaft(dc, m_rectSlider, fracValue, len, orient, flags, style); - } - - // calculate the thumb position in pixels and draw it -@@ -921,16 +924,21 @@ int wxSlider::PixelToThumbPos(wxCoord x) const - len = rectShaft.width - sizeThumb.x; - } - -+ int logicalPos; -+ if (IsInverted()) -+ logicalPos = x0 + len - x; -+ else -+ logicalPos = x - x0; -+ - int pos = m_min; - if ( len > 0 ) - { -- if ( x > x0 ) -- { -- pos += ((x - x0) * (m_max - m_min)) / len; -- if ( pos > m_max ) -+ if (logicalPos > 0) { -+ if (logicalPos <= len) -+ pos += (logicalPos * (m_max - m_min)) / len; -+ else - pos = m_max; - } -- //else: x <= x0, leave pos = min - } - - return pos; -@@ -955,38 +963,17 @@ void wxSlider::SetShaftPartState(wxScrollThumb::Shaft shaftPart, - - void wxSlider::OnThumbDragStart(int pos) - { -- if (IsVert()) -- { -- PerformAction(wxACTION_SLIDER_THUMB_DRAG, m_max - pos); -- } -- else -- { -- PerformAction(wxACTION_SLIDER_THUMB_DRAG, pos); -- } -+ PerformAction(wxACTION_SLIDER_THUMB_DRAG, pos); - } - - void wxSlider::OnThumbDrag(int pos) - { -- if (IsVert()) -- { -- PerformAction(wxACTION_SLIDER_THUMB_MOVE, m_max - pos); -- } -- else -- { -- PerformAction(wxACTION_SLIDER_THUMB_MOVE, pos); -- } -+ PerformAction(wxACTION_SLIDER_THUMB_MOVE, pos); - } - - void wxSlider::OnThumbDragEnd(int pos) - { -- if (IsVert()) -- { -- PerformAction(wxACTION_SLIDER_THUMB_RELEASE, m_max - pos); -- } -- else -- { -- PerformAction(wxACTION_SLIDER_THUMB_RELEASE, pos); -- } -+ PerformAction(wxACTION_SLIDER_THUMB_RELEASE, pos); - } - - void wxSlider::OnPageScrollStart() -diff --git a/src/univ/spinbutt.cpp b/src/univ/spinbutt.cpp -index 32062e7eb9..60ece45932 100644 ---- a/src/univ/spinbutt.cpp -+++ b/src/univ/spinbutt.cpp -@@ -186,13 +186,15 @@ wxSize wxSpinButton::DoGetBestClientSize() const - { - // a spin button has by default the same size as two scrollbar arrows put - // together -- wxSize size = m_renderer->GetScrollbarArrowSize(); -+ wxSize size; - if ( IsVertical() ) - { -+ size = m_renderer->GetScrollbarArrowSize(wxVERTICAL); - size.y *= 2; - } - else - { -+ size = m_renderer->GetScrollbarArrowSize(wxHORIZONTAL); - size.x *= 2; - } - -@@ -290,30 +292,40 @@ void wxSpinButton::DoDraw(wxControlRenderer *renderer) - - void wxSpinButton::CalcArrowRects(wxRect *rect1, wxRect *rect2) const - { -- // calculate the rectangles for both arrows: note that normally the 2 -- // arrows are adjacent to each other but if the total control width/height -- // is odd, we can have 1 pixel between them -+ const wxCoord ARROW_WIDTH = 9; -+ const wxCoord ARROW_HEIGHT = 5; -+ - wxRect rectTotal = GetClientRect(); - -- *rect1 = -- *rect2 = rectTotal; - if ( IsVertical() ) - { -- rect1->height /= 2; -- rect2->height /= 2; -- -- rect2->y += rect1->height; -- if ( rectTotal.height % 2 ) -- rect2->y++; -+ wxCoord h = rectTotal.height / 2; -+ wxCoord w = rectTotal.width; -+ -+ rect1->x = rectTotal.x + (w - ARROW_WIDTH) / 2; -+ rect1->y = rectTotal.y + (h - ARROW_HEIGHT) / 2; -+ rect1->width = ARROW_WIDTH; -+ rect1->height = ARROW_HEIGHT; -+ -+ rect2->x = rect1->x; -+ rect2->y = rect1->y + h; -+ rect2->width = ARROW_WIDTH; -+ rect2->height = ARROW_HEIGHT; - } - else // horizontal - { -- rect1->width /= 2; -- rect2->width /= 2; -- -- rect2->x += rect1->width; -- if ( rectTotal.width % 2 ) -- rect2->x++; -+ wxCoord h = rectTotal.height; -+ wxCoord w = rectTotal.width / 2; -+ -+ rect1->x = rectTotal.x + (w - ARROW_WIDTH) / 2; -+ rect1->y = rectTotal.y + (h - ARROW_HEIGHT) / 2; -+ rect1->width = ARROW_WIDTH; -+ rect1->height = ARROW_HEIGHT; -+ -+ rect2->x = rect1->x + w; -+ rect2->y = rect1->y; -+ rect2->width = ARROW_WIDTH; -+ rect2->height = ARROW_HEIGHT; - } - } - -diff --git a/src/univ/stattext.cpp b/src/univ/stattext.cpp -index 84b152bc9f..b240c42036 100644 ---- a/src/univ/stattext.cpp -+++ b/src/univ/stattext.cpp -@@ -75,6 +75,8 @@ void wxStaticText::SetLabel(const wxString& str) - - // draw as real label the abbreviated version of it - WXSetVisibleLabel(GetEllipsizedLabel()); -+ -+ AutoResizeIfNecessary(); - } - - void wxStaticText::WXSetVisibleLabel(const wxString& str) -@@ -84,7 +86,7 @@ void wxStaticText::WXSetVisibleLabel(const wxString& str) - - wxString wxStaticText::WXGetVisibleLabel() const - { -- return wxControl::GetLabel(); -+ return wxControl::GetLabelText(); - } - - /* -diff --git a/src/univ/stdrend.cpp b/src/univ/stdrend.cpp -index 8e694120e3..0edeaf3f4a 100644 ---- a/src/univ/stdrend.cpp -+++ b/src/univ/stdrend.cpp -@@ -429,7 +429,7 @@ void wxStdRenderer::DrawBorder(wxDC& dc, - break; - - case wxBORDER_SIMPLE: -- DrawRect(dc, &rect, m_penBlack); -+ DrawStaticBorder(dc, &rect); - break; - - default: -diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp -index 9575a243b9..f1f8deacd1 100644 ---- a/src/univ/textctrl.cpp -+++ b/src/univ/textctrl.cpp -@@ -746,6 +746,7 @@ bool wxTextCtrl::Create(wxWindow *parent, - RecalcFontMetrics(); - ChangeValue(value); - SetInitialSize(size); -+ SetBackgroundColour(*wxWHITE); - - m_isEditable = !(style & wxTE_READONLY); - -@@ -2404,6 +2405,23 @@ wxSize wxTextCtrl::DoGetBestClientSize() const - return wxSize(rectTotal.width, rectTotal.height); - } - -+wxSize wxTextCtrl::DoGetSizeFromTextSize(int xlen, int ylen) const -+{ -+ wxRect rectText(0, 0, xlen, ylen); -+ wxRect rectTotal = GetRenderer()->GetTextTotalArea(this, rectText); -+ -+ if (xlen == -1 || ylen == -1) -+ { -+ wxSize bestSize = DoGetBestClientSize(); -+ if (xlen == -1) -+ rectTotal.width = bestSize.x; -+ if (ylen == -1) -+ rectTotal.height = bestSize.y; -+ } -+ -+ return wxSize(rectTotal.width, rectTotal.height); -+} -+ - void wxTextCtrl::UpdateTextRect() - { - wxRect rectTotal(GetClientSize()); -diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp -index f0005e7946..a03ade235f 100644 ---- a/src/univ/themes/gtk.cpp -+++ b/src/univ/themes/gtk.cpp -@@ -141,6 +141,7 @@ public: - #if wxUSE_SLIDER - virtual void DrawSliderShaft(wxDC& dc, - const wxRect& rect, -+ double fracValue, - int lenThumb, - wxOrientation orient, - int flags = 0, -@@ -193,7 +194,7 @@ public: - - // geometry and hit testing - #if wxUSE_SCROLLBAR -- virtual wxSize GetScrollbarArrowSize() const -+ virtual wxSize GetScrollbarArrowSize(wxOrientation WXUNUSED(orientation)) const - { return m_sizeScrollbarArrow; } - #endif // wxUSE_SCROLLBAR - -@@ -1500,6 +1501,7 @@ wxRect wxGTKRenderer::GetSliderShaftRect(const wxRect& rect, - - void wxGTKRenderer::DrawSliderShaft(wxDC& dc, - const wxRect& rectOrig, -+ double WXUNUSED(fracValue), - int WXUNUSED(lenThumb), - wxOrientation WXUNUSED(orient), - int flags, -diff --git a/src/univ/themes/mono.cpp b/src/univ/themes/mono.cpp -index e028eae0cb..c77a54ffe4 100644 ---- a/src/univ/themes/mono.cpp -+++ b/src/univ/themes/mono.cpp -@@ -115,6 +115,7 @@ public: - #if wxUSE_SLIDER - virtual void DrawSliderShaft(wxDC& dc, - const wxRect& rect, -+ double fracValue, - int lenThumb, - wxOrientation orient, - int flags = 0, -@@ -170,7 +171,8 @@ public: - virtual wxRect GetBorderDimensions(wxBorder border) const; - - #if wxUSE_SCROLLBAR -- virtual wxSize GetScrollbarArrowSize() const { return GetStdBmpSize(); } -+ virtual wxSize GetScrollbarArrowSize(wxOrientation WXUNUSED(orientation)) const -+ { return GetStdBmpSize(); } - #endif // wxUSE_SCROLLBAR - - virtual wxSize GetCheckBitmapSize() const { return GetStdBmpSize(); } -@@ -952,6 +954,7 @@ wxMenuGeometryInfo *wxMonoRenderer::GetMenuGeometry(wxWindow *WXUNUSED(win), - - void wxMonoRenderer::DrawSliderShaft(wxDC& WXUNUSED(dc), - const wxRect& WXUNUSED(rect), -+ double WXUNUSED(fracValue), - int WXUNUSED(lenThumb), - wxOrientation WXUNUSED(orient), - int WXUNUSED(flags), -diff --git a/src/univ/themes/wasm.cpp b/src/univ/themes/wasm.cpp -new file mode 100644 -index 0000000000..9b65b24a8b ---- /dev/null -+++ b/src/univ/themes/wasm.cpp -@@ -0,0 +1,2960 @@ -+/////////////////////////////////////////////////////////////////////////////// -+// Name: src/univ/themes/wasm.cpp -+// Purpose: wxUniversal theme for WASM -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+/////////////////////////////////////////////////////////////////////////////// -+ -+// =========================================================================== -+// declarations -+// =========================================================================== -+ -+// --------------------------------------------------------------------------- -+// headers -+// --------------------------------------------------------------------------- -+ -+// for compilers that support precompilation, includes "wx.h". -+#include "wx/wxprec.h" -+ -+ -+#include "wx/univ/theme.h" -+ -+#if wxUSE_THEME_WASM -+ -+#ifndef WX_PRECOMP -+ #include "wx/intl.h" -+ #include "wx/log.h" -+ #include "wx/dcmemory.h" -+ #include "wx/dcclient.h" -+ #include "wx/window.h" -+ -+ #include "wx/menu.h" -+ -+ #include "wx/bmpbuttn.h" -+ #include "wx/button.h" -+ #include "wx/checkbox.h" -+ #include "wx/listbox.h" -+ #include "wx/checklst.h" -+ #include "wx/combobox.h" -+ #include "wx/scrolbar.h" -+ #include "wx/slider.h" -+ #include "wx/textctrl.h" -+ #include "wx/toolbar.h" -+ #include "wx/statusbr.h" -+ -+ #include "wx/settings.h" -+ #include "wx/toplevel.h" -+ #include "wx/image.h" -+#endif // WX_PRECOMP -+ -+#include "wx/notebook.h" -+#include "wx/spinbutt.h" -+#include "wx/artprov.h" -+#include "wx/tglbtn.h" -+ -+#include "wx/univ/stdrend.h" -+#include "wx/univ/inpcons.h" -+#include "wx/univ/inphand.h" -+#include "wx/univ/colschem.h" -+ -+class wxWasmMenuGeometryInfo; -+ -+// ---------------------------------------------------------------------------- -+// constants -+// ---------------------------------------------------------------------------- -+ -+// standard border size -+static const int BORDER_THICKNESS = 2; -+ -+static const int CHECK_WIDTH = 8; -+static const int CHECK_HEIGHT = 8; -+ -+// ---------------------------------------------------------------------------- -+// wxWasmRenderer: draw the GUI elements in Wasm style -+// ---------------------------------------------------------------------------- -+ -+class wxWasmRenderer : public wxStdRenderer -+{ -+public: -+ wxWasmRenderer(const wxColourScheme *scheme); -+ -+ // wxRenderer methods -+ virtual void DrawFocusRect(wxWindow* win, -+ wxDC& dc, -+ const wxRect& rect, -+ int flags = 0) wxOVERRIDE; -+ virtual void DrawTextBorder(wxDC& dc, -+ wxBorder border, -+ const wxRect& rect, -+ int flags = 0, -+ wxRect *rectIn = NULL) wxOVERRIDE; -+ virtual void DrawButtonSurface(wxDC& dc, -+ const wxColour& col, -+ const wxRect& rect, -+ int flags) wxOVERRIDE; -+ virtual void DrawButtonLabel(wxDC& dc, -+ const wxString& label, -+ const wxBitmap& image, -+ const wxRect& rect, -+ int flags, -+ int alignment, -+ int indexAccel, -+ wxRect *rectBounds) wxOVERRIDE; -+ virtual void DrawButtonBorder(wxDC& dc, -+ const wxRect& rect, -+ int flags = 0, -+ wxRect *rectIn = NULL) wxOVERRIDE; -+ virtual void DrawArrow(wxDC& dc, -+ wxDirection dir, -+ const wxRect& rect, -+ int flags = 0) wxOVERRIDE; -+ virtual void DrawMenuArrow(wxDC& dc, -+ const wxRect& rect, -+ int flags = 0); -+ virtual void DrawScrollbarArrow(wxDC& dc, -+ wxDirection dir, -+ const wxRect& rect, -+ int flags = 0) wxOVERRIDE; -+ virtual void DrawScrollbarThumb(wxDC& dc, -+ wxOrientation orient, -+ const wxRect& rect, -+ int flags = 0) wxOVERRIDE; -+ virtual void DrawScrollbarShaft(wxDC& dc, -+ wxOrientation orient, -+ const wxRect& rect, -+ int flags = 0) wxOVERRIDE; -+ -+#if wxUSE_TOOLBAR -+ virtual void DrawToolBarButton(wxDC& dc, -+ const wxString& label, -+ const wxBitmap& bitmap, -+ const wxRect& rect, -+ int flags = 0, -+ long style = 0, -+ int tbarStyle = 0) wxOVERRIDE; -+#endif // wxUSE_TOOLBAR -+ -+#if wxUSE_TEXTCTRL -+ virtual void DrawLineWrapMark(wxDC& dc, const wxRect& rect) wxOVERRIDE; -+#endif // wxUSE_TEXTCTRL -+ -+#if wxUSE_NOTEBOOK -+ virtual void DrawTab(wxDC& dc, -+ const wxRect& rect, -+ wxDirection dir, -+ const wxString& label, -+ const wxBitmap& bitmap = wxNullBitmap, -+ int flags = 0, -+ int indexAccel = -1) wxOVERRIDE; -+#endif // wxUSE_NOTEBOOK -+ -+#if wxUSE_SLIDER -+ virtual void DrawSliderShaft(wxDC& dc, -+ const wxRect& rect, -+ double fracValue, -+ int lenThumb, -+ wxOrientation orient, -+ int flags = 0, -+ long style = 0, -+ wxRect *rectShaft = NULL) wxOVERRIDE; -+ virtual void DrawSliderThumb(wxDC& dc, -+ const wxRect& rect, -+ wxOrientation orient, -+ int flags = 0, -+ long style = 0) wxOVERRIDE; -+ virtual void DrawSliderTicks(wxDC& WXUNUSED(dc), -+ const wxRect& WXUNUSED(rect), -+ int WXUNUSED(lenThumb), -+ wxOrientation WXUNUSED(orient), -+ int WXUNUSED(start), -+ int WXUNUSED(end), -+ int WXUNUSED(step) = 1, -+ int WXUNUSED(flags) = 0, -+ long WXUNUSED(style) = 0) wxOVERRIDE -+ { -+ // we don't have the ticks in Wasm version -+ } -+#endif // wxUSE_SLIDER -+ -+#if wxUSE_MENUS -+ virtual void DrawMenuBarItem(wxDC& dc, -+ const wxRect& rect, -+ const wxString& label, -+ int flags = 0, -+ int indexAccel = -1) wxOVERRIDE; -+ virtual void DrawMenuItem(wxDC& dc, -+ wxCoord y, -+ const wxMenuGeometryInfo& geometryInfo, -+ const wxString& label, -+ const wxString& accel, -+ const wxBitmap& bitmap = wxNullBitmap, -+ int flags = 0, -+ int indexAccel = -1) wxOVERRIDE; -+ virtual void DrawMenuSeparator(wxDC& dc, -+ wxCoord y, -+ const wxMenuGeometryInfo& geomInfo) wxOVERRIDE; -+ virtual void DrawMenuOverflowArrow(wxDC& dc, -+ const wxRect& rect, -+ wxDirection direction) wxOVERRIDE; -+#endif // wxUSE_MENUS -+ -+ virtual void GetComboBitmaps(wxBitmap *bmpNormal, -+ wxBitmap *bmpFocus, -+ wxBitmap *bmpPressed, -+ wxBitmap *bmpDisabled) wxOVERRIDE; -+ -+ virtual void AdjustSize(wxSize *size, const wxWindow *window) wxOVERRIDE; -+ -+ // geometry and hit testing -+#if wxUSE_SCROLLBAR -+ virtual wxSize GetScrollbarArrowSize(wxOrientation orientation) const wxOVERRIDE -+ { return orientation == wxVERTICAL ? wxSize(15, 0) : wxSize(0, 15); } -+#endif // wxUSE_SCROLLBAR -+ -+ virtual wxSize GetCheckBitmapSize() const wxOVERRIDE -+ { return wxSize(14, 14); } -+ virtual wxSize GetRadioBitmapSize() const wxOVERRIDE -+ { return wxSize(15, 15); } -+ virtual wxCoord GetCheckItemMargin() const wxOVERRIDE -+ { return 2; } -+ -+#if wxUSE_TOOLBAR -+ virtual wxSize GetToolBarButtonSize(wxCoord *separator) const wxOVERRIDE -+ { if ( separator ) *separator = 5; return wxSize(16, 15); } -+ virtual wxSize GetToolBarMargin() const wxOVERRIDE -+ { return wxSize(6, 6); } -+#endif // wxUSE_TOOLBAR -+ -+#if wxUSE_TEXTCTRL -+ virtual wxRect GetTextClientArea(const wxTextCtrl *text, -+ const wxRect& rect, -+ wxCoord *extraSpaceBeyond) const wxOVERRIDE; -+#endif // wxUSE_TEXTCTRL -+ -+#if wxUSE_NOTEBOOK -+ virtual wxSize GetTabIndent() const wxOVERRIDE { return wxSize(2, 2); } -+ virtual wxSize GetTabPadding() const wxOVERRIDE { return wxSize(6, 6); } -+#endif // wxUSE_NOTEBOOK -+ -+#if wxUSE_SLIDER -+ virtual wxCoord GetSliderDim() const wxOVERRIDE { return 21; } -+ virtual wxCoord GetSliderTickLen() const wxOVERRIDE { return 0; } -+ virtual wxRect GetSliderShaftRect(const wxRect& rect, -+ int lenThumb, -+ wxOrientation orient, -+ long style = 0) const wxOVERRIDE; -+ virtual wxSize GetSliderThumbSize(const wxRect& rect, -+ int lenThumb, -+ wxOrientation orient) const wxOVERRIDE; -+#endif // wxUSE_SLIDER -+ -+ virtual wxSize GetProgressBarStep() const wxOVERRIDE { return wxSize(16, 32); } -+ -+#if wxUSE_MENUS -+ virtual wxSize GetMenuBarItemSize(const wxSize& sizeText) const wxOVERRIDE; -+ virtual wxMenuGeometryInfo *GetMenuGeometry(wxWindow *win, -+ const wxMenu& menu) const wxOVERRIDE; -+#endif // wxUSE_MENUS -+ -+ // helpers for "wxBitmap wxColourScheme::Get()" -+ void DrawCheckBitmap(wxDC& dc, const wxRect& rect); -+ void DrawUncheckBitmap(wxDC& dc, const wxRect& rect, bool isPressed); -+ void DrawUndeterminedBitmap(wxDC& dc, const wxRect& rect, bool isPressed); -+ -+#if wxUSE_TEXTCTRL -+ // return the width of the border around the text area in the text control -+ virtual int GetTextBorderWidth(const wxTextCtrl *text) const wxOVERRIDE; -+#endif // wxUSE_TEXTCTRL -+ -+protected: -+ wxString RenderAccelString(const wxString& accel) const; -+ -+ // overridden wxStdRenderer methods -+ virtual void DrawSunkenBorder(wxDC& dc, wxRect *rect) wxOVERRIDE; -+ virtual void DrawStaticBorder(wxDC& dc, wxRect *rect) wxOVERRIDE; -+ -+ virtual void DrawHorizontalLine(wxDC& dc, wxCoord y, wxCoord x1, wxCoord x2) wxOVERRIDE; -+ virtual void DrawVerticalLine(wxDC& dc, wxCoord x, wxCoord y1, wxCoord y2) wxOVERRIDE; -+ -+ virtual void DrawFrameWithoutLabel(wxDC& dc, -+ const wxRect& rectFrame, -+ const wxRect& rectLabel); -+ -+ virtual void DrawFrameWithLabel(wxDC& dc, -+ const wxString& label, -+ const wxRect& rectFrame, -+ const wxRect& rectText, -+ int flags, -+ int alignment, -+ int indexAccel) wxOVERRIDE; -+ -+ virtual void DrawFrame(wxDC& dc, -+ const wxString& label, -+ const wxRect& rect, -+ int flags, -+ int alignment, -+ int indexAccel) wxOVERRIDE; -+ -+ virtual void DrawCheckItemBitmap(wxDC& dc, -+ const wxBitmap& bitmap, -+ const wxRect& rect, -+ int flags) wxOVERRIDE; -+ -+ // get the colour to use for background -+ wxColour GetBackgroundColour(int flags) const -+ { -+ if ( flags & wxCONTROL_PRESSED ) -+ return wxSCHEME_COLOUR(m_scheme, CONTROL_PRESSED); -+ else if ( flags & wxCONTROL_CURRENT ) -+ return wxSCHEME_COLOUR(m_scheme, CONTROL_CURRENT); -+ else -+ return wxSCHEME_COLOUR(m_scheme, CONTROL); -+ } -+ -+ // as DrawShadedRect() but the pixels in the bottom left and upper right -+ // border are drawn with the pen1, not pen2 -+ void DrawAntiShadedRect(wxDC& dc, wxRect *rect, -+ const wxPen& pen1, const wxPen& pen2); -+ -+ // used for drawing opened rectangles - draws only one side of it at once -+ // (and doesn't adjust the rect) -+ void DrawAntiShadedRectSide(wxDC& dc, -+ const wxRect& rect, -+ const wxPen& pen1, -+ const wxPen& pen2, -+ wxDirection dir); -+ -+ void DrawShadedRect(wxDC& dc, wxRect *rect, -+ const wxPen& pen1, const wxPen& pen2); -+ -+ // draw an opened rect for the arrow in given direction -+ void DrawArrowBorder(wxDC& dc, -+ wxRect *rect, -+ wxDirection dir); -+ -+ // draw two sides of the rectangle -+ void DrawThumbBorder(wxDC& dc, -+ wxRect *rect, -+ wxOrientation orient); -+ -+ // just as DrawRaisedBorder() except that the bottom left and up right -+ // pixels of the interior rect are drawn in another colour (i.e. the inner -+ // rect is drawn with DrawAntiShadedRect() and not DrawShadedRect()) -+ void DrawAntiRaisedBorder(wxDC& dc, wxRect *rect); -+ -+ // draw inner Wasm shadow -+ void DrawInnerShadedRect(wxDC& dc, wxRect *rect); -+ -+ // get the line wrap indicator bitmap -+ wxBitmap GetLineWrapBitmap() const; -+ -+ virtual wxBitmap GetCheckBitmap(int flags) wxOVERRIDE; -+ virtual wxBitmap GetRadioBitmap(int flags) wxOVERRIDE; -+ -+ // draw a /\ or \/ line from (x1, y1) to (x2, y1) passing by the point -+ // ((x1 + x2)/2, y2) -+ void DrawUpZag(wxDC& dc, -+ wxCoord x1, wxCoord x2, -+ wxCoord y1, wxCoord y2); -+ void DrawDownZag(wxDC& dc, -+ wxCoord x1, wxCoord x2, -+ wxCoord y1, wxCoord y2); -+ -+ void DrawCheck(wxDC& dc, const wxRect& rect); -+ -+ // draw the radio button bitmap for the given state -+ void DrawRadioButtonBitmap(wxDC& dc, const wxRect& rect, int flags); -+ -+ // common part of DrawMenuItem() and DrawMenuBarItem() -+ void DoDrawMenuItem(wxDC& dc, -+ const wxRect& rect, -+ const wxString& label, -+ int flags, -+ int indexAccel, -+ const wxString& accel = wxEmptyString, -+ const wxBitmap& bitmap = wxNullBitmap, -+ const wxWasmMenuGeometryInfo *geometryInfo = NULL); -+ -+ // initialize the combo bitmaps -+ void InitComboBitmaps(); -+ -+ virtual wxBitmap GetFrameButtonBitmap(FrameButtonType WXUNUSED(type)) wxOVERRIDE -+ { -+ return wxNullBitmap; -+ } -+ -+private: -+ // data -+ wxSize m_sizeScrollbarArrow; -+ -+ // GDI objects -+ wxPen m_penGrey; -+ wxPen m_penMediumGrey; -+ -+ // the checkbox and radio button bitmaps: first row is for the normal, -+ // second for the pressed state and the columns are for checked, unchecked -+ // and undeterminated respectively -+ wxBitmap m_bitmapsCheckbox[IndicatorState_MaxCtrl][IndicatorStatus_Max], -+ m_bitmapsRadiobtn[IndicatorState_MaxCtrl][IndicatorStatus_Max]; -+ -+ // the line wrap bitmap (drawn at the end of wrapped lines) -+ wxBitmap m_bmpLineWrap; -+ -+ // the combobox bitmaps -+ enum -+ { -+ ComboState_Normal, -+ ComboState_Focus, -+ ComboState_Pressed, -+ ComboState_Disabled, -+ ComboState_Max -+ }; -+ -+ wxBitmap m_bitmapsCombo[ComboState_Max]; -+}; -+ -+// ---------------------------------------------------------------------------- -+// wxWasmInputHandler and derived classes: process the keyboard and mouse -+// messages according to Wasm standards -+// ---------------------------------------------------------------------------- -+ -+class wxWasmInputHandler : public wxInputHandler -+{ -+public: -+ wxWasmInputHandler() { } -+ -+ virtual bool HandleKey(wxInputConsumer *control, -+ const wxKeyEvent& event, -+ bool pressed); -+ virtual bool HandleMouse(wxInputConsumer *control, -+ const wxMouseEvent& event); -+ virtual bool HandleMouseMove(wxInputConsumer *control, -+ const wxMouseEvent& event); -+}; -+ -+#if wxUSE_SCROLLBAR -+ -+class wxWasmScrollBarInputHandler : public wxStdScrollBarInputHandler -+{ -+public: -+ wxWasmScrollBarInputHandler(wxRenderer *renderer, wxInputHandler *handler) -+ : wxStdScrollBarInputHandler(renderer, handler) { } -+ -+protected: -+ virtual void Highlight(wxScrollBar *scrollbar, bool doIt) -+ { -+ // only arrows and the thumb can be highlighted -+ if ( !IsArrow() && m_htLast != wxHT_SCROLLBAR_THUMB ) -+ return; -+ -+ wxStdScrollBarInputHandler::Highlight(scrollbar, doIt); -+ } -+ -+ virtual void Press(wxScrollBar *scrollbar, bool doIt) -+ { -+ // only arrows can be pressed -+ if ( !IsArrow() ) -+ return; -+ -+ wxStdScrollBarInputHandler::Press(scrollbar, doIt); -+ } -+ -+ // any button can be used to drag the scrollbar under Wasm+ -+ virtual bool IsAllowedButton(int WXUNUSED(button)) const { return true; } -+ -+ bool IsArrow() const -+ { -+ return m_htLast == wxHT_SCROLLBAR_ARROW_LINE_1 || -+ m_htLast == wxHT_SCROLLBAR_ARROW_LINE_2; -+ } -+}; -+ -+#endif // wxUSE_SCROLLBAR -+ -+#if wxUSE_CHECKBOX -+ -+class wxWasmCheckboxInputHandler : public wxStdInputHandler -+{ -+public: -+ wxWasmCheckboxInputHandler(wxInputHandler *handler) -+ : wxStdInputHandler(handler) { } -+ -+ virtual bool HandleKey(wxInputConsumer *control, -+ const wxKeyEvent& event, -+ bool pressed); -+}; -+ -+#endif // wxUSE_CHECKBOX -+ -+#if wxUSE_TEXTCTRL -+ -+class wxWasmTextCtrlInputHandler : public wxStdInputHandler -+{ -+public: -+ wxWasmTextCtrlInputHandler(wxInputHandler *handler) -+ : wxStdInputHandler(handler) { } -+ -+ virtual bool HandleKey(wxInputConsumer *control, -+ const wxKeyEvent& event, -+ bool pressed); -+}; -+ -+#endif // wxUSE_TEXTCTRL -+ -+// ---------------------------------------------------------------------------- -+// wxWasmColourScheme: uses the standard Wasm colours -+// ---------------------------------------------------------------------------- -+ -+class wxWasmColourScheme : public wxColourScheme -+{ -+public: -+ virtual wxColour Get(StdColour col) const; -+ virtual wxColour GetBackground(wxWindow *win) const; -+}; -+ -+// ---------------------------------------------------------------------------- -+// wxWasmArtProvider -+// ---------------------------------------------------------------------------- -+ -+class wxWasmArtProvider : public wxArtProvider -+{ -+protected: -+ virtual wxBitmap CreateBitmap(const wxArtID& id, -+ const wxArtClient& client, -+ const wxSize& size); -+}; -+ -+// ---------------------------------------------------------------------------- -+// wxWasmTheme -+// ---------------------------------------------------------------------------- -+ -+WX_DEFINE_ARRAY_PTR(wxInputHandler *, wxArrayHandlers); -+ -+class wxWasmTheme : public wxTheme -+{ -+public: -+ wxWasmTheme(); -+ virtual ~wxWasmTheme(); -+ -+ virtual wxRenderer *GetRenderer(); -+ virtual wxArtProvider *GetArtProvider(); -+ virtual wxInputHandler *GetInputHandler(const wxString& control, -+ wxInputConsumer *consumer); -+ virtual wxColourScheme *GetColourScheme(); -+ -+private: -+ wxWasmRenderer *m_renderer; -+ -+ wxWasmArtProvider *m_artProvider; -+ -+ // the names of the already created handlers and the handlers themselves -+ // (these arrays are synchronized) -+ wxSortedArrayString m_handlerNames; -+ wxArrayHandlers m_handlers; -+ -+ wxWasmColourScheme *m_scheme; -+ -+ WX_DECLARE_THEME(wasm) -+}; -+ -+// ============================================================================ -+// implementation -+// ============================================================================ -+ -+WX_IMPLEMENT_THEME(wxWasmTheme, wasm, wxTRANSLATE("WASM theme")); -+ -+// ---------------------------------------------------------------------------- -+// wxWasmTheme -+// ---------------------------------------------------------------------------- -+ -+wxWasmTheme::wxWasmTheme() -+{ -+ m_scheme = NULL; -+ m_renderer = NULL; -+ m_artProvider = NULL; -+} -+ -+wxWasmTheme::~wxWasmTheme() -+{ -+ delete m_renderer; -+ delete m_scheme; -+ delete m_artProvider; -+} -+ -+wxRenderer *wxWasmTheme::GetRenderer() -+{ -+ if ( !m_renderer ) -+ { -+ m_renderer = new wxWasmRenderer(GetColourScheme()); -+ } -+ -+ return m_renderer; -+} -+ -+wxArtProvider *wxWasmTheme::GetArtProvider() -+{ -+ if ( !m_artProvider ) -+ { -+ m_artProvider = new wxWasmArtProvider; -+ } -+ -+ return m_artProvider; -+} -+ -+wxColourScheme *wxWasmTheme::GetColourScheme() -+{ -+ if ( !m_scheme ) -+ { -+ m_scheme = new wxWasmColourScheme; -+ } -+ return m_scheme; -+} -+ -+wxInputHandler *wxWasmTheme::GetInputHandler(const wxString& control, -+ wxInputConsumer *consumer) -+{ -+ wxInputHandler *handler = NULL; -+ int n = m_handlerNames.Index(control); -+ if ( n == wxNOT_FOUND ) -+ { -+ static wxWasmInputHandler s_handlerDef; -+ -+ wxInputHandler * const -+ handlerStd = consumer->DoGetStdInputHandler(&s_handlerDef); -+ -+ // create a new handler -+#if wxUSE_CHECKBOX -+ if ( control == wxINP_HANDLER_CHECKBOX ) -+ { -+ static wxWasmCheckboxInputHandler s_handler(handlerStd); -+ -+ handler = &s_handler; -+ } -+ else -+#endif // wxUSE_CHECKBOX -+#if wxUSE_SCROLLBAR -+ if ( control == wxINP_HANDLER_SCROLLBAR ) -+ { -+ static wxWasmScrollBarInputHandler s_handler(m_renderer, handlerStd); -+ -+ handler = &s_handler; -+ } -+ else -+#endif // wxUSE_SCROLLBAR -+#if wxUSE_TEXTCTRL -+ if ( control == wxINP_HANDLER_TEXTCTRL ) -+ { -+ static wxWasmTextCtrlInputHandler s_handler(handlerStd); -+ -+ handler = &s_handler; -+ } -+ else -+#endif // wxUSE_TEXTCTRL -+ { -+ // no special handler for this control -+ handler = handlerStd; -+ } -+ -+ n = m_handlerNames.Add(control); -+ m_handlers.Insert(handler, n); -+ } -+ else // we already have it -+ { -+ handler = m_handlers[n]; -+ } -+ -+ return handler; -+} -+ -+// ============================================================================ -+// wxWasmColourScheme -+// ============================================================================ -+ -+wxColour wxWasmColourScheme::GetBackground(wxWindow *win) const -+{ -+ wxColour col; -+ if ( win->UseBgCol() ) -+ { -+ // use the user specified colour -+ col = win->GetBackgroundColour(); -+ } -+ -+ if ( !win->ShouldInheritColours() ) -+ { -+ // doesn't depend on the state -+ if ( !col.IsOk() ) -+ { -+ col = Get(WINDOW); -+ } -+ } -+ else -+ { -+ int flags = win->GetStateFlags(); -+ -+ // the colour set by the user should be used for the normal state -+ // and for the states for which we don't have any specific colours -+ if ( !col.IsOk() || (flags != 0) ) -+ { -+#if wxUSE_SCROLLBAR -+ if ( wxDynamicCast(win, wxScrollBar) ) -+ col = Get(SCROLLBAR); -+ else -+#endif //wxUSE_SCROLLBAR -+ if ( (flags & wxCONTROL_CURRENT) && win->CanBeHighlighted() ) -+ col = Get(CONTROL_CURRENT); -+ else if ( flags & wxCONTROL_PRESSED ) -+ col = Get(CONTROL_PRESSED); -+ else -+ col = Get(CONTROL); -+ } -+ } -+ -+ return col; -+} -+ -+wxColour wxWasmColourScheme::Get(wxWasmColourScheme::StdColour col) const -+{ -+ switch ( col ) -+ { -+ case FRAME: -+ case WINDOW: return wxColour(0xe6e6e6); -+ -+ case SHADOW_DARK: return wxColour(0x606060); -+ case SHADOW_HIGHLIGHT: return *wxWHITE; -+ case SHADOW_IN: return wxColour(0xd6d6d6); -+ case SHADOW_OUT: return wxColour(0x969696); -+ -+ case CONTROL: return wxColour(0xe6e6e6); -+ case CONTROL_PRESSED: return wxColour(0xc3c3c3); -+ case CONTROL_CURRENT: return wxColour(0xeaeaea); -+ -+ case CONTROL_TEXT: return *wxBLACK; -+ case CONTROL_TEXT_DISABLED: -+ return wxColour(0x757575); -+ case CONTROL_TEXT_DISABLED_SHADOW: -+ return *wxWHITE; -+ -+ case SCROLLBAR: -+ case SCROLLBAR_PRESSED: return wxColour(0xa0a0a0); -+ -+ case HIGHLIGHT: return wxColour(0xd56464); -+ case HIGHLIGHT_TEXT: return wxColour(0xffffff); -+ -+ case GAUGE: return Get(CONTROL_CURRENT); -+ -+ case TITLEBAR: return wxColour(0xaeaaae); -+ case TITLEBAR_ACTIVE: return wxColour(0x820300); -+ case TITLEBAR_TEXT: return wxColour(0xc0c0c0); -+ case TITLEBAR_ACTIVE_TEXT: -+ return *wxWHITE; -+ -+ case DESKTOP: return *wxBLACK; -+ -+ case MAX: -+ default: -+ wxFAIL_MSG(wxT("invalid standard colour")); -+ return *wxBLACK; -+ } -+} -+ -+// ============================================================================ -+// wxWasmRenderer -+// ============================================================================ -+ -+// ---------------------------------------------------------------------------- -+// construction -+// ---------------------------------------------------------------------------- -+ -+wxWasmRenderer::wxWasmRenderer(const wxColourScheme *scheme) -+ : wxStdRenderer(scheme) -+{ -+ m_penGrey = wxPen(wxSCHEME_COLOUR(scheme, SCROLLBAR)); -+ m_penMediumGrey = wxPen(wxColour(182, 182, 182)); -+} -+ -+// ---------------------------------------------------------------------------- -+// border stuff -+// ---------------------------------------------------------------------------- -+ -+void wxWasmRenderer::DrawAntiShadedRectSide(wxDC& dc, -+ const wxRect& rect, -+ const wxPen& pen1, -+ const wxPen& pen2, -+ wxDirection dir) -+{ -+ dc.SetPen(dir == wxLEFT || dir == wxUP ? pen1 : pen2); -+ -+ switch ( dir ) -+ { -+ case wxLEFT: -+ dc.DrawLine(rect.GetLeft(), rect.GetTop(), -+ rect.GetLeft(), rect.GetBottom() + 1); -+ break; -+ -+ case wxUP: -+ dc.DrawLine(rect.GetLeft(), rect.GetTop(), -+ rect.GetRight() + 1, rect.GetTop()); -+ break; -+ -+ case wxRIGHT: -+ dc.DrawLine(rect.GetRight(), rect.GetTop(), -+ rect.GetRight(), rect.GetBottom() + 1); -+ break; -+ -+ case wxDOWN: -+ dc.DrawLine(rect.GetLeft(), rect.GetBottom(), -+ rect.GetRight() + 1, rect.GetBottom()); -+ break; -+ -+ default: -+ wxFAIL_MSG(wxT("unknown rectangle side")); -+ } -+} -+ -+void wxWasmRenderer::DrawAntiShadedRect(wxDC& dc, wxRect *rect, -+ const wxPen& pen1, const wxPen& pen2) -+{ -+ // draw the rectangle -+ dc.SetPen(pen1); -+ dc.DrawLine(rect->GetLeft(), rect->GetTop(), -+ rect->GetLeft(), rect->GetBottom()); -+ dc.DrawLine(rect->GetLeft() + 1, rect->GetTop(), -+ rect->GetRight(), rect->GetTop()); -+ dc.SetPen(pen2); -+ dc.DrawLine(rect->GetRight(), rect->GetTop() + 1, -+ rect->GetRight(), rect->GetBottom()); -+ dc.DrawLine(rect->GetLeft() + 1, rect->GetBottom(), -+ rect->GetRight(), rect->GetBottom()); -+ -+ // adjust the rect -+ rect->Inflate(-1); -+} -+ -+void wxWasmRenderer::DrawShadedRect(wxDC& dc, wxRect *rect, -+ const wxPen& pen1, const wxPen& pen2) -+{ -+ // draw the rectangle -+ dc.SetPen(pen1); -+ dc.DrawLine(rect->GetLeft(), rect->GetTop(), -+ rect->GetLeft(), rect->GetBottom()); -+ dc.DrawLine(rect->GetLeft(), rect->GetTop(), -+ rect->GetRight(), rect->GetTop()); -+ dc.SetPen(pen2); -+ dc.DrawLine(rect->GetRight(), rect->GetTop(), -+ rect->GetRight(), rect->GetBottom()); -+ dc.DrawLine(rect->GetLeft(), rect->GetBottom(), -+ rect->GetRight(), rect->GetBottom()); -+ -+ // adjust the rect -+ rect->Inflate(-1); -+} -+ -+// ---------------------------------------------------------------------------- -+void wxWasmRenderer::DrawInnerShadedRect(wxDC& dc, wxRect *rect) -+{ -+ DrawAntiShadedRect(dc, rect, m_penDarkGrey, m_penHighlight); -+ DrawAntiShadedRect(dc, rect, m_penBlack, m_penHighlight); -+} -+ -+void wxWasmRenderer::DrawAntiRaisedBorder(wxDC& dc, wxRect *rect) -+{ -+ DrawShadedRect(dc, rect, m_penHighlight, m_penBlack); -+ DrawAntiShadedRect(dc, rect, m_penLightGrey, m_penDarkGrey); -+} -+ -+void wxWasmRenderer::DrawSunkenBorder(wxDC& dc, wxRect *rect) -+{ -+ DrawAntiShadedRect(dc, rect, m_penDarkGrey, m_penHighlight); -+ DrawShadedRect(dc, rect, m_penBlack, m_penLightGrey); -+} -+ -+void wxWasmRenderer::DrawStaticBorder(wxDC& dc, wxRect *rect) -+{ -+ DrawRect(dc, rect, m_penDarkGrey); -+} -+ -+void -+wxWasmRenderer::DrawFocusRect(wxWindow* WXUNUSED(win), -+ wxDC& WXUNUSED(dc), -+ const wxRect& WXUNUSED(rect), -+ int WXUNUSED(flags)) -+{ -+} -+ -+void wxWasmRenderer::DrawTextBorder(wxDC& dc, -+ wxBorder border, -+ const wxRect& rectOrig, -+ int flags, -+ wxRect *rectIn) -+{ -+ DrawBorder(dc, border, rectOrig, flags, rectIn); -+/* -+ wxRect rect = rectOrig; -+ -+ DrawRect(dc, &rect, m_penDarkGrey); -+ -+ if ( rectIn ) -+ *rectIn = rect; -+*/ -+} -+ -+void wxWasmRenderer::DrawButtonSurface(wxDC& dc, -+ const wxColour& WXUNUSED(col), -+ const wxRect& rect, -+ int flags) -+{ -+ if (flags & wxCONTROL_PRESSED) -+ { -+ DrawBackground(dc, wxColour(184, 184, 184), rect, flags); -+ } else { -+ DrawBackground(dc, wxColour(214, 214, 214), rect, flags); -+ } -+} -+ -+void wxWasmRenderer::DrawButtonLabel(wxDC& dc, -+ const wxString& text, -+ const wxBitmap& image, -+ const wxRect& rect, -+ int flags, -+ int alignment, -+ int WXUNUSED(indexAccel), -+ wxRect *rectBounds) -+{ -+ wxString label; -+ if (!image.IsOk()) -+ label = text; -+ -+ wxDCTextColourChanger clrChanger(dc); -+ -+ wxRect rectLabel = rect; -+ if ( !label.empty() && (flags & wxCONTROL_DISABLED) ) -+ { -+ if ( flags & wxCONTROL_PRESSED ) -+ { -+ // shift the label if a button is pressed -+ rectLabel.Offset(1, 1); -+ } -+ -+ -+ // make the main label text grey -+ clrChanger.Set(m_penDarkGrey.GetColour()); -+ -+ if ( flags & wxCONTROL_FOCUSED ) -+ { -+ // leave enough space for the focus rect -+ rectLabel.Inflate(-2); -+ } -+ } -+ -+ dc.DrawLabel(label, image, rectLabel, alignment, -1, rectBounds); -+} -+ -+void wxWasmRenderer::DrawButtonBorder(wxDC& WXUNUSED(dc), -+ const wxRect& rectTotal, -+ int WXUNUSED(flags), -+ wxRect *rectIn) -+{ -+ wxRect rect = rectTotal; -+ -+ //DrawRect(dc, &rect, m_penDarkGrey); -+ -+ if ( rectIn ) -+ *rectIn = rect; -+} -+ -+int wxWasmRenderer::GetTextBorderWidth(const wxTextCtrl * WXUNUSED(text)) const -+{ -+ return 4; -+} -+ -+// ---------------------------------------------------------------------------- -+// lines and frames -+// ---------------------------------------------------------------------------- -+ -+void wxWasmRenderer::DrawHorizontalLine(wxDC& dc, wxCoord y, wxCoord x1, wxCoord x2) -+{ -+ dc.SetPen(m_penMediumGrey); -+ dc.DrawLine(x1, y, x2 + 1, y); -+} -+ -+void wxWasmRenderer::DrawVerticalLine(wxDC& dc, wxCoord x, wxCoord y1, wxCoord y2) -+{ -+ dc.SetPen(m_penMediumGrey); -+ dc.DrawLine(x, y1, x, y2 + 1); -+} -+ -+void wxWasmRenderer::DrawFrameWithoutLabel(wxDC& dc, -+ const wxRect& rectFrame, -+ const wxRect& rectLabel) -+{ -+ // draw left, bottom and right lines entirely -+ DrawVerticalLine(dc, rectFrame.GetLeft(), -+ rectFrame.GetTop(), rectFrame.GetBottom() - 2); -+ DrawHorizontalLine(dc, rectFrame.GetBottom() - 1, -+ rectFrame.GetLeft(), rectFrame.GetRight() - 2); -+ DrawHorizontalLine(dc, rectFrame.GetTop(), -+ rectLabel.GetRight(), rectFrame.GetRight() - 2); -+ DrawVerticalLine(dc, rectFrame.GetRight() - 1, -+ rectFrame.GetTop(), rectFrame.GetBottom() - 2); -+ DrawHorizontalLine(dc, rectFrame.GetTop(), -+ rectFrame.GetLeft() + 1, rectLabel.GetLeft()); -+} -+ -+void wxWasmRenderer::DrawFrameWithLabel(wxDC& dc, -+ const wxString& label, -+ const wxRect& rectFrameOrig, -+ const wxRect& rectTextOrig, -+ int flags, -+ int alignment, -+ int indexAccel) -+{ -+ wxRect rectText(rectTextOrig); -+ rectText.Inflate(1, 0); -+ -+ wxRect rectLabel; -+ DrawLabel(dc, label, rectText, flags, alignment, indexAccel, &rectLabel); -+ rectLabel.x -= 3; -+ rectLabel.width += 6; -+ -+ wxRect rectFrame(rectFrameOrig); -+ rectFrame.x += 5; -+ rectFrame.width -= 5; -+ -+ DrawFrameWithoutLabel(dc, rectFrame, rectLabel); -+} -+ -+void wxWasmRenderer::DrawFrame(wxDC& dc, -+ const wxString& label, -+ const wxRect& rect, -+ int flags, -+ int alignment, -+ int indexAccel) -+{ -+ wxCoord height = 0; // of the label -+ wxRect rectFrame = rect; -+ if ( !label.empty() ) -+ { -+ // the text should touch the top border of the rect, so the frame -+ // itself should be lower -+ dc.GetTextExtent(label, NULL, &height); -+ rectFrame.y += height / 2; -+ rectFrame.height -= height / 2; -+ -+ // we have to draw each part of the frame individually as we can't -+ // erase the background beyond the label as it might contain some -+ // pixmap already, so drawing everything and then overwriting part of -+ // the frame with label doesn't work -+ -+ // TODO: the +5 shouldn't be hard coded -+ wxRect rectText; -+ rectText.x = rectFrame.x + 12; -+ rectText.y = rect.y; -+ rectText.width = rectFrame.width - 14; // +2 border width -+ rectText.height = height; -+ -+ DrawFrameWithLabel(dc, label, rectFrame, rectText, flags, -+ alignment, indexAccel); -+ } -+ else // no label -+ { -+ wxRect rectFrame(rect); -+ -+ DrawVerticalLine(dc, rectFrame.GetLeft(), -+ rectFrame.GetTop(), rectFrame.GetBottom() - 2); -+ DrawHorizontalLine(dc, rectFrame.GetTop(), -+ rectFrame.GetLeft() + 1, rectFrame.GetRight() - 2); -+ DrawHorizontalLine(dc, rectFrame.GetBottom() - 1, -+ rectFrame.GetLeft(), rectFrame.GetRight() - 2); -+ //DrawHorizontalLine(dc, rectFrame.GetTop(), -+ // rectLabel.GetRight(), rectFrame.GetRight() - 2); -+ DrawVerticalLine(dc, rectFrame.GetRight() - 1, -+ rectFrame.GetTop(), rectFrame.GetBottom() - 2); -+ } -+} -+ -+// ---------------------------------------------------------------------------- -+// check/radio buttons -+// ---------------------------------------------------------------------------- -+ -+void wxWasmRenderer::DrawCheckItemBitmap(wxDC& dc, -+ const wxBitmap& bitmap, -+ const wxRect& rect, -+ int flags) -+{ -+ // never draw the focus rect around the check indicators here -+ DrawCheckButton(dc, wxEmptyString, bitmap, rect, flags & ~wxCONTROL_FOCUSED); -+} -+ -+void wxWasmRenderer::DrawUndeterminedBitmap(wxDC& dc, -+ const wxRect& rectTotal, -+ bool isPressed) -+{ -+ // FIXME: For sure it is not Wasm look but it is better than nothing. -+ // Show me correct look and I will immediatelly make it better (ABX) -+ wxRect rect = rectTotal; -+ -+ wxColour col1, col2; -+ -+ if ( isPressed ) -+ { -+ col1 = wxSCHEME_COLOUR(m_scheme, SHADOW_DARK); -+ col2 = wxSCHEME_COLOUR(m_scheme, CONTROL_PRESSED); -+ } -+ else -+ { -+ col1 = wxSCHEME_COLOUR(m_scheme, SHADOW_DARK); -+ col2 = *wxWHITE; -+ } -+ -+ dc.SetPen(*wxTRANSPARENT_PEN); -+ dc.SetBrush(col1); -+ dc.DrawRectangle(rect); -+ rect.Deflate(1); -+ dc.SetBrush(col2); -+ dc.DrawRectangle(rect); -+} -+ -+void wxWasmRenderer::DrawUncheckBitmap(wxDC& dc, -+ const wxRect& rectTotal, -+ bool isPressed) -+{ -+ wxRect rect = rectTotal; -+ -+ wxColour col = *wxWHITE; -+ -+ if ( isPressed ) -+ col = wxSCHEME_COLOUR(m_scheme, CONTROL_PRESSED); -+ -+ dc.SetPen(*wxTRANSPARENT_PEN); -+ dc.SetBrush(wxSCHEME_COLOUR(m_scheme, SHADOW_OUT)); -+ dc.DrawRectangle(rect); -+ -+ rect.Inflate(-1); -+ dc.SetBrush(col); -+ dc.DrawRectangle(rect); -+} -+ -+void wxWasmRenderer::DrawCheckBitmap(wxDC& dc, const wxRect& rectTotal) -+{ -+ wxRect rect = rectTotal; -+ -+ dc.SetPen(*wxTRANSPARENT_PEN); -+ dc.SetBrush(wxSCHEME_COLOUR(m_scheme, SHADOW_OUT)); -+ dc.DrawRectangle(rect); -+ -+ rect.Inflate(-1); -+ dc.SetBrush(*wxWHITE); -+ dc.DrawRectangle(rect); -+ -+ DrawCheck(dc, rect); -+} -+ -+void wxWasmRenderer::DrawRadioButtonBitmap(wxDC& dc, -+ const wxRect& rect, -+ int flags) -+{ -+ wxCoord xRight = rect.GetRight(), -+ yBottom = rect.GetBottom(); -+ -+ wxCoord radius = rect.height / 2 - 1;; -+ -+ DrawBackground(dc, wxSCHEME_COLOUR(m_scheme, CONTROL_CURRENT), rect); -+ -+ dc.SetPen(m_penDarkGrey); -+ dc.SetBrush(wxSCHEME_COLOUR(m_scheme, CONTROL_CURRENT)); -+ // draw the normal border -+ dc.DrawCircle(xRight/2,yBottom/2,radius); -+ -+ wxColor checkedCol, uncheckedCol; -+ checkedCol = wxSCHEME_COLOUR(m_scheme, HIGHLIGHT); -+ uncheckedCol = wxSCHEME_COLOUR(m_scheme, SHADOW_HIGHLIGHT); -+ dc.SetBrush(flags & wxCONTROL_CHECKED ? checkedCol : uncheckedCol); -+ -+ // inner dot -+ dc.DrawCircle(xRight/2,yBottom/2,radius/2); -+ -+ bool drawIt = true; -+ -+ if ( flags & wxCONTROL_PRESSED ) -+ dc.SetBrush(wxSCHEME_COLOUR(m_scheme, CONTROL_PRESSED)); -+ else // unchecked and unpressed -+ drawIt = false; -+ -+ if ( drawIt ) -+ dc.DrawCircle(xRight/2, yBottom/2, radius/2); -+ -+ if ( flags & wxCONTROL_PRESSED ) -+ { -+ dc.SetBrush(wxSCHEME_COLOUR(m_scheme, CONTROL_PRESSED)); -+ drawIt = true; -+ } -+ else // checked and unpressed -+ drawIt = false; -+ -+ if ( drawIt ) -+ dc.DrawCircle(xRight/2, yBottom/2, radius/2); -+} -+ -+void wxWasmRenderer::DrawUpZag(wxDC& dc, -+ wxCoord x1, -+ wxCoord x2, -+ wxCoord y1, -+ wxCoord y2) -+{ -+ wxCoord xMid = (x1 + x2) / 2; -+ dc.DrawLine(x1, y1, xMid, y2); -+ dc.DrawLine(xMid, y2, x2 + 1, y1 + 1); -+} -+ -+void wxWasmRenderer::DrawDownZag(wxDC& dc, -+ wxCoord x1, -+ wxCoord x2, -+ wxCoord y1, -+ wxCoord y2) -+{ -+ wxCoord xMid = (x1 + x2) / 2; -+ dc.DrawLine(x1 + 1, y1 + 1, xMid, y2); -+ dc.DrawLine(xMid, y2, x2, y1); -+} -+ -+void wxWasmRenderer::DrawCheck(wxDC& dc, const wxRect& rect) -+{ -+ dc.SetPen(wxPen(dc.GetTextForeground(), 2)); -+ -+ int x = rect.x + (rect.width - CHECK_WIDTH) / 2; -+ int y = rect.y + (rect.height - CHECK_HEIGHT) / 2; -+ -+ int x1 = x; -+ int y1 = y + 5; -+ int x2 = x + 3; -+ int y2 = y + 8; -+ int x3 = x + 8; -+ int y3 = y; -+ -+ dc.DrawLine(x1, y1, x2, y2); -+ dc.DrawLine(x2, y2, x3, y3); -+} -+ -+wxBitmap wxWasmRenderer::GetCheckBitmap(int flags) -+{ -+ if ( !m_bitmapsCheckbox[0][0].IsOk() ) -+ { -+ // init the bitmaps once only -+ wxRect rect; -+ wxSize size = GetCheckBitmapSize(); -+ rect.width = size.x; -+ rect.height = size.y; -+ double scaleFactor = wxContentScaleFactor(); -+ -+ for ( int i = 0; i < 2; i++ ) -+ { -+ for ( int j = 0; j < 3; j++ ) -+ m_bitmapsCheckbox[i][j].CreateScaled(rect.width, rect.height, wxBITMAP_SCREEN_DEPTH, scaleFactor); -+ } -+ -+ wxMemoryDC dc; -+ -+ // normal checked -+ dc.SelectObject(m_bitmapsCheckbox[0][0]); -+ DrawCheckBitmap(dc, rect); -+ -+ // normal unchecked -+ dc.SelectObject(m_bitmapsCheckbox[0][1]); -+ DrawUncheckBitmap(dc, rect, false); -+ -+ // normal undeterminated -+ dc.SelectObject(m_bitmapsCheckbox[0][2]); -+ DrawUndeterminedBitmap(dc, rect, false); -+ -+ // pressed checked -+ m_bitmapsCheckbox[1][0] = m_bitmapsCheckbox[0][0]; -+ -+ // pressed unchecked -+ dc.SelectObject(m_bitmapsCheckbox[1][1]); -+ DrawUncheckBitmap(dc, rect, true); -+ -+ // pressed undeterminated -+ dc.SelectObject(m_bitmapsCheckbox[1][2]); -+ DrawUndeterminedBitmap(dc, rect, true); -+ } -+ -+ IndicatorState state; -+ IndicatorStatus status; -+ GetIndicatorsFromFlags(flags, state, status); -+ -+ // disabled looks the same as normal -+ if ( state == IndicatorState_Disabled ) -+ state = IndicatorState_Normal; -+ -+ return m_bitmapsCheckbox[state][status]; -+} -+ -+wxBitmap wxWasmRenderer::GetRadioBitmap(int flags) -+{ -+ IndicatorState state; -+ IndicatorStatus status; -+ GetIndicatorsFromFlags(flags, state, status); -+ -+ wxBitmap& bmp = m_bitmapsRadiobtn[state][status]; -+ if ( !bmp.IsOk() ) -+ { -+ const wxSize size = GetRadioBitmapSize(); -+ double scaleFactor = wxContentScaleFactor(); -+ -+ wxMemoryDC dc; -+ bmp.CreateScaled(size.x, size.y, wxBITMAP_SCREEN_DEPTH, scaleFactor); -+ dc.SelectObject(bmp); -+ -+ DrawRadioButtonBitmap(dc, size, flags); -+ } -+ -+ return bmp; -+} -+ -+wxBitmap wxWasmRenderer::GetLineWrapBitmap() const -+{ -+ if ( !m_bmpLineWrap.IsOk() ) -+ { -+ #define line_wrap_width 6 -+ #define line_wrap_height 9 -+ static const char line_wrap_bits[] = -+ { -+ 0x1e, 0x3e, 0x30, 0x30, 0x39, 0x1f, 0x0f, 0x0f, 0x1f, -+ }; -+ -+ wxBitmap bmpLineWrap(line_wrap_bits, line_wrap_width, line_wrap_height, wxBITMAP_SCREEN_DEPTH); -+ if ( !bmpLineWrap.IsOk() ) -+ { -+ wxFAIL_MSG( wxT("Failed to create line wrap XBM") ); -+ } -+ else -+ { -+ wxConstCast(this, wxWasmRenderer)->m_bmpLineWrap = bmpLineWrap; -+ } -+ } -+ -+ return m_bmpLineWrap; -+} -+ -+#if wxUSE_TOOLBAR -+void wxWasmRenderer::DrawToolBarButton(wxDC& dc, -+ const wxString& label, -+ const wxBitmap& bitmap, -+ const wxRect& rectOrig, -+ int flags, -+ long WXUNUSED(style), -+ int tbarStyle) -+{ -+ // we don't draw the separators at all -+ if ( !label.empty() || bitmap.IsOk() ) -+ { -+ wxRect rect = rectOrig; -+ rect.Deflate(BORDER_THICKNESS); -+ -+ if ( flags & wxCONTROL_PRESSED ) -+ { -+ DrawBorder(dc, wxBORDER_SUNKEN, rect, flags, &rect); -+ -+ DrawBackground(dc, wxSCHEME_COLOUR(m_scheme, CONTROL_PRESSED), rect); -+ } -+ else if ( flags & wxCONTROL_CURRENT ) -+ { -+ DrawBorder(dc, wxBORDER_RAISED, rect, flags, &rect); -+ -+ DrawBackground(dc, wxSCHEME_COLOUR(m_scheme, CONTROL_CURRENT), rect); -+ } -+ -+ if(tbarStyle & wxTB_TEXT) -+ { -+ if(tbarStyle & wxTB_HORIZONTAL) -+ { -+ dc.DrawLabel(label, bitmap, rect, wxALIGN_CENTRE); -+ } -+ else -+ { -+ dc.DrawLabel(label, bitmap, rect, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL); -+ } -+ } -+ else -+ { -+ int xpoint = (rect.GetLeft() + rect.GetRight() + 1 - bitmap.GetWidth()) / 2; -+ int ypoint = (rect.GetTop() + rect.GetBottom() + 1 - bitmap.GetHeight()) / 2; -+ dc.DrawBitmap(bitmap, xpoint, ypoint); -+ } -+ } -+} -+#endif // wxUSE_TOOLBAR -+ -+// ---------------------------------------------------------------------------- -+// text control -+// ---------------------------------------------------------------------------- -+ -+#if wxUSE_TEXTCTRL -+ -+wxRect wxWasmRenderer::GetTextClientArea(const wxTextCtrl *text, -+ const wxRect& rect, -+ wxCoord *extraSpaceBeyond) const -+{ -+ wxRect -+ rectText = wxStdRenderer::GetTextClientArea(text, rect, extraSpaceBeyond); -+ -+ if ( text->WrapLines() ) -+ { -+ // leave enough for the line wrap bitmap indicator -+ wxCoord widthMark = GetLineWrapBitmap().GetWidth() + 2; -+ -+ rectText.width -= widthMark; -+ -+ if ( extraSpaceBeyond ) -+ *extraSpaceBeyond = widthMark; -+ } -+ -+ return rectText; -+} -+ -+void wxWasmRenderer::DrawLineWrapMark(wxDC& dc, const wxRect& rect) -+{ -+ wxBitmap bmpLineWrap = GetLineWrapBitmap(); -+ -+ // for a mono bitmap he colours it appears in depends on the current text -+ // colours, so set them correctly -+ wxColour colFgOld; -+ if ( bmpLineWrap.GetDepth() == 1 ) -+ { -+ colFgOld = dc.GetTextForeground(); -+ -+ // FIXME: I wonder what should we do if the background is black too? -+ dc.SetTextForeground(*wxBLACK); -+ } -+ -+ dc.DrawBitmap(bmpLineWrap, -+ rect.x, rect.y + (rect.height - bmpLineWrap.GetHeight())/2); -+ -+ if ( colFgOld.IsOk() ) -+ { -+ // restore old colour -+ dc.SetTextForeground(colFgOld); -+ } -+} -+ -+#endif // wxUSE_TEXTCTRL -+ -+// ---------------------------------------------------------------------------- -+// notebook -+// ---------------------------------------------------------------------------- -+ -+#if wxUSE_NOTEBOOK -+ -+void wxWasmRenderer::DrawTab(wxDC& dc, -+ const wxRect& rectOrig, -+ wxDirection dir, -+ const wxString& label, -+ const wxBitmap& bitmap, -+ int flags, -+ int indexAccel) -+{ -+ #define SELECT_FOR_VERTICAL(X,Y) ( isVertical ? Y : X ) -+ #define REVERSE_FOR_VERTICAL(X,Y) \ -+ SELECT_FOR_VERTICAL(X,Y) \ -+ , \ -+ SELECT_FOR_VERTICAL(Y,X) -+ -+ wxRect rect = rectOrig; -+ -+ bool isVertical = ( dir == wxLEFT ) || ( dir == wxRIGHT ); -+ -+ // the current tab is drawn indented (to the top for default case) and -+ // bigger than the other ones -+ const wxSize indent = GetTabIndent(); -+ if ( flags & wxCONTROL_SELECTED ) -+ { -+ rect.Inflate( SELECT_FOR_VERTICAL( indent.x , 0), -+ SELECT_FOR_VERTICAL( 0, indent.y )); -+ switch ( dir ) -+ { -+ default: -+ wxFAIL_MSG(wxT("invaild notebook tab orientation")); -+ // fall through -+ -+ case wxTOP: -+ rect.y -= indent.y; -+ // fall through -+ case wxBOTTOM: -+ rect.height += indent.y; -+ break; -+ -+ case wxLEFT: -+ rect.x -= indent.x; -+ // fall through -+ case wxRIGHT: -+ rect.width += indent.x; -+ break; -+ } -+ } -+ -+ // selected tab has different colour -+ wxColour col = flags & wxCONTROL_SELECTED -+ ? wxSCHEME_COLOUR(m_scheme, SHADOW_IN) -+ : wxSCHEME_COLOUR(m_scheme, SCROLLBAR); -+ DrawSolidRect(dc, col, rect); -+ -+ if ( flags & wxCONTROL_FOCUSED ) -+ { -+ // draw the focus rect -+ wxRect rectBorder = rect; -+ rectBorder.Deflate(4, 3); -+ if ( dir == wxBOTTOM ) -+ rectBorder.Offset(0, -1); -+ if ( dir == wxRIGHT ) -+ rectBorder.Offset(-1, 0); -+ -+ //DrawRect(dc, &rectBorder, m_penBlack); -+ } -+ -+ // draw the text, image and the focus around them (if necessary) -+ wxRect rectLabel( REVERSE_FOR_VERTICAL(rect.x,rect.y), -+ REVERSE_FOR_VERTICAL(rect.width,rect.height) -+ ); -+ rectLabel.Deflate(1, 1); -+ if ( isVertical ) -+ { -+ // draw it horizontally into memory and rotate for screen -+ wxMemoryDC dcMem; -+ wxBitmap bitmapRotated, -+ bitmapMem( rectLabel.x + rectLabel.width, -+ rectLabel.y + rectLabel.height ); -+ dcMem.SelectObject(bitmapMem); -+ dcMem.SetBackground(dc.GetBackground()); -+ dcMem.SetFont(dc.GetFont()); -+ dcMem.SetTextForeground(dc.GetTextForeground()); -+ dcMem.Clear(); -+ bitmapRotated = -+#if wxUSE_IMAGE -+ wxBitmap( wxImage( bitmap.ConvertToImage() ).Rotate90(dir==wxLEFT) ) -+#else -+ bitmap -+#endif // wxUSE_IMAGE -+ ; -+ dcMem.DrawLabel(label, bitmapRotated, rectLabel, wxALIGN_CENTRE, indexAccel); -+ dcMem.SelectObject(wxNullBitmap); -+ bitmapMem = bitmapMem.GetSubBitmap(rectLabel); -+#if wxUSE_IMAGE -+ bitmapMem = wxBitmap(wxImage(bitmapMem.ConvertToImage()).Rotate90(dir==wxRIGHT)) -+#endif -+ ; -+ -+ dc.DrawBitmap(bitmapMem, rectLabel.y, rectLabel.x, false); -+ } -+ else -+ { -+ dc.DrawLabel(label, bitmap, rectLabel, wxALIGN_CENTRE, indexAccel); -+ } -+ -+ // now draw the tab itself -+ wxCoord x = SELECT_FOR_VERTICAL(rect.x,rect.y), -+ y = SELECT_FOR_VERTICAL(rect.y,rect.x), -+ x2 = SELECT_FOR_VERTICAL(rect.GetRight(),rect.GetBottom()), -+ y2 = SELECT_FOR_VERTICAL(rect.GetBottom(),rect.GetRight()); -+ switch ( dir ) -+ { -+ default: -+ // default is top -+ case wxLEFT: -+ // left orientation looks like top but IsVertical makes x and y reversed -+ case wxTOP: -+ // top is not vertical so use coordinates in written order -+ dc.SetPen(m_penHighlight); -+ dc.DrawLine(REVERSE_FOR_VERTICAL(x, y2), -+ REVERSE_FOR_VERTICAL(x, y)); -+ dc.DrawLine(REVERSE_FOR_VERTICAL(x + 1, y), -+ REVERSE_FOR_VERTICAL(x2, y)); -+ -+ dc.SetPen(m_penBlack); -+ dc.DrawLine(REVERSE_FOR_VERTICAL(x2, y2), -+ REVERSE_FOR_VERTICAL(x2, y)); -+ -+ dc.SetPen(m_penDarkGrey); -+ dc.DrawLine(REVERSE_FOR_VERTICAL(x2 - 1, y2), -+ REVERSE_FOR_VERTICAL(x2 - 1, y + 1)); -+ -+ if ( flags & wxCONTROL_SELECTED ) -+ { -+ dc.SetPen(m_penLightGrey); -+ -+ // overwrite the part of the border below this tab -+ dc.DrawLine(REVERSE_FOR_VERTICAL(x + 1, y2 + 1), -+ REVERSE_FOR_VERTICAL(x2 - 1, y2 + 1)); -+ -+ // and the shadow of the tab to the left of us -+ dc.DrawLine(REVERSE_FOR_VERTICAL(x + 1, y + 2), -+ REVERSE_FOR_VERTICAL(x + 1, y2 + 1)); -+ } -+ break; -+ -+ case wxRIGHT: -+ // right orientation looks like bottom but IsVertical makes x and y reversed -+ case wxBOTTOM: -+ // bottom is not vertical so use coordinates in written order -+ dc.SetPen(m_penHighlight); -+ -+ // we need to continue one pixel further to overwrite the corner of -+ // the border for the selected tab -+ dc.DrawLine(REVERSE_FOR_VERTICAL(x, y - (flags & wxCONTROL_SELECTED ? 1 : 0)), -+ REVERSE_FOR_VERTICAL(x, y2)); -+ -+ // it doesn't work like this (TODO: implement it properly) -+#if 0 -+ // erase the corner of the tab to the right -+ dc.SetPen(m_penLightGrey); -+ dc.DrawPoint(REVERSE_FOR_VERTICAL(x2 - 1, y - 2)); -+ dc.DrawPoint(REVERSE_FOR_VERTICAL(x2 - 2, y - 2)); -+ dc.DrawPoint(REVERSE_FOR_VERTICAL(x2 - 2, y - 1)); -+#endif // 0 -+ -+ dc.SetPen(m_penBlack); -+ dc.DrawLine(REVERSE_FOR_VERTICAL(x + 1, y2), -+ REVERSE_FOR_VERTICAL(x2, y2)); -+ dc.DrawLine(REVERSE_FOR_VERTICAL(x2, y), -+ REVERSE_FOR_VERTICAL(x2, y2)); -+ -+ dc.SetPen(m_penDarkGrey); -+ dc.DrawLine(REVERSE_FOR_VERTICAL(x + 2, y2 - 1), -+ REVERSE_FOR_VERTICAL(x2 - 1, y2 - 1)); -+ dc.DrawLine(REVERSE_FOR_VERTICAL(x2 - 1, y), -+ REVERSE_FOR_VERTICAL(x2 - 1, y2)); -+ -+ if ( flags & wxCONTROL_SELECTED ) -+ { -+ dc.SetPen(m_penLightGrey); -+ -+ // overwrite the part of the (double!) border above this tab -+ dc.DrawLine(REVERSE_FOR_VERTICAL(x + 1, y - 1), -+ REVERSE_FOR_VERTICAL(x2 - 1, y - 1)); -+ dc.DrawLine(REVERSE_FOR_VERTICAL(x + 1, y - 2), -+ REVERSE_FOR_VERTICAL(x2 - 1, y - 2)); -+ -+ // and the shadow of the tab to the left of us -+ dc.DrawLine(REVERSE_FOR_VERTICAL(x + 1, y2 - 1), -+ REVERSE_FOR_VERTICAL(x + 1, y - 1)); -+ } -+ break; -+ } -+} -+ -+#endif // wxUSE_NOTEBOOK -+ -+// ---------------------------------------------------------------------------- -+// slider -+// ---------------------------------------------------------------------------- -+ -+#if wxUSE_SLIDER -+ -+wxSize wxWasmRenderer::GetSliderThumbSize(const wxRect& WXUNUSED(rect), -+ int WXUNUSED(lenThumb), -+ wxOrientation WXUNUSED(orient)) const -+{ -+ static const wxCoord SLIDER_THUMB_LENGTH = 17; -+ return wxSize(SLIDER_THUMB_LENGTH, SLIDER_THUMB_LENGTH); -+} -+ -+wxRect wxWasmRenderer::GetSliderShaftRect(const wxRect& rect, -+ int WXUNUSED(lenThumb), -+ wxOrientation WXUNUSED(orient), -+ long WXUNUSED(style)) const -+{ -+ return rect.Deflate(2 * BORDER_THICKNESS, 2 * BORDER_THICKNESS); -+} -+ -+void wxWasmRenderer::DrawSliderShaft(wxDC& dc, -+ const wxRect& rectOrig, -+ double fracValue, -+ int lenThumb, -+ wxOrientation orient, -+ int flags, -+ long WXUNUSED(style), -+ wxRect *rectShaft) -+{ -+ static const wxCoord SHAFT_WIDTH = 5; -+ static const double SHAFT_RADIUS = SHAFT_WIDTH / 2.0; -+ -+ dc.SetPen(*wxTRANSPARENT_PEN); -+ dc.SetBrush(wxSCHEME_COLOUR(m_scheme, WINDOW)); -+ dc.DrawRectangle(rectOrig); -+ -+ wxRect rect = rectOrig; -+ rect.Deflate(2 * BORDER_THICKNESS); -+ -+ wxRect rectOn; -+ wxRect rectOff; -+ -+ if ( orient == wxHORIZONTAL ) -+ { -+ int offset = (rect.height - SHAFT_WIDTH) / 2; -+ int thumbCenter = fracValue * (rect.width - lenThumb) + lenThumb / 2.0; -+ rectOn = wxRect(rect.x, rect.y + offset, thumbCenter, SHAFT_WIDTH); -+ rectOff = wxRect(rect.x + thumbCenter, rect.y + offset, rect.width - thumbCenter, SHAFT_WIDTH); -+ } -+ else -+ { -+ int offset = (rect.width - SHAFT_WIDTH) / 2; -+ int thumbCenter = fracValue * (rect.height - lenThumb) + lenThumb / 2.0; -+ rectOff = wxRect(rect.x + offset, rect.y, SHAFT_WIDTH, thumbCenter); -+ rectOn = wxRect(rect.x + offset, rect.y + thumbCenter, SHAFT_WIDTH, rect.height - thumbCenter); -+ } -+ -+ if (flags & wxSL_INVERSE) -+ { -+ wxRect tmpRect = rectOff; -+ rectOff = rectOn; -+ rectOn = tmpRect; -+ } -+ -+ dc.SetBrush(wxSCHEME_COLOUR(m_scheme, HIGHLIGHT)); -+ dc.DrawRoundedRectangle(rectOn.x, rectOn.y, rectOn.width, rectOn.height, SHAFT_RADIUS); -+ -+ dc.SetBrush(wxSCHEME_COLOUR(m_scheme, SCROLLBAR)); -+ dc.DrawRoundedRectangle(rectOff.x, rectOff.y, rectOff.width, rectOff.height, SHAFT_RADIUS); -+ -+ if ( rectShaft ) -+ *rectShaft = rect; -+} -+ -+void wxWasmRenderer::DrawSliderThumb(wxDC& dc, -+ const wxRect& rectOrig, -+ wxOrientation WXUNUSED(orient), -+ int WXUNUSED(flags), -+ long WXUNUSED(style)) -+{ -+ wxRect rect = rectOrig; -+ -+ dc.SetPen(*wxTRANSPARENT_PEN); -+ dc.SetBrush(wxSCHEME_COLOUR(m_scheme, HIGHLIGHT)); -+ -+ dc.DrawEllipse(rect); -+} -+ -+#endif // wxUSE_SLIDER -+ -+#if wxUSE_MENUS -+ -+// ---------------------------------------------------------------------------- -+// menu and menubar -+// ---------------------------------------------------------------------------- -+ -+// FIXME: all constants are hardcoded but shouldn't be -+static const wxCoord MENU_LEFT_MARGIN = 12; -+static const wxCoord MENU_RIGHT_MARGIN = 9; -+ -+static const wxCoord MENU_HORZ_MARGIN = 12; -+static const wxCoord MENU_VERT_MARGIN = 4; -+ -+// the margin around bitmap/check marks (on each side) -+static const wxCoord MENU_BMP_MARGIN = 2; -+ -+static const wxCoord MENU_CHECK_MARGIN = 2; -+ -+static const wxCoord MENU_ARROW_WIDTH = 5; -+static const wxCoord MENU_ARROW_HEIGHT = 9; -+ -+// the margin between the labels and accel strings -+static const wxCoord MENU_ACCEL_MARGIN = 8; -+ -+// the separator height in pixels: in fact, strangely enough, the real height -+// is 2 but Windows adds one extra pixel in the bottom margin, so take it into -+// account here -+static const wxCoord MENU_SEPARATOR_HEIGHT = 3; -+ -+static const wxCoord MENU_OVERFLOW_HEIGHT = 24; -+static const wxCoord MENU_OVERFLOW_ARROW_WIDTH = MENU_ARROW_HEIGHT; -+static const wxCoord MENU_OVERFLOW_ARROW_HEIGHT = MENU_ARROW_WIDTH; -+ -+ -+// wxWasmMenuGeometryInfo: the wxMenuGeometryInfo used by wxWasmRenderer -+class wxWasmMenuGeometryInfo : public wxMenuGeometryInfo -+{ -+public: -+ virtual wxSize GetSize() const wxOVERRIDE { return m_size; } -+ -+ virtual wxCoord GetOverflowHeight() const wxOVERRIDE { return MENU_OVERFLOW_HEIGHT; } -+ -+ wxCoord GetLabelOffset() const { return m_ofsLabel; } -+ wxCoord GetAccelOffset() const { return m_ofsAccel; } -+ -+ wxCoord GetItemHeight() const { return m_heightItem; } -+ -+private: -+ // the total size of the menu -+ wxSize m_size; -+ -+ // the offset of the start of the menu item label -+ wxCoord m_ofsLabel; -+ -+ // the offset of the start of the accel label -+ wxCoord m_ofsAccel; -+ -+ // the height of a normal (not separator) item -+ wxCoord m_heightItem; -+ -+ friend wxMenuGeometryInfo * -+ wxWasmRenderer::GetMenuGeometry(wxWindow *, const wxMenu&) const; -+}; -+ -+void wxWasmRenderer::DrawMenuBarItem(wxDC& dc, -+ const wxRect& rect, -+ const wxString& label, -+ int flags, -+ int indexAccel) -+{ -+ DoDrawMenuItem(dc, rect, label, flags, indexAccel); -+} -+ -+void wxWasmRenderer::DrawMenuItem(wxDC& dc, -+ wxCoord y, -+ const wxMenuGeometryInfo& gi, -+ const wxString& label, -+ const wxString& accel, -+ const wxBitmap& bitmap, -+ int flags, -+ int indexAccel) -+{ -+ const wxWasmMenuGeometryInfo& geomInfo = (const wxWasmMenuGeometryInfo&)gi; -+ -+ wxRect rect; -+ rect.x = 0; -+ rect.y = y; -+ rect.width = geomInfo.GetSize().x; -+ rect.height = geomInfo.GetItemHeight(); -+ -+ DoDrawMenuItem(dc, rect, label, flags, indexAccel, accel, bitmap, &geomInfo); -+} -+ -+void wxWasmRenderer::DoDrawMenuItem(wxDC& dc, -+ const wxRect& rectOrig, -+ const wxString& label, -+ int flags, -+ int WXUNUSED(indexAccel), -+ const wxString& accel, -+ const wxBitmap& bitmap, -+ const wxWasmMenuGeometryInfo *geometryInfo) -+{ -+ wxRect rect = rectOrig; -+ -+ // draw the selected item specially -+ if ( flags & wxCONTROL_SELECTED && !(flags & wxCONTROL_DISABLED) ) -+ { -+ DrawBackground(dc, wxSCHEME_COLOUR(m_scheme, HIGHLIGHT), rect); -+ dc.SetTextForeground(wxSCHEME_COLOUR(m_scheme, HIGHLIGHT_TEXT)); -+ } -+ -+ rect.Deflate(MENU_HORZ_MARGIN, MENU_VERT_MARGIN); -+ -+ // draw the bitmap: use the bitmap provided or the standard checkmark for -+ // the checkable items -+ if ( geometryInfo ) -+ { -+ wxBitmap bmp = bitmap; -+ -+ if ( flags & wxCONTROL_CHECKED ) -+ { -+ wxRect checkRect(rect.x, rect.y, CHECK_WIDTH, rect.height); -+ DrawCheck(dc, checkRect); -+ } -+ -+ if ( bmp.IsOk() ) -+ { -+ rect.SetRight(geometryInfo->GetLabelOffset()); -+ wxControlRenderer::DrawBitmap(dc, bmp, rect); -+ } -+ } -+ //else: menubar items don't have bitmaps -+ -+ // draw the label -+ if ( geometryInfo ) -+ { -+ rect.x = geometryInfo->GetLabelOffset(); -+ rect.SetRight(geometryInfo->GetAccelOffset()); -+ } -+ -+ DrawLabel(dc, label, rect, flags, wxALIGN_CENTRE_VERTICAL, -1); -+ -+ // draw the accel string -+ if ( !accel.empty() ) -+ { -+ // menubar items shouldn't have them -+ wxCHECK_RET( geometryInfo, wxT("accel strings only valid for menus") ); -+ -+ rect.x = geometryInfo->GetAccelOffset(); -+ rect.SetRight(geometryInfo->GetSize().x - MENU_RIGHT_MARGIN); -+ -+ wxString accelString = RenderAccelString(accel); -+ DrawLabel(dc, accelString, rect, flags, wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL); -+ } -+ -+ // draw the submenu indicator -+ if ( flags & wxCONTROL_ISSUBMENU ) -+ { -+ wxCHECK_RET( geometryInfo, wxT("wxCONTROL_ISSUBMENU only valid for menus") ); -+ -+ rect.x = geometryInfo->GetSize().x - MENU_RIGHT_MARGIN - MENU_ARROW_WIDTH; -+ rect.y = rect.y + (rect.height - MENU_ARROW_HEIGHT) / 2; -+ rect.height = MENU_ARROW_HEIGHT; -+ rect.width = MENU_ARROW_WIDTH; -+ -+ DrawMenuArrow(dc, rect, flags); -+ } -+ -+ if ( flags & wxCONTROL_SELECTED && !(flags & wxCONTROL_DISABLED) ) -+ { -+ dc.SetTextForeground(wxSCHEME_COLOUR(m_scheme, CONTROL_TEXT)); -+ } -+} -+ -+void wxWasmRenderer::DrawMenuSeparator(wxDC& dc, -+ wxCoord y, -+ const wxMenuGeometryInfo& geomInfo) -+{ -+ y += MENU_VERT_MARGIN; -+ dc.SetPen(m_penMediumGrey); -+ dc.DrawLine(0, y, geomInfo.GetSize().x + 1, y); -+} -+ -+void wxWasmRenderer::DrawMenuOverflowArrow(wxDC& dc, -+ const wxRect& rect, -+ wxDirection direction) -+{ -+ dc.SetBrush(wxSCHEME_COLOUR(m_scheme, CONTROL)); -+ dc.SetPen(*wxTRANSPARENT_PEN); -+ dc.DrawRectangle(rect); -+ -+ wxCoord x = rect.x + (rect.GetWidth() - MENU_OVERFLOW_ARROW_WIDTH) / 2; -+ wxCoord y = rect.y + (rect.GetHeight() - MENU_OVERFLOW_ARROW_HEIGHT) / 2; -+ -+ wxRect arrowRect(x, y, MENU_OVERFLOW_ARROW_WIDTH, MENU_OVERFLOW_ARROW_HEIGHT); -+ dc.SetBrush(dc.GetTextForeground()); -+ -+ DrawArrow(dc, direction, arrowRect, 0); -+} -+ -+wxSize wxWasmRenderer::GetMenuBarItemSize(const wxSize& sizeText) const -+{ -+ wxSize size = sizeText; -+ -+ // TODO: make this configurable -+ size.x += 2*MENU_HORZ_MARGIN; -+ size.y += 2*MENU_VERT_MARGIN; -+ -+ return size; -+} -+ -+static inline bool CompareAccelString(const wxString& str, const char *accel) -+{ -+ return str.CmpNoCase(accel) == 0 -+#if wxUSE_INTL -+ || str.CmpNoCase(wxGetTranslation(accel)) == 0 -+#endif -+ ; -+} -+ -+wxString wxWasmRenderer::RenderAccelString(const wxString& accel) const -+{ -+ if ((wxGetOsVersion() & wxOS_MAC) != 0) -+ { -+ wxString label = accel; -+ label.Trim(true); -+ -+ wxString modifiers; -+ wxString current; -+ -+ for ( size_t n = 0; n < label.length(); n++ ) -+ { -+ bool skip = false; -+ if ( !skip && ( (label[n] == '+') || (label[n] == '-') ) ) -+ { -+ if ( CompareAccelString(current, wxTRANSLATE("ctrl")) ) -+ modifiers += wxString::FromUTF8("\xE2\x8C\x98"); -+ else if ( CompareAccelString(current, wxTRANSLATE("alt")) ) -+ modifiers += wxString::FromUTF8("\xE2\x8C\xA5"); -+ else if ( CompareAccelString(current, wxTRANSLATE("shift")) ) -+ modifiers += wxString::FromUTF8("\xE2\x87\xA7"); -+ else if ( CompareAccelString(current, wxTRANSLATE("rawctrl")) ) -+ modifiers += wxString::FromUTF8("\xE2\x8C\x83"); -+ else if ( CompareAccelString(current, wxTRANSLATE("num ")) ) -+ { -+ // This isn't really a modifier, but is part of the name of keys -+ // that have a =/- in them (e.g. num + and num -) -+ // So we want to skip the processing if we see it -+ skip = true; -+ current += label[n]; -+ -+ continue; -+ } -+ else // not a recognized modifier name -+ { -+ // we may have "Ctrl-+", for example, but we still want to -+ // catch typos like "Crtl-A" so only give the warning if we -+ // have something before the current '+' or '-', else take -+ // it as a literal symbol -+ if ( current.empty() ) -+ { -+ current += label[n]; -+ -+ // skip clearing it below -+ continue; -+ } -+ else -+ { -+ wxLogDebug(wxT("Unknown accel modifier: '%s'"), -+ current.c_str()); -+ } -+ } -+ -+ current.clear(); -+ } -+ else // not special character -+ { -+ // Preserve case of the key (see comment below) -+ current += label[n]; -+ } -+ } -+ -+ return modifiers + current; -+ } -+ else -+ { -+ return accel; -+ } -+} -+ -+wxMenuGeometryInfo *wxWasmRenderer::GetMenuGeometry(wxWindow *win, -+ const wxMenu& menu) const -+{ -+ // prepare the dc: for now we draw all the items with the system font -+ wxClientDC dc(win); -+ dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); -+ -+ // the height of a normal item -+ wxCoord heightText = dc.GetCharHeight(); -+ -+ // the total height -+ wxCoord height = 0; -+ -+ // the max length of label and accel strings: the menu width is the sum of -+ // them, even if they're for different items (as the accels should be -+ // aligned) -+ // -+ // the max length of the bitmap is never 0 as Windows always leaves enough -+ // space for a check mark indicator -+ wxCoord widthLabelMax = 0, -+ widthAccelMax = 0, -+ widthCheck = 0, -+ widthBmpMax = MENU_LEFT_MARGIN; -+ -+ bool hasCheck = false; -+ -+ for ( wxMenuItemList::compatibility_iterator node = menu.GetMenuItems().GetFirst(); -+ node; -+ node = node->GetNext() ) -+ { -+ // height of this item -+ wxCoord h; -+ -+ wxMenuItem *item = node->GetData(); -+ if ( item->IsSeparator() ) -+ { -+ h = MENU_SEPARATOR_HEIGHT; -+ } -+ else // not separator -+ { -+ h = heightText; -+ -+ wxCoord widthLabel; -+ dc.GetTextExtent(item->GetItemLabelText(), &widthLabel, NULL); -+ if ( widthLabel > widthLabelMax ) -+ { -+ widthLabelMax = widthLabel; -+ } -+ -+ wxCoord widthAccel; -+ wxString accelString = RenderAccelString(item->GetAccelString()); -+ dc.GetTextExtent(accelString, &widthAccel, NULL); -+ if ( widthAccel > widthAccelMax ) -+ { -+ widthAccelMax = widthAccel; -+ } -+ -+ if ( item->GetSubMenu() && MENU_ARROW_WIDTH > widthAccelMax ) { -+ widthAccelMax = MENU_ARROW_WIDTH; -+ } -+ -+ const wxBitmap& bmp = item->GetBitmap(); -+ if ( bmp.IsOk() ) -+ { -+ wxCoord widthBmp = bmp.GetWidth(); -+ if ( widthBmp > widthBmpMax ) -+ widthBmpMax = widthBmp; -+ } -+ else if ( item->IsChecked() ) -+ { -+ hasCheck = true; -+ } -+ } -+ -+ h += 2*MENU_VERT_MARGIN; -+ -+ // remember the item position and height -+ item->SetGeometry(height, h); -+ -+ height += h; -+ } -+ -+ // bundle the metrics into a struct and return it -+ wxWasmMenuGeometryInfo *gi = new wxWasmMenuGeometryInfo; -+ -+ if (hasCheck) -+ { -+ widthCheck = CHECK_WIDTH + MENU_CHECK_MARGIN; -+ } -+ -+ gi->m_ofsLabel = widthCheck + widthBmpMax + 2*MENU_BMP_MARGIN; -+ gi->m_ofsAccel = gi->m_ofsLabel + widthLabelMax; -+ if ( widthAccelMax > 0 ) -+ { -+ // if we actually have any accesl, add a margin -+ gi->m_ofsAccel += MENU_ACCEL_MARGIN; -+ } -+ -+ gi->m_heightItem = heightText + 2*MENU_VERT_MARGIN; -+ -+ gi->m_size.x = gi->m_ofsAccel + widthAccelMax + MENU_RIGHT_MARGIN; -+ gi->m_size.y = height; -+ -+ return gi; -+} -+ -+#endif // wxUSE_MENUS -+ -+// ---------------------------------------------------------------------------- -+// combobox -+// ---------------------------------------------------------------------------- -+ -+void wxWasmRenderer::InitComboBitmaps() -+{ -+ wxSize sizeArrow = m_sizeScrollbarArrow; -+ sizeArrow.x -= 2; -+ sizeArrow.y -= 2; -+ double scaleFactor = wxContentScaleFactor(); -+ -+ size_t n; -+ -+ for ( n = ComboState_Normal; n < ComboState_Max; n++ ) -+ { -+ m_bitmapsCombo[n].CreateScaled(sizeArrow.x, sizeArrow.y, wxBITMAP_SCREEN_DEPTH, scaleFactor); -+ } -+ -+ static const int comboButtonFlags[ComboState_Max] = -+ { -+ 0, -+ wxCONTROL_CURRENT, -+ wxCONTROL_PRESSED, -+ wxCONTROL_DISABLED, -+ }; -+ -+ wxRect rect(sizeArrow); -+ -+ wxMemoryDC dc; -+ for ( n = ComboState_Normal; n < ComboState_Max; n++ ) -+ { -+ int flags = comboButtonFlags[n]; -+ -+ dc.SelectObject(m_bitmapsCombo[n]); -+ DrawSolidRect(dc, GetBackgroundColour(flags), rect); -+ DrawArrow(dc, wxDOWN, rect, flags); -+ } -+} -+ -+void wxWasmRenderer::GetComboBitmaps(wxBitmap *bmpNormal, -+ wxBitmap *bmpFocus, -+ wxBitmap *bmpPressed, -+ wxBitmap *bmpDisabled) -+{ -+ if ( !m_bitmapsCombo[ComboState_Normal].IsOk() ) -+ { -+ InitComboBitmaps(); -+ } -+ -+ if ( bmpNormal ) -+ *bmpNormal = m_bitmapsCombo[ComboState_Normal]; -+ if ( bmpFocus ) -+ *bmpFocus = m_bitmapsCombo[ComboState_Focus]; -+ if ( bmpPressed ) -+ *bmpPressed = m_bitmapsCombo[ComboState_Pressed]; -+ if ( bmpDisabled ) -+ *bmpDisabled = m_bitmapsCombo[ComboState_Disabled]; -+} -+ -+// ---------------------------------------------------------------------------- -+// scrollbar -+// ---------------------------------------------------------------------------- -+ -+void wxWasmRenderer::DrawArrowBorder(wxDC& dc, -+ wxRect *rect, -+ wxDirection dir) -+{ -+ static const wxDirection sides[] = -+ { -+ wxUP, wxLEFT, wxRIGHT, wxDOWN -+ }; -+ -+ wxRect rect1, rect2, rectInner; -+ rect1 = -+ rect2 = -+ rectInner = *rect; -+ -+ rect2.Inflate(-1); -+ rectInner.Inflate(-2); -+ -+ DrawSolidRect(dc, wxSCHEME_COLOUR(m_scheme, SCROLLBAR), *rect); -+ -+ // find the side not to draw and also adjust the rectangles to compensate -+ // for it -+ wxDirection sideToOmit; -+ switch ( dir ) -+ { -+ case wxUP: -+ sideToOmit = wxDOWN; -+ rect2.height += 1; -+ rectInner.height += 1; -+ break; -+ -+ case wxDOWN: -+ sideToOmit = wxUP; -+ rect2.y -= 1; -+ rect2.height += 1; -+ rectInner.y -= 2; -+ rectInner.height += 1; -+ break; -+ -+ case wxLEFT: -+ sideToOmit = wxRIGHT; -+ rect2.width += 1; -+ rectInner.width += 1; -+ break; -+ -+ case wxRIGHT: -+ sideToOmit = wxLEFT; -+ rect2.x -= 1; -+ rect2.width += 1; -+ rectInner.x -= 2; -+ rectInner.width += 1; -+ break; -+ -+ default: -+ wxFAIL_MSG(wxT("unknown arrow direction")); -+ return; -+ } -+ -+ // the outer rect first -+ size_t n; -+ for ( n = 0; n < WXSIZEOF(sides); n++ ) -+ { -+ wxDirection side = sides[n]; -+ if ( side == sideToOmit ) -+ continue; -+ -+ DrawAntiShadedRectSide(dc, rect1, m_penDarkGrey, m_penHighlight, side); -+ } -+ -+ // and then the inner one -+ for ( n = 0; n < WXSIZEOF(sides); n++ ) -+ { -+ wxDirection side = sides[n]; -+ if ( side == sideToOmit ) -+ continue; -+ -+ DrawAntiShadedRectSide(dc, rect2, m_penBlack, m_penGrey, side); -+ } -+ -+ *rect = rectInner; -+} -+ -+void wxWasmRenderer::DrawScrollbarArrow(wxDC& dc, -+ wxDirection dir, -+ const wxRect& rectArrow, -+ int flags) -+{ -+ // first of all, draw the border around it - but we don't want the border -+ // on the side opposite to the arrow point -+ wxRect rect = rectArrow; -+ DrawArrowBorder(dc, &rect, dir); -+ -+ // then the arrow itself -+ DrawArrow(dc, dir, rect, flags); -+} -+ -+void wxWasmRenderer::DrawMenuArrow(wxDC& dc, -+ const wxRect& rect, -+ int flags) -+{ -+ wxCoord middle = (rect.GetTop() + rect.GetBottom() + 1) / 2; -+ -+ wxPoint ptArrow[3]; -+ -+ ptArrow[0] = rect.GetPosition(); -+ ptArrow[1].x = rect.GetRight(); -+ ptArrow[1].y = middle; -+ ptArrow[2].x = rect.GetLeft(); -+ ptArrow[2].y = rect.GetBottom(); -+ -+ wxColour colInside = GetBackgroundColour(flags); -+ -+ dc.SetPen(*wxTRANSPARENT_PEN); -+ dc.SetBrush(dc.GetTextForeground()); -+ -+ dc.DrawPolygon(WXSIZEOF(ptArrow), ptArrow); -+} -+ -+void wxWasmRenderer::DrawArrow(wxDC& dc, -+ wxDirection dir, -+ const wxRect& rect, -+ int flags) -+{ -+ enum -+ { -+ Point_First, -+ Point_Second, -+ Point_Third, -+ Point_Max -+ }; -+ -+ wxPoint ptArrow[Point_Max]; -+ -+ wxColour colInside; -+ if ( flags & wxCONTROL_PRESSED ) -+ { -+ colInside = wxSCHEME_COLOUR(m_scheme, CONTROL_TEXT_DISABLED); -+ } -+ else -+ { -+ colInside = wxSCHEME_COLOUR(m_scheme, CONTROL_TEXT); -+ } -+ -+ wxCoord middle; -+ if ( dir == wxUP || dir == wxDOWN ) -+ { -+ // horz middle -+ middle = (rect.GetRight() + rect.GetLeft() + 1) / 2; -+ } -+ else // horz arrow -+ { -+ middle = (rect.GetTop() + rect.GetBottom() + 1) / 2; -+ } -+ -+ // draw the arrow interior -+ dc.SetPen(*wxTRANSPARENT_PEN); -+ dc.SetBrush(colInside); -+ -+ switch ( dir ) -+ { -+ case wxUP: -+ ptArrow[Point_First].x = rect.GetLeft(); -+ ptArrow[Point_First].y = rect.GetBottom(); -+ ptArrow[Point_Second].x = middle; -+ ptArrow[Point_Second].y = rect.GetTop(); -+ ptArrow[Point_Third].x = rect.GetRight(); -+ ptArrow[Point_Third].y = rect.GetBottom(); -+ break; -+ -+ case wxDOWN: -+ ptArrow[Point_First] = rect.GetPosition(); -+ ptArrow[Point_Second].x = middle; -+ ptArrow[Point_Second].y = rect.GetBottom(); -+ ptArrow[Point_Third].x = rect.GetRight(); -+ ptArrow[Point_Third].y = rect.GetTop(); -+ break; -+ -+ case wxLEFT: -+ ptArrow[Point_First].x = rect.GetRight(); -+ ptArrow[Point_First].y = rect.GetTop(); -+ ptArrow[Point_Second].x = rect.GetLeft(); -+ ptArrow[Point_Second].y = middle; -+ ptArrow[Point_Third].x = rect.GetRight(); -+ ptArrow[Point_Third].y = rect.GetBottom(); -+ break; -+ -+ case wxRIGHT: -+ ptArrow[Point_First] = rect.GetPosition(); -+ ptArrow[Point_Second].x = rect.GetRight(); -+ ptArrow[Point_Second].y = middle; -+ ptArrow[Point_Third].x = rect.GetLeft(); -+ ptArrow[Point_Third].y = rect.GetBottom(); -+ break; -+ -+ default: -+ wxFAIL_MSG(wxT("unknown arrow direction")); -+ } -+ -+ dc.DrawPolygon(WXSIZEOF(ptArrow), ptArrow); -+} -+ -+void wxWasmRenderer::DrawThumbBorder(wxDC& dc, -+ wxRect *rect, -+ wxOrientation orient) -+{ -+ if ( orient == wxVERTICAL ) -+ { -+ DrawAntiShadedRectSide(dc, *rect, m_penDarkGrey, m_penDarkGrey, -+ wxLEFT); -+ DrawAntiShadedRectSide(dc, *rect, m_penDarkGrey, m_penDarkGrey, -+ wxRIGHT); -+ rect->Inflate(-1, 0); -+ } -+ else -+ { -+ DrawAntiShadedRectSide(dc, *rect, m_penDarkGrey, m_penDarkGrey, -+ wxUP); -+ DrawAntiShadedRectSide(dc, *rect, m_penDarkGrey, m_penDarkGrey, -+ wxDOWN); -+ rect->Inflate(0, -1); -+ } -+} -+ -+void wxWasmRenderer::DrawScrollbarThumb(wxDC& dc, -+ wxOrientation orient, -+ const wxRect& rect, -+ int WXUNUSED(flags)) -+{ -+ // we don't want the border in the direction of the scrollbar movement -+ wxRect rectThumb = rect; -+ DrawThumbBorder(dc, &rectThumb, orient); -+ -+ double radius = (orient == wxVERTICAL ? rectThumb.width : rectThumb.height) / 2.0; -+ -+ wxColour col = wxSCHEME_COLOUR(m_scheme, CONTROL); -+ -+ dc.SetBrush(col); -+ dc.SetPen(*wxTRANSPARENT_PEN); -+ dc.DrawRoundedRectangle(rectThumb.x, rectThumb.y, rectThumb.width, rectThumb.height, radius); -+} -+ -+void wxWasmRenderer::DrawScrollbarShaft(wxDC& dc, -+ wxOrientation orient, -+ const wxRect& rect, -+ int WXUNUSED(flags)) -+{ -+ wxRect rectBar = rect; -+ DrawThumbBorder(dc, &rectBar, orient); -+ DrawSolidRect(dc, wxSCHEME_COLOUR(m_scheme, SCROLLBAR), rectBar); -+} -+ -+// ---------------------------------------------------------------------------- -+// size adjustments -+// ---------------------------------------------------------------------------- -+ -+void wxWasmRenderer::AdjustSize(wxSize *size, const wxWindow *window) -+{ -+#if wxUSE_BMPBUTTON -+ if ( wxDynamicCast(window, wxBitmapButton) ) -+ { -+ size->x += 4; -+ size->y += 4; -+ } else -+#endif // wxUSE_BMPBUTTON -+#if wxUSE_BUTTON || wxUSE_TOGGLEBTN -+ if ( 0 -+# if wxUSE_BUTTON -+ || wxDynamicCast(window, wxButton) -+# endif // wxUSE_BUTTON -+# if wxUSE_TOGGLEBTN -+ || wxDynamicCast(window, wxToggleButton) -+# endif // wxUSE_TOGGLEBTN -+ ) -+ { -+ if ( !(window->GetWindowStyle() & wxBU_EXACTFIT) ) -+ { -+ // TODO: this is ad hoc... -+ size->x += 3*window->GetCharWidth(); -+ wxCoord minBtnHeight = 18; -+ if ( size->y < minBtnHeight ) -+ size->y = minBtnHeight; -+ -+ // button border width -+ size->y += 4; -+ } -+ } else -+#endif // wxUSE_BUTTON || wxUSE_TOGGLEBTN -+#if wxUSE_SCROLLBAR -+ if ( wxDynamicCast(window, wxScrollBar) ) -+ { -+ /* -+ Don't adjust the size for a scrollbar as its DoGetBestClientSize -+ already has the correct size set. Any size changes here would get -+ added to the best size, making the scrollbar larger. -+ Also skip border width adjustments, they don't make sense for us. -+ */ -+ return; -+ } -+ else -+#endif // wxUSE_SCROLLBAR -+ { -+ // take into account the border width -+ wxStdRenderer::AdjustSize(size, window); -+ } -+} -+ -+// ---------------------------------------------------------------------------- -+// standard icons -+// ---------------------------------------------------------------------------- -+ -+/* Copyright (c) Julian Smart */ -+static const char *error_xpm[] = { -+/* columns rows colors chars-per-pixel */ -+"48 48 4 1", -+" c None", -+"X c #242424", -+"o c #DCDF00", -+". c #C00000", -+/* pixels */ -+" ", -+" ", -+" ", -+" ", -+" ", -+" ..... ", -+" ............. ", -+" ................. ", -+" ................... ", -+" ....................... ", -+" ......................... ", -+" ........................... ", -+" ...........................X ", -+" .............................X ", -+" ............................... ", -+" ...............................X ", -+" .................................X ", -+" .................................X ", -+" .................................XX ", -+" ...ooooooooooooooooooooooooooo...XX ", -+" ....ooooooooooooooooooooooooooo....X ", -+" ....ooooooooooooooooooooooooooo....X ", -+" ....ooooooooooooooooooooooooooo....XX ", -+" ....ooooooooooooooooooooooooooo....XX ", -+" ....ooooooooooooooooooooooooooo....XX ", -+" ...ooooooooooooooooooooooooooo...XXX ", -+" ...ooooooooooooooooooooooooooo...XXX ", -+" .................................XX ", -+" .................................XX ", -+" ...............................XXX ", -+" ...............................XXX ", -+" .............................XXX ", -+" ...........................XXXX ", -+" ...........................XXX ", -+" .........................XXX ", -+" .......................XXXX ", -+" X...................XXXXX ", -+" X.................XXXXX ", -+" X.............XXXXX ", -+" XXXX.....XXXXXXXX ", -+" XXXXXXXXXXXXX ", -+" XXXXX ", -+" ", -+" ", -+" ", -+" ", -+" ", -+" " -+}; -+ -+/* Copyright (c) Julian Smart */ -+static const char *info_xpm[] = { -+/* columns rows colors chars-per-pixel */ -+"48 48 9 1", -+"$ c Black", -+"O c #FFFFFF", -+"@ c #808080", -+"+ c #000080", -+"o c #E8EB01", -+" c None", -+"X c #FFFF40", -+"# c #C0C0C0", -+". c #ABAD01", -+/* pixels */ -+" ", -+" ", -+" ", -+" ", -+" ", -+" ", -+" ", -+" ", -+" ", -+" ..... ", -+" ..XXXXX.. ", -+" ..XXXXXXXXo.. ", -+" .XXXOXXXXXXXoo. ", -+" .XOOXXX+XXXXXo. ", -+" .XOOOXX+++XXXXoo. ", -+" .XOOXXX+++XXXXXo. ", -+" .XOOOXXX+++XXXXXXo. ", -+" .XOOXXXX+++XXXXXXo. ", -+" .XXXXXXX+++XXXXXXX. ", -+" .XXXXXXX+++XXXXXXo. ", -+" .XXXXXXX+++XXXXXoo. ", -+" .XXXXXX+++XXXXXo. ", -+" .XXXXXXX+XXXXXXo. ", -+" .XXXXXXXXXXXXo. ", -+" .XXXXX+++XXXoo. ", -+" .XXXX+++XXoo. ", -+" .XXXXXXXXo. ", -+" ..XXXXXXo.. ", -+" .XXXXXo.. ", -+" @#######@ ", -+" @@@@@@@@@ ", -+" @#######@ ", -+" @@@@@@@@@ ", -+" @#######@ ", -+" @@@@@@@ ", -+" ### ", -+" $$$ ", -+" ", -+" ", -+" ", -+" ", -+" ", -+" ", -+" ", -+" ", -+" ", -+" ", -+" " -+}; -+ -+/* Copyright (c) Julian Smart */ -+static const char *warning_xpm[] = { -+/* columns rows colors chars-per-pixel */ -+"48 48 9 1", -+"@ c Black", -+"o c #A6A800", -+"+ c #8A8C00", -+"$ c #B8BA00", -+" c None", -+"O c #6E7000", -+"X c #DCDF00", -+". c #C00000", -+"# c #373800", -+/* pixels */ -+" ", -+" ", -+" ", -+" ", -+" ", -+" ", -+" ", -+" . ", -+" ... ", -+" ... ", -+" ..... ", -+" ...X.. ", -+" ..XXX.. ", -+" ...XXX... ", -+" ..XXXXX.. ", -+" ..XXXXXX... ", -+" ...XXoO+XX.. ", -+" ..XXXO@#XXX.. ", -+" ..XXXXO@#XXX... ", -+" ...XXXXO@#XXXX.. ", -+" ..XXXXXO@#XXXX... ", -+" ...XXXXXo@OXXXXX.. ", -+" ...XXXXXXo@OXXXXXX.. ", -+" ..XXXXXXX$@OXXXXXX... ", -+" ...XXXXXXXX@XXXXXXXX.. ", -+" ...XXXXXXXXXXXXXXXXXX... ", -+" ..XXXXXXXXXXOXXXXXXXXX.. ", -+" ...XXXXXXXXXO@#XXXXXXXXX.. ", -+" ..XXXXXXXXXXX#XXXXXXXXXX... ", -+" ...XXXXXXXXXXXXXXXXXXXXXXX.. ", -+" ...XXXXXXXXXXXXXXXXXXXXXXXX... ", -+" .............................. ", -+" .............................. ", -+" ", -+" ", -+" ", -+" ", -+" ", -+" ", -+" ", -+" ", -+" ", -+" ", -+" ", -+" ", -+" ", -+" ", -+" " -+}; -+ -+/* Copyright (c) Julian Smart */ -+static const char *question_xpm[] = { -+/* columns rows colors chars-per-pixel */ -+"48 48 21 1", -+". c Black", -+"> c #696969", -+"O c #1F1F00", -+"+ c #181818", -+"o c #F6F900", -+"; c #3F3F00", -+"$ c #111111", -+" c None", -+"& c #202020", -+"X c #AAAA00", -+"@ c #949400", -+": c #303030", -+"1 c #383838", -+"% c #2A2A00", -+", c #404040", -+"= c #B4B400", -+"- c #484848", -+"# c #151500", -+"< c #9F9F00", -+"2 c #6A6A00", -+"* c #353500", -+/* pixels */ -+" ", -+" ", -+" ", -+" ", -+" ......... ", -+" ...XXXXXXX.. ", -+" ..XXXXoooooXXXO+ ", -+" ..XXooooooooooooX@.. ", -+" ..XoooooooooooooooXX#. ", -+" $%XoooooooooooooooooXX#. ", -+" &.XoooooooXXXXXXooooooXX.. ", -+" .XooooooXX.$...$XXoooooX*. ", -+" $.XoooooX%.$ .*oooooo=.. ", -+" .XooooooX.. -.XoooooX.. ", -+" .XoooooX..+ .XoooooX;. ", -+" ...XXXX..: .XoooooX;. ", -+" ........ >.XoooooX;. ", -+" +.XoooooX.. ", -+" ,.Xoooooo<.. ", -+" 1#XooooooXO.. ", -+" &#XooooooX2.. ", -+" $%XooooooXX.. ", -+" $%XooooooXX.. ", -+" $%XooooooXX.. ", -+" &.XooooooXX.. ", -+" .XooooooXX.. ", -+" &.XoooooXX.. ", -+" ..XooooXX.. ", -+" ..XooooX... ", -+" ..XXooXX..& ", -+" ...XXXXX.. ", -+" ........ ", -+" ", -+" ", -+" ....... ", -+" ..XXXXX.. ", -+" ..XXoooXX.. ", -+" ..XoooooX.. ", -+" ..XoooooX.. ", -+" ..XXoooXX.. ", -+" ..XXXXX.. ", -+" ....... ", -+" ", -+" ", -+" ", -+" ", -+" ", -+" " -+}; -+ -+wxBitmap wxWasmArtProvider::CreateBitmap(const wxArtID& id, -+ const wxArtClient& WXUNUSED(client), -+ const wxSize& WXUNUSED(size)) -+{ -+ if ( id == wxART_INFORMATION ) -+ return wxBitmap(info_xpm); -+ if ( id == wxART_ERROR ) -+ return wxBitmap(error_xpm); -+ if ( id == wxART_WARNING ) -+ return wxBitmap(warning_xpm); -+ if ( id == wxART_QUESTION ) -+ return wxBitmap(question_xpm); -+ return wxNullBitmap; -+} -+ -+ -+// ============================================================================ -+// wxInputHandler -+// ============================================================================ -+ -+// ---------------------------------------------------------------------------- -+// wxWasmInputHandler -+// ---------------------------------------------------------------------------- -+ -+bool wxWasmInputHandler::HandleKey(wxInputConsumer * WXUNUSED(control), -+ const wxKeyEvent& WXUNUSED(event), -+ bool WXUNUSED(pressed)) -+{ -+ return false; -+} -+ -+bool wxWasmInputHandler::HandleMouse(wxInputConsumer *control, -+ const wxMouseEvent& event) -+{ -+ // clicking on the control gives it focus -+ if ( event.ButtonDown() && wxWindow::FindFocus() != control->GetInputWindow() ) -+ { -+ control->GetInputWindow()->SetFocus(); -+ -+ return true; -+ } -+ -+ return false; -+} -+ -+bool wxWasmInputHandler::HandleMouseMove(wxInputConsumer *control, -+ const wxMouseEvent& event) -+{ -+ if ( event.Entering() ) -+ { -+ control->GetInputWindow()->SetCurrent(true); -+ } -+ else if ( event.Leaving() ) -+ { -+ control->GetInputWindow()->SetCurrent(false); -+ } -+ else -+ { -+ return false; -+ } -+ -+ return true; -+} -+ -+#if wxUSE_CHECKBOX -+ -+// ---------------------------------------------------------------------------- -+// wxWasmCheckboxInputHandler -+// ---------------------------------------------------------------------------- -+ -+bool wxWasmCheckboxInputHandler::HandleKey(wxInputConsumer *control, -+ const wxKeyEvent& event, -+ bool pressed) -+{ -+ if ( pressed ) -+ { -+ int keycode = event.GetKeyCode(); -+ if ( keycode == WXK_SPACE || keycode == WXK_RETURN ) -+ { -+ control->PerformAction(wxACTION_CHECKBOX_TOGGLE); -+ -+ return true; -+ } -+ } -+ -+ return false; -+} -+ -+#endif // wxUSE_CHECKBOX -+ -+#if wxUSE_TEXTCTRL -+ -+// ---------------------------------------------------------------------------- -+// wxWasmTextCtrlInputHandler -+// ---------------------------------------------------------------------------- -+ -+bool wxWasmTextCtrlInputHandler::HandleKey(wxInputConsumer *control, -+ const wxKeyEvent& event, -+ bool pressed) -+{ -+ // handle only Wasm-specific text bindings here, the others are handled in -+ // the base class -+ if ( pressed ) -+ { -+ wxControlAction action; -+ int keycode = event.GetKeyCode(); -+ if ( event.ControlDown() ) -+ { -+ switch ( keycode ) -+ { -+ case 'A': -+ action = wxACTION_TEXT_HOME; -+ break; -+ -+ case 'B': -+ action = wxACTION_TEXT_LEFT; -+ break; -+ -+ case 'D': -+ action << wxACTION_TEXT_PREFIX_DEL << wxACTION_TEXT_RIGHT; -+ break; -+ -+ case 'E': -+ action = wxACTION_TEXT_END; -+ break; -+ -+ case 'F': -+ action = wxACTION_TEXT_RIGHT; -+ break; -+ -+ case 'H': -+ action << wxACTION_TEXT_PREFIX_DEL << wxACTION_TEXT_LEFT; -+ break; -+ -+ case 'K': -+ action << wxACTION_TEXT_PREFIX_DEL << wxACTION_TEXT_END; -+ break; -+ -+ case 'N': -+ action = wxACTION_TEXT_DOWN; -+ break; -+ -+ case 'P': -+ action = wxACTION_TEXT_UP; -+ break; -+ -+ case 'U': -+ //delete the entire line -+ control->PerformAction(wxACTION_TEXT_HOME); -+ action << wxACTION_TEXT_PREFIX_DEL << wxACTION_TEXT_END; -+ break; -+ -+ case 'W': -+ action << wxACTION_TEXT_PREFIX_DEL << wxACTION_TEXT_WORD_LEFT; -+ break; -+ } -+ } -+ else if ( event.AltDown() ) -+ { -+ switch ( keycode ) -+ { -+ case 'B': -+ action = wxACTION_TEXT_WORD_LEFT; -+ break; -+ -+ case 'D': -+ action << wxACTION_TEXT_PREFIX_DEL << wxACTION_TEXT_WORD_RIGHT; -+ break; -+ -+ case 'F': -+ action = wxACTION_TEXT_WORD_RIGHT; -+ break; -+ } -+ } -+ -+ if ( action != wxACTION_NONE ) -+ { -+ control->PerformAction(action); -+ -+ return true; -+ } -+ } -+ -+ return wxStdInputHandler::HandleKey(control, event, pressed); -+} -+ -+#endif // wxUSE_TEXTCTRL -+ -+#endif // wxUSE_THEME_WASM -diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp -index 0e0642064e..7bda91b260 100644 ---- a/src/univ/themes/win32.cpp -+++ b/src/univ/themes/win32.cpp -@@ -146,6 +146,7 @@ public: - #if wxUSE_SLIDER - virtual void DrawSliderShaft(wxDC& dc, - const wxRect& rect, -+ double fracValue, - int lenThumb, - wxOrientation orient, - int flags = 0, -@@ -201,7 +202,7 @@ public: - virtual void AdjustSize(wxSize *size, const wxWindow *window); - virtual bool AreScrollbarsInsideBorder() const; - -- virtual wxSize GetScrollbarArrowSize() const -+ virtual wxSize GetScrollbarArrowSize(wxOrientation WXUNUSED(orientation)) const - { return m_sizeScrollbarArrow; } - - virtual wxSize GetCheckBitmapSize() const -@@ -2062,6 +2063,7 @@ wxRect wxWin32Renderer::GetSliderShaftRect(const wxRect& rectOrig, - - void wxWin32Renderer::DrawSliderShaft(wxDC& dc, - const wxRect& rectOrig, -+ double WXUNUSED(fracValue), - int lenThumb, - wxOrientation orient, - int flags, -diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp -index 5d76e44a8d..564d6435b5 100644 ---- a/src/univ/winuniv.cpp -+++ b/src/univ/winuniv.cpp -@@ -96,13 +96,15 @@ public: - wxIMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowDFB); - #elif defined(__WXX11__) - wxIMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowX11); -+#elif defined(__WXWASM__) -+ wxIMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowWasm); - #endif - - wxBEGIN_EVENT_TABLE(wxWindow, wxWindowNative) - EVT_SIZE(wxWindow::OnSize) - - #if wxUSE_ACCEL || wxUSE_MENUS -- EVT_KEY_DOWN(wxWindow::OnKeyDown) -+ //EVT_KEY_DOWN(wxWindow::OnKeyDown) - #endif // wxUSE_ACCEL - - #if wxUSE_MENUS -@@ -132,6 +134,10 @@ void wxWindow::Init() - - m_oldSize.x = wxDefaultCoord; - m_oldSize.y = wxDefaultCoord; -+ -+#if wxUSE_MENUS -+ m_popupCallback = NULL; -+#endif - } - - bool wxWindow::Create(wxWindow *parent, -diff --git a/src/wasm/app.cpp b/src/wasm/app.cpp -new file mode 100644 -index 0000000000..c61fccfbdb ---- /dev/null -+++ b/src/wasm/app.cpp -@@ -0,0 +1,685 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: src/wasm/app.cpp -+// Purpose wxApp implementation -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#include "wx/app.h" -+ -+#include "wx/apptrait.h" -+#include "wx/dnd.h" -+#include "wx/nonownedwnd.h" -+#include "wx/toplevel.h" -+#include "wx/window.h" -+ -+#include "wx/private/eventloopsourcesmanager.h" -+#include "wx/wasm/private/display.h" -+#include "wx/wasm/private/keyboard.h" -+#include "wx/wasm/private/mouse.h" -+#include "wx/wasm/private/timer.h" -+ -+#include -+#include -+ -+void RegisterEmscriptenCallbacks(wxApp* app); -+ -+// ---------------------------------------------------------------------------- -+// wxApp -+// ---------------------------------------------------------------------------- -+ -+IMPLEMENT_DYNAMIC_CLASS(wxApp, wxAppBase) -+ -+wxApp::wxApp() -+ : m_display(new wxWasmDisplay()) -+{ -+ printf("Creating app\n"); -+ -+ RegisterEmscriptenCallbacks(this); -+} -+ -+wxApp::~wxApp() -+{ -+ delete m_display; -+} -+ -+void wxApp::Paint() -+{ -+ wxWindow *topWindow = GetTopWindow(); -+ wxASSERT(topWindow != NULL); -+ -+ wxWindowList::iterator windowIter; -+ -+ for (windowIter = wxTopLevelWindows.begin(); -+ windowIter != wxTopLevelWindows.end(); -+ ++windowIter) -+ { -+ wxNonOwnedWindow* window = static_cast(*windowIter); -+ window->OnAnimationFrame(); -+ -+ if (window->NeedsPaint()) -+ { -+ window->HandlePaintRequests(); -+ } -+ } -+} -+ -+bool wxApp::IsKeyPressed(long keyCode) -+{ -+ switch (keyCode) -+ { -+ case WXK_NONE: -+ return false; -+ break; -+ case WXK_CONTROL: -+ return m_mouseState.RawControlDown(); -+ break; -+ case WXK_SHIFT: -+ return m_mouseState.ShiftDown(); -+ break; -+ case WXK_ALT: -+ return m_mouseState.AltDown(); -+ break; -+ default: -+ return m_keyCodeSet.find(keyCode) != m_keyCodeSet.end(); -+ break; -+ } -+} -+ -+void wxApp::SetKeyPressed(long keyCode, bool pressed) -+{ -+ if (pressed) -+ { -+ m_keyCodeSet.insert(keyCode); -+ } -+ else -+ { -+ m_keyCodeSet.erase(keyCode); -+ } -+} -+ -+void wxApp::GetMousePosition(int *x, int *y) -+{ -+ m_mouseState.GetPosition(x, y); -+} -+ -+void wxApp::GetMouseState(wxMouseState *mouseState) -+{ -+ *mouseState = m_mouseState; -+} -+ -+wxWindow *wxApp::GetMouseWindow(const wxPoint& position) const -+{ -+ wxWindow *captureWindow = wxWindow::GetCapture(); -+ if (captureWindow != NULL) -+ { -+ return captureWindow; -+ } -+ else -+ { -+ return wxFindWindowAtPoint(position); -+ } -+} -+ -+void wxApp::UpdateMouseState(const wxKeyEvent& event) -+{ -+ m_mouseState.SetControlDown(event.ControlDown()); -+ m_mouseState.SetShiftDown(event.ShiftDown()); -+ m_mouseState.SetAltDown(event.AltDown()); -+ m_mouseState.SetMetaDown(event.MetaDown()); -+ m_mouseState.SetRawControlDown(event.RawControlDown()); -+} -+ -+bool wxApp::HandleKeyEvent(wxKeyEvent *event) -+{ -+ //printf("HandleKeyEvent: %d\n", event->GetEventType()); -+ -+ wxWindow *window = wxWindow::FindFocus(); -+ //printf("KeyEvent: window %p\n", window); -+ -+ if (window != NULL && window->IsEnabled()) -+ { -+ event->SetEventObject(window); -+ event->SetId(window->GetId()); -+ -+ if (event->GetEventType() == wxEVT_CHAR) -+ { -+ //printf("key char: %d\n", event->GetKeyCode()); -+ } -+ else if (event->GetEventType() == wxEVT_KEY_DOWN) -+ { -+ //printf("key down: %d\n", event->GetKeyCode()); -+ } -+ -+ UpdateMouseState(*event); -+ -+ if (event->GetEventType() == wxEVT_CHAR_HOOK) -+ { -+ SetKeyPressed(event->GetKeyCode(), true); -+ } -+ else if (event->GetEventType() == wxEVT_KEY_UP) -+ { -+ SetKeyPressed(event->GetKeyCode(), false); -+ } -+ -+ return window->HandleWindowEvent(*event); -+ } -+ else -+ { -+ return false; -+ } -+} -+ -+void wxApp::SendMouseEventToWindow(wxMouseEvent *event, wxWindow *window) -+{ -+ if (window->IsEnabled()) -+ { -+ wxASSERT(window != NULL); -+ wxASSERT(event != NULL); -+ -+ wxPoint mousePosition = event->GetPosition(); -+ wxPoint clientPosition = window->ScreenToClient(mousePosition); -+ //wxPoint screenPosition = window->GetScreenPosition(); -+ //printf("mouse: %d %d\n", mousePosition.x, mousePosition.y); -+ //printf("screen: %d %d %p\n", screenPosition.x, screenPosition.y, window); -+ //printf("client: %d %d %p\n", clientPosition.x, clientPosition.y, window); -+ event->SetPosition(clientPosition); -+ -+ event->SetEventObject(window); -+ event->SetId(window->GetId()); -+ -+ window->HandleWindowEvent(*event); -+ } -+} -+ -+void wxApp::UpdateMouseState(const wxMouseEvent& event) -+{ -+ m_mouseState.SetControlDown(event.ControlDown()); -+ m_mouseState.SetShiftDown(event.ShiftDown()); -+ m_mouseState.SetAltDown(event.AltDown()); -+ m_mouseState.SetMetaDown(event.MetaDown()); -+ m_mouseState.SetRawControlDown(event.RawControlDown()); -+ -+ m_mouseState.SetLeftDown(event.LeftIsDown()); -+ m_mouseState.SetMiddleDown(event.MiddleIsDown()); -+ m_mouseState.SetRightDown(event.RightIsDown()); -+ m_mouseState.SetAux1Down(event.Aux1IsDown()); -+ m_mouseState.SetAux2Down(event.Aux2IsDown()); -+ m_mouseState.SetPosition(event.GetPosition()); -+} -+ -+void wxApp::HandleMouseEvent(wxMouseEvent *event) -+{ -+ if (wxDropSource::IsDragInProgress()) -+ { -+ wxDropSource::HandleMouseEvent(event); -+ } -+ else -+ { -+ wxPoint mousePosition = event->GetPosition(); -+ -+ UpdateMouseState(*event); -+ -+ if (g_mouseWindow != GetMouseWindow(mousePosition)) -+ { -+ if (g_mouseWindow != NULL) -+ { -+ wxMouseEvent leaveEvent(*event); -+ leaveEvent.SetEventType(wxEVT_LEAVE_WINDOW); -+ SendMouseEventToWindow(&leaveEvent, g_mouseWindow); -+ } -+ -+ // Don't optimize away GetMouseWindow, it may have changed during -+ // wxEVT_LEAVE_WINDOW processing. -+ g_mouseWindow = GetMouseWindow(mousePosition); -+ -+ if (g_mouseWindow != NULL) -+ { -+ wxCursor cursor = g_mouseWindow->GetCursor(); -+ if (cursor.IsOk()) -+ { -+ wxSetCursor(cursor); -+ } -+ else -+ { -+ wxSetCursor(*wxSTANDARD_CURSOR); -+ } -+ wxMouseEvent enterEvent(*event); -+ enterEvent.SetEventType(wxEVT_ENTER_WINDOW); -+ SendMouseEventToWindow(&enterEvent, g_mouseWindow); -+ } -+ } -+ -+ if (g_mouseWindow != NULL) -+ { -+ wxEventType eventType = event->GetEventType(); -+ // Enter window and leave window events are handled above. -+ if (eventType != wxEVT_ENTER_WINDOW && eventType != wxEVT_LEAVE_WINDOW) -+ { -+ SendMouseEventToWindow(event, g_mouseWindow); -+ } -+ -+ if (g_mouseWindow != NULL && -+ g_mouseWindow == GetMouseWindow(mousePosition) && -+ (eventType == wxEVT_LEFT_DOWN || -+ eventType == wxEVT_RIGHT_DOWN || -+ eventType == wxEVT_MIDDLE_DOWN)) -+ { -+ if (g_mouseWindow->IsEnabled()) -+ { -+ g_mouseWindow->SetFocus(); -+ } -+ } -+ } -+ } -+} -+ -+void wxApp::HandleMouseWheelEvent(wxMouseEvent *event) -+{ -+ wxPoint mousePosition = wxGetMousePosition(); -+ event->SetPosition(mousePosition); -+ wxWindow *window = GetMouseWindow(mousePosition); -+ -+ if (window != NULL) -+ { -+ SendMouseEventToWindow(event, window); -+ } -+} -+ -+void wxApp::HandleSizeEvent(const wxSizeEvent &event) -+{ -+ wxSize newSize = event.GetSize(); -+ //printf("HandleSizeEvent: %d %d\n", newSize.GetWidth(), newSize.GetHeight()); -+ -+ GetDisplay()->SetScreenSize(newSize); -+ GetDisplay()->UpdateScaleFactor(); -+ -+ wxWindow *topWindow = GetTopWindow(); -+ if (topWindow != NULL) -+ { -+ //printf("SetSize %d %d\n", newSize.GetWidth(), newSize.GetHeight()); -+ topWindow->SetSize(0, 0, newSize.GetWidth(), newSize.GetHeight()); -+ topWindow->Refresh(); -+ } -+} -+ -+void wxApp::HandleActivateEvent(wxActivateEvent *event) -+{ -+ //printf("HandleActivateEvent\n"); -+ wxWindow *topWindow = GetTopWindow(); -+ -+ if (topWindow != NULL) -+ { -+ event->SetId(topWindow->GetId()); -+ event->SetEventObject(topWindow); -+ topWindow->HandleWindowEvent(*event); -+ } -+} -+ -+void wxApp::HandleCloseEvent(wxCloseEvent *event) -+{ -+ //printf("close message\n"); -+ wxWindow *topWindow = GetTopWindow(); -+ -+ if (topWindow != NULL) -+ { -+ event->SetId(topWindow->GetId()); -+ event->SetEventObject(topWindow); -+ topWindow->HandleWindowEvent(*event); -+ } -+} -+ -+// =========================================================================== -+// wxGUIAppTraits -+// =========================================================================== -+ -+wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, -+ int *verMin, -+ int* verMicro) const -+{ -+ *verMaj = __EMSCRIPTEN_major__; -+ *verMin = __EMSCRIPTEN_minor__; -+ *verMicro = __EMSCRIPTEN_tiny__; -+ -+ return wxPORT_WASM; -+} -+ -+#if wxUSE_TIMER -+wxTimerImpl *wxGUIAppTraits::CreateTimerImpl(wxTimer *timer) -+{ -+ return new wxWasmTimerImpl(timer); -+} -+#endif -+ -+#if wxUSE_EVENTLOOP_SOURCE -+ -+class wxWasmEventLoopSourcesManager : public wxEventLoopSourcesManagerBase -+{ -+public: -+ wxEventLoopSource * -+ AddSourceForFD(int WXUNUSED(fd), -+ wxEventLoopSourceHandler* WXUNUSED(handler), -+ int WXUNUSED(flags)) -+ { -+ wxFAIL_MSG("Monitoring FDs in the main loop is not supported"); -+ -+ return NULL; -+ } -+}; -+ -+wxEventLoopSourcesManagerBase* wxGUIAppTraits::GetEventLoopSourcesManager() -+{ -+ static wxWasmEventLoopSourcesManager s_eventLoopSourcesManager; -+ -+ return &s_eventLoopSourcesManager; -+} -+ -+#endif // wxUSE_EVENTLOOP_SOURCE -+ -+ -+wxEventLoopBase* wxGUIAppTraits::CreateEventLoop() -+{ -+ return new wxEventLoop(); -+} -+ -+bool wxGUIAppTraits::ShowAssertDialog(const wxString& WXUNUSED(msg)) -+{ -+ return false; -+} -+ -+namespace -+{ -+ -+const char *GetEventName(int eventType) -+{ -+ switch (eventType) -+ { -+ case EMSCRIPTEN_EVENT_KEYPRESS: -+ return "keypress"; -+ break; -+ case EMSCRIPTEN_EVENT_KEYDOWN: -+ return "keydown"; -+ break; -+ case EMSCRIPTEN_EVENT_KEYUP: -+ return "keyup"; -+ break; -+ case EMSCRIPTEN_EVENT_CLICK: -+ return "click"; -+ break; -+ case EMSCRIPTEN_EVENT_MOUSEDOWN: -+ return "mousedown"; -+ break; -+ case EMSCRIPTEN_EVENT_MOUSEUP: -+ return "mouseup"; -+ break; -+ case EMSCRIPTEN_EVENT_DBLCLICK: -+ return "dblclick"; -+ break; -+ case EMSCRIPTEN_EVENT_MOUSEMOVE: -+ return "mousemove"; -+ break; -+ case EMSCRIPTEN_EVENT_WHEEL: -+ return "wheel"; -+ break; -+ case EMSCRIPTEN_EVENT_RESIZE: -+ return "resize"; -+ break; -+ case EMSCRIPTEN_EVENT_MOUSEENTER: -+ return "mouseenter"; -+ break; -+ case EMSCRIPTEN_EVENT_MOUSELEAVE: -+ return "mouseleave"; -+ break; -+ case EMSCRIPTEN_EVENT_TOUCHSTART: -+ return "touchstart"; -+ break; -+ case EMSCRIPTEN_EVENT_TOUCHEND: -+ return "touchend"; -+ break; -+ case EMSCRIPTEN_EVENT_TOUCHMOVE: -+ return "touchmove"; -+ break; -+ case EMSCRIPTEN_EVENT_TOUCHCANCEL: -+ return "touchcancel"; -+ break; -+ default: -+ break; -+ } -+ return "(Unknown)"; -+} -+ -+EM_BOOL KeyCallback(int eventType, -+ const EmscriptenKeyboardEvent *emscriptenEvent, -+ void *userData) -+{ -+ //printf("KeyCallback: %d\n", eventType); -+ -+ wxApp* app = static_cast(userData); -+ wxKeyEvent event; -+ bool preventDefault = true; -+ -+ if (EmscriptenKeyboardEventToWXEvent(eventType, *emscriptenEvent, &event)) -+ { -+ /* -+ wxString key_char(event.GetUnicodeKey()); -+ printf("type: %d, key_code: %d, char: %s\n", -+ event.GetEventType(), -+ event.GetKeyCode(), -+ static_cast(key_char.utf8_str())); -+ */ -+ -+ if (event.GetEventType() == wxEVT_KEY_DOWN) -+ { -+ wxKeyEvent charHookEvent(wxEVT_CHAR_HOOK, event); -+ -+ if (!app->HandleKeyEvent(&charHookEvent) || -+ charHookEvent.IsNextEventAllowed()) -+ { -+ // The browser does not generate char events for some key codes -+ if (KeyCodeNeedsCharEvent(event.GetKeyCode())) -+ { -+ if (!app->HandleKeyEvent(&event)) -+ { -+ wxKeyEvent charEvent(wxEVT_CHAR, event); -+ app->HandleKeyEvent(&charEvent); -+ } -+ } -+ else -+ { -+ // By default, emscripten generates char events -+ preventDefault = app->HandleKeyEvent(&event); -+ } -+ } -+ else -+ { -+ preventDefault = false; -+ } -+ } -+ else -+ { -+ app->HandleKeyEvent(&event); -+ } -+ } -+ -+ return preventDefault; -+} -+ -+EM_BOOL MouseCallback(int eventType, -+ const EmscriptenMouseEvent *emscriptenEvent, -+ void *userData) -+{ -+ //const char *eventName = GetEventName(eventType); -+ //printf("MouseCallback: %s %d %ld %ld\n", eventName, emscriptenEvent->button, emscriptenEvent->targetX, emscriptenEvent->targetY); -+ -+ wxApp* app = static_cast(userData); -+ wxMouseEvent event; -+ -+ if (EmscriptenMouseEventToWXEvent(eventType, *emscriptenEvent, &event)) -+ { -+ app->HandleMouseEvent(&event); -+ } -+ -+ return true; -+} -+ -+EM_BOOL TouchCallback(int eventType, -+ const EmscriptenTouchEvent *emscriptenEvent, -+ void *userData) -+{ -+ //const char *eventName = GetEventName(eventType); -+ //printf("TouchCallback: %s %d %ld %ld\n", eventName, emscriptenEvent->numTouches, emscriptenEvent->touches[0].targetX, emscriptenEvent->touches[0].targetY); -+ -+ wxApp* app = static_cast(userData); -+ wxMouseEvent event; -+ -+ if (EmscriptenTouchEventToWXEvent(eventType, *emscriptenEvent, &event)) -+ { -+ if (event.GetEventType() == wxEVT_LEFT_DOWN) -+ { -+ // Mirroring browser behavior, move the mouse to the new location -+ // before sending the mouse down event. -+ wxMouseEvent moveEvent(event); -+ moveEvent.SetEventType(wxEVT_MOTION); -+ moveEvent.SetLeftDown(false); -+ moveEvent.m_clickCount = 0; -+ app->HandleMouseEvent(&moveEvent); -+ -+ } -+ app->HandleMouseEvent(&event); -+ return true; -+ } else { -+ return false; -+ } -+} -+ -+EM_BOOL WheelCallback(int WXUNUSED(eventType), -+ const EmscriptenWheelEvent *emscriptenEvent, -+ void *userData) -+{ -+ //printf("WheelCallback: %f %f %ld %ld\n", event->deltaX, event->deltaY, event->mouse.targetX, event->mouse.targetY); -+ -+ wxApp* app = static_cast(userData); -+ wxMouseEvent event; -+ -+ if (EmscriptenWheelEventToWXEvent(*emscriptenEvent, wxHORIZONTAL, &event)) -+ { -+ } -+ -+ if (EmscriptenWheelEventToWXEvent(*emscriptenEvent, wxVERTICAL, &event)) -+ { -+ app->HandleMouseWheelEvent(&event); -+ } -+ -+ return true; -+} -+ -+EM_BOOL ResizeCallback(int WXUNUSED(eventType), -+ const EmscriptenUiEvent *emscriptenEvent, -+ void *userData) -+{ -+ //printf("ResizeCallback: %d %d\n", event->windowInnerWidth, event->windowInnerHeight); -+ wxApp* app = static_cast(userData); -+ int offset = EM_ASM_INT({ -+ return mainWindow.offsetTop; -+ }); -+ wxSize size(emscriptenEvent->windowInnerWidth, emscriptenEvent->windowInnerHeight - offset); -+ wxSizeEvent event(size); -+ -+ app->HandleSizeEvent(event); -+ -+ return true; -+} -+ -+EM_BOOL FocusCallback(int eventType, -+ const EmscriptenFocusEvent *WXUNUSED(emscriptenEvent), -+ void *userData) -+{ -+ //printf("FocusCallback\n"); -+ wxApp* app = static_cast(userData); -+ -+ wxActivateEvent event(wxEVT_ACTIVATE, eventType == EMSCRIPTEN_EVENT_FOCUS); -+ app->HandleActivateEvent(&event); -+ -+ return true; -+} -+ -+const char *UnloadCallback(int WXUNUSED(eventType), -+ const void *WXUNUSED(emscriptenEvent), -+ void *userData) -+{ -+ //printf("UnloadCallback\n"); -+ wxApp* app = static_cast(userData); -+ -+ wxCloseEvent event(wxEVT_CLOSE_WINDOW); -+ event.SetCanVeto(true); -+ app->HandleCloseEvent(&event); -+ -+ return event.GetVeto() ? "veto" : ""; -+} -+ -+} -+ -+void RegisterEmscriptenCallbacks(wxApp* app) -+{ -+ EMSCRIPTEN_RESULT result; -+ -+ result = emscripten_set_keydown_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, app, false, KeyCallback); -+ wxASSERT(result == EMSCRIPTEN_RESULT_SUCCESS); -+ -+ result = emscripten_set_keyup_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, app, false, KeyCallback); -+ wxASSERT(result == EMSCRIPTEN_RESULT_SUCCESS); -+ -+ result = emscripten_set_keypress_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, app, false, KeyCallback); -+ wxASSERT(result == EMSCRIPTEN_RESULT_SUCCESS); -+ -+ result = emscripten_set_mousedown_callback("#canvas", app, false, MouseCallback); -+ wxASSERT(result == EMSCRIPTEN_RESULT_SUCCESS); -+ -+ result = emscripten_set_mouseup_callback("#canvas", app, false, MouseCallback); -+ wxASSERT(result == EMSCRIPTEN_RESULT_SUCCESS); -+ -+ //result = emscripten_set_click_callback("#canvas", app, false, MouseCallback); -+ //wxASSERT(result == EMSCRIPTEN_RESULT_SUCCESS); -+ -+ //result = emscripten_set_dblclick_callback("#canvas", app, false, MouseCallback); -+ //wxASSERT(result == EMSCRIPTEN_RESULT_SUCCESS); -+ -+ result = emscripten_set_mouseenter_callback("#canvas", app, false, MouseCallback); -+ wxASSERT(result == EMSCRIPTEN_RESULT_SUCCESS); -+ -+ result = emscripten_set_mouseleave_callback("#canvas", app, false, MouseCallback); -+ wxASSERT(result == EMSCRIPTEN_RESULT_SUCCESS); -+ -+ result = emscripten_set_mousemove_callback("#canvas", app, false, MouseCallback); -+ wxASSERT(result == EMSCRIPTEN_RESULT_SUCCESS); -+ -+ result = emscripten_set_wheel_callback("#canvas", app, false, WheelCallback); -+ wxASSERT(result == EMSCRIPTEN_RESULT_SUCCESS); -+ -+ result = emscripten_set_touchstart_callback("#canvas", app, false, TouchCallback); -+ wxASSERT(result == EMSCRIPTEN_RESULT_SUCCESS); -+ -+ result = emscripten_set_touchend_callback("#canvas", app, false, TouchCallback); -+ wxASSERT(result == EMSCRIPTEN_RESULT_SUCCESS); -+ -+ result = emscripten_set_touchmove_callback("#canvas", app, false, TouchCallback); -+ wxASSERT(result == EMSCRIPTEN_RESULT_SUCCESS); -+ -+ result = emscripten_set_touchcancel_callback("#canvas", app, false, TouchCallback); -+ wxASSERT(result == EMSCRIPTEN_RESULT_SUCCESS); -+ -+ result = emscripten_set_resize_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, app, false, ResizeCallback); -+ wxASSERT(result == EMSCRIPTEN_RESULT_SUCCESS); -+ -+ result = emscripten_set_focus_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, app, false, FocusCallback); -+ wxASSERT(result == EMSCRIPTEN_RESULT_SUCCESS); -+ -+ result = emscripten_set_blur_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, app, false, FocusCallback); -+ wxASSERT(result == EMSCRIPTEN_RESULT_SUCCESS); -+ -+ result = emscripten_set_beforeunload_callback(app, UnloadCallback); -+ wxASSERT(result == EMSCRIPTEN_RESULT_SUCCESS); -+} -diff --git a/src/wasm/bitmap.cpp b/src/wasm/bitmap.cpp -new file mode 100644 -index 0000000000..952214f2b9 ---- /dev/null -+++ b/src/wasm/bitmap.cpp -@@ -0,0 +1,852 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/bitmap.cpp -+// Purpose: wxBitmap implementation -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#include "wx/bitmap.h" -+#include "wx/log.h" -+ -+#ifndef WX_PRECOMP -+#include "wx/icon.h" -+#include "wx/image.h" -+#include "wx/colour.h" -+#endif -+ -+#include "wx/dcmemory.h" -+#include "wx/rawbmp.h" -+#include "wx/tokenzr.h" -+#include "wx/wasm/dc.h" -+#include "wx/wasm/private.h" -+ -+#include -+ -+enum BitmapDataSource -+{ -+ BITMAP_DATA_SOURCE_NONE, -+ BITMAP_DATA_SOURCE_JS, -+ BITMAP_DATA_SOURCE_CPP -+}; -+ -+// ======================================================================== -+// wxBitmapRefData -+// ======================================================================== -+ -+class wxBitmapRefData: public wxGDIRefData -+{ -+ friend class wxBitmap; -+public: -+ wxBitmapRefData(int width, int height, int depth, double scale); -+ virtual ~wxBitmapRefData(); -+ -+ inline double GetScaleFactor() const { return m_scaleFactor; } -+ -+ inline int GetScaledWidth() const { return m_width * m_scaleFactor; } -+ inline int GetScaledHeight() const { return m_height * m_scaleFactor; } -+ -+ inline int GetBytesPerPixel() const { return 4; } -+ inline int GetBytesPerRow() const { return GetBytesPerPixel() * m_dataWidth; } -+ int GetDataSize() const { return GetBytesPerPixel() * m_dataWidth * m_dataHeight; } -+ -+ inline BitmapDataSource GetDataSource() const { return m_dataSource; } -+ unsigned char *GetData() const { return m_bitmap; } -+ -+ inline bool HasMask() const { return m_mask != NULL; } -+ -+ void SyncToCpp(); -+ void SyncToJs(); -+ -+ int GetJavascriptId() const; -+ -+protected: -+ void AllocateData(); -+ unsigned char* CreateComposite(); -+ -+protected: -+ mutable int m_jsId; -+ unsigned char *m_bitmap; -+ wxMask *m_mask; -+ int m_width; -+ int m_height; -+ int m_depth; -+ double m_scaleFactor; -+ int m_dataWidth; -+ int m_dataHeight; -+ mutable BitmapDataSource m_dataSource; -+ -+ wxDECLARE_NO_COPY_CLASS(wxBitmapRefData); -+}; -+ -+wxBitmapRefData::wxBitmapRefData(int width, int height, int depth, double scale) -+{ -+ m_jsId = -1; -+ m_bitmap = NULL; -+ m_mask = NULL; -+ m_width = width; -+ m_height = height; -+ m_depth = depth; -+ m_scaleFactor = scale; -+ m_dataWidth = width * m_scaleFactor; -+ m_dataHeight = height * m_scaleFactor; -+ m_dataSource = BITMAP_DATA_SOURCE_NONE; -+} -+ -+wxBitmapRefData::~wxBitmapRefData() -+{ -+ if (m_jsId != -1) -+ { -+ EM_ASM({ -+ destroyBitmap($0); -+ }, m_jsId); -+ } -+ -+ delete [] m_bitmap; -+ delete m_mask; -+} -+ -+void wxBitmapRefData::AllocateData() -+{ -+ if (m_bitmap == NULL) -+ { -+ int size = GetDataSize(); -+ m_bitmap = new unsigned char[size]; -+ if (m_dataSource == BITMAP_DATA_SOURCE_NONE) -+ { -+ memset(m_bitmap, 0, size); -+ } -+ } -+} -+ -+unsigned char* wxBitmapRefData::CreateComposite() -+{ -+ // Initialize composite with original bitmap. -+ int size = GetDataSize(); -+ unsigned char* compositeData = new unsigned char[size]; -+ -+ int rowPixels = GetBytesPerRow() / sizeof(uint32_t);; -+ -+ uint32_t *bitmapPtr = reinterpret_cast(m_bitmap); -+ uint32_t *maskPtr = m_mask->GetData(); -+ uint32_t *compositePtr = reinterpret_cast(compositeData); -+ -+ int width = GetScaledWidth(); -+ int height = GetScaledHeight(); -+ -+ for (int y = 0; y < height; y++) -+ { -+ for (int x = 0; x < width; x++) -+ { -+ *compositePtr = *maskPtr & bitmapPtr[x]; -+ -+ maskPtr++; -+ compositePtr++; -+ } -+ bitmapPtr += rowPixels; -+ } -+ -+ return compositeData; -+} -+ -+void wxBitmapRefData::SyncToCpp() -+{ -+ switch (m_dataSource) -+ { -+ case BITMAP_DATA_SOURCE_NONE: -+ AllocateData(); -+ break; -+ case BITMAP_DATA_SOURCE_JS: -+ AllocateData(); -+ wxASSERT_MSG(m_bitmap != NULL, wxT("Data not allocated")); -+ -+ if (m_jsId != -1) -+ { -+ EM_ASM({ -+ getBitmapData($0, $1); -+ }, m_jsId, m_bitmap); -+ } -+ break; -+ case BITMAP_DATA_SOURCE_CPP: -+ break; -+ } -+ -+ m_dataSource = BITMAP_DATA_SOURCE_CPP; -+} -+ -+void wxBitmapRefData::SyncToJs() -+{ -+ switch (m_dataSource) -+ { -+ case BITMAP_DATA_SOURCE_NONE: -+ AllocateData(); -+ case BITMAP_DATA_SOURCE_CPP: -+ { -+ unsigned char* compositeData; -+ unsigned char* data; -+ -+ if (HasMask()) -+ { -+ compositeData = CreateComposite(); -+ data = compositeData; -+ } -+ else -+ { -+ compositeData = NULL; -+ data = m_bitmap; -+ } -+ -+ if (m_jsId == -1) -+ { -+ m_jsId = EM_ASM_INT({ -+ return createBitmap($0, $1, $2, $3); -+ }, m_dataWidth, m_dataHeight, data, m_scaleFactor); -+ } -+ else -+ { -+ EM_ASM({ -+ setBitmapData($0, $1, $2, $3, $4); -+ }, m_jsId, m_dataWidth, m_dataHeight, data, m_scaleFactor); -+ } -+ m_dataSource = BITMAP_DATA_SOURCE_JS; -+ -+ delete [] compositeData; -+ } -+ break; -+ case BITMAP_DATA_SOURCE_JS: -+ break; -+ } -+} -+ -+int wxBitmapRefData::GetJavascriptId() const -+{ -+ return m_jsId; -+} -+ -+//----------------------------------------------------------------------------- -+// wxMask -+//----------------------------------------------------------------------------- -+ -+IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject) -+ -+wxMask::wxMask() -+ : m_dataSize(0), -+ m_data(NULL) -+{ -+} -+ -+wxMask::wxMask(const wxMask& mask) -+{ -+ m_dataSize = mask.m_dataSize; -+ -+ if (m_dataSize > 0) -+ { -+ m_data = new uint32_t[m_dataSize]; -+ memcpy(m_data, mask.m_data, m_dataSize * sizeof(uint32_t)); -+ } -+ else -+ { -+ m_data = NULL; -+ } -+ -+ m_bitmap = mask.m_bitmap; -+} -+ -+wxMask::wxMask(const wxBitmap& bitmap, const wxColour& colour) -+ : m_dataSize(0), -+ m_data(NULL) -+{ -+ Create(bitmap, colour); -+} -+ -+#if wxUSE_PALETTE -+wxMask::wxMask(const wxBitmap& bitmap, int paletteIndex) -+ : m_dataSize(0), -+ m_data(NULL) -+{ -+ Create(bitmap, paletteIndex); -+} -+#endif // wxUSE_PALETTE -+ -+wxMask::wxMask(const wxBitmap& bitmap) -+ : m_dataSize(0), -+ m_data(NULL) -+{ -+ Create(bitmap); -+} -+ -+wxMask::~wxMask() -+{ -+ FreeData(); -+} -+ -+wxBitmap wxMask::GetBitmap() const -+{ -+ return m_bitmap; -+} -+ -+uint32_t* wxMask::GetData() const -+{ -+ return m_data; -+} -+ -+void wxMask::FreeData() -+{ -+ delete [] m_data; -+ m_data = NULL; -+} -+ -+bool wxMask::InitFromColour(const wxBitmap& bitmap, const wxColour& colour) -+{ -+ bitmap.SyncToCpp(); -+ -+ int width = bitmap.GetScaledWidth(); -+ int height = bitmap.GetScaledHeight(); -+ -+ m_dataSize = width * height; -+ m_data = new uint32_t[m_dataSize]; -+ -+ const uint32_t maskOn = 0xffffffff; -+ const uint32_t maskOff = 0x00000000; -+ -+ // Creates mask to filters out the alpha channel. -+ const uint32_t colorMask = wxColour(0xff, 0xff, 0xff, 0x00).GetRGBA(); -+ uint32_t maskColor = colour.GetRGBA() & colorMask; -+ -+ int rowPixels = bitmap.GetBytesPerRow() / sizeof(uint32_t);; -+ -+ wxBitmapRefData* maskBitmapRef = static_cast(bitmap.GetRefData()); -+ uint32_t* bitmapPtr = reinterpret_cast(maskBitmapRef->GetData()); -+ uint32_t* dataPtr = m_data; -+ -+ for (int y = 0; y < height; y++) -+ { -+ for (int x = 0; x < width; x++) -+ { -+ *dataPtr = (bitmapPtr[x] & colorMask) == maskColor ? maskOff : maskOn; -+ ++dataPtr; -+ } -+ -+ bitmapPtr += rowPixels; -+ } -+ bitmapPtr = reinterpret_cast(maskBitmapRef->GetData()); -+ dataPtr = m_data; -+ -+ return true; -+} -+ -+bool wxMask::InitFromMonoBitmap(const wxBitmap& bitmap) -+{ -+ // TODO: implement -+ wxFAIL_MSG(wxT("InitFromMonoBitmap is not implemented")); -+ m_bitmap = bitmap; -+ return true; -+} -+ -+//----------------------------------------------------------------------------- -+// wxBitmap -+//----------------------------------------------------------------------------- -+ -+#define M_BITMAPDATA static_cast(m_refData) -+ -+IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject) -+ -+wxBitmap::wxBitmap() -+{ -+} -+ -+wxBitmap::wxBitmap(int width, int height, int depth) -+{ -+ bool retval = Create(width, height, depth); -+ wxASSERT_MSG(retval, wxT("error creating bitmap")); -+} -+ -+wxBitmap::wxBitmap(const wxSize& sz, int depth) -+{ -+ bool retval = Create(sz, depth); -+ wxASSERT_MSG(retval, wxT("error creating bitmap")); -+} -+ -+wxBitmap::wxBitmap(const char bits[], int width, int height, int depth) -+{ -+ bool retval = Create(bits, width, height, depth); -+ wxASSERT_MSG(retval, wxT("error creating bitmap")); -+} -+ -+wxBitmap::wxBitmap(const wxString &filename, wxBitmapType type) -+{ -+ bool retval = LoadFile(filename, type); -+ wxASSERT_MSG(retval, -+ wxString::Format(wxT("error creating bitmap from file %s"), filename)); -+} -+ -+wxBitmap::wxBitmap(const wxImage& image, int depth, double scale) -+{ -+ bool retval = Create(image, depth, scale); -+ wxASSERT_MSG(retval, wxT("error creating bitmap")); -+} -+ -+wxBitmap::wxBitmap(const wxImage& image, const wxDC& dc) -+{ -+ bool retval = Create(image, dc.GetDepth(), dc.GetContentScaleFactor()); -+ wxASSERT_MSG(retval, wxT("error creating bitmap")); -+} -+ -+bool wxBitmap::Create(int width, int height, int depth) -+{ -+ return CreateScaled(width, height, depth, 1.0); -+} -+ -+bool wxBitmap::Create(const wxSize& sz, int depth) -+{ -+ return Create(sz.GetWidth(), sz.GetHeight(), depth); -+} -+ -+bool wxBitmap::Create(int width, int height, const wxDC& dc) -+{ -+ return CreateScaled(width, height, dc.GetDepth(), dc.GetContentScaleFactor()); -+} -+ -+bool wxBitmap::Create(const char bits[], int width, int height, int depth) -+{ -+ if (!Create(width, height, depth)) -+ { -+ return false; -+ } -+ -+ int srcBytesPerRow = static_cast(ceil(width * depth / 8.0)); -+ int dstBytesPerRow = GetBytesPerRow(); -+ -+ unsigned char *data = static_cast(BeginRawAccess()); -+ wxASSERT_MSG(data != NULL, wxT("bitmap not allocated")); -+ -+ const char *srcPtr = bits; -+ unsigned char *dstPtr = data; -+ -+ for (int y = 0; y < height; y++) -+ { -+ memcpy(dstPtr, srcPtr, srcBytesPerRow); -+ -+ srcPtr += srcBytesPerRow; -+ dstPtr += dstBytesPerRow; -+ } -+ -+ EndRawAccess(); -+ -+ return true; -+} -+ -+bool wxBitmap::CreateScaled(int width, int height, int depth, double scale) -+{ -+ if (depth == wxBITMAP_SCREEN_DEPTH) -+ { -+ depth = wxDisplayDepth(); -+ } -+ -+ UnRef(); -+ -+ wxCHECK_MSG(depth == 32 || depth == 24, false, -+ wxString::Format("unsupported bitmap depth: %d", depth)); -+ wxCHECK_MSG(width >= 0 && height >= 0, false, wxT("invalid bitmap size")); -+ -+ m_refData = new wxBitmapRefData(width, height, depth, scale); -+ -+ return true; -+} -+ -+#if wxUSE_IMAGE -+ -+bool wxBitmap::Create(const wxImage& image, int depth, double scale) -+{ -+ bool hasAlpha = image.HasAlpha(); -+ -+ if (depth == wxBITMAP_SCREEN_DEPTH) -+ { -+ depth = wxDisplayDepth(); -+ } -+ -+ wxCHECK_MSG(depth == 32 || (depth == 24 && !hasAlpha), false, -+ wxString::Format("unsupported bitmap depth: %d", depth)); -+ -+ int scaledWidth = image.GetWidth() / scale; -+ int scaledHeight = image.GetHeight() / scale; -+ -+ const int width = scaledWidth * scale; -+ const int height = scaledHeight * scale; -+ -+ if (!CreateScaled(scaledWidth, scaledHeight, depth, scale)) -+ { -+ return false; -+ } -+ -+ int bytesPerRow = GetBytesPerRow(); -+ if (bytesPerRow < 0) -+ { -+ return false; -+ } -+ -+ unsigned char *data = static_cast(BeginRawAccess()); -+ if (data == NULL) -+ { -+ return false; -+ } -+ -+ unsigned char *rowPtr = data; -+ -+ for (int y = 0; y < height; y++) -+ { -+ unsigned char *dstPtr = rowPtr; -+ -+ for (int x = 0; x < width; x++) -+ { -+ *dstPtr++ = image.GetRed(x, y); -+ *dstPtr++ = image.GetGreen(x, y); -+ *dstPtr++ = image.GetBlue(x, y); -+ *dstPtr++ = hasAlpha ? image.GetAlpha(x, y) : 0xff; -+ } -+ rowPtr += bytesPerRow; -+ } -+ -+ EndRawAccess(); -+ -+ if (image.HasMask()) -+ { -+ wxColour maskColor(image.GetMaskRed(), -+ image.GetMaskGreen(), -+ image.GetMaskBlue()); -+ SetMask(new wxMask(*this, maskColor)); -+ } -+ -+ return true; -+} -+ -+wxImage wxBitmap::ConvertToImage() const -+{ -+ wxCHECK_MSG(IsOk(), wxNullImage, wxT("invalid bitmap")); -+ -+ const int width = GetWidth(); -+ const int height = GetHeight(); -+ const int depth = GetDepth(); -+ const bool hasAlpha = HasAlpha(); -+ -+ wxCHECK_MSG(depth == 32 || depth == 24, wxNullImage, wxT("unsupported depth")); -+ -+ int bytesPerRow = GetBytesPerRow(); -+ if (bytesPerRow < 0) -+ { -+ return wxNullImage; -+ } -+ -+ unsigned char *data = static_cast(BeginRawAccess()); -+ if (data == NULL) -+ { -+ return wxNullImage; -+ } -+ -+ unsigned char *rowPtr = data; -+ -+ wxImage image(width, height, false); -+ -+ if (hasAlpha) -+ { -+ image.InitAlpha(); -+ } -+ -+ for (int y = 0; y < height; y++) -+ { -+ unsigned char *srcPtr = rowPtr; -+ -+ for (int x = 0; x < width; x++) -+ { -+ const unsigned char r = *srcPtr++; -+ const unsigned char g = *srcPtr++; -+ const unsigned char b = *srcPtr++; -+ const unsigned char a = *srcPtr++; -+ -+ image.SetRGB(x, y, r, g, b); -+ -+ if (hasAlpha) -+ { -+ image.SetAlpha(x, y, a); -+ } -+ } -+ rowPtr += bytesPerRow; -+ } -+ -+ EndRawAccess(); -+ -+ return image; -+} -+ -+#endif // wxUSE_IMAGE -+ -+int wxBitmap::GetHeight() const -+{ -+ wxCHECK_MSG(IsOk(), -1, wxT("invalid bitmap")); -+ return M_BITMAPDATA->m_height; -+} -+ -+int wxBitmap::GetWidth() const -+{ -+ wxCHECK_MSG(IsOk(), -1, wxT("invalid bitmap")); -+ return M_BITMAPDATA->m_width; -+} -+ -+int wxBitmap::GetDepth() const -+{ -+ wxCHECK_MSG(IsOk(), -1, wxT("invalid bitmap")); -+ return M_BITMAPDATA->m_depth; -+} -+ -+double wxBitmap::GetScaleFactor() const -+{ -+ wxCHECK_MSG(IsOk(), -1, wxT("invalid bitmap")); -+ return M_BITMAPDATA->GetScaleFactor(); -+} -+ -+double wxBitmap::GetScaledWidth() const -+{ -+ return M_BITMAPDATA->GetScaledWidth(); -+} -+ -+double wxBitmap::GetScaledHeight() const -+{ -+ return M_BITMAPDATA->GetScaledHeight(); -+} -+ -+wxMask *wxBitmap::GetMask() const -+{ -+ wxCHECK_MSG(IsOk(), NULL, wxT("invalid bitmap")); -+ return M_BITMAPDATA->m_mask; -+} -+ -+void wxBitmap::SetMask(wxMask *mask) -+{ -+ AllocExclusive(); -+ -+ delete M_BITMAPDATA->m_mask; -+ M_BITMAPDATA->m_mask = NULL; -+ -+ if (mask->GetDataSize() != GetScaledWidth() * GetScaledHeight()) -+ { -+ wxFAIL_MSG("bitmap and mask dimensions must match"); -+ delete mask; -+ return; -+ } -+ -+ M_BITMAPDATA->m_mask = mask; -+ -+ M_BITMAPDATA->SyncToCpp(); -+} -+ -+wxBitmap wxBitmap::GetSubBitmap(const wxRect& rect) const -+{ -+ wxBitmap subBitmap; -+ -+ wxCHECK_MSG(IsOk(), subBitmap, wxT("invalid bitmap")); -+ -+ const wxBitmapRefData* bitmapData = M_BITMAPDATA; -+ -+ wxCHECK_MSG(rect.x >= 0 && rect.y >= 0 && -+ rect.x + rect.width <= bitmapData->m_width && -+ rect.y + rect.height <= bitmapData->m_height, -+ subBitmap, wxT("invalid bitmap region")); -+ -+ M_BITMAPDATA->SyncToCpp(); -+ -+ wxBitmapRefData * const newRef = -+ new wxBitmapRefData(rect.width, -+ rect.height, -+ bitmapData->m_depth, -+ bitmapData->m_scaleFactor); -+ -+ subBitmap.m_refData = newRef; -+ -+ double sf = GetScaleFactor(); -+ -+ const int scaledWidth = rect.width * sf; -+ const int scaledHeight = rect.height * sf; -+ const int srcX = rect.x * sf; -+ const int srcY = rect.y * sf; -+ const int srcBytesPerRow = GetBytesPerRow(); -+ const int dstBytesPerRow = subBitmap.GetBytesPerRow(); -+ -+ const int bytesPerPixel = GetBytesPerPixel(); -+ const int rowSize = bytesPerPixel * scaledWidth; -+ const unsigned char* srcPtr = M_BITMAPDATA->m_bitmap + srcY * srcBytesPerRow + bytesPerPixel * srcX; -+ unsigned char *dstPtr = static_cast(subBitmap.BeginRawAccess()); -+ -+ for (int y = 0; y < scaledHeight; y++) -+ { -+ memcpy(dstPtr, srcPtr, rowSize); -+ srcPtr += srcBytesPerRow; -+ dstPtr += dstBytesPerRow; -+ } -+ -+ subBitmap.EndRawAccess(); -+ -+ // TODO: copy mask -+ -+ return subBitmap; -+} -+ -+bool wxBitmap::SaveFile(const wxString &WXUNUSED(name), -+ wxBitmapType WXUNUSED(type), -+ const wxPalette *WXUNUSED(palette)) const -+{ -+ // TODO: implement -+ wxFAIL_MSG(wxT("SaveFile is not implemented")); -+ return true; -+} -+ -+bool wxBitmap::LoadFile(const wxString &WXUNUSED(filename), wxBitmapType WXUNUSED(type)) -+{ -+ // TODO: implement -+ wxFAIL_MSG(wxT("LoadFile is not implemented")); -+ return false; -+} -+ -+void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp) -+{ -+ wxCHECK_MSG(IsOk(), NULL, wxT("invalid bitmap")); -+ wxCHECK_MSG(bpp == GetDepth(), NULL, wxT("wrong depth")); -+ -+ data.m_width = GetScaledWidth(); -+ data.m_height = GetScaledHeight(); -+ data.m_stride = GetBytesPerRow(); -+ -+ return BeginRawAccess(); -+} -+ -+void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data)) -+{ -+ EndRawAccess(); -+} -+ -+void *wxBitmap::BeginRawAccess() const -+{ -+ wxCHECK_MSG(IsOk(), NULL, wxT("invalid bitmap")); -+ -+ M_BITMAPDATA->SyncToCpp(); -+ -+ return M_BITMAPDATA->m_bitmap; -+} -+ -+void wxBitmap::EndRawAccess() const -+{ -+ wxCHECK_RET(IsOk(), wxT("invalid bitmap")); -+} -+ -+int wxBitmap::GetBytesPerPixel() const -+{ -+ wxCHECK_MSG(IsOk(), -1, wxT("invalid bitmap")); -+ -+ return M_BITMAPDATA->GetBytesPerPixel(); -+} -+ -+int wxBitmap::GetBytesPerRow() const -+{ -+ wxCHECK_MSG(IsOk(), -1, wxT("invalid bitmap")); -+ -+ return M_BITMAPDATA->GetBytesPerRow(); -+} -+ -+#if wxUSE_PALETTE -+wxPalette *wxBitmap::GetPalette() const -+{ -+ // TODO: implement -+ wxFAIL_MSG(wxT("GetPalette is not implemented")); -+ return NULL; -+} -+ -+void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette)) -+{ -+ // TODO: implement -+ wxFAIL_MSG(wxT("SetPalette is not implemented")); -+} -+#endif // wxUSE_PALETTE -+ -+bool wxBitmap::CopyFromIcon(const wxIcon& icon) -+{ -+ *this = icon; -+ return IsOk(); -+} -+ -+void wxBitmap::SetHeight(int height) -+{ -+ AllocExclusive(); -+ M_BITMAPDATA->m_height = height; -+} -+ -+void wxBitmap::SetWidth(int width) -+{ -+ AllocExclusive(); -+ M_BITMAPDATA->m_width = width; -+} -+ -+void wxBitmap::SetDepth(int depth) -+{ -+ wxCHECK_RET(depth == 24 || depth == 32, -+ wxString::Format("unsupported bitmap depth: %d", depth)); -+ AllocExclusive(); -+ M_BITMAPDATA->m_depth = depth; -+} -+ -+/* static */ -+void wxBitmap::InitStandardHandlers() -+{ -+} -+ -+wxGDIRefData* wxBitmap::CreateGDIRefData() const -+{ -+ return new wxBitmapRefData(0, 0, 0, 1.0); -+} -+ -+wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const -+{ -+ const wxBitmapRefData* oldRef = static_cast(data); -+ wxBitmapRefData *const newRef = new wxBitmapRefData(oldRef->m_width, -+ oldRef->m_height, -+ oldRef->m_depth, -+ oldRef->m_scaleFactor); -+ -+ if (oldRef->GetDataSource() == BITMAP_DATA_SOURCE_JS) -+ { -+ newRef->m_jsId = oldRef->m_jsId; -+ newRef->m_dataSource = BITMAP_DATA_SOURCE_JS; -+ newRef->SyncToCpp(); -+ newRef->m_jsId = -1; -+ } -+ else if (oldRef->m_bitmap != NULL) -+ { -+ int size = oldRef->GetDataSize(); -+ newRef->m_bitmap = new unsigned char[size]; -+ memcpy(newRef->m_bitmap, oldRef->m_bitmap, size); -+ } -+ -+ newRef->m_dataSource = BITMAP_DATA_SOURCE_CPP; -+ -+ if (oldRef->m_mask != NULL) -+ { -+ newRef->m_mask = new wxMask(*oldRef->m_mask); -+ } -+ -+ return newRef; -+} -+ -+void wxBitmap::SyncToCpp() const -+{ -+ M_BITMAPDATA->SyncToCpp(); -+} -+ -+void wxBitmap::SyncToJs() const -+{ -+ M_BITMAPDATA->SyncToJs(); -+} -+ -+int wxBitmap::GetJavascriptId() const -+{ -+ return M_BITMAPDATA->GetJavascriptId(); -+} -diff --git a/src/wasm/brush.cpp b/src/wasm/brush.cpp -new file mode 100644 -index 0000000000..04acf66d29 ---- /dev/null -+++ b/src/wasm/brush.cpp -@@ -0,0 +1,175 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/brush.cpp -+// Purpose: wxBrush implementation -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#include "wx/brush.h" -+ -+#ifndef WX_PRECOMP -+#include "wx/bitmap.h" -+#include "wx/colour.h" -+#endif -+ -+// ---------------------------------------------------------------------------- -+// wxBrushRefData -+// ---------------------------------------------------------------------------- -+ -+class wxBrushRefData: public wxGDIRefData -+{ -+public: -+ wxBrushRefData(const wxColour& colour = wxNullColour, wxBrushStyle style = wxBRUSHSTYLE_SOLID) -+ { -+ m_colour = colour; -+ m_style = style; -+ m_stipple = NULL; -+ } -+ -+ wxBrushRefData(const wxBitmap& stipple) -+ { -+ m_stipple = NULL; -+ DoSetStipple(stipple); -+ } -+ -+ ~wxBrushRefData() -+ { -+ delete m_stipple; -+ } -+ -+ wxBrushRefData(const wxBrushRefData& data) -+ : wxGDIRefData() -+ { -+ m_colour = data.m_colour; -+ m_style = data.m_style; -+ m_stipple = data.m_stipple ? new wxBitmap(*data.m_stipple) : NULL; -+ } -+ -+ bool operator==(const wxBrushRefData& data) const -+ { -+ return m_colour == data.m_colour && -+ m_style == data.m_style && -+ (m_style != wxBRUSHSTYLE_STIPPLE || m_stipple->IsSameAs(*data.m_stipple)); -+ } -+ -+ inline const wxColour& GetColour() const { return m_colour; } -+ inline wxBrushStyle GetStyle() const { return m_style; } -+ inline wxBitmap *GetStipple() { return m_stipple; } -+ -+ inline void SetColour(const wxColour& colour) { m_colour = colour; } -+ inline void SetStyle(wxBrushStyle style) { m_style = style; } -+ inline void SetStipple(const wxBitmap& stipple) { DoSetStipple(stipple); } -+ -+protected: -+ void DoSetStipple(const wxBitmap& stipple) -+ { -+ delete m_stipple; -+ m_stipple = new wxBitmap(stipple); -+ m_style = wxBRUSHSTYLE_STIPPLE; -+ } -+ -+ wxColour m_colour; -+ wxBrushStyle m_style; -+ wxBitmap * m_stipple; -+}; -+ -+// ---------------------------------------------------------------------------- -+// wxBrush -+// ---------------------------------------------------------------------------- -+ -+#define M_BRUSHDATA ((wxBrushRefData *)m_refData) -+ -+IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxBrushBase) -+ -+wxBrush::wxBrush(const wxColour &colour, wxBrushStyle style) -+{ -+ m_refData = new wxBrushRefData(colour, style); -+} -+ -+wxBrush::wxBrush(const wxBitmap &stipple) -+{ -+ m_refData = new wxBrushRefData(stipple); -+} -+ -+wxBrush::~wxBrush() -+{ -+ // m_refData unrefed in ~wxObject -+} -+ -+wxGDIRefData *wxBrush::CreateGDIRefData() const -+{ -+ return new wxBrushRefData(); -+} -+ -+wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const -+{ -+ return new wxBrushRefData(*(wxBrushRefData *)data); -+} -+ -+bool wxBrush::operator==(const wxBrush& brush) const -+{ -+ const wxBrushRefData *brushData = (wxBrushRefData *)brush.m_refData; -+ -+ // an invalid brush is considered to be only equal to another invalid brush -+ return m_refData ? (brushData && *M_BRUSHDATA == *brushData) : !brushData; -+} -+ -+wxBrushStyle wxBrush::GetStyle() const -+{ -+ wxCHECK_MSG(IsOk(), wxBRUSHSTYLE_INVALID, wxT("invalid brush")); -+ -+ return M_BRUSHDATA->GetStyle(); -+} -+ -+wxColour wxBrush::GetColour() const -+{ -+ wxCHECK_MSG(IsOk(), wxNullColour, wxT("invalid brush")); -+ -+ return M_BRUSHDATA->GetColour(); -+} -+ -+wxBitmap *wxBrush::GetStipple() const -+{ -+ wxCHECK_MSG(IsOk(), NULL, wxT("invalid brush")); -+ -+ return M_BRUSHDATA->GetStipple(); -+} -+ -+void wxBrush::SetColour(const wxColour& col) -+{ -+ AllocExclusive(); -+ -+ M_BRUSHDATA->SetColour(col); -+} -+ -+void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b) -+{ -+ AllocExclusive(); -+ -+ M_BRUSHDATA->SetColour(wxColour(r, g, b)); -+} -+ -+void wxBrush::SetStyle(wxBrushStyle style) -+{ -+ AllocExclusive(); -+ -+ if (style != wxBRUSHSTYLE_SOLID && -+ style != wxBRUSHSTYLE_TRANSPARENT && -+ style != wxBRUSHSTYLE_STIPPLE) -+ { -+ // TODO: implement -+ wxFAIL_MSG(wxT("Brush style is not implemented")); -+ } -+ -+ M_BRUSHDATA->SetStyle(style); -+} -+ -+void wxBrush::SetStipple(const wxBitmap& stipple) -+{ -+ AllocExclusive(); -+ -+ M_BRUSHDATA->SetStipple(stipple); -+} -diff --git a/src/wasm/clipbrd.cpp b/src/wasm/clipbrd.cpp -new file mode 100644 -index 0000000000..5d83c91706 ---- /dev/null -+++ b/src/wasm/clipbrd.cpp -@@ -0,0 +1,22 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/clipbrd.cpp -+// Purpose: wxClipboard implementation -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#include "wx/clipbrd.h" -+ -+#ifndef WX_PRECOMP -+#endif // WX_PRECOMP -+ -+//----------------------------------------------------------------------------- -+// wxClipboard -+//----------------------------------------------------------------------------- -+ -+IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxClipboardBase) -+ -+// TODO: implement -diff --git a/src/wasm/colour.cpp b/src/wasm/colour.cpp -new file mode 100644 -index 0000000000..e1a9c6937f ---- /dev/null -+++ b/src/wasm/colour.cpp -@@ -0,0 +1,57 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/colour.cpp -+// Purpose: wxColour implementation -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#include "wx/colour.h" -+ -+#ifndef WX_PRECOMP -+#include "wx/gdicmn.h" -+#endif -+ -+#include -+ -+// ---------------------------------------------------------------------------- -+// wxColour -+// ---------------------------------------------------------------------------- -+ -+wxColour::~wxColour() -+{ -+} -+ -+void wxColour::Init() -+{ -+ m_red = 0; -+ m_green = 0; -+ m_blue = 0; -+ m_alpha = wxALPHA_OPAQUE; -+ m_isInit = false; -+} -+ -+void wxColour::InitRGBA(unsigned char r, -+ unsigned char g, -+ unsigned char b, -+ unsigned char a) -+{ -+ m_red = r; -+ m_green = g; -+ m_blue = b; -+ m_alpha = a; -+ m_isInit = true; -+} -+ -+wxColour& wxColour::operator=(const wxColour& col) -+{ -+ m_red = col.m_red; -+ m_green = col.m_green; -+ m_blue = col.m_blue; -+ m_alpha = col.m_alpha; -+ m_isInit = col.m_isInit; -+ -+ return *this; -+} -diff --git a/src/wasm/config.cpp b/src/wasm/config.cpp -new file mode 100644 -index 0000000000..780978a354 ---- /dev/null -+++ b/src/wasm/config.cpp -@@ -0,0 +1,502 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/dc.cpp -+// Purpose: wxLocalStorageConfig implementation -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+ -+// For compilers that support precompilation, includes "wx.h". -+#include "wx/wxprec.h" -+ -+#ifdef __BORLANDC__ -+#pragma hdrstop -+#endif -+ -+#if wxUSE_CONFIG -+ -+#include "wx/config.h" -+ -+#ifndef WX_PRECOMP -+#include "wx/string.h" -+#include "wx/intl.h" -+#include "wx/log.h" -+#include "wx/event.h" -+#include "wx/app.h" -+#endif //WX_PRECOMP -+ -+#include "wx/wasm/config.h" -+ -+#include -+ -+// ---------------------------------------------------------------------------- -+// constants -+// ---------------------------------------------------------------------------- -+ -+#define ROOT_PREFIX wxT("config") -+ -+// ============================================================================ -+// implementation -+// ============================================================================ -+ -+// ---------------------------------------------------------------------------- -+// ctor/dtor -+// ---------------------------------------------------------------------------- -+ -+wxIMPLEMENT_ABSTRACT_CLASS(wxLocalStorageConfig, wxConfigBase); -+ -+wxLocalStorageConfig::wxLocalStorageConfig(const wxString& appName, -+ const wxString& vendorName, -+ const wxString& strLocal, -+ const wxString& strGlobal, -+ long style) -+ : wxConfigBase(appName, vendorName, strLocal, strGlobal, style), -+ m_strPath(wxCONFIG_PATH_SEPARATOR) -+{ -+} -+ -+wxLocalStorageConfig::~wxLocalStorageConfig() -+{ -+} -+ -+// ---------------------------------------------------------------------------- -+// path management -+// ---------------------------------------------------------------------------- -+ -+void wxLocalStorageConfig::SetPath(const wxString& strPath) -+{ -+ if (strPath.empty()) -+ { -+ m_strPath = wxCONFIG_PATH_SEPARATOR; -+ } -+ else // not root -+ { -+ // construct the full path -+ wxString strFullPath; -+ if (strPath[0u] == wxCONFIG_PATH_SEPARATOR) -+ { -+ // absolute path -+ strFullPath = strPath; -+ } -+ else // relative path -+ { -+ strFullPath.reserve(m_strPath.length() + strPath.length() + 2); -+ -+ strFullPath << m_strPath; -+ if (strFullPath.Len() == 0 || -+ strFullPath.Last() != wxCONFIG_PATH_SEPARATOR) -+ { -+ strFullPath << wxCONFIG_PATH_SEPARATOR; -+ } -+ strFullPath << strPath; -+ } -+ m_strPath = strFullPath; -+ } -+ -+ if (strPath.Contains(wxT(".."))) -+ { -+ wxArrayString parts; -+ wxSplitPath(parts, m_strPath); -+ -+ m_strPath = wxCONFIG_PATH_SEPARATOR + wxJoin(parts, wxCONFIG_PATH_SEPARATOR, '\0'); -+ } -+} -+ -+wxString wxLocalStorageConfig::MakeEntryKey(const wxString& key) const -+{ -+ if (!key.empty() && key[0u] == wxCONFIG_PATH_SEPARATOR) -+ { -+ return ROOT_PREFIX + key; -+ } -+ else -+ { -+ return ROOT_PREFIX + GetPath() + key; -+ } -+} -+ -+wxString wxLocalStorageConfig::MakeGroupKey(const wxString& key) const -+{ -+ wxString groupKey = MakeEntryKey(key); -+ if (!groupKey.EndsWith(wxCONFIG_PATH_SEPARATOR)) -+ { -+ groupKey << wxCONFIG_PATH_SEPARATOR; -+ } -+ return groupKey; -+} -+ -+// ---------------------------------------------------------------------------- -+// enumeration (works only with current group) -+// ---------------------------------------------------------------------------- -+ -+bool wxLocalStorageConfig::GetFirstGroup(wxString& str, long& lIndex) const -+{ -+ lIndex = 0; -+ return GetNextGroup(str, lIndex); -+} -+ -+bool wxLocalStorageConfig::GetNextGroup(wxString& str, long& lIndex) const -+{ -+ const wxString prefix = MakeGroupKey(""); -+ const char *prefixCStr = static_cast((prefix).mb_str(wxConvUTF8)); -+ -+ int keyIndex = EM_ASM_INT({ -+ return getConfigGroupIndex(UTF8ToString($0), $1); -+ }, prefixCStr, lIndex); -+ -+ if (keyIndex == -1) -+ { -+ return false; -+ } -+ -+ lIndex++; -+ -+ int length = EM_ASM_INT({ -+ return getConfigKeyLength($0); -+ }, keyIndex); -+ -+ if (length == 0) -+ { -+ str = ""; -+ } -+ else -+ { -+ char *keyCStr = new char[length + 1]; -+ EM_ASM({ -+ getConfigKey($0, $1, $2); -+ }, keyIndex, keyCStr, length + 1); -+ -+ char *start = keyCStr + strlen(prefixCStr); -+ char *end = strchr(start, '/'); -+ if (end) -+ { -+ *end = '\0'; -+ } -+ str = start; -+ delete [] keyCStr; -+ } -+ -+ return true; -+} -+ -+bool wxLocalStorageConfig::GetFirstEntry(wxString& str, long& lIndex) const -+{ -+ lIndex = 0; -+ return GetNextEntry(str, lIndex); -+} -+ -+bool wxLocalStorageConfig::GetNextEntry(wxString& str, long& lIndex) const -+{ -+ const wxString prefix = MakeGroupKey(""); -+ const char *prefixCStr = static_cast((prefix).mb_str(wxConvUTF8)); -+ -+ int keyIndex = EM_ASM_INT({ -+ return getConfigEntryIndex(UTF8ToString($0), $1); -+ }, prefixCStr, lIndex); -+ -+ if (keyIndex == -1) -+ { -+ return false; -+ } -+ -+ lIndex++; -+ -+ int length = EM_ASM_INT({ -+ return getConfigKeyLength($0); -+ }, keyIndex); -+ -+ if (length == 0) -+ { -+ str = ""; -+ } -+ else -+ { -+ char *keyCStr = new char[length + 1]; -+ EM_ASM({ -+ getConfigKey($0, $1, $2); -+ }, keyIndex, keyCStr, length + 1); -+ -+ str = keyCStr + strlen(prefixCStr); -+ delete [] keyCStr; -+ } -+ -+ return true; -+} -+ -+size_t wxLocalStorageConfig::GetNumberOfEntries(bool bRecursive) const -+{ -+ const wxString prefix = MakeGroupKey(""); -+ const char *prefixCStr = static_cast((prefix).mb_str(wxConvUTF8)); -+ -+ int numEntries = EM_ASM_INT({ -+ return getConfigEntryCount(UTF8ToString($0), $1); -+ }, prefixCStr, bRecursive); -+ -+ return numEntries; -+} -+ -+size_t wxLocalStorageConfig::GetNumberOfGroups(bool bRecursive) const -+{ -+ const wxString prefix = MakeGroupKey(""); -+ const char *prefixCStr = static_cast((prefix).mb_str(wxConvUTF8)); -+ -+ int numGroups = EM_ASM_INT({ -+ return getConfigGroupCount(UTF8ToString($0)); -+ }, prefixCStr, bRecursive); -+ -+ return numGroups; -+} -+ -+// ---------------------------------------------------------------------------- -+// tests for existence -+// ---------------------------------------------------------------------------- -+ -+bool wxLocalStorageConfig::HasGroup(const wxString& key) const -+{ -+ const wxString groupKey = MakeGroupKey(key); -+ const char *keyCStr = static_cast((groupKey).mb_str(wxConvUTF8)); -+ -+ bool hasGroup = EM_ASM_INT({ -+ return hasConfigGroup(UTF8ToString($0)); -+ }, keyCStr); -+ -+ return hasGroup; -+} -+ -+bool wxLocalStorageConfig::HasEntry(const wxString& key) const -+{ -+ const wxString entryKey = MakeEntryKey(key); -+ const char *keyCStr = static_cast((entryKey).mb_str(wxConvUTF8)); -+ -+ bool hasEntry = EM_ASM_INT({ -+ return hasConfigEntry(UTF8ToString($0)); -+ }, keyCStr); -+ -+ return hasEntry; -+} -+ -+// ---------------------------------------------------------------------------- -+// reading/writing -+// ---------------------------------------------------------------------------- -+ -+bool wxLocalStorageConfig::DoReadString(const wxString& key, wxString *pstr) const -+{ -+ wxCHECK_MSG(pstr, false, wxT("wxLocalStorageConfig::Read(): NULL param")); -+ -+ const wxString entryKey = MakeEntryKey(key); -+ const char *keyCStr = static_cast((entryKey).mb_str(wxConvUTF8)); -+ -+ //printf("GetItem: %s\n", keyCStr); -+ -+ int length = EM_ASM_INT({ -+ return getConfigEntryLength(UTF8ToString($0)); -+ }, keyCStr); -+ -+ if (length == -1) -+ { -+ return false; -+ } -+ else if (length == 0) -+ { -+ pstr->Clear(); -+ return true; -+ } -+ else -+ { -+ char *valueCStr = new char[length + 1]; -+ valueCStr[0] = '\0'; -+ -+ EM_ASM({ -+ getConfigEntry(UTF8ToString($0), $1, $2); -+ }, keyCStr, valueCStr, length + 1); -+ -+ *pstr = valueCStr; -+ delete [] valueCStr; -+ -+ return true; -+ } -+} -+ -+bool wxLocalStorageConfig::DoReadLong(const wxString& key, long *pl) const -+{ -+ wxCHECK_MSG(pl, false, wxT("wxLocalStorageConfig::Read(): NULL param")); -+ -+ wxString str; -+ if (!Read(key, &str)) -+ return false; -+ -+ return str.ToLong(pl); -+} -+ -+bool wxLocalStorageConfig::DoReadBool(const wxString& key, bool *pb) const -+{ -+ wxCHECK_MSG(pb, false, wxT("wxLocalStorageConfig::Read(): NULL param")); -+ -+ wxString value; -+ -+ if (Read(key, &value)) -+ { -+ if (value == "true") -+ { -+ *pb = true; -+ return true; -+ } -+ else if (value == "false") -+ { -+ *pb = false; -+ return true; -+ } -+ else -+ { -+ wxLogWarning(_("Invalid value \"%s\" for a boolean key \"%s\" in " -+ "config file."), -+ value, key); -+ return false; -+ } -+ } -+ else -+ { -+ return false; -+ } -+} -+ -+#if wxUSE_BASE64 -+bool wxLocalStorageConfig::DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const -+{ -+ wxCHECK_MSG(buf, false, wxT("NULL buffer")); -+ -+ wxString value; -+ if (!Read(key, &value)) -+ return false; -+ -+ *buf = wxBase64Decode(value); -+ -+ return true; -+} -+#endif // wxUSE_BASE64 -+ -+bool wxLocalStorageConfig::DoWriteString(const wxString& key, const wxString& str) -+{ -+ const wxString entryKey = MakeEntryKey(key); -+ const char *keyCStr = static_cast((entryKey).mb_str(wxConvUTF8)); -+ const char *valueCStr = static_cast((str).mb_str(wxConvUTF8)); -+ -+ //printf("SetItem: %s=%s\n", keyCStr, valueCStr); -+ -+ EM_ASM({ -+ setConfigEntry(UTF8ToString($0), UTF8ToString($1)); -+ }, keyCStr, valueCStr); -+ -+ return true; -+} -+ -+bool wxLocalStorageConfig::DoWriteLong(const wxString& key, long l) -+{ -+ return Write(key, wxString::Format(wxT("%ld"), l)); -+} -+ -+bool wxLocalStorageConfig::DoWriteBool(const wxString& key, bool b) -+{ -+ return Write(key, b ? "true" : "false"); -+} -+ -+#if wxUSE_BASE64 -+bool wxLocalStorageConfig::DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf) -+{ -+ return Write(key, wxBase64Encode(buf)); -+} -+#endif // wxUSE_BASE64 -+ -+// ---------------------------------------------------------------------------- -+// renaming -+// ---------------------------------------------------------------------------- -+ -+bool wxLocalStorageConfig::RenameEntry(const wxString& oldName, const wxString& newName) -+{ -+ wxString value; -+ if (!Read(oldName, &value)) -+ { -+ return false; -+ } -+ else -+ { -+ if (Write(newName, value)) -+ { -+ DeleteEntry(oldName); -+ return true; -+ } -+ else -+ { -+ return false; -+ } -+ } -+ -+ return true; -+} -+ -+bool wxLocalStorageConfig::RenameGroup(const wxString& oldName, const wxString& newName) -+{ -+ const wxString oldGroupKey = MakeGroupKey(oldName); -+ const char *oldGroupKeyCStr = static_cast((oldGroupKey).mb_str(wxConvUTF8)); -+ -+ const wxString newGroupKey = MakeGroupKey(newName); -+ const char *newGroupKeyCStr = static_cast((newGroupKey).mb_str(wxConvUTF8)); -+ -+ bool retval = EM_ASM_INT({ -+ renameConfigGroup(UTF8ToString($0), UTF8ToString($1)); -+ }, oldGroupKeyCStr, newGroupKeyCStr); -+ -+ return retval; -+} -+ -+// ---------------------------------------------------------------------------- -+// deleting -+// ---------------------------------------------------------------------------- -+ -+bool wxLocalStorageConfig::DeleteEntry(const wxString& key, bool WXUNUSED(bGroupIfEmptyAlso)) -+{ -+ if (HasEntry(key)) -+ { -+ const wxString entryKey = MakeEntryKey(key); -+ const char *keyCStr = static_cast((entryKey).mb_str(wxConvUTF8)); -+ -+ EM_ASM({ -+ removeConfigEntry(UTF8ToString($0)); -+ }, keyCStr); -+ -+ return true; -+ } -+ else -+ { -+ return false; -+ } -+} -+ -+bool wxLocalStorageConfig::DeleteGroup(const wxString& key) -+{ -+ const wxString groupKey = MakeGroupKey(key); -+ const char *keyCStr = static_cast((groupKey).mb_str(wxConvUTF8)); -+ -+ bool groupDeleted = EM_ASM_INT({ -+ return removeConfigGroup(UTF8ToString($0)); -+ }, keyCStr); -+ -+ wxString path = GetPath(); -+ while (!HasGroup(path) && !path.empty()) -+ { -+ path = path.BeforeLast(wxCONFIG_PATH_SEPARATOR); -+ } -+ SetPath(path); -+ -+ return groupDeleted; -+} -+ -+bool wxLocalStorageConfig::DeleteAll() -+{ -+ EM_ASM({ -+ clearConfig(); -+ }); -+ return true; -+} -+ -+#endif // wxUSE_CONFIG -diff --git a/src/wasm/cursor.cpp b/src/wasm/cursor.cpp -new file mode 100644 -index 0000000000..c4bb9880f7 ---- /dev/null -+++ b/src/wasm/cursor.cpp -@@ -0,0 +1,342 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/cursor.cpp -+// Purpose: wxCursor implementation -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#include "wx/cursor.h" -+ -+#ifndef WX_PRECOMP -+#include "wx/window.h" -+#include "wx/image.h" -+#include "wx/bitmap.h" -+#include "wx/log.h" -+#endif // WX_PRECOMP -+ -+#include "wx/wasm/private.h" -+ -+#include -+ -+//----------------------------------------------------------------------------- -+// wxCursorRefData -+//----------------------------------------------------------------------------- -+ -+enum HTML5CursorType -+{ -+ HTML5_CURSOR_TYPE_CUSTOM = -1, -+ HTML5_CURSOR_TYPE_POINTER = 0, -+ HTML5_CURSOR_TYPE_CROSS = 1, -+ HTML5_CURSOR_TYPE_HAND = 2, -+ HTML5_CURSOR_TYPE_IBEAM = 3, -+ HTML5_CURSOR_TYPE_WAIT = 4, -+ HTML5_CURSOR_TYPE_HELP = 5, -+ HTML5_CURSOR_TYPE_EASTRESIZE = 6, -+ HTML5_CURSOR_TYPE_NORTHRESIZE = 7, -+ HTML5_CURSOR_TYPE_NORTHEASTRESIZE = 8, -+ HTML5_CURSOR_TYPE_NORTHWESTRESIZE = 9, -+ HTML5_CURSOR_TYPE_SOUTHRESIZE = 10, -+ HTML5_CURSOR_TYPE_SOUTHEASTRESIZE = 11, -+ HTML5_CURSOR_TYPE_SOUTHWESTRESIZE = 12, -+ HTML5_CURSOR_TYPE_WESTRESIZE = 13, -+ HTML5_CURSOR_TYPE_NORTHSOUTHRESIZE = 14, -+ HTML5_CURSOR_TYPE_EASTWESTRESIZE = 15, -+ HTML5_CURSOR_TYPE_NORTHEASTSOUTHWESTRESIZE = 16, -+ HTML5_CURSOR_TYPE_NORTHWESTSOUTHEASTRESIZE = 17, -+ HTML5_CURSOR_TYPE_COLUMNRESIZE = 18, -+ HTML5_CURSOR_TYPE_ROWRESIZE = 19, -+ HTML5_CURSOR_TYPE_MOVE = 20, -+ HTML5_CURSOR_TYPE_VERTICALTEXT = 21, -+ HTML5_CURSOR_TYPE_CELL = 22, -+ HTML5_CURSOR_TYPE_CONTEXTMENU = 23, -+ HTML5_CURSOR_TYPE_ALIAS = 24, -+ HTML5_CURSOR_TYPE_PROGRESS = 25, -+ HTML5_CURSOR_TYPE_NODROP = 26, -+ HTML5_CURSOR_TYPE_COPY = 27, -+ HTML5_CURSOR_TYPE_NONE = 28, -+ HTML5_CURSOR_TYPE_NOTALLOWED = 29, -+ HTML5_CURSOR_TYPE_ZOOMIN = 30, -+ HTML5_CURSOR_TYPE_ZOOMOUT = 31, -+ HTML5_CURSOR_TYPE_GRAB = 32, -+ HTML5_CURSOR_TYPE_GRABBING = 33 -+}; -+ -+HTML5CursorType wxCursorToHTML5Cursor(wxStockCursor wxCursorId) -+{ -+ HTML5CursorType html5Cursor = HTML5_CURSOR_TYPE_POINTER; -+ -+ switch (wxCursorId) -+ { -+ case wxCURSOR_NONE: -+ html5Cursor = HTML5_CURSOR_TYPE_NONE; -+ break; -+ case wxCURSOR_ARROW: -+ html5Cursor = HTML5_CURSOR_TYPE_POINTER; -+ break; -+ case wxCURSOR_RIGHT_ARROW: -+ html5Cursor = HTML5_CURSOR_TYPE_POINTER; -+ break; -+ case wxCURSOR_BULLSEYE: -+ break; -+ case wxCURSOR_CHAR: -+ html5Cursor = HTML5_CURSOR_TYPE_IBEAM; -+ break; -+ case wxCURSOR_CROSS: -+ html5Cursor = HTML5_CURSOR_TYPE_CROSS; -+ break; -+ case wxCURSOR_HAND: -+ html5Cursor = HTML5_CURSOR_TYPE_HAND; -+ break; -+ case wxCURSOR_IBEAM: -+ html5Cursor = HTML5_CURSOR_TYPE_IBEAM; -+ break; -+ case wxCURSOR_LEFT_BUTTON: -+ break; -+ case wxCURSOR_MAGNIFIER: -+ html5Cursor = HTML5_CURSOR_TYPE_IBEAM; -+ break; -+ case wxCURSOR_MIDDLE_BUTTON: -+ break; -+ case wxCURSOR_NO_ENTRY: -+ html5Cursor = HTML5_CURSOR_TYPE_NOTALLOWED; -+ break; -+ case wxCURSOR_PAINT_BRUSH: -+ break; -+ case wxCURSOR_PENCIL: -+ break; -+ case wxCURSOR_POINT_LEFT: -+ html5Cursor = HTML5_CURSOR_TYPE_WESTRESIZE; -+ break; -+ case wxCURSOR_POINT_RIGHT: -+ html5Cursor = HTML5_CURSOR_TYPE_EASTRESIZE; -+ break; -+ case wxCURSOR_QUESTION_ARROW: -+ html5Cursor = HTML5_CURSOR_TYPE_HELP; -+ break; -+ case wxCURSOR_RIGHT_BUTTON: -+ break; -+ case wxCURSOR_SIZENESW: -+ html5Cursor = HTML5_CURSOR_TYPE_NORTHEASTSOUTHWESTRESIZE; -+ break; -+ case wxCURSOR_SIZENS: -+ html5Cursor = HTML5_CURSOR_TYPE_NORTHSOUTHRESIZE; -+ break; -+ case wxCURSOR_SIZENWSE: -+ html5Cursor = HTML5_CURSOR_TYPE_NORTHWESTSOUTHEASTRESIZE; -+ break; -+ case wxCURSOR_SIZEWE: -+ html5Cursor = HTML5_CURSOR_TYPE_EASTWESTRESIZE; -+ break; -+ case wxCURSOR_SIZING: -+ html5Cursor = HTML5_CURSOR_TYPE_MOVE; -+ break; -+ case wxCURSOR_SPRAYCAN: -+ break; -+ case wxCURSOR_WAIT: -+ html5Cursor = HTML5_CURSOR_TYPE_WAIT; -+ break; -+ case wxCURSOR_WATCH: -+ html5Cursor = HTML5_CURSOR_TYPE_WAIT; -+ break; -+ case wxCURSOR_BLANK: -+ html5Cursor = HTML5_CURSOR_TYPE_NONE; -+ break; -+ case wxCURSOR_ARROWWAIT: -+ break; -+ case wxCURSOR_OPEN_HAND: -+ html5Cursor = HTML5_CURSOR_TYPE_GRAB; -+ break; -+ case wxCURSOR_CLOSED_HAND: -+ html5Cursor = HTML5_CURSOR_TYPE_GRABBING; -+ break; -+ default: -+ wxFAIL_MSG(wxT("Invalid cursor type")); -+ break; -+ } -+ -+ return html5Cursor; -+} -+ -+class wxCursorRefData: public wxGDIRefData -+{ -+public: -+ wxCursorRefData() : m_cursorType(HTML5_CURSOR_TYPE_POINTER) { } -+ wxCursorRefData(wxStockCursor cursorId) -+ : m_cursorType(wxCursorToHTML5Cursor(cursorId)), -+ m_hotSpotX(0), -+ m_hotSpotY(0) { } -+ wxCursorRefData(const wxBitmap& bitmap, int hotSpotX, int hotSpotY) -+ : m_cursorType(HTML5_CURSOR_TYPE_CUSTOM), -+ m_bitmap(bitmap), -+ m_hotSpotX(hotSpotX), -+ m_hotSpotY(hotSpotY) { } -+ wxCursorRefData(const wxCursorRefData& cursor) -+ { -+ m_cursorType = cursor.m_cursorType; -+ m_bitmap = cursor.m_bitmap; -+ m_hotSpotX = cursor.m_hotSpotX; -+ m_hotSpotY = cursor.m_hotSpotY; -+ } -+ wxCursorRefData(HTML5CursorType cursorType) -+ : m_cursorType(cursorType), -+ m_hotSpotX(0), -+ m_hotSpotY(0) { } -+ -+ virtual ~wxCursorRefData() { } -+ -+ HTML5CursorType GetCursorType() const { return m_cursorType; } -+ -+ bool HasBitmap() const { return m_bitmap.IsOk(); } -+ const wxBitmap& GetBitmap() { return m_bitmap; } -+ -+ int GetHotSpotX() const { return m_hotSpotX; } -+ int GetHotSpotY() const { return m_hotSpotY; } -+ -+private: -+ HTML5CursorType m_cursorType; -+ wxBitmap m_bitmap; -+ int m_hotSpotX; -+ int m_hotSpotY; -+}; -+ -+//----------------------------------------------------------------------------- -+// wxCursor -+//----------------------------------------------------------------------------- -+ -+#define M_CURSORDATA static_cast(m_refData) -+ -+IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxGDIObject) -+ -+wxCursor::wxCursor() -+{ -+} -+ -+#if wxUSE_IMAGE -+wxCursor::wxCursor(const wxImage &image) -+{ -+ InitFromImage(image); -+} -+ -+wxCursor::wxCursor(const wxString& filename, -+ wxBitmapType type, -+ int hotSpotX, int hotSpotY) -+{ -+ wxImage img; -+ bool retval = img.LoadFile(filename, type); -+ wxASSERT(retval); -+ -+ // eventually set the hotspot: -+ if (!img.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X)) -+ img.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, hotSpotX); -+ if (!img.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y)) -+ img.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, hotSpotY); -+ -+ InitFromImage(img); -+} -+#endif -+ -+wxCursor::wxCursor(const char WXUNUSED(bits)[], -+ int WXUNUSED(width), int WXUNUSED(height), -+ int WXUNUSED(hotSpotX), int WXUNUSED(hotSpotY), -+ const char WXUNUSED(maskBits)[]) -+{ -+ // TODO: implement -+ wxFAIL_MSG(wxT("wxCursor from XBM is not implemented")); -+} -+ -+wxCursor::wxCursor(int cursorType) -+{ -+ m_refData = new wxCursorRefData(static_cast(cursorType)); -+} -+ -+void wxCursor::Install() const -+{ -+ HTML5CursorType cursorType = M_CURSORDATA->GetCursorType(); -+ //printf("setcursor: %d\n", cursorType); -+ -+ if (cursorType != HTML5_CURSOR_TYPE_CUSTOM) -+ { -+ EM_ASM({ -+ setCursor($0); -+ }, cursorType); -+ } -+ else -+ { -+ M_CURSORDATA->GetBitmap().SyncToJs(); -+ -+ EM_ASM({ -+ setCursor($0, $1, $2, $3); -+ }, cursorType, -+ M_CURSORDATA->GetBitmap().GetJavascriptId(), -+ M_CURSORDATA->GetHotSpotX(), -+ M_CURSORDATA->GetHotSpotY()); -+ } -+} -+ -+void wxCursor::InitFromStock(wxStockCursor cursorId) -+{ -+ m_refData = new wxCursorRefData(cursorId); -+} -+ -+#if wxUSE_IMAGE -+void wxCursor::InitFromImage(const wxImage& image) -+{ -+ int hotSpotX = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X); -+ int hotSpotY = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y); -+ if (hotSpotX < 0 || hotSpotX > image.GetWidth()) hotSpotX = 0; -+ if (hotSpotY < 0 || hotSpotY > image.GetHeight()) hotSpotY = 0; -+ -+ m_refData = new wxCursorRefData(wxBitmap(image), hotSpotX, hotSpotY); -+} -+#endif -+ -+wxGDIRefData *wxCursor::CreateGDIRefData() const -+{ -+ return new wxCursorRefData(); -+} -+ -+wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const -+{ -+ return new wxCursorRefData(*static_cast(data)); -+} -+ -+wxCursor g_globalCursor; -+static wxCursor gs_storedCursor; -+static int gs_busyCount = 0; -+ -+void wxBeginBusyCursor(const wxCursor *cursor) -+{ -+ if (gs_busyCount++ == 0) -+ { -+ gs_storedCursor = g_globalCursor; -+ wxSetCursor(*cursor); -+ } -+} -+ -+void wxEndBusyCursor() -+{ -+ if (gs_busyCount && --gs_busyCount == 0) -+ { -+ wxSetCursor(gs_storedCursor); -+ gs_storedCursor = wxCursor(); -+ } -+} -+ -+bool wxIsBusy() -+{ -+ return gs_busyCount > 0; -+} -+ -+void wxSetCursor(const wxCursor& cursor) -+{ -+ cursor.Install(); -+ g_globalCursor = cursor; -+} -+ -+wxCursor wxGetCursor() -+{ -+ return g_globalCursor; -+} -diff --git a/src/wasm/dataobj.cpp b/src/wasm/dataobj.cpp -new file mode 100644 -index 0000000000..fd809ab71e ---- /dev/null -+++ b/src/wasm/dataobj.cpp -@@ -0,0 +1,364 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/dataobj.cpp -+// Purpose: wxDataObject implementation -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#if wxUSE_DATAOBJ -+ -+#include "wx/dataobj.h" -+ -+#ifndef WX_PRECOMP -+#endif // WX_PRECOMP -+ -+#include "wx/mstream.h" -+#include "wx/scopedarray.h" -+ -+#include -+ -+// ---------------------------------------------------------------------------- -+// wxDataFormat -+// ---------------------------------------------------------------------------- -+ -+wxDataFormat::wxDataFormat() -+ : m_type(wxDF_INVALID) -+{ -+} -+ -+wxDataFormat::wxDataFormat(wxDataFormatId type) -+ : m_type(type) -+{ -+} -+ -+wxDataFormat::wxDataFormat(const wxDataFormat& format) -+{ -+ *this = format; -+} -+ -+wxDataFormat& wxDataFormat::operator=(const wxDataFormat& format) -+{ -+ m_type = format.m_type; -+ m_id = format.m_id; -+ return *this; -+} -+ -+bool wxDataFormat::operator==(wxDataFormat format) const -+{ -+ return m_type == format.m_type && m_id == format.m_id; -+} -+ -+bool wxDataFormat::operator!=(wxDataFormat format) const -+{ -+ return m_type != format.m_type || m_id != format.m_id; -+} -+ -+bool wxDataFormat::operator==(wxDataFormatId type) const -+{ -+ return m_type == type; -+} -+ -+bool wxDataFormat::operator!=(wxDataFormatId type) const -+{ -+ return m_type != type; -+} -+ -+wxString wxDataFormat::GetId() const -+{ -+ wxCHECK_MSG(m_type == wxDF_PRIVATE, wxEmptyString, -+ wxT("id invalid for standard format")); -+ return m_id; -+} -+ -+void wxDataFormat::SetId(const wxString& id) -+{ -+ m_type = wxDF_PRIVATE; -+ m_id = id; -+} -+ -+wxDataFormatId wxDataFormat::GetType() const -+{ -+ return m_type; -+} -+ -+void wxDataFormat::SetType(wxDataFormatId type) -+{ -+ m_type = type; -+ if (m_type != wxDF_PRIVATE) -+ { -+ m_id = wxEmptyString; -+ } -+} -+ -+void wxDataFormat::InitFromString(const wxString& id) -+{ -+ SetId(id); -+} -+ -+// ---------------------------------------------------------------------------- -+// wxDataObject -+// ---------------------------------------------------------------------------- -+ -+wxDataFormat wxDataObject::GetPreferredFormatForObject(const wxDataObject& obj, -+ Direction dir) const -+{ -+ Direction otherDir; -+ switch (dir) -+ { -+ case Get: -+ otherDir = Set; -+ break; -+ case Set: -+ otherDir = Get; -+ break; -+ case Both: -+ otherDir = Both; -+ break; -+ } -+ -+ wxDataFormat preferredFormat = GetPreferredFormat(dir); -+ if (obj.IsSupported(preferredFormat, otherDir)) -+ { -+ return preferredFormat; -+ } -+ -+ wxDataFormat otherPreferredFormat = obj.GetPreferredFormat(otherDir); -+ if (IsSupported(otherPreferredFormat, dir)) -+ { -+ return otherPreferredFormat; -+ } -+ -+ size_t formatCount = GetFormatCount(); -+ wxDataFormat *formats = new wxDataFormat[formatCount]; -+ GetAllFormats(formats, dir); -+ -+ wxDataFormat format(wxDF_INVALID); -+ for (size_t i = 0; i < formatCount; ++i) -+ { -+ if (obj.IsSupported(formats[i], otherDir)) -+ { -+ format = formats[i]; -+ break; -+ } -+ } -+ -+ delete [] formats; -+ -+ return format; -+} -+ -+wxDataFormat wxDataObject::GetSupportedFormatInSource(wxDataObject *source) const -+{ -+ wxDataFormat format; -+ size_t formatcount = source->GetFormatCount(); -+ wxScopedArray array(formatcount); -+ -+ source->GetAllFormats( array.get() ); -+ for (size_t i = 0; i < formatcount; i++) -+ { -+ wxDataFormat testFormat = array[i]; -+ if ( IsSupported( testFormat, wxDataObject::Set ) ) -+ { -+ format = testFormat; -+ break; -+ } -+ } -+ return format; -+} -+ -+// ---------------------------------------------------------------------------- -+// wxBitmapDataObject -+// ---------------------------------------------------------------------------- -+ -+wxBitmapDataObject::wxBitmapDataObject() -+{ -+ Init(); -+} -+ -+wxBitmapDataObject::wxBitmapDataObject(const wxBitmap& bitmap) -+ : wxBitmapDataObjectBase(bitmap) -+{ -+ Init(); -+ -+ DoConvertToPng(); -+} -+ -+wxBitmapDataObject::~wxBitmapDataObject() -+{ -+ Clear(); -+} -+ -+void wxBitmapDataObject::SetBitmap( const wxBitmap &bitmap ) -+{ -+ ClearAll(); -+ -+ wxBitmapDataObjectBase::SetBitmap(bitmap); -+ -+ DoConvertToPng(); -+} -+ -+bool wxBitmapDataObject::GetDataHere(void *buf) const -+{ -+ if ( !m_pngSize ) -+ { -+ wxFAIL_MSG( wxT("attempt to copy empty bitmap failed") ); -+ -+ return false; -+ } -+ -+ memcpy(buf, m_pngData, m_pngSize); -+ -+ return true; -+} -+ -+bool wxBitmapDataObject::SetData(size_t size, const void *buf) -+{ -+ Clear(); -+ -+ wxCHECK_MSG( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL, -+ false, wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") ); -+ -+ m_pngSize = size; -+ m_pngData = new char[m_pngSize]; -+ -+ memcpy(m_pngData, buf, m_pngSize); -+ -+ wxMemoryInputStream mstream((char*) m_pngData, m_pngSize); -+ wxImage image; -+ if ( !image.LoadFile( mstream, wxBITMAP_TYPE_PNG ) ) -+ { -+ return false; -+ } -+ -+ m_bitmap = wxBitmap(image); -+ -+ return m_bitmap.IsOk(); -+} -+ -+void wxBitmapDataObject::DoConvertToPng() -+{ -+ if ( !m_bitmap.IsOk() ) -+ return; -+ -+ wxCHECK_RET( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL, -+ wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") ); -+ -+ wxImage image = m_bitmap.ConvertToImage(); -+ -+ wxCountingOutputStream count; -+ image.SaveFile(count, wxBITMAP_TYPE_PNG); -+ -+ m_pngSize = count.GetSize() + 100; // sometimes the size seems to vary ??? -+ m_pngData = new char[m_pngSize]; -+ -+ wxMemoryOutputStream mstream((char*) m_pngData, m_pngSize); -+ image.SaveFile(mstream, wxBITMAP_TYPE_PNG); -+} -+ -+// ---------------------------------------------------------------------------- -+// wxFileDataObject -+// ---------------------------------------------------------------------------- -+ -+void wxFileDataObject::AddFile(const wxString &filename) -+{ -+ m_filenames.Add(filename); -+} -+ -+size_t wxFileDataObject::GetDataSize() const -+{ -+ size_t count = m_filenames.GetCount(); -+ size_t size = sizeof(count); -+ -+ for (size_t i = 0; i < count; ++i) -+ { -+ const wxScopedCharBuffer filename(m_filenames[i].utf8_str()); -+ size_t length = filename.length(); -+ -+ size += sizeof(length) + length; -+ } -+ -+ return size; -+} -+ -+bool wxFileDataObject::GetDataHere(void *buf) const -+{ -+ if (!buf) -+ { -+ return false; -+ } -+ -+ char* bufptr = static_cast(buf); -+ -+ size_t count = m_filenames.GetCount(); -+ memcpy(bufptr, &count, sizeof(count)); -+ bufptr += sizeof(count); -+ -+ for (size_t i = 0; i < count; ++i) -+ { -+ const wxScopedCharBuffer filename(m_filenames[i].utf8_str()); -+ if (!filename) -+ { -+ return false; -+ } -+ -+ size_t length = filename.length(); -+ -+ memcpy(bufptr, &length, sizeof(length)); -+ bufptr += sizeof(length); -+ memcpy(bufptr, filename, length); -+ bufptr += length; -+ } -+ -+ return true; -+} -+ -+bool wxFileDataObject::SetData(size_t len, const void *buf) -+{ -+ m_filenames.Clear(); -+ -+ if (!buf) -+ { -+ return false; -+ } -+ -+ const char* bufptr = static_cast(buf); -+ int bytesLeft = len; -+ -+ size_t count; -+ if (bytesLeft < sizeof(count)) -+ { -+ return false; -+ } -+ memcpy(&count, bufptr, sizeof(count)); -+ bufptr += sizeof(count); -+ bytesLeft -= sizeof(count); -+ -+ for (size_t i = 0; i < count; ++i) -+ { -+ size_t length; -+ if (bytesLeft < sizeof(length)) -+ { -+ return false; -+ } -+ memcpy(&length, bufptr, sizeof(length)); -+ bufptr += sizeof(length); -+ bytesLeft -= sizeof(length); -+ -+ if (bytesLeft < length) -+ { -+ return false; -+ } -+ wxString filename = wxString::FromUTF8(bufptr, length); -+ bufptr += length; -+ bytesLeft -= length; -+ -+ m_filenames.Add(filename); -+ } -+ -+ return true; -+} -+ -+#endif // wxUSE_DATAOBJ -diff --git a/src/wasm/dc.cpp b/src/wasm/dc.cpp -new file mode 100644 -index 0000000000..d9249f4f15 ---- /dev/null -+++ b/src/wasm/dc.cpp -@@ -0,0 +1,591 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/dc.cpp -+// Purpose: wxDC implementation -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#include -+ -+#include "wx/app.h" -+#include "wx/wasm/dc.h" -+#include "wx/wasm/private/display.h" -+ -+#include -+ -+// ---------------------------------------------------------------------------- -+// wxWasmDCImpl -+// ---------------------------------------------------------------------------- -+ -+IMPLEMENT_ABSTRACT_CLASS(wxWasmDCImpl, wxDCImpl) -+ -+wxWasmDCImpl::wxWasmDCImpl(wxDC *owner) -+ : wxDCImpl(owner), -+ m_jsId(-1), -+ m_fontDirty(true) -+{ -+ m_ok = false; -+ -+ m_pen = *wxBLACK_PEN; -+ m_font = *wxNORMAL_FONT; -+ m_brush = *wxWHITE_BRUSH; -+ m_backgroundBrush = *wxWHITE_BRUSH; -+} -+ -+void wxWasmDCImpl::Clear() -+{ -+ wxCHECK_RET(IsOk(), wxT("invalid dc")); -+ -+ wxSize size = GetSize(); -+ -+ EM_ASM({ -+ clearRect($0, $1, $2, $3); -+ }, GetJavascriptId(), -+ LogicalToDeviceXRel(size.x), -+ LogicalToDeviceYRel(size.y), -+ m_backgroundBrush.GetColour().GetRGBA()); -+} -+ -+void wxWasmDCImpl::SetFont(const wxFont& font) -+{ -+ m_font = font; -+ m_fontDirty = true; -+} -+ -+enum HTML5LineJoin -+{ -+ HTML5_LINE_JOIN_ROUND = 0, -+ HTML5_LINE_JOIN_BEVEL = 1, -+ HTML5_LINE_JOIN_MITER = 2 -+}; -+ -+enum HTML5LineCap -+{ -+ HTML5_LINE_CAP_BUTT = 0, -+ HTML5_LINE_CAP_ROUND = 1, -+ HTML5_LINE_CAP_SQUARE = 2 -+}; -+ -+HTML5LineJoin wxPenJoinToHTML5LineJoin(wxPenJoin penJoin) -+{ -+ switch (penJoin) -+ { -+ case wxJOIN_BEVEL: -+ return HTML5_LINE_JOIN_BEVEL; -+ break; -+ case wxJOIN_MITER: -+ return HTML5_LINE_JOIN_MITER; -+ break; -+ case wxJOIN_ROUND: -+ return HTML5_LINE_JOIN_ROUND; -+ break; -+ default: -+ wxFAIL_MSG(wxT("Invalid pen join")); -+ return HTML5_LINE_JOIN_ROUND; -+ break; -+ } -+} -+ -+HTML5LineCap wxPenCapToHTML5LineCap(wxPenCap penCap) -+{ -+ switch (penCap) -+ { -+ case wxCAP_ROUND: -+ return HTML5_LINE_CAP_ROUND; -+ break; -+ case wxCAP_PROJECTING: -+ return HTML5_LINE_CAP_SQUARE; -+ break; -+ case wxCAP_BUTT: -+ return HTML5_LINE_CAP_BUTT; -+ break; -+ default: -+ wxFAIL_MSG(wxT("Invalid pen cap")); -+ return HTML5_LINE_CAP_ROUND; -+ break; -+ } -+} -+ -+void wxWasmDCImpl::SetPen(const wxPen& pen) -+{ -+ if (pen != m_pen) -+ { -+ m_pen = pen; -+ -+ int bitmapId = -1; -+ -+ if (m_pen.GetStyle() == wxPENSTYLE_STIPPLE) -+ { -+ wxBitmap *stippleBitmap = m_pen.GetStipple(); -+ wxASSERT_MSG(stippleBitmap != NULL, "stipple pen without bitmap"); -+ -+ stippleBitmap->SyncToJs(); -+ bitmapId = stippleBitmap->GetJavascriptId(); -+ } -+ -+ EM_ASM({ -+ setPen($0, $1, $2, $3, $4, $5, $6, $7); -+ }, GetJavascriptId(), -+ m_pen.GetColour().GetRGBA(), -+ m_pen.GetWidth(), -+ wxPenJoinToHTML5LineJoin(m_pen.GetJoin()), -+ wxPenCapToHTML5LineCap(m_pen.GetCap()), -+ m_pen.GetDashCount(), -+ m_pen.GetDash(), -+ bitmapId); -+ } -+} -+ -+void wxWasmDCImpl::SetBrush(const wxBrush& brush) -+{ -+ m_brush = brush; -+ -+ int bitmapId = -1; -+ -+ if (m_brush.GetStyle() == wxBRUSHSTYLE_STIPPLE) -+ { -+ wxBitmap *stippleBitmap = m_brush.GetStipple(); -+ wxASSERT_MSG(stippleBitmap != NULL, "stipple brush without bitmap"); -+ -+ stippleBitmap->SyncToJs(); -+ bitmapId = stippleBitmap->GetJavascriptId(); -+ } -+ -+ EM_ASM({ -+ setBrush($0, $1, $2); -+ }, GetJavascriptId(), m_brush.GetColour().GetRGBA(), bitmapId); -+} -+ -+void wxWasmDCImpl::SetBackground(const wxBrush& brush) -+{ -+ m_backgroundBrush = brush; -+} -+ -+void wxWasmDCImpl::SetPalette(const wxPalette& WXUNUSED(palette)) -+{ -+ // TODO: implement -+ wxFAIL_MSG(wxT("SetPalette is not implemented")); -+} -+ -+wxCoord wxWasmDCImpl::GetCharWidth() const -+{ -+ wxCoord charWidth; -+ m_font.GetCharSize(&charWidth, NULL); -+ return charWidth; -+} -+ -+wxCoord wxWasmDCImpl::GetCharHeight() const -+{ -+ wxCoord charHeight; -+ m_font.GetCharSize(NULL, &charHeight); -+ return charHeight; -+} -+ -+void wxWasmDCImpl::DoGetTextExtent(const wxString& string, -+ wxCoord *x, wxCoord *y, -+ wxCoord *descent, -+ wxCoord *externalLeading, -+ const wxFont *theFont) const -+{ -+ const wxFont *font = theFont != NULL ? theFont : &m_font; -+ font->GetTextExtent(string, x, y, descent, externalLeading); -+} -+ -+bool wxWasmDCImpl::CanDrawBitmap() const -+{ -+ return true; -+} -+ -+bool wxWasmDCImpl::CanGetTextExtent() const -+{ -+ return true; -+} -+ -+int wxWasmDCImpl::GetDepth() const -+{ -+ return 32; -+} -+ -+wxSize wxWasmDCImpl::GetPPI() const -+{ -+ return wxSize(static_cast(m_mm_to_pix_x * 25.4 + 0.5), -+ static_cast(m_mm_to_pix_y * 25.4 + 0.5)); -+} -+ -+void wxWasmDCImpl::DoGetSizeMM(int* width, int* height) const -+{ -+ int wPixels, hPixels; -+ DoGetSize(&wPixels, &hPixels); -+ -+ if (width) -+ { -+ *width = wPixels / m_mm_to_pix_x; -+ } -+ if (height) -+ { -+ *height = hPixels / m_mm_to_pix_y; -+ } -+} -+ -+void wxWasmDCImpl::SetLogicalFunction(wxRasterOperationMode WXUNUSED(function)) -+{ -+ // TODO: implement -+ //wxFAIL_MSG(wxT("SetLogicalFunction is not implemented")); -+} -+ -+void wxWasmDCImpl::SetTextForeground(const wxColour& colour) -+{ -+ m_textForegroundColour = colour; -+} -+ -+void wxWasmDCImpl::SetTextBackground(const wxColour& colour) -+{ -+ m_textBackgroundColour = colour; -+} -+ -+void wxWasmDCImpl::DoSetDeviceClippingRegion(const wxRegion& region) -+{ -+ // TODO: implement for non-rectangular regions -+ wxRect rect = region.GetBox(); -+ -+ EM_ASM({ -+ clipRect($0, $1, $2, $3, $4); -+ }, GetJavascriptId(), rect.x, rect.y, rect.width, rect.height); -+} -+ -+void wxWasmDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, -+ wxCoord width, wxCoord height) -+{ -+ wxDCImpl::DoSetClippingRegion(x, y, width, height); -+ -+ EM_ASM({ -+ clipRect($0, $1, $2, $3, $4); -+ }, GetJavascriptId(), -+ LogicalToDeviceDoubleX(m_clipX1), -+ LogicalToDeviceDoubleY(m_clipY1), -+ LogicalToDeviceXRel(m_clipX2 - m_clipX1), -+ LogicalToDeviceYRel(m_clipY2 - m_clipY1)); -+} -+ -+void wxWasmDCImpl::DestroyClippingRegion() -+{ -+ m_clipping = false; -+ -+ EM_ASM({ -+ destroyClip($0); -+ }, GetJavascriptId()); -+} -+ -+bool wxWasmDCImpl::DoGetPixel(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxColour *WXUNUSED(col)) const -+{ -+ wxCHECK_MSG(IsOk(), false, wxT("invalid dc")); -+ // TODO: implement -+ wxFAIL_MSG(wxT("DoGetPixel is not implemented")); -+ -+ return true; -+} -+ -+void wxWasmDCImpl::DoDrawPoint(wxCoord x, wxCoord y) -+{ -+ wxCHECK_RET(IsOk(), wxT("invalid dc")); -+ -+ if (m_pen.IsNonTransparent()) -+ { -+ EM_ASM({ -+ drawPoint($0, $1, $2); -+ }, GetJavascriptId(), LogicalToDeviceDoubleX(x), LogicalToDeviceDoubleY(y)); -+ } -+} -+ -+void wxWasmDCImpl::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) -+{ -+ wxCHECK_RET(IsOk(), wxT("invalid dc")); -+ -+ if (m_pen.IsNonTransparent()) -+ { -+ EM_ASM({ -+ drawLine($0, $1, $2, $3, $4); -+ }, GetJavascriptId(), -+ LogicalToDeviceDoubleX(x1), -+ LogicalToDeviceDoubleY(y1), -+ LogicalToDeviceDoubleX(x2), -+ LogicalToDeviceDoubleY(y2)); -+ } -+} -+ -+void wxWasmDCImpl::DoDrawLines(int n, const wxPoint points[], -+ wxCoord xoffset, wxCoord yoffset) -+{ -+ wxCHECK_RET(IsOk(), wxT("invalid dc")); -+ -+ if (n > 0 && m_pen.IsNonTransparent()) -+ { -+ int coords[2 * n]; -+ -+ for (int i = 0, j = 0; i < n; i++) -+ { -+ coords[j++] = LogicalToDeviceDoubleX(points[i].x + xoffset); -+ coords[j++] = LogicalToDeviceDoubleY(points[i].y + yoffset); -+ } -+ -+ EM_ASM({ -+ drawLines($0, $1, $2); -+ }, GetJavascriptId(), n, coords); -+ } -+} -+ -+void wxWasmDCImpl::DoDrawPolygon(int n, const wxPoint points[], -+ wxCoord xoffset, wxCoord yoffset, -+ wxPolygonFillMode fillMode) -+{ -+ wxCHECK_RET(IsOk(), wxT("invalid dc")); -+ -+ if (n > 0) -+ { -+ int coords[2 * n]; -+ -+ for (int i = 0, j = 0; i < n; i++) -+ { -+ coords[j++] = LogicalToDeviceDoubleX(points[i].x + xoffset); -+ coords[j++] = LogicalToDeviceDoubleY(points[i].y + yoffset); -+ } -+ -+ EM_ASM({ -+ drawPolygon($0, $1, $2, $3, $4, $5); -+ }, GetJavascriptId(), -+ n, -+ coords, -+ fillMode == wxODDEVEN_RULE, -+ m_brush.IsNonTransparent(), -+ m_pen.IsNonTransparent()); -+ } -+} -+ -+void wxWasmDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, -+ wxCoord width, wxCoord height) -+{ -+ wxCHECK_RET(IsOk(), wxT("invalid dc")); -+ -+ EM_ASM({ -+ drawRect($0, $1, $2, $3, $4, $5, $6); -+ }, GetJavascriptId(), -+ LogicalToDeviceDoubleX(x), -+ LogicalToDeviceDoubleY(y), -+ LogicalToDeviceXRel(width), -+ LogicalToDeviceYRel(height), -+ m_brush.IsNonTransparent(), -+ m_pen.IsNonTransparent()); -+} -+ -+void wxWasmDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, -+ wxCoord width, wxCoord height, -+ double radius) -+{ -+ wxCHECK_RET(IsOk(), wxT("invalid dc")); -+ -+ EM_ASM({ -+ drawRoundedRect($0, $1, $2, $3, $4, $5, $6, $7); -+ }, GetJavascriptId(), -+ LogicalToDeviceDoubleX(x), -+ LogicalToDeviceDoubleY(y), -+ LogicalToDeviceXRel(width), -+ LogicalToDeviceYRel(height), -+ radius, -+ m_brush.IsNonTransparent(), -+ m_pen.IsNonTransparent()); -+} -+ -+void wxWasmDCImpl::DoDrawEllipse(wxCoord x, wxCoord y, -+ wxCoord width, wxCoord height) -+{ -+ wxCHECK_RET(IsOk(), wxT("invalid dc")); -+ -+ EM_ASM({ -+ drawEllipse($0, $1, $2, $3, $4, $5, $6); -+ }, GetJavascriptId(), -+ LogicalToDeviceDoubleX(x), -+ LogicalToDeviceDoubleY(y), -+ LogicalToDeviceXRel(width), -+ LogicalToDeviceYRel(height), -+ m_brush.IsNonTransparent(), -+ m_pen.IsNonTransparent()); -+} -+ -+void wxWasmDCImpl::DoDrawArc(wxCoord x1, wxCoord y1, -+ wxCoord x2, wxCoord y2, -+ wxCoord xc, wxCoord yc) -+{ -+ wxCHECK_RET(IsOk(), wxT("invalid dc")); -+ -+ double dx1 = x1 - xc; -+ double dy1 = y1 - yc; -+ double radius = sqrt(dx1 * dx1 + dy1 * dy1); -+ double startAngle = atan2(dy1, dx1); -+ double endAngle = atan2(y2 - yc, x2 - xc); -+ -+ EM_ASM({ -+ drawArc($0, $1, $2, $3, $4, $5, $6, $7); -+ }, GetJavascriptId(), -+ LogicalToDeviceDoubleX(xc), -+ LogicalToDeviceDoubleY(yc), -+ radius, -+ startAngle, -+ endAngle, -+ m_brush.IsNonTransparent(), -+ m_pen.IsNonTransparent()); -+} -+ -+void wxWasmDCImpl::DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, -+ double startAngle, double endAngle) -+{ -+ wxCHECK_RET(IsOk(), wxT("invalid dc")); -+ -+ EM_ASM({ -+ drawEllipticArc($0, $1, $2, $3, $4, $5, $6, $7, $8); -+ }, GetJavascriptId(), -+ LogicalToDeviceDoubleX(x), -+ LogicalToDeviceDoubleY(y), -+ LogicalToDeviceXRel(w), -+ LogicalToDeviceYRel(h), -+ startAngle, -+ endAngle, -+ m_brush.IsNonTransparent(), -+ m_pen.IsNonTransparent()); -+} -+ -+void wxWasmDCImpl::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) -+{ -+ wxBitmap bitmap; -+ bitmap.CopyFromIcon(icon); -+ DoDrawBitmap(bitmap, x, y); -+} -+ -+void wxWasmDCImpl::DoDrawBitmap(const wxBitmap &bitmap, wxCoord x, wxCoord y, -+ bool WXUNUSED(useMask)) -+{ -+ wxCHECK_RET(IsOk(), wxT("invalid dc")); -+ -+ bitmap.SyncToJs(); -+ -+ EM_ASM({ -+ drawBitmap($0, $1, $2, $3); -+ }, GetJavascriptId(), -+ bitmap.GetJavascriptId(), -+ LogicalToDeviceDoubleX(x), -+ LogicalToDeviceDoubleY(y)); -+} -+ -+bool wxWasmDCImpl::DoBlit(wxCoord xdest, wxCoord ydest, -+ wxCoord width, wxCoord height, -+ wxDC *source, -+ wxCoord xsrc, wxCoord ysrc, -+ wxRasterOperationMode WXUNUSED(rop), -+ bool WXUNUSED(useMask), -+ wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask)) -+{ -+ wxCHECK_MSG(IsOk(), false, wxT("invalid dc")); -+ -+ wxWasmDCImpl *srcImpl = static_cast(source->GetImpl()); -+ -+ EM_ASM({ -+ blit($0, $1, $2, $3, $4, $5, $6, $7); -+ }, srcImpl->GetJavascriptId(), -+ GetJavascriptId(), -+ xsrc, ysrc, -+ width, height, -+ xdest, ydest); -+ -+ return true; -+} -+ -+void wxWasmDCImpl::DoCrossHair(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) -+{ -+ // TODO: implement -+ wxFAIL_MSG(wxT("DoCrossHair is not implemented")); -+} -+ -+void wxWasmDCImpl::DoDrawText(const wxString& text, wxCoord x, wxCoord y) -+{ -+ wxCHECK_RET(IsOk(), wxT("invalid dc")); -+ -+ if (m_fontDirty) -+ { -+ wxString fontInfoDesc = m_font.GetNativeFontInfoDesc(); -+ const char *fontString = fontInfoDesc.utf8_str(); -+ -+ // TODO: set underline and strikethrough when context supports textDecoration attribute -+ EM_ASM({ -+ setFont($0, UTF8ToString($1)); -+ }, GetJavascriptId(), fontString); -+ -+ m_fontDirty = false; -+ } -+ -+ const char *s = text.utf8_str(); -+ -+ wxCoord devX = LogicalToDeviceDoubleX(x); -+ wxCoord devY = LogicalToDeviceDoubleY(y); -+ -+ wxCoord textWidth; -+ wxCoord textHeight; -+ -+ DoGetTextExtent(text, &textWidth, &textHeight); -+ -+ if (m_backgroundMode == wxSOLID && m_textBackgroundColour.Alpha() != 0) -+ { -+ wxBrush saveBrush = m_brush; -+ SetBrush(m_textBackgroundColour); -+ -+ EM_ASM({ -+ drawRect($0, $1, $2, $3, $4, $5, $6); -+ }, GetJavascriptId(), -+ devX, -+ devY, -+ LogicalToDeviceXRel(textWidth), -+ LogicalToDeviceYRel(textHeight), -+ true, -+ false); -+ -+ SetBrush(saveBrush); -+ } -+ -+ wxCoord textY = devY + textHeight * (5.0 / 6.0); -+ -+ EM_ASM({ -+ drawText($0, UTF8ToString($1), $2, $3, $4); -+ }, GetJavascriptId(), s, devX, textY, m_textForegroundColour.GetRGBA()); -+} -+ -+void wxWasmDCImpl::DoDrawRotatedText(const wxString& text, -+ wxCoord x, wxCoord y, -+ double angle) -+{ -+ wxCHECK_RET(IsOk(), wxT("invalid dc")); -+ -+ wxCoord devX = LogicalToDeviceDoubleX(x); -+ wxCoord devY = LogicalToDeviceDoubleY(y); -+ -+ EM_ASM({ -+ rotateAtPoint($0, $1, $2, $3); -+ }, GetJavascriptId(), devX, devY, angle); -+ -+ DoDrawText(text, 0, 0); -+ -+ EM_ASM({ -+ clearRotation($0); -+ }, GetJavascriptId(), devX, devY, angle); -+} -+ -+bool wxWasmDCImpl::DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), -+ const wxColour& WXUNUSED(col), -+ wxFloodFillStyle WXUNUSED(style)) -+{ -+ wxCHECK_MSG(IsOk(), false, wxT("invalid dc")); -+ // TODO: implement -+ wxFAIL_MSG(wxT("DoFloodFill is not implemented")); -+ -+ return true; -+} -diff --git a/src/wasm/dcclient.cpp b/src/wasm/dcclient.cpp -new file mode 100644 -index 0000000000..38d578cd7e ---- /dev/null -+++ b/src/wasm/dcclient.cpp -@@ -0,0 +1,154 @@ -+ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/dcclient.cpp -+// Purpose: wxClientDC implementation -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#include "wx/wasm/dcclient.h" -+ -+#include "wx/app.h" -+#include "wx/nonownedwnd.h" -+#include "wx/window.h" -+#include "wx/wasm/private/display.h" -+ -+#include -+ -+// ---------------------------------------------------------------------------- -+// wxWindowDCImpl -+// ---------------------------------------------------------------------------- -+ -+IMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxWasmDCImpl) -+ -+wxWindowDCImpl::wxWindowDCImpl(wxDC *owner, wxWindow *win, bool isClient) -+ : wxWasmDCImpl(owner) -+{ -+ wxASSERT(win); -+ -+ m_window = win; -+ m_contentScaleFactor = wxContentScaleFactor(); -+ -+ if (win->IsTopLevel()) -+ { -+ if (isClient) -+ Create(wxRect(win->GetClientAreaOrigin(), win->GetSize())); -+ else -+ Create(wxRect(wxPoint(0, 0), win->GetSize())); -+ } -+ else -+ { -+ wxRect origRect(win->GetPosition(), win->GetSize()); -+ -+ wxRect parentRect = origRect; -+ wxPoint origin = win->GetClientAreaOrigin(); -+ -+ if (isClient) -+ { -+ origRect.width -= origin.x; -+ origRect.height -= origin.y; -+ } -+ else -+ { -+ origRect.x -= origin.x; -+ origRect.y -= origin.y; -+ } -+ -+ wxRect clipRect = origRect; -+ wxWindow* child; -+ wxWindow* parent; -+ -+ for (child = win, parent = win->GetParent(); -+ !parent->IsTopLevel(); -+ child = parent, parent = parent->GetParent()) -+ { -+ parentRect.Offset(-child->GetPosition()); -+ parentRect.Offset(-child->GetClientAreaOrigin()); -+ parentRect.SetSize(parent->GetSize()); -+ -+ wxPoint origin = parent->GetClientAreaOrigin(); -+ parentRect.width -= origin.x; -+ parentRect.height -= origin.y; -+ -+ clipRect.Intersect(parentRect); -+ } -+ -+ parentRect.Offset(-child->GetPosition()); -+ parentRect.Offset(-child->GetClientAreaOrigin()); -+ // TODO: we should clip for top-level rect, but wxUniversal renders -+ // the menu bar and toolbars in the top-level window's non-client area. -+ parentRect.Offset(-parent->GetClientAreaOrigin()); -+ -+ if (origRect.x == clipRect.x && origRect.y == clipRect.y) -+ { -+ clipRect.x = origRect.x - parentRect.x; -+ clipRect.y = origRect.y - parentRect.y; -+ } -+ else -+ { -+ SetDeviceOrigin(origRect.x - clipRect.x, origRect.y - clipRect.y); -+ clipRect.x -= parentRect.x; -+ clipRect.y -= parentRect.y; -+ } -+ -+ Create(clipRect); -+ } -+} -+ -+wxWindowDCImpl::~wxWindowDCImpl(void) -+{ -+ EM_ASM({ -+ destroyWindowContext($0); -+ }, GetJavascriptId()); -+} -+ -+void wxWindowDCImpl::Create(const wxRect& rect) -+{ -+ int windowId = m_window->GetTopLevelWindow()->GetCSSId(); -+ -+ int jsId = EM_ASM_INT({ -+ return createWindowContext($0, $1, $2, $3, $4, $5); -+ }, windowId, rect.x, rect.y, rect.width, rect.height, m_contentScaleFactor); -+ -+ SetJavascriptId(jsId); -+} -+ -+void wxWindowDCImpl::DoGetSize(int *width, int *height) const -+{ -+ wxCHECK_RET(IsOk(), wxT("invalid dc")); -+ -+ m_window->GetSize(width, height); -+} -+ -+// ---------------------------------------------------------------------------- -+// wxClientDCImpl -+// ---------------------------------------------------------------------------- -+ -+IMPLEMENT_ABSTRACT_CLASS(wxClientDCImpl, wxWindowDCImpl) -+ -+wxClientDCImpl::wxClientDCImpl(wxDC *owner, wxWindow *win) -+ : wxWindowDCImpl(owner, win, true) -+{ -+} -+ -+wxClientDCImpl::~wxClientDCImpl(void) -+{ -+} -+ -+// ---------------------------------------------------------------------------- -+// wxPaintDCImpl -+// ---------------------------------------------------------------------------- -+ -+IMPLEMENT_ABSTRACT_CLASS(wxPaintDCImpl, wxClientDCImpl) -+ -+wxPaintDCImpl::wxPaintDCImpl(wxDC *owner, wxWindow *win) -+ : wxClientDCImpl(owner, win) -+{ -+} -+ -+wxPaintDCImpl::~wxPaintDCImpl(void) -+{ -+} -diff --git a/src/wasm/dcmemory.cpp b/src/wasm/dcmemory.cpp -new file mode 100644 -index 0000000000..cfea46a650 ---- /dev/null -+++ b/src/wasm/dcmemory.cpp -@@ -0,0 +1,98 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/dcmemory.cpp -+// Purpose: wxMemoryDC implementation -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#include "wx/wasm/dcmemory.h" -+ -+#include -+ -+// ---------------------------------------------------------------------------- -+// wxMemoryDCImpl -+// ---------------------------------------------------------------------------- -+ -+IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxWasmDCImpl) -+ -+wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC *owner) -+ : wxWasmDCImpl(owner) -+{ -+ Init(); -+} -+ -+wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC *owner, wxBitmap& bitmap) -+ : wxWasmDCImpl(owner) -+{ -+ Init(); -+ DoSelect(bitmap); -+} -+ -+wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC *owner, wxDC *dc) -+ : wxWasmDCImpl(owner) -+{ -+ Init(); -+ m_contentScaleFactor = dc->GetContentScaleFactor(); -+} -+ -+wxMemoryDCImpl::~wxMemoryDCImpl(void) -+{ -+ Deselect(); -+} -+ -+void wxMemoryDCImpl::Init() -+{ -+ m_ok = false; -+} -+ -+void wxMemoryDCImpl::DoGetSize(int *width, int *height) const -+{ -+ wxCHECK_RET(IsOk(), wxT("invalid dc")); -+ -+ if (width) -+ { -+ *width = m_bitmap.GetWidth(); -+ } -+ if (height) -+ { -+ *height = m_bitmap.GetHeight(); -+ } -+} -+ -+void wxMemoryDCImpl::DoSelect(const wxBitmap& bitmap) -+{ -+ Deselect(); -+ -+ m_bitmap = bitmap; -+ m_contentScaleFactor = bitmap.IsOk() ? bitmap.GetScaleFactor() : 1.0; -+ -+ if (m_bitmap.IsOk()) -+ { -+ m_bitmap.SyncToJs(); -+ -+ int jsId = EM_ASM_INT({ -+ return createMemoryContext($0, $1); -+ }, m_bitmap.GetJavascriptId(), GetContentScaleFactor()); -+ -+ SetJavascriptId(jsId); -+ m_ok = true; -+ } -+} -+ -+void wxMemoryDCImpl::Deselect() -+{ -+ if (m_bitmap.IsOk()) -+ { -+ EM_ASM({ -+ destroyMemoryContext($0); -+ }, GetJavascriptId()); -+ -+ SetJavascriptId(-1); -+ m_ok = false; -+ } -+} -+ -+// TODO: wrap drawing methods and SyncToJs the selected bitmap -diff --git a/src/wasm/dcscreen.cpp b/src/wasm/dcscreen.cpp -new file mode 100644 -index 0000000000..c09ea08ad9 ---- /dev/null -+++ b/src/wasm/dcscreen.cpp -@@ -0,0 +1,54 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/dcscreen.cpp -+// Purpose: wxScreenDC implementation -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#include "wx/wasm/dcscreen.h" -+ -+#include "wx/app.h" -+#include "wx/nonownedwnd.h" -+#include "wx/wasm/private/display.h" -+ -+#include -+ -+// ---------------------------------------------------------------------------- -+// wxScreenDCImpl -+// ---------------------------------------------------------------------------- -+ -+IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWasmDCImpl) -+ -+wxScreenDCImpl::wxScreenDCImpl(wxScreenDC *owner) -+ : wxWasmDCImpl(owner) -+{ -+ m_contentScaleFactor = wxContentScaleFactor(); -+ -+ wxNonOwnedWindow *topWindow = wxTheApp->GetTopWindow()->GetTopLevelWindow(); -+ wxSize size = topWindow->GetSize(); -+ -+ int windowId = topWindow->GetCSSId(); -+ -+ int jsId = EM_ASM_INT({ -+ return createWindowContext($0, $1, $2, $3, $4, $5); -+ }, windowId, 0, 0, size.x, size.y, m_contentScaleFactor); -+ -+ SetJavascriptId(jsId); -+} -+ -+wxScreenDCImpl::~wxScreenDCImpl(void) -+{ -+ EM_ASM({ -+ destroyWindowContext($0); -+ }, GetJavascriptId()); -+} -+ -+void wxScreenDCImpl::DoGetSize(int *width, int *height) const -+{ -+ wxCHECK_RET(IsOk(), wxT("invalid dc")); -+ -+ wxTheApp->GetTopWindow()->GetSize(width, height); -+} -diff --git a/src/wasm/display.cpp b/src/wasm/display.cpp -new file mode 100644 -index 0000000000..7e5eda4f20 ---- /dev/null -+++ b/src/wasm/display.cpp -@@ -0,0 +1,110 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: src/wasm/private.cpp -+// Purpose wxWasm private classes -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#ifndef WX_PRECOMP -+#include "wx/app.h" -+#endif // WX_PRECOMP -+ -+#include "wx/display.h" -+#include "wx/private/display.h" -+#include "wx/wasm/private/display.h" -+ -+#include -+#include -+ -+double GetDevicePixelRatio() -+{ -+ return emscripten_get_device_pixel_ratio(); -+} -+ -+int GetScreenWidth() -+{ -+ return EM_ASM_INT({ -+ return mainWindow.offsetWidth; -+ }); -+} -+ -+int GetScreenHeight() -+{ -+ return EM_ASM_INT({ -+ return mainWindow.offsetHeight; -+ }); -+} -+ -+// =========================================================================== -+// wxWasmDisplay -+// =========================================================================== -+ -+wxWasmDisplay::wxWasmDisplay() -+ : m_screenSize(GetScreenWidth(), GetScreenHeight()), -+ m_deviceScaleFactor(GetDevicePixelRatio()), -+ m_contentScaleFactor(m_deviceScaleFactor >= 1.5 ? 2.0 : 1.0) -+{ -+} -+ -+void wxWasmDisplay::UpdateScaleFactor() -+{ -+ m_deviceScaleFactor = GetDevicePixelRatio(); -+ m_contentScaleFactor = m_deviceScaleFactor >= 1.5 ? 2.0 : 1.0; -+} -+ -+const int DEFAULT_DEPTH = 32; -+ -+// ---------------------------------------------------------------------------- -+// display characteristics -+// ---------------------------------------------------------------------------- -+ -+class wxDisplayImplSingleWasm : public wxDisplayImplSingle -+{ -+public: -+ virtual wxRect GetGeometry() const wxOVERRIDE -+ { -+ wxSize screenSize = wxTheApp->GetDisplay()->GetScreenSize(); -+ return wxRect(0, 0, screenSize.x, screenSize.y); -+ } -+ -+ virtual int GetDepth() const wxOVERRIDE -+ { -+ return DEFAULT_DEPTH; -+ } -+ -+ virtual wxSize GetPPI() const wxOVERRIDE -+ { -+ // CSS reference pixel size is 1/96 in -+ // see http://www.w3.org/TR/css3-values/#reference-pixel -+ const double ppi = 96.0; -+ return wxSize(ppi, ppi); -+ } -+}; -+ -+double wxDisplayScaleFactor() -+{ -+ return wxTheApp->GetDisplay()->GetDeviceScaleFactor(); -+} -+ -+double wxContentScaleFactor() -+{ -+ return wxTheApp->GetDisplay()->GetContentScaleFactor(); -+} -+ -+class wxDisplayFactorySingleWasm : public wxDisplayFactorySingle -+{ -+protected: -+ virtual wxDisplayImpl *CreateSingleDisplay() -+ { -+ return new wxDisplayImplSingleWasm(); -+ } -+}; -+ -+wxDisplayFactory *wxDisplay::CreateFactory() -+{ -+ return new wxDisplayFactorySingleWasm(); -+} -+ -diff --git a/src/wasm/dnd.cpp b/src/wasm/dnd.cpp -new file mode 100644 -index 0000000000..5583efb594 ---- /dev/null -+++ b/src/wasm/dnd.cpp -@@ -0,0 +1,375 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/dnd.cpp -+// Purpose: wxDropTaraget implementation -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#if wxUSE_DRAG_AND_DROP -+ -+#include "wx/app.h" -+#include "wx/dnd.h" -+#include "wx/window.h" -+ -+#include "wx/evtloop.h" -+ -+#ifndef WX_PRECOMP -+#endif // WX_PRECOMP -+ -+// ---------------------------------------------------------------------------- -+// wxDropSource -+// ---------------------------------------------------------------------------- -+ -+namespace -+{ -+ -+wxDropSource *g_dropSource = NULL; -+wxDataObject *g_dataObject = NULL; -+ -+wxCursor defaultDragNoneCursor(26); -+wxCursor defaultDragCopyCursor(27); -+wxCursor defaultDragMoveCursor(27); -+ -+} // anonymous namespace -+ -+wxDropSource::wxDropSource(wxWindow *WXUNUSED(win), -+ const wxCursor ©, -+ const wxCursor &move, -+ const wxCursor &none) -+ : wxDropSourceBase(copy, move, none), -+ m_dropFlags(0), -+ m_overWindow(NULL), -+ m_lastMouseEventValid(false) -+{ -+} -+ -+wxDropSource::~wxDropSource() -+{ -+} -+ -+void wxDropSource::StartDrag() -+{ -+ wxASSERT(!IsDragInProgress()); -+ -+ g_dropSource = this; -+ g_dataObject = GetDataObject(); -+ -+ m_lastMouseEventValid = false; -+ -+ m_startCursor = wxGetCursor(); -+ -+ m_startPosition = wxGetMousePosition(); -+ m_overWindow = wxTheApp->GetMouseWindow(m_startPosition); -+ -+ wxDragResult desiredResult = wxDragNone; -+ if (m_overWindow != NULL && m_overWindow->GetDropTarget() != NULL) -+ { -+ desiredResult = m_overWindow->GetDropTarget()->OnEnter( -+ m_startPosition.x, -+ m_startPosition.y, -+ GetDefaultDragResult()); -+ } -+ -+ UpdateDesiredDragResult(desiredResult); -+} -+ -+void wxDropSource::EndDrag(wxDragResult result) -+{ -+ wxASSERT(IsDragInProgress()); -+ -+ g_dropSource = NULL; -+ g_dataObject = NULL; -+ -+ wxSetCursor(m_startCursor); -+ -+ if (m_lastMouseEventValid && -+ m_lastMouseEvent.GetPosition() != m_startPosition) -+ { -+ //printf("drop sending mouse update event\n"); -+ // Generate a motion event to bring app up to date with mouse position. -+ wxMouseEvent mouseEvent(m_lastMouseEvent); -+ mouseEvent.SetEventType(wxEVT_MOTION); -+ mouseEvent.m_clickCount = 0; -+ wxTheApp->HandleMouseEvent(&mouseEvent); -+ } -+ -+ m_lastMouseEventValid = false; -+ m_overWindow = NULL; -+ -+ OnDragResult(result); -+} -+ -+const wxCursor& wxDropSource::GetCursor(wxDragResult res) const -+{ -+ const wxCursor& cursor = wxDropSourceBase::GetCursor(res); -+ -+ // If cursor not set, use default. -+ if (cursor.IsSameAs(wxNullCursor)) -+ { -+ switch (res) -+ { -+ case wxDragCopy: -+ return defaultDragCopyCursor; -+ break; -+ case wxDragMove: -+ return defaultDragMoveCursor; -+ break; -+ default: -+ return defaultDragNoneCursor; -+ break; -+ } -+ } -+ return cursor; -+} -+ -+bool wxDropSource::UseAlternateResult() -+{ -+ return wxKeyboardState().CmdDown(); -+} -+ -+wxDragResult wxDropSource::GetDefaultDragResult() -+{ -+ if (m_dropFlags & wxDrag_CopyOnly) -+ { -+ return wxDragCopy; -+ } -+ else if (m_dropFlags & wxDrag_DefaultMove) -+ { -+ return UseAlternateResult() ? wxDragCopy : wxDragMove; -+ } -+ else -+ { -+ return UseAlternateResult() ? wxDragMove : wxDragCopy; -+ } -+} -+ -+void wxDropSource::UpdateDesiredDragResult(wxDragResult desiredResult) -+{ -+ GiveFeedback(desiredResult); -+ -+ m_desiredResult = desiredResult; -+ wxCursor cursor = GetCursor(desiredResult); -+ wxSetCursor(cursor); -+} -+ -+bool wxDropSource::HandleMouseEvent(wxMouseEvent *event, wxDragResult *result) -+{ -+ //printf("drop mouse event: %d\n", event->GetEventType()); -+ -+ m_lastMouseEvent = *event; -+ m_lastMouseEventValid = true; -+ -+ wxPoint mousePosition = event->GetPosition(); -+ wxWindow *window = wxTheApp->GetMouseWindow(mousePosition); -+ wxPoint clientMousePosition = -+ window != NULL ? window->ScreenToClient(mousePosition) : mousePosition; -+ -+ wxTheApp->UpdateMouseState(*event); -+ -+ wxMouseState mouseState; -+ wxTheApp->GetMouseState(&mouseState); -+ -+ if (window != m_overWindow) -+ { -+ //printf("drop window changed\n"); -+ if (m_overWindow != NULL && m_overWindow->GetDropTarget() != NULL) -+ { -+ m_overWindow->GetDropTarget()->OnLeave(); -+ } -+ m_overWindow = window; -+ -+ wxDragResult desiredResult = wxDragNone; -+ -+ if (m_overWindow != NULL && m_overWindow->GetDropTarget() != NULL) -+ { -+ desiredResult = m_overWindow->GetDropTarget()->OnEnter( -+ clientMousePosition.x, -+ clientMousePosition.y, -+ GetDefaultDragResult()); -+ } -+ -+ if (desiredResult == wxDragCancel || desiredResult == wxDragError) -+ { -+ *result = desiredResult; -+ return true; -+ } -+ if (desiredResult != m_desiredResult) -+ { -+ //printf("drop target result: %d\n", desiredResult); -+ UpdateDesiredDragResult(desiredResult); -+ } -+ } -+ -+ if (event->GetEventType() == wxEVT_MOTION) -+ { -+ if (m_overWindow != NULL && m_overWindow->GetDropTarget() != NULL) -+ { -+ wxDragResult desiredResult = m_overWindow->GetDropTarget()->OnDragOver( -+ clientMousePosition.x, -+ clientMousePosition.y, -+ GetDefaultDragResult()); -+ -+ if (desiredResult == wxDragCancel || desiredResult == wxDragError) -+ { -+ *result = desiredResult; -+ return true; -+ } -+ if (desiredResult != m_desiredResult) -+ { -+ //printf("drop target result: %d\n", desiredResult); -+ UpdateDesiredDragResult(desiredResult); -+ } -+ } -+ } -+ -+ if (!event->LeftIsDown()) -+ { -+ if (m_overWindow != NULL && -+ m_overWindow->GetDropTarget() != NULL && -+ m_desiredResult != wxDragNone) -+ { -+ bool accept = m_overWindow->GetDropTarget()->OnDrop( -+ clientMousePosition.x, -+ clientMousePosition.y); -+ //printf("drop target accept: %d\n", accept); -+ if (accept) -+ { -+ *result = m_overWindow->GetDropTarget()->OnData( -+ clientMousePosition.x, -+ clientMousePosition.y, -+ GetDefaultDragResult()); -+ } -+ else -+ { -+ *result = wxDragNone; -+ } -+ } -+ else -+ { -+ *result = wxDragNone; -+ } -+ //printf("drop ending\n"); -+ return true; -+ } -+ -+ return false; -+} -+ -+wxDragResult wxDropSource::DoDragDrop(int flags) -+{ -+ //printf("DoDragDrop enter\n"); -+ -+ m_dropFlags = flags; -+ -+ if (IsDragInProgress() || !wxTheApp) -+ { -+ return wxDragNone; -+ } -+ -+ wxMouseState mouseState; -+ wxTheApp->GetMouseState(&mouseState); -+ -+ if (!mouseState.LeftIsDown()) -+ { -+ return wxDragNone; -+ } -+ -+ StartDrag(); -+ -+ //printf("DoDragDrop exit\n"); -+ return wxDragNone; -+} -+ -+/* static */ -+bool wxDropSource::IsDragInProgress() -+{ -+ return g_dropSource != NULL; -+} -+ -+/* static */ -+void wxDropSource::HandleMouseEvent(wxMouseEvent* event) -+{ -+ wxASSERT(IsDragInProgress()); -+ -+ wxDragResult result = wxDragNone; -+ -+ if (g_dropSource->HandleMouseEvent(event, &result)) -+ { -+ g_dropSource->EndDrag(result); -+ } -+} -+ -+ -+// ---------------------------------------------------------------------------- -+// wxDropTarget -+// ---------------------------------------------------------------------------- -+ -+wxDropTarget::wxDropTarget(wxDataObject *WXUNUSED(dataObject)) -+{ -+} -+ -+wxDataFormat wxDropTarget::GetMatchingPair() -+{ -+ wxDataFormat supported(wxDF_INVALID); -+ if (m_dataObject != NULL) -+ { -+ if (g_dropSource) -+ { -+ wxDataObject* data = g_dropSource->GetDataObject(); -+ -+ if ( data ) -+ { -+ supported = m_dataObject->GetSupportedFormatInSource(data); -+ } -+ } -+ } -+ -+ return supported; -+} -+ -+bool wxDropTarget::OnDrop(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) -+{ -+ if (g_dataObject == NULL) -+ { -+ return false; -+ } -+ return true; -+} -+ -+wxDragResult wxDropTarget::OnData(wxCoord WXUNUSED(x), -+ wxCoord WXUNUSED(y), -+ wxDragResult def) -+{ -+ return GetData() ? def : wxDragNone; -+} -+ -+bool wxDropTarget::GetData() -+{ -+ if (m_dataObject == NULL || g_dataObject == NULL) -+ { -+ return false; -+ } -+ -+ wxDataFormat format = m_dataObject->GetPreferredFormatForObject( -+ *g_dataObject, -+ wxDataObjectBase::Set); -+ -+ if (format.GetType() == wxDF_INVALID) -+ { -+ return false; -+ } -+ size_t size = g_dataObject->GetDataSize(format); -+ wxScopedCharBuffer buffer = wxScopedCharBuffer::CreateOwned(static_cast(malloc(size)), size); -+ -+ if (!g_dataObject->GetDataHere(format, buffer.data())) -+ { -+ return false; -+ } -+ -+ return m_dataObject->SetData(format, size, buffer.data()); -+} -+ -+#endif // wxUSE_DRAG_AND_DROP -diff --git a/src/wasm/evtloop.cpp b/src/wasm/evtloop.cpp -new file mode 100644 -index 0000000000..777db1da31 ---- /dev/null -+++ b/src/wasm/evtloop.cpp -@@ -0,0 +1,110 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/evtloop.cpp -+// Purpose: wxGUIEventLoop implementation -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#include "wx/app.h" -+#include "wx/evtloop.h" -+#include "wx/toplevel.h" -+ -+#include -+ -+extern "C" { -+ -+ void EMSCRIPTEN_KEEPALIVE ProcessEvents() -+ { -+ static int counter = 0; -+ -+ if (wxTheApp) -+ { -+ wxTheApp->ProcessPendingEvents(); -+ wxTheApp->Paint(); -+ if (counter++ % 3 == 0) -+ { -+ wxTheApp->ProcessIdle(); -+ } -+ } -+ } -+ -+} // extern "C" -+ -+// ---------------------------------------------------------------------------- -+// wxGUIEventLoop -+// ---------------------------------------------------------------------------- -+ -+void wxGUIEventLoop::ScheduleExit(int WXUNUSED(rc)) -+{ -+ wxCHECK_RET( IsInsideRun(), wxT("can't call ScheduleExit() if not started") ); -+ -+ m_shouldExit = true; -+ -+ // Deschedules requestAnimationFrame, but does not resume execution in DoRun -+ // -+ // See https://emscripten.org/docs/api_reference/emscripten.h.html#c.emscripten_cancel_main_loop -+ emscripten_cancel_main_loop(); -+} -+ -+bool wxGUIEventLoop::Pending() const -+{ -+ return wxTheApp && wxTheApp->HasPendingEvents(); -+} -+ -+bool wxGUIEventLoop::Dispatch() -+{ -+ ProcessEvents(); -+ return true; -+} -+ -+int wxGUIEventLoop::DispatchTimeout(unsigned long WXUNUSED(timeout)) -+{ -+ // TODO: implement -+ wxFAIL_MSG(wxT("DispatchTimeout is not implemented")); -+ return 0; -+} -+ -+void wxGUIEventLoop::WakeUp() -+{ -+ // noop: browser doesn't block -+} -+ -+void wxGUIEventLoop::DoYieldFor(long eventsToProcess) -+{ -+ while (Pending()) -+ { -+ Dispatch(); -+ } -+ -+ wxEventLoopBase::DoYieldFor(eventsToProcess); -+} -+ -+int wxGUIEventLoop::DoRun() -+{ -+ wxASSERT_MSG(IsOk(), wxT("invalid event loop")); -+ -+ if (!wxTopLevelWindows.empty()) -+ { -+ wxWindow *topWindow = wxTopLevelWindows.front(); -+ -+ int width = EM_ASM_INT({ -+ return window.innerWidth; -+ }); -+ int height = EM_ASM_INT({ -+ return window.innerHeight - mainWindow.offsetTop; -+ }); -+ topWindow->SetSize(0, 0, width, height); -+ topWindow->Refresh(); -+ } -+ -+ // Simulates an infinite loop by throwing an exception to prevent -+ // execution from continuing after this function call. -+ // -+ // See https://emscripten.org/docs/api_reference/emscripten.h.html#c.emscripten_set_main_loop -+ emscripten_set_main_loop(ProcessEvents, 0, 1); -+ -+ return 0; -+} -diff --git a/src/wasm/font.cpp b/src/wasm/font.cpp -new file mode 100644 -index 0000000000..31d2d97aaf ---- /dev/null -+++ b/src/wasm/font.cpp -@@ -0,0 +1,480 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/font.cpp -+// Purpose: wxFont implementation -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#include "wx/font.h" -+#include "wx/fontutil.h" -+ -+#ifndef WX_PRECOMP -+#endif // WX_PRECOMP -+ -+#include -+ -+static const float DEFAULT_POINT_SIZE = 10; -+ -+namespace -+{ -+ -+const char* GetStyleString(wxFontStyle style) -+{ -+ switch (style) -+ { -+ case wxFONTSTYLE_NORMAL: -+ return "normal"; -+ break; -+ case wxFONTSTYLE_ITALIC: -+ return "italic"; -+ break; -+ case wxFONTSTYLE_SLANT: -+ return "oblique"; -+ break; -+ default: -+ wxFAIL_MSG("invalid font style"); -+ return "normal"; -+ break; -+ } -+} -+ -+const char* GetFamilyString(wxFontFamily family) -+{ -+ switch (family) -+ { -+ case wxFONTFAMILY_DEFAULT: -+ return "Open Sans, sans-serif"; -+ break; -+ case wxFONTFAMILY_DECORATIVE: -+ return "cursive"; -+ break; -+ case wxFONTFAMILY_ROMAN: -+ return "serif"; -+ break; -+ case wxFONTFAMILY_SCRIPT: -+ return "cursive"; -+ break; -+ case wxFONTFAMILY_SWISS: -+ return "Open Sans, sans-serif"; -+ break; -+ case wxFONTFAMILY_MODERN: -+ return "monospace"; -+ break; -+ case wxFONTFAMILY_TELETYPE: -+ return "monospace"; -+ break; -+ case wxFONTFAMILY_MAX: -+ wxFAIL_MSG("invalid font family"); -+ return "serif"; -+ break; -+ } -+} -+ -+} // anonymous namespace -+ -+// ---------------------------------------------------------------------------- -+// wxFontRefData -+// ---------------------------------------------------------------------------- -+ -+class wxFontRefData : public wxGDIRefData -+{ -+public: -+ wxFontRefData() -+ { -+ m_nativeFontInfo.SetFractionalPointSize(DEFAULT_POINT_SIZE); -+ } -+ wxFontRefData(const wxFontInfo& info) -+ { -+ m_nativeFontInfo.SetFaceName(info.GetFaceName()); -+ m_nativeFontInfo.SetFamily(info.GetFamily()); -+ // TODO: support font size in pixels -+ if (info.IsUsingSizeInPixels()) -+ { -+ m_nativeFontInfo.SetFractionalPointSize(info.GetPixelSize().y); -+ } -+ else -+ { -+ m_nativeFontInfo.SetFractionalPointSize(info.GetFractionalPointSize()); -+ } -+ m_nativeFontInfo.SetStyle(info.GetStyle()); -+ m_nativeFontInfo.SetWeight(info.GetWeight()); -+ m_nativeFontInfo.SetUnderlined(info.IsUnderlined()); -+ m_nativeFontInfo.SetStrikethrough(info.IsStrikethrough()); -+ } -+ -+ wxFontRefData(const wxFontRefData& data) -+ { -+ m_nativeFontInfo = data.m_nativeFontInfo; -+ } -+ -+ const wxNativeFontInfo *GetNativeFontInfo() const -+ { -+ return &m_nativeFontInfo; -+ } -+ -+ void SetNativeFontInfo(const wxNativeFontInfo& info) -+ { -+ m_nativeFontInfo = info; -+ } -+ -+ void GetTextExtent(const wxString &string, -+ wxCoord *x, wxCoord *y, -+ wxCoord *descent, -+ wxCoord *externalLeading) const; -+ -+ wxNativeFontInfo m_nativeFontInfo; -+}; -+ -+void wxNativeFontInfo::SetFractionalPointSize(double pointsize) -+{ -+ if (pointsize != pointSize) -+ { -+ pointSize = pointsize; -+ m_isRendered = false; -+ } -+} -+ -+void wxNativeFontInfo::SetStyle(wxFontStyle style_) -+{ -+ if (style_ != style) -+ { -+ style = style_; -+ m_isRendered = false; -+ } -+} -+ -+void wxNativeFontInfo::SetNumericWeight(int weight_) -+{ -+ if (weight_ != weight) -+ { -+ weight = weight_; -+ m_isRendered = false; -+ } -+} -+ -+void wxNativeFontInfo::SetUnderlined(bool underlined_) -+{ -+ if (underlined_ != underlined) -+ { -+ underlined = underlined_; -+ m_isRendered = false; -+ } -+} -+ -+void wxNativeFontInfo::SetStrikethrough(bool strikethrough_) -+{ -+ if (strikethrough_ != strikethrough) -+ { -+ strikethrough = strikethrough_; -+ m_isRendered = false; -+ } -+} -+ -+bool wxNativeFontInfo::SetFaceName(const wxString& facename_) -+{ -+ if (facename_ != faceName) -+ { -+ faceName = facename_; -+ m_isRendered = false; -+ } -+ -+ return true; -+} -+ -+void wxNativeFontInfo::SetFamily(wxFontFamily family_) -+{ -+ if (family_ != family) -+ { -+ family = family_; -+ m_isRendered = false; -+ } -+} -+ -+void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding_) -+{ -+ if (encoding_ != encoding) -+ { -+ encoding = encoding_; -+ m_isRendered = false; -+ } -+} -+ -+bool wxNativeFontInfo::FromString(const wxString& WXUNUSED(s)) -+{ -+ return false; -+} -+ -+wxString wxNativeFontInfo::ToString() const -+{ -+ if (!m_isRendered) -+ { -+ wxString fontFaceAndFamily; -+ if (GetFaceName().empty()) -+ { -+ fontFaceAndFamily = GetFamilyString(GetFamily()); -+ } -+ else -+ { -+ fontFaceAndFamily = wxString::Format("\"%s\", %s", -+ GetFaceName(), -+ GetFamilyString(GetFamily())); -+ } -+ -+ m_renderedString = wxString::Format(wxT("%s %d %fpt/1 %s"), -+ GetStyleString(GetStyle()), -+ GetNumericWeight(), -+ GetFractionalPointSize(), -+ fontFaceAndFamily.utf8_str()); -+ m_isRendered = true; -+ } -+ return m_renderedString; -+} -+ -+void wxFontRefData::GetTextExtent(const wxString &string, -+ wxCoord *x, wxCoord *y, -+ wxCoord *descent, -+ wxCoord *externalLeading) const -+{ -+ wxString fontInfoDesc = m_nativeFontInfo.ToString(); -+ const char *fontString = fontInfoDesc.utf8_str(); -+ -+ const char *s = string.utf8_str(); -+ -+ if (x != NULL) -+ { -+ *x = EM_ASM_INT({ -+ return measureText(UTF8ToString($0), UTF8ToString($1)); -+ }, s, fontString); -+ } -+ -+ if (y != NULL) -+ { -+ *y = static_cast(round(1.6 * m_nativeFontInfo.GetFractionalPointSize())); -+ } -+ -+ if (descent != NULL) -+ { -+ *descent = 0; -+ } -+ -+ if (externalLeading != NULL) -+ { -+ *externalLeading = 0; -+ } -+} -+ -+//----------------------------------------------------------------------------- -+// wxFont -+//----------------------------------------------------------------------------- -+ -+#define M_FONTDATA ((wxFontRefData*)m_refData) -+#define M_FONTINFO (M_FONTDATA->m_nativeFontInfo) -+ -+wxFont::wxFont() -+{ -+ m_refData = new wxFontRefData(); -+} -+ -+wxFont::wxFont(const wxFontInfo& info) -+{ -+ m_refData = new wxFontRefData(info); -+} -+ -+wxFont::wxFont(const wxString& nativeFontInfoString) -+{ -+ wxNativeFontInfo info; -+ if (info.FromString(nativeFontInfoString)) -+ { -+ wxFontRefData *fontRefData = new wxFontRefData(); -+ m_refData = fontRefData; -+ fontRefData->SetNativeFontInfo(info); -+ } -+} -+ -+wxFont::wxFont(const wxNativeFontInfo& info) -+{ -+ M_FONTINFO = info; -+} -+ -+wxFont::wxFont(int size, -+ wxFontFamily family, -+ wxFontStyle style, -+ wxFontWeight weight, -+ bool underlined, -+ const wxString& face, -+ wxFontEncoding encoding) -+{ -+ Create(size, family, style, weight, underlined, face, encoding); -+} -+ -+wxFont::wxFont(const wxSize& pixelSize, -+ wxFontFamily family, -+ wxFontStyle style, -+ wxFontWeight weight, -+ bool underlined, -+ const wxString& face, -+ wxFontEncoding encoding) -+{ -+ Create(pixelSize.GetHeight(), family, style, weight, underlined, face, encoding); -+} -+ -+wxFont::~wxFont() -+{ -+} -+ -+bool wxFont::Create(int size, -+ wxFontFamily family, -+ wxFontStyle style, -+ wxFontWeight weight, -+ bool underlined, -+ const wxString& face, -+ wxFontEncoding encoding) -+{ -+ UnRef(); -+ -+ m_refData = new wxFontRefData( -+ InfoFromLegacyParams(size, family, style, weight, underlined, face, encoding)); -+ -+ return true; -+} -+ -+// implement base class pure virtuals -+double wxFont::GetFractionalPointSize() const -+{ -+ wxCHECK_MSG(IsOk(), 0, wxT("invalid font")); -+ return M_FONTINFO.GetFractionalPointSize(); -+} -+ -+wxFontStyle wxFont::GetStyle() const -+{ -+ wxCHECK_MSG(IsOk(), wxFONTSTYLE_NORMAL, wxT("invalid font")); -+ return M_FONTINFO.GetStyle(); -+} -+ -+wxFontWeight wxFont::GetWeight() const -+{ -+ wxCHECK_MSG(IsOk(), wxFONTWEIGHT_NORMAL, wxT("invalid font")); -+ return M_FONTINFO.GetWeight(); -+} -+ -+int wxFont::GetNumericWeight() const -+{ -+ wxCHECK_MSG(IsOk(), false, wxT("invalid font")); -+ return M_FONTINFO.GetNumericWeight(); -+} -+ -+bool wxFont::GetUnderlined() const -+{ -+ wxCHECK_MSG(IsOk(), false, wxT("invalid font")); -+ return M_FONTINFO.GetUnderlined(); -+} -+ -+bool wxFont::GetStrikethrough() const -+{ -+ wxCHECK_MSG(IsOk(), false, wxT("invalid font")); -+ return M_FONTINFO.GetStrikethrough(); -+} -+ -+wxString wxFont::GetFaceName() const -+{ -+ wxCHECK_MSG(IsOk(), wxEmptyString, wxT("invalid font")); -+ return M_FONTINFO.GetFaceName(); -+} -+ -+wxFontEncoding wxFont::GetEncoding() const -+{ -+ wxCHECK_MSG(IsOk(), wxFONTENCODING_DEFAULT, wxT("invalid font")); -+ return M_FONTINFO.GetEncoding(); -+} -+ -+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const -+{ -+ wxCHECK_MSG(IsOk(), NULL, wxT("invalid font")); -+ return &M_FONTINFO; -+} -+ -+wxFontFamily wxFont::DoGetFamily() const -+{ -+ wxCHECK_MSG(IsOk(), wxFONTFAMILY_DEFAULT, wxT("invalid font")); -+ return M_FONTINFO.GetFamily(); -+} -+ -+void wxFont::SetFractionalPointSize(double pointSize) -+{ -+ AllocExclusive(); -+ M_FONTINFO.SetFractionalPointSize(pointSize); -+} -+ -+void wxFont::SetFamily(wxFontFamily family) -+{ -+ AllocExclusive(); -+ M_FONTINFO.SetFamily(family); -+} -+ -+void wxFont::SetStyle(wxFontStyle style) -+{ -+ AllocExclusive(); -+ M_FONTINFO.SetStyle(style); -+} -+ -+void wxFont::SetWeight(wxFontWeight weight) -+{ -+ AllocExclusive(); -+ M_FONTINFO.SetWeight(weight); -+} -+ -+void wxFont::SetNumericWeight(int weight) -+{ -+ AllocExclusive(); -+ M_FONTINFO.SetNumericWeight(weight); -+} -+ -+void wxFont::SetUnderlined(bool underlined) -+{ -+ AllocExclusive(); -+ M_FONTINFO.SetUnderlined(underlined); -+} -+ -+void wxFont::SetStrikethrough(bool strikethrough) -+{ -+ AllocExclusive(); -+ M_FONTINFO.SetStrikethrough(strikethrough); -+} -+ -+bool wxFont::SetFaceName(const wxString& faceName) -+{ -+ AllocExclusive(); -+ return M_FONTINFO.SetFaceName(faceName); -+} -+ -+void wxFont::SetEncoding(wxFontEncoding encoding) -+{ -+ AllocExclusive(); -+ return M_FONTINFO.SetEncoding(encoding); -+} -+ -+wxGDIRefData* wxFont::CreateGDIRefData() const -+{ -+ return new wxFontRefData(); -+} -+ -+wxGDIRefData* wxFont::CloneGDIRefData(const wxGDIRefData* data) const -+{ -+ return new wxFontRefData(*static_cast(data)); -+} -+ -+void wxFont::GetTextExtent(const wxString &string, -+ wxCoord *x, wxCoord *y, -+ wxCoord *descent, -+ wxCoord *externalLeading) const -+{ -+ M_FONTDATA->GetTextExtent(string, x, y, descent, externalLeading); -+} -+ -+void wxFont::GetCharSize(wxCoord *x, wxCoord *y) const -+{ -+ M_FONTDATA->GetTextExtent(wxT("M"), x, y, NULL, NULL); -+} -diff --git a/src/wasm/fontenum.cpp b/src/wasm/fontenum.cpp -new file mode 100644 -index 0000000000..b04d7a3418 ---- /dev/null -+++ b/src/wasm/fontenum.cpp -@@ -0,0 +1,34 @@ -+ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/fontenum.cpp -+// Purpose: wxFontEnumerator -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#include "wx/fontenum.h" -+ -+#ifndef WX_PRECOMP -+#endif -+ -+//----------------------------------------------------------------------------- -+// wxFontEnumerator -+//----------------------------------------------------------------------------- -+bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding WXUNUSED(encoding), -+ bool WXUNUSED(fixedWidthOnly)) -+{ -+ // TODO: implement -+ wxFAIL_MSG(wxT("EnumerateFacenames is not implemented")); -+ return false; -+} -+ -+bool wxFontEnumerator::EnumerateEncodings(const wxString& WXUNUSED(family)) -+{ -+ // TODO: implement -+ wxFAIL_MSG(wxT("EnumerateEncodings is not implemented")); -+ return false; -+} -+ -diff --git a/src/wasm/fontutil.cpp b/src/wasm/fontutil.cpp -new file mode 100644 -index 0000000000..f30848e914 ---- /dev/null -+++ b/src/wasm/fontutil.cpp -@@ -0,0 +1,55 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/fontutil.cpp -+// Purpose: -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#include "wx/fontutil.h" -+ -+#ifndef WX_PRECOMP -+#endif -+ -+#include "wx/encinfo.h" -+ -+//----------------------------------------------------------------------------- -+// wxNativeEncodingInfo -+//----------------------------------------------------------------------------- -+ -+bool wxNativeEncodingInfo::FromString(const wxString& WXUNUSED(s)) -+{ -+ // TODO: implement -+ wxFAIL_MSG(wxT("FromString is not implemented")); -+ return true; -+} -+ -+wxString wxNativeEncodingInfo::ToString() const -+{ -+ // TODO: implement -+ wxFAIL_MSG(wxT("ToString is not implemented")); -+ return wxEmptyString; -+} -+ -+// ---------------------------------------------------------------------------- -+// common functions -+// ---------------------------------------------------------------------------- -+ -+bool wxGetNativeFontEncoding(wxFontEncoding WXUNUSED(encoding), -+ wxNativeEncodingInfo *info) -+{ -+ // TODO: implement -+ wxFAIL_MSG(wxT("wxGetNativeFontEncoding is not implemented")); -+ *info = wxNativeEncodingInfo(); -+ -+ return true; -+} -+ -+bool wxTestFontEncoding(const wxNativeEncodingInfo& WXUNUSED(info)) -+{ -+ // TODO: implement -+ wxFAIL_MSG(wxT("wxTestFontEncoding is not implemented")); -+ return false; -+} -diff --git a/src/wasm/keyboard.cpp b/src/wasm/keyboard.cpp -new file mode 100644 -index 0000000000..add7a292c5 ---- /dev/null -+++ b/src/wasm/keyboard.cpp -@@ -0,0 +1,359 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: src/wasm/keyboard.cpp -+// Purpose Keyboard event converter -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#include "wx/event.h" -+#include "wx/log.h" -+#include "wx/utils.h" -+ -+#include -+ -+namespace -+{ -+ -+struct KeyTranslationEntry -+{ -+ const char *domKeyCode; -+ int wxKeyCode; -+}; -+ -+const KeyTranslationEntry kKeyTranslationEntries[] = -+{ -+ {"Digit1", '1'}, -+ {"Digit2", '2'}, -+ {"Digit3", '3'}, -+ {"Digit4", '4'}, -+ {"Digit5", '5'}, -+ {"Digit6", '6'}, -+ {"Digit7", '7'}, -+ {"Digit8", '8'}, -+ {"Digit9", '9'}, -+ {"Digit0", '0'}, -+ {"KeyA", 'A'}, -+ {"KeyB", 'B'}, -+ {"KeyC", 'C'}, -+ {"KeyD", 'D'}, -+ {"KeyE", 'E'}, -+ {"KeyF", 'F'}, -+ {"KeyG", 'G'}, -+ {"KeyH", 'H'}, -+ {"KeyI", 'I'}, -+ {"KeyJ", 'J'}, -+ {"KeyK", 'K'}, -+ {"KeyL", 'L'}, -+ {"KeyM", 'M'}, -+ {"KeyN", 'N'}, -+ {"KeyO", 'O'}, -+ {"KeyP", 'P'}, -+ {"KeyQ", 'Q'}, -+ {"KeyR", 'R'}, -+ {"KeyS", 'S'}, -+ {"KeyT", 'T'}, -+ {"KeyU", 'U'}, -+ {"KeyV", 'V'}, -+ {"KeyW", 'W'}, -+ {"KeyX", 'X'}, -+ {"KeyY", 'Y'}, -+ {"KeyZ", 'Z'}, -+ {"Comma", ','}, -+ {"Period", '.'}, -+ {"Semicolon", ';'}, -+ {"Quote", '\''}, -+ {"BracketLeft", '['}, -+ {"BracketRight", ']'}, -+ {"Backquote", '`'}, -+ {"Backslash", '\\'}, -+ {"Minus", '-'}, -+ {"Equal", '='}, -+ {"AltLeft", WXK_ALT}, -+ {"AltRight", WXK_ALT}, -+ {"CapsLock", WXK_CAPITAL}, -+ {"ControlLeft", WXK_CONTROL}, -+ {"ControlRight", WXK_CONTROL}, -+ {"OSLeft", WXK_CONTROL}, -+ {"OSRight", WXK_CONTROL}, -+ {"MetaLeft", WXK_CONTROL}, -+ {"MetaRight", WXK_CONTROL}, -+ {"ShiftLeft", WXK_SHIFT}, -+ {"ShiftRight", WXK_SHIFT}, -+ {"ContextMenu", WXK_WINDOWS_MENU}, -+ {"Enter", WXK_RETURN}, -+ {"Space", WXK_SPACE}, -+ {"Tab", WXK_TAB}, -+ {"Backspace", WXK_BACK}, -+ {"Delete", WXK_DELETE}, -+ {"End", WXK_END}, -+ {"Help", WXK_HELP}, -+ {"Home", WXK_HOME}, -+ {"Insert", WXK_INSERT}, -+ {"PageDown", WXK_PAGEDOWN}, -+ {"PageUp", WXK_PAGEUP}, -+ {"ArrowDown", WXK_DOWN}, -+ {"ArrowLeft", WXK_LEFT}, -+ {"ArrowRight", WXK_RIGHT}, -+ {"ArrowUp", WXK_UP}, -+ {"Escape", WXK_ESCAPE}, -+ {"PrintScreen", WXK_PRINT}, -+ {"ScrollLock", WXK_SCROLL}, -+ {"Pause", WXK_PAUSE}, -+ {"F1", WXK_F1}, -+ {"F2", WXK_F2}, -+ {"F3", WXK_F3}, -+ {"F4", WXK_F4}, -+ {"F5", WXK_F5}, -+ {"F6", WXK_F6}, -+ {"F7", WXK_F7}, -+ {"F8", WXK_F8}, -+ {"F9", WXK_F9}, -+ {"F10", WXK_F10}, -+ {"F11", WXK_F11}, -+ {"F12", WXK_F12}, -+ {"F13", WXK_F13}, -+ {"F14", WXK_F14}, -+ {"F15", WXK_F15}, -+ {"F16", WXK_F16}, -+ {"F17", WXK_F17}, -+ {"F18", WXK_F18}, -+ {"F19", WXK_F19}, -+ {"F20", WXK_F20}, -+ {"F21", WXK_F21}, -+ {"F22", WXK_F22}, -+ {"F23", WXK_F23}, -+ {"F24", WXK_F24}, -+ {"NumLock", WXK_NUMLOCK}, -+ {"Numpad0", WXK_NUMPAD0}, -+ {"Numpad1", WXK_NUMPAD1}, -+ {"Numpad2", WXK_NUMPAD2}, -+ {"Numpad3", WXK_NUMPAD3}, -+ {"Numpad4", WXK_NUMPAD4}, -+ {"Numpad5", WXK_NUMPAD5}, -+ {"Numpad6", WXK_NUMPAD6}, -+ {"Numpad7", WXK_NUMPAD7}, -+ {"Numpad8", WXK_NUMPAD8}, -+ {"Numpad9", WXK_NUMPAD9}, -+ {"NumpadAdd", WXK_NUMPAD_ADD}, -+ {"NumpadComma", WXK_NUMPAD_DECIMAL}, // ? -+ {"NumpadDecimal", WXK_NUMPAD_DECIMAL}, -+ {"NumpadDivide", WXK_NUMPAD_DIVIDE}, -+ {"NumpadEnter", WXK_NUMPAD_ENTER}, -+ {"NumpadEqual", WXK_NUMPAD_EQUAL}, -+ {"NumpadMultiply", WXK_NUMPAD_MULTIPLY}, -+ {"NumpadSubtract", WXK_NUMPAD_SUBTRACT} -+}; -+ -+const int kNumKeyTranslationEntries = sizeof(kKeyTranslationEntries) / sizeof(kKeyTranslationEntries[0]); -+ -+WX_DECLARE_HASH_MAP(char *, long, wxStringHash, wxStringEqual, KeyTranslationMap); -+ -+KeyTranslationMap *CreateKeyTranslationMap() -+{ -+ KeyTranslationMap *keyTranslationMap = new KeyTranslationMap(); -+ -+ for (int i = 0; i < kNumKeyTranslationEntries; i++) -+ { -+ const KeyTranslationEntry &entry = kKeyTranslationEntries[i]; -+ (*keyTranslationMap)[entry.domKeyCode] = entry.wxKeyCode; -+ } -+ -+ // OS specific translations. -+ wxOperatingSystemId systemId = wxGetOsVersion(); -+ -+ if (systemId & wxOS_WINDOWS) -+ { -+ (*keyTranslationMap)["OSLeft"] = WXK_WINDOWS_LEFT; -+ (*keyTranslationMap)["OSRight"] = WXK_WINDOWS_RIGHT; -+ } -+ -+ return keyTranslationMap; -+} -+ -+const KeyTranslationMap &GetKeyTranslationMap() -+{ -+ static KeyTranslationMap *keyTranslationMap = NULL; -+ -+ if (keyTranslationMap == NULL) -+ { -+ keyTranslationMap = CreateKeyTranslationMap(); -+ } -+ return *keyTranslationMap; -+} -+ -+int DOMKeyCodeToWXKeyCode(const char *domKeyCode) -+{ -+ const KeyTranslationMap &keyTranslationMap = GetKeyTranslationMap(); -+ KeyTranslationMap::const_iterator it = keyTranslationMap.find(domKeyCode); -+ return it != keyTranslationMap.end() ? it->second : WXK_NONE; -+} -+ -+wxEventType GetKeyEventType(int emscriptenEventType) -+{ -+ wxEventType eventType; -+ -+ switch (emscriptenEventType) -+ { -+ case EMSCRIPTEN_EVENT_KEYDOWN: -+ //printf("key down event\n"); -+ eventType = wxEVT_KEY_DOWN; -+ break; -+ case EMSCRIPTEN_EVENT_KEYUP: -+ //printf("key up event\n"); -+ eventType = wxEVT_KEY_UP; -+ break; -+ case EMSCRIPTEN_EVENT_KEYPRESS: -+ //printf("key char event\n"); -+ eventType = wxEVT_CHAR; -+ break; -+ default: -+ wxFAIL_MSG(wxT("invalid key event type")); -+ eventType = wxEVT_NULL; -+ break; -+ } -+ -+ return eventType; -+} -+ -+void SetKeyboardModifiers(const EmscriptenKeyboardEvent& emscriptenEvent, -+ wxKeyboardState *event) -+{ -+ if ((wxGetOsVersion() & wxOS_MAC) != 0) -+ { -+ event->SetControlDown(emscriptenEvent.metaKey); -+ event->SetMetaDown(false); -+ } -+ else -+ { -+ event->SetControlDown(emscriptenEvent.ctrlKey); -+ event->SetMetaDown(emscriptenEvent.metaKey); -+ } -+ event->SetShiftDown(emscriptenEvent.shiftKey); -+ event->SetAltDown(emscriptenEvent.altKey); -+ event->SetRawControlDown(emscriptenEvent.ctrlKey); -+} -+ -+void InitKeyEvent(int emscriptenEventType, -+ const EmscriptenKeyboardEvent& emscriptenEvent, -+ wxKeyEvent *event) -+{ -+ static wxMBConvUTF8 converter; -+ -+ SetKeyboardModifiers(emscriptenEvent, event); -+ -+ event->m_rawCode = emscriptenEvent.keyCode; -+ event->m_rawFlags = 0; -+ -+ const std::string domKeyCode(emscriptenEvent.code); -+ const std::string charText(emscriptenEvent.key); -+ -+ //printf("key code: %lu\n", emscriptenEvent.keyCode); -+ //printf("char code: %c\n", static_cast(emscriptenEvent.keyCode)); -+ //printf("dom code: %s\n", domKeyCode.c_str()); -+ //printf("char text: %s\n", charText.c_str()); -+ -+ if (emscriptenEventType == EMSCRIPTEN_EVENT_KEYPRESS && -+ charText.size() == 1 && -+ static_cast(charText.at(0)) <= WXK_DELETE) -+ { -+ event->m_keyCode = charText.at(0); -+ } -+ else if (!domKeyCode.empty()) -+ { -+ event->m_keyCode = DOMKeyCodeToWXKeyCode(domKeyCode.c_str()); -+ } -+ else -+ { -+ event->m_keyCode = WXK_NONE; -+ } -+ -+#if wxUSE_UNICODE -+ if (event->m_keyCode <= WXK_DELETE && event->m_keyCode != WXK_NONE) -+ { -+ char temp = event->m_keyCode; -+ converter.ToWChar(&event->m_uniChar, 1, &temp, 1); -+ } -+ else -+ { -+ event->m_uniChar = WXK_NONE; -+ } -+#endif -+ -+ event->SetTimestamp(0); -+} -+ -+} // anonymous namespace -+ -+bool EmscriptenKeyboardEventToWXEvent(int emscriptenEventType, -+ const EmscriptenKeyboardEvent &emscriptenEvent, -+ wxKeyEvent *keyEvent) -+{ -+ wxEventType eventType = GetKeyEventType(emscriptenEventType); -+ -+ keyEvent->SetEventType(eventType); -+ InitKeyEvent(emscriptenEventType, emscriptenEvent, keyEvent); -+ -+ return true; -+} -+ -+bool KeyCodeNeedsCharEvent(int keyCode) -+{ -+ switch (keyCode) -+ { -+ case WXK_ESCAPE: -+ case WXK_BACK: -+ case WXK_DELETE: -+ case WXK_CLEAR: -+ case WXK_PAUSE: -+ case WXK_END: -+ case WXK_HOME: -+ case WXK_LEFT: -+ case WXK_UP: -+ case WXK_RIGHT: -+ case WXK_DOWN: -+ case WXK_SELECT: -+ case WXK_PRINT: -+ case WXK_SNAPSHOT: -+ case WXK_INSERT: -+ case WXK_HELP: -+ case WXK_NUMLOCK: -+ case WXK_SCROLL: -+ case WXK_PAGEUP: -+ case WXK_PAGEDOWN: -+ case WXK_F1: -+ case WXK_F2: -+ case WXK_F3: -+ case WXK_F4: -+ case WXK_F5: -+ case WXK_F6: -+ case WXK_F7: -+ case WXK_F8: -+ case WXK_F9: -+ case WXK_F10: -+ case WXK_F11: -+ case WXK_F12: -+ case WXK_F13: -+ case WXK_F14: -+ case WXK_F15: -+ case WXK_F16: -+ case WXK_F17: -+ case WXK_F18: -+ case WXK_F19: -+ case WXK_F20: -+ case WXK_F21: -+ case WXK_F22: -+ case WXK_F23: -+ case WXK_F24: -+ // case WXK_SELECT: ?? -+ // case WXK_EXECUTE: ?? -+ return true; -+ break; -+ default: -+ break; -+ } -+ -+ return false; -+} -diff --git a/src/wasm/mouse.cpp b/src/wasm/mouse.cpp -new file mode 100644 -index 0000000000..e3a2d1cfde ---- /dev/null -+++ b/src/wasm/mouse.cpp -@@ -0,0 +1,312 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: src/wasm/mouse.cpp -+// Purpose Mouse event converter -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#include "wx/event.h" -+#include "wx/log.h" -+#include -+ -+//#define HAS_MOUSE_DETAIL -+ -+namespace -+{ -+ -+wxEventType GetMouseDownEventType(int button, int numClicks) -+{ -+ switch (button) -+ { -+ case 0: -+ return numClicks % 2 == 1 ? wxEVT_LEFT_DOWN : wxEVT_LEFT_DCLICK; -+ break; -+ case 1: -+ return numClicks % 2 == 1 ? wxEVT_MIDDLE_DOWN : wxEVT_MIDDLE_DCLICK; -+ break; -+ case 2: -+ return numClicks % 2 == 1 ? wxEVT_RIGHT_DOWN : wxEVT_RIGHT_DCLICK; -+ break; -+ default: -+ wxFAIL_MSG(wxT("invalid mouse button")); -+ return wxEVT_NULL; -+ break; -+ } -+} -+ -+wxEventType GetMouseUpEventType(int button) -+{ -+ switch (button) -+ { -+ case 0: -+ return wxEVT_LEFT_UP; -+ break; -+ case 1: -+ return wxEVT_MIDDLE_UP; -+ break; -+ case 2: -+ return wxEVT_RIGHT_UP; -+ break; -+ default: -+ wxFAIL_MSG(wxT("invalid mouse button")); -+ return wxEVT_NULL; -+ break; -+ } -+} -+ -+wxEventType GetMouseEventType(int emscriptenEventType, -+ const EmscriptenMouseEvent &event) -+{ -+ wxEventType eventType; -+ std::string eventName; -+ -+#ifdef HAS_MOUSE_DETAIL -+ int clickCount = event.detail; -+#else -+ int clickCount = 1; -+#endif -+ -+ switch (emscriptenEventType) -+ { -+ case EMSCRIPTEN_EVENT_MOUSEDOWN: -+ eventName = "MOUSEDOWN"; -+ eventType = GetMouseDownEventType(event.button, clickCount); -+ break; -+ case EMSCRIPTEN_EVENT_MOUSEUP: -+ eventName = "MOUSEUP"; -+ eventType = GetMouseUpEventType(event.button); -+ break; -+ case EMSCRIPTEN_EVENT_MOUSEMOVE: -+ eventName = "MOUSEMOVE"; -+ eventType = wxEVT_MOTION; -+ break; -+ case EMSCRIPTEN_EVENT_MOUSEENTER: -+ eventName = "MOUSEENTER"; -+ eventType = wxEVT_ENTER_WINDOW; -+ break; -+ case EMSCRIPTEN_EVENT_MOUSELEAVE: -+ eventName = "MOUSELEAVE"; -+ eventType = wxEVT_LEAVE_WINDOW; -+ break; -+ case EMSCRIPTEN_EVENT_CLICK: -+ eventName = "CLICK"; -+ eventType = wxEVT_NULL; -+ break; -+ case EMSCRIPTEN_EVENT_DBLCLICK: -+ eventName = "DBLCLICK"; -+ eventType = wxEVT_NULL; -+ break; -+ default: -+ wxFAIL_MSG(wxT("invalid mouse event type")); -+ eventType = wxEVT_NULL; -+ break; -+ } -+ -+ //printf("event: %s\n", eventName.c_str()); -+ -+ return eventType; -+} -+ -+void SetKeyboardState(bool ctrlKey, -+ bool shiftKey, -+ bool altKey, -+ bool metaKey, -+ wxMouseEvent *event) -+{ -+ if ((wxGetOsVersion() & wxOS_MAC) != 0) -+ { -+ event->SetControlDown(metaKey); -+ event->SetMetaDown(false); -+ } -+ else -+ { -+ event->SetControlDown(ctrlKey); -+ event->SetMetaDown(metaKey); -+ } -+ event->SetShiftDown(shiftKey); -+ event->SetAltDown(altKey); -+ event->SetRawControlDown(ctrlKey); -+} -+ -+void SetMouseState(long targetX, -+ long targetY, -+ unsigned short buttons, -+ wxMouseState *event) -+{ -+ event->SetX(targetX); -+ event->SetY(targetY); -+ event->SetLeftDown((buttons & 1) != 0); -+ event->SetRightDown((buttons & 2) != 0); -+ event->SetMiddleDown((buttons & 4) != 0); -+ event->SetAux1Down(false); -+ event->SetAux2Down(false); -+} -+ -+void InitMouseEventCommon(const EmscriptenMouseEvent& emscriptenEvent, wxMouseEvent *event) -+{ -+ SetKeyboardState(emscriptenEvent.ctrlKey, -+ emscriptenEvent.shiftKey, -+ emscriptenEvent.altKey, -+ emscriptenEvent.metaKey, -+ event); -+ SetMouseState(emscriptenEvent.targetX, -+ emscriptenEvent.targetY, -+ emscriptenEvent.buttons, -+ event); -+} -+ -+} // anonymous namespace -+ -+bool EmscriptenWheelEventToWXEvent(const EmscriptenWheelEvent &emscriptenEvent, -+ wxOrientation orientation, -+ wxMouseEvent *mouseEvent) -+{ -+ float delta = orientation == wxHORIZONTAL ? delta = emscriptenEvent.deltaX -+ : delta = -emscriptenEvent.deltaY; -+ -+ if (delta == 0) -+ { -+ return false; -+ } -+ -+ mouseEvent->SetEventType(wxEVT_MOUSEWHEEL); -+ InitMouseEventCommon(emscriptenEvent.mouse, mouseEvent); -+ -+ mouseEvent->m_wheelAxis = -+ orientation == wxHORIZONTAL ? wxMOUSE_WHEEL_HORIZONTAL -+ : wxMOUSE_WHEEL_VERTICAL; -+ -+ mouseEvent->m_wheelRotation = delta; -+ mouseEvent->m_wheelDelta = 10; -+ -+ mouseEvent->m_linesPerAction = 1; -+ mouseEvent->m_columnsPerAction = 1; -+ -+ return true; -+} -+ -+bool EmscriptenMouseEventToWXEvent(int emscriptenEventType, -+ const EmscriptenMouseEvent &emscriptenEvent, -+ wxMouseEvent *mouseEvent) -+{ -+ wxEventType eventType = GetMouseEventType(emscriptenEventType, emscriptenEvent); -+ if (eventType == wxEVT_NULL) -+ { -+ return false; -+ } -+ -+ mouseEvent->SetEventType(eventType); -+ InitMouseEventCommon(emscriptenEvent, mouseEvent); -+ -+ if (eventType == wxEVT_MOTION) -+ { -+ mouseEvent->m_clickCount = 0; -+ } -+ else if (eventType == wxEVT_RIGHT_DCLICK || -+ eventType == wxEVT_MIDDLE_DCLICK || -+ eventType == wxEVT_LEFT_DCLICK) -+ { -+ mouseEvent->m_clickCount = 2; -+ } -+ else -+ { -+ mouseEvent->m_clickCount = 1; -+ } -+ -+ //printf("mouse event type: %d\n", emscriptenEventType); -+ //printf("mouse button: %d\n", emscriptenEvent.button); -+ //printf("click count: %ld\n", emscriptenEvent.detail); -+ //printf("mouse: left down: %d, right down: %d\n", -+ // mouseEvent->LeftIsDown(), mouseEvent->RightIsDown()); -+ -+ return true; -+} -+ -+bool EmscriptenTouchEventToWXEvent(int touchEventType, -+ const EmscriptenTouchEvent &touchEvent, -+ wxMouseEvent *mouseEvent) -+{ -+ static bool hasTouch = false; -+ static long firstTouchId = 0; -+ -+ wxEventType eventType = wxEVT_NULL; -+ unsigned short buttons; -+ int clickCount; -+ int touchIndex; -+ -+ if (touchEventType == EMSCRIPTEN_EVENT_TOUCHSTART) -+ { -+ if (!hasTouch && touchEvent.numTouches == 1) -+ { -+ hasTouch = true; -+ firstTouchId = touchEvent.touches[0].identifier; -+ -+ eventType = wxEVT_LEFT_DOWN; -+ buttons = 1; -+ clickCount = 1; -+ touchIndex = 0; -+ } -+ } -+ else if (touchEventType == EMSCRIPTEN_EVENT_TOUCHEND || -+ touchEventType == EMSCRIPTEN_EVENT_TOUCHCANCEL) -+ { -+ if (hasTouch) -+ { -+ for (int i = 0; i < touchEvent.numTouches; i++) -+ { -+ if (firstTouchId == touchEvent.touches[i].identifier && -+ (touchEvent.touches[i].isChanged || -+ touchEventType == EMSCRIPTEN_EVENT_TOUCHCANCEL)) -+ { -+ hasTouch = false; -+ -+ eventType = wxEVT_LEFT_UP; -+ buttons = 0; -+ clickCount = 1; -+ touchIndex = i; -+ } -+ } -+ } -+ } -+ else if (touchEventType == EMSCRIPTEN_EVENT_TOUCHMOVE) -+ { -+ if (hasTouch) -+ { -+ for (int i = 0; i < touchEvent.numTouches; i++) -+ { -+ if (firstTouchId == touchEvent.touches[i].identifier && -+ touchEvent.touches[i].isChanged) -+ { -+ eventType = wxEVT_MOTION; -+ buttons = 1; -+ clickCount = 0; -+ touchIndex = i; -+ } -+ } -+ } -+ } -+ -+ if (eventType != wxEVT_NULL) -+ { -+ mouseEvent->SetEventType(eventType); -+ mouseEvent->m_clickCount = clickCount; -+ -+ SetKeyboardState(touchEvent.ctrlKey, -+ touchEvent.shiftKey, -+ touchEvent.altKey, -+ touchEvent.metaKey, -+ mouseEvent); -+ SetMouseState(touchEvent.touches[touchIndex].targetX, -+ touchEvent.touches[touchIndex].targetY, -+ buttons, -+ mouseEvent); -+ return true; -+ } -+ else -+ { -+ return false; -+ } -+} -diff --git a/src/wasm/nonownedwnd.cpp b/src/wasm/nonownedwnd.cpp -new file mode 100644 -index 0000000000..b4bf41e89a ---- /dev/null -+++ b/src/wasm/nonownedwnd.cpp -@@ -0,0 +1,160 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/nonownedwnd.cpp -+// Purpose: wxNonOwnedWindow implementation -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#include "wx/app.h" -+#include "wx/nonownedwnd.h" -+#include "wx/wasm/private.h" -+#include "wx/wasm/private/display.h" -+ -+#include -+ -+void wxNonOwnedWindow::Init() -+{ -+ m_cssId = wxID_NONE; -+} -+ -+wxNonOwnedWindow::~wxNonOwnedWindow() -+{ -+ if (m_cssId != wxID_NONE) -+ { -+ EM_ASM({ -+ destroyWindow($0); -+ }, m_cssId); -+ } -+} -+ -+bool wxNonOwnedWindow::Create(wxWindow *parent, -+ wxWindowID id, -+ const wxPoint& pos, -+ const wxSize& size, -+ long style, -+ const wxString& name) -+{ -+ wxString classList = GetCSSClassList(); -+ -+ m_cssId = EM_ASM_INT({ -+ return createWindow(-1, true, $0, UTF8ToString($1)); -+ }, m_isShown, static_cast(classList.utf8_str())); -+ -+ int x = pos.x; -+ int y = pos.y; -+ -+ if (x == wxDefaultCoord) -+ { -+ x = 0; -+ } -+ if (y == wxDefaultCoord) -+ { -+ y = 0; -+ } -+ -+ int width = WidthDefault(size.x); -+ int height = HeightDefault(size.y); -+ -+ if (!wxNonOwnedWindowBase::Create(parent, id, wxPoint(x, y), wxSize(width, height), style, name)) -+ { -+ wxFAIL_MSG(wxT("wxTopLevelWindowWasm creation failed")); -+ return false; -+ } -+ -+ wxTopLevelWindows.Append(this); -+ -+ //printf("CreateWindow: %d\n", m_cssId); -+ -+ return true; -+} -+ -+void wxNonOwnedWindow::SetSizer(wxSizer *sizer, bool deleteOld) -+{ -+ wxWindow::SetSizer(sizer, deleteOld); -+ Layout(); -+} -+ -+void wxNonOwnedWindow::DoSetSize(int x, int y, -+ int width, int height, -+ int sizeFlags) -+{ -+ //printf("DoSetSize: %d, %d, %d, %d, %d\n", GetCSSId(), x, y, width, height); -+ -+ wxRect oldRect = GetScreenRect(); -+ wxNonOwnedWindowBase::DoSetSize(x, y, width, height, sizeFlags); -+ wxRect newRect = GetScreenRect(); -+ -+ if (newRect != oldRect) -+ { -+ EM_ASM({ -+ return setWindowRect($0, $1, $2, $3, $4); -+ }, GetCSSId(), newRect.x, newRect.y, newRect.width, newRect.height); -+ } -+} -+ -+bool wxNonOwnedWindow::Show(bool show) -+{ -+ bool ret = wxNonOwnedWindowBase::Show(show); -+ if (ret && !IsMainFrame()) -+ { -+ EM_ASM({ -+ setWindowVisibility($0, $1); -+ }, GetCSSId(), show); -+ } -+ -+ return ret; -+} -+ -+void wxNonOwnedWindow::Raise() -+{ -+ EM_ASM({ -+ raiseWindow($0); -+ }, GetCSSId()); -+ -+ for (wxWindowList::iterator windowIter = wxTopLevelWindows.begin(); -+ windowIter != wxTopLevelWindows.end(); -+ ++windowIter) -+ { -+ wxWindow *window = *windowIter; -+ if (window->GetParent() != NULL && -+ window->GetParent()->GetTopLevelWindow() == this) -+ { -+ window->Raise(); -+ } -+ } -+} -+ -+void wxNonOwnedWindow::Lower() -+{ -+ for (wxWindowList::iterator windowIter = wxTopLevelWindows.begin(); -+ windowIter != wxTopLevelWindows.end(); -+ ++windowIter) -+ { -+ wxWindow *window = *windowIter; -+ if (window->GetParent() != NULL && -+ window->GetParent()->GetTopLevelWindow() == this) -+ { -+ window->Lower(); -+ } -+ } -+ -+ EM_ASM({ -+ lowerWindow($0); -+ }, GetCSSId()); -+} -+ -+void wxNonOwnedWindow::HandlePaintRequests() -+{ -+ if (NeedsPaint()) -+ { -+ DoPaint(false); -+ } -+} -+ -+bool wxNonOwnedWindow::IsMainFrame() const -+{ -+ return !wxTopLevelWindows.IsEmpty() && this == wxTopLevelWindows[0]; -+} -diff --git a/src/wasm/pen.cpp b/src/wasm/pen.cpp -new file mode 100644 -index 0000000000..8e86b77867 ---- /dev/null -+++ b/src/wasm/pen.cpp -@@ -0,0 +1,306 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/pen.cpp -+// Purpose: wxPen implementation -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#include "wx/pen.h" -+ -+#ifndef WX_PRECOMP -+#include "wx/colour.h" -+#endif // WX_PRECOMP -+ -+//----------------------------------------------------------------------------- -+// wxPenRefData -+//----------------------------------------------------------------------------- -+ -+class wxPenRefData: public wxGDIRefData -+{ -+public: -+ wxPenRefData() -+ { -+ m_colour = *wxBLACK; -+ m_width = 1; -+ m_style = wxPENSTYLE_SOLID; -+ m_join = wxJOIN_ROUND; -+ m_cap = wxCAP_ROUND; -+ m_stipple = NULL; -+ m_dashCount = 0; -+ m_dash = NULL; -+ } -+ -+ wxPenRefData(const wxPenRefData& data) -+ : wxGDIRefData() -+ { -+ m_colour = data.m_colour; -+ m_width = data.m_width; -+ m_style = data.m_style; -+ m_join = data.m_join; -+ m_cap = data.m_cap; -+ m_stipple = data.m_stipple ? new wxBitmap(*data.m_stipple) : NULL; -+ m_dashCount = data.m_dashCount; -+ m_dash = data.m_dash; -+ } -+ -+ ~wxPenRefData() -+ { -+ delete m_stipple; -+ } -+ -+ bool operator==(const wxPenRefData& data) const -+ { -+ return m_colour == data.m_colour && -+ m_width == data.m_width && -+ m_style == data.m_style && -+ m_join == data.m_join && -+ m_cap == data.m_cap && -+ (m_style != wxPENSTYLE_STIPPLE || m_stipple->IsSameAs(*data.m_stipple)) && -+ (m_style != wxPENSTYLE_USER_DASH || -+ (m_dashCount == data.m_dashCount && -+ memcmp(m_dash, data.m_dash, m_dashCount * sizeof(wxDash)) == 0)); -+ } -+ -+ inline const wxColour& GetColour() const { return m_colour; } -+ inline int GetWidth() const { return m_width; } -+ inline wxPenStyle GetStyle() const { return m_style; } -+ inline wxPenJoin GetJoin() const { return m_join; } -+ inline wxPenCap GetCap() const { return m_cap; } -+ inline wxBitmap *GetStipple() const { return m_stipple; } -+ inline int GetDashCount() const { return m_dashCount; } -+ inline const wxDash *GetDash() const { return m_dash; } -+ -+ inline void SetColour(const wxColour& colour) { m_colour = colour; } -+ inline void SetWidth(int width) { m_width = width; } -+ inline void SetStyle(wxPenStyle style) { m_style = style; } -+ inline void SetJoin(wxPenJoin join) { m_join = join; } -+ inline void SetCap(wxPenCap cap) { m_cap = cap; } -+ -+ inline void SetStipple(const wxBitmap& stipple) -+ { -+ delete m_stipple; -+ m_stipple = new wxBitmap(stipple); -+ m_style = wxPENSTYLE_STIPPLE; -+ } -+ -+ inline void SetDashes(int dashCount, const wxDash *dash) -+ { -+ m_dashCount = dashCount; -+ m_dash = dash; -+ } -+ -+protected: -+ wxColour m_colour; -+ int m_width; -+ wxPenStyle m_style; -+ wxPenJoin m_join; -+ wxPenCap m_cap; -+ wxBitmap * m_stipple; -+ int m_dashCount; -+ const wxDash *m_dash; -+}; -+ -+//----------------------------------------------------------------------------- -+// wxPen -+//----------------------------------------------------------------------------- -+ -+#define M_PENDATA ((wxPenRefData *)m_refData) -+ -+IMPLEMENT_DYNAMIC_CLASS(wxPen, wxPenBase) -+ -+wxPen::wxPen(const wxColour &colour, int width, wxPenStyle style) -+{ -+ m_refData = new wxPenRefData(); -+ SetColour(colour); -+ SetWidth(width); -+ SetStyle(style); -+} -+ -+wxPen::wxPen(const wxBitmap& stipple, int width) -+{ -+ m_refData = new wxPenRefData(); -+ SetStipple(stipple); -+ SetWidth(width); -+} -+ -+wxPen::~wxPen() -+{ -+ // m_refData unrefed in ~wxObject -+} -+ -+wxGDIRefData *wxPen::CreateGDIRefData() const -+{ -+ return new wxPenRefData(); -+} -+ -+wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *data) const -+{ -+ return new wxPenRefData(*(wxPenRefData *)data); -+} -+ -+bool wxPen::operator==(const wxPen& pen) const -+{ -+ if (m_refData == pen.m_refData) -+ { -+ return true; -+ } -+ -+ if (!m_refData || !pen.m_refData) -+ { -+ return false; -+ } -+ -+ return (*(wxPenRefData*)m_refData == *(wxPenRefData*)pen.m_refData); -+} -+ -+void wxPen::SetColour(const wxColour &colour) -+{ -+ AllocExclusive(); -+ -+ M_PENDATA->SetColour(colour.GetRGBA()); -+} -+ -+void wxPen::SetColour(unsigned char red, unsigned char green, unsigned char blue) -+{ -+ AllocExclusive(); -+ -+ M_PENDATA->SetColour(wxColour(red, green, blue)); -+} -+ -+void wxPen::SetWidth(int width) -+{ -+ AllocExclusive(); -+ -+ M_PENDATA->SetWidth(width); -+} -+ -+static const wxDash dotted[] = {1, 3}; -+static const wxDash longDash[] = {19, 9}; -+static const wxDash shortDash[] = {9, 9}; -+static const wxDash dotDash[] = {9, 6, 1, 6}; -+ -+void wxPen::SetStyle(wxPenStyle style) -+{ -+ AllocExclusive(); -+ -+ switch (style) -+ { -+ case wxPENSTYLE_SOLID: -+ case wxPENSTYLE_TRANSPARENT: -+ case wxPENSTYLE_STIPPLE: -+ case wxPENSTYLE_USER_DASH: -+ break; -+ case wxPENSTYLE_DOT: -+ SetDashes(sizeof(dotted) / sizeof(wxDash), dotted); -+ break; -+ case wxPENSTYLE_LONG_DASH: -+ SetDashes(sizeof(longDash) / sizeof(wxDash), longDash); -+ break; -+ case wxPENSTYLE_SHORT_DASH: -+ SetDashes(sizeof(shortDash) / sizeof(wxDash), shortDash); -+ break; -+ case wxPENSTYLE_DOT_DASH: -+ SetDashes(sizeof(dotDash) / sizeof(wxDash), dotDash); -+ break; -+ default: -+ wxFAIL_MSG(wxT("Pen style is not implemented")); -+ } -+ -+ M_PENDATA->SetStyle(style); -+} -+ -+void wxPen::SetCap(wxPenCap cap) -+{ -+ AllocExclusive(); -+ -+ M_PENDATA->SetCap(cap); -+} -+ -+void wxPen::SetJoin(wxPenJoin join) -+{ -+ AllocExclusive(); -+ -+ M_PENDATA->SetJoin(join); -+} -+ -+void wxPen::SetStipple(const wxBitmap& stipple) -+{ -+ AllocExclusive(); -+ -+ M_PENDATA->SetStipple(stipple); -+} -+ -+void wxPen::SetDashes(int dashCount, const wxDash *dash) -+{ -+ AllocExclusive(); -+ -+ M_PENDATA->SetDashes(dashCount, dash); -+} -+ -+wxColour wxPen::GetColour() const -+{ -+ wxCHECK_MSG(IsOk(), wxNullColour, wxT("invalid pen")); -+ -+ return M_PENDATA->GetColour(); -+} -+ -+int wxPen::GetWidth() const -+{ -+ wxCHECK_MSG(IsOk(), -1, wxT("invalid pen")); -+ -+ return M_PENDATA->GetWidth(); -+} -+ -+wxPenStyle wxPen::GetStyle() const -+{ -+ wxCHECK_MSG(IsOk(), wxPENSTYLE_INVALID, wxT("invalid pen")); -+ -+ return M_PENDATA->GetStyle(); -+} -+ -+wxPenCap wxPen::GetCap() const -+{ -+ wxCHECK_MSG(IsOk(), wxCAP_INVALID, wxT("invalid pen")); -+ -+ return M_PENDATA->GetCap(); -+} -+ -+wxPenJoin wxPen::GetJoin() const -+{ -+ wxCHECK_MSG(IsOk(), wxJOIN_INVALID, wxT("invalid pen")); -+ -+ return M_PENDATA->GetJoin(); -+} -+ -+wxBitmap *wxPen::GetStipple() const -+{ -+ wxCHECK_MSG(IsOk(), NULL, wxT("invalid pen")); -+ -+ return M_PENDATA->GetStipple(); -+} -+ -+int wxPen::GetDashes(wxDash **ptr) const -+{ -+ wxCHECK_MSG(IsOk(), 0, wxT("invalid pen")); -+ -+ *ptr = const_cast(M_PENDATA->GetDash()); -+ return M_PENDATA->GetDashCount(); -+} -+ -+int wxPen::GetDashCount() const -+{ -+ wxCHECK_MSG(IsOk(), -1, wxT("invalid pen")); -+ -+ return M_PENDATA->GetDashCount(); -+} -+ -+wxDash *wxPen::GetDash() const -+{ -+ wxCHECK_MSG(IsOk(), NULL, wxT("invalid pen")); -+ -+ return const_cast(M_PENDATA->GetDash()); -+} -+ -diff --git a/src/wasm/popupwin.cpp b/src/wasm/popupwin.cpp -new file mode 100644 -index 0000000000..8ebf758340 ---- /dev/null -+++ b/src/wasm/popupwin.cpp -@@ -0,0 +1,43 @@ -+ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/popupwin.cpp -+// Purpose: wxPopupWindow implementation -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#include "wx/app.h" -+#include "wx/wasm/private/display.h" -+#include "wx/popupwin.h" -+ -+#ifndef WX_PRECOMP -+#endif //WX_PRECOMP -+ -+// ---------------------------------------------------------------------------- -+// wxPopupWindow -+// ---------------------------------------------------------------------------- -+ -+#ifdef __WXUNIVERSAL__ -+wxBEGIN_EVENT_TABLE(wxPopupWindow, wxPopupWindowBase) -+ EVT_SIZE(wxPopupWindow::OnSize) -+wxEND_EVENT_TABLE() -+#endif -+ -+wxPopupWindow::~wxPopupWindow() -+{ -+} -+ -+bool wxPopupWindow::Create(wxWindow *parent, int flags) -+{ -+ if (!wxNonOwnedWindow::Create(parent, -1, wxDefaultPosition, wxDefaultSize, flags, wxT("popup"))) -+ { -+ return false; -+ } -+ -+ Hide(); -+ -+ return true; -+} -diff --git a/src/wasm/region.cpp b/src/wasm/region.cpp -new file mode 100644 -index 0000000000..208654f100 ---- /dev/null -+++ b/src/wasm/region.cpp -@@ -0,0 +1,20 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/region.cpp -+// Purpose: wxRegion implementation -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#include "wx/region.h" -+ -+#ifndef WX_PRECOMP -+#endif // WX_PRECOMP -+ -+//----------------------------------------------------------------------------- -+// wxRegion -+//----------------------------------------------------------------------------- -+ -+IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxRegionGeneric) -diff --git a/src/wasm/settings.cpp b/src/wasm/settings.cpp -new file mode 100644 -index 0000000000..10e2ffb3ea ---- /dev/null -+++ b/src/wasm/settings.cpp -@@ -0,0 +1,62 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/settings.cpp -+// Purpose: -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#include "wx/log.h" -+#include "wx/settings.h" -+ -+#ifndef WX_PRECOMP -+#endif -+ -+static wxFont gs_fontDefault(10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); -+ -+//----------------------------------------------------------------------------- -+// wxSystemSettings -+//----------------------------------------------------------------------------- -+ -+wxColour wxSystemSettingsNative::GetColour(wxSystemColour index) -+{ -+ switch (index) -+ { -+ case wxSYS_COLOUR_WINDOW: -+ case wxSYS_COLOUR_INFOBK: -+ case wxSYS_COLOUR_MENU: -+ return *wxWHITE; -+ break; -+ default: -+ return *wxBLACK; -+ break; -+ } -+} -+ -+wxFont wxSystemSettingsNative::GetFont(wxSystemFont WXUNUSED(index)) -+{ -+ // TODO: implement -+ return gs_fontDefault; -+} -+ -+int wxSystemSettingsNative::GetMetric(wxSystemMetric WXUNUSED(index), const wxWindow* WXUNUSED(win)) -+{ -+ // TODO: implement -+ return 0; -+} -+ -+bool wxSystemSettingsNative::HasFeature(wxSystemFeature index) -+{ -+ switch (index) -+ { -+ case wxSYS_CAN_ICONIZE_FRAME: -+ return false; -+ case wxSYS_CAN_DRAW_FRAME_DECORATIONS: -+ // Suppresses drawing of frame border and title bar. -+ return true; -+ default: -+ return false; -+ } -+} -diff --git a/src/wasm/timer.cpp b/src/wasm/timer.cpp -new file mode 100644 -index 0000000000..73c6b948f9 ---- /dev/null -+++ b/src/wasm/timer.cpp -@@ -0,0 +1,110 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: src/wasm/timer.cpp -+// Purpose: wxTimer implementation -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#if wxUSE_TIMER -+ -+#include "wx/app.h" -+#include "wx/evtloop.h" -+#include "wx/log.h" -+ -+#include "wx/wasm/private/timer.h" -+ -+#include -+ -+// ---------------------------------------------------------------------------- -+// wxTimerImpl -+// ---------------------------------------------------------------------------- -+ -+void TimerCallback(void *userData) -+{ -+ TimerCallbackFunc *callbackFunc = static_cast(userData); -+ callbackFunc->Run(); -+} -+ -+bool wxWasmTimerImpl::Start(int millisecs, bool oneShot) -+{ -+ if (!wxTimerImpl::Start(millisecs, oneShot)) -+ { -+ return false; -+ } -+ -+ wxASSERT_MSG(m_callbackFunc == NULL, wxT("timer should be stopped")); -+ -+ // Data gets freed by callback. -+ m_callbackFunc = new TimerCallbackFunc(this); -+ -+ ScheduleFirstInterval(); -+ -+ return true; -+} -+ -+void wxWasmTimerImpl::Stop() -+{ -+ wxASSERT_MSG(m_callbackFunc != NULL, wxT("timer should be running")); -+ -+ // Set a flag that tells the callback to cancel when it fires. -+ m_callbackFunc->Cancel(); -+ m_callbackFunc = NULL; -+} -+ -+void wxWasmTimerImpl::ScheduleFirstInterval() -+{ -+ int intervalMs = m_timer->GetInterval(); -+ m_deadlineMs = wxGetUTCTimeMillis() + intervalMs; -+ -+ ScheduleTimerCallback(intervalMs, m_callbackFunc); -+} -+ -+void wxWasmTimerImpl::ScheduleNextInterval() -+{ -+ int intervalMs = m_timer->GetInterval(); -+ -+ m_deadlineMs += intervalMs; -+ -+ int timeLeftMs = (m_deadlineMs - wxGetUTCTimeMillis()).ToLong(); -+ timeLeftMs = wxMax(timeLeftMs, 0); -+ timeLeftMs = wxMin(timeLeftMs, intervalMs); -+ -+ ScheduleTimerCallback(timeLeftMs, m_callbackFunc); -+} -+ -+void wxWasmTimerImpl::ScheduleTimerCallback(int millisecs, TimerCallbackFunc *callbackFunc) -+{ -+ emscripten_async_call(TimerCallback, callbackFunc, millisecs); -+} -+ -+void TimerCallbackFunc::Run() -+{ -+ bool selfDestruct = true; -+ -+ if (!IsCanceled()) -+ { -+ wxWasmTimerImpl *timer = GetTimerImpl(); -+ -+ if (timer->IsOneShot()) -+ { -+ timer->Stop(); -+ } -+ else -+ { -+ timer->ScheduleNextInterval(); -+ selfDestruct = false; -+ } -+ -+ timer->m_timer->Notify(); -+ } -+ -+ if (selfDestruct) -+ { -+ delete this; -+ } -+} -+ -+#endif // wxUSE_TIMER -diff --git a/src/wasm/toplevel.cpp b/src/wasm/toplevel.cpp -new file mode 100644 -index 0000000000..ce006aaa99 ---- /dev/null -+++ b/src/wasm/toplevel.cpp -@@ -0,0 +1,286 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/toplevel.cpp -+// Purpose: wxTopLevelWindowWasm implementation -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#include "wx/app.h" -+#include "wx/dcclient.h" -+#include "wx/frame.h" -+#include "wx/settings.h" -+#include "wx/toplevel.h" -+ -+#include "wx/wasm/private.h" -+#include "wx/wasm/private/display.h" -+ -+#include -+#include -+ -+static const wxCoord TITLE_BAR_HEIGHT = 22; -+static const wxColour TITLE_BAR_BACKGROUND_COLOUR(200, 200, 200); -+static const wxColour TITLE_BAR_FOREGROUND_COLOUR(40, 40, 40); -+ -+static const wxCoord MINIMIZE_BUTTON_SIZE = 16; -+static const wxCoord MINIMIZE_BUTTON_PADDING = 3; -+ -+// ---------------------------------------------------------------------------- -+// wxTopLevelWindowWasm -+// ---------------------------------------------------------------------------- -+ -+wxBEGIN_EVENT_TABLE(wxTopLevelWindowWasm, wxTopLevelWindowBase) -+ EVT_NC_PAINT(wxTopLevelWindowWasm::OnNcPaint) -+ EVT_LEFT_DOWN(wxTopLevelWindowWasm::OnMouseDown) -+ EVT_LEFT_UP(wxTopLevelWindowWasm::OnMouseUp) -+ EVT_MOTION(wxTopLevelWindowWasm::OnMotion) -+wxEND_EVENT_TABLE() -+ -+bool wxTopLevelWindowWasm::Create(wxWindow *parent, -+ wxWindowID id, -+ const wxString& title, -+ const wxPoint& pos, -+ const wxSize& size, -+ long style, -+ const wxString& name) -+{ -+ //wxLogDebug(wxT("creating toplevel window")); -+ -+ if (!wxTopLevelWindowBase::Create(parent, id, pos, size, style, name)) -+ { -+ wxFAIL_MSG(wxT("wxTopLevelWindowWasm creation failed")); -+ return false; -+ } -+ -+ SetTitle(title); -+ -+ return true; -+} -+ -+void wxTopLevelWindowWasm::Init() -+{ -+ m_isActive = false; -+ m_minimizeButtonRect = wxRect(0, 0, MINIMIZE_BUTTON_SIZE, MINIMIZE_BUTTON_SIZE); -+ m_isDragging = false; -+} -+ -+bool wxTopLevelWindowWasm::HasTitleBar() const -+{ -+ // Main frame already has a native title bar. -+ return !IsMainFrame() && !(GetWindowStyle() & wxFRAME_NO_TASKBAR); -+} -+ -+wxPoint wxTopLevelWindowWasm::GetClientAreaOrigin() const -+{ -+ wxPoint origin = wxTopLevelWindowBase::GetClientAreaOrigin(); -+ -+ if (HasTitleBar()) -+ { -+ origin.y += TITLE_BAR_HEIGHT; -+ } -+ -+ return origin; -+} -+ -+void wxTopLevelWindowWasm::DoGetClientSize(int *width, int *height) const -+{ -+ wxTopLevelWindowBase::DoGetClientSize(width, height); -+ -+ if (height && HasTitleBar()) -+ { -+ *height = wxMax(*height - TITLE_BAR_HEIGHT, 0); -+ } -+} -+ -+void wxTopLevelWindowWasm::DoSetClientSize(int width, int height) -+{ -+ if (HasTitleBar()) -+ { -+ height += TITLE_BAR_HEIGHT; -+ } -+ -+ wxTopLevelWindowBase::DoSetClientSize(width, height); -+} -+ -+void wxTopLevelWindowWasm::DoScreenToClient(int *x, int *y) const -+{ -+ wxWindow::DoScreenToClient(x, y); -+} -+ -+void wxTopLevelWindowWasm::DoClientToScreen(int *x, int *y) const -+{ -+ wxWindow::DoClientToScreen(x, y); -+} -+ -+void wxTopLevelWindowWasm::SetIcons(const wxIconBundle& icons) -+{ -+ wxTopLevelWindowBase::SetIcons(icons); -+ -+ wxSize size = wxContentScaleFactor() >= 1.5 ? wxSize(32, 32) : wxSize(16, 16); -+ -+ wxIcon icon = icons.GetIcon(size, wxIconBundle::FALLBACK_NEAREST_LARGER); -+ -+ if (icon.IsOk()) -+ { -+ icon.SyncToJs(); -+ -+ EM_ASM({ -+ setIcon($0); -+ }, icon.GetJavascriptId()); -+ } -+} -+ -+void wxTopLevelWindowWasm::ShowWithoutActivating() -+{ -+ Show(true); -+} -+ -+bool wxTopLevelWindowWasm::ShowFullScreen(bool show, long WXUNUSED(style)) -+{ -+ if (show != IsFullScreen()) -+ { -+ EM_ASM({ -+ showFullscreen($0); -+ }, show); -+ } -+ -+ return true; -+} -+ -+bool wxTopLevelWindowWasm::IsFullScreen() const -+{ -+ EmscriptenFullscreenChangeEvent fullscreenStatus; -+ emscripten_get_fullscreen_status(&fullscreenStatus); -+ return fullscreenStatus.isFullscreen; -+} -+ -+void wxTopLevelWindowWasm::SetTitle(const wxString &title) -+{ -+ m_title = title; -+ -+ if (IsMainFrame()) -+ { -+ EM_ASM({ -+ document.title = UTF8ToString($0); -+ }, static_cast(title.utf8_str())); -+ } -+} -+ -+void wxTopLevelWindowWasm::DrawTitleText(wxDC& dc, const wxRect& rect) -+{ -+ wxCoord textWidth; -+ wxCoord textHeight; -+ dc.GetTextExtent(GetTitle(), &textWidth, &textHeight); -+ -+ int textX = wxMax((rect.width - textWidth) / 2, 0); -+ int textY = wxMax((rect.height - textHeight) / 2, 0); -+ -+ wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).Bold(); -+ -+ dc.SetTextBackground(TITLE_BAR_BACKGROUND_COLOUR); -+ dc.SetTextForeground(TITLE_BAR_FOREGROUND_COLOUR); -+ dc.SetFont(font); -+ -+ dc.DrawText(GetTitle(), textX, textY); -+} -+ -+void wxTopLevelWindowWasm::DrawMinimizeButton(wxDC& dc, const wxRect& rect) -+{ -+ wxCoord buttonWidth = m_minimizeButtonRect.width - 2 * MINIMIZE_BUTTON_PADDING; -+ wxCoord buttonHeight = m_minimizeButtonRect.height - 2 * MINIMIZE_BUTTON_PADDING; -+ wxCoord buttonMargin = (rect.height - buttonHeight) / 2; -+ -+ wxCoord buttonX = wxMax(rect.x + rect.width - buttonWidth - buttonMargin, 0); -+ wxCoord buttonY = rect.y + buttonMargin; -+ -+ m_minimizeButtonRect.x = buttonX - MINIMIZE_BUTTON_PADDING; -+ m_minimizeButtonRect.y = buttonY - MINIMIZE_BUTTON_PADDING; -+ -+ dc.SetPen(wxPen(TITLE_BAR_FOREGROUND_COLOUR, 2)); -+ -+ dc.DrawLine(buttonX, buttonY, buttonX + buttonWidth, buttonY + buttonHeight); -+ dc.DrawLine(buttonX, buttonY + buttonHeight, buttonX + buttonWidth, buttonY); -+} -+ -+void wxTopLevelWindowWasm::StartDrag(const wxPoint& pos) -+{ -+ m_isDragging = true; -+ m_dragOffset = pos; -+ CaptureMouse(); -+} -+ -+void wxTopLevelWindowWasm::EndDrag() -+{ -+ m_isDragging = false; -+ ReleaseMouse(); -+} -+ -+void wxTopLevelWindowWasm::DragMove(const wxPoint& pos) -+{ -+ Move(pos - m_dragOffset); -+} -+ -+void wxTopLevelWindowWasm::OnNcPaint(wxNcPaintEvent& WXUNUSED(event)) -+{ -+ if (HasTitleBar()) -+ { -+ wxWindowDC dc(this); -+ wxRect ncRect(0, 0, GetSize().x, TITLE_BAR_HEIGHT); -+ -+ dc.SetBrush(TITLE_BAR_BACKGROUND_COLOUR); -+ dc.SetPen(*wxTRANSPARENT_PEN); -+ -+ dc.DrawRectangle(ncRect); -+ -+ DrawTitleText(dc, ncRect); -+ DrawMinimizeButton(dc, ncRect); -+ } -+} -+ -+void wxTopLevelWindowWasm::OnMouseDown(wxMouseEvent& event) -+{ -+ if (HasTitleBar()) -+ { -+ wxPoint pos = event.GetPosition() + GetClientAreaOrigin(); -+ -+ if (pos.y < TITLE_BAR_HEIGHT && !m_minimizeButtonRect.Contains(pos)) -+ { -+ StartDrag(pos); -+ } -+ } -+} -+ -+void wxTopLevelWindowWasm::OnMouseUp(wxMouseEvent& event) -+{ -+ if (m_isDragging) -+ { -+ EndDrag(); -+ } -+ -+ if (HasTitleBar()) -+ { -+ wxPoint pos = event.GetPosition() + GetClientAreaOrigin(); -+ -+ if (m_minimizeButtonRect.Contains(pos)) -+ { -+ Close(); -+ } -+ } -+} -+ -+void wxTopLevelWindowWasm::OnMotion(wxMouseEvent& event) -+{ -+ if (m_isDragging) -+ { -+ if (event.Dragging()) -+ { -+ DragMove(ClientToScreen(event.GetPosition())); -+ } -+ else -+ { -+ EndDrag(); -+ } -+ } -+} -diff --git a/src/wasm/utils.cpp b/src/wasm/utils.cpp -new file mode 100644 -index 0000000000..7d1df3f375 ---- /dev/null -+++ b/src/wasm/utils.cpp -@@ -0,0 +1,172 @@ -+ -+///////////////////////////////////////////////////////////////////////////// -+// Name: src/wasm/utils.cpp -+// Purpose: -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+#include "wx/wxprec.h" -+ -+#ifndef WX_PRECOMP -+#include "wx/app.h" -+#endif // WX_PRECOMP -+ -+#include "wx/wasm/private.h" -+#include "wx/private/launchbrowser.h" -+ -+#include -+#include -+ -+#define GET_JAVASCRIPT_STRING(varName, string) \ -+ { \ -+ int length = EM_ASM_INT({ \ -+ return lengthBytesUTF8(varName); \ -+ }); \ -+ char* buffer = new char[length + 1]; \ -+ EM_ASM({ \ -+ stringToUTF8(varName, $0, $1); \ -+ }, buffer, length + 1); \ -+ string = buffer; \ -+ delete [] buffer; \ -+ } -+ -+// TODO: return os version -+wxOperatingSystemId wxGetOsVersion(int *WXUNUSED(verMaj), -+ int *WXUNUSED(verMin), -+ int *WXUNUSED(verMicro)) -+{ -+ wxString osName; -+ GET_JAVASCRIPT_STRING(platformInfo.name, osName); -+ -+ wxOperatingSystemId systemId = wxOS_UNKNOWN; -+ -+ if (osName == "Windows NT" || osName == "Windows") -+ { -+ systemId = wxOS_WINDOWS_NT; -+ } -+ else if (osName == "Mac OS X" || osName == "Macintosh") -+ { -+ systemId = wxOS_MAC_OSX_DARWIN; -+ } -+ else if (osName == "Linux") -+ { -+ systemId = wxOS_UNIX_LINUX; -+ } -+ else if (osName == "CrOS") -+ { -+ systemId = wxOS_CHROME_OS; -+ } -+ -+ return systemId; -+} -+ -+bool wxCheckOsVersion(int majorVsn, int minorVsn, int microVsn) -+{ -+ // TODO: implement -+ return true; -+} -+ -+wxString wxGetOsDescription() -+{ -+ wxString browserName; -+ wxString browserVersion; -+ wxString osName; -+ wxString osVersion; -+ -+ GET_JAVASCRIPT_STRING(browserInfo.name, browserName); -+ GET_JAVASCRIPT_STRING(browserInfo.version, browserVersion); -+ GET_JAVASCRIPT_STRING(platformInfo.name, osName); -+ GET_JAVASCRIPT_STRING(platformInfo.version, osVersion); -+ -+ return browserName + " " + browserVersion + " (" + osName + " " + osVersion + ")"; -+} -+ -+bool wxIsPlatform64Bit() -+{ -+ return false; -+} -+ -+wxString wxGetCpuArchitectureName() -+{ -+ return "unknown"; -+} -+ -+wxBrowserInfo wxGetBrowserInfo() -+{ -+ wxBrowserId browserId = wxBROWSER_UNKNOWN; -+ -+ wxString userAgent; -+ wxString browserName; -+ wxString browserVersion; -+ -+ GET_JAVASCRIPT_STRING(navigator.userAgent, userAgent); -+ GET_JAVASCRIPT_STRING(browserInfo.name, browserName); -+ GET_JAVASCRIPT_STRING(browserInfo.version, browserVersion); -+ -+ if (browserName == "Firefox") -+ { -+ browserId = wxBROWSER_FIREFOX; -+ } -+ else if (browserName == "Chrome") -+ { -+ browserId = wxBROWSER_CHROME; -+ } -+ else if (browserName == "Safari") -+ { -+ browserId = wxBROWSER_SAFARI; -+ } -+ else if (browserName == "Edge") -+ { -+ browserId = wxBROWSER_EDGE; -+ } -+ else if (browserName == "MSIE") -+ { -+ browserId = wxBROWSER_MSIE; -+ } -+ else if (browserName == "Opera") -+ { -+ browserId = wxBROWSER_OPERA; -+ } -+ -+ // TODO: populate version -+ -+ return wxBrowserInfo(browserId, browserName, userAgent, browserVersion); -+} -+ -+void EmscriptenDoLaunchBrowser(const wxString& url) -+{ -+ EM_ASM({ -+ openUrl(UTF8ToString($0)) -+ }, static_cast(url.utf8_str())); -+} -+ -+void EmscriptenDoLaunchBrowserAsync(void *arg) -+{ -+ wxString *url = static_cast(arg); -+ EmscriptenDoLaunchBrowser(*url); -+ delete url; -+} -+ -+bool wxDoLaunchDefaultBrowser(const wxLaunchBrowserParams& params) -+{ -+ // TODO: handle wxBROWSER_NEW_WINDOW flag -+ -+ if (emscripten_is_main_runtime_thread()) -+ { -+ EmscriptenDoLaunchBrowser(params.url); -+ } -+ else -+ { -+ emscripten_async_run_in_main_runtime_thread(EM_FUNC_SIG_VI, -+ &EmscriptenDoLaunchBrowserAsync, -+ new wxString(params.url)); -+ } -+ -+ return true; -+} -+ -+void wxBell() -+{ -+} -+ -diff --git a/src/wasm/window.cpp b/src/wasm/window.cpp -new file mode 100644 -index 0000000000..d6d0286d18 ---- /dev/null -+++ b/src/wasm/window.cpp -@@ -0,0 +1,706 @@ -+///////////////////////////////////////////////////////////////////////////// -+// Name: wx/wasm/window.cpp -+// Purpose: wxWasmWindow implementation -+// Author: Adam Hilss -+// Copyright: (c) 2022 Adam Hilss -+// Licence: LGPL v2 -+///////////////////////////////////////////////////////////////////////////// -+ -+#include "wx/wxprec.h" -+ -+#include "wx/window.h" -+ -+#include "wx/app.h" -+#include "wx/caret.h" -+#include "wx/dcclient.h" -+#include "wx/dnd.h" -+#include "wx/log.h" -+#include "wx/menu.h" -+#include "wx/nonownedwnd.h" -+#include "wx/wasm/private/display.h" -+ -+#define TRACE_WINDOW wxT("window") -+#define TRACE_PAINT wxT("paint") -+ -+wxWindow *g_mouseWindow = NULL; -+ -+static wxWindowWasm *gs_focusWindow = NULL; -+static wxWindowWasm *gs_nextFocusWindow = NULL; -+static wxWindowWasm *gs_captureWindow = NULL; -+ -+// ---------------------------------------------------------------------------- -+// wxWindowWasm -+// ---------------------------------------------------------------------------- -+ -+// in wxUniv/MSW this class is abstract because it doesn't have DoPopupMenu() -+// method -+#ifdef __WXUNIVERSAL__ -+IMPLEMENT_ABSTRACT_CLASS(wxWindowWasm, wxWindowBase) -+#endif // __WXUNIVERSAL__ -+ -+wxWindowWasm::wxWindowWasm() -+{ -+ Init(); -+} -+ -+wxWindowWasm::wxWindowWasm(wxWindow *parent, -+ wxWindowID id, -+ const wxPoint& pos, -+ const wxSize& size, -+ long style, -+ const wxString& name) -+{ -+ Init(); -+ bool retval = wxWindowWasm::Create(parent, id, pos, size, style, name); -+ wxASSERT_MSG(retval, wxT("error creating window")); -+} -+ -+wxWindowWasm::~wxWindowWasm() -+{ -+ SendDestroyEvent(); -+ -+ if (g_mouseWindow == this) -+ { -+ g_mouseWindow = NULL; -+ } -+ if (gs_focusWindow == this) -+ { -+ gs_focusWindow = NULL; -+ } -+ if (gs_nextFocusWindow == this) -+ { -+ gs_nextFocusWindow = NULL; -+ } -+ if (gs_captureWindow == this) -+ { -+ wxFAIL_MSG(wxT("Destroying window with mouse capture")); -+ ReleaseMouse(); -+ } -+ -+ DestroyChildren(); -+} -+ -+void wxWindowWasm::Init() -+{ -+ m_x = 0; -+ m_y = 0; -+ m_width = 0; -+ m_height = 0; -+ -+ m_childNeedsPaint = true; -+ m_selfNeedsPaint = true; -+} -+ -+bool wxWindowWasm::Create(wxWindow *parent, -+ wxWindowID id, -+ const wxPoint& pos, -+ const wxSize& size, -+ long style, -+ const wxString& name) -+{ -+ //printf("wxWindowWasm::Create\n"); -+ if (!CreateBase(parent, id, pos, size, style, wxDefaultValidator, name)) -+ { -+ return false; -+ } -+ -+ if (parent) -+ { -+ parent->AddChild(this); -+ } -+ -+ int x = pos.x; -+ int y = pos.y; -+ if (x == wxDefaultCoord) -+ { -+ x = 0; -+ } -+ if (y == wxDefaultCoord) -+ { -+ y = 0; -+ } -+ int w = WidthDefault(size.x); -+ int h = HeightDefault(size.y); -+ SetSize(x, y, w, h); -+ -+ return true; -+} -+ -+void wxWindowWasm::Raise() -+{ -+ if (GetParent()) -+ { -+ wxWindowList& children = GetParent()->GetChildren(); -+ children.DeleteObject(this); -+ children.Append(this); -+ } -+} -+ -+void wxWindowWasm::Lower() -+{ -+ if (GetParent()) -+ { -+ wxWindowList& children = GetParent()->GetChildren(); -+ children.DeleteObject(this); -+ children.Insert(this); -+ } -+} -+ -+bool wxWindowWasm::Show(bool show) -+{ -+ if (wxWindowBase::Show(show)) -+ { -+ if (show) -+ { -+ Refresh(); -+ } -+ else if (GetParent()) -+ { -+ GetParent()->Refresh(); -+ } -+ -+ wxShowEvent eventShow(GetId(), show); -+ eventShow.SetEventObject(this); -+ HandleWindowEvent(eventShow); -+ -+ return true; -+ } -+ else -+ { -+ return false; -+ } -+} -+ -+void wxWindowWasm::SetFocus() -+{ -+ if ( gs_focusWindow == this || !CanAcceptFocus() ) -+ return; // nothing to do, focused already -+ -+ wxWindowWasm *prevFocusWindow = gs_focusWindow; -+ -+ if (gs_focusWindow != NULL) -+ { -+ gs_nextFocusWindow = this; -+ gs_focusWindow->KillFocus(); -+ gs_nextFocusWindow = NULL; -+ } -+ -+ gs_focusWindow = this; -+ -+ wxChildFocusEvent eventFocus(static_cast(this)); -+ HandleWindowEvent(eventFocus); -+ -+ wxFocusEvent event(wxEVT_SET_FOCUS, GetId()); -+ event.SetEventObject(this); -+ event.SetWindow(static_cast(prevFocusWindow)); -+ HandleWindowEvent(event); -+ -+#if wxUSE_CARET -+ // caret needs to be informed about focus change -+ wxCaret *caret = GetCaret(); -+ if ( caret ) -+ caret->OnSetFocus(); -+#endif // wxUSE_CARET -+} -+ -+void wxWindowWasm::KillFocus() -+{ -+ wxCHECK_RET(gs_focusWindow == this, -+ "killing focus on window that doesn't have it" ); -+ -+ gs_focusWindow = NULL; -+ -+ if ( m_isBeingDeleted ) -+ return; // don't send any events from dtor -+ -+#if wxUSE_CARET -+ // caret needs to be informed about focus change -+ wxCaret *caret = GetCaret(); -+ if ( caret ) -+ caret->OnKillFocus(); -+#endif // wxUSE_CARET -+ -+ wxFocusEvent event(wxEVT_KILL_FOCUS, GetId()); -+ event.SetEventObject(this); -+ event.SetWindow(static_cast(gs_nextFocusWindow)); -+ HandleWindowEvent(event); -+} -+ -+void wxWindowWasm::WarpPointer(int WXUNUSED(x), int WXUNUSED(y)) -+{ -+ wxFAIL_MSG("WarpPointer is not supported"); -+} -+ -+void wxWindowWasm::Refresh(bool WXUNUSED(eraseBackground), const wxRect *WXUNUSED(rect)) -+{ -+ //printf("Refresh: %p %d %d\n", this, IsShown(), IsFrozen()); -+ if (!IsShown() || IsFrozen()) -+ { -+ return; -+ } -+ -+ Invalidate(true); -+} -+ -+bool wxWindowWasm::HasTransparentBackground() -+{ -+ return GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT || -+ GetBackgroundColour().Alpha() == 0; -+} -+ -+void wxWindowWasm::Invalidate(bool needsPaint) -+{ -+ if (!m_childNeedsPaint || m_selfNeedsPaint != needsPaint) -+ { -+ m_selfNeedsPaint |= needsPaint; -+ m_childNeedsPaint = true; -+ -+ if (GetParent()) -+ { -+ bool parentNeedsPaint = needsPaint && HasTransparentBackground(); -+ GetParent()->Invalidate(parentNeedsPaint); -+ } -+ } -+} -+ -+void wxWindowWasm::EraseBackgroundWindow() -+{ -+ //printf("EraseBackgroundWindow\n"); -+ wxWindowDC dc(static_cast(this)); -+ wxEraseEvent eraseEvent(GetId(), &dc); -+ eraseEvent.SetEventObject(this); -+ HandleWindowEvent(eraseEvent); -+} -+ -+void wxWindowWasm::PaintSelf() -+{ -+ //wxRect r = GetScreenRect(); -+ //printf("PaintSelf: %p %d %d %d %d\n", -+ // this, r.GetX(), r.GetY(), r.GetWidth(), r.GetHeight()); -+ -+ EraseBackgroundWindow(); -+ -+ if (GetClientRect() != GetRect()) -+ { -+ wxNcPaintEvent ncPaintEvent(this); -+ HandleWindowEvent(ncPaintEvent); -+ } -+ -+ wxPaintEvent paintEvent(this); -+ HandleWindowEvent(paintEvent); -+ -+ m_selfNeedsPaint = false; -+} -+ -+void wxWindowWasm::PaintChildren(bool selfWasPainted) -+{ -+ //printf("PaintChildren: %p\n", this); -+ wxWindowList& children = GetChildren(); -+ -+ for (wxWindowList::iterator i = children.begin(); i != children.end(); ++i) -+ { -+ wxWindow *child = *i; -+ -+ wxASSERT(child); -+ -+ if (!child->IsFrozen() && child->IsShown()) -+ { -+ if (child->NeedsPaint() || selfWasPainted) -+ { -+ child->DoPaint(selfWasPainted); -+ } -+ } -+ } -+ -+ m_childNeedsPaint = false; -+} -+ -+void wxWindowWasm::DoPaint(bool parentWasPainted) -+{ -+ wxSize clientSize = GetClientSize(); -+ //printf("DoPaint: %p %d %d\n", -+ // this, clientSize.GetWidth(), clientSize.GetHeight()); -+ -+ if (clientSize.GetWidth() <= 0 || clientSize.GetHeight() <= 0) -+ { -+ return; -+ } -+ -+ if (IsShown() && !IsFrozen()) -+ { -+ m_updateRegion = wxRect(GetSize()); -+ -+ bool selfWasPainted; -+ if (m_selfNeedsPaint || parentWasPainted) -+ { -+ PaintSelf(); -+ selfWasPainted = true; -+ } -+ else -+ { -+ selfWasPainted = false; -+ } -+ -+ //if (m_childNeedsPaint || selfWasPainted) { -+ PaintChildren(selfWasPainted); -+ //} -+ -+ m_updateRegion.Clear(); -+ } -+} -+ -+bool wxWindowWasm::SetFont(const wxFont& font) -+{ -+ m_font = font; -+ return true; -+} -+ -+bool wxWindowWasm::SetCursor(const wxCursor &cursor) -+{ -+ if (!wxWindowBase::SetCursor(cursor)) -+ { -+ return false; -+ } -+ -+ bool mouseInsideWindow = GetScreenRect().Contains(wxGetMousePosition()); -+ -+ if (GetCapture() == NULL && mouseInsideWindow) -+ { -+ if (cursor.IsOk()) -+ { -+ wxSetCursor(cursor); -+ } -+ else -+ { -+ wxSetCursor(*wxSTANDARD_CURSOR); -+ } -+ } -+ -+ return true; -+} -+ -+int wxWindowWasm::GetCharWidth() const -+{ -+ wxCoord charWidth; -+ m_font.GetCharSize(&charWidth, NULL); -+ return charWidth; -+} -+ -+int wxWindowWasm::GetCharHeight() const -+{ -+ wxCoord charHeight; -+ m_font.GetCharSize(NULL, &charHeight); -+ return charHeight; -+} -+ -+double wxWindowWasm::GetContentScaleFactor() const -+{ -+ return wxContentScaleFactor(); -+} -+ -+double wxWindowWasm::GetDPIScaleFactor() const -+{ -+ -+ return GetContentScaleFactor(); -+} -+ -+void wxWindowWasm::DoGetTextExtent(const wxString& string, -+ int *x, int *y, -+ int *descent, -+ int *externalLeading, -+ const wxFont *theFont) const -+{ -+ const wxFont *font = (!theFont || !theFont->IsOk()) ? &m_font : theFont; -+ font->GetTextExtent(string, x, y, descent, externalLeading); -+} -+ -+#if wxUSE_DRAG_AND_DROP -+void wxWindowWasm::SetDropTarget(wxDropTarget *dropTarget) -+{ -+ delete m_dropTarget; -+ m_dropTarget = dropTarget; -+} -+#endif // wxUSE_DRAG_AND_DROP -+ -+wxNonOwnedWindow* wxWindowWasm::GetTopLevelWindow() -+{ -+ wxWindowWasm* window = this; -+ -+ while (!window->IsTopLevel()) -+ { -+ window = window->GetParent(); -+ } -+ -+ return static_cast(window); -+} -+ -+static wxPoint GetScreenPositionOfClientOrigin(const wxWindowWasm *win) -+{ -+ wxCHECK_MSG(win, wxPoint(0, 0), "no window provided"); -+ -+ wxPoint pt(win->GetPosition() + win->GetClientAreaOrigin()); -+ -+ if (!win->IsTopLevel()) -+ { -+ pt += GetScreenPositionOfClientOrigin(win->GetParent()); -+ } -+ -+ return pt; -+} -+ -+void wxWindowWasm::DoClientToScreen(int *x, int *y) const -+{ -+ wxPoint origin = GetScreenPositionOfClientOrigin(this); -+ -+ if (x) -+ { -+ *x += origin.x; -+ } -+ if (y) -+ { -+ *y += origin.y; -+ } -+} -+ -+void wxWindowWasm::DoScreenToClient(int *x, int *y) const -+{ -+ wxPoint origin = GetScreenPositionOfClientOrigin(this); -+ -+ if (x) -+ { -+ *x -= origin.x; -+ } -+ if (y) -+ { -+ *y -= origin.y; -+ } -+} -+ -+void wxWindowWasm::DoGetPosition(int *x, int *y) const -+{ -+ if (x) -+ { -+ *x = m_x; -+ } -+ if (y) -+ { -+ *y = m_y; -+ } -+} -+ -+void wxWindowWasm::DoGetSize(int *width, int *height) const -+{ -+ if (width) -+ { -+ *width = m_width; -+ } -+ if (height) -+ { -+ *height = m_height; -+ } -+} -+ -+void wxWindowWasm::DoGetClientSize(int *width, int *height) const -+{ -+ DoGetSize(width, height); -+} -+ -+void wxWindowWasm::DoSetSize(int x, int y, -+ int width, int height, -+ int sizeFlags) -+{ -+ //printf("DoSetSize: %d %d %d %d\n", x, y, width, height); -+ int currentX, currentY; -+ DoGetPosition(¤tX, ¤tY); -+ int currentW, currentH; -+ DoGetSize(¤tW, ¤tH); -+ -+ if ((x == wxDefaultCoord) && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) -+ { -+ x = currentX; -+ } -+ if ((y == wxDefaultCoord) && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) -+ { -+ y = currentY; -+ } -+ -+ -+ wxSize size(wxDefaultSize); -+ -+ if (width == wxDefaultCoord) -+ { -+ if (sizeFlags & wxSIZE_AUTO_WIDTH) -+ { -+ size = DoGetBestSize(); -+ width = size.x; -+ } -+ else -+ { -+ width = currentW; -+ } -+ } -+ if (height == wxDefaultCoord) -+ { -+ if (sizeFlags & wxSIZE_AUTO_HEIGHT) -+ { -+ if (size.x == wxDefaultCoord) -+ { -+ size = DoGetBestSize(); -+ } -+ height = size.y; -+ } -+ else -+ { -+ height = currentH; -+ } -+ } -+ -+ /* -+ int maxWidth = GetMaxWidth(); -+ int minWidth = GetMinWidth(); -+ int maxHeight = GetMaxHeight(); -+ int minHeight = GetMinHeight(); -+ if (minWidth != wxDefaultCoord && width < minWidth) -+ width = minWidth; -+ if (maxWidth != wxDefaultCoord && width > maxWidth) -+ width = maxWidth; -+ if (minHeight != wxDefaultCoord && height < minHeight) -+ height = minHeight; -+ if (maxHeight != wxDefaultCoord && height > maxHeight) -+ height = maxHeight; -+ */ -+ -+ if (x != currentX || y != currentY || width != currentW || height != currentH) -+ { -+ Invalidate(true); -+ -+ AdjustForParentClientOrigin(x, y, sizeFlags); -+ DoMoveWindow(x, y, width, height); -+ -+ wxSize newSize(width, height); -+ wxSizeEvent event(newSize, GetId()); -+ event.SetEventObject(this); -+ HandleWindowEvent(event); -+ } -+} -+ -+void wxWindowWasm::DoSetClientSize(int width, int height) -+{ -+ SetSize(width, height); -+} -+ -+void wxWindowWasm::DoMoveWindow(int x, int y, int width, int height) -+{ -+ if (IsTopLevel() && GetTopLevelWindow()->IsMainFrame()) -+ { -+ x = 0; -+ y = 0; -+ } -+ -+ wxPoint parentOrigin(0, 0); -+ AdjustForParentClientOrigin(parentOrigin.x, parentOrigin.y); -+ -+ int clientX = x - parentOrigin.x; -+ int clientY = y - parentOrigin.y; -+ -+ if (m_x != clientX || m_y != clientY || m_width != width || m_height != height) -+ { -+ wxRect oldPos = wxRect(m_x, m_y, m_width, m_height); -+ oldPos.Offset(parentOrigin); -+ -+ wxRect newPos = wxRect(x, y, width, height); -+ -+ m_x = clientX; -+ m_y = clientY; -+ m_width = width; -+ m_height = height; -+ -+ wxWindow *parent = GetParent(); -+ -+ if (parent != NULL) -+ { -+ parent->RefreshRect(oldPos); -+ parent->RefreshRect(newPos); -+ } -+ } -+} -+ -+void wxWindowWasm::DoEnable(bool enable) -+{ -+ if (!enable && HasFocus()) -+ { -+ KillFocus(); -+ } -+} -+ -+void wxWindowWasm::DoCaptureMouse() -+{ -+ gs_captureWindow = this; -+} -+ -+void wxWindowWasm::DoReleaseMouse() -+{ -+ wxASSERT_MSG(gs_captureWindow == this, wxT("attempt to release mouse, but this window hasn't captured it")); -+ -+ gs_captureWindow = NULL; -+} -+ -+void wxWindowWasm::DoThaw() -+{ -+ if (IsShown()) -+ { -+ Invalidate(true); -+ } -+} -+ -+// ---------------------------------------------------------------------------- -+// this wxWindowBase function is implemented here (in platform-specific file) -+// because it is static and so couldn't be made virtual -+// ---------------------------------------------------------------------------- -+ -+/* static */ -+wxWindow *wxWindowBase::DoFindFocus() -+{ -+ return static_cast(gs_focusWindow); -+} -+ -+/* static */ -+wxWindow *wxWindowBase::GetCapture() -+{ -+ return static_cast(gs_captureWindow); -+} -+ -+wxWindow *wxGetActiveWindow() -+{ -+ return wxWindow::FindFocus(); -+} -+ -+void wxGetMousePosition(int* x, int* y) -+{ -+ wxTheApp->GetMousePosition(x, y); -+} -+ -+wxPoint wxGetMousePosition() -+{ -+ wxPoint point; -+ wxGetMousePosition(&point.x, &point.y); -+ return point; -+} -+ -+wxMouseState wxGetMouseState() -+{ -+ wxMouseState mouseState; -+ wxTheApp->GetMouseState(&mouseState); -+ return mouseState; -+} -+ -+bool wxGetKeyState(wxKeyCode keyCode) -+{ -+ return wxTheApp->IsKeyPressed(keyCode); -+} -+ -+wxWindow* wxFindWindowAtPoint(const wxPoint& pt) -+{ -+ return wxGenericFindWindowAtPoint(pt); -+} -+ -diff --git a/3rdparty/pcre/config.sub b/3rdparty/pcre/config.sub -index 1d8e98bc..f1bee4ef 100755 ---- a/3rdparty/pcre/config.sub -+++ b/3rdparty/pcre/config.sub -@@ -1,8 +1,8 @@ - #! /bin/sh - # Configuration validation subroutine script. --# Copyright 1992-2018 Free Software Foundation, Inc. -+# Copyright 1992-2021 Free Software Foundation, Inc. - --timestamp='2018-02-22' -+timestamp='2021-03-10' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -33,7 +33,7 @@ timestamp='2018-02-22' - # Otherwise, we print the canonical config type on stdout and succeed. - - # You can get the latest version of this script from: --# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub -+# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub - - # This file is supposed to be the same for all GNU packages - # and recognize all the CPU types, system types and aliases -@@ -50,7 +50,7 @@ timestamp='2018-02-22' - # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM - # It is wrong to echo any other type of specification. - --me=`echo "$0" | sed -e 's,.*/,,'` -+me=$(echo "$0" | sed -e 's,.*/,,') - - usage="\ - Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS -@@ -67,7 +67,7 @@ Report bugs and patches to ." - version="\ - GNU config.sub ($timestamp) - --Copyright 1992-2018 Free Software Foundation, Inc. -+Copyright 1992-2021 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -89,7 +89,7 @@ while test $# -gt 0 ; do - - ) # Use stdin as input. - break ;; - -* ) -- echo "$me: invalid option $1$help" -+ echo "$me: invalid option $1$help" >&2 - exit 1 ;; - - *local*) -@@ -110,1223 +110,1176 @@ case $# in - exit 1;; - esac - --# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). --# Here we must recognize all the valid KERNEL-OS combinations. --maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` --case $maybe_os in -- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ -- linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ -- knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ -- kopensolaris*-gnu* | cloudabi*-eabi* | \ -- storm-chaos* | os2-emx* | rtmk-nova*) -- os=-$maybe_os -- basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` -- ;; -- android-linux) -- os=-linux-android -- basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown -- ;; -- *) -- basic_machine=`echo "$1" | sed 's/-[^-]*$//'` -- if [ "$basic_machine" != "$1" ] -- then os=`echo "$1" | sed 's/.*-/-/'` -- else os=; fi -- ;; --esac -+# Split fields of configuration type -+# shellcheck disable=SC2162 -+IFS="-" read field1 field2 field3 field4 <&2 -+ exit 1 - ;; -- -lynx*) -- os=-lynxos -+ *-*-*-*) -+ basic_machine=$field1-$field2 -+ basic_os=$field3-$field4 - ;; -- -ptx*) -- basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` -+ *-*-*) -+ # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two -+ # parts -+ maybe_os=$field2-$field3 -+ case $maybe_os in -+ nto-qnx* | linux-* | uclinux-uclibc* \ -+ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ -+ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ -+ | storm-chaos* | os2-emx* | rtmk-nova*) -+ basic_machine=$field1 -+ basic_os=$maybe_os -+ ;; -+ android-linux) -+ basic_machine=$field1-unknown -+ basic_os=linux-android -+ ;; -+ *) -+ basic_machine=$field1-$field2 -+ basic_os=$field3 -+ ;; -+ esac - ;; -- -psos*) -- os=-psos -+ *-*) -+ # A lone config we happen to match not fitting any pattern -+ case $field1-$field2 in -+ decstation-3100) -+ basic_machine=mips-dec -+ basic_os= -+ ;; -+ *-*) -+ # Second component is usually, but not always the OS -+ case $field2 in -+ # Prevent following clause from handling this valid os -+ sun*os*) -+ basic_machine=$field1 -+ basic_os=$field2 -+ ;; -+ # Manufacturers -+ dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ -+ | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ -+ | unicom* | ibm* | next | hp | isi* | apollo | altos* \ -+ | convergent* | ncr* | news | 32* | 3600* | 3100* \ -+ | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ -+ | ultra | tti* | harris | dolphin | highlevel | gould \ -+ | cbm | ns | masscomp | apple | axis | knuth | cray \ -+ | microblaze* | sim | cisco \ -+ | oki | wec | wrs | winbond) -+ basic_machine=$field1-$field2 -+ basic_os= -+ ;; -+ *) -+ basic_machine=$field1 -+ basic_os=$field2 -+ ;; -+ esac -+ ;; -+ esac - ;; -- -mint | -mint[0-9]*) -- basic_machine=m68k-atari -- os=-mint -+ *) -+ # Convert single-component short-hands not valid as part of -+ # multi-component configurations. -+ case $field1 in -+ 386bsd) -+ basic_machine=i386-pc -+ basic_os=bsd -+ ;; -+ a29khif) -+ basic_machine=a29k-amd -+ basic_os=udi -+ ;; -+ adobe68k) -+ basic_machine=m68010-adobe -+ basic_os=scout -+ ;; -+ alliant) -+ basic_machine=fx80-alliant -+ basic_os= -+ ;; -+ altos | altos3068) -+ basic_machine=m68k-altos -+ basic_os= -+ ;; -+ am29k) -+ basic_machine=a29k-none -+ basic_os=bsd -+ ;; -+ amdahl) -+ basic_machine=580-amdahl -+ basic_os=sysv -+ ;; -+ amiga) -+ basic_machine=m68k-unknown -+ basic_os= -+ ;; -+ amigaos | amigados) -+ basic_machine=m68k-unknown -+ basic_os=amigaos -+ ;; -+ amigaunix | amix) -+ basic_machine=m68k-unknown -+ basic_os=sysv4 -+ ;; -+ apollo68) -+ basic_machine=m68k-apollo -+ basic_os=sysv -+ ;; -+ apollo68bsd) -+ basic_machine=m68k-apollo -+ basic_os=bsd -+ ;; -+ aros) -+ basic_machine=i386-pc -+ basic_os=aros -+ ;; -+ aux) -+ basic_machine=m68k-apple -+ basic_os=aux -+ ;; -+ balance) -+ basic_machine=ns32k-sequent -+ basic_os=dynix -+ ;; -+ blackfin) -+ basic_machine=bfin-unknown -+ basic_os=linux -+ ;; -+ cegcc) -+ basic_machine=arm-unknown -+ basic_os=cegcc -+ ;; -+ convex-c1) -+ basic_machine=c1-convex -+ basic_os=bsd -+ ;; -+ convex-c2) -+ basic_machine=c2-convex -+ basic_os=bsd -+ ;; -+ convex-c32) -+ basic_machine=c32-convex -+ basic_os=bsd -+ ;; -+ convex-c34) -+ basic_machine=c34-convex -+ basic_os=bsd -+ ;; -+ convex-c38) -+ basic_machine=c38-convex -+ basic_os=bsd -+ ;; -+ cray) -+ basic_machine=j90-cray -+ basic_os=unicos -+ ;; -+ crds | unos) -+ basic_machine=m68k-crds -+ basic_os= -+ ;; -+ da30) -+ basic_machine=m68k-da30 -+ basic_os= -+ ;; -+ decstation | pmax | pmin | dec3100 | decstatn) -+ basic_machine=mips-dec -+ basic_os= -+ ;; -+ delta88) -+ basic_machine=m88k-motorola -+ basic_os=sysv3 -+ ;; -+ dicos) -+ basic_machine=i686-pc -+ basic_os=dicos -+ ;; -+ djgpp) -+ basic_machine=i586-pc -+ basic_os=msdosdjgpp -+ ;; -+ ebmon29k) -+ basic_machine=a29k-amd -+ basic_os=ebmon -+ ;; -+ es1800 | OSE68k | ose68k | ose | OSE) -+ basic_machine=m68k-ericsson -+ basic_os=ose -+ ;; -+ gmicro) -+ basic_machine=tron-gmicro -+ basic_os=sysv -+ ;; -+ go32) -+ basic_machine=i386-pc -+ basic_os=go32 -+ ;; -+ h8300hms) -+ basic_machine=h8300-hitachi -+ basic_os=hms -+ ;; -+ h8300xray) -+ basic_machine=h8300-hitachi -+ basic_os=xray -+ ;; -+ h8500hms) -+ basic_machine=h8500-hitachi -+ basic_os=hms -+ ;; -+ harris) -+ basic_machine=m88k-harris -+ basic_os=sysv3 -+ ;; -+ hp300 | hp300hpux) -+ basic_machine=m68k-hp -+ basic_os=hpux -+ ;; -+ hp300bsd) -+ basic_machine=m68k-hp -+ basic_os=bsd -+ ;; -+ hppaosf) -+ basic_machine=hppa1.1-hp -+ basic_os=osf -+ ;; -+ hppro) -+ basic_machine=hppa1.1-hp -+ basic_os=proelf -+ ;; -+ i386mach) -+ basic_machine=i386-mach -+ basic_os=mach -+ ;; -+ isi68 | isi) -+ basic_machine=m68k-isi -+ basic_os=sysv -+ ;; -+ m68knommu) -+ basic_machine=m68k-unknown -+ basic_os=linux -+ ;; -+ magnum | m3230) -+ basic_machine=mips-mips -+ basic_os=sysv -+ ;; -+ merlin) -+ basic_machine=ns32k-utek -+ basic_os=sysv -+ ;; -+ mingw64) -+ basic_machine=x86_64-pc -+ basic_os=mingw64 -+ ;; -+ mingw32) -+ basic_machine=i686-pc -+ basic_os=mingw32 -+ ;; -+ mingw32ce) -+ basic_machine=arm-unknown -+ basic_os=mingw32ce -+ ;; -+ monitor) -+ basic_machine=m68k-rom68k -+ basic_os=coff -+ ;; -+ morphos) -+ basic_machine=powerpc-unknown -+ basic_os=morphos -+ ;; -+ moxiebox) -+ basic_machine=moxie-unknown -+ basic_os=moxiebox -+ ;; -+ msdos) -+ basic_machine=i386-pc -+ basic_os=msdos -+ ;; -+ msys) -+ basic_machine=i686-pc -+ basic_os=msys -+ ;; -+ mvs) -+ basic_machine=i370-ibm -+ basic_os=mvs -+ ;; -+ nacl) -+ basic_machine=le32-unknown -+ basic_os=nacl -+ ;; -+ emscripten) -+ basic_machine=asmjs-unknown -+ basic_os=emscripten -+ ;; -+ ncr3000) -+ basic_machine=i486-ncr -+ basic_os=sysv4 -+ ;; -+ netbsd386) -+ basic_machine=i386-pc -+ basic_os=netbsd -+ ;; -+ netwinder) -+ basic_machine=armv4l-rebel -+ basic_os=linux -+ ;; -+ news | news700 | news800 | news900) -+ basic_machine=m68k-sony -+ basic_os=newsos -+ ;; -+ news1000) -+ basic_machine=m68030-sony -+ basic_os=newsos -+ ;; -+ necv70) -+ basic_machine=v70-nec -+ basic_os=sysv -+ ;; -+ nh3000) -+ basic_machine=m68k-harris -+ basic_os=cxux -+ ;; -+ nh[45]000) -+ basic_machine=m88k-harris -+ basic_os=cxux -+ ;; -+ nindy960) -+ basic_machine=i960-intel -+ basic_os=nindy -+ ;; -+ mon960) -+ basic_machine=i960-intel -+ basic_os=mon960 -+ ;; -+ nonstopux) -+ basic_machine=mips-compaq -+ basic_os=nonstopux -+ ;; -+ os400) -+ basic_machine=powerpc-ibm -+ basic_os=os400 -+ ;; -+ OSE68000 | ose68000) -+ basic_machine=m68000-ericsson -+ basic_os=ose -+ ;; -+ os68k) -+ basic_machine=m68k-none -+ basic_os=os68k -+ ;; -+ paragon) -+ basic_machine=i860-intel -+ basic_os=osf -+ ;; -+ parisc) -+ basic_machine=hppa-unknown -+ basic_os=linux -+ ;; -+ psp) -+ basic_machine=mipsallegrexel-sony -+ basic_os=psp -+ ;; -+ pw32) -+ basic_machine=i586-unknown -+ basic_os=pw32 -+ ;; -+ rdos | rdos64) -+ basic_machine=x86_64-pc -+ basic_os=rdos -+ ;; -+ rdos32) -+ basic_machine=i386-pc -+ basic_os=rdos -+ ;; -+ rom68k) -+ basic_machine=m68k-rom68k -+ basic_os=coff -+ ;; -+ sa29200) -+ basic_machine=a29k-amd -+ basic_os=udi -+ ;; -+ sei) -+ basic_machine=mips-sei -+ basic_os=seiux -+ ;; -+ sequent) -+ basic_machine=i386-sequent -+ basic_os= -+ ;; -+ sps7) -+ basic_machine=m68k-bull -+ basic_os=sysv2 -+ ;; -+ st2000) -+ basic_machine=m68k-tandem -+ basic_os= -+ ;; -+ stratus) -+ basic_machine=i860-stratus -+ basic_os=sysv4 -+ ;; -+ sun2) -+ basic_machine=m68000-sun -+ basic_os= -+ ;; -+ sun2os3) -+ basic_machine=m68000-sun -+ basic_os=sunos3 -+ ;; -+ sun2os4) -+ basic_machine=m68000-sun -+ basic_os=sunos4 -+ ;; -+ sun3) -+ basic_machine=m68k-sun -+ basic_os= -+ ;; -+ sun3os3) -+ basic_machine=m68k-sun -+ basic_os=sunos3 -+ ;; -+ sun3os4) -+ basic_machine=m68k-sun -+ basic_os=sunos4 -+ ;; -+ sun4) -+ basic_machine=sparc-sun -+ basic_os= -+ ;; -+ sun4os3) -+ basic_machine=sparc-sun -+ basic_os=sunos3 -+ ;; -+ sun4os4) -+ basic_machine=sparc-sun -+ basic_os=sunos4 -+ ;; -+ sun4sol2) -+ basic_machine=sparc-sun -+ basic_os=solaris2 -+ ;; -+ sun386 | sun386i | roadrunner) -+ basic_machine=i386-sun -+ basic_os= -+ ;; -+ sv1) -+ basic_machine=sv1-cray -+ basic_os=unicos -+ ;; -+ symmetry) -+ basic_machine=i386-sequent -+ basic_os=dynix -+ ;; -+ t3e) -+ basic_machine=alphaev5-cray -+ basic_os=unicos -+ ;; -+ t90) -+ basic_machine=t90-cray -+ basic_os=unicos -+ ;; -+ toad1) -+ basic_machine=pdp10-xkl -+ basic_os=tops20 -+ ;; -+ tpf) -+ basic_machine=s390x-ibm -+ basic_os=tpf -+ ;; -+ udi29k) -+ basic_machine=a29k-amd -+ basic_os=udi -+ ;; -+ ultra3) -+ basic_machine=a29k-nyu -+ basic_os=sym1 -+ ;; -+ v810 | necv810) -+ basic_machine=v810-nec -+ basic_os=none -+ ;; -+ vaxv) -+ basic_machine=vax-dec -+ basic_os=sysv -+ ;; -+ vms) -+ basic_machine=vax-dec -+ basic_os=vms -+ ;; -+ vsta) -+ basic_machine=i386-pc -+ basic_os=vsta -+ ;; -+ vxworks960) -+ basic_machine=i960-wrs -+ basic_os=vxworks -+ ;; -+ vxworks68) -+ basic_machine=m68k-wrs -+ basic_os=vxworks -+ ;; -+ vxworks29k) -+ basic_machine=a29k-wrs -+ basic_os=vxworks -+ ;; -+ wasm32 | wasm32_simd128) -+ basic_machine=wasm32-unknown -+ ;; -+ xbox) -+ basic_machine=i686-pc -+ basic_os=mingw32 -+ ;; -+ ymp) -+ basic_machine=ymp-cray -+ basic_os=unicos -+ ;; -+ *) -+ basic_machine=$1 -+ basic_os= -+ ;; -+ esac - ;; - esac - --# Decode aliases for certain CPU-COMPANY combinations. -+# Decode 1-component or ad-hoc basic machines - case $basic_machine in -- # Recognize the basic CPU types without company name. -- # Some are omitted here because they have special meanings below. -- 1750a | 580 \ -- | a29k \ -- | aarch64 | aarch64_be \ -- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ -- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ -- | am33_2.0 \ -- | arc | arceb \ -- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ -- | avr | avr32 \ -- | ba \ -- | be32 | be64 \ -- | bfin \ -- | c4x | c8051 | clipper \ -- | d10v | d30v | dlx | dsp16xx \ -- | e2k | epiphany \ -- | fido | fr30 | frv | ft32 \ -- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -- | hexagon \ -- | i370 | i860 | i960 | ia16 | ia64 \ -- | ip2k | iq2000 \ -- | k1om \ -- | le32 | le64 \ -- | lm32 \ -- | m32c | m32r | m32rle | m68000 | m68k | m88k \ -- | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ -- | mips | mipsbe | mipseb | mipsel | mipsle \ -- | mips16 \ -- | mips64 | mips64el \ -- | mips64octeon | mips64octeonel \ -- | mips64orion | mips64orionel \ -- | mips64r5900 | mips64r5900el \ -- | mips64vr | mips64vrel \ -- | mips64vr4100 | mips64vr4100el \ -- | mips64vr4300 | mips64vr4300el \ -- | mips64vr5000 | mips64vr5000el \ -- | mips64vr5900 | mips64vr5900el \ -- | mipsisa32 | mipsisa32el \ -- | mipsisa32r2 | mipsisa32r2el \ -- | mipsisa32r6 | mipsisa32r6el \ -- | mipsisa64 | mipsisa64el \ -- | mipsisa64r2 | mipsisa64r2el \ -- | mipsisa64r6 | mipsisa64r6el \ -- | mipsisa64sb1 | mipsisa64sb1el \ -- | mipsisa64sr71k | mipsisa64sr71kel \ -- | mipsr5900 | mipsr5900el \ -- | mipstx39 | mipstx39el \ -- | mn10200 | mn10300 \ -- | moxie \ -- | mt \ -- | msp430 \ -- | nds32 | nds32le | nds32be \ -- | nios | nios2 | nios2eb | nios2el \ -- | ns16k | ns32k \ -- | open8 | or1k | or1knd | or32 \ -- | pdp10 | pj | pjl \ -- | powerpc | powerpc64 | powerpc64le | powerpcle \ -- | pru \ -- | pyramid \ -- | riscv32 | riscv64 \ -- | rl78 | rx \ -- | score \ -- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ -- | sh64 | sh64le \ -- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ -- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -- | spu \ -- | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ -- | ubicom32 \ -- | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ -- | visium \ -- | wasm32 \ -- | x86 | xc16x | xstormy16 | xtensa \ -- | z8k | z80) -- basic_machine=$basic_machine-unknown -- ;; -- c54x) -- basic_machine=tic54x-unknown -- ;; -- c55x) -- basic_machine=tic55x-unknown -- ;; -- c6x) -- basic_machine=tic6x-unknown -- ;; -- leon|leon[3-9]) -- basic_machine=sparc-$basic_machine -- ;; -- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) -- basic_machine=$basic_machine-unknown -- os=-none -+ # Here we handle the default manufacturer of certain CPU types. It is in -+ # some cases the only manufacturer, in others, it is the most popular. -+ w89k) -+ cpu=hppa1.1 -+ vendor=winbond - ;; -- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) -+ op50n) -+ cpu=hppa1.1 -+ vendor=oki - ;; -- ms1) -- basic_machine=mt-unknown -+ op60c) -+ cpu=hppa1.1 -+ vendor=oki - ;; -- -- strongarm | thumb | xscale) -- basic_machine=arm-unknown -+ ibm*) -+ cpu=i370 -+ vendor=ibm - ;; -- xgate) -- basic_machine=$basic_machine-unknown -- os=-none -+ orion105) -+ cpu=clipper -+ vendor=highlevel - ;; -- xscaleeb) -- basic_machine=armeb-unknown -+ mac | mpw | mac-mpw) -+ cpu=m68k -+ vendor=apple - ;; -- -- xscaleel) -- basic_machine=armel-unknown -+ pmac | pmac-mpw) -+ cpu=powerpc -+ vendor=apple - ;; - -- # We use `pc' rather than `unknown' -- # because (1) that's what they normally are, and -- # (2) the word "unknown" tends to confuse beginning users. -- i*86 | x86_64) -- basic_machine=$basic_machine-pc -- ;; -- # Object if more than one company name word. -- *-*-*) -- echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 -- exit 1 -- ;; -- # Recognize the basic CPU types with company name. -- 580-* \ -- | a29k-* \ -- | aarch64-* | aarch64_be-* \ -- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ -- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ -- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ -- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -- | avr-* | avr32-* \ -- | ba-* \ -- | be32-* | be64-* \ -- | bfin-* | bs2000-* \ -- | c[123]* | c30-* | [cjt]90-* | c4x-* \ -- | c8051-* | clipper-* | craynv-* | cydra-* \ -- | d10v-* | d30v-* | dlx-* \ -- | e2k-* | elxsi-* \ -- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ -- | h8300-* | h8500-* \ -- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ -- | hexagon-* \ -- | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ -- | ip2k-* | iq2000-* \ -- | k1om-* \ -- | le32-* | le64-* \ -- | lm32-* \ -- | m32c-* | m32r-* | m32rle-* \ -- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ -- | microblaze-* | microblazeel-* \ -- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ -- | mips16-* \ -- | mips64-* | mips64el-* \ -- | mips64octeon-* | mips64octeonel-* \ -- | mips64orion-* | mips64orionel-* \ -- | mips64r5900-* | mips64r5900el-* \ -- | mips64vr-* | mips64vrel-* \ -- | mips64vr4100-* | mips64vr4100el-* \ -- | mips64vr4300-* | mips64vr4300el-* \ -- | mips64vr5000-* | mips64vr5000el-* \ -- | mips64vr5900-* | mips64vr5900el-* \ -- | mipsisa32-* | mipsisa32el-* \ -- | mipsisa32r2-* | mipsisa32r2el-* \ -- | mipsisa32r6-* | mipsisa32r6el-* \ -- | mipsisa64-* | mipsisa64el-* \ -- | mipsisa64r2-* | mipsisa64r2el-* \ -- | mipsisa64r6-* | mipsisa64r6el-* \ -- | mipsisa64sb1-* | mipsisa64sb1el-* \ -- | mipsisa64sr71k-* | mipsisa64sr71kel-* \ -- | mipsr5900-* | mipsr5900el-* \ -- | mipstx39-* | mipstx39el-* \ -- | mmix-* \ -- | mt-* \ -- | msp430-* \ -- | nds32-* | nds32le-* | nds32be-* \ -- | nios-* | nios2-* | nios2eb-* | nios2el-* \ -- | none-* | np1-* | ns16k-* | ns32k-* \ -- | open8-* \ -- | or1k*-* \ -- | orion-* \ -- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ -- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ -- | pru-* \ -- | pyramid-* \ -- | riscv32-* | riscv64-* \ -- | rl78-* | romp-* | rs6000-* | rx-* \ -- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ -- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ -- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ -- | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ -- | tahoe-* \ -- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -- | tile*-* \ -- | tron-* \ -- | ubicom32-* \ -- | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ -- | vax-* \ -- | visium-* \ -- | wasm32-* \ -- | we32k-* \ -- | x86-* | x86_64-* | xc16x-* | xps100-* \ -- | xstormy16-* | xtensa*-* \ -- | ymp-* \ -- | z8k-* | z80-*) -- ;; -- # Recognize the basic CPU types without company name, with glob match. -- xtensa*) -- basic_machine=$basic_machine-unknown -- ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. -- 386bsd) -- basic_machine=i386-pc -- os=-bsd -- ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) -- basic_machine=m68000-att -+ cpu=m68000 -+ vendor=att - ;; - 3b*) -- basic_machine=we32k-att -- ;; -- a29khif) -- basic_machine=a29k-amd -- os=-udi -- ;; -- abacus) -- basic_machine=abacus-unknown -- ;; -- adobe68k) -- basic_machine=m68010-adobe -- os=-scout -- ;; -- alliant | fx80) -- basic_machine=fx80-alliant -- ;; -- altos | altos3068) -- basic_machine=m68k-altos -- ;; -- am29k) -- basic_machine=a29k-none -- os=-bsd -- ;; -- amd64) -- basic_machine=x86_64-pc -- ;; -- amd64-*) -- basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- amdahl) -- basic_machine=580-amdahl -- os=-sysv -- ;; -- amiga | amiga-*) -- basic_machine=m68k-unknown -- ;; -- amigaos | amigados) -- basic_machine=m68k-unknown -- os=-amigaos -- ;; -- amigaunix | amix) -- basic_machine=m68k-unknown -- os=-sysv4 -- ;; -- apollo68) -- basic_machine=m68k-apollo -- os=-sysv -- ;; -- apollo68bsd) -- basic_machine=m68k-apollo -- os=-bsd -- ;; -- aros) -- basic_machine=i386-pc -- os=-aros -- ;; -- asmjs) -- basic_machine=asmjs-unknown -- ;; -- aux) -- basic_machine=m68k-apple -- os=-aux -- ;; -- balance) -- basic_machine=ns32k-sequent -- os=-dynix -- ;; -- blackfin) -- basic_machine=bfin-unknown -- os=-linux -- ;; -- blackfin-*) -- basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- os=-linux -+ cpu=we32k -+ vendor=att - ;; - bluegene*) -- basic_machine=powerpc-ibm -- os=-cnk -- ;; -- c54x-*) -- basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- c55x-*) -- basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- c6x-*) -- basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- c90) -- basic_machine=c90-cray -- os=-unicos -- ;; -- cegcc) -- basic_machine=arm-unknown -- os=-cegcc -- ;; -- convex-c1) -- basic_machine=c1-convex -- os=-bsd -- ;; -- convex-c2) -- basic_machine=c2-convex -- os=-bsd -- ;; -- convex-c32) -- basic_machine=c32-convex -- os=-bsd -- ;; -- convex-c34) -- basic_machine=c34-convex -- os=-bsd -- ;; -- convex-c38) -- basic_machine=c38-convex -- os=-bsd -- ;; -- cray | j90) -- basic_machine=j90-cray -- os=-unicos -- ;; -- craynv) -- basic_machine=craynv-cray -- os=-unicosmp -- ;; -- cr16 | cr16-*) -- basic_machine=cr16-unknown -- os=-elf -- ;; -- crds | unos) -- basic_machine=m68k-crds -- ;; -- crisv32 | crisv32-* | etraxfs*) -- basic_machine=crisv32-axis -- ;; -- cris | cris-* | etrax*) -- basic_machine=cris-axis -- ;; -- crx) -- basic_machine=crx-unknown -- os=-elf -- ;; -- da30 | da30-*) -- basic_machine=m68k-da30 -- ;; -- decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) -- basic_machine=mips-dec -+ cpu=powerpc -+ vendor=ibm -+ basic_os=cnk - ;; - decsystem10* | dec10*) -- basic_machine=pdp10-dec -- os=-tops10 -+ cpu=pdp10 -+ vendor=dec -+ basic_os=tops10 - ;; - decsystem20* | dec20*) -- basic_machine=pdp10-dec -- os=-tops20 -+ cpu=pdp10 -+ vendor=dec -+ basic_os=tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) -- basic_machine=m68k-motorola -- ;; -- delta88) -- basic_machine=m88k-motorola -- os=-sysv3 -- ;; -- dicos) -- basic_machine=i686-pc -- os=-dicos -- ;; -- djgpp) -- basic_machine=i586-pc -- os=-msdosdjgpp -- ;; -- dpx20 | dpx20-*) -- basic_machine=rs6000-bull -- os=-bosx -+ cpu=m68k -+ vendor=motorola - ;; - dpx2*) -- basic_machine=m68k-bull -- os=-sysv3 -- ;; -- e500v[12]) -- basic_machine=powerpc-unknown -- os=$os"spe" -- ;; -- e500v[12]-*) -- basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- os=$os"spe" -- ;; -- ebmon29k) -- basic_machine=a29k-amd -- os=-ebmon -- ;; -- elxsi) -- basic_machine=elxsi-elxsi -- os=-bsd -+ cpu=m68k -+ vendor=bull -+ basic_os=sysv3 - ;; - encore | umax | mmax) -- basic_machine=ns32k-encore -+ cpu=ns32k -+ vendor=encore - ;; -- es1800 | OSE68k | ose68k | ose | OSE) -- basic_machine=m68k-ericsson -- os=-ose -+ elxsi) -+ cpu=elxsi -+ vendor=elxsi -+ basic_os=${basic_os:-bsd} - ;; - fx2800) -- basic_machine=i860-alliant -+ cpu=i860 -+ vendor=alliant - ;; - genix) -- basic_machine=ns32k-ns -- ;; -- gmicro) -- basic_machine=tron-gmicro -- os=-sysv -- ;; -- go32) -- basic_machine=i386-pc -- os=-go32 -+ cpu=ns32k -+ vendor=ns - ;; - h3050r* | hiux*) -- basic_machine=hppa1.1-hitachi -- os=-hiuxwe2 -- ;; -- h8300hms) -- basic_machine=h8300-hitachi -- os=-hms -- ;; -- h8300xray) -- basic_machine=h8300-hitachi -- os=-xray -- ;; -- h8500hms) -- basic_machine=h8500-hitachi -- os=-hms -- ;; -- harris) -- basic_machine=m88k-harris -- os=-sysv3 -- ;; -- hp300-*) -- basic_machine=m68k-hp -- ;; -- hp300bsd) -- basic_machine=m68k-hp -- os=-bsd -- ;; -- hp300hpux) -- basic_machine=m68k-hp -- os=-hpux -+ cpu=hppa1.1 -+ vendor=hitachi -+ basic_os=hiuxwe2 - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) -- basic_machine=hppa1.0-hp -+ cpu=hppa1.0 -+ vendor=hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) -- basic_machine=m68000-hp -+ cpu=m68000 -+ vendor=hp - ;; - hp9k3[2-9][0-9]) -- basic_machine=m68k-hp -+ cpu=m68k -+ vendor=hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) -- basic_machine=hppa1.0-hp -+ cpu=hppa1.0 -+ vendor=hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) -- basic_machine=hppa1.1-hp -+ cpu=hppa1.1 -+ vendor=hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp -- basic_machine=hppa1.1-hp -+ cpu=hppa1.1 -+ vendor=hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp -- basic_machine=hppa1.1-hp -+ cpu=hppa1.1 -+ vendor=hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) -- basic_machine=hppa1.1-hp -+ cpu=hppa1.1 -+ vendor=hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) -- basic_machine=hppa1.0-hp -- ;; -- hppaosf) -- basic_machine=hppa1.1-hp -- os=-osf -- ;; -- hppro) -- basic_machine=hppa1.1-hp -- os=-proelf -- ;; -- i370-ibm* | ibm*) -- basic_machine=i370-ibm -+ cpu=hppa1.0 -+ vendor=hp - ;; - i*86v32) -- basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` -- os=-sysv32 -+ cpu=$(echo "$1" | sed -e 's/86.*/86/') -+ vendor=pc -+ basic_os=sysv32 - ;; - i*86v4*) -- basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` -- os=-sysv4 -+ cpu=$(echo "$1" | sed -e 's/86.*/86/') -+ vendor=pc -+ basic_os=sysv4 - ;; - i*86v) -- basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` -- os=-sysv -+ cpu=$(echo "$1" | sed -e 's/86.*/86/') -+ vendor=pc -+ basic_os=sysv - ;; - i*86sol2) -- basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` -- os=-solaris2 -- ;; -- i386mach) -- basic_machine=i386-mach -- os=-mach -+ cpu=$(echo "$1" | sed -e 's/86.*/86/') -+ vendor=pc -+ basic_os=solaris2 - ;; -- vsta) -- basic_machine=i386-unknown -- os=-vsta -+ j90 | j90-cray) -+ cpu=j90 -+ vendor=cray -+ basic_os=${basic_os:-unicos} - ;; - iris | iris4d) -- basic_machine=mips-sgi -- case $os in -- -irix*) -+ cpu=mips -+ vendor=sgi -+ case $basic_os in -+ irix*) - ;; - *) -- os=-irix4 -+ basic_os=irix4 - ;; - esac - ;; -- isi68 | isi) -- basic_machine=m68k-isi -- os=-sysv -- ;; -- leon-*|leon[3-9]-*) -- basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` -- ;; -- m68knommu) -- basic_machine=m68k-unknown -- os=-linux -- ;; -- m68knommu-*) -- basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- os=-linux -- ;; -- magnum | m3230) -- basic_machine=mips-mips -- os=-sysv -- ;; -- merlin) -- basic_machine=ns32k-utek -- os=-sysv -- ;; -- microblaze*) -- basic_machine=microblaze-xilinx -- ;; -- mingw64) -- basic_machine=x86_64-pc -- os=-mingw64 -- ;; -- mingw32) -- basic_machine=i686-pc -- os=-mingw32 -- ;; -- mingw32ce) -- basic_machine=arm-unknown -- os=-mingw32ce -- ;; - miniframe) -- basic_machine=m68000-convergent -- ;; -- *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) -- basic_machine=m68k-atari -- os=-mint -- ;; -- mips3*-*) -- basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` -- ;; -- mips3*) -- basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown -- ;; -- monitor) -- basic_machine=m68k-rom68k -- os=-coff -- ;; -- morphos) -- basic_machine=powerpc-unknown -- os=-morphos -- ;; -- moxiebox) -- basic_machine=moxie-unknown -- os=-moxiebox -+ cpu=m68000 -+ vendor=convergent - ;; -- msdos) -- basic_machine=i386-pc -- os=-msdos -- ;; -- ms1-*) -- basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` -- ;; -- msys) -- basic_machine=i686-pc -- os=-msys -- ;; -- mvs) -- basic_machine=i370-ibm -- os=-mvs -- ;; -- nacl) -- basic_machine=le32-unknown -- os=-nacl -- ;; -- ncr3000) -- basic_machine=i486-ncr -- os=-sysv4 -- ;; -- netbsd386) -- basic_machine=i386-unknown -- os=-netbsd -- ;; -- netwinder) -- basic_machine=armv4l-rebel -- os=-linux -- ;; -- news | news700 | news800 | news900) -- basic_machine=m68k-sony -- os=-newsos -- ;; -- news1000) -- basic_machine=m68030-sony -- os=-newsos -+ *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) -+ cpu=m68k -+ vendor=atari -+ basic_os=mint - ;; - news-3600 | risc-news) -- basic_machine=mips-sony -- os=-newsos -- ;; -- necv70) -- basic_machine=v70-nec -- os=-sysv -+ cpu=mips -+ vendor=sony -+ basic_os=newsos - ;; - next | m*-next) -- basic_machine=m68k-next -- case $os in -- -nextstep* ) -+ cpu=m68k -+ vendor=next -+ case $basic_os in -+ openstep*) -+ ;; -+ nextstep*) - ;; -- -ns2*) -- os=-nextstep2 -+ ns2*) -+ basic_os=nextstep2 - ;; - *) -- os=-nextstep3 -+ basic_os=nextstep3 - ;; - esac - ;; -- nh3000) -- basic_machine=m68k-harris -- os=-cxux -- ;; -- nh[45]000) -- basic_machine=m88k-harris -- os=-cxux -- ;; -- nindy960) -- basic_machine=i960-intel -- os=-nindy -- ;; -- mon960) -- basic_machine=i960-intel -- os=-mon960 -- ;; -- nonstopux) -- basic_machine=mips-compaq -- os=-nonstopux -- ;; - np1) -- basic_machine=np1-gould -- ;; -- neo-tandem) -- basic_machine=neo-tandem -- ;; -- nse-tandem) -- basic_machine=nse-tandem -- ;; -- nsr-tandem) -- basic_machine=nsr-tandem -- ;; -- nsv-tandem) -- basic_machine=nsv-tandem -- ;; -- nsx-tandem) -- basic_machine=nsx-tandem -+ cpu=np1 -+ vendor=gould - ;; - op50n-* | op60c-*) -- basic_machine=hppa1.1-oki -- os=-proelf -- ;; -- openrisc | openrisc-*) -- basic_machine=or32-unknown -- ;; -- os400) -- basic_machine=powerpc-ibm -- os=-os400 -- ;; -- OSE68000 | ose68000) -- basic_machine=m68000-ericsson -- os=-ose -- ;; -- os68k) -- basic_machine=m68k-none -- os=-os68k -+ cpu=hppa1.1 -+ vendor=oki -+ basic_os=proelf - ;; - pa-hitachi) -- basic_machine=hppa1.1-hitachi -- os=-hiuxwe2 -- ;; -- paragon) -- basic_machine=i860-intel -- os=-osf -- ;; -- parisc) -- basic_machine=hppa-unknown -- os=-linux -- ;; -- parisc-*) -- basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- os=-linux -+ cpu=hppa1.1 -+ vendor=hitachi -+ basic_os=hiuxwe2 - ;; - pbd) -- basic_machine=sparc-tti -+ cpu=sparc -+ vendor=tti - ;; - pbb) -- basic_machine=m68k-tti -+ cpu=m68k -+ vendor=tti - ;; -- pc532 | pc532-*) -- basic_machine=ns32k-pc532 -- ;; -- pc98) -- basic_machine=i386-pc -- ;; -- pc98-*) -- basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- pentium | p5 | k5 | k6 | nexgen | viac3) -- basic_machine=i586-pc -- ;; -- pentiumpro | p6 | 6x86 | athlon | athlon_*) -- basic_machine=i686-pc -- ;; -- pentiumii | pentium2 | pentiumiii | pentium3) -- basic_machine=i686-pc -- ;; -- pentium4) -- basic_machine=i786-pc -- ;; -- pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) -- basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- pentiumpro-* | p6-* | 6x86-* | athlon-*) -- basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) -- basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- pentium4-*) -- basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` -+ pc532) -+ cpu=ns32k -+ vendor=pc532 - ;; - pn) -- basic_machine=pn-gould -- ;; -- power) basic_machine=power-ibm -+ cpu=pn -+ vendor=gould - ;; -- ppc | ppcbe) basic_machine=powerpc-unknown -+ power) -+ cpu=power -+ vendor=ibm - ;; -- ppc-* | ppcbe-*) -- basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- ppcle | powerpclittle) -- basic_machine=powerpcle-unknown -- ;; -- ppcle-* | powerpclittle-*) -- basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- ppc64) basic_machine=powerpc64-unknown -+ ps2) -+ cpu=i386 -+ vendor=ibm - ;; -- ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` -+ rm[46]00) -+ cpu=mips -+ vendor=siemens - ;; -- ppc64le | powerpc64little) -- basic_machine=powerpc64le-unknown -+ rtpc | rtpc-*) -+ cpu=romp -+ vendor=ibm - ;; -- ppc64le-* | powerpc64little-*) -- basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` -+ sde) -+ cpu=mipsisa32 -+ vendor=sde -+ basic_os=${basic_os:-elf} - ;; -- ps2) -- basic_machine=i386-ibm -+ simso-wrs) -+ cpu=sparclite -+ vendor=wrs -+ basic_os=vxworks - ;; -- pw32) -- basic_machine=i586-unknown -- os=-pw32 -+ tower | tower-32) -+ cpu=m68k -+ vendor=ncr - ;; -- rdos | rdos64) -- basic_machine=x86_64-pc -- os=-rdos -+ vpp*|vx|vx-*) -+ cpu=f301 -+ vendor=fujitsu - ;; -- rdos32) -- basic_machine=i386-pc -- os=-rdos -+ w65) -+ cpu=w65 -+ vendor=wdc - ;; -- rom68k) -- basic_machine=m68k-rom68k -- os=-coff -+ w89k-*) -+ cpu=hppa1.1 -+ vendor=winbond -+ basic_os=proelf - ;; -- rm[46]00) -- basic_machine=mips-siemens -+ none) -+ cpu=none -+ vendor=none - ;; -- rtpc | rtpc-*) -- basic_machine=romp-ibm -+ leon|leon[3-9]) -+ cpu=sparc -+ vendor=$basic_machine - ;; -- s390 | s390-*) -- basic_machine=s390-ibm -+ leon-*|leon[3-9]-*) -+ cpu=sparc -+ vendor=$(echo "$basic_machine" | sed 's/-.*//') - ;; -- s390x | s390x-*) -- basic_machine=s390x-ibm -+ -+ *-*) -+ # shellcheck disable=SC2162 -+ IFS="-" read cpu vendor <&2 -- exit 1 -+ # Recognize the canonical CPU types that are allowed with any -+ # company name. -+ case $cpu in -+ 1750a | 580 \ -+ | a29k \ -+ | aarch64 | aarch64_be \ -+ | abacus \ -+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ -+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ -+ | alphapca5[67] | alpha64pca5[67] \ -+ | am33_2.0 \ -+ | amdgcn \ -+ | arc | arceb \ -+ | arm | arm[lb]e | arme[lb] | armv* \ -+ | avr | avr32 \ -+ | asmjs \ -+ | ba \ -+ | be32 | be64 \ -+ | bfin | bpf | bs2000 \ -+ | c[123]* | c30 | [cjt]90 | c4x \ -+ | c8051 | clipper | craynv | csky | cydra \ -+ | d10v | d30v | dlx | dsp16xx \ -+ | e2k | elxsi | epiphany \ -+ | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \ -+ | h8300 | h8500 \ -+ | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -+ | hexagon \ -+ | i370 | i*86 | i860 | i960 | ia16 | ia64 \ -+ | ip2k | iq2000 \ -+ | k1om \ -+ | le32 | le64 \ -+ | lm32 \ -+ | loongarch32 | loongarch64 | loongarchx32 \ -+ | m32c | m32r | m32rle \ -+ | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ -+ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ -+ | m88110 | m88k | maxq | mb | mcore | mep | metag \ -+ | microblaze | microblazeel \ -+ | mips | mipsbe | mipseb | mipsel | mipsle \ -+ | mips16 \ -+ | mips64 | mips64eb | mips64el \ -+ | mips64octeon | mips64octeonel \ -+ | mips64orion | mips64orionel \ -+ | mips64r5900 | mips64r5900el \ -+ | mips64vr | mips64vrel \ -+ | mips64vr4100 | mips64vr4100el \ -+ | mips64vr4300 | mips64vr4300el \ -+ | mips64vr5000 | mips64vr5000el \ -+ | mips64vr5900 | mips64vr5900el \ -+ | mipsisa32 | mipsisa32el \ -+ | mipsisa32r2 | mipsisa32r2el \ -+ | mipsisa32r6 | mipsisa32r6el \ -+ | mipsisa64 | mipsisa64el \ -+ | mipsisa64r2 | mipsisa64r2el \ -+ | mipsisa64r6 | mipsisa64r6el \ -+ | mipsisa64sb1 | mipsisa64sb1el \ -+ | mipsisa64sr71k | mipsisa64sr71kel \ -+ | mipsr5900 | mipsr5900el \ -+ | mipstx39 | mipstx39el \ -+ | mmix \ -+ | mn10200 | mn10300 \ -+ | moxie \ -+ | mt \ -+ | msp430 \ -+ | nds32 | nds32le | nds32be \ -+ | nfp \ -+ | nios | nios2 | nios2eb | nios2el \ -+ | none | np1 | ns16k | ns32k | nvptx \ -+ | open8 \ -+ | or1k* \ -+ | or32 \ -+ | orion \ -+ | picochip \ -+ | pdp10 | pdp11 | pj | pjl | pn | power \ -+ | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ -+ | pru \ -+ | pyramid \ -+ | riscv | riscv32 | riscv32be | riscv64 | riscv64be \ -+ | rl78 | romp | rs6000 | rx \ -+ | s390 | s390x \ -+ | score \ -+ | sh | shl \ -+ | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ -+ | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \ -+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \ -+ | sparclite \ -+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ -+ | spu \ -+ | tahoe \ -+ | thumbv7* \ -+ | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ -+ | tron \ -+ | ubicom32 \ -+ | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ -+ | vax \ -+ | visium \ -+ | w65 \ -+ | wasm32 | wasm32_simd128 | wasm64 \ -+ | we32k \ -+ | x86 | x86_64 | xc16x | xgate | xps100 \ -+ | xstormy16 | xtensa* \ -+ | ymp \ -+ | z8k | z80) -+ ;; -+ -+ *) -+ echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2 -+ exit 1 -+ ;; -+ esac - ;; - esac - - # Here we canonicalize certain aliases for manufacturers. --case $basic_machine in -- *-digital*) -- basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` -+case $vendor in -+ digital*) -+ vendor=dec - ;; -- *-commodore*) -- basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` -+ commodore*) -+ vendor=cbm - ;; - *) - ;; -@@ -1334,203 +1287,213 @@ esac - - # Decode manufacturer-specific aliases for certain operating systems. - --if [ x"$os" != x"" ] -+if test x$basic_os != x - then -+ -+# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just -+# set os. -+case $basic_os in -+ gnu/linux*) -+ kernel=linux -+ os=$(echo $basic_os | sed -e 's|gnu/linux|gnu|') -+ ;; -+ os2-emx) -+ kernel=os2 -+ os=$(echo $basic_os | sed -e 's|os2-emx|emx|') -+ ;; -+ nto-qnx*) -+ kernel=nto -+ os=$(echo $basic_os | sed -e 's|nto-qnx|qnx|') -+ ;; -+ *-*) -+ # shellcheck disable=SC2162 -+ IFS="-" read kernel os <&2 -- exit 1 -+ # No normalization, but not necessarily accepted, that comes below. - ;; - esac -+ - else - - # Here we handle the default operating systems that come with various machines. -@@ -1543,258 +1506,361 @@ else - # will signal an error saying that MANUFACTURER isn't an operating - # system, and we'll never get to this point. - --case $basic_machine in -+kernel= -+case $cpu-$vendor in - score-*) -- os=-elf -+ os=elf - ;; - spu-*) -- os=-elf -+ os=elf - ;; - *-acorn) -- os=-riscix1.2 -+ os=riscix1.2 - ;; - arm*-rebel) -- os=-linux -+ kernel=linux -+ os=gnu - ;; - arm*-semi) -- os=-aout -+ os=aout - ;; - c4x-* | tic4x-*) -- os=-coff -+ os=coff - ;; - c8051-*) -- os=-elf -+ os=elf -+ ;; -+ clipper-intergraph) -+ os=clix - ;; - hexagon-*) -- os=-elf -+ os=elf - ;; - tic54x-*) -- os=-coff -+ os=coff - ;; - tic55x-*) -- os=-coff -+ os=coff - ;; - tic6x-*) -- os=-coff -+ os=coff - ;; - # This must come before the *-dec entry. - pdp10-*) -- os=-tops20 -+ os=tops20 - ;; - pdp11-*) -- os=-none -+ os=none - ;; - *-dec | vax-*) -- os=-ultrix4.2 -+ os=ultrix4.2 - ;; - m68*-apollo) -- os=-domain -+ os=domain - ;; - i386-sun) -- os=-sunos4.0.2 -+ os=sunos4.0.2 - ;; - m68000-sun) -- os=-sunos3 -+ os=sunos3 - ;; - m68*-cisco) -- os=-aout -+ os=aout - ;; - mep-*) -- os=-elf -+ os=elf - ;; - mips*-cisco) -- os=-elf -+ os=elf - ;; - mips*-*) -- os=-elf -+ os=elf - ;; - or32-*) -- os=-coff -+ os=coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. -- os=-sysv3 -+ os=sysv3 - ;; - sparc-* | *-sun) -- os=-sunos4.1.1 -+ os=sunos4.1.1 - ;; - pru-*) -- os=-elf -+ os=elf - ;; - *-be) -- os=-beos -+ os=beos - ;; - *-ibm) -- os=-aix -+ os=aix - ;; - *-knuth) -- os=-mmixware -+ os=mmixware - ;; - *-wec) -- os=-proelf -+ os=proelf - ;; - *-winbond) -- os=-proelf -+ os=proelf - ;; - *-oki) -- os=-proelf -+ os=proelf - ;; - *-hp) -- os=-hpux -+ os=hpux - ;; - *-hitachi) -- os=-hiux -+ os=hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) -- os=-sysv -+ os=sysv - ;; - *-cbm) -- os=-amigaos -+ os=amigaos - ;; - *-dg) -- os=-dgux -+ os=dgux - ;; - *-dolphin) -- os=-sysv3 -+ os=sysv3 - ;; - m68k-ccur) -- os=-rtu -+ os=rtu - ;; - m88k-omron*) -- os=-luna -+ os=luna - ;; - *-next) -- os=-nextstep -+ os=nextstep - ;; - *-sequent) -- os=-ptx -+ os=ptx - ;; - *-crds) -- os=-unos -+ os=unos - ;; - *-ns) -- os=-genix -+ os=genix - ;; - i370-*) -- os=-mvs -+ os=mvs - ;; - *-gould) -- os=-sysv -+ os=sysv - ;; - *-highlevel) -- os=-bsd -+ os=bsd - ;; - *-encore) -- os=-bsd -+ os=bsd - ;; - *-sgi) -- os=-irix -+ os=irix - ;; - *-siemens) -- os=-sysv4 -+ os=sysv4 - ;; - *-masscomp) -- os=-rtu -+ os=rtu - ;; - f30[01]-fujitsu | f700-fujitsu) -- os=-uxpv -+ os=uxpv - ;; - *-rom68k) -- os=-coff -+ os=coff - ;; - *-*bug) -- os=-coff -+ os=coff - ;; - *-apple) -- os=-macos -+ os=macos - ;; - *-atari*) -- os=-mint -+ os=mint -+ ;; -+ *-wrs) -+ os=vxworks - ;; - *) -- os=-none -+ os=none - ;; - esac -+ - fi - -+# Now, validate our (potentially fixed-up) OS. -+case $os in -+ # Sometimes we do "kernel-libc", so those need to count as OSes. -+ musl* | newlib* | uclibc*) -+ ;; -+ # Likewise for "kernel-abi" -+ eabi* | gnueabi*) -+ ;; -+ # VxWorks passes extra cpu info in the 4th filed. -+ simlinux | simwindows | spe) -+ ;; -+ # Now accept the basic system types. -+ # The portable systems comes first. -+ # Each alternative MUST end in a * to match a version number. -+ gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ -+ | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ -+ | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ -+ | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ -+ | hiux* | abug | nacl* | netware* | windows* \ -+ | os9* | macos* | osx* | ios* \ -+ | mpw* | magic* | mmixware* | mon960* | lnews* \ -+ | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ -+ | aos* | aros* | cloudabi* | sortix* | twizzler* \ -+ | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ -+ | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ -+ | mirbsd* | netbsd* | dicos* | openedition* | ose* \ -+ | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \ -+ | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ -+ | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ -+ | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ -+ | udi* | lites* | ieee* | go32* | aux* | hcos* \ -+ | chorusrdb* | cegcc* | glidix* | serenity* \ -+ | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ -+ | midipix* | mingw32* | mingw64* | mint* \ -+ | uxpv* | beos* | mpeix* | udk* | moxiebox* \ -+ | interix* | uwin* | mks* | rhapsody* | darwin* \ -+ | openstep* | oskit* | conix* | pw32* | nonstopux* \ -+ | storm-chaos* | tops10* | tenex* | tops20* | its* \ -+ | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \ -+ | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \ -+ | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ -+ | skyos* | haiku* | rdos* | toppers* | drops* | es* \ -+ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ -+ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ -+ | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*) -+ ;; -+ # This one is extra strict with allowed versions -+ sco3.2v2 | sco3.2v[4-9]* | sco5v6*) -+ # Don't forget version if it is 3.2v4 or newer. -+ ;; -+ none) -+ ;; -+ *) -+ echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 -+ exit 1 -+ ;; -+esac -+ -+# As a final step for OS-related things, validate the OS-kernel combination -+# (given a valid OS), if there is a kernel. -+case $kernel-$os in -+ linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* ) -+ ;; -+ uclinux-uclibc* ) -+ ;; -+ -dietlibc* | -newlib* | -musl* | -uclibc* ) -+ # These are just libc implementations, not actual OSes, and thus -+ # require a kernel. -+ echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 -+ exit 1 -+ ;; -+ kfreebsd*-gnu* | kopensolaris*-gnu*) -+ ;; -+ vxworks-simlinux | vxworks-simwindows | vxworks-spe) -+ ;; -+ nto-qnx*) -+ ;; -+ os2-emx) -+ ;; -+ *-eabi* | *-gnueabi*) -+ ;; -+ -*) -+ # Blank kernel with real OS is always fine. -+ ;; -+ *-*) -+ echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 -+ exit 1 -+ ;; -+esac -+ - # Here we handle the case where we know the os, and the CPU type, but not the - # manufacturer. We pick the logical manufacturer. --vendor=unknown --case $basic_machine in -- *-unknown) -- case $os in -- -riscix*) -+case $vendor in -+ unknown) -+ case $cpu-$os in -+ *-riscix*) - vendor=acorn - ;; -- -sunos*) -+ *-sunos*) - vendor=sun - ;; -- -cnk*|-aix*) -+ *-cnk* | *-aix*) - vendor=ibm - ;; -- -beos*) -+ *-beos*) - vendor=be - ;; -- -hpux*) -+ *-hpux*) - vendor=hp - ;; -- -mpeix*) -+ *-mpeix*) - vendor=hp - ;; -- -hiux*) -+ *-hiux*) - vendor=hitachi - ;; -- -unos*) -+ *-unos*) - vendor=crds - ;; -- -dgux*) -+ *-dgux*) - vendor=dg - ;; -- -luna*) -+ *-luna*) - vendor=omron - ;; -- -genix*) -+ *-genix*) - vendor=ns - ;; -- -mvs* | -opened*) -+ *-clix*) -+ vendor=intergraph -+ ;; -+ *-mvs* | *-opened*) -+ vendor=ibm -+ ;; -+ *-os400*) - vendor=ibm - ;; -- -os400*) -+ s390-* | s390x-*) - vendor=ibm - ;; -- -ptx*) -+ *-ptx*) - vendor=sequent - ;; -- -tpf*) -+ *-tpf*) - vendor=ibm - ;; -- -vxsim* | -vxworks* | -windiss*) -+ *-vxsim* | *-vxworks* | *-windiss*) - vendor=wrs - ;; -- -aux*) -+ *-aux*) - vendor=apple - ;; -- -hms*) -+ *-hms*) - vendor=hitachi - ;; -- -mpw* | -macos*) -+ *-mpw* | *-macos*) - vendor=apple - ;; -- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) -+ *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) - vendor=atari - ;; -- -vos*) -+ *-vos*) - vendor=stratus - ;; - esac -- basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` - ;; - esac - --echo "$basic_machine$os" -+echo "$cpu-$vendor-${kernel:+$kernel-}$os" - exit - - # Local variables: --# eval: (add-hook 'write-file-functions 'time-stamp) -+# eval: (add-hook 'before-save-hook 'time-stamp) - # time-stamp-start: "timestamp='" - # time-stamp-format: "%:y-%02m-%02d" - # time-stamp-end: "'" -diff --git a/src/expat/expat/conftools/config.sub b/src/expat/expat/conftools/config.sub -index 9ccf09a7..f1bee4ef 100755 ---- a/src/expat/expat/conftools/config.sub -+++ b/src/expat/expat/conftools/config.sub -@@ -1,8 +1,8 @@ - #! /bin/sh - # Configuration validation subroutine script. --# Copyright 1992-2018 Free Software Foundation, Inc. -+# Copyright 1992-2021 Free Software Foundation, Inc. - --timestamp='2018-03-08' -+timestamp='2021-03-10' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -33,7 +33,7 @@ timestamp='2018-03-08' - # Otherwise, we print the canonical config type on stdout and succeed. - - # You can get the latest version of this script from: --# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub -+# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub - - # This file is supposed to be the same for all GNU packages - # and recognize all the CPU types, system types and aliases -@@ -50,7 +50,7 @@ timestamp='2018-03-08' - # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM - # It is wrong to echo any other type of specification. - --me=`echo "$0" | sed -e 's,.*/,,'` -+me=$(echo "$0" | sed -e 's,.*/,,') - - usage="\ - Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS -@@ -67,7 +67,7 @@ Report bugs and patches to ." - version="\ - GNU config.sub ($timestamp) - --Copyright 1992-2018 Free Software Foundation, Inc. -+Copyright 1992-2021 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -89,7 +89,7 @@ while test $# -gt 0 ; do - - ) # Use stdin as input. - break ;; - -* ) -- echo "$me: invalid option $1$help" -+ echo "$me: invalid option $1$help" >&2 - exit 1 ;; - - *local*) -@@ -110,1223 +110,1176 @@ case $# in - exit 1;; - esac - --# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). --# Here we must recognize all the valid KERNEL-OS combinations. --maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` --case $maybe_os in -- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ -- linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ -- knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ -- kopensolaris*-gnu* | cloudabi*-eabi* | \ -- storm-chaos* | os2-emx* | rtmk-nova*) -- os=-$maybe_os -- basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` -- ;; -- android-linux) -- os=-linux-android -- basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown -- ;; -- *) -- basic_machine=`echo "$1" | sed 's/-[^-]*$//'` -- if [ "$basic_machine" != "$1" ] -- then os=`echo "$1" | sed 's/.*-/-/'` -- else os=; fi -- ;; --esac -+# Split fields of configuration type -+# shellcheck disable=SC2162 -+IFS="-" read field1 field2 field3 field4 <&2 -+ exit 1 - ;; -- -lynx*) -- os=-lynxos -+ *-*-*-*) -+ basic_machine=$field1-$field2 -+ basic_os=$field3-$field4 - ;; -- -ptx*) -- basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` -+ *-*-*) -+ # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two -+ # parts -+ maybe_os=$field2-$field3 -+ case $maybe_os in -+ nto-qnx* | linux-* | uclinux-uclibc* \ -+ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ -+ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ -+ | storm-chaos* | os2-emx* | rtmk-nova*) -+ basic_machine=$field1 -+ basic_os=$maybe_os -+ ;; -+ android-linux) -+ basic_machine=$field1-unknown -+ basic_os=linux-android -+ ;; -+ *) -+ basic_machine=$field1-$field2 -+ basic_os=$field3 -+ ;; -+ esac - ;; -- -psos*) -- os=-psos -+ *-*) -+ # A lone config we happen to match not fitting any pattern -+ case $field1-$field2 in -+ decstation-3100) -+ basic_machine=mips-dec -+ basic_os= -+ ;; -+ *-*) -+ # Second component is usually, but not always the OS -+ case $field2 in -+ # Prevent following clause from handling this valid os -+ sun*os*) -+ basic_machine=$field1 -+ basic_os=$field2 -+ ;; -+ # Manufacturers -+ dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ -+ | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ -+ | unicom* | ibm* | next | hp | isi* | apollo | altos* \ -+ | convergent* | ncr* | news | 32* | 3600* | 3100* \ -+ | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ -+ | ultra | tti* | harris | dolphin | highlevel | gould \ -+ | cbm | ns | masscomp | apple | axis | knuth | cray \ -+ | microblaze* | sim | cisco \ -+ | oki | wec | wrs | winbond) -+ basic_machine=$field1-$field2 -+ basic_os= -+ ;; -+ *) -+ basic_machine=$field1 -+ basic_os=$field2 -+ ;; -+ esac -+ ;; -+ esac - ;; -- -mint | -mint[0-9]*) -- basic_machine=m68k-atari -- os=-mint -+ *) -+ # Convert single-component short-hands not valid as part of -+ # multi-component configurations. -+ case $field1 in -+ 386bsd) -+ basic_machine=i386-pc -+ basic_os=bsd -+ ;; -+ a29khif) -+ basic_machine=a29k-amd -+ basic_os=udi -+ ;; -+ adobe68k) -+ basic_machine=m68010-adobe -+ basic_os=scout -+ ;; -+ alliant) -+ basic_machine=fx80-alliant -+ basic_os= -+ ;; -+ altos | altos3068) -+ basic_machine=m68k-altos -+ basic_os= -+ ;; -+ am29k) -+ basic_machine=a29k-none -+ basic_os=bsd -+ ;; -+ amdahl) -+ basic_machine=580-amdahl -+ basic_os=sysv -+ ;; -+ amiga) -+ basic_machine=m68k-unknown -+ basic_os= -+ ;; -+ amigaos | amigados) -+ basic_machine=m68k-unknown -+ basic_os=amigaos -+ ;; -+ amigaunix | amix) -+ basic_machine=m68k-unknown -+ basic_os=sysv4 -+ ;; -+ apollo68) -+ basic_machine=m68k-apollo -+ basic_os=sysv -+ ;; -+ apollo68bsd) -+ basic_machine=m68k-apollo -+ basic_os=bsd -+ ;; -+ aros) -+ basic_machine=i386-pc -+ basic_os=aros -+ ;; -+ aux) -+ basic_machine=m68k-apple -+ basic_os=aux -+ ;; -+ balance) -+ basic_machine=ns32k-sequent -+ basic_os=dynix -+ ;; -+ blackfin) -+ basic_machine=bfin-unknown -+ basic_os=linux -+ ;; -+ cegcc) -+ basic_machine=arm-unknown -+ basic_os=cegcc -+ ;; -+ convex-c1) -+ basic_machine=c1-convex -+ basic_os=bsd -+ ;; -+ convex-c2) -+ basic_machine=c2-convex -+ basic_os=bsd -+ ;; -+ convex-c32) -+ basic_machine=c32-convex -+ basic_os=bsd -+ ;; -+ convex-c34) -+ basic_machine=c34-convex -+ basic_os=bsd -+ ;; -+ convex-c38) -+ basic_machine=c38-convex -+ basic_os=bsd -+ ;; -+ cray) -+ basic_machine=j90-cray -+ basic_os=unicos -+ ;; -+ crds | unos) -+ basic_machine=m68k-crds -+ basic_os= -+ ;; -+ da30) -+ basic_machine=m68k-da30 -+ basic_os= -+ ;; -+ decstation | pmax | pmin | dec3100 | decstatn) -+ basic_machine=mips-dec -+ basic_os= -+ ;; -+ delta88) -+ basic_machine=m88k-motorola -+ basic_os=sysv3 -+ ;; -+ dicos) -+ basic_machine=i686-pc -+ basic_os=dicos -+ ;; -+ djgpp) -+ basic_machine=i586-pc -+ basic_os=msdosdjgpp -+ ;; -+ ebmon29k) -+ basic_machine=a29k-amd -+ basic_os=ebmon -+ ;; -+ es1800 | OSE68k | ose68k | ose | OSE) -+ basic_machine=m68k-ericsson -+ basic_os=ose -+ ;; -+ gmicro) -+ basic_machine=tron-gmicro -+ basic_os=sysv -+ ;; -+ go32) -+ basic_machine=i386-pc -+ basic_os=go32 -+ ;; -+ h8300hms) -+ basic_machine=h8300-hitachi -+ basic_os=hms -+ ;; -+ h8300xray) -+ basic_machine=h8300-hitachi -+ basic_os=xray -+ ;; -+ h8500hms) -+ basic_machine=h8500-hitachi -+ basic_os=hms -+ ;; -+ harris) -+ basic_machine=m88k-harris -+ basic_os=sysv3 -+ ;; -+ hp300 | hp300hpux) -+ basic_machine=m68k-hp -+ basic_os=hpux -+ ;; -+ hp300bsd) -+ basic_machine=m68k-hp -+ basic_os=bsd -+ ;; -+ hppaosf) -+ basic_machine=hppa1.1-hp -+ basic_os=osf -+ ;; -+ hppro) -+ basic_machine=hppa1.1-hp -+ basic_os=proelf -+ ;; -+ i386mach) -+ basic_machine=i386-mach -+ basic_os=mach -+ ;; -+ isi68 | isi) -+ basic_machine=m68k-isi -+ basic_os=sysv -+ ;; -+ m68knommu) -+ basic_machine=m68k-unknown -+ basic_os=linux -+ ;; -+ magnum | m3230) -+ basic_machine=mips-mips -+ basic_os=sysv -+ ;; -+ merlin) -+ basic_machine=ns32k-utek -+ basic_os=sysv -+ ;; -+ mingw64) -+ basic_machine=x86_64-pc -+ basic_os=mingw64 -+ ;; -+ mingw32) -+ basic_machine=i686-pc -+ basic_os=mingw32 -+ ;; -+ mingw32ce) -+ basic_machine=arm-unknown -+ basic_os=mingw32ce -+ ;; -+ monitor) -+ basic_machine=m68k-rom68k -+ basic_os=coff -+ ;; -+ morphos) -+ basic_machine=powerpc-unknown -+ basic_os=morphos -+ ;; -+ moxiebox) -+ basic_machine=moxie-unknown -+ basic_os=moxiebox -+ ;; -+ msdos) -+ basic_machine=i386-pc -+ basic_os=msdos -+ ;; -+ msys) -+ basic_machine=i686-pc -+ basic_os=msys -+ ;; -+ mvs) -+ basic_machine=i370-ibm -+ basic_os=mvs -+ ;; -+ nacl) -+ basic_machine=le32-unknown -+ basic_os=nacl -+ ;; -+ emscripten) -+ basic_machine=asmjs-unknown -+ basic_os=emscripten -+ ;; -+ ncr3000) -+ basic_machine=i486-ncr -+ basic_os=sysv4 -+ ;; -+ netbsd386) -+ basic_machine=i386-pc -+ basic_os=netbsd -+ ;; -+ netwinder) -+ basic_machine=armv4l-rebel -+ basic_os=linux -+ ;; -+ news | news700 | news800 | news900) -+ basic_machine=m68k-sony -+ basic_os=newsos -+ ;; -+ news1000) -+ basic_machine=m68030-sony -+ basic_os=newsos -+ ;; -+ necv70) -+ basic_machine=v70-nec -+ basic_os=sysv -+ ;; -+ nh3000) -+ basic_machine=m68k-harris -+ basic_os=cxux -+ ;; -+ nh[45]000) -+ basic_machine=m88k-harris -+ basic_os=cxux -+ ;; -+ nindy960) -+ basic_machine=i960-intel -+ basic_os=nindy -+ ;; -+ mon960) -+ basic_machine=i960-intel -+ basic_os=mon960 -+ ;; -+ nonstopux) -+ basic_machine=mips-compaq -+ basic_os=nonstopux -+ ;; -+ os400) -+ basic_machine=powerpc-ibm -+ basic_os=os400 -+ ;; -+ OSE68000 | ose68000) -+ basic_machine=m68000-ericsson -+ basic_os=ose -+ ;; -+ os68k) -+ basic_machine=m68k-none -+ basic_os=os68k -+ ;; -+ paragon) -+ basic_machine=i860-intel -+ basic_os=osf -+ ;; -+ parisc) -+ basic_machine=hppa-unknown -+ basic_os=linux -+ ;; -+ psp) -+ basic_machine=mipsallegrexel-sony -+ basic_os=psp -+ ;; -+ pw32) -+ basic_machine=i586-unknown -+ basic_os=pw32 -+ ;; -+ rdos | rdos64) -+ basic_machine=x86_64-pc -+ basic_os=rdos -+ ;; -+ rdos32) -+ basic_machine=i386-pc -+ basic_os=rdos -+ ;; -+ rom68k) -+ basic_machine=m68k-rom68k -+ basic_os=coff -+ ;; -+ sa29200) -+ basic_machine=a29k-amd -+ basic_os=udi -+ ;; -+ sei) -+ basic_machine=mips-sei -+ basic_os=seiux -+ ;; -+ sequent) -+ basic_machine=i386-sequent -+ basic_os= -+ ;; -+ sps7) -+ basic_machine=m68k-bull -+ basic_os=sysv2 -+ ;; -+ st2000) -+ basic_machine=m68k-tandem -+ basic_os= -+ ;; -+ stratus) -+ basic_machine=i860-stratus -+ basic_os=sysv4 -+ ;; -+ sun2) -+ basic_machine=m68000-sun -+ basic_os= -+ ;; -+ sun2os3) -+ basic_machine=m68000-sun -+ basic_os=sunos3 -+ ;; -+ sun2os4) -+ basic_machine=m68000-sun -+ basic_os=sunos4 -+ ;; -+ sun3) -+ basic_machine=m68k-sun -+ basic_os= -+ ;; -+ sun3os3) -+ basic_machine=m68k-sun -+ basic_os=sunos3 -+ ;; -+ sun3os4) -+ basic_machine=m68k-sun -+ basic_os=sunos4 -+ ;; -+ sun4) -+ basic_machine=sparc-sun -+ basic_os= -+ ;; -+ sun4os3) -+ basic_machine=sparc-sun -+ basic_os=sunos3 -+ ;; -+ sun4os4) -+ basic_machine=sparc-sun -+ basic_os=sunos4 -+ ;; -+ sun4sol2) -+ basic_machine=sparc-sun -+ basic_os=solaris2 -+ ;; -+ sun386 | sun386i | roadrunner) -+ basic_machine=i386-sun -+ basic_os= -+ ;; -+ sv1) -+ basic_machine=sv1-cray -+ basic_os=unicos -+ ;; -+ symmetry) -+ basic_machine=i386-sequent -+ basic_os=dynix -+ ;; -+ t3e) -+ basic_machine=alphaev5-cray -+ basic_os=unicos -+ ;; -+ t90) -+ basic_machine=t90-cray -+ basic_os=unicos -+ ;; -+ toad1) -+ basic_machine=pdp10-xkl -+ basic_os=tops20 -+ ;; -+ tpf) -+ basic_machine=s390x-ibm -+ basic_os=tpf -+ ;; -+ udi29k) -+ basic_machine=a29k-amd -+ basic_os=udi -+ ;; -+ ultra3) -+ basic_machine=a29k-nyu -+ basic_os=sym1 -+ ;; -+ v810 | necv810) -+ basic_machine=v810-nec -+ basic_os=none -+ ;; -+ vaxv) -+ basic_machine=vax-dec -+ basic_os=sysv -+ ;; -+ vms) -+ basic_machine=vax-dec -+ basic_os=vms -+ ;; -+ vsta) -+ basic_machine=i386-pc -+ basic_os=vsta -+ ;; -+ vxworks960) -+ basic_machine=i960-wrs -+ basic_os=vxworks -+ ;; -+ vxworks68) -+ basic_machine=m68k-wrs -+ basic_os=vxworks -+ ;; -+ vxworks29k) -+ basic_machine=a29k-wrs -+ basic_os=vxworks -+ ;; -+ wasm32 | wasm32_simd128) -+ basic_machine=wasm32-unknown -+ ;; -+ xbox) -+ basic_machine=i686-pc -+ basic_os=mingw32 -+ ;; -+ ymp) -+ basic_machine=ymp-cray -+ basic_os=unicos -+ ;; -+ *) -+ basic_machine=$1 -+ basic_os= -+ ;; -+ esac - ;; - esac - --# Decode aliases for certain CPU-COMPANY combinations. -+# Decode 1-component or ad-hoc basic machines - case $basic_machine in -- # Recognize the basic CPU types without company name. -- # Some are omitted here because they have special meanings below. -- 1750a | 580 \ -- | a29k \ -- | aarch64 | aarch64_be \ -- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ -- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ -- | am33_2.0 \ -- | arc | arceb \ -- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ -- | avr | avr32 \ -- | ba \ -- | be32 | be64 \ -- | bfin \ -- | c4x | c8051 | clipper \ -- | d10v | d30v | dlx | dsp16xx \ -- | e2k | epiphany \ -- | fido | fr30 | frv | ft32 \ -- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -- | hexagon \ -- | i370 | i860 | i960 | ia16 | ia64 \ -- | ip2k | iq2000 \ -- | k1om \ -- | le32 | le64 \ -- | lm32 \ -- | m32c | m32r | m32rle | m68000 | m68k | m88k \ -- | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ -- | mips | mipsbe | mipseb | mipsel | mipsle \ -- | mips16 \ -- | mips64 | mips64el \ -- | mips64octeon | mips64octeonel \ -- | mips64orion | mips64orionel \ -- | mips64r5900 | mips64r5900el \ -- | mips64vr | mips64vrel \ -- | mips64vr4100 | mips64vr4100el \ -- | mips64vr4300 | mips64vr4300el \ -- | mips64vr5000 | mips64vr5000el \ -- | mips64vr5900 | mips64vr5900el \ -- | mipsisa32 | mipsisa32el \ -- | mipsisa32r2 | mipsisa32r2el \ -- | mipsisa32r6 | mipsisa32r6el \ -- | mipsisa64 | mipsisa64el \ -- | mipsisa64r2 | mipsisa64r2el \ -- | mipsisa64r6 | mipsisa64r6el \ -- | mipsisa64sb1 | mipsisa64sb1el \ -- | mipsisa64sr71k | mipsisa64sr71kel \ -- | mipsr5900 | mipsr5900el \ -- | mipstx39 | mipstx39el \ -- | mn10200 | mn10300 \ -- | moxie \ -- | mt \ -- | msp430 \ -- | nds32 | nds32le | nds32be \ -- | nios | nios2 | nios2eb | nios2el \ -- | ns16k | ns32k \ -- | open8 | or1k | or1knd | or32 \ -- | pdp10 | pj | pjl \ -- | powerpc | powerpc64 | powerpc64le | powerpcle \ -- | pru \ -- | pyramid \ -- | riscv32 | riscv64 \ -- | rl78 | rx \ -- | score \ -- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ -- | sh64 | sh64le \ -- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ -- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -- | spu \ -- | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ -- | ubicom32 \ -- | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ -- | visium \ -- | wasm32 \ -- | x86 | xc16x | xstormy16 | xtensa \ -- | z8k | z80) -- basic_machine=$basic_machine-unknown -- ;; -- c54x) -- basic_machine=tic54x-unknown -- ;; -- c55x) -- basic_machine=tic55x-unknown -- ;; -- c6x) -- basic_machine=tic6x-unknown -- ;; -- leon|leon[3-9]) -- basic_machine=sparc-$basic_machine -- ;; -- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) -- basic_machine=$basic_machine-unknown -- os=-none -+ # Here we handle the default manufacturer of certain CPU types. It is in -+ # some cases the only manufacturer, in others, it is the most popular. -+ w89k) -+ cpu=hppa1.1 -+ vendor=winbond - ;; -- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) -+ op50n) -+ cpu=hppa1.1 -+ vendor=oki - ;; -- ms1) -- basic_machine=mt-unknown -+ op60c) -+ cpu=hppa1.1 -+ vendor=oki - ;; -- -- strongarm | thumb | xscale) -- basic_machine=arm-unknown -+ ibm*) -+ cpu=i370 -+ vendor=ibm - ;; -- xgate) -- basic_machine=$basic_machine-unknown -- os=-none -+ orion105) -+ cpu=clipper -+ vendor=highlevel - ;; -- xscaleeb) -- basic_machine=armeb-unknown -+ mac | mpw | mac-mpw) -+ cpu=m68k -+ vendor=apple - ;; -- -- xscaleel) -- basic_machine=armel-unknown -+ pmac | pmac-mpw) -+ cpu=powerpc -+ vendor=apple - ;; - -- # We use `pc' rather than `unknown' -- # because (1) that's what they normally are, and -- # (2) the word "unknown" tends to confuse beginning users. -- i*86 | x86_64) -- basic_machine=$basic_machine-pc -- ;; -- # Object if more than one company name word. -- *-*-*) -- echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 -- exit 1 -- ;; -- # Recognize the basic CPU types with company name. -- 580-* \ -- | a29k-* \ -- | aarch64-* | aarch64_be-* \ -- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ -- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ -- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ -- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -- | avr-* | avr32-* \ -- | ba-* \ -- | be32-* | be64-* \ -- | bfin-* | bs2000-* \ -- | c[123]* | c30-* | [cjt]90-* | c4x-* \ -- | c8051-* | clipper-* | craynv-* | cydra-* \ -- | d10v-* | d30v-* | dlx-* \ -- | e2k-* | elxsi-* \ -- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ -- | h8300-* | h8500-* \ -- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ -- | hexagon-* \ -- | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ -- | ip2k-* | iq2000-* \ -- | k1om-* \ -- | le32-* | le64-* \ -- | lm32-* \ -- | m32c-* | m32r-* | m32rle-* \ -- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ -- | microblaze-* | microblazeel-* \ -- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ -- | mips16-* \ -- | mips64-* | mips64el-* \ -- | mips64octeon-* | mips64octeonel-* \ -- | mips64orion-* | mips64orionel-* \ -- | mips64r5900-* | mips64r5900el-* \ -- | mips64vr-* | mips64vrel-* \ -- | mips64vr4100-* | mips64vr4100el-* \ -- | mips64vr4300-* | mips64vr4300el-* \ -- | mips64vr5000-* | mips64vr5000el-* \ -- | mips64vr5900-* | mips64vr5900el-* \ -- | mipsisa32-* | mipsisa32el-* \ -- | mipsisa32r2-* | mipsisa32r2el-* \ -- | mipsisa32r6-* | mipsisa32r6el-* \ -- | mipsisa64-* | mipsisa64el-* \ -- | mipsisa64r2-* | mipsisa64r2el-* \ -- | mipsisa64r6-* | mipsisa64r6el-* \ -- | mipsisa64sb1-* | mipsisa64sb1el-* \ -- | mipsisa64sr71k-* | mipsisa64sr71kel-* \ -- | mipsr5900-* | mipsr5900el-* \ -- | mipstx39-* | mipstx39el-* \ -- | mmix-* \ -- | mt-* \ -- | msp430-* \ -- | nds32-* | nds32le-* | nds32be-* \ -- | nios-* | nios2-* | nios2eb-* | nios2el-* \ -- | none-* | np1-* | ns16k-* | ns32k-* \ -- | open8-* \ -- | or1k*-* \ -- | orion-* \ -- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ -- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ -- | pru-* \ -- | pyramid-* \ -- | riscv32-* | riscv64-* \ -- | rl78-* | romp-* | rs6000-* | rx-* \ -- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ -- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ -- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ -- | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ -- | tahoe-* \ -- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -- | tile*-* \ -- | tron-* \ -- | ubicom32-* \ -- | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ -- | vax-* \ -- | visium-* \ -- | wasm32-* \ -- | we32k-* \ -- | x86-* | x86_64-* | xc16x-* | xps100-* \ -- | xstormy16-* | xtensa*-* \ -- | ymp-* \ -- | z8k-* | z80-*) -- ;; -- # Recognize the basic CPU types without company name, with glob match. -- xtensa*) -- basic_machine=$basic_machine-unknown -- ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. -- 386bsd) -- basic_machine=i386-pc -- os=-bsd -- ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) -- basic_machine=m68000-att -+ cpu=m68000 -+ vendor=att - ;; - 3b*) -- basic_machine=we32k-att -- ;; -- a29khif) -- basic_machine=a29k-amd -- os=-udi -- ;; -- abacus) -- basic_machine=abacus-unknown -- ;; -- adobe68k) -- basic_machine=m68010-adobe -- os=-scout -- ;; -- alliant | fx80) -- basic_machine=fx80-alliant -- ;; -- altos | altos3068) -- basic_machine=m68k-altos -- ;; -- am29k) -- basic_machine=a29k-none -- os=-bsd -- ;; -- amd64) -- basic_machine=x86_64-pc -- ;; -- amd64-*) -- basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- amdahl) -- basic_machine=580-amdahl -- os=-sysv -- ;; -- amiga | amiga-*) -- basic_machine=m68k-unknown -- ;; -- amigaos | amigados) -- basic_machine=m68k-unknown -- os=-amigaos -- ;; -- amigaunix | amix) -- basic_machine=m68k-unknown -- os=-sysv4 -- ;; -- apollo68) -- basic_machine=m68k-apollo -- os=-sysv -- ;; -- apollo68bsd) -- basic_machine=m68k-apollo -- os=-bsd -- ;; -- aros) -- basic_machine=i386-pc -- os=-aros -- ;; -- asmjs) -- basic_machine=asmjs-unknown -- ;; -- aux) -- basic_machine=m68k-apple -- os=-aux -- ;; -- balance) -- basic_machine=ns32k-sequent -- os=-dynix -- ;; -- blackfin) -- basic_machine=bfin-unknown -- os=-linux -- ;; -- blackfin-*) -- basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- os=-linux -+ cpu=we32k -+ vendor=att - ;; - bluegene*) -- basic_machine=powerpc-ibm -- os=-cnk -- ;; -- c54x-*) -- basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- c55x-*) -- basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- c6x-*) -- basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- c90) -- basic_machine=c90-cray -- os=-unicos -- ;; -- cegcc) -- basic_machine=arm-unknown -- os=-cegcc -- ;; -- convex-c1) -- basic_machine=c1-convex -- os=-bsd -- ;; -- convex-c2) -- basic_machine=c2-convex -- os=-bsd -- ;; -- convex-c32) -- basic_machine=c32-convex -- os=-bsd -- ;; -- convex-c34) -- basic_machine=c34-convex -- os=-bsd -- ;; -- convex-c38) -- basic_machine=c38-convex -- os=-bsd -- ;; -- cray | j90) -- basic_machine=j90-cray -- os=-unicos -- ;; -- craynv) -- basic_machine=craynv-cray -- os=-unicosmp -- ;; -- cr16 | cr16-*) -- basic_machine=cr16-unknown -- os=-elf -- ;; -- crds | unos) -- basic_machine=m68k-crds -- ;; -- crisv32 | crisv32-* | etraxfs*) -- basic_machine=crisv32-axis -- ;; -- cris | cris-* | etrax*) -- basic_machine=cris-axis -- ;; -- crx) -- basic_machine=crx-unknown -- os=-elf -- ;; -- da30 | da30-*) -- basic_machine=m68k-da30 -- ;; -- decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) -- basic_machine=mips-dec -+ cpu=powerpc -+ vendor=ibm -+ basic_os=cnk - ;; - decsystem10* | dec10*) -- basic_machine=pdp10-dec -- os=-tops10 -+ cpu=pdp10 -+ vendor=dec -+ basic_os=tops10 - ;; - decsystem20* | dec20*) -- basic_machine=pdp10-dec -- os=-tops20 -+ cpu=pdp10 -+ vendor=dec -+ basic_os=tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) -- basic_machine=m68k-motorola -- ;; -- delta88) -- basic_machine=m88k-motorola -- os=-sysv3 -- ;; -- dicos) -- basic_machine=i686-pc -- os=-dicos -- ;; -- djgpp) -- basic_machine=i586-pc -- os=-msdosdjgpp -- ;; -- dpx20 | dpx20-*) -- basic_machine=rs6000-bull -- os=-bosx -+ cpu=m68k -+ vendor=motorola - ;; - dpx2*) -- basic_machine=m68k-bull -- os=-sysv3 -- ;; -- e500v[12]) -- basic_machine=powerpc-unknown -- os=$os"spe" -- ;; -- e500v[12]-*) -- basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- os=$os"spe" -- ;; -- ebmon29k) -- basic_machine=a29k-amd -- os=-ebmon -- ;; -- elxsi) -- basic_machine=elxsi-elxsi -- os=-bsd -+ cpu=m68k -+ vendor=bull -+ basic_os=sysv3 - ;; - encore | umax | mmax) -- basic_machine=ns32k-encore -+ cpu=ns32k -+ vendor=encore - ;; -- es1800 | OSE68k | ose68k | ose | OSE) -- basic_machine=m68k-ericsson -- os=-ose -+ elxsi) -+ cpu=elxsi -+ vendor=elxsi -+ basic_os=${basic_os:-bsd} - ;; - fx2800) -- basic_machine=i860-alliant -+ cpu=i860 -+ vendor=alliant - ;; - genix) -- basic_machine=ns32k-ns -- ;; -- gmicro) -- basic_machine=tron-gmicro -- os=-sysv -- ;; -- go32) -- basic_machine=i386-pc -- os=-go32 -+ cpu=ns32k -+ vendor=ns - ;; - h3050r* | hiux*) -- basic_machine=hppa1.1-hitachi -- os=-hiuxwe2 -- ;; -- h8300hms) -- basic_machine=h8300-hitachi -- os=-hms -- ;; -- h8300xray) -- basic_machine=h8300-hitachi -- os=-xray -- ;; -- h8500hms) -- basic_machine=h8500-hitachi -- os=-hms -- ;; -- harris) -- basic_machine=m88k-harris -- os=-sysv3 -- ;; -- hp300-*) -- basic_machine=m68k-hp -- ;; -- hp300bsd) -- basic_machine=m68k-hp -- os=-bsd -- ;; -- hp300hpux) -- basic_machine=m68k-hp -- os=-hpux -+ cpu=hppa1.1 -+ vendor=hitachi -+ basic_os=hiuxwe2 - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) -- basic_machine=hppa1.0-hp -+ cpu=hppa1.0 -+ vendor=hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) -- basic_machine=m68000-hp -+ cpu=m68000 -+ vendor=hp - ;; - hp9k3[2-9][0-9]) -- basic_machine=m68k-hp -+ cpu=m68k -+ vendor=hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) -- basic_machine=hppa1.0-hp -+ cpu=hppa1.0 -+ vendor=hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) -- basic_machine=hppa1.1-hp -+ cpu=hppa1.1 -+ vendor=hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp -- basic_machine=hppa1.1-hp -+ cpu=hppa1.1 -+ vendor=hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp -- basic_machine=hppa1.1-hp -+ cpu=hppa1.1 -+ vendor=hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) -- basic_machine=hppa1.1-hp -+ cpu=hppa1.1 -+ vendor=hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) -- basic_machine=hppa1.0-hp -- ;; -- hppaosf) -- basic_machine=hppa1.1-hp -- os=-osf -- ;; -- hppro) -- basic_machine=hppa1.1-hp -- os=-proelf -- ;; -- i370-ibm* | ibm*) -- basic_machine=i370-ibm -+ cpu=hppa1.0 -+ vendor=hp - ;; - i*86v32) -- basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` -- os=-sysv32 -+ cpu=$(echo "$1" | sed -e 's/86.*/86/') -+ vendor=pc -+ basic_os=sysv32 - ;; - i*86v4*) -- basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` -- os=-sysv4 -+ cpu=$(echo "$1" | sed -e 's/86.*/86/') -+ vendor=pc -+ basic_os=sysv4 - ;; - i*86v) -- basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` -- os=-sysv -+ cpu=$(echo "$1" | sed -e 's/86.*/86/') -+ vendor=pc -+ basic_os=sysv - ;; - i*86sol2) -- basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` -- os=-solaris2 -- ;; -- i386mach) -- basic_machine=i386-mach -- os=-mach -+ cpu=$(echo "$1" | sed -e 's/86.*/86/') -+ vendor=pc -+ basic_os=solaris2 - ;; -- vsta) -- basic_machine=i386-unknown -- os=-vsta -+ j90 | j90-cray) -+ cpu=j90 -+ vendor=cray -+ basic_os=${basic_os:-unicos} - ;; - iris | iris4d) -- basic_machine=mips-sgi -- case $os in -- -irix*) -+ cpu=mips -+ vendor=sgi -+ case $basic_os in -+ irix*) - ;; - *) -- os=-irix4 -+ basic_os=irix4 - ;; - esac - ;; -- isi68 | isi) -- basic_machine=m68k-isi -- os=-sysv -- ;; -- leon-*|leon[3-9]-*) -- basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` -- ;; -- m68knommu) -- basic_machine=m68k-unknown -- os=-linux -- ;; -- m68knommu-*) -- basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- os=-linux -- ;; -- magnum | m3230) -- basic_machine=mips-mips -- os=-sysv -- ;; -- merlin) -- basic_machine=ns32k-utek -- os=-sysv -- ;; -- microblaze*) -- basic_machine=microblaze-xilinx -- ;; -- mingw64) -- basic_machine=x86_64-pc -- os=-mingw64 -- ;; -- mingw32) -- basic_machine=i686-pc -- os=-mingw32 -- ;; -- mingw32ce) -- basic_machine=arm-unknown -- os=-mingw32ce -- ;; - miniframe) -- basic_machine=m68000-convergent -- ;; -- *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) -- basic_machine=m68k-atari -- os=-mint -- ;; -- mips3*-*) -- basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` -- ;; -- mips3*) -- basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown -- ;; -- monitor) -- basic_machine=m68k-rom68k -- os=-coff -- ;; -- morphos) -- basic_machine=powerpc-unknown -- os=-morphos -- ;; -- moxiebox) -- basic_machine=moxie-unknown -- os=-moxiebox -+ cpu=m68000 -+ vendor=convergent - ;; -- msdos) -- basic_machine=i386-pc -- os=-msdos -- ;; -- ms1-*) -- basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` -- ;; -- msys) -- basic_machine=i686-pc -- os=-msys -- ;; -- mvs) -- basic_machine=i370-ibm -- os=-mvs -- ;; -- nacl) -- basic_machine=le32-unknown -- os=-nacl -- ;; -- ncr3000) -- basic_machine=i486-ncr -- os=-sysv4 -- ;; -- netbsd386) -- basic_machine=i386-unknown -- os=-netbsd -- ;; -- netwinder) -- basic_machine=armv4l-rebel -- os=-linux -- ;; -- news | news700 | news800 | news900) -- basic_machine=m68k-sony -- os=-newsos -- ;; -- news1000) -- basic_machine=m68030-sony -- os=-newsos -+ *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) -+ cpu=m68k -+ vendor=atari -+ basic_os=mint - ;; - news-3600 | risc-news) -- basic_machine=mips-sony -- os=-newsos -- ;; -- necv70) -- basic_machine=v70-nec -- os=-sysv -+ cpu=mips -+ vendor=sony -+ basic_os=newsos - ;; - next | m*-next) -- basic_machine=m68k-next -- case $os in -- -nextstep* ) -+ cpu=m68k -+ vendor=next -+ case $basic_os in -+ openstep*) -+ ;; -+ nextstep*) - ;; -- -ns2*) -- os=-nextstep2 -+ ns2*) -+ basic_os=nextstep2 - ;; - *) -- os=-nextstep3 -+ basic_os=nextstep3 - ;; - esac - ;; -- nh3000) -- basic_machine=m68k-harris -- os=-cxux -- ;; -- nh[45]000) -- basic_machine=m88k-harris -- os=-cxux -- ;; -- nindy960) -- basic_machine=i960-intel -- os=-nindy -- ;; -- mon960) -- basic_machine=i960-intel -- os=-mon960 -- ;; -- nonstopux) -- basic_machine=mips-compaq -- os=-nonstopux -- ;; - np1) -- basic_machine=np1-gould -- ;; -- neo-tandem) -- basic_machine=neo-tandem -- ;; -- nse-tandem) -- basic_machine=nse-tandem -- ;; -- nsr-tandem) -- basic_machine=nsr-tandem -- ;; -- nsv-tandem) -- basic_machine=nsv-tandem -- ;; -- nsx-tandem) -- basic_machine=nsx-tandem -+ cpu=np1 -+ vendor=gould - ;; - op50n-* | op60c-*) -- basic_machine=hppa1.1-oki -- os=-proelf -- ;; -- openrisc | openrisc-*) -- basic_machine=or32-unknown -- ;; -- os400) -- basic_machine=powerpc-ibm -- os=-os400 -- ;; -- OSE68000 | ose68000) -- basic_machine=m68000-ericsson -- os=-ose -- ;; -- os68k) -- basic_machine=m68k-none -- os=-os68k -+ cpu=hppa1.1 -+ vendor=oki -+ basic_os=proelf - ;; - pa-hitachi) -- basic_machine=hppa1.1-hitachi -- os=-hiuxwe2 -- ;; -- paragon) -- basic_machine=i860-intel -- os=-osf -- ;; -- parisc) -- basic_machine=hppa-unknown -- os=-linux -- ;; -- parisc-*) -- basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- os=-linux -+ cpu=hppa1.1 -+ vendor=hitachi -+ basic_os=hiuxwe2 - ;; - pbd) -- basic_machine=sparc-tti -+ cpu=sparc -+ vendor=tti - ;; - pbb) -- basic_machine=m68k-tti -+ cpu=m68k -+ vendor=tti - ;; -- pc532 | pc532-*) -- basic_machine=ns32k-pc532 -- ;; -- pc98) -- basic_machine=i386-pc -- ;; -- pc98-*) -- basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- pentium | p5 | k5 | k6 | nexgen | viac3) -- basic_machine=i586-pc -- ;; -- pentiumpro | p6 | 6x86 | athlon | athlon_*) -- basic_machine=i686-pc -- ;; -- pentiumii | pentium2 | pentiumiii | pentium3) -- basic_machine=i686-pc -- ;; -- pentium4) -- basic_machine=i786-pc -- ;; -- pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) -- basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- pentiumpro-* | p6-* | 6x86-* | athlon-*) -- basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) -- basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- pentium4-*) -- basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` -+ pc532) -+ cpu=ns32k -+ vendor=pc532 - ;; - pn) -- basic_machine=pn-gould -- ;; -- power) basic_machine=power-ibm -+ cpu=pn -+ vendor=gould - ;; -- ppc | ppcbe) basic_machine=powerpc-unknown -+ power) -+ cpu=power -+ vendor=ibm - ;; -- ppc-* | ppcbe-*) -- basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- ppcle | powerpclittle) -- basic_machine=powerpcle-unknown -- ;; -- ppcle-* | powerpclittle-*) -- basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- ppc64) basic_machine=powerpc64-unknown -+ ps2) -+ cpu=i386 -+ vendor=ibm - ;; -- ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` -+ rm[46]00) -+ cpu=mips -+ vendor=siemens - ;; -- ppc64le | powerpc64little) -- basic_machine=powerpc64le-unknown -+ rtpc | rtpc-*) -+ cpu=romp -+ vendor=ibm - ;; -- ppc64le-* | powerpc64little-*) -- basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` -+ sde) -+ cpu=mipsisa32 -+ vendor=sde -+ basic_os=${basic_os:-elf} - ;; -- ps2) -- basic_machine=i386-ibm -+ simso-wrs) -+ cpu=sparclite -+ vendor=wrs -+ basic_os=vxworks - ;; -- pw32) -- basic_machine=i586-unknown -- os=-pw32 -+ tower | tower-32) -+ cpu=m68k -+ vendor=ncr - ;; -- rdos | rdos64) -- basic_machine=x86_64-pc -- os=-rdos -+ vpp*|vx|vx-*) -+ cpu=f301 -+ vendor=fujitsu - ;; -- rdos32) -- basic_machine=i386-pc -- os=-rdos -+ w65) -+ cpu=w65 -+ vendor=wdc - ;; -- rom68k) -- basic_machine=m68k-rom68k -- os=-coff -+ w89k-*) -+ cpu=hppa1.1 -+ vendor=winbond -+ basic_os=proelf - ;; -- rm[46]00) -- basic_machine=mips-siemens -+ none) -+ cpu=none -+ vendor=none - ;; -- rtpc | rtpc-*) -- basic_machine=romp-ibm -+ leon|leon[3-9]) -+ cpu=sparc -+ vendor=$basic_machine - ;; -- s390 | s390-*) -- basic_machine=s390-ibm -+ leon-*|leon[3-9]-*) -+ cpu=sparc -+ vendor=$(echo "$basic_machine" | sed 's/-.*//') - ;; -- s390x | s390x-*) -- basic_machine=s390x-ibm -+ -+ *-*) -+ # shellcheck disable=SC2162 -+ IFS="-" read cpu vendor <&2 -- exit 1 -+ # Recognize the canonical CPU types that are allowed with any -+ # company name. -+ case $cpu in -+ 1750a | 580 \ -+ | a29k \ -+ | aarch64 | aarch64_be \ -+ | abacus \ -+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ -+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ -+ | alphapca5[67] | alpha64pca5[67] \ -+ | am33_2.0 \ -+ | amdgcn \ -+ | arc | arceb \ -+ | arm | arm[lb]e | arme[lb] | armv* \ -+ | avr | avr32 \ -+ | asmjs \ -+ | ba \ -+ | be32 | be64 \ -+ | bfin | bpf | bs2000 \ -+ | c[123]* | c30 | [cjt]90 | c4x \ -+ | c8051 | clipper | craynv | csky | cydra \ -+ | d10v | d30v | dlx | dsp16xx \ -+ | e2k | elxsi | epiphany \ -+ | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \ -+ | h8300 | h8500 \ -+ | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -+ | hexagon \ -+ | i370 | i*86 | i860 | i960 | ia16 | ia64 \ -+ | ip2k | iq2000 \ -+ | k1om \ -+ | le32 | le64 \ -+ | lm32 \ -+ | loongarch32 | loongarch64 | loongarchx32 \ -+ | m32c | m32r | m32rle \ -+ | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ -+ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ -+ | m88110 | m88k | maxq | mb | mcore | mep | metag \ -+ | microblaze | microblazeel \ -+ | mips | mipsbe | mipseb | mipsel | mipsle \ -+ | mips16 \ -+ | mips64 | mips64eb | mips64el \ -+ | mips64octeon | mips64octeonel \ -+ | mips64orion | mips64orionel \ -+ | mips64r5900 | mips64r5900el \ -+ | mips64vr | mips64vrel \ -+ | mips64vr4100 | mips64vr4100el \ -+ | mips64vr4300 | mips64vr4300el \ -+ | mips64vr5000 | mips64vr5000el \ -+ | mips64vr5900 | mips64vr5900el \ -+ | mipsisa32 | mipsisa32el \ -+ | mipsisa32r2 | mipsisa32r2el \ -+ | mipsisa32r6 | mipsisa32r6el \ -+ | mipsisa64 | mipsisa64el \ -+ | mipsisa64r2 | mipsisa64r2el \ -+ | mipsisa64r6 | mipsisa64r6el \ -+ | mipsisa64sb1 | mipsisa64sb1el \ -+ | mipsisa64sr71k | mipsisa64sr71kel \ -+ | mipsr5900 | mipsr5900el \ -+ | mipstx39 | mipstx39el \ -+ | mmix \ -+ | mn10200 | mn10300 \ -+ | moxie \ -+ | mt \ -+ | msp430 \ -+ | nds32 | nds32le | nds32be \ -+ | nfp \ -+ | nios | nios2 | nios2eb | nios2el \ -+ | none | np1 | ns16k | ns32k | nvptx \ -+ | open8 \ -+ | or1k* \ -+ | or32 \ -+ | orion \ -+ | picochip \ -+ | pdp10 | pdp11 | pj | pjl | pn | power \ -+ | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ -+ | pru \ -+ | pyramid \ -+ | riscv | riscv32 | riscv32be | riscv64 | riscv64be \ -+ | rl78 | romp | rs6000 | rx \ -+ | s390 | s390x \ -+ | score \ -+ | sh | shl \ -+ | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ -+ | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \ -+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \ -+ | sparclite \ -+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ -+ | spu \ -+ | tahoe \ -+ | thumbv7* \ -+ | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ -+ | tron \ -+ | ubicom32 \ -+ | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ -+ | vax \ -+ | visium \ -+ | w65 \ -+ | wasm32 | wasm32_simd128 | wasm64 \ -+ | we32k \ -+ | x86 | x86_64 | xc16x | xgate | xps100 \ -+ | xstormy16 | xtensa* \ -+ | ymp \ -+ | z8k | z80) -+ ;; -+ -+ *) -+ echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2 -+ exit 1 -+ ;; -+ esac - ;; - esac - - # Here we canonicalize certain aliases for manufacturers. --case $basic_machine in -- *-digital*) -- basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` -+case $vendor in -+ digital*) -+ vendor=dec - ;; -- *-commodore*) -- basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` -+ commodore*) -+ vendor=cbm - ;; - *) - ;; -@@ -1334,203 +1287,213 @@ esac - - # Decode manufacturer-specific aliases for certain operating systems. - --if [ x"$os" != x"" ] -+if test x$basic_os != x - then -+ -+# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just -+# set os. -+case $basic_os in -+ gnu/linux*) -+ kernel=linux -+ os=$(echo $basic_os | sed -e 's|gnu/linux|gnu|') -+ ;; -+ os2-emx) -+ kernel=os2 -+ os=$(echo $basic_os | sed -e 's|os2-emx|emx|') -+ ;; -+ nto-qnx*) -+ kernel=nto -+ os=$(echo $basic_os | sed -e 's|nto-qnx|qnx|') -+ ;; -+ *-*) -+ # shellcheck disable=SC2162 -+ IFS="-" read kernel os <&2 -- exit 1 -+ # No normalization, but not necessarily accepted, that comes below. - ;; - esac -+ - else - - # Here we handle the default operating systems that come with various machines. -@@ -1543,254 +1506,357 @@ else - # will signal an error saying that MANUFACTURER isn't an operating - # system, and we'll never get to this point. - --case $basic_machine in -+kernel= -+case $cpu-$vendor in - score-*) -- os=-elf -+ os=elf - ;; - spu-*) -- os=-elf -+ os=elf - ;; - *-acorn) -- os=-riscix1.2 -+ os=riscix1.2 - ;; - arm*-rebel) -- os=-linux -+ kernel=linux -+ os=gnu - ;; - arm*-semi) -- os=-aout -+ os=aout - ;; - c4x-* | tic4x-*) -- os=-coff -+ os=coff - ;; - c8051-*) -- os=-elf -+ os=elf -+ ;; -+ clipper-intergraph) -+ os=clix - ;; - hexagon-*) -- os=-elf -+ os=elf - ;; - tic54x-*) -- os=-coff -+ os=coff - ;; - tic55x-*) -- os=-coff -+ os=coff - ;; - tic6x-*) -- os=-coff -+ os=coff - ;; - # This must come before the *-dec entry. - pdp10-*) -- os=-tops20 -+ os=tops20 - ;; - pdp11-*) -- os=-none -+ os=none - ;; - *-dec | vax-*) -- os=-ultrix4.2 -+ os=ultrix4.2 - ;; - m68*-apollo) -- os=-domain -+ os=domain - ;; - i386-sun) -- os=-sunos4.0.2 -+ os=sunos4.0.2 - ;; - m68000-sun) -- os=-sunos3 -+ os=sunos3 - ;; - m68*-cisco) -- os=-aout -+ os=aout - ;; - mep-*) -- os=-elf -+ os=elf - ;; - mips*-cisco) -- os=-elf -+ os=elf - ;; - mips*-*) -- os=-elf -+ os=elf - ;; - or32-*) -- os=-coff -+ os=coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. -- os=-sysv3 -+ os=sysv3 - ;; - sparc-* | *-sun) -- os=-sunos4.1.1 -+ os=sunos4.1.1 - ;; - pru-*) -- os=-elf -+ os=elf - ;; - *-be) -- os=-beos -+ os=beos - ;; - *-ibm) -- os=-aix -+ os=aix - ;; - *-knuth) -- os=-mmixware -+ os=mmixware - ;; - *-wec) -- os=-proelf -+ os=proelf - ;; - *-winbond) -- os=-proelf -+ os=proelf - ;; - *-oki) -- os=-proelf -+ os=proelf - ;; - *-hp) -- os=-hpux -+ os=hpux - ;; - *-hitachi) -- os=-hiux -+ os=hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) -- os=-sysv -+ os=sysv - ;; - *-cbm) -- os=-amigaos -+ os=amigaos - ;; - *-dg) -- os=-dgux -+ os=dgux - ;; - *-dolphin) -- os=-sysv3 -+ os=sysv3 - ;; - m68k-ccur) -- os=-rtu -+ os=rtu - ;; - m88k-omron*) -- os=-luna -+ os=luna - ;; - *-next) -- os=-nextstep -+ os=nextstep - ;; - *-sequent) -- os=-ptx -+ os=ptx - ;; - *-crds) -- os=-unos -+ os=unos - ;; - *-ns) -- os=-genix -+ os=genix - ;; - i370-*) -- os=-mvs -+ os=mvs - ;; - *-gould) -- os=-sysv -+ os=sysv - ;; - *-highlevel) -- os=-bsd -+ os=bsd - ;; - *-encore) -- os=-bsd -+ os=bsd - ;; - *-sgi) -- os=-irix -+ os=irix - ;; - *-siemens) -- os=-sysv4 -+ os=sysv4 - ;; - *-masscomp) -- os=-rtu -+ os=rtu - ;; - f30[01]-fujitsu | f700-fujitsu) -- os=-uxpv -+ os=uxpv - ;; - *-rom68k) -- os=-coff -+ os=coff - ;; - *-*bug) -- os=-coff -+ os=coff - ;; - *-apple) -- os=-macos -+ os=macos - ;; - *-atari*) -- os=-mint -+ os=mint -+ ;; -+ *-wrs) -+ os=vxworks - ;; - *) -- os=-none -+ os=none - ;; - esac -+ - fi - -+# Now, validate our (potentially fixed-up) OS. -+case $os in -+ # Sometimes we do "kernel-libc", so those need to count as OSes. -+ musl* | newlib* | uclibc*) -+ ;; -+ # Likewise for "kernel-abi" -+ eabi* | gnueabi*) -+ ;; -+ # VxWorks passes extra cpu info in the 4th filed. -+ simlinux | simwindows | spe) -+ ;; -+ # Now accept the basic system types. -+ # The portable systems comes first. -+ # Each alternative MUST end in a * to match a version number. -+ gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ -+ | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ -+ | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ -+ | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ -+ | hiux* | abug | nacl* | netware* | windows* \ -+ | os9* | macos* | osx* | ios* \ -+ | mpw* | magic* | mmixware* | mon960* | lnews* \ -+ | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ -+ | aos* | aros* | cloudabi* | sortix* | twizzler* \ -+ | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ -+ | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ -+ | mirbsd* | netbsd* | dicos* | openedition* | ose* \ -+ | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \ -+ | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ -+ | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ -+ | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ -+ | udi* | lites* | ieee* | go32* | aux* | hcos* \ -+ | chorusrdb* | cegcc* | glidix* | serenity* \ -+ | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ -+ | midipix* | mingw32* | mingw64* | mint* \ -+ | uxpv* | beos* | mpeix* | udk* | moxiebox* \ -+ | interix* | uwin* | mks* | rhapsody* | darwin* \ -+ | openstep* | oskit* | conix* | pw32* | nonstopux* \ -+ | storm-chaos* | tops10* | tenex* | tops20* | its* \ -+ | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \ -+ | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \ -+ | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ -+ | skyos* | haiku* | rdos* | toppers* | drops* | es* \ -+ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ -+ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ -+ | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*) -+ ;; -+ # This one is extra strict with allowed versions -+ sco3.2v2 | sco3.2v[4-9]* | sco5v6*) -+ # Don't forget version if it is 3.2v4 or newer. -+ ;; -+ none) -+ ;; -+ *) -+ echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 -+ exit 1 -+ ;; -+esac -+ -+# As a final step for OS-related things, validate the OS-kernel combination -+# (given a valid OS), if there is a kernel. -+case $kernel-$os in -+ linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* ) -+ ;; -+ uclinux-uclibc* ) -+ ;; -+ -dietlibc* | -newlib* | -musl* | -uclibc* ) -+ # These are just libc implementations, not actual OSes, and thus -+ # require a kernel. -+ echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 -+ exit 1 -+ ;; -+ kfreebsd*-gnu* | kopensolaris*-gnu*) -+ ;; -+ vxworks-simlinux | vxworks-simwindows | vxworks-spe) -+ ;; -+ nto-qnx*) -+ ;; -+ os2-emx) -+ ;; -+ *-eabi* | *-gnueabi*) -+ ;; -+ -*) -+ # Blank kernel with real OS is always fine. -+ ;; -+ *-*) -+ echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 -+ exit 1 -+ ;; -+esac -+ - # Here we handle the case where we know the os, and the CPU type, but not the - # manufacturer. We pick the logical manufacturer. --vendor=unknown --case $basic_machine in -- *-unknown) -- case $os in -- -riscix*) -+case $vendor in -+ unknown) -+ case $cpu-$os in -+ *-riscix*) - vendor=acorn - ;; -- -sunos*) -+ *-sunos*) - vendor=sun - ;; -- -cnk*|-aix*) -+ *-cnk* | *-aix*) - vendor=ibm - ;; -- -beos*) -+ *-beos*) - vendor=be - ;; -- -hpux*) -+ *-hpux*) - vendor=hp - ;; -- -mpeix*) -+ *-mpeix*) - vendor=hp - ;; -- -hiux*) -+ *-hiux*) - vendor=hitachi - ;; -- -unos*) -+ *-unos*) - vendor=crds - ;; -- -dgux*) -+ *-dgux*) - vendor=dg - ;; -- -luna*) -+ *-luna*) - vendor=omron - ;; -- -genix*) -+ *-genix*) - vendor=ns - ;; -- -mvs* | -opened*) -+ *-clix*) -+ vendor=intergraph -+ ;; -+ *-mvs* | *-opened*) -+ vendor=ibm -+ ;; -+ *-os400*) - vendor=ibm - ;; -- -os400*) -+ s390-* | s390x-*) - vendor=ibm - ;; -- -ptx*) -+ *-ptx*) - vendor=sequent - ;; -- -tpf*) -+ *-tpf*) - vendor=ibm - ;; -- -vxsim* | -vxworks* | -windiss*) -+ *-vxsim* | *-vxworks* | *-windiss*) - vendor=wrs - ;; -- -aux*) -+ *-aux*) - vendor=apple - ;; -- -hms*) -+ *-hms*) - vendor=hitachi - ;; -- -mpw* | -macos*) -+ *-mpw* | *-macos*) - vendor=apple - ;; -- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) -+ *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) - vendor=atari - ;; -- -vos*) -+ *-vos*) - vendor=stratus - ;; - esac -- basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` - ;; - esac - --echo "$basic_machine$os" -+echo "$cpu-$vendor-${kernel:+$kernel-}$os" - exit - - # Local variables: -diff --git a/src/jpeg/config.sub b/src/jpeg/config.sub -index 9ccf09a..f1bee4e 100755 ---- a/src/jpeg/config.sub -+++ b/src/jpeg/config.sub -@@ -1,8 +1,8 @@ - #! /bin/sh - # Configuration validation subroutine script. --# Copyright 1992-2018 Free Software Foundation, Inc. -+# Copyright 1992-2021 Free Software Foundation, Inc. - --timestamp='2018-03-08' -+timestamp='2021-03-10' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -33,7 +33,7 @@ timestamp='2018-03-08' - # Otherwise, we print the canonical config type on stdout and succeed. - - # You can get the latest version of this script from: --# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub -+# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub - - # This file is supposed to be the same for all GNU packages - # and recognize all the CPU types, system types and aliases -@@ -50,7 +50,7 @@ timestamp='2018-03-08' - # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM - # It is wrong to echo any other type of specification. - --me=`echo "$0" | sed -e 's,.*/,,'` -+me=$(echo "$0" | sed -e 's,.*/,,') - - usage="\ - Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS -@@ -67,7 +67,7 @@ Report bugs and patches to ." - version="\ - GNU config.sub ($timestamp) - --Copyright 1992-2018 Free Software Foundation, Inc. -+Copyright 1992-2021 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -89,7 +89,7 @@ while test $# -gt 0 ; do - - ) # Use stdin as input. - break ;; - -* ) -- echo "$me: invalid option $1$help" -+ echo "$me: invalid option $1$help" >&2 - exit 1 ;; - - *local*) -@@ -110,1223 +110,1176 @@ case $# in - exit 1;; - esac - --# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). --# Here we must recognize all the valid KERNEL-OS combinations. --maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` --case $maybe_os in -- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ -- linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ -- knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ -- kopensolaris*-gnu* | cloudabi*-eabi* | \ -- storm-chaos* | os2-emx* | rtmk-nova*) -- os=-$maybe_os -- basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` -- ;; -- android-linux) -- os=-linux-android -- basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown -- ;; -- *) -- basic_machine=`echo "$1" | sed 's/-[^-]*$//'` -- if [ "$basic_machine" != "$1" ] -- then os=`echo "$1" | sed 's/.*-/-/'` -- else os=; fi -- ;; --esac -+# Split fields of configuration type -+# shellcheck disable=SC2162 -+IFS="-" read field1 field2 field3 field4 <&2 -+ exit 1 - ;; -- -lynx*) -- os=-lynxos -+ *-*-*-*) -+ basic_machine=$field1-$field2 -+ basic_os=$field3-$field4 - ;; -- -ptx*) -- basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` -+ *-*-*) -+ # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two -+ # parts -+ maybe_os=$field2-$field3 -+ case $maybe_os in -+ nto-qnx* | linux-* | uclinux-uclibc* \ -+ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ -+ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ -+ | storm-chaos* | os2-emx* | rtmk-nova*) -+ basic_machine=$field1 -+ basic_os=$maybe_os -+ ;; -+ android-linux) -+ basic_machine=$field1-unknown -+ basic_os=linux-android -+ ;; -+ *) -+ basic_machine=$field1-$field2 -+ basic_os=$field3 -+ ;; -+ esac - ;; -- -psos*) -- os=-psos -+ *-*) -+ # A lone config we happen to match not fitting any pattern -+ case $field1-$field2 in -+ decstation-3100) -+ basic_machine=mips-dec -+ basic_os= -+ ;; -+ *-*) -+ # Second component is usually, but not always the OS -+ case $field2 in -+ # Prevent following clause from handling this valid os -+ sun*os*) -+ basic_machine=$field1 -+ basic_os=$field2 -+ ;; -+ # Manufacturers -+ dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ -+ | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ -+ | unicom* | ibm* | next | hp | isi* | apollo | altos* \ -+ | convergent* | ncr* | news | 32* | 3600* | 3100* \ -+ | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ -+ | ultra | tti* | harris | dolphin | highlevel | gould \ -+ | cbm | ns | masscomp | apple | axis | knuth | cray \ -+ | microblaze* | sim | cisco \ -+ | oki | wec | wrs | winbond) -+ basic_machine=$field1-$field2 -+ basic_os= -+ ;; -+ *) -+ basic_machine=$field1 -+ basic_os=$field2 -+ ;; -+ esac -+ ;; -+ esac - ;; -- -mint | -mint[0-9]*) -- basic_machine=m68k-atari -- os=-mint -+ *) -+ # Convert single-component short-hands not valid as part of -+ # multi-component configurations. -+ case $field1 in -+ 386bsd) -+ basic_machine=i386-pc -+ basic_os=bsd -+ ;; -+ a29khif) -+ basic_machine=a29k-amd -+ basic_os=udi -+ ;; -+ adobe68k) -+ basic_machine=m68010-adobe -+ basic_os=scout -+ ;; -+ alliant) -+ basic_machine=fx80-alliant -+ basic_os= -+ ;; -+ altos | altos3068) -+ basic_machine=m68k-altos -+ basic_os= -+ ;; -+ am29k) -+ basic_machine=a29k-none -+ basic_os=bsd -+ ;; -+ amdahl) -+ basic_machine=580-amdahl -+ basic_os=sysv -+ ;; -+ amiga) -+ basic_machine=m68k-unknown -+ basic_os= -+ ;; -+ amigaos | amigados) -+ basic_machine=m68k-unknown -+ basic_os=amigaos -+ ;; -+ amigaunix | amix) -+ basic_machine=m68k-unknown -+ basic_os=sysv4 -+ ;; -+ apollo68) -+ basic_machine=m68k-apollo -+ basic_os=sysv -+ ;; -+ apollo68bsd) -+ basic_machine=m68k-apollo -+ basic_os=bsd -+ ;; -+ aros) -+ basic_machine=i386-pc -+ basic_os=aros -+ ;; -+ aux) -+ basic_machine=m68k-apple -+ basic_os=aux -+ ;; -+ balance) -+ basic_machine=ns32k-sequent -+ basic_os=dynix -+ ;; -+ blackfin) -+ basic_machine=bfin-unknown -+ basic_os=linux -+ ;; -+ cegcc) -+ basic_machine=arm-unknown -+ basic_os=cegcc -+ ;; -+ convex-c1) -+ basic_machine=c1-convex -+ basic_os=bsd -+ ;; -+ convex-c2) -+ basic_machine=c2-convex -+ basic_os=bsd -+ ;; -+ convex-c32) -+ basic_machine=c32-convex -+ basic_os=bsd -+ ;; -+ convex-c34) -+ basic_machine=c34-convex -+ basic_os=bsd -+ ;; -+ convex-c38) -+ basic_machine=c38-convex -+ basic_os=bsd -+ ;; -+ cray) -+ basic_machine=j90-cray -+ basic_os=unicos -+ ;; -+ crds | unos) -+ basic_machine=m68k-crds -+ basic_os= -+ ;; -+ da30) -+ basic_machine=m68k-da30 -+ basic_os= -+ ;; -+ decstation | pmax | pmin | dec3100 | decstatn) -+ basic_machine=mips-dec -+ basic_os= -+ ;; -+ delta88) -+ basic_machine=m88k-motorola -+ basic_os=sysv3 -+ ;; -+ dicos) -+ basic_machine=i686-pc -+ basic_os=dicos -+ ;; -+ djgpp) -+ basic_machine=i586-pc -+ basic_os=msdosdjgpp -+ ;; -+ ebmon29k) -+ basic_machine=a29k-amd -+ basic_os=ebmon -+ ;; -+ es1800 | OSE68k | ose68k | ose | OSE) -+ basic_machine=m68k-ericsson -+ basic_os=ose -+ ;; -+ gmicro) -+ basic_machine=tron-gmicro -+ basic_os=sysv -+ ;; -+ go32) -+ basic_machine=i386-pc -+ basic_os=go32 -+ ;; -+ h8300hms) -+ basic_machine=h8300-hitachi -+ basic_os=hms -+ ;; -+ h8300xray) -+ basic_machine=h8300-hitachi -+ basic_os=xray -+ ;; -+ h8500hms) -+ basic_machine=h8500-hitachi -+ basic_os=hms -+ ;; -+ harris) -+ basic_machine=m88k-harris -+ basic_os=sysv3 -+ ;; -+ hp300 | hp300hpux) -+ basic_machine=m68k-hp -+ basic_os=hpux -+ ;; -+ hp300bsd) -+ basic_machine=m68k-hp -+ basic_os=bsd -+ ;; -+ hppaosf) -+ basic_machine=hppa1.1-hp -+ basic_os=osf -+ ;; -+ hppro) -+ basic_machine=hppa1.1-hp -+ basic_os=proelf -+ ;; -+ i386mach) -+ basic_machine=i386-mach -+ basic_os=mach -+ ;; -+ isi68 | isi) -+ basic_machine=m68k-isi -+ basic_os=sysv -+ ;; -+ m68knommu) -+ basic_machine=m68k-unknown -+ basic_os=linux -+ ;; -+ magnum | m3230) -+ basic_machine=mips-mips -+ basic_os=sysv -+ ;; -+ merlin) -+ basic_machine=ns32k-utek -+ basic_os=sysv -+ ;; -+ mingw64) -+ basic_machine=x86_64-pc -+ basic_os=mingw64 -+ ;; -+ mingw32) -+ basic_machine=i686-pc -+ basic_os=mingw32 -+ ;; -+ mingw32ce) -+ basic_machine=arm-unknown -+ basic_os=mingw32ce -+ ;; -+ monitor) -+ basic_machine=m68k-rom68k -+ basic_os=coff -+ ;; -+ morphos) -+ basic_machine=powerpc-unknown -+ basic_os=morphos -+ ;; -+ moxiebox) -+ basic_machine=moxie-unknown -+ basic_os=moxiebox -+ ;; -+ msdos) -+ basic_machine=i386-pc -+ basic_os=msdos -+ ;; -+ msys) -+ basic_machine=i686-pc -+ basic_os=msys -+ ;; -+ mvs) -+ basic_machine=i370-ibm -+ basic_os=mvs -+ ;; -+ nacl) -+ basic_machine=le32-unknown -+ basic_os=nacl -+ ;; -+ emscripten) -+ basic_machine=asmjs-unknown -+ basic_os=emscripten -+ ;; -+ ncr3000) -+ basic_machine=i486-ncr -+ basic_os=sysv4 -+ ;; -+ netbsd386) -+ basic_machine=i386-pc -+ basic_os=netbsd -+ ;; -+ netwinder) -+ basic_machine=armv4l-rebel -+ basic_os=linux -+ ;; -+ news | news700 | news800 | news900) -+ basic_machine=m68k-sony -+ basic_os=newsos -+ ;; -+ news1000) -+ basic_machine=m68030-sony -+ basic_os=newsos -+ ;; -+ necv70) -+ basic_machine=v70-nec -+ basic_os=sysv -+ ;; -+ nh3000) -+ basic_machine=m68k-harris -+ basic_os=cxux -+ ;; -+ nh[45]000) -+ basic_machine=m88k-harris -+ basic_os=cxux -+ ;; -+ nindy960) -+ basic_machine=i960-intel -+ basic_os=nindy -+ ;; -+ mon960) -+ basic_machine=i960-intel -+ basic_os=mon960 -+ ;; -+ nonstopux) -+ basic_machine=mips-compaq -+ basic_os=nonstopux -+ ;; -+ os400) -+ basic_machine=powerpc-ibm -+ basic_os=os400 -+ ;; -+ OSE68000 | ose68000) -+ basic_machine=m68000-ericsson -+ basic_os=ose -+ ;; -+ os68k) -+ basic_machine=m68k-none -+ basic_os=os68k -+ ;; -+ paragon) -+ basic_machine=i860-intel -+ basic_os=osf -+ ;; -+ parisc) -+ basic_machine=hppa-unknown -+ basic_os=linux -+ ;; -+ psp) -+ basic_machine=mipsallegrexel-sony -+ basic_os=psp -+ ;; -+ pw32) -+ basic_machine=i586-unknown -+ basic_os=pw32 -+ ;; -+ rdos | rdos64) -+ basic_machine=x86_64-pc -+ basic_os=rdos -+ ;; -+ rdos32) -+ basic_machine=i386-pc -+ basic_os=rdos -+ ;; -+ rom68k) -+ basic_machine=m68k-rom68k -+ basic_os=coff -+ ;; -+ sa29200) -+ basic_machine=a29k-amd -+ basic_os=udi -+ ;; -+ sei) -+ basic_machine=mips-sei -+ basic_os=seiux -+ ;; -+ sequent) -+ basic_machine=i386-sequent -+ basic_os= -+ ;; -+ sps7) -+ basic_machine=m68k-bull -+ basic_os=sysv2 -+ ;; -+ st2000) -+ basic_machine=m68k-tandem -+ basic_os= -+ ;; -+ stratus) -+ basic_machine=i860-stratus -+ basic_os=sysv4 -+ ;; -+ sun2) -+ basic_machine=m68000-sun -+ basic_os= -+ ;; -+ sun2os3) -+ basic_machine=m68000-sun -+ basic_os=sunos3 -+ ;; -+ sun2os4) -+ basic_machine=m68000-sun -+ basic_os=sunos4 -+ ;; -+ sun3) -+ basic_machine=m68k-sun -+ basic_os= -+ ;; -+ sun3os3) -+ basic_machine=m68k-sun -+ basic_os=sunos3 -+ ;; -+ sun3os4) -+ basic_machine=m68k-sun -+ basic_os=sunos4 -+ ;; -+ sun4) -+ basic_machine=sparc-sun -+ basic_os= -+ ;; -+ sun4os3) -+ basic_machine=sparc-sun -+ basic_os=sunos3 -+ ;; -+ sun4os4) -+ basic_machine=sparc-sun -+ basic_os=sunos4 -+ ;; -+ sun4sol2) -+ basic_machine=sparc-sun -+ basic_os=solaris2 -+ ;; -+ sun386 | sun386i | roadrunner) -+ basic_machine=i386-sun -+ basic_os= -+ ;; -+ sv1) -+ basic_machine=sv1-cray -+ basic_os=unicos -+ ;; -+ symmetry) -+ basic_machine=i386-sequent -+ basic_os=dynix -+ ;; -+ t3e) -+ basic_machine=alphaev5-cray -+ basic_os=unicos -+ ;; -+ t90) -+ basic_machine=t90-cray -+ basic_os=unicos -+ ;; -+ toad1) -+ basic_machine=pdp10-xkl -+ basic_os=tops20 -+ ;; -+ tpf) -+ basic_machine=s390x-ibm -+ basic_os=tpf -+ ;; -+ udi29k) -+ basic_machine=a29k-amd -+ basic_os=udi -+ ;; -+ ultra3) -+ basic_machine=a29k-nyu -+ basic_os=sym1 -+ ;; -+ v810 | necv810) -+ basic_machine=v810-nec -+ basic_os=none -+ ;; -+ vaxv) -+ basic_machine=vax-dec -+ basic_os=sysv -+ ;; -+ vms) -+ basic_machine=vax-dec -+ basic_os=vms -+ ;; -+ vsta) -+ basic_machine=i386-pc -+ basic_os=vsta -+ ;; -+ vxworks960) -+ basic_machine=i960-wrs -+ basic_os=vxworks -+ ;; -+ vxworks68) -+ basic_machine=m68k-wrs -+ basic_os=vxworks -+ ;; -+ vxworks29k) -+ basic_machine=a29k-wrs -+ basic_os=vxworks -+ ;; -+ wasm32 | wasm32_simd128) -+ basic_machine=wasm32-unknown -+ ;; -+ xbox) -+ basic_machine=i686-pc -+ basic_os=mingw32 -+ ;; -+ ymp) -+ basic_machine=ymp-cray -+ basic_os=unicos -+ ;; -+ *) -+ basic_machine=$1 -+ basic_os= -+ ;; -+ esac - ;; - esac - --# Decode aliases for certain CPU-COMPANY combinations. -+# Decode 1-component or ad-hoc basic machines - case $basic_machine in -- # Recognize the basic CPU types without company name. -- # Some are omitted here because they have special meanings below. -- 1750a | 580 \ -- | a29k \ -- | aarch64 | aarch64_be \ -- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ -- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ -- | am33_2.0 \ -- | arc | arceb \ -- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ -- | avr | avr32 \ -- | ba \ -- | be32 | be64 \ -- | bfin \ -- | c4x | c8051 | clipper \ -- | d10v | d30v | dlx | dsp16xx \ -- | e2k | epiphany \ -- | fido | fr30 | frv | ft32 \ -- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -- | hexagon \ -- | i370 | i860 | i960 | ia16 | ia64 \ -- | ip2k | iq2000 \ -- | k1om \ -- | le32 | le64 \ -- | lm32 \ -- | m32c | m32r | m32rle | m68000 | m68k | m88k \ -- | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ -- | mips | mipsbe | mipseb | mipsel | mipsle \ -- | mips16 \ -- | mips64 | mips64el \ -- | mips64octeon | mips64octeonel \ -- | mips64orion | mips64orionel \ -- | mips64r5900 | mips64r5900el \ -- | mips64vr | mips64vrel \ -- | mips64vr4100 | mips64vr4100el \ -- | mips64vr4300 | mips64vr4300el \ -- | mips64vr5000 | mips64vr5000el \ -- | mips64vr5900 | mips64vr5900el \ -- | mipsisa32 | mipsisa32el \ -- | mipsisa32r2 | mipsisa32r2el \ -- | mipsisa32r6 | mipsisa32r6el \ -- | mipsisa64 | mipsisa64el \ -- | mipsisa64r2 | mipsisa64r2el \ -- | mipsisa64r6 | mipsisa64r6el \ -- | mipsisa64sb1 | mipsisa64sb1el \ -- | mipsisa64sr71k | mipsisa64sr71kel \ -- | mipsr5900 | mipsr5900el \ -- | mipstx39 | mipstx39el \ -- | mn10200 | mn10300 \ -- | moxie \ -- | mt \ -- | msp430 \ -- | nds32 | nds32le | nds32be \ -- | nios | nios2 | nios2eb | nios2el \ -- | ns16k | ns32k \ -- | open8 | or1k | or1knd | or32 \ -- | pdp10 | pj | pjl \ -- | powerpc | powerpc64 | powerpc64le | powerpcle \ -- | pru \ -- | pyramid \ -- | riscv32 | riscv64 \ -- | rl78 | rx \ -- | score \ -- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ -- | sh64 | sh64le \ -- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ -- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -- | spu \ -- | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ -- | ubicom32 \ -- | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ -- | visium \ -- | wasm32 \ -- | x86 | xc16x | xstormy16 | xtensa \ -- | z8k | z80) -- basic_machine=$basic_machine-unknown -- ;; -- c54x) -- basic_machine=tic54x-unknown -- ;; -- c55x) -- basic_machine=tic55x-unknown -- ;; -- c6x) -- basic_machine=tic6x-unknown -- ;; -- leon|leon[3-9]) -- basic_machine=sparc-$basic_machine -- ;; -- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) -- basic_machine=$basic_machine-unknown -- os=-none -+ # Here we handle the default manufacturer of certain CPU types. It is in -+ # some cases the only manufacturer, in others, it is the most popular. -+ w89k) -+ cpu=hppa1.1 -+ vendor=winbond - ;; -- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) -+ op50n) -+ cpu=hppa1.1 -+ vendor=oki - ;; -- ms1) -- basic_machine=mt-unknown -+ op60c) -+ cpu=hppa1.1 -+ vendor=oki - ;; -- -- strongarm | thumb | xscale) -- basic_machine=arm-unknown -+ ibm*) -+ cpu=i370 -+ vendor=ibm - ;; -- xgate) -- basic_machine=$basic_machine-unknown -- os=-none -+ orion105) -+ cpu=clipper -+ vendor=highlevel - ;; -- xscaleeb) -- basic_machine=armeb-unknown -+ mac | mpw | mac-mpw) -+ cpu=m68k -+ vendor=apple - ;; -- -- xscaleel) -- basic_machine=armel-unknown -+ pmac | pmac-mpw) -+ cpu=powerpc -+ vendor=apple - ;; - -- # We use `pc' rather than `unknown' -- # because (1) that's what they normally are, and -- # (2) the word "unknown" tends to confuse beginning users. -- i*86 | x86_64) -- basic_machine=$basic_machine-pc -- ;; -- # Object if more than one company name word. -- *-*-*) -- echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 -- exit 1 -- ;; -- # Recognize the basic CPU types with company name. -- 580-* \ -- | a29k-* \ -- | aarch64-* | aarch64_be-* \ -- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ -- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ -- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ -- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -- | avr-* | avr32-* \ -- | ba-* \ -- | be32-* | be64-* \ -- | bfin-* | bs2000-* \ -- | c[123]* | c30-* | [cjt]90-* | c4x-* \ -- | c8051-* | clipper-* | craynv-* | cydra-* \ -- | d10v-* | d30v-* | dlx-* \ -- | e2k-* | elxsi-* \ -- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ -- | h8300-* | h8500-* \ -- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ -- | hexagon-* \ -- | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ -- | ip2k-* | iq2000-* \ -- | k1om-* \ -- | le32-* | le64-* \ -- | lm32-* \ -- | m32c-* | m32r-* | m32rle-* \ -- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ -- | microblaze-* | microblazeel-* \ -- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ -- | mips16-* \ -- | mips64-* | mips64el-* \ -- | mips64octeon-* | mips64octeonel-* \ -- | mips64orion-* | mips64orionel-* \ -- | mips64r5900-* | mips64r5900el-* \ -- | mips64vr-* | mips64vrel-* \ -- | mips64vr4100-* | mips64vr4100el-* \ -- | mips64vr4300-* | mips64vr4300el-* \ -- | mips64vr5000-* | mips64vr5000el-* \ -- | mips64vr5900-* | mips64vr5900el-* \ -- | mipsisa32-* | mipsisa32el-* \ -- | mipsisa32r2-* | mipsisa32r2el-* \ -- | mipsisa32r6-* | mipsisa32r6el-* \ -- | mipsisa64-* | mipsisa64el-* \ -- | mipsisa64r2-* | mipsisa64r2el-* \ -- | mipsisa64r6-* | mipsisa64r6el-* \ -- | mipsisa64sb1-* | mipsisa64sb1el-* \ -- | mipsisa64sr71k-* | mipsisa64sr71kel-* \ -- | mipsr5900-* | mipsr5900el-* \ -- | mipstx39-* | mipstx39el-* \ -- | mmix-* \ -- | mt-* \ -- | msp430-* \ -- | nds32-* | nds32le-* | nds32be-* \ -- | nios-* | nios2-* | nios2eb-* | nios2el-* \ -- | none-* | np1-* | ns16k-* | ns32k-* \ -- | open8-* \ -- | or1k*-* \ -- | orion-* \ -- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ -- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ -- | pru-* \ -- | pyramid-* \ -- | riscv32-* | riscv64-* \ -- | rl78-* | romp-* | rs6000-* | rx-* \ -- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ -- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ -- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ -- | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ -- | tahoe-* \ -- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -- | tile*-* \ -- | tron-* \ -- | ubicom32-* \ -- | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ -- | vax-* \ -- | visium-* \ -- | wasm32-* \ -- | we32k-* \ -- | x86-* | x86_64-* | xc16x-* | xps100-* \ -- | xstormy16-* | xtensa*-* \ -- | ymp-* \ -- | z8k-* | z80-*) -- ;; -- # Recognize the basic CPU types without company name, with glob match. -- xtensa*) -- basic_machine=$basic_machine-unknown -- ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. -- 386bsd) -- basic_machine=i386-pc -- os=-bsd -- ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) -- basic_machine=m68000-att -+ cpu=m68000 -+ vendor=att - ;; - 3b*) -- basic_machine=we32k-att -- ;; -- a29khif) -- basic_machine=a29k-amd -- os=-udi -- ;; -- abacus) -- basic_machine=abacus-unknown -- ;; -- adobe68k) -- basic_machine=m68010-adobe -- os=-scout -- ;; -- alliant | fx80) -- basic_machine=fx80-alliant -- ;; -- altos | altos3068) -- basic_machine=m68k-altos -- ;; -- am29k) -- basic_machine=a29k-none -- os=-bsd -- ;; -- amd64) -- basic_machine=x86_64-pc -- ;; -- amd64-*) -- basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- amdahl) -- basic_machine=580-amdahl -- os=-sysv -- ;; -- amiga | amiga-*) -- basic_machine=m68k-unknown -- ;; -- amigaos | amigados) -- basic_machine=m68k-unknown -- os=-amigaos -- ;; -- amigaunix | amix) -- basic_machine=m68k-unknown -- os=-sysv4 -- ;; -- apollo68) -- basic_machine=m68k-apollo -- os=-sysv -- ;; -- apollo68bsd) -- basic_machine=m68k-apollo -- os=-bsd -- ;; -- aros) -- basic_machine=i386-pc -- os=-aros -- ;; -- asmjs) -- basic_machine=asmjs-unknown -- ;; -- aux) -- basic_machine=m68k-apple -- os=-aux -- ;; -- balance) -- basic_machine=ns32k-sequent -- os=-dynix -- ;; -- blackfin) -- basic_machine=bfin-unknown -- os=-linux -- ;; -- blackfin-*) -- basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- os=-linux -+ cpu=we32k -+ vendor=att - ;; - bluegene*) -- basic_machine=powerpc-ibm -- os=-cnk -- ;; -- c54x-*) -- basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- c55x-*) -- basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- c6x-*) -- basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- c90) -- basic_machine=c90-cray -- os=-unicos -- ;; -- cegcc) -- basic_machine=arm-unknown -- os=-cegcc -- ;; -- convex-c1) -- basic_machine=c1-convex -- os=-bsd -- ;; -- convex-c2) -- basic_machine=c2-convex -- os=-bsd -- ;; -- convex-c32) -- basic_machine=c32-convex -- os=-bsd -- ;; -- convex-c34) -- basic_machine=c34-convex -- os=-bsd -- ;; -- convex-c38) -- basic_machine=c38-convex -- os=-bsd -- ;; -- cray | j90) -- basic_machine=j90-cray -- os=-unicos -- ;; -- craynv) -- basic_machine=craynv-cray -- os=-unicosmp -- ;; -- cr16 | cr16-*) -- basic_machine=cr16-unknown -- os=-elf -- ;; -- crds | unos) -- basic_machine=m68k-crds -- ;; -- crisv32 | crisv32-* | etraxfs*) -- basic_machine=crisv32-axis -- ;; -- cris | cris-* | etrax*) -- basic_machine=cris-axis -- ;; -- crx) -- basic_machine=crx-unknown -- os=-elf -- ;; -- da30 | da30-*) -- basic_machine=m68k-da30 -- ;; -- decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) -- basic_machine=mips-dec -+ cpu=powerpc -+ vendor=ibm -+ basic_os=cnk - ;; - decsystem10* | dec10*) -- basic_machine=pdp10-dec -- os=-tops10 -+ cpu=pdp10 -+ vendor=dec -+ basic_os=tops10 - ;; - decsystem20* | dec20*) -- basic_machine=pdp10-dec -- os=-tops20 -+ cpu=pdp10 -+ vendor=dec -+ basic_os=tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) -- basic_machine=m68k-motorola -- ;; -- delta88) -- basic_machine=m88k-motorola -- os=-sysv3 -- ;; -- dicos) -- basic_machine=i686-pc -- os=-dicos -- ;; -- djgpp) -- basic_machine=i586-pc -- os=-msdosdjgpp -- ;; -- dpx20 | dpx20-*) -- basic_machine=rs6000-bull -- os=-bosx -+ cpu=m68k -+ vendor=motorola - ;; - dpx2*) -- basic_machine=m68k-bull -- os=-sysv3 -- ;; -- e500v[12]) -- basic_machine=powerpc-unknown -- os=$os"spe" -- ;; -- e500v[12]-*) -- basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- os=$os"spe" -- ;; -- ebmon29k) -- basic_machine=a29k-amd -- os=-ebmon -- ;; -- elxsi) -- basic_machine=elxsi-elxsi -- os=-bsd -+ cpu=m68k -+ vendor=bull -+ basic_os=sysv3 - ;; - encore | umax | mmax) -- basic_machine=ns32k-encore -+ cpu=ns32k -+ vendor=encore - ;; -- es1800 | OSE68k | ose68k | ose | OSE) -- basic_machine=m68k-ericsson -- os=-ose -+ elxsi) -+ cpu=elxsi -+ vendor=elxsi -+ basic_os=${basic_os:-bsd} - ;; - fx2800) -- basic_machine=i860-alliant -+ cpu=i860 -+ vendor=alliant - ;; - genix) -- basic_machine=ns32k-ns -- ;; -- gmicro) -- basic_machine=tron-gmicro -- os=-sysv -- ;; -- go32) -- basic_machine=i386-pc -- os=-go32 -+ cpu=ns32k -+ vendor=ns - ;; - h3050r* | hiux*) -- basic_machine=hppa1.1-hitachi -- os=-hiuxwe2 -- ;; -- h8300hms) -- basic_machine=h8300-hitachi -- os=-hms -- ;; -- h8300xray) -- basic_machine=h8300-hitachi -- os=-xray -- ;; -- h8500hms) -- basic_machine=h8500-hitachi -- os=-hms -- ;; -- harris) -- basic_machine=m88k-harris -- os=-sysv3 -- ;; -- hp300-*) -- basic_machine=m68k-hp -- ;; -- hp300bsd) -- basic_machine=m68k-hp -- os=-bsd -- ;; -- hp300hpux) -- basic_machine=m68k-hp -- os=-hpux -+ cpu=hppa1.1 -+ vendor=hitachi -+ basic_os=hiuxwe2 - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) -- basic_machine=hppa1.0-hp -+ cpu=hppa1.0 -+ vendor=hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) -- basic_machine=m68000-hp -+ cpu=m68000 -+ vendor=hp - ;; - hp9k3[2-9][0-9]) -- basic_machine=m68k-hp -+ cpu=m68k -+ vendor=hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) -- basic_machine=hppa1.0-hp -+ cpu=hppa1.0 -+ vendor=hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) -- basic_machine=hppa1.1-hp -+ cpu=hppa1.1 -+ vendor=hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp -- basic_machine=hppa1.1-hp -+ cpu=hppa1.1 -+ vendor=hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp -- basic_machine=hppa1.1-hp -+ cpu=hppa1.1 -+ vendor=hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) -- basic_machine=hppa1.1-hp -+ cpu=hppa1.1 -+ vendor=hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) -- basic_machine=hppa1.0-hp -- ;; -- hppaosf) -- basic_machine=hppa1.1-hp -- os=-osf -- ;; -- hppro) -- basic_machine=hppa1.1-hp -- os=-proelf -- ;; -- i370-ibm* | ibm*) -- basic_machine=i370-ibm -+ cpu=hppa1.0 -+ vendor=hp - ;; - i*86v32) -- basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` -- os=-sysv32 -+ cpu=$(echo "$1" | sed -e 's/86.*/86/') -+ vendor=pc -+ basic_os=sysv32 - ;; - i*86v4*) -- basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` -- os=-sysv4 -+ cpu=$(echo "$1" | sed -e 's/86.*/86/') -+ vendor=pc -+ basic_os=sysv4 - ;; - i*86v) -- basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` -- os=-sysv -+ cpu=$(echo "$1" | sed -e 's/86.*/86/') -+ vendor=pc -+ basic_os=sysv - ;; - i*86sol2) -- basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` -- os=-solaris2 -- ;; -- i386mach) -- basic_machine=i386-mach -- os=-mach -+ cpu=$(echo "$1" | sed -e 's/86.*/86/') -+ vendor=pc -+ basic_os=solaris2 - ;; -- vsta) -- basic_machine=i386-unknown -- os=-vsta -+ j90 | j90-cray) -+ cpu=j90 -+ vendor=cray -+ basic_os=${basic_os:-unicos} - ;; - iris | iris4d) -- basic_machine=mips-sgi -- case $os in -- -irix*) -+ cpu=mips -+ vendor=sgi -+ case $basic_os in -+ irix*) - ;; - *) -- os=-irix4 -+ basic_os=irix4 - ;; - esac - ;; -- isi68 | isi) -- basic_machine=m68k-isi -- os=-sysv -- ;; -- leon-*|leon[3-9]-*) -- basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` -- ;; -- m68knommu) -- basic_machine=m68k-unknown -- os=-linux -- ;; -- m68knommu-*) -- basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- os=-linux -- ;; -- magnum | m3230) -- basic_machine=mips-mips -- os=-sysv -- ;; -- merlin) -- basic_machine=ns32k-utek -- os=-sysv -- ;; -- microblaze*) -- basic_machine=microblaze-xilinx -- ;; -- mingw64) -- basic_machine=x86_64-pc -- os=-mingw64 -- ;; -- mingw32) -- basic_machine=i686-pc -- os=-mingw32 -- ;; -- mingw32ce) -- basic_machine=arm-unknown -- os=-mingw32ce -- ;; - miniframe) -- basic_machine=m68000-convergent -- ;; -- *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) -- basic_machine=m68k-atari -- os=-mint -- ;; -- mips3*-*) -- basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` -- ;; -- mips3*) -- basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown -- ;; -- monitor) -- basic_machine=m68k-rom68k -- os=-coff -- ;; -- morphos) -- basic_machine=powerpc-unknown -- os=-morphos -- ;; -- moxiebox) -- basic_machine=moxie-unknown -- os=-moxiebox -+ cpu=m68000 -+ vendor=convergent - ;; -- msdos) -- basic_machine=i386-pc -- os=-msdos -- ;; -- ms1-*) -- basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` -- ;; -- msys) -- basic_machine=i686-pc -- os=-msys -- ;; -- mvs) -- basic_machine=i370-ibm -- os=-mvs -- ;; -- nacl) -- basic_machine=le32-unknown -- os=-nacl -- ;; -- ncr3000) -- basic_machine=i486-ncr -- os=-sysv4 -- ;; -- netbsd386) -- basic_machine=i386-unknown -- os=-netbsd -- ;; -- netwinder) -- basic_machine=armv4l-rebel -- os=-linux -- ;; -- news | news700 | news800 | news900) -- basic_machine=m68k-sony -- os=-newsos -- ;; -- news1000) -- basic_machine=m68030-sony -- os=-newsos -+ *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) -+ cpu=m68k -+ vendor=atari -+ basic_os=mint - ;; - news-3600 | risc-news) -- basic_machine=mips-sony -- os=-newsos -- ;; -- necv70) -- basic_machine=v70-nec -- os=-sysv -+ cpu=mips -+ vendor=sony -+ basic_os=newsos - ;; - next | m*-next) -- basic_machine=m68k-next -- case $os in -- -nextstep* ) -+ cpu=m68k -+ vendor=next -+ case $basic_os in -+ openstep*) -+ ;; -+ nextstep*) - ;; -- -ns2*) -- os=-nextstep2 -+ ns2*) -+ basic_os=nextstep2 - ;; - *) -- os=-nextstep3 -+ basic_os=nextstep3 - ;; - esac - ;; -- nh3000) -- basic_machine=m68k-harris -- os=-cxux -- ;; -- nh[45]000) -- basic_machine=m88k-harris -- os=-cxux -- ;; -- nindy960) -- basic_machine=i960-intel -- os=-nindy -- ;; -- mon960) -- basic_machine=i960-intel -- os=-mon960 -- ;; -- nonstopux) -- basic_machine=mips-compaq -- os=-nonstopux -- ;; - np1) -- basic_machine=np1-gould -- ;; -- neo-tandem) -- basic_machine=neo-tandem -- ;; -- nse-tandem) -- basic_machine=nse-tandem -- ;; -- nsr-tandem) -- basic_machine=nsr-tandem -- ;; -- nsv-tandem) -- basic_machine=nsv-tandem -- ;; -- nsx-tandem) -- basic_machine=nsx-tandem -+ cpu=np1 -+ vendor=gould - ;; - op50n-* | op60c-*) -- basic_machine=hppa1.1-oki -- os=-proelf -- ;; -- openrisc | openrisc-*) -- basic_machine=or32-unknown -- ;; -- os400) -- basic_machine=powerpc-ibm -- os=-os400 -- ;; -- OSE68000 | ose68000) -- basic_machine=m68000-ericsson -- os=-ose -- ;; -- os68k) -- basic_machine=m68k-none -- os=-os68k -+ cpu=hppa1.1 -+ vendor=oki -+ basic_os=proelf - ;; - pa-hitachi) -- basic_machine=hppa1.1-hitachi -- os=-hiuxwe2 -- ;; -- paragon) -- basic_machine=i860-intel -- os=-osf -- ;; -- parisc) -- basic_machine=hppa-unknown -- os=-linux -- ;; -- parisc-*) -- basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- os=-linux -+ cpu=hppa1.1 -+ vendor=hitachi -+ basic_os=hiuxwe2 - ;; - pbd) -- basic_machine=sparc-tti -+ cpu=sparc -+ vendor=tti - ;; - pbb) -- basic_machine=m68k-tti -+ cpu=m68k -+ vendor=tti - ;; -- pc532 | pc532-*) -- basic_machine=ns32k-pc532 -- ;; -- pc98) -- basic_machine=i386-pc -- ;; -- pc98-*) -- basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- pentium | p5 | k5 | k6 | nexgen | viac3) -- basic_machine=i586-pc -- ;; -- pentiumpro | p6 | 6x86 | athlon | athlon_*) -- basic_machine=i686-pc -- ;; -- pentiumii | pentium2 | pentiumiii | pentium3) -- basic_machine=i686-pc -- ;; -- pentium4) -- basic_machine=i786-pc -- ;; -- pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) -- basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- pentiumpro-* | p6-* | 6x86-* | athlon-*) -- basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) -- basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- pentium4-*) -- basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` -+ pc532) -+ cpu=ns32k -+ vendor=pc532 - ;; - pn) -- basic_machine=pn-gould -- ;; -- power) basic_machine=power-ibm -+ cpu=pn -+ vendor=gould - ;; -- ppc | ppcbe) basic_machine=powerpc-unknown -+ power) -+ cpu=power -+ vendor=ibm - ;; -- ppc-* | ppcbe-*) -- basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- ppcle | powerpclittle) -- basic_machine=powerpcle-unknown -- ;; -- ppcle-* | powerpclittle-*) -- basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- ppc64) basic_machine=powerpc64-unknown -+ ps2) -+ cpu=i386 -+ vendor=ibm - ;; -- ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` -+ rm[46]00) -+ cpu=mips -+ vendor=siemens - ;; -- ppc64le | powerpc64little) -- basic_machine=powerpc64le-unknown -+ rtpc | rtpc-*) -+ cpu=romp -+ vendor=ibm - ;; -- ppc64le-* | powerpc64little-*) -- basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` -+ sde) -+ cpu=mipsisa32 -+ vendor=sde -+ basic_os=${basic_os:-elf} - ;; -- ps2) -- basic_machine=i386-ibm -+ simso-wrs) -+ cpu=sparclite -+ vendor=wrs -+ basic_os=vxworks - ;; -- pw32) -- basic_machine=i586-unknown -- os=-pw32 -+ tower | tower-32) -+ cpu=m68k -+ vendor=ncr - ;; -- rdos | rdos64) -- basic_machine=x86_64-pc -- os=-rdos -+ vpp*|vx|vx-*) -+ cpu=f301 -+ vendor=fujitsu - ;; -- rdos32) -- basic_machine=i386-pc -- os=-rdos -+ w65) -+ cpu=w65 -+ vendor=wdc - ;; -- rom68k) -- basic_machine=m68k-rom68k -- os=-coff -+ w89k-*) -+ cpu=hppa1.1 -+ vendor=winbond -+ basic_os=proelf - ;; -- rm[46]00) -- basic_machine=mips-siemens -+ none) -+ cpu=none -+ vendor=none - ;; -- rtpc | rtpc-*) -- basic_machine=romp-ibm -+ leon|leon[3-9]) -+ cpu=sparc -+ vendor=$basic_machine - ;; -- s390 | s390-*) -- basic_machine=s390-ibm -+ leon-*|leon[3-9]-*) -+ cpu=sparc -+ vendor=$(echo "$basic_machine" | sed 's/-.*//') - ;; -- s390x | s390x-*) -- basic_machine=s390x-ibm -+ -+ *-*) -+ # shellcheck disable=SC2162 -+ IFS="-" read cpu vendor <&2 -- exit 1 -+ # Recognize the canonical CPU types that are allowed with any -+ # company name. -+ case $cpu in -+ 1750a | 580 \ -+ | a29k \ -+ | aarch64 | aarch64_be \ -+ | abacus \ -+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ -+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ -+ | alphapca5[67] | alpha64pca5[67] \ -+ | am33_2.0 \ -+ | amdgcn \ -+ | arc | arceb \ -+ | arm | arm[lb]e | arme[lb] | armv* \ -+ | avr | avr32 \ -+ | asmjs \ -+ | ba \ -+ | be32 | be64 \ -+ | bfin | bpf | bs2000 \ -+ | c[123]* | c30 | [cjt]90 | c4x \ -+ | c8051 | clipper | craynv | csky | cydra \ -+ | d10v | d30v | dlx | dsp16xx \ -+ | e2k | elxsi | epiphany \ -+ | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \ -+ | h8300 | h8500 \ -+ | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -+ | hexagon \ -+ | i370 | i*86 | i860 | i960 | ia16 | ia64 \ -+ | ip2k | iq2000 \ -+ | k1om \ -+ | le32 | le64 \ -+ | lm32 \ -+ | loongarch32 | loongarch64 | loongarchx32 \ -+ | m32c | m32r | m32rle \ -+ | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ -+ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ -+ | m88110 | m88k | maxq | mb | mcore | mep | metag \ -+ | microblaze | microblazeel \ -+ | mips | mipsbe | mipseb | mipsel | mipsle \ -+ | mips16 \ -+ | mips64 | mips64eb | mips64el \ -+ | mips64octeon | mips64octeonel \ -+ | mips64orion | mips64orionel \ -+ | mips64r5900 | mips64r5900el \ -+ | mips64vr | mips64vrel \ -+ | mips64vr4100 | mips64vr4100el \ -+ | mips64vr4300 | mips64vr4300el \ -+ | mips64vr5000 | mips64vr5000el \ -+ | mips64vr5900 | mips64vr5900el \ -+ | mipsisa32 | mipsisa32el \ -+ | mipsisa32r2 | mipsisa32r2el \ -+ | mipsisa32r6 | mipsisa32r6el \ -+ | mipsisa64 | mipsisa64el \ -+ | mipsisa64r2 | mipsisa64r2el \ -+ | mipsisa64r6 | mipsisa64r6el \ -+ | mipsisa64sb1 | mipsisa64sb1el \ -+ | mipsisa64sr71k | mipsisa64sr71kel \ -+ | mipsr5900 | mipsr5900el \ -+ | mipstx39 | mipstx39el \ -+ | mmix \ -+ | mn10200 | mn10300 \ -+ | moxie \ -+ | mt \ -+ | msp430 \ -+ | nds32 | nds32le | nds32be \ -+ | nfp \ -+ | nios | nios2 | nios2eb | nios2el \ -+ | none | np1 | ns16k | ns32k | nvptx \ -+ | open8 \ -+ | or1k* \ -+ | or32 \ -+ | orion \ -+ | picochip \ -+ | pdp10 | pdp11 | pj | pjl | pn | power \ -+ | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ -+ | pru \ -+ | pyramid \ -+ | riscv | riscv32 | riscv32be | riscv64 | riscv64be \ -+ | rl78 | romp | rs6000 | rx \ -+ | s390 | s390x \ -+ | score \ -+ | sh | shl \ -+ | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ -+ | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \ -+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \ -+ | sparclite \ -+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ -+ | spu \ -+ | tahoe \ -+ | thumbv7* \ -+ | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ -+ | tron \ -+ | ubicom32 \ -+ | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ -+ | vax \ -+ | visium \ -+ | w65 \ -+ | wasm32 | wasm32_simd128 | wasm64 \ -+ | we32k \ -+ | x86 | x86_64 | xc16x | xgate | xps100 \ -+ | xstormy16 | xtensa* \ -+ | ymp \ -+ | z8k | z80) -+ ;; -+ -+ *) -+ echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2 -+ exit 1 -+ ;; -+ esac - ;; - esac - - # Here we canonicalize certain aliases for manufacturers. --case $basic_machine in -- *-digital*) -- basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` -+case $vendor in -+ digital*) -+ vendor=dec - ;; -- *-commodore*) -- basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` -+ commodore*) -+ vendor=cbm - ;; - *) - ;; -@@ -1334,203 +1287,213 @@ esac - - # Decode manufacturer-specific aliases for certain operating systems. - --if [ x"$os" != x"" ] -+if test x$basic_os != x - then -+ -+# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just -+# set os. -+case $basic_os in -+ gnu/linux*) -+ kernel=linux -+ os=$(echo $basic_os | sed -e 's|gnu/linux|gnu|') -+ ;; -+ os2-emx) -+ kernel=os2 -+ os=$(echo $basic_os | sed -e 's|os2-emx|emx|') -+ ;; -+ nto-qnx*) -+ kernel=nto -+ os=$(echo $basic_os | sed -e 's|nto-qnx|qnx|') -+ ;; -+ *-*) -+ # shellcheck disable=SC2162 -+ IFS="-" read kernel os <&2 -- exit 1 -+ # No normalization, but not necessarily accepted, that comes below. - ;; - esac -+ - else - - # Here we handle the default operating systems that come with various machines. -@@ -1543,254 +1506,357 @@ else - # will signal an error saying that MANUFACTURER isn't an operating - # system, and we'll never get to this point. - --case $basic_machine in -+kernel= -+case $cpu-$vendor in - score-*) -- os=-elf -+ os=elf - ;; - spu-*) -- os=-elf -+ os=elf - ;; - *-acorn) -- os=-riscix1.2 -+ os=riscix1.2 - ;; - arm*-rebel) -- os=-linux -+ kernel=linux -+ os=gnu - ;; - arm*-semi) -- os=-aout -+ os=aout - ;; - c4x-* | tic4x-*) -- os=-coff -+ os=coff - ;; - c8051-*) -- os=-elf -+ os=elf -+ ;; -+ clipper-intergraph) -+ os=clix - ;; - hexagon-*) -- os=-elf -+ os=elf - ;; - tic54x-*) -- os=-coff -+ os=coff - ;; - tic55x-*) -- os=-coff -+ os=coff - ;; - tic6x-*) -- os=-coff -+ os=coff - ;; - # This must come before the *-dec entry. - pdp10-*) -- os=-tops20 -+ os=tops20 - ;; - pdp11-*) -- os=-none -+ os=none - ;; - *-dec | vax-*) -- os=-ultrix4.2 -+ os=ultrix4.2 - ;; - m68*-apollo) -- os=-domain -+ os=domain - ;; - i386-sun) -- os=-sunos4.0.2 -+ os=sunos4.0.2 - ;; - m68000-sun) -- os=-sunos3 -+ os=sunos3 - ;; - m68*-cisco) -- os=-aout -+ os=aout - ;; - mep-*) -- os=-elf -+ os=elf - ;; - mips*-cisco) -- os=-elf -+ os=elf - ;; - mips*-*) -- os=-elf -+ os=elf - ;; - or32-*) -- os=-coff -+ os=coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. -- os=-sysv3 -+ os=sysv3 - ;; - sparc-* | *-sun) -- os=-sunos4.1.1 -+ os=sunos4.1.1 - ;; - pru-*) -- os=-elf -+ os=elf - ;; - *-be) -- os=-beos -+ os=beos - ;; - *-ibm) -- os=-aix -+ os=aix - ;; - *-knuth) -- os=-mmixware -+ os=mmixware - ;; - *-wec) -- os=-proelf -+ os=proelf - ;; - *-winbond) -- os=-proelf -+ os=proelf - ;; - *-oki) -- os=-proelf -+ os=proelf - ;; - *-hp) -- os=-hpux -+ os=hpux - ;; - *-hitachi) -- os=-hiux -+ os=hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) -- os=-sysv -+ os=sysv - ;; - *-cbm) -- os=-amigaos -+ os=amigaos - ;; - *-dg) -- os=-dgux -+ os=dgux - ;; - *-dolphin) -- os=-sysv3 -+ os=sysv3 - ;; - m68k-ccur) -- os=-rtu -+ os=rtu - ;; - m88k-omron*) -- os=-luna -+ os=luna - ;; - *-next) -- os=-nextstep -+ os=nextstep - ;; - *-sequent) -- os=-ptx -+ os=ptx - ;; - *-crds) -- os=-unos -+ os=unos - ;; - *-ns) -- os=-genix -+ os=genix - ;; - i370-*) -- os=-mvs -+ os=mvs - ;; - *-gould) -- os=-sysv -+ os=sysv - ;; - *-highlevel) -- os=-bsd -+ os=bsd - ;; - *-encore) -- os=-bsd -+ os=bsd - ;; - *-sgi) -- os=-irix -+ os=irix - ;; - *-siemens) -- os=-sysv4 -+ os=sysv4 - ;; - *-masscomp) -- os=-rtu -+ os=rtu - ;; - f30[01]-fujitsu | f700-fujitsu) -- os=-uxpv -+ os=uxpv - ;; - *-rom68k) -- os=-coff -+ os=coff - ;; - *-*bug) -- os=-coff -+ os=coff - ;; - *-apple) -- os=-macos -+ os=macos - ;; - *-atari*) -- os=-mint -+ os=mint -+ ;; -+ *-wrs) -+ os=vxworks - ;; - *) -- os=-none -+ os=none - ;; - esac -+ - fi - -+# Now, validate our (potentially fixed-up) OS. -+case $os in -+ # Sometimes we do "kernel-libc", so those need to count as OSes. -+ musl* | newlib* | uclibc*) -+ ;; -+ # Likewise for "kernel-abi" -+ eabi* | gnueabi*) -+ ;; -+ # VxWorks passes extra cpu info in the 4th filed. -+ simlinux | simwindows | spe) -+ ;; -+ # Now accept the basic system types. -+ # The portable systems comes first. -+ # Each alternative MUST end in a * to match a version number. -+ gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ -+ | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ -+ | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ -+ | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ -+ | hiux* | abug | nacl* | netware* | windows* \ -+ | os9* | macos* | osx* | ios* \ -+ | mpw* | magic* | mmixware* | mon960* | lnews* \ -+ | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ -+ | aos* | aros* | cloudabi* | sortix* | twizzler* \ -+ | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ -+ | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ -+ | mirbsd* | netbsd* | dicos* | openedition* | ose* \ -+ | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \ -+ | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ -+ | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ -+ | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ -+ | udi* | lites* | ieee* | go32* | aux* | hcos* \ -+ | chorusrdb* | cegcc* | glidix* | serenity* \ -+ | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ -+ | midipix* | mingw32* | mingw64* | mint* \ -+ | uxpv* | beos* | mpeix* | udk* | moxiebox* \ -+ | interix* | uwin* | mks* | rhapsody* | darwin* \ -+ | openstep* | oskit* | conix* | pw32* | nonstopux* \ -+ | storm-chaos* | tops10* | tenex* | tops20* | its* \ -+ | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \ -+ | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \ -+ | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ -+ | skyos* | haiku* | rdos* | toppers* | drops* | es* \ -+ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ -+ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ -+ | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*) -+ ;; -+ # This one is extra strict with allowed versions -+ sco3.2v2 | sco3.2v[4-9]* | sco5v6*) -+ # Don't forget version if it is 3.2v4 or newer. -+ ;; -+ none) -+ ;; -+ *) -+ echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 -+ exit 1 -+ ;; -+esac -+ -+# As a final step for OS-related things, validate the OS-kernel combination -+# (given a valid OS), if there is a kernel. -+case $kernel-$os in -+ linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* ) -+ ;; -+ uclinux-uclibc* ) -+ ;; -+ -dietlibc* | -newlib* | -musl* | -uclibc* ) -+ # These are just libc implementations, not actual OSes, and thus -+ # require a kernel. -+ echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 -+ exit 1 -+ ;; -+ kfreebsd*-gnu* | kopensolaris*-gnu*) -+ ;; -+ vxworks-simlinux | vxworks-simwindows | vxworks-spe) -+ ;; -+ nto-qnx*) -+ ;; -+ os2-emx) -+ ;; -+ *-eabi* | *-gnueabi*) -+ ;; -+ -*) -+ # Blank kernel with real OS is always fine. -+ ;; -+ *-*) -+ echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 -+ exit 1 -+ ;; -+esac -+ - # Here we handle the case where we know the os, and the CPU type, but not the - # manufacturer. We pick the logical manufacturer. --vendor=unknown --case $basic_machine in -- *-unknown) -- case $os in -- -riscix*) -+case $vendor in -+ unknown) -+ case $cpu-$os in -+ *-riscix*) - vendor=acorn - ;; -- -sunos*) -+ *-sunos*) - vendor=sun - ;; -- -cnk*|-aix*) -+ *-cnk* | *-aix*) - vendor=ibm - ;; -- -beos*) -+ *-beos*) - vendor=be - ;; -- -hpux*) -+ *-hpux*) - vendor=hp - ;; -- -mpeix*) -+ *-mpeix*) - vendor=hp - ;; -- -hiux*) -+ *-hiux*) - vendor=hitachi - ;; -- -unos*) -+ *-unos*) - vendor=crds - ;; -- -dgux*) -+ *-dgux*) - vendor=dg - ;; -- -luna*) -+ *-luna*) - vendor=omron - ;; -- -genix*) -+ *-genix*) - vendor=ns - ;; -- -mvs* | -opened*) -+ *-clix*) -+ vendor=intergraph -+ ;; -+ *-mvs* | *-opened*) -+ vendor=ibm -+ ;; -+ *-os400*) - vendor=ibm - ;; -- -os400*) -+ s390-* | s390x-*) - vendor=ibm - ;; -- -ptx*) -+ *-ptx*) - vendor=sequent - ;; -- -tpf*) -+ *-tpf*) - vendor=ibm - ;; -- -vxsim* | -vxworks* | -windiss*) -+ *-vxsim* | *-vxworks* | *-windiss*) - vendor=wrs - ;; -- -aux*) -+ *-aux*) - vendor=apple - ;; -- -hms*) -+ *-hms*) - vendor=hitachi - ;; -- -mpw* | -macos*) -+ *-mpw* | *-macos*) - vendor=apple - ;; -- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) -+ *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) - vendor=atari - ;; -- -vos*) -+ *-vos*) - vendor=stratus - ;; - esac -- basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` - ;; - esac - --echo "$basic_machine$os" -+echo "$cpu-$vendor-${kernel:+$kernel-}$os" - exit - - # Local variables: -diff --git a/src/png/config.sub b/src/png/config.sub -index 9ccf09a7a..f1bee4ef7 100755 ---- a/src/png/config.sub -+++ b/src/png/config.sub -@@ -1,8 +1,8 @@ - #! /bin/sh - # Configuration validation subroutine script. --# Copyright 1992-2018 Free Software Foundation, Inc. -+# Copyright 1992-2021 Free Software Foundation, Inc. - --timestamp='2018-03-08' -+timestamp='2021-03-10' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -33,7 +33,7 @@ timestamp='2018-03-08' - # Otherwise, we print the canonical config type on stdout and succeed. - - # You can get the latest version of this script from: --# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub -+# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub - - # This file is supposed to be the same for all GNU packages - # and recognize all the CPU types, system types and aliases -@@ -50,7 +50,7 @@ timestamp='2018-03-08' - # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM - # It is wrong to echo any other type of specification. - --me=`echo "$0" | sed -e 's,.*/,,'` -+me=$(echo "$0" | sed -e 's,.*/,,') - - usage="\ - Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS -@@ -67,7 +67,7 @@ Report bugs and patches to ." - version="\ - GNU config.sub ($timestamp) - --Copyright 1992-2018 Free Software Foundation, Inc. -+Copyright 1992-2021 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -89,7 +89,7 @@ while test $# -gt 0 ; do - - ) # Use stdin as input. - break ;; - -* ) -- echo "$me: invalid option $1$help" -+ echo "$me: invalid option $1$help" >&2 - exit 1 ;; - - *local*) -@@ -110,1223 +110,1176 @@ case $# in - exit 1;; - esac - --# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). --# Here we must recognize all the valid KERNEL-OS combinations. --maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` --case $maybe_os in -- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ -- linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ -- knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ -- kopensolaris*-gnu* | cloudabi*-eabi* | \ -- storm-chaos* | os2-emx* | rtmk-nova*) -- os=-$maybe_os -- basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` -- ;; -- android-linux) -- os=-linux-android -- basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown -- ;; -- *) -- basic_machine=`echo "$1" | sed 's/-[^-]*$//'` -- if [ "$basic_machine" != "$1" ] -- then os=`echo "$1" | sed 's/.*-/-/'` -- else os=; fi -- ;; --esac -+# Split fields of configuration type -+# shellcheck disable=SC2162 -+IFS="-" read field1 field2 field3 field4 <&2 -+ exit 1 - ;; -- -lynx*) -- os=-lynxos -+ *-*-*-*) -+ basic_machine=$field1-$field2 -+ basic_os=$field3-$field4 - ;; -- -ptx*) -- basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` -+ *-*-*) -+ # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two -+ # parts -+ maybe_os=$field2-$field3 -+ case $maybe_os in -+ nto-qnx* | linux-* | uclinux-uclibc* \ -+ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ -+ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ -+ | storm-chaos* | os2-emx* | rtmk-nova*) -+ basic_machine=$field1 -+ basic_os=$maybe_os -+ ;; -+ android-linux) -+ basic_machine=$field1-unknown -+ basic_os=linux-android -+ ;; -+ *) -+ basic_machine=$field1-$field2 -+ basic_os=$field3 -+ ;; -+ esac - ;; -- -psos*) -- os=-psos -+ *-*) -+ # A lone config we happen to match not fitting any pattern -+ case $field1-$field2 in -+ decstation-3100) -+ basic_machine=mips-dec -+ basic_os= -+ ;; -+ *-*) -+ # Second component is usually, but not always the OS -+ case $field2 in -+ # Prevent following clause from handling this valid os -+ sun*os*) -+ basic_machine=$field1 -+ basic_os=$field2 -+ ;; -+ # Manufacturers -+ dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ -+ | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ -+ | unicom* | ibm* | next | hp | isi* | apollo | altos* \ -+ | convergent* | ncr* | news | 32* | 3600* | 3100* \ -+ | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ -+ | ultra | tti* | harris | dolphin | highlevel | gould \ -+ | cbm | ns | masscomp | apple | axis | knuth | cray \ -+ | microblaze* | sim | cisco \ -+ | oki | wec | wrs | winbond) -+ basic_machine=$field1-$field2 -+ basic_os= -+ ;; -+ *) -+ basic_machine=$field1 -+ basic_os=$field2 -+ ;; -+ esac -+ ;; -+ esac - ;; -- -mint | -mint[0-9]*) -- basic_machine=m68k-atari -- os=-mint -+ *) -+ # Convert single-component short-hands not valid as part of -+ # multi-component configurations. -+ case $field1 in -+ 386bsd) -+ basic_machine=i386-pc -+ basic_os=bsd -+ ;; -+ a29khif) -+ basic_machine=a29k-amd -+ basic_os=udi -+ ;; -+ adobe68k) -+ basic_machine=m68010-adobe -+ basic_os=scout -+ ;; -+ alliant) -+ basic_machine=fx80-alliant -+ basic_os= -+ ;; -+ altos | altos3068) -+ basic_machine=m68k-altos -+ basic_os= -+ ;; -+ am29k) -+ basic_machine=a29k-none -+ basic_os=bsd -+ ;; -+ amdahl) -+ basic_machine=580-amdahl -+ basic_os=sysv -+ ;; -+ amiga) -+ basic_machine=m68k-unknown -+ basic_os= -+ ;; -+ amigaos | amigados) -+ basic_machine=m68k-unknown -+ basic_os=amigaos -+ ;; -+ amigaunix | amix) -+ basic_machine=m68k-unknown -+ basic_os=sysv4 -+ ;; -+ apollo68) -+ basic_machine=m68k-apollo -+ basic_os=sysv -+ ;; -+ apollo68bsd) -+ basic_machine=m68k-apollo -+ basic_os=bsd -+ ;; -+ aros) -+ basic_machine=i386-pc -+ basic_os=aros -+ ;; -+ aux) -+ basic_machine=m68k-apple -+ basic_os=aux -+ ;; -+ balance) -+ basic_machine=ns32k-sequent -+ basic_os=dynix -+ ;; -+ blackfin) -+ basic_machine=bfin-unknown -+ basic_os=linux -+ ;; -+ cegcc) -+ basic_machine=arm-unknown -+ basic_os=cegcc -+ ;; -+ convex-c1) -+ basic_machine=c1-convex -+ basic_os=bsd -+ ;; -+ convex-c2) -+ basic_machine=c2-convex -+ basic_os=bsd -+ ;; -+ convex-c32) -+ basic_machine=c32-convex -+ basic_os=bsd -+ ;; -+ convex-c34) -+ basic_machine=c34-convex -+ basic_os=bsd -+ ;; -+ convex-c38) -+ basic_machine=c38-convex -+ basic_os=bsd -+ ;; -+ cray) -+ basic_machine=j90-cray -+ basic_os=unicos -+ ;; -+ crds | unos) -+ basic_machine=m68k-crds -+ basic_os= -+ ;; -+ da30) -+ basic_machine=m68k-da30 -+ basic_os= -+ ;; -+ decstation | pmax | pmin | dec3100 | decstatn) -+ basic_machine=mips-dec -+ basic_os= -+ ;; -+ delta88) -+ basic_machine=m88k-motorola -+ basic_os=sysv3 -+ ;; -+ dicos) -+ basic_machine=i686-pc -+ basic_os=dicos -+ ;; -+ djgpp) -+ basic_machine=i586-pc -+ basic_os=msdosdjgpp -+ ;; -+ ebmon29k) -+ basic_machine=a29k-amd -+ basic_os=ebmon -+ ;; -+ es1800 | OSE68k | ose68k | ose | OSE) -+ basic_machine=m68k-ericsson -+ basic_os=ose -+ ;; -+ gmicro) -+ basic_machine=tron-gmicro -+ basic_os=sysv -+ ;; -+ go32) -+ basic_machine=i386-pc -+ basic_os=go32 -+ ;; -+ h8300hms) -+ basic_machine=h8300-hitachi -+ basic_os=hms -+ ;; -+ h8300xray) -+ basic_machine=h8300-hitachi -+ basic_os=xray -+ ;; -+ h8500hms) -+ basic_machine=h8500-hitachi -+ basic_os=hms -+ ;; -+ harris) -+ basic_machine=m88k-harris -+ basic_os=sysv3 -+ ;; -+ hp300 | hp300hpux) -+ basic_machine=m68k-hp -+ basic_os=hpux -+ ;; -+ hp300bsd) -+ basic_machine=m68k-hp -+ basic_os=bsd -+ ;; -+ hppaosf) -+ basic_machine=hppa1.1-hp -+ basic_os=osf -+ ;; -+ hppro) -+ basic_machine=hppa1.1-hp -+ basic_os=proelf -+ ;; -+ i386mach) -+ basic_machine=i386-mach -+ basic_os=mach -+ ;; -+ isi68 | isi) -+ basic_machine=m68k-isi -+ basic_os=sysv -+ ;; -+ m68knommu) -+ basic_machine=m68k-unknown -+ basic_os=linux -+ ;; -+ magnum | m3230) -+ basic_machine=mips-mips -+ basic_os=sysv -+ ;; -+ merlin) -+ basic_machine=ns32k-utek -+ basic_os=sysv -+ ;; -+ mingw64) -+ basic_machine=x86_64-pc -+ basic_os=mingw64 -+ ;; -+ mingw32) -+ basic_machine=i686-pc -+ basic_os=mingw32 -+ ;; -+ mingw32ce) -+ basic_machine=arm-unknown -+ basic_os=mingw32ce -+ ;; -+ monitor) -+ basic_machine=m68k-rom68k -+ basic_os=coff -+ ;; -+ morphos) -+ basic_machine=powerpc-unknown -+ basic_os=morphos -+ ;; -+ moxiebox) -+ basic_machine=moxie-unknown -+ basic_os=moxiebox -+ ;; -+ msdos) -+ basic_machine=i386-pc -+ basic_os=msdos -+ ;; -+ msys) -+ basic_machine=i686-pc -+ basic_os=msys -+ ;; -+ mvs) -+ basic_machine=i370-ibm -+ basic_os=mvs -+ ;; -+ nacl) -+ basic_machine=le32-unknown -+ basic_os=nacl -+ ;; -+ emscripten) -+ basic_machine=asmjs-unknown -+ basic_os=emscripten -+ ;; -+ ncr3000) -+ basic_machine=i486-ncr -+ basic_os=sysv4 -+ ;; -+ netbsd386) -+ basic_machine=i386-pc -+ basic_os=netbsd -+ ;; -+ netwinder) -+ basic_machine=armv4l-rebel -+ basic_os=linux -+ ;; -+ news | news700 | news800 | news900) -+ basic_machine=m68k-sony -+ basic_os=newsos -+ ;; -+ news1000) -+ basic_machine=m68030-sony -+ basic_os=newsos -+ ;; -+ necv70) -+ basic_machine=v70-nec -+ basic_os=sysv -+ ;; -+ nh3000) -+ basic_machine=m68k-harris -+ basic_os=cxux -+ ;; -+ nh[45]000) -+ basic_machine=m88k-harris -+ basic_os=cxux -+ ;; -+ nindy960) -+ basic_machine=i960-intel -+ basic_os=nindy -+ ;; -+ mon960) -+ basic_machine=i960-intel -+ basic_os=mon960 -+ ;; -+ nonstopux) -+ basic_machine=mips-compaq -+ basic_os=nonstopux -+ ;; -+ os400) -+ basic_machine=powerpc-ibm -+ basic_os=os400 -+ ;; -+ OSE68000 | ose68000) -+ basic_machine=m68000-ericsson -+ basic_os=ose -+ ;; -+ os68k) -+ basic_machine=m68k-none -+ basic_os=os68k -+ ;; -+ paragon) -+ basic_machine=i860-intel -+ basic_os=osf -+ ;; -+ parisc) -+ basic_machine=hppa-unknown -+ basic_os=linux -+ ;; -+ psp) -+ basic_machine=mipsallegrexel-sony -+ basic_os=psp -+ ;; -+ pw32) -+ basic_machine=i586-unknown -+ basic_os=pw32 -+ ;; -+ rdos | rdos64) -+ basic_machine=x86_64-pc -+ basic_os=rdos -+ ;; -+ rdos32) -+ basic_machine=i386-pc -+ basic_os=rdos -+ ;; -+ rom68k) -+ basic_machine=m68k-rom68k -+ basic_os=coff -+ ;; -+ sa29200) -+ basic_machine=a29k-amd -+ basic_os=udi -+ ;; -+ sei) -+ basic_machine=mips-sei -+ basic_os=seiux -+ ;; -+ sequent) -+ basic_machine=i386-sequent -+ basic_os= -+ ;; -+ sps7) -+ basic_machine=m68k-bull -+ basic_os=sysv2 -+ ;; -+ st2000) -+ basic_machine=m68k-tandem -+ basic_os= -+ ;; -+ stratus) -+ basic_machine=i860-stratus -+ basic_os=sysv4 -+ ;; -+ sun2) -+ basic_machine=m68000-sun -+ basic_os= -+ ;; -+ sun2os3) -+ basic_machine=m68000-sun -+ basic_os=sunos3 -+ ;; -+ sun2os4) -+ basic_machine=m68000-sun -+ basic_os=sunos4 -+ ;; -+ sun3) -+ basic_machine=m68k-sun -+ basic_os= -+ ;; -+ sun3os3) -+ basic_machine=m68k-sun -+ basic_os=sunos3 -+ ;; -+ sun3os4) -+ basic_machine=m68k-sun -+ basic_os=sunos4 -+ ;; -+ sun4) -+ basic_machine=sparc-sun -+ basic_os= -+ ;; -+ sun4os3) -+ basic_machine=sparc-sun -+ basic_os=sunos3 -+ ;; -+ sun4os4) -+ basic_machine=sparc-sun -+ basic_os=sunos4 -+ ;; -+ sun4sol2) -+ basic_machine=sparc-sun -+ basic_os=solaris2 -+ ;; -+ sun386 | sun386i | roadrunner) -+ basic_machine=i386-sun -+ basic_os= -+ ;; -+ sv1) -+ basic_machine=sv1-cray -+ basic_os=unicos -+ ;; -+ symmetry) -+ basic_machine=i386-sequent -+ basic_os=dynix -+ ;; -+ t3e) -+ basic_machine=alphaev5-cray -+ basic_os=unicos -+ ;; -+ t90) -+ basic_machine=t90-cray -+ basic_os=unicos -+ ;; -+ toad1) -+ basic_machine=pdp10-xkl -+ basic_os=tops20 -+ ;; -+ tpf) -+ basic_machine=s390x-ibm -+ basic_os=tpf -+ ;; -+ udi29k) -+ basic_machine=a29k-amd -+ basic_os=udi -+ ;; -+ ultra3) -+ basic_machine=a29k-nyu -+ basic_os=sym1 -+ ;; -+ v810 | necv810) -+ basic_machine=v810-nec -+ basic_os=none -+ ;; -+ vaxv) -+ basic_machine=vax-dec -+ basic_os=sysv -+ ;; -+ vms) -+ basic_machine=vax-dec -+ basic_os=vms -+ ;; -+ vsta) -+ basic_machine=i386-pc -+ basic_os=vsta -+ ;; -+ vxworks960) -+ basic_machine=i960-wrs -+ basic_os=vxworks -+ ;; -+ vxworks68) -+ basic_machine=m68k-wrs -+ basic_os=vxworks -+ ;; -+ vxworks29k) -+ basic_machine=a29k-wrs -+ basic_os=vxworks -+ ;; -+ wasm32 | wasm32_simd128) -+ basic_machine=wasm32-unknown -+ ;; -+ xbox) -+ basic_machine=i686-pc -+ basic_os=mingw32 -+ ;; -+ ymp) -+ basic_machine=ymp-cray -+ basic_os=unicos -+ ;; -+ *) -+ basic_machine=$1 -+ basic_os= -+ ;; -+ esac - ;; - esac - --# Decode aliases for certain CPU-COMPANY combinations. -+# Decode 1-component or ad-hoc basic machines - case $basic_machine in -- # Recognize the basic CPU types without company name. -- # Some are omitted here because they have special meanings below. -- 1750a | 580 \ -- | a29k \ -- | aarch64 | aarch64_be \ -- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ -- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ -- | am33_2.0 \ -- | arc | arceb \ -- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ -- | avr | avr32 \ -- | ba \ -- | be32 | be64 \ -- | bfin \ -- | c4x | c8051 | clipper \ -- | d10v | d30v | dlx | dsp16xx \ -- | e2k | epiphany \ -- | fido | fr30 | frv | ft32 \ -- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -- | hexagon \ -- | i370 | i860 | i960 | ia16 | ia64 \ -- | ip2k | iq2000 \ -- | k1om \ -- | le32 | le64 \ -- | lm32 \ -- | m32c | m32r | m32rle | m68000 | m68k | m88k \ -- | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ -- | mips | mipsbe | mipseb | mipsel | mipsle \ -- | mips16 \ -- | mips64 | mips64el \ -- | mips64octeon | mips64octeonel \ -- | mips64orion | mips64orionel \ -- | mips64r5900 | mips64r5900el \ -- | mips64vr | mips64vrel \ -- | mips64vr4100 | mips64vr4100el \ -- | mips64vr4300 | mips64vr4300el \ -- | mips64vr5000 | mips64vr5000el \ -- | mips64vr5900 | mips64vr5900el \ -- | mipsisa32 | mipsisa32el \ -- | mipsisa32r2 | mipsisa32r2el \ -- | mipsisa32r6 | mipsisa32r6el \ -- | mipsisa64 | mipsisa64el \ -- | mipsisa64r2 | mipsisa64r2el \ -- | mipsisa64r6 | mipsisa64r6el \ -- | mipsisa64sb1 | mipsisa64sb1el \ -- | mipsisa64sr71k | mipsisa64sr71kel \ -- | mipsr5900 | mipsr5900el \ -- | mipstx39 | mipstx39el \ -- | mn10200 | mn10300 \ -- | moxie \ -- | mt \ -- | msp430 \ -- | nds32 | nds32le | nds32be \ -- | nios | nios2 | nios2eb | nios2el \ -- | ns16k | ns32k \ -- | open8 | or1k | or1knd | or32 \ -- | pdp10 | pj | pjl \ -- | powerpc | powerpc64 | powerpc64le | powerpcle \ -- | pru \ -- | pyramid \ -- | riscv32 | riscv64 \ -- | rl78 | rx \ -- | score \ -- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ -- | sh64 | sh64le \ -- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ -- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -- | spu \ -- | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ -- | ubicom32 \ -- | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ -- | visium \ -- | wasm32 \ -- | x86 | xc16x | xstormy16 | xtensa \ -- | z8k | z80) -- basic_machine=$basic_machine-unknown -- ;; -- c54x) -- basic_machine=tic54x-unknown -- ;; -- c55x) -- basic_machine=tic55x-unknown -- ;; -- c6x) -- basic_machine=tic6x-unknown -- ;; -- leon|leon[3-9]) -- basic_machine=sparc-$basic_machine -- ;; -- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) -- basic_machine=$basic_machine-unknown -- os=-none -+ # Here we handle the default manufacturer of certain CPU types. It is in -+ # some cases the only manufacturer, in others, it is the most popular. -+ w89k) -+ cpu=hppa1.1 -+ vendor=winbond - ;; -- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) -+ op50n) -+ cpu=hppa1.1 -+ vendor=oki - ;; -- ms1) -- basic_machine=mt-unknown -+ op60c) -+ cpu=hppa1.1 -+ vendor=oki - ;; -- -- strongarm | thumb | xscale) -- basic_machine=arm-unknown -+ ibm*) -+ cpu=i370 -+ vendor=ibm - ;; -- xgate) -- basic_machine=$basic_machine-unknown -- os=-none -+ orion105) -+ cpu=clipper -+ vendor=highlevel - ;; -- xscaleeb) -- basic_machine=armeb-unknown -+ mac | mpw | mac-mpw) -+ cpu=m68k -+ vendor=apple - ;; -- -- xscaleel) -- basic_machine=armel-unknown -+ pmac | pmac-mpw) -+ cpu=powerpc -+ vendor=apple - ;; - -- # We use `pc' rather than `unknown' -- # because (1) that's what they normally are, and -- # (2) the word "unknown" tends to confuse beginning users. -- i*86 | x86_64) -- basic_machine=$basic_machine-pc -- ;; -- # Object if more than one company name word. -- *-*-*) -- echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 -- exit 1 -- ;; -- # Recognize the basic CPU types with company name. -- 580-* \ -- | a29k-* \ -- | aarch64-* | aarch64_be-* \ -- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ -- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ -- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ -- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -- | avr-* | avr32-* \ -- | ba-* \ -- | be32-* | be64-* \ -- | bfin-* | bs2000-* \ -- | c[123]* | c30-* | [cjt]90-* | c4x-* \ -- | c8051-* | clipper-* | craynv-* | cydra-* \ -- | d10v-* | d30v-* | dlx-* \ -- | e2k-* | elxsi-* \ -- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ -- | h8300-* | h8500-* \ -- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ -- | hexagon-* \ -- | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ -- | ip2k-* | iq2000-* \ -- | k1om-* \ -- | le32-* | le64-* \ -- | lm32-* \ -- | m32c-* | m32r-* | m32rle-* \ -- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ -- | microblaze-* | microblazeel-* \ -- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ -- | mips16-* \ -- | mips64-* | mips64el-* \ -- | mips64octeon-* | mips64octeonel-* \ -- | mips64orion-* | mips64orionel-* \ -- | mips64r5900-* | mips64r5900el-* \ -- | mips64vr-* | mips64vrel-* \ -- | mips64vr4100-* | mips64vr4100el-* \ -- | mips64vr4300-* | mips64vr4300el-* \ -- | mips64vr5000-* | mips64vr5000el-* \ -- | mips64vr5900-* | mips64vr5900el-* \ -- | mipsisa32-* | mipsisa32el-* \ -- | mipsisa32r2-* | mipsisa32r2el-* \ -- | mipsisa32r6-* | mipsisa32r6el-* \ -- | mipsisa64-* | mipsisa64el-* \ -- | mipsisa64r2-* | mipsisa64r2el-* \ -- | mipsisa64r6-* | mipsisa64r6el-* \ -- | mipsisa64sb1-* | mipsisa64sb1el-* \ -- | mipsisa64sr71k-* | mipsisa64sr71kel-* \ -- | mipsr5900-* | mipsr5900el-* \ -- | mipstx39-* | mipstx39el-* \ -- | mmix-* \ -- | mt-* \ -- | msp430-* \ -- | nds32-* | nds32le-* | nds32be-* \ -- | nios-* | nios2-* | nios2eb-* | nios2el-* \ -- | none-* | np1-* | ns16k-* | ns32k-* \ -- | open8-* \ -- | or1k*-* \ -- | orion-* \ -- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ -- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ -- | pru-* \ -- | pyramid-* \ -- | riscv32-* | riscv64-* \ -- | rl78-* | romp-* | rs6000-* | rx-* \ -- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ -- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ -- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ -- | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ -- | tahoe-* \ -- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -- | tile*-* \ -- | tron-* \ -- | ubicom32-* \ -- | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ -- | vax-* \ -- | visium-* \ -- | wasm32-* \ -- | we32k-* \ -- | x86-* | x86_64-* | xc16x-* | xps100-* \ -- | xstormy16-* | xtensa*-* \ -- | ymp-* \ -- | z8k-* | z80-*) -- ;; -- # Recognize the basic CPU types without company name, with glob match. -- xtensa*) -- basic_machine=$basic_machine-unknown -- ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. -- 386bsd) -- basic_machine=i386-pc -- os=-bsd -- ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) -- basic_machine=m68000-att -+ cpu=m68000 -+ vendor=att - ;; - 3b*) -- basic_machine=we32k-att -- ;; -- a29khif) -- basic_machine=a29k-amd -- os=-udi -- ;; -- abacus) -- basic_machine=abacus-unknown -- ;; -- adobe68k) -- basic_machine=m68010-adobe -- os=-scout -- ;; -- alliant | fx80) -- basic_machine=fx80-alliant -- ;; -- altos | altos3068) -- basic_machine=m68k-altos -- ;; -- am29k) -- basic_machine=a29k-none -- os=-bsd -- ;; -- amd64) -- basic_machine=x86_64-pc -- ;; -- amd64-*) -- basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- amdahl) -- basic_machine=580-amdahl -- os=-sysv -- ;; -- amiga | amiga-*) -- basic_machine=m68k-unknown -- ;; -- amigaos | amigados) -- basic_machine=m68k-unknown -- os=-amigaos -- ;; -- amigaunix | amix) -- basic_machine=m68k-unknown -- os=-sysv4 -- ;; -- apollo68) -- basic_machine=m68k-apollo -- os=-sysv -- ;; -- apollo68bsd) -- basic_machine=m68k-apollo -- os=-bsd -- ;; -- aros) -- basic_machine=i386-pc -- os=-aros -- ;; -- asmjs) -- basic_machine=asmjs-unknown -- ;; -- aux) -- basic_machine=m68k-apple -- os=-aux -- ;; -- balance) -- basic_machine=ns32k-sequent -- os=-dynix -- ;; -- blackfin) -- basic_machine=bfin-unknown -- os=-linux -- ;; -- blackfin-*) -- basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- os=-linux -+ cpu=we32k -+ vendor=att - ;; - bluegene*) -- basic_machine=powerpc-ibm -- os=-cnk -- ;; -- c54x-*) -- basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- c55x-*) -- basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- c6x-*) -- basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- c90) -- basic_machine=c90-cray -- os=-unicos -- ;; -- cegcc) -- basic_machine=arm-unknown -- os=-cegcc -- ;; -- convex-c1) -- basic_machine=c1-convex -- os=-bsd -- ;; -- convex-c2) -- basic_machine=c2-convex -- os=-bsd -- ;; -- convex-c32) -- basic_machine=c32-convex -- os=-bsd -- ;; -- convex-c34) -- basic_machine=c34-convex -- os=-bsd -- ;; -- convex-c38) -- basic_machine=c38-convex -- os=-bsd -- ;; -- cray | j90) -- basic_machine=j90-cray -- os=-unicos -- ;; -- craynv) -- basic_machine=craynv-cray -- os=-unicosmp -- ;; -- cr16 | cr16-*) -- basic_machine=cr16-unknown -- os=-elf -- ;; -- crds | unos) -- basic_machine=m68k-crds -- ;; -- crisv32 | crisv32-* | etraxfs*) -- basic_machine=crisv32-axis -- ;; -- cris | cris-* | etrax*) -- basic_machine=cris-axis -- ;; -- crx) -- basic_machine=crx-unknown -- os=-elf -- ;; -- da30 | da30-*) -- basic_machine=m68k-da30 -- ;; -- decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) -- basic_machine=mips-dec -+ cpu=powerpc -+ vendor=ibm -+ basic_os=cnk - ;; - decsystem10* | dec10*) -- basic_machine=pdp10-dec -- os=-tops10 -+ cpu=pdp10 -+ vendor=dec -+ basic_os=tops10 - ;; - decsystem20* | dec20*) -- basic_machine=pdp10-dec -- os=-tops20 -+ cpu=pdp10 -+ vendor=dec -+ basic_os=tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) -- basic_machine=m68k-motorola -- ;; -- delta88) -- basic_machine=m88k-motorola -- os=-sysv3 -- ;; -- dicos) -- basic_machine=i686-pc -- os=-dicos -- ;; -- djgpp) -- basic_machine=i586-pc -- os=-msdosdjgpp -- ;; -- dpx20 | dpx20-*) -- basic_machine=rs6000-bull -- os=-bosx -+ cpu=m68k -+ vendor=motorola - ;; - dpx2*) -- basic_machine=m68k-bull -- os=-sysv3 -- ;; -- e500v[12]) -- basic_machine=powerpc-unknown -- os=$os"spe" -- ;; -- e500v[12]-*) -- basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- os=$os"spe" -- ;; -- ebmon29k) -- basic_machine=a29k-amd -- os=-ebmon -- ;; -- elxsi) -- basic_machine=elxsi-elxsi -- os=-bsd -+ cpu=m68k -+ vendor=bull -+ basic_os=sysv3 - ;; - encore | umax | mmax) -- basic_machine=ns32k-encore -+ cpu=ns32k -+ vendor=encore - ;; -- es1800 | OSE68k | ose68k | ose | OSE) -- basic_machine=m68k-ericsson -- os=-ose -+ elxsi) -+ cpu=elxsi -+ vendor=elxsi -+ basic_os=${basic_os:-bsd} - ;; - fx2800) -- basic_machine=i860-alliant -+ cpu=i860 -+ vendor=alliant - ;; - genix) -- basic_machine=ns32k-ns -- ;; -- gmicro) -- basic_machine=tron-gmicro -- os=-sysv -- ;; -- go32) -- basic_machine=i386-pc -- os=-go32 -+ cpu=ns32k -+ vendor=ns - ;; - h3050r* | hiux*) -- basic_machine=hppa1.1-hitachi -- os=-hiuxwe2 -- ;; -- h8300hms) -- basic_machine=h8300-hitachi -- os=-hms -- ;; -- h8300xray) -- basic_machine=h8300-hitachi -- os=-xray -- ;; -- h8500hms) -- basic_machine=h8500-hitachi -- os=-hms -- ;; -- harris) -- basic_machine=m88k-harris -- os=-sysv3 -- ;; -- hp300-*) -- basic_machine=m68k-hp -- ;; -- hp300bsd) -- basic_machine=m68k-hp -- os=-bsd -- ;; -- hp300hpux) -- basic_machine=m68k-hp -- os=-hpux -+ cpu=hppa1.1 -+ vendor=hitachi -+ basic_os=hiuxwe2 - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) -- basic_machine=hppa1.0-hp -+ cpu=hppa1.0 -+ vendor=hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) -- basic_machine=m68000-hp -+ cpu=m68000 -+ vendor=hp - ;; - hp9k3[2-9][0-9]) -- basic_machine=m68k-hp -+ cpu=m68k -+ vendor=hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) -- basic_machine=hppa1.0-hp -+ cpu=hppa1.0 -+ vendor=hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) -- basic_machine=hppa1.1-hp -+ cpu=hppa1.1 -+ vendor=hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp -- basic_machine=hppa1.1-hp -+ cpu=hppa1.1 -+ vendor=hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp -- basic_machine=hppa1.1-hp -+ cpu=hppa1.1 -+ vendor=hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) -- basic_machine=hppa1.1-hp -+ cpu=hppa1.1 -+ vendor=hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) -- basic_machine=hppa1.0-hp -- ;; -- hppaosf) -- basic_machine=hppa1.1-hp -- os=-osf -- ;; -- hppro) -- basic_machine=hppa1.1-hp -- os=-proelf -- ;; -- i370-ibm* | ibm*) -- basic_machine=i370-ibm -+ cpu=hppa1.0 -+ vendor=hp - ;; - i*86v32) -- basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` -- os=-sysv32 -+ cpu=$(echo "$1" | sed -e 's/86.*/86/') -+ vendor=pc -+ basic_os=sysv32 - ;; - i*86v4*) -- basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` -- os=-sysv4 -+ cpu=$(echo "$1" | sed -e 's/86.*/86/') -+ vendor=pc -+ basic_os=sysv4 - ;; - i*86v) -- basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` -- os=-sysv -+ cpu=$(echo "$1" | sed -e 's/86.*/86/') -+ vendor=pc -+ basic_os=sysv - ;; - i*86sol2) -- basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` -- os=-solaris2 -- ;; -- i386mach) -- basic_machine=i386-mach -- os=-mach -+ cpu=$(echo "$1" | sed -e 's/86.*/86/') -+ vendor=pc -+ basic_os=solaris2 - ;; -- vsta) -- basic_machine=i386-unknown -- os=-vsta -+ j90 | j90-cray) -+ cpu=j90 -+ vendor=cray -+ basic_os=${basic_os:-unicos} - ;; - iris | iris4d) -- basic_machine=mips-sgi -- case $os in -- -irix*) -+ cpu=mips -+ vendor=sgi -+ case $basic_os in -+ irix*) - ;; - *) -- os=-irix4 -+ basic_os=irix4 - ;; - esac - ;; -- isi68 | isi) -- basic_machine=m68k-isi -- os=-sysv -- ;; -- leon-*|leon[3-9]-*) -- basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` -- ;; -- m68knommu) -- basic_machine=m68k-unknown -- os=-linux -- ;; -- m68knommu-*) -- basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- os=-linux -- ;; -- magnum | m3230) -- basic_machine=mips-mips -- os=-sysv -- ;; -- merlin) -- basic_machine=ns32k-utek -- os=-sysv -- ;; -- microblaze*) -- basic_machine=microblaze-xilinx -- ;; -- mingw64) -- basic_machine=x86_64-pc -- os=-mingw64 -- ;; -- mingw32) -- basic_machine=i686-pc -- os=-mingw32 -- ;; -- mingw32ce) -- basic_machine=arm-unknown -- os=-mingw32ce -- ;; - miniframe) -- basic_machine=m68000-convergent -- ;; -- *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) -- basic_machine=m68k-atari -- os=-mint -- ;; -- mips3*-*) -- basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` -- ;; -- mips3*) -- basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown -- ;; -- monitor) -- basic_machine=m68k-rom68k -- os=-coff -- ;; -- morphos) -- basic_machine=powerpc-unknown -- os=-morphos -- ;; -- moxiebox) -- basic_machine=moxie-unknown -- os=-moxiebox -+ cpu=m68000 -+ vendor=convergent - ;; -- msdos) -- basic_machine=i386-pc -- os=-msdos -- ;; -- ms1-*) -- basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` -- ;; -- msys) -- basic_machine=i686-pc -- os=-msys -- ;; -- mvs) -- basic_machine=i370-ibm -- os=-mvs -- ;; -- nacl) -- basic_machine=le32-unknown -- os=-nacl -- ;; -- ncr3000) -- basic_machine=i486-ncr -- os=-sysv4 -- ;; -- netbsd386) -- basic_machine=i386-unknown -- os=-netbsd -- ;; -- netwinder) -- basic_machine=armv4l-rebel -- os=-linux -- ;; -- news | news700 | news800 | news900) -- basic_machine=m68k-sony -- os=-newsos -- ;; -- news1000) -- basic_machine=m68030-sony -- os=-newsos -+ *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) -+ cpu=m68k -+ vendor=atari -+ basic_os=mint - ;; - news-3600 | risc-news) -- basic_machine=mips-sony -- os=-newsos -- ;; -- necv70) -- basic_machine=v70-nec -- os=-sysv -+ cpu=mips -+ vendor=sony -+ basic_os=newsos - ;; - next | m*-next) -- basic_machine=m68k-next -- case $os in -- -nextstep* ) -+ cpu=m68k -+ vendor=next -+ case $basic_os in -+ openstep*) -+ ;; -+ nextstep*) - ;; -- -ns2*) -- os=-nextstep2 -+ ns2*) -+ basic_os=nextstep2 - ;; - *) -- os=-nextstep3 -+ basic_os=nextstep3 - ;; - esac - ;; -- nh3000) -- basic_machine=m68k-harris -- os=-cxux -- ;; -- nh[45]000) -- basic_machine=m88k-harris -- os=-cxux -- ;; -- nindy960) -- basic_machine=i960-intel -- os=-nindy -- ;; -- mon960) -- basic_machine=i960-intel -- os=-mon960 -- ;; -- nonstopux) -- basic_machine=mips-compaq -- os=-nonstopux -- ;; - np1) -- basic_machine=np1-gould -- ;; -- neo-tandem) -- basic_machine=neo-tandem -- ;; -- nse-tandem) -- basic_machine=nse-tandem -- ;; -- nsr-tandem) -- basic_machine=nsr-tandem -- ;; -- nsv-tandem) -- basic_machine=nsv-tandem -- ;; -- nsx-tandem) -- basic_machine=nsx-tandem -+ cpu=np1 -+ vendor=gould - ;; - op50n-* | op60c-*) -- basic_machine=hppa1.1-oki -- os=-proelf -- ;; -- openrisc | openrisc-*) -- basic_machine=or32-unknown -- ;; -- os400) -- basic_machine=powerpc-ibm -- os=-os400 -- ;; -- OSE68000 | ose68000) -- basic_machine=m68000-ericsson -- os=-ose -- ;; -- os68k) -- basic_machine=m68k-none -- os=-os68k -+ cpu=hppa1.1 -+ vendor=oki -+ basic_os=proelf - ;; - pa-hitachi) -- basic_machine=hppa1.1-hitachi -- os=-hiuxwe2 -- ;; -- paragon) -- basic_machine=i860-intel -- os=-osf -- ;; -- parisc) -- basic_machine=hppa-unknown -- os=-linux -- ;; -- parisc-*) -- basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- os=-linux -+ cpu=hppa1.1 -+ vendor=hitachi -+ basic_os=hiuxwe2 - ;; - pbd) -- basic_machine=sparc-tti -+ cpu=sparc -+ vendor=tti - ;; - pbb) -- basic_machine=m68k-tti -+ cpu=m68k -+ vendor=tti - ;; -- pc532 | pc532-*) -- basic_machine=ns32k-pc532 -- ;; -- pc98) -- basic_machine=i386-pc -- ;; -- pc98-*) -- basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- pentium | p5 | k5 | k6 | nexgen | viac3) -- basic_machine=i586-pc -- ;; -- pentiumpro | p6 | 6x86 | athlon | athlon_*) -- basic_machine=i686-pc -- ;; -- pentiumii | pentium2 | pentiumiii | pentium3) -- basic_machine=i686-pc -- ;; -- pentium4) -- basic_machine=i786-pc -- ;; -- pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) -- basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- pentiumpro-* | p6-* | 6x86-* | athlon-*) -- basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) -- basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- pentium4-*) -- basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` -+ pc532) -+ cpu=ns32k -+ vendor=pc532 - ;; - pn) -- basic_machine=pn-gould -- ;; -- power) basic_machine=power-ibm -+ cpu=pn -+ vendor=gould - ;; -- ppc | ppcbe) basic_machine=powerpc-unknown -+ power) -+ cpu=power -+ vendor=ibm - ;; -- ppc-* | ppcbe-*) -- basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- ppcle | powerpclittle) -- basic_machine=powerpcle-unknown -- ;; -- ppcle-* | powerpclittle-*) -- basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- ppc64) basic_machine=powerpc64-unknown -+ ps2) -+ cpu=i386 -+ vendor=ibm - ;; -- ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` -+ rm[46]00) -+ cpu=mips -+ vendor=siemens - ;; -- ppc64le | powerpc64little) -- basic_machine=powerpc64le-unknown -+ rtpc | rtpc-*) -+ cpu=romp -+ vendor=ibm - ;; -- ppc64le-* | powerpc64little-*) -- basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` -+ sde) -+ cpu=mipsisa32 -+ vendor=sde -+ basic_os=${basic_os:-elf} - ;; -- ps2) -- basic_machine=i386-ibm -+ simso-wrs) -+ cpu=sparclite -+ vendor=wrs -+ basic_os=vxworks - ;; -- pw32) -- basic_machine=i586-unknown -- os=-pw32 -+ tower | tower-32) -+ cpu=m68k -+ vendor=ncr - ;; -- rdos | rdos64) -- basic_machine=x86_64-pc -- os=-rdos -+ vpp*|vx|vx-*) -+ cpu=f301 -+ vendor=fujitsu - ;; -- rdos32) -- basic_machine=i386-pc -- os=-rdos -+ w65) -+ cpu=w65 -+ vendor=wdc - ;; -- rom68k) -- basic_machine=m68k-rom68k -- os=-coff -+ w89k-*) -+ cpu=hppa1.1 -+ vendor=winbond -+ basic_os=proelf - ;; -- rm[46]00) -- basic_machine=mips-siemens -+ none) -+ cpu=none -+ vendor=none - ;; -- rtpc | rtpc-*) -- basic_machine=romp-ibm -+ leon|leon[3-9]) -+ cpu=sparc -+ vendor=$basic_machine - ;; -- s390 | s390-*) -- basic_machine=s390-ibm -+ leon-*|leon[3-9]-*) -+ cpu=sparc -+ vendor=$(echo "$basic_machine" | sed 's/-.*//') - ;; -- s390x | s390x-*) -- basic_machine=s390x-ibm -+ -+ *-*) -+ # shellcheck disable=SC2162 -+ IFS="-" read cpu vendor <&2 -- exit 1 -+ # Recognize the canonical CPU types that are allowed with any -+ # company name. -+ case $cpu in -+ 1750a | 580 \ -+ | a29k \ -+ | aarch64 | aarch64_be \ -+ | abacus \ -+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ -+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ -+ | alphapca5[67] | alpha64pca5[67] \ -+ | am33_2.0 \ -+ | amdgcn \ -+ | arc | arceb \ -+ | arm | arm[lb]e | arme[lb] | armv* \ -+ | avr | avr32 \ -+ | asmjs \ -+ | ba \ -+ | be32 | be64 \ -+ | bfin | bpf | bs2000 \ -+ | c[123]* | c30 | [cjt]90 | c4x \ -+ | c8051 | clipper | craynv | csky | cydra \ -+ | d10v | d30v | dlx | dsp16xx \ -+ | e2k | elxsi | epiphany \ -+ | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \ -+ | h8300 | h8500 \ -+ | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -+ | hexagon \ -+ | i370 | i*86 | i860 | i960 | ia16 | ia64 \ -+ | ip2k | iq2000 \ -+ | k1om \ -+ | le32 | le64 \ -+ | lm32 \ -+ | loongarch32 | loongarch64 | loongarchx32 \ -+ | m32c | m32r | m32rle \ -+ | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ -+ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ -+ | m88110 | m88k | maxq | mb | mcore | mep | metag \ -+ | microblaze | microblazeel \ -+ | mips | mipsbe | mipseb | mipsel | mipsle \ -+ | mips16 \ -+ | mips64 | mips64eb | mips64el \ -+ | mips64octeon | mips64octeonel \ -+ | mips64orion | mips64orionel \ -+ | mips64r5900 | mips64r5900el \ -+ | mips64vr | mips64vrel \ -+ | mips64vr4100 | mips64vr4100el \ -+ | mips64vr4300 | mips64vr4300el \ -+ | mips64vr5000 | mips64vr5000el \ -+ | mips64vr5900 | mips64vr5900el \ -+ | mipsisa32 | mipsisa32el \ -+ | mipsisa32r2 | mipsisa32r2el \ -+ | mipsisa32r6 | mipsisa32r6el \ -+ | mipsisa64 | mipsisa64el \ -+ | mipsisa64r2 | mipsisa64r2el \ -+ | mipsisa64r6 | mipsisa64r6el \ -+ | mipsisa64sb1 | mipsisa64sb1el \ -+ | mipsisa64sr71k | mipsisa64sr71kel \ -+ | mipsr5900 | mipsr5900el \ -+ | mipstx39 | mipstx39el \ -+ | mmix \ -+ | mn10200 | mn10300 \ -+ | moxie \ -+ | mt \ -+ | msp430 \ -+ | nds32 | nds32le | nds32be \ -+ | nfp \ -+ | nios | nios2 | nios2eb | nios2el \ -+ | none | np1 | ns16k | ns32k | nvptx \ -+ | open8 \ -+ | or1k* \ -+ | or32 \ -+ | orion \ -+ | picochip \ -+ | pdp10 | pdp11 | pj | pjl | pn | power \ -+ | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ -+ | pru \ -+ | pyramid \ -+ | riscv | riscv32 | riscv32be | riscv64 | riscv64be \ -+ | rl78 | romp | rs6000 | rx \ -+ | s390 | s390x \ -+ | score \ -+ | sh | shl \ -+ | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ -+ | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \ -+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \ -+ | sparclite \ -+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ -+ | spu \ -+ | tahoe \ -+ | thumbv7* \ -+ | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ -+ | tron \ -+ | ubicom32 \ -+ | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ -+ | vax \ -+ | visium \ -+ | w65 \ -+ | wasm32 | wasm32_simd128 | wasm64 \ -+ | we32k \ -+ | x86 | x86_64 | xc16x | xgate | xps100 \ -+ | xstormy16 | xtensa* \ -+ | ymp \ -+ | z8k | z80) -+ ;; -+ -+ *) -+ echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2 -+ exit 1 -+ ;; -+ esac - ;; - esac - - # Here we canonicalize certain aliases for manufacturers. --case $basic_machine in -- *-digital*) -- basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` -+case $vendor in -+ digital*) -+ vendor=dec - ;; -- *-commodore*) -- basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` -+ commodore*) -+ vendor=cbm - ;; - *) - ;; -@@ -1334,203 +1287,213 @@ esac - - # Decode manufacturer-specific aliases for certain operating systems. - --if [ x"$os" != x"" ] -+if test x$basic_os != x - then -+ -+# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just -+# set os. -+case $basic_os in -+ gnu/linux*) -+ kernel=linux -+ os=$(echo $basic_os | sed -e 's|gnu/linux|gnu|') -+ ;; -+ os2-emx) -+ kernel=os2 -+ os=$(echo $basic_os | sed -e 's|os2-emx|emx|') -+ ;; -+ nto-qnx*) -+ kernel=nto -+ os=$(echo $basic_os | sed -e 's|nto-qnx|qnx|') -+ ;; -+ *-*) -+ # shellcheck disable=SC2162 -+ IFS="-" read kernel os <&2 -- exit 1 -+ # No normalization, but not necessarily accepted, that comes below. - ;; - esac -+ - else - - # Here we handle the default operating systems that come with various machines. -@@ -1543,254 +1506,357 @@ else - # will signal an error saying that MANUFACTURER isn't an operating - # system, and we'll never get to this point. - --case $basic_machine in -+kernel= -+case $cpu-$vendor in - score-*) -- os=-elf -+ os=elf - ;; - spu-*) -- os=-elf -+ os=elf - ;; - *-acorn) -- os=-riscix1.2 -+ os=riscix1.2 - ;; - arm*-rebel) -- os=-linux -+ kernel=linux -+ os=gnu - ;; - arm*-semi) -- os=-aout -+ os=aout - ;; - c4x-* | tic4x-*) -- os=-coff -+ os=coff - ;; - c8051-*) -- os=-elf -+ os=elf -+ ;; -+ clipper-intergraph) -+ os=clix - ;; - hexagon-*) -- os=-elf -+ os=elf - ;; - tic54x-*) -- os=-coff -+ os=coff - ;; - tic55x-*) -- os=-coff -+ os=coff - ;; - tic6x-*) -- os=-coff -+ os=coff - ;; - # This must come before the *-dec entry. - pdp10-*) -- os=-tops20 -+ os=tops20 - ;; - pdp11-*) -- os=-none -+ os=none - ;; - *-dec | vax-*) -- os=-ultrix4.2 -+ os=ultrix4.2 - ;; - m68*-apollo) -- os=-domain -+ os=domain - ;; - i386-sun) -- os=-sunos4.0.2 -+ os=sunos4.0.2 - ;; - m68000-sun) -- os=-sunos3 -+ os=sunos3 - ;; - m68*-cisco) -- os=-aout -+ os=aout - ;; - mep-*) -- os=-elf -+ os=elf - ;; - mips*-cisco) -- os=-elf -+ os=elf - ;; - mips*-*) -- os=-elf -+ os=elf - ;; - or32-*) -- os=-coff -+ os=coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. -- os=-sysv3 -+ os=sysv3 - ;; - sparc-* | *-sun) -- os=-sunos4.1.1 -+ os=sunos4.1.1 - ;; - pru-*) -- os=-elf -+ os=elf - ;; - *-be) -- os=-beos -+ os=beos - ;; - *-ibm) -- os=-aix -+ os=aix - ;; - *-knuth) -- os=-mmixware -+ os=mmixware - ;; - *-wec) -- os=-proelf -+ os=proelf - ;; - *-winbond) -- os=-proelf -+ os=proelf - ;; - *-oki) -- os=-proelf -+ os=proelf - ;; - *-hp) -- os=-hpux -+ os=hpux - ;; - *-hitachi) -- os=-hiux -+ os=hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) -- os=-sysv -+ os=sysv - ;; - *-cbm) -- os=-amigaos -+ os=amigaos - ;; - *-dg) -- os=-dgux -+ os=dgux - ;; - *-dolphin) -- os=-sysv3 -+ os=sysv3 - ;; - m68k-ccur) -- os=-rtu -+ os=rtu - ;; - m88k-omron*) -- os=-luna -+ os=luna - ;; - *-next) -- os=-nextstep -+ os=nextstep - ;; - *-sequent) -- os=-ptx -+ os=ptx - ;; - *-crds) -- os=-unos -+ os=unos - ;; - *-ns) -- os=-genix -+ os=genix - ;; - i370-*) -- os=-mvs -+ os=mvs - ;; - *-gould) -- os=-sysv -+ os=sysv - ;; - *-highlevel) -- os=-bsd -+ os=bsd - ;; - *-encore) -- os=-bsd -+ os=bsd - ;; - *-sgi) -- os=-irix -+ os=irix - ;; - *-siemens) -- os=-sysv4 -+ os=sysv4 - ;; - *-masscomp) -- os=-rtu -+ os=rtu - ;; - f30[01]-fujitsu | f700-fujitsu) -- os=-uxpv -+ os=uxpv - ;; - *-rom68k) -- os=-coff -+ os=coff - ;; - *-*bug) -- os=-coff -+ os=coff - ;; - *-apple) -- os=-macos -+ os=macos - ;; - *-atari*) -- os=-mint -+ os=mint -+ ;; -+ *-wrs) -+ os=vxworks - ;; - *) -- os=-none -+ os=none - ;; - esac -+ - fi - -+# Now, validate our (potentially fixed-up) OS. -+case $os in -+ # Sometimes we do "kernel-libc", so those need to count as OSes. -+ musl* | newlib* | uclibc*) -+ ;; -+ # Likewise for "kernel-abi" -+ eabi* | gnueabi*) -+ ;; -+ # VxWorks passes extra cpu info in the 4th filed. -+ simlinux | simwindows | spe) -+ ;; -+ # Now accept the basic system types. -+ # The portable systems comes first. -+ # Each alternative MUST end in a * to match a version number. -+ gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ -+ | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ -+ | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ -+ | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ -+ | hiux* | abug | nacl* | netware* | windows* \ -+ | os9* | macos* | osx* | ios* \ -+ | mpw* | magic* | mmixware* | mon960* | lnews* \ -+ | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ -+ | aos* | aros* | cloudabi* | sortix* | twizzler* \ -+ | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ -+ | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ -+ | mirbsd* | netbsd* | dicos* | openedition* | ose* \ -+ | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \ -+ | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ -+ | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ -+ | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ -+ | udi* | lites* | ieee* | go32* | aux* | hcos* \ -+ | chorusrdb* | cegcc* | glidix* | serenity* \ -+ | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ -+ | midipix* | mingw32* | mingw64* | mint* \ -+ | uxpv* | beos* | mpeix* | udk* | moxiebox* \ -+ | interix* | uwin* | mks* | rhapsody* | darwin* \ -+ | openstep* | oskit* | conix* | pw32* | nonstopux* \ -+ | storm-chaos* | tops10* | tenex* | tops20* | its* \ -+ | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \ -+ | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \ -+ | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ -+ | skyos* | haiku* | rdos* | toppers* | drops* | es* \ -+ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ -+ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ -+ | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*) -+ ;; -+ # This one is extra strict with allowed versions -+ sco3.2v2 | sco3.2v[4-9]* | sco5v6*) -+ # Don't forget version if it is 3.2v4 or newer. -+ ;; -+ none) -+ ;; -+ *) -+ echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 -+ exit 1 -+ ;; -+esac -+ -+# As a final step for OS-related things, validate the OS-kernel combination -+# (given a valid OS), if there is a kernel. -+case $kernel-$os in -+ linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* ) -+ ;; -+ uclinux-uclibc* ) -+ ;; -+ -dietlibc* | -newlib* | -musl* | -uclibc* ) -+ # These are just libc implementations, not actual OSes, and thus -+ # require a kernel. -+ echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 -+ exit 1 -+ ;; -+ kfreebsd*-gnu* | kopensolaris*-gnu*) -+ ;; -+ vxworks-simlinux | vxworks-simwindows | vxworks-spe) -+ ;; -+ nto-qnx*) -+ ;; -+ os2-emx) -+ ;; -+ *-eabi* | *-gnueabi*) -+ ;; -+ -*) -+ # Blank kernel with real OS is always fine. -+ ;; -+ *-*) -+ echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 -+ exit 1 -+ ;; -+esac -+ - # Here we handle the case where we know the os, and the CPU type, but not the - # manufacturer. We pick the logical manufacturer. --vendor=unknown --case $basic_machine in -- *-unknown) -- case $os in -- -riscix*) -+case $vendor in -+ unknown) -+ case $cpu-$os in -+ *-riscix*) - vendor=acorn - ;; -- -sunos*) -+ *-sunos*) - vendor=sun - ;; -- -cnk*|-aix*) -+ *-cnk* | *-aix*) - vendor=ibm - ;; -- -beos*) -+ *-beos*) - vendor=be - ;; -- -hpux*) -+ *-hpux*) - vendor=hp - ;; -- -mpeix*) -+ *-mpeix*) - vendor=hp - ;; -- -hiux*) -+ *-hiux*) - vendor=hitachi - ;; -- -unos*) -+ *-unos*) - vendor=crds - ;; -- -dgux*) -+ *-dgux*) - vendor=dg - ;; -- -luna*) -+ *-luna*) - vendor=omron - ;; -- -genix*) -+ *-genix*) - vendor=ns - ;; -- -mvs* | -opened*) -+ *-clix*) -+ vendor=intergraph -+ ;; -+ *-mvs* | *-opened*) -+ vendor=ibm -+ ;; -+ *-os400*) - vendor=ibm - ;; -- -os400*) -+ s390-* | s390x-*) - vendor=ibm - ;; -- -ptx*) -+ *-ptx*) - vendor=sequent - ;; -- -tpf*) -+ *-tpf*) - vendor=ibm - ;; -- -vxsim* | -vxworks* | -windiss*) -+ *-vxsim* | *-vxworks* | *-windiss*) - vendor=wrs - ;; -- -aux*) -+ *-aux*) - vendor=apple - ;; -- -hms*) -+ *-hms*) - vendor=hitachi - ;; -- -mpw* | -macos*) -+ *-mpw* | *-macos*) - vendor=apple - ;; -- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) -+ *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) - vendor=atari - ;; -- -vos*) -+ *-vos*) - vendor=stratus - ;; - esac -- basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` - ;; - esac - --echo "$basic_machine$os" -+echo "$cpu-$vendor-${kernel:+$kernel-}$os" - exit - - # Local variables: -diff --git a/src/tiff/config/config.sub b/src/tiff/config/config.sub -index 9ccf09a7..f1bee4ef 100755 ---- a/src/tiff/config/config.sub -+++ b/src/tiff/config/config.sub -@@ -1,8 +1,8 @@ - #! /bin/sh - # Configuration validation subroutine script. --# Copyright 1992-2018 Free Software Foundation, Inc. -+# Copyright 1992-2021 Free Software Foundation, Inc. - --timestamp='2018-03-08' -+timestamp='2021-03-10' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -33,7 +33,7 @@ timestamp='2018-03-08' - # Otherwise, we print the canonical config type on stdout and succeed. - - # You can get the latest version of this script from: --# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub -+# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub - - # This file is supposed to be the same for all GNU packages - # and recognize all the CPU types, system types and aliases -@@ -50,7 +50,7 @@ timestamp='2018-03-08' - # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM - # It is wrong to echo any other type of specification. - --me=`echo "$0" | sed -e 's,.*/,,'` -+me=$(echo "$0" | sed -e 's,.*/,,') - - usage="\ - Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS -@@ -67,7 +67,7 @@ Report bugs and patches to ." - version="\ - GNU config.sub ($timestamp) - --Copyright 1992-2018 Free Software Foundation, Inc. -+Copyright 1992-2021 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -89,7 +89,7 @@ while test $# -gt 0 ; do - - ) # Use stdin as input. - break ;; - -* ) -- echo "$me: invalid option $1$help" -+ echo "$me: invalid option $1$help" >&2 - exit 1 ;; - - *local*) -@@ -110,1223 +110,1176 @@ case $# in - exit 1;; - esac - --# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). --# Here we must recognize all the valid KERNEL-OS combinations. --maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` --case $maybe_os in -- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ -- linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ -- knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ -- kopensolaris*-gnu* | cloudabi*-eabi* | \ -- storm-chaos* | os2-emx* | rtmk-nova*) -- os=-$maybe_os -- basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` -- ;; -- android-linux) -- os=-linux-android -- basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown -- ;; -- *) -- basic_machine=`echo "$1" | sed 's/-[^-]*$//'` -- if [ "$basic_machine" != "$1" ] -- then os=`echo "$1" | sed 's/.*-/-/'` -- else os=; fi -- ;; --esac -+# Split fields of configuration type -+# shellcheck disable=SC2162 -+IFS="-" read field1 field2 field3 field4 <&2 -+ exit 1 - ;; -- -lynx*) -- os=-lynxos -+ *-*-*-*) -+ basic_machine=$field1-$field2 -+ basic_os=$field3-$field4 - ;; -- -ptx*) -- basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` -+ *-*-*) -+ # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two -+ # parts -+ maybe_os=$field2-$field3 -+ case $maybe_os in -+ nto-qnx* | linux-* | uclinux-uclibc* \ -+ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ -+ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ -+ | storm-chaos* | os2-emx* | rtmk-nova*) -+ basic_machine=$field1 -+ basic_os=$maybe_os -+ ;; -+ android-linux) -+ basic_machine=$field1-unknown -+ basic_os=linux-android -+ ;; -+ *) -+ basic_machine=$field1-$field2 -+ basic_os=$field3 -+ ;; -+ esac - ;; -- -psos*) -- os=-psos -+ *-*) -+ # A lone config we happen to match not fitting any pattern -+ case $field1-$field2 in -+ decstation-3100) -+ basic_machine=mips-dec -+ basic_os= -+ ;; -+ *-*) -+ # Second component is usually, but not always the OS -+ case $field2 in -+ # Prevent following clause from handling this valid os -+ sun*os*) -+ basic_machine=$field1 -+ basic_os=$field2 -+ ;; -+ # Manufacturers -+ dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ -+ | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ -+ | unicom* | ibm* | next | hp | isi* | apollo | altos* \ -+ | convergent* | ncr* | news | 32* | 3600* | 3100* \ -+ | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ -+ | ultra | tti* | harris | dolphin | highlevel | gould \ -+ | cbm | ns | masscomp | apple | axis | knuth | cray \ -+ | microblaze* | sim | cisco \ -+ | oki | wec | wrs | winbond) -+ basic_machine=$field1-$field2 -+ basic_os= -+ ;; -+ *) -+ basic_machine=$field1 -+ basic_os=$field2 -+ ;; -+ esac -+ ;; -+ esac - ;; -- -mint | -mint[0-9]*) -- basic_machine=m68k-atari -- os=-mint -+ *) -+ # Convert single-component short-hands not valid as part of -+ # multi-component configurations. -+ case $field1 in -+ 386bsd) -+ basic_machine=i386-pc -+ basic_os=bsd -+ ;; -+ a29khif) -+ basic_machine=a29k-amd -+ basic_os=udi -+ ;; -+ adobe68k) -+ basic_machine=m68010-adobe -+ basic_os=scout -+ ;; -+ alliant) -+ basic_machine=fx80-alliant -+ basic_os= -+ ;; -+ altos | altos3068) -+ basic_machine=m68k-altos -+ basic_os= -+ ;; -+ am29k) -+ basic_machine=a29k-none -+ basic_os=bsd -+ ;; -+ amdahl) -+ basic_machine=580-amdahl -+ basic_os=sysv -+ ;; -+ amiga) -+ basic_machine=m68k-unknown -+ basic_os= -+ ;; -+ amigaos | amigados) -+ basic_machine=m68k-unknown -+ basic_os=amigaos -+ ;; -+ amigaunix | amix) -+ basic_machine=m68k-unknown -+ basic_os=sysv4 -+ ;; -+ apollo68) -+ basic_machine=m68k-apollo -+ basic_os=sysv -+ ;; -+ apollo68bsd) -+ basic_machine=m68k-apollo -+ basic_os=bsd -+ ;; -+ aros) -+ basic_machine=i386-pc -+ basic_os=aros -+ ;; -+ aux) -+ basic_machine=m68k-apple -+ basic_os=aux -+ ;; -+ balance) -+ basic_machine=ns32k-sequent -+ basic_os=dynix -+ ;; -+ blackfin) -+ basic_machine=bfin-unknown -+ basic_os=linux -+ ;; -+ cegcc) -+ basic_machine=arm-unknown -+ basic_os=cegcc -+ ;; -+ convex-c1) -+ basic_machine=c1-convex -+ basic_os=bsd -+ ;; -+ convex-c2) -+ basic_machine=c2-convex -+ basic_os=bsd -+ ;; -+ convex-c32) -+ basic_machine=c32-convex -+ basic_os=bsd -+ ;; -+ convex-c34) -+ basic_machine=c34-convex -+ basic_os=bsd -+ ;; -+ convex-c38) -+ basic_machine=c38-convex -+ basic_os=bsd -+ ;; -+ cray) -+ basic_machine=j90-cray -+ basic_os=unicos -+ ;; -+ crds | unos) -+ basic_machine=m68k-crds -+ basic_os= -+ ;; -+ da30) -+ basic_machine=m68k-da30 -+ basic_os= -+ ;; -+ decstation | pmax | pmin | dec3100 | decstatn) -+ basic_machine=mips-dec -+ basic_os= -+ ;; -+ delta88) -+ basic_machine=m88k-motorola -+ basic_os=sysv3 -+ ;; -+ dicos) -+ basic_machine=i686-pc -+ basic_os=dicos -+ ;; -+ djgpp) -+ basic_machine=i586-pc -+ basic_os=msdosdjgpp -+ ;; -+ ebmon29k) -+ basic_machine=a29k-amd -+ basic_os=ebmon -+ ;; -+ es1800 | OSE68k | ose68k | ose | OSE) -+ basic_machine=m68k-ericsson -+ basic_os=ose -+ ;; -+ gmicro) -+ basic_machine=tron-gmicro -+ basic_os=sysv -+ ;; -+ go32) -+ basic_machine=i386-pc -+ basic_os=go32 -+ ;; -+ h8300hms) -+ basic_machine=h8300-hitachi -+ basic_os=hms -+ ;; -+ h8300xray) -+ basic_machine=h8300-hitachi -+ basic_os=xray -+ ;; -+ h8500hms) -+ basic_machine=h8500-hitachi -+ basic_os=hms -+ ;; -+ harris) -+ basic_machine=m88k-harris -+ basic_os=sysv3 -+ ;; -+ hp300 | hp300hpux) -+ basic_machine=m68k-hp -+ basic_os=hpux -+ ;; -+ hp300bsd) -+ basic_machine=m68k-hp -+ basic_os=bsd -+ ;; -+ hppaosf) -+ basic_machine=hppa1.1-hp -+ basic_os=osf -+ ;; -+ hppro) -+ basic_machine=hppa1.1-hp -+ basic_os=proelf -+ ;; -+ i386mach) -+ basic_machine=i386-mach -+ basic_os=mach -+ ;; -+ isi68 | isi) -+ basic_machine=m68k-isi -+ basic_os=sysv -+ ;; -+ m68knommu) -+ basic_machine=m68k-unknown -+ basic_os=linux -+ ;; -+ magnum | m3230) -+ basic_machine=mips-mips -+ basic_os=sysv -+ ;; -+ merlin) -+ basic_machine=ns32k-utek -+ basic_os=sysv -+ ;; -+ mingw64) -+ basic_machine=x86_64-pc -+ basic_os=mingw64 -+ ;; -+ mingw32) -+ basic_machine=i686-pc -+ basic_os=mingw32 -+ ;; -+ mingw32ce) -+ basic_machine=arm-unknown -+ basic_os=mingw32ce -+ ;; -+ monitor) -+ basic_machine=m68k-rom68k -+ basic_os=coff -+ ;; -+ morphos) -+ basic_machine=powerpc-unknown -+ basic_os=morphos -+ ;; -+ moxiebox) -+ basic_machine=moxie-unknown -+ basic_os=moxiebox -+ ;; -+ msdos) -+ basic_machine=i386-pc -+ basic_os=msdos -+ ;; -+ msys) -+ basic_machine=i686-pc -+ basic_os=msys -+ ;; -+ mvs) -+ basic_machine=i370-ibm -+ basic_os=mvs -+ ;; -+ nacl) -+ basic_machine=le32-unknown -+ basic_os=nacl -+ ;; -+ emscripten) -+ basic_machine=asmjs-unknown -+ basic_os=emscripten -+ ;; -+ ncr3000) -+ basic_machine=i486-ncr -+ basic_os=sysv4 -+ ;; -+ netbsd386) -+ basic_machine=i386-pc -+ basic_os=netbsd -+ ;; -+ netwinder) -+ basic_machine=armv4l-rebel -+ basic_os=linux -+ ;; -+ news | news700 | news800 | news900) -+ basic_machine=m68k-sony -+ basic_os=newsos -+ ;; -+ news1000) -+ basic_machine=m68030-sony -+ basic_os=newsos -+ ;; -+ necv70) -+ basic_machine=v70-nec -+ basic_os=sysv -+ ;; -+ nh3000) -+ basic_machine=m68k-harris -+ basic_os=cxux -+ ;; -+ nh[45]000) -+ basic_machine=m88k-harris -+ basic_os=cxux -+ ;; -+ nindy960) -+ basic_machine=i960-intel -+ basic_os=nindy -+ ;; -+ mon960) -+ basic_machine=i960-intel -+ basic_os=mon960 -+ ;; -+ nonstopux) -+ basic_machine=mips-compaq -+ basic_os=nonstopux -+ ;; -+ os400) -+ basic_machine=powerpc-ibm -+ basic_os=os400 -+ ;; -+ OSE68000 | ose68000) -+ basic_machine=m68000-ericsson -+ basic_os=ose -+ ;; -+ os68k) -+ basic_machine=m68k-none -+ basic_os=os68k -+ ;; -+ paragon) -+ basic_machine=i860-intel -+ basic_os=osf -+ ;; -+ parisc) -+ basic_machine=hppa-unknown -+ basic_os=linux -+ ;; -+ psp) -+ basic_machine=mipsallegrexel-sony -+ basic_os=psp -+ ;; -+ pw32) -+ basic_machine=i586-unknown -+ basic_os=pw32 -+ ;; -+ rdos | rdos64) -+ basic_machine=x86_64-pc -+ basic_os=rdos -+ ;; -+ rdos32) -+ basic_machine=i386-pc -+ basic_os=rdos -+ ;; -+ rom68k) -+ basic_machine=m68k-rom68k -+ basic_os=coff -+ ;; -+ sa29200) -+ basic_machine=a29k-amd -+ basic_os=udi -+ ;; -+ sei) -+ basic_machine=mips-sei -+ basic_os=seiux -+ ;; -+ sequent) -+ basic_machine=i386-sequent -+ basic_os= -+ ;; -+ sps7) -+ basic_machine=m68k-bull -+ basic_os=sysv2 -+ ;; -+ st2000) -+ basic_machine=m68k-tandem -+ basic_os= -+ ;; -+ stratus) -+ basic_machine=i860-stratus -+ basic_os=sysv4 -+ ;; -+ sun2) -+ basic_machine=m68000-sun -+ basic_os= -+ ;; -+ sun2os3) -+ basic_machine=m68000-sun -+ basic_os=sunos3 -+ ;; -+ sun2os4) -+ basic_machine=m68000-sun -+ basic_os=sunos4 -+ ;; -+ sun3) -+ basic_machine=m68k-sun -+ basic_os= -+ ;; -+ sun3os3) -+ basic_machine=m68k-sun -+ basic_os=sunos3 -+ ;; -+ sun3os4) -+ basic_machine=m68k-sun -+ basic_os=sunos4 -+ ;; -+ sun4) -+ basic_machine=sparc-sun -+ basic_os= -+ ;; -+ sun4os3) -+ basic_machine=sparc-sun -+ basic_os=sunos3 -+ ;; -+ sun4os4) -+ basic_machine=sparc-sun -+ basic_os=sunos4 -+ ;; -+ sun4sol2) -+ basic_machine=sparc-sun -+ basic_os=solaris2 -+ ;; -+ sun386 | sun386i | roadrunner) -+ basic_machine=i386-sun -+ basic_os= -+ ;; -+ sv1) -+ basic_machine=sv1-cray -+ basic_os=unicos -+ ;; -+ symmetry) -+ basic_machine=i386-sequent -+ basic_os=dynix -+ ;; -+ t3e) -+ basic_machine=alphaev5-cray -+ basic_os=unicos -+ ;; -+ t90) -+ basic_machine=t90-cray -+ basic_os=unicos -+ ;; -+ toad1) -+ basic_machine=pdp10-xkl -+ basic_os=tops20 -+ ;; -+ tpf) -+ basic_machine=s390x-ibm -+ basic_os=tpf -+ ;; -+ udi29k) -+ basic_machine=a29k-amd -+ basic_os=udi -+ ;; -+ ultra3) -+ basic_machine=a29k-nyu -+ basic_os=sym1 -+ ;; -+ v810 | necv810) -+ basic_machine=v810-nec -+ basic_os=none -+ ;; -+ vaxv) -+ basic_machine=vax-dec -+ basic_os=sysv -+ ;; -+ vms) -+ basic_machine=vax-dec -+ basic_os=vms -+ ;; -+ vsta) -+ basic_machine=i386-pc -+ basic_os=vsta -+ ;; -+ vxworks960) -+ basic_machine=i960-wrs -+ basic_os=vxworks -+ ;; -+ vxworks68) -+ basic_machine=m68k-wrs -+ basic_os=vxworks -+ ;; -+ vxworks29k) -+ basic_machine=a29k-wrs -+ basic_os=vxworks -+ ;; -+ wasm32 | wasm32_simd128) -+ basic_machine=wasm32-unknown -+ ;; -+ xbox) -+ basic_machine=i686-pc -+ basic_os=mingw32 -+ ;; -+ ymp) -+ basic_machine=ymp-cray -+ basic_os=unicos -+ ;; -+ *) -+ basic_machine=$1 -+ basic_os= -+ ;; -+ esac - ;; - esac - --# Decode aliases for certain CPU-COMPANY combinations. -+# Decode 1-component or ad-hoc basic machines - case $basic_machine in -- # Recognize the basic CPU types without company name. -- # Some are omitted here because they have special meanings below. -- 1750a | 580 \ -- | a29k \ -- | aarch64 | aarch64_be \ -- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ -- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ -- | am33_2.0 \ -- | arc | arceb \ -- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ -- | avr | avr32 \ -- | ba \ -- | be32 | be64 \ -- | bfin \ -- | c4x | c8051 | clipper \ -- | d10v | d30v | dlx | dsp16xx \ -- | e2k | epiphany \ -- | fido | fr30 | frv | ft32 \ -- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -- | hexagon \ -- | i370 | i860 | i960 | ia16 | ia64 \ -- | ip2k | iq2000 \ -- | k1om \ -- | le32 | le64 \ -- | lm32 \ -- | m32c | m32r | m32rle | m68000 | m68k | m88k \ -- | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ -- | mips | mipsbe | mipseb | mipsel | mipsle \ -- | mips16 \ -- | mips64 | mips64el \ -- | mips64octeon | mips64octeonel \ -- | mips64orion | mips64orionel \ -- | mips64r5900 | mips64r5900el \ -- | mips64vr | mips64vrel \ -- | mips64vr4100 | mips64vr4100el \ -- | mips64vr4300 | mips64vr4300el \ -- | mips64vr5000 | mips64vr5000el \ -- | mips64vr5900 | mips64vr5900el \ -- | mipsisa32 | mipsisa32el \ -- | mipsisa32r2 | mipsisa32r2el \ -- | mipsisa32r6 | mipsisa32r6el \ -- | mipsisa64 | mipsisa64el \ -- | mipsisa64r2 | mipsisa64r2el \ -- | mipsisa64r6 | mipsisa64r6el \ -- | mipsisa64sb1 | mipsisa64sb1el \ -- | mipsisa64sr71k | mipsisa64sr71kel \ -- | mipsr5900 | mipsr5900el \ -- | mipstx39 | mipstx39el \ -- | mn10200 | mn10300 \ -- | moxie \ -- | mt \ -- | msp430 \ -- | nds32 | nds32le | nds32be \ -- | nios | nios2 | nios2eb | nios2el \ -- | ns16k | ns32k \ -- | open8 | or1k | or1knd | or32 \ -- | pdp10 | pj | pjl \ -- | powerpc | powerpc64 | powerpc64le | powerpcle \ -- | pru \ -- | pyramid \ -- | riscv32 | riscv64 \ -- | rl78 | rx \ -- | score \ -- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ -- | sh64 | sh64le \ -- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ -- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -- | spu \ -- | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ -- | ubicom32 \ -- | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ -- | visium \ -- | wasm32 \ -- | x86 | xc16x | xstormy16 | xtensa \ -- | z8k | z80) -- basic_machine=$basic_machine-unknown -- ;; -- c54x) -- basic_machine=tic54x-unknown -- ;; -- c55x) -- basic_machine=tic55x-unknown -- ;; -- c6x) -- basic_machine=tic6x-unknown -- ;; -- leon|leon[3-9]) -- basic_machine=sparc-$basic_machine -- ;; -- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) -- basic_machine=$basic_machine-unknown -- os=-none -+ # Here we handle the default manufacturer of certain CPU types. It is in -+ # some cases the only manufacturer, in others, it is the most popular. -+ w89k) -+ cpu=hppa1.1 -+ vendor=winbond - ;; -- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) -+ op50n) -+ cpu=hppa1.1 -+ vendor=oki - ;; -- ms1) -- basic_machine=mt-unknown -+ op60c) -+ cpu=hppa1.1 -+ vendor=oki - ;; -- -- strongarm | thumb | xscale) -- basic_machine=arm-unknown -+ ibm*) -+ cpu=i370 -+ vendor=ibm - ;; -- xgate) -- basic_machine=$basic_machine-unknown -- os=-none -+ orion105) -+ cpu=clipper -+ vendor=highlevel - ;; -- xscaleeb) -- basic_machine=armeb-unknown -+ mac | mpw | mac-mpw) -+ cpu=m68k -+ vendor=apple - ;; -- -- xscaleel) -- basic_machine=armel-unknown -+ pmac | pmac-mpw) -+ cpu=powerpc -+ vendor=apple - ;; - -- # We use `pc' rather than `unknown' -- # because (1) that's what they normally are, and -- # (2) the word "unknown" tends to confuse beginning users. -- i*86 | x86_64) -- basic_machine=$basic_machine-pc -- ;; -- # Object if more than one company name word. -- *-*-*) -- echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 -- exit 1 -- ;; -- # Recognize the basic CPU types with company name. -- 580-* \ -- | a29k-* \ -- | aarch64-* | aarch64_be-* \ -- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ -- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ -- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ -- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -- | avr-* | avr32-* \ -- | ba-* \ -- | be32-* | be64-* \ -- | bfin-* | bs2000-* \ -- | c[123]* | c30-* | [cjt]90-* | c4x-* \ -- | c8051-* | clipper-* | craynv-* | cydra-* \ -- | d10v-* | d30v-* | dlx-* \ -- | e2k-* | elxsi-* \ -- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ -- | h8300-* | h8500-* \ -- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ -- | hexagon-* \ -- | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ -- | ip2k-* | iq2000-* \ -- | k1om-* \ -- | le32-* | le64-* \ -- | lm32-* \ -- | m32c-* | m32r-* | m32rle-* \ -- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ -- | microblaze-* | microblazeel-* \ -- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ -- | mips16-* \ -- | mips64-* | mips64el-* \ -- | mips64octeon-* | mips64octeonel-* \ -- | mips64orion-* | mips64orionel-* \ -- | mips64r5900-* | mips64r5900el-* \ -- | mips64vr-* | mips64vrel-* \ -- | mips64vr4100-* | mips64vr4100el-* \ -- | mips64vr4300-* | mips64vr4300el-* \ -- | mips64vr5000-* | mips64vr5000el-* \ -- | mips64vr5900-* | mips64vr5900el-* \ -- | mipsisa32-* | mipsisa32el-* \ -- | mipsisa32r2-* | mipsisa32r2el-* \ -- | mipsisa32r6-* | mipsisa32r6el-* \ -- | mipsisa64-* | mipsisa64el-* \ -- | mipsisa64r2-* | mipsisa64r2el-* \ -- | mipsisa64r6-* | mipsisa64r6el-* \ -- | mipsisa64sb1-* | mipsisa64sb1el-* \ -- | mipsisa64sr71k-* | mipsisa64sr71kel-* \ -- | mipsr5900-* | mipsr5900el-* \ -- | mipstx39-* | mipstx39el-* \ -- | mmix-* \ -- | mt-* \ -- | msp430-* \ -- | nds32-* | nds32le-* | nds32be-* \ -- | nios-* | nios2-* | nios2eb-* | nios2el-* \ -- | none-* | np1-* | ns16k-* | ns32k-* \ -- | open8-* \ -- | or1k*-* \ -- | orion-* \ -- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ -- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ -- | pru-* \ -- | pyramid-* \ -- | riscv32-* | riscv64-* \ -- | rl78-* | romp-* | rs6000-* | rx-* \ -- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ -- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ -- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ -- | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ -- | tahoe-* \ -- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -- | tile*-* \ -- | tron-* \ -- | ubicom32-* \ -- | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ -- | vax-* \ -- | visium-* \ -- | wasm32-* \ -- | we32k-* \ -- | x86-* | x86_64-* | xc16x-* | xps100-* \ -- | xstormy16-* | xtensa*-* \ -- | ymp-* \ -- | z8k-* | z80-*) -- ;; -- # Recognize the basic CPU types without company name, with glob match. -- xtensa*) -- basic_machine=$basic_machine-unknown -- ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. -- 386bsd) -- basic_machine=i386-pc -- os=-bsd -- ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) -- basic_machine=m68000-att -+ cpu=m68000 -+ vendor=att - ;; - 3b*) -- basic_machine=we32k-att -- ;; -- a29khif) -- basic_machine=a29k-amd -- os=-udi -- ;; -- abacus) -- basic_machine=abacus-unknown -- ;; -- adobe68k) -- basic_machine=m68010-adobe -- os=-scout -- ;; -- alliant | fx80) -- basic_machine=fx80-alliant -- ;; -- altos | altos3068) -- basic_machine=m68k-altos -- ;; -- am29k) -- basic_machine=a29k-none -- os=-bsd -- ;; -- amd64) -- basic_machine=x86_64-pc -- ;; -- amd64-*) -- basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- amdahl) -- basic_machine=580-amdahl -- os=-sysv -- ;; -- amiga | amiga-*) -- basic_machine=m68k-unknown -- ;; -- amigaos | amigados) -- basic_machine=m68k-unknown -- os=-amigaos -- ;; -- amigaunix | amix) -- basic_machine=m68k-unknown -- os=-sysv4 -- ;; -- apollo68) -- basic_machine=m68k-apollo -- os=-sysv -- ;; -- apollo68bsd) -- basic_machine=m68k-apollo -- os=-bsd -- ;; -- aros) -- basic_machine=i386-pc -- os=-aros -- ;; -- asmjs) -- basic_machine=asmjs-unknown -- ;; -- aux) -- basic_machine=m68k-apple -- os=-aux -- ;; -- balance) -- basic_machine=ns32k-sequent -- os=-dynix -- ;; -- blackfin) -- basic_machine=bfin-unknown -- os=-linux -- ;; -- blackfin-*) -- basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- os=-linux -+ cpu=we32k -+ vendor=att - ;; - bluegene*) -- basic_machine=powerpc-ibm -- os=-cnk -- ;; -- c54x-*) -- basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- c55x-*) -- basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- c6x-*) -- basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- c90) -- basic_machine=c90-cray -- os=-unicos -- ;; -- cegcc) -- basic_machine=arm-unknown -- os=-cegcc -- ;; -- convex-c1) -- basic_machine=c1-convex -- os=-bsd -- ;; -- convex-c2) -- basic_machine=c2-convex -- os=-bsd -- ;; -- convex-c32) -- basic_machine=c32-convex -- os=-bsd -- ;; -- convex-c34) -- basic_machine=c34-convex -- os=-bsd -- ;; -- convex-c38) -- basic_machine=c38-convex -- os=-bsd -- ;; -- cray | j90) -- basic_machine=j90-cray -- os=-unicos -- ;; -- craynv) -- basic_machine=craynv-cray -- os=-unicosmp -- ;; -- cr16 | cr16-*) -- basic_machine=cr16-unknown -- os=-elf -- ;; -- crds | unos) -- basic_machine=m68k-crds -- ;; -- crisv32 | crisv32-* | etraxfs*) -- basic_machine=crisv32-axis -- ;; -- cris | cris-* | etrax*) -- basic_machine=cris-axis -- ;; -- crx) -- basic_machine=crx-unknown -- os=-elf -- ;; -- da30 | da30-*) -- basic_machine=m68k-da30 -- ;; -- decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) -- basic_machine=mips-dec -+ cpu=powerpc -+ vendor=ibm -+ basic_os=cnk - ;; - decsystem10* | dec10*) -- basic_machine=pdp10-dec -- os=-tops10 -+ cpu=pdp10 -+ vendor=dec -+ basic_os=tops10 - ;; - decsystem20* | dec20*) -- basic_machine=pdp10-dec -- os=-tops20 -+ cpu=pdp10 -+ vendor=dec -+ basic_os=tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) -- basic_machine=m68k-motorola -- ;; -- delta88) -- basic_machine=m88k-motorola -- os=-sysv3 -- ;; -- dicos) -- basic_machine=i686-pc -- os=-dicos -- ;; -- djgpp) -- basic_machine=i586-pc -- os=-msdosdjgpp -- ;; -- dpx20 | dpx20-*) -- basic_machine=rs6000-bull -- os=-bosx -+ cpu=m68k -+ vendor=motorola - ;; - dpx2*) -- basic_machine=m68k-bull -- os=-sysv3 -- ;; -- e500v[12]) -- basic_machine=powerpc-unknown -- os=$os"spe" -- ;; -- e500v[12]-*) -- basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- os=$os"spe" -- ;; -- ebmon29k) -- basic_machine=a29k-amd -- os=-ebmon -- ;; -- elxsi) -- basic_machine=elxsi-elxsi -- os=-bsd -+ cpu=m68k -+ vendor=bull -+ basic_os=sysv3 - ;; - encore | umax | mmax) -- basic_machine=ns32k-encore -+ cpu=ns32k -+ vendor=encore - ;; -- es1800 | OSE68k | ose68k | ose | OSE) -- basic_machine=m68k-ericsson -- os=-ose -+ elxsi) -+ cpu=elxsi -+ vendor=elxsi -+ basic_os=${basic_os:-bsd} - ;; - fx2800) -- basic_machine=i860-alliant -+ cpu=i860 -+ vendor=alliant - ;; - genix) -- basic_machine=ns32k-ns -- ;; -- gmicro) -- basic_machine=tron-gmicro -- os=-sysv -- ;; -- go32) -- basic_machine=i386-pc -- os=-go32 -+ cpu=ns32k -+ vendor=ns - ;; - h3050r* | hiux*) -- basic_machine=hppa1.1-hitachi -- os=-hiuxwe2 -- ;; -- h8300hms) -- basic_machine=h8300-hitachi -- os=-hms -- ;; -- h8300xray) -- basic_machine=h8300-hitachi -- os=-xray -- ;; -- h8500hms) -- basic_machine=h8500-hitachi -- os=-hms -- ;; -- harris) -- basic_machine=m88k-harris -- os=-sysv3 -- ;; -- hp300-*) -- basic_machine=m68k-hp -- ;; -- hp300bsd) -- basic_machine=m68k-hp -- os=-bsd -- ;; -- hp300hpux) -- basic_machine=m68k-hp -- os=-hpux -+ cpu=hppa1.1 -+ vendor=hitachi -+ basic_os=hiuxwe2 - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) -- basic_machine=hppa1.0-hp -+ cpu=hppa1.0 -+ vendor=hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) -- basic_machine=m68000-hp -+ cpu=m68000 -+ vendor=hp - ;; - hp9k3[2-9][0-9]) -- basic_machine=m68k-hp -+ cpu=m68k -+ vendor=hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) -- basic_machine=hppa1.0-hp -+ cpu=hppa1.0 -+ vendor=hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) -- basic_machine=hppa1.1-hp -+ cpu=hppa1.1 -+ vendor=hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp -- basic_machine=hppa1.1-hp -+ cpu=hppa1.1 -+ vendor=hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp -- basic_machine=hppa1.1-hp -+ cpu=hppa1.1 -+ vendor=hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) -- basic_machine=hppa1.1-hp -+ cpu=hppa1.1 -+ vendor=hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) -- basic_machine=hppa1.0-hp -- ;; -- hppaosf) -- basic_machine=hppa1.1-hp -- os=-osf -- ;; -- hppro) -- basic_machine=hppa1.1-hp -- os=-proelf -- ;; -- i370-ibm* | ibm*) -- basic_machine=i370-ibm -+ cpu=hppa1.0 -+ vendor=hp - ;; - i*86v32) -- basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` -- os=-sysv32 -+ cpu=$(echo "$1" | sed -e 's/86.*/86/') -+ vendor=pc -+ basic_os=sysv32 - ;; - i*86v4*) -- basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` -- os=-sysv4 -+ cpu=$(echo "$1" | sed -e 's/86.*/86/') -+ vendor=pc -+ basic_os=sysv4 - ;; - i*86v) -- basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` -- os=-sysv -+ cpu=$(echo "$1" | sed -e 's/86.*/86/') -+ vendor=pc -+ basic_os=sysv - ;; - i*86sol2) -- basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` -- os=-solaris2 -- ;; -- i386mach) -- basic_machine=i386-mach -- os=-mach -+ cpu=$(echo "$1" | sed -e 's/86.*/86/') -+ vendor=pc -+ basic_os=solaris2 - ;; -- vsta) -- basic_machine=i386-unknown -- os=-vsta -+ j90 | j90-cray) -+ cpu=j90 -+ vendor=cray -+ basic_os=${basic_os:-unicos} - ;; - iris | iris4d) -- basic_machine=mips-sgi -- case $os in -- -irix*) -+ cpu=mips -+ vendor=sgi -+ case $basic_os in -+ irix*) - ;; - *) -- os=-irix4 -+ basic_os=irix4 - ;; - esac - ;; -- isi68 | isi) -- basic_machine=m68k-isi -- os=-sysv -- ;; -- leon-*|leon[3-9]-*) -- basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` -- ;; -- m68knommu) -- basic_machine=m68k-unknown -- os=-linux -- ;; -- m68knommu-*) -- basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- os=-linux -- ;; -- magnum | m3230) -- basic_machine=mips-mips -- os=-sysv -- ;; -- merlin) -- basic_machine=ns32k-utek -- os=-sysv -- ;; -- microblaze*) -- basic_machine=microblaze-xilinx -- ;; -- mingw64) -- basic_machine=x86_64-pc -- os=-mingw64 -- ;; -- mingw32) -- basic_machine=i686-pc -- os=-mingw32 -- ;; -- mingw32ce) -- basic_machine=arm-unknown -- os=-mingw32ce -- ;; - miniframe) -- basic_machine=m68000-convergent -- ;; -- *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) -- basic_machine=m68k-atari -- os=-mint -- ;; -- mips3*-*) -- basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` -- ;; -- mips3*) -- basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown -- ;; -- monitor) -- basic_machine=m68k-rom68k -- os=-coff -- ;; -- morphos) -- basic_machine=powerpc-unknown -- os=-morphos -- ;; -- moxiebox) -- basic_machine=moxie-unknown -- os=-moxiebox -+ cpu=m68000 -+ vendor=convergent - ;; -- msdos) -- basic_machine=i386-pc -- os=-msdos -- ;; -- ms1-*) -- basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` -- ;; -- msys) -- basic_machine=i686-pc -- os=-msys -- ;; -- mvs) -- basic_machine=i370-ibm -- os=-mvs -- ;; -- nacl) -- basic_machine=le32-unknown -- os=-nacl -- ;; -- ncr3000) -- basic_machine=i486-ncr -- os=-sysv4 -- ;; -- netbsd386) -- basic_machine=i386-unknown -- os=-netbsd -- ;; -- netwinder) -- basic_machine=armv4l-rebel -- os=-linux -- ;; -- news | news700 | news800 | news900) -- basic_machine=m68k-sony -- os=-newsos -- ;; -- news1000) -- basic_machine=m68030-sony -- os=-newsos -+ *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) -+ cpu=m68k -+ vendor=atari -+ basic_os=mint - ;; - news-3600 | risc-news) -- basic_machine=mips-sony -- os=-newsos -- ;; -- necv70) -- basic_machine=v70-nec -- os=-sysv -+ cpu=mips -+ vendor=sony -+ basic_os=newsos - ;; - next | m*-next) -- basic_machine=m68k-next -- case $os in -- -nextstep* ) -+ cpu=m68k -+ vendor=next -+ case $basic_os in -+ openstep*) -+ ;; -+ nextstep*) - ;; -- -ns2*) -- os=-nextstep2 -+ ns2*) -+ basic_os=nextstep2 - ;; - *) -- os=-nextstep3 -+ basic_os=nextstep3 - ;; - esac - ;; -- nh3000) -- basic_machine=m68k-harris -- os=-cxux -- ;; -- nh[45]000) -- basic_machine=m88k-harris -- os=-cxux -- ;; -- nindy960) -- basic_machine=i960-intel -- os=-nindy -- ;; -- mon960) -- basic_machine=i960-intel -- os=-mon960 -- ;; -- nonstopux) -- basic_machine=mips-compaq -- os=-nonstopux -- ;; - np1) -- basic_machine=np1-gould -- ;; -- neo-tandem) -- basic_machine=neo-tandem -- ;; -- nse-tandem) -- basic_machine=nse-tandem -- ;; -- nsr-tandem) -- basic_machine=nsr-tandem -- ;; -- nsv-tandem) -- basic_machine=nsv-tandem -- ;; -- nsx-tandem) -- basic_machine=nsx-tandem -+ cpu=np1 -+ vendor=gould - ;; - op50n-* | op60c-*) -- basic_machine=hppa1.1-oki -- os=-proelf -- ;; -- openrisc | openrisc-*) -- basic_machine=or32-unknown -- ;; -- os400) -- basic_machine=powerpc-ibm -- os=-os400 -- ;; -- OSE68000 | ose68000) -- basic_machine=m68000-ericsson -- os=-ose -- ;; -- os68k) -- basic_machine=m68k-none -- os=-os68k -+ cpu=hppa1.1 -+ vendor=oki -+ basic_os=proelf - ;; - pa-hitachi) -- basic_machine=hppa1.1-hitachi -- os=-hiuxwe2 -- ;; -- paragon) -- basic_machine=i860-intel -- os=-osf -- ;; -- parisc) -- basic_machine=hppa-unknown -- os=-linux -- ;; -- parisc-*) -- basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- os=-linux -+ cpu=hppa1.1 -+ vendor=hitachi -+ basic_os=hiuxwe2 - ;; - pbd) -- basic_machine=sparc-tti -+ cpu=sparc -+ vendor=tti - ;; - pbb) -- basic_machine=m68k-tti -+ cpu=m68k -+ vendor=tti - ;; -- pc532 | pc532-*) -- basic_machine=ns32k-pc532 -- ;; -- pc98) -- basic_machine=i386-pc -- ;; -- pc98-*) -- basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- pentium | p5 | k5 | k6 | nexgen | viac3) -- basic_machine=i586-pc -- ;; -- pentiumpro | p6 | 6x86 | athlon | athlon_*) -- basic_machine=i686-pc -- ;; -- pentiumii | pentium2 | pentiumiii | pentium3) -- basic_machine=i686-pc -- ;; -- pentium4) -- basic_machine=i786-pc -- ;; -- pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) -- basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- pentiumpro-* | p6-* | 6x86-* | athlon-*) -- basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) -- basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- pentium4-*) -- basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` -+ pc532) -+ cpu=ns32k -+ vendor=pc532 - ;; - pn) -- basic_machine=pn-gould -- ;; -- power) basic_machine=power-ibm -+ cpu=pn -+ vendor=gould - ;; -- ppc | ppcbe) basic_machine=powerpc-unknown -+ power) -+ cpu=power -+ vendor=ibm - ;; -- ppc-* | ppcbe-*) -- basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- ppcle | powerpclittle) -- basic_machine=powerpcle-unknown -- ;; -- ppcle-* | powerpclittle-*) -- basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` -- ;; -- ppc64) basic_machine=powerpc64-unknown -+ ps2) -+ cpu=i386 -+ vendor=ibm - ;; -- ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` -+ rm[46]00) -+ cpu=mips -+ vendor=siemens - ;; -- ppc64le | powerpc64little) -- basic_machine=powerpc64le-unknown -+ rtpc | rtpc-*) -+ cpu=romp -+ vendor=ibm - ;; -- ppc64le-* | powerpc64little-*) -- basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` -+ sde) -+ cpu=mipsisa32 -+ vendor=sde -+ basic_os=${basic_os:-elf} - ;; -- ps2) -- basic_machine=i386-ibm -+ simso-wrs) -+ cpu=sparclite -+ vendor=wrs -+ basic_os=vxworks - ;; -- pw32) -- basic_machine=i586-unknown -- os=-pw32 -+ tower | tower-32) -+ cpu=m68k -+ vendor=ncr - ;; -- rdos | rdos64) -- basic_machine=x86_64-pc -- os=-rdos -+ vpp*|vx|vx-*) -+ cpu=f301 -+ vendor=fujitsu - ;; -- rdos32) -- basic_machine=i386-pc -- os=-rdos -+ w65) -+ cpu=w65 -+ vendor=wdc - ;; -- rom68k) -- basic_machine=m68k-rom68k -- os=-coff -+ w89k-*) -+ cpu=hppa1.1 -+ vendor=winbond -+ basic_os=proelf - ;; -- rm[46]00) -- basic_machine=mips-siemens -+ none) -+ cpu=none -+ vendor=none - ;; -- rtpc | rtpc-*) -- basic_machine=romp-ibm -+ leon|leon[3-9]) -+ cpu=sparc -+ vendor=$basic_machine - ;; -- s390 | s390-*) -- basic_machine=s390-ibm -+ leon-*|leon[3-9]-*) -+ cpu=sparc -+ vendor=$(echo "$basic_machine" | sed 's/-.*//') - ;; -- s390x | s390x-*) -- basic_machine=s390x-ibm -+ -+ *-*) -+ # shellcheck disable=SC2162 -+ IFS="-" read cpu vendor <&2 -- exit 1 -+ # Recognize the canonical CPU types that are allowed with any -+ # company name. -+ case $cpu in -+ 1750a | 580 \ -+ | a29k \ -+ | aarch64 | aarch64_be \ -+ | abacus \ -+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ -+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ -+ | alphapca5[67] | alpha64pca5[67] \ -+ | am33_2.0 \ -+ | amdgcn \ -+ | arc | arceb \ -+ | arm | arm[lb]e | arme[lb] | armv* \ -+ | avr | avr32 \ -+ | asmjs \ -+ | ba \ -+ | be32 | be64 \ -+ | bfin | bpf | bs2000 \ -+ | c[123]* | c30 | [cjt]90 | c4x \ -+ | c8051 | clipper | craynv | csky | cydra \ -+ | d10v | d30v | dlx | dsp16xx \ -+ | e2k | elxsi | epiphany \ -+ | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \ -+ | h8300 | h8500 \ -+ | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -+ | hexagon \ -+ | i370 | i*86 | i860 | i960 | ia16 | ia64 \ -+ | ip2k | iq2000 \ -+ | k1om \ -+ | le32 | le64 \ -+ | lm32 \ -+ | loongarch32 | loongarch64 | loongarchx32 \ -+ | m32c | m32r | m32rle \ -+ | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ -+ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ -+ | m88110 | m88k | maxq | mb | mcore | mep | metag \ -+ | microblaze | microblazeel \ -+ | mips | mipsbe | mipseb | mipsel | mipsle \ -+ | mips16 \ -+ | mips64 | mips64eb | mips64el \ -+ | mips64octeon | mips64octeonel \ -+ | mips64orion | mips64orionel \ -+ | mips64r5900 | mips64r5900el \ -+ | mips64vr | mips64vrel \ -+ | mips64vr4100 | mips64vr4100el \ -+ | mips64vr4300 | mips64vr4300el \ -+ | mips64vr5000 | mips64vr5000el \ -+ | mips64vr5900 | mips64vr5900el \ -+ | mipsisa32 | mipsisa32el \ -+ | mipsisa32r2 | mipsisa32r2el \ -+ | mipsisa32r6 | mipsisa32r6el \ -+ | mipsisa64 | mipsisa64el \ -+ | mipsisa64r2 | mipsisa64r2el \ -+ | mipsisa64r6 | mipsisa64r6el \ -+ | mipsisa64sb1 | mipsisa64sb1el \ -+ | mipsisa64sr71k | mipsisa64sr71kel \ -+ | mipsr5900 | mipsr5900el \ -+ | mipstx39 | mipstx39el \ -+ | mmix \ -+ | mn10200 | mn10300 \ -+ | moxie \ -+ | mt \ -+ | msp430 \ -+ | nds32 | nds32le | nds32be \ -+ | nfp \ -+ | nios | nios2 | nios2eb | nios2el \ -+ | none | np1 | ns16k | ns32k | nvptx \ -+ | open8 \ -+ | or1k* \ -+ | or32 \ -+ | orion \ -+ | picochip \ -+ | pdp10 | pdp11 | pj | pjl | pn | power \ -+ | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ -+ | pru \ -+ | pyramid \ -+ | riscv | riscv32 | riscv32be | riscv64 | riscv64be \ -+ | rl78 | romp | rs6000 | rx \ -+ | s390 | s390x \ -+ | score \ -+ | sh | shl \ -+ | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ -+ | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \ -+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \ -+ | sparclite \ -+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ -+ | spu \ -+ | tahoe \ -+ | thumbv7* \ -+ | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ -+ | tron \ -+ | ubicom32 \ -+ | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ -+ | vax \ -+ | visium \ -+ | w65 \ -+ | wasm32 | wasm32_simd128 | wasm64 \ -+ | we32k \ -+ | x86 | x86_64 | xc16x | xgate | xps100 \ -+ | xstormy16 | xtensa* \ -+ | ymp \ -+ | z8k | z80) -+ ;; -+ -+ *) -+ echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2 -+ exit 1 -+ ;; -+ esac - ;; - esac - - # Here we canonicalize certain aliases for manufacturers. --case $basic_machine in -- *-digital*) -- basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` -+case $vendor in -+ digital*) -+ vendor=dec - ;; -- *-commodore*) -- basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` -+ commodore*) -+ vendor=cbm - ;; - *) - ;; -@@ -1334,203 +1287,213 @@ esac - - # Decode manufacturer-specific aliases for certain operating systems. - --if [ x"$os" != x"" ] -+if test x$basic_os != x - then -+ -+# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just -+# set os. -+case $basic_os in -+ gnu/linux*) -+ kernel=linux -+ os=$(echo $basic_os | sed -e 's|gnu/linux|gnu|') -+ ;; -+ os2-emx) -+ kernel=os2 -+ os=$(echo $basic_os | sed -e 's|os2-emx|emx|') -+ ;; -+ nto-qnx*) -+ kernel=nto -+ os=$(echo $basic_os | sed -e 's|nto-qnx|qnx|') -+ ;; -+ *-*) -+ # shellcheck disable=SC2162 -+ IFS="-" read kernel os <&2 -- exit 1 -+ # No normalization, but not necessarily accepted, that comes below. - ;; - esac -+ - else - - # Here we handle the default operating systems that come with various machines. -@@ -1543,254 +1506,357 @@ else - # will signal an error saying that MANUFACTURER isn't an operating - # system, and we'll never get to this point. - --case $basic_machine in -+kernel= -+case $cpu-$vendor in - score-*) -- os=-elf -+ os=elf - ;; - spu-*) -- os=-elf -+ os=elf - ;; - *-acorn) -- os=-riscix1.2 -+ os=riscix1.2 - ;; - arm*-rebel) -- os=-linux -+ kernel=linux -+ os=gnu - ;; - arm*-semi) -- os=-aout -+ os=aout - ;; - c4x-* | tic4x-*) -- os=-coff -+ os=coff - ;; - c8051-*) -- os=-elf -+ os=elf -+ ;; -+ clipper-intergraph) -+ os=clix - ;; - hexagon-*) -- os=-elf -+ os=elf - ;; - tic54x-*) -- os=-coff -+ os=coff - ;; - tic55x-*) -- os=-coff -+ os=coff - ;; - tic6x-*) -- os=-coff -+ os=coff - ;; - # This must come before the *-dec entry. - pdp10-*) -- os=-tops20 -+ os=tops20 - ;; - pdp11-*) -- os=-none -+ os=none - ;; - *-dec | vax-*) -- os=-ultrix4.2 -+ os=ultrix4.2 - ;; - m68*-apollo) -- os=-domain -+ os=domain - ;; - i386-sun) -- os=-sunos4.0.2 -+ os=sunos4.0.2 - ;; - m68000-sun) -- os=-sunos3 -+ os=sunos3 - ;; - m68*-cisco) -- os=-aout -+ os=aout - ;; - mep-*) -- os=-elf -+ os=elf - ;; - mips*-cisco) -- os=-elf -+ os=elf - ;; - mips*-*) -- os=-elf -+ os=elf - ;; - or32-*) -- os=-coff -+ os=coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. -- os=-sysv3 -+ os=sysv3 - ;; - sparc-* | *-sun) -- os=-sunos4.1.1 -+ os=sunos4.1.1 - ;; - pru-*) -- os=-elf -+ os=elf - ;; - *-be) -- os=-beos -+ os=beos - ;; - *-ibm) -- os=-aix -+ os=aix - ;; - *-knuth) -- os=-mmixware -+ os=mmixware - ;; - *-wec) -- os=-proelf -+ os=proelf - ;; - *-winbond) -- os=-proelf -+ os=proelf - ;; - *-oki) -- os=-proelf -+ os=proelf - ;; - *-hp) -- os=-hpux -+ os=hpux - ;; - *-hitachi) -- os=-hiux -+ os=hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) -- os=-sysv -+ os=sysv - ;; - *-cbm) -- os=-amigaos -+ os=amigaos - ;; - *-dg) -- os=-dgux -+ os=dgux - ;; - *-dolphin) -- os=-sysv3 -+ os=sysv3 - ;; - m68k-ccur) -- os=-rtu -+ os=rtu - ;; - m88k-omron*) -- os=-luna -+ os=luna - ;; - *-next) -- os=-nextstep -+ os=nextstep - ;; - *-sequent) -- os=-ptx -+ os=ptx - ;; - *-crds) -- os=-unos -+ os=unos - ;; - *-ns) -- os=-genix -+ os=genix - ;; - i370-*) -- os=-mvs -+ os=mvs - ;; - *-gould) -- os=-sysv -+ os=sysv - ;; - *-highlevel) -- os=-bsd -+ os=bsd - ;; - *-encore) -- os=-bsd -+ os=bsd - ;; - *-sgi) -- os=-irix -+ os=irix - ;; - *-siemens) -- os=-sysv4 -+ os=sysv4 - ;; - *-masscomp) -- os=-rtu -+ os=rtu - ;; - f30[01]-fujitsu | f700-fujitsu) -- os=-uxpv -+ os=uxpv - ;; - *-rom68k) -- os=-coff -+ os=coff - ;; - *-*bug) -- os=-coff -+ os=coff - ;; - *-apple) -- os=-macos -+ os=macos - ;; - *-atari*) -- os=-mint -+ os=mint -+ ;; -+ *-wrs) -+ os=vxworks - ;; - *) -- os=-none -+ os=none - ;; - esac -+ - fi - -+# Now, validate our (potentially fixed-up) OS. -+case $os in -+ # Sometimes we do "kernel-libc", so those need to count as OSes. -+ musl* | newlib* | uclibc*) -+ ;; -+ # Likewise for "kernel-abi" -+ eabi* | gnueabi*) -+ ;; -+ # VxWorks passes extra cpu info in the 4th filed. -+ simlinux | simwindows | spe) -+ ;; -+ # Now accept the basic system types. -+ # The portable systems comes first. -+ # Each alternative MUST end in a * to match a version number. -+ gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ -+ | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ -+ | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ -+ | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ -+ | hiux* | abug | nacl* | netware* | windows* \ -+ | os9* | macos* | osx* | ios* \ -+ | mpw* | magic* | mmixware* | mon960* | lnews* \ -+ | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ -+ | aos* | aros* | cloudabi* | sortix* | twizzler* \ -+ | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ -+ | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ -+ | mirbsd* | netbsd* | dicos* | openedition* | ose* \ -+ | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \ -+ | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ -+ | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ -+ | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ -+ | udi* | lites* | ieee* | go32* | aux* | hcos* \ -+ | chorusrdb* | cegcc* | glidix* | serenity* \ -+ | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ -+ | midipix* | mingw32* | mingw64* | mint* \ -+ | uxpv* | beos* | mpeix* | udk* | moxiebox* \ -+ | interix* | uwin* | mks* | rhapsody* | darwin* \ -+ | openstep* | oskit* | conix* | pw32* | nonstopux* \ -+ | storm-chaos* | tops10* | tenex* | tops20* | its* \ -+ | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \ -+ | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \ -+ | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ -+ | skyos* | haiku* | rdos* | toppers* | drops* | es* \ -+ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ -+ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ -+ | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*) -+ ;; -+ # This one is extra strict with allowed versions -+ sco3.2v2 | sco3.2v[4-9]* | sco5v6*) -+ # Don't forget version if it is 3.2v4 or newer. -+ ;; -+ none) -+ ;; -+ *) -+ echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 -+ exit 1 -+ ;; -+esac -+ -+# As a final step for OS-related things, validate the OS-kernel combination -+# (given a valid OS), if there is a kernel. -+case $kernel-$os in -+ linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* ) -+ ;; -+ uclinux-uclibc* ) -+ ;; -+ -dietlibc* | -newlib* | -musl* | -uclibc* ) -+ # These are just libc implementations, not actual OSes, and thus -+ # require a kernel. -+ echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 -+ exit 1 -+ ;; -+ kfreebsd*-gnu* | kopensolaris*-gnu*) -+ ;; -+ vxworks-simlinux | vxworks-simwindows | vxworks-spe) -+ ;; -+ nto-qnx*) -+ ;; -+ os2-emx) -+ ;; -+ *-eabi* | *-gnueabi*) -+ ;; -+ -*) -+ # Blank kernel with real OS is always fine. -+ ;; -+ *-*) -+ echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 -+ exit 1 -+ ;; -+esac -+ - # Here we handle the case where we know the os, and the CPU type, but not the - # manufacturer. We pick the logical manufacturer. --vendor=unknown --case $basic_machine in -- *-unknown) -- case $os in -- -riscix*) -+case $vendor in -+ unknown) -+ case $cpu-$os in -+ *-riscix*) - vendor=acorn - ;; -- -sunos*) -+ *-sunos*) - vendor=sun - ;; -- -cnk*|-aix*) -+ *-cnk* | *-aix*) - vendor=ibm - ;; -- -beos*) -+ *-beos*) - vendor=be - ;; -- -hpux*) -+ *-hpux*) - vendor=hp - ;; -- -mpeix*) -+ *-mpeix*) - vendor=hp - ;; -- -hiux*) -+ *-hiux*) - vendor=hitachi - ;; -- -unos*) -+ *-unos*) - vendor=crds - ;; -- -dgux*) -+ *-dgux*) - vendor=dg - ;; -- -luna*) -+ *-luna*) - vendor=omron - ;; -- -genix*) -+ *-genix*) - vendor=ns - ;; -- -mvs* | -opened*) -+ *-clix*) -+ vendor=intergraph -+ ;; -+ *-mvs* | *-opened*) -+ vendor=ibm -+ ;; -+ *-os400*) - vendor=ibm - ;; -- -os400*) -+ s390-* | s390x-*) - vendor=ibm - ;; -- -ptx*) -+ *-ptx*) - vendor=sequent - ;; -- -tpf*) -+ *-tpf*) - vendor=ibm - ;; -- -vxsim* | -vxworks* | -windiss*) -+ *-vxsim* | *-vxworks* | *-windiss*) - vendor=wrs - ;; -- -aux*) -+ *-aux*) - vendor=apple - ;; -- -hms*) -+ *-hms*) - vendor=hitachi - ;; -- -mpw* | -macos*) -+ *-mpw* | *-macos*) - vendor=apple - ;; -- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) -+ *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) - vendor=atari - ;; -- -vos*) -+ *-vos*) - vendor=stratus - ;; - esac -- basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` - ;; - esac - --echo "$basic_machine$os" -+echo "$cpu-$vendor-${kernel:+$kernel-}$os" - exit - - # Local variables: diff --git a/scripts/build-wasm-test.sh b/scripts/build-wasm-test.sh index 75a982d..a672e82 100755 --- a/scripts/build-wasm-test.sh +++ b/scripts/build-wasm-test.sh @@ -30,7 +30,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PROJECT_ROOT="$(dirname "$SCRIPT_DIR")" BUILD_DIR="$PROJECT_ROOT/build-wasm/wxwidgets-universal" TESTS_DIR="$PROJECT_ROOT/tests" -WASM_APP_DIR="$TESTS_DIR/wasm-app" +WASM_APP_DIR="$TESTS_DIR/apps" STANDALONE_DIR="$WASM_APP_DIR/standalone" echo "=== Building wxWidgets WASM Test Applications ===" diff --git a/tests/GL_README.md b/tests/GL_README.md index b340fe5..481e00c 100644 --- a/tests/GL_README.md +++ b/tests/GL_README.md @@ -107,4 +107,4 @@ All immediate mode tests pass with the color-per-vertex pattern: - Cyan line strip - Magenta line loop -See `wasm-app/minimal_test.cpp` for working examples. +See `apps/minimal_test.cpp` for working examples. diff --git a/tests/README.md b/tests/README.md index f0e4116..a78755c 100644 --- a/tests/README.md +++ b/tests/README.md @@ -13,7 +13,7 @@ Playwright tests for verifying the wxWidgets WASM port. ../scripts/build-wasm-test.sh ``` -This builds `wasm-app/minimal_test.{html,js,wasm}` and standalone test apps. +This builds `apps/minimal_test.{html,js,wasm}` and standalone test apps. ## Running Tests @@ -47,7 +47,7 @@ tests/ ├── logs/ # Test logs (auto-generated) ├── test-results/ # Screenshots (auto-generated) ├── baseline-screenshots/ # Reference screenshots for comparison -├── wasm-app/ # Built WASM test applications +├── apps/ # Built WASM test applications │ ├── minimal_test.html # Main test app │ └── standalone/ # Individual component test apps └── playwright.config.ts # Playwright configuration @@ -79,10 +79,10 @@ Tests capture screenshots to `test-results/`. Compare against baselines: ## Viewing the App Directly -Start a local server in the wasm-app directory: +Start a local server in the apps directory: ```bash -cd wasm-app +cd apps npx serve . ``` @@ -91,7 +91,7 @@ Then open http://localhost:3000/minimal_test.html in your browser. Alternative using Python: ```bash -cd wasm-app +cd apps python3 -m http.server 8000 ``` @@ -159,7 +159,7 @@ For deeper analysis, use Emscripten's LLVM tools: LLVM_DIR="/opt/homebrew/Cellar/emscripten/4.0.20/libexec/llvm/bin" # Check if WASM has DWARF info -$LLVM_DIR/llvm-dwarfdump --debug-info wasm-app/standalone/grid/grid_test.wasm +$LLVM_DIR/llvm-dwarfdump --debug-info apps/standalone/grid/grid_test.wasm # Disassemble with function names $LLVM_DIR/llvm-objdump -d grid_test.wasm | head -200 diff --git a/tests/WHATWORKS.md b/tests/WHATWORKS.md index 66f653a..367c32a 100644 --- a/tests/WHATWORKS.md +++ b/tests/WHATWORKS.md @@ -184,7 +184,7 @@ This section maps KiCad's wxWidgets usage to our test coverage. ## Standalone Test Apps -Organized in `wasm-app/standalone/` folders: +Organized in `apps/standalone/` folders: | App | Status | Tests | KiCad Relevance | |-----|--------|-------|-----------------| @@ -395,7 +395,7 @@ The `wasmedge_test` app verifies WASM-specific behaviors: ### Build Command Always use the build script: ```bash -cd tests/wasm-app && ./build-test-apps.sh +cd tests/apps && ./build-test-apps.sh ``` --- @@ -410,7 +410,7 @@ The test suite captures screenshots during test runs for visual regression testi tests/ ├── baseline-screenshots/ # Known-good reference screenshots (146+ files) ├── test-results/ # Screenshots from latest test run -└── wasm-app/ +└── apps/ └── e2e/ # Playwright test specs ``` @@ -467,7 +467,7 @@ cp tests/test-results/dialog-*.png tests/baseline-screenshots/ ### Running Tests with Screenshots ```bash -cd tests/wasm-app +cd tests/apps npm test # Run all tests (saves screenshots to test-results/) npx playwright test --ui # Interactive mode with screenshot preview ``` diff --git a/tests/wasm-app/Makefile.wasm b/tests/apps/Makefile.wasm similarity index 99% rename from tests/wasm-app/Makefile.wasm rename to tests/apps/Makefile.wasm index a0f84bf..f3e7c41 100644 --- a/tests/wasm-app/Makefile.wasm +++ b/tests/apps/Makefile.wasm @@ -60,7 +60,7 @@ BASE_LDFLAGS = -sALLOW_MEMORY_GROWTH -sERROR_ON_UNDEFINED_SYMBOLS=0 \ # GL-specific flags EM_GL_FLAGS = -sLEGACY_GL_EMULATION -sMAX_WEBGL_VERSION=2 -GL_SHIM = ../../lib/gl_immediate_shim.js +GL_SHIM = ../../wasm/shims/gl_immediate_shim.js # LDFLAGS for GL apps (minimal_test) LDFLAGS_GL = $(DEBUG_LDFLAGS) $(BASE_LDFLAGS) $(EM_GL_FLAGS) --js-library=$(GL_SHIM) $(WX_LDFLAGS_GL) diff --git a/tests/wasm-app/kicad/pcbnew.html b/tests/apps/kicad/pcbnew.html similarity index 100% rename from tests/wasm-app/kicad/pcbnew.html rename to tests/apps/kicad/pcbnew.html diff --git a/tests/wasm-app/minimal_test.cpp b/tests/apps/minimal_test.cpp similarity index 100% rename from tests/wasm-app/minimal_test.cpp rename to tests/apps/minimal_test.cpp diff --git a/tests/wasm-app/standalone/aui/aui_test.cpp b/tests/apps/standalone/aui/aui_test.cpp similarity index 100% rename from tests/wasm-app/standalone/aui/aui_test.cpp rename to tests/apps/standalone/aui/aui_test.cpp diff --git a/tests/wasm-app/standalone/auinotebook/auinotebook_test.cpp b/tests/apps/standalone/auinotebook/auinotebook_test.cpp similarity index 100% rename from tests/wasm-app/standalone/auinotebook/auinotebook_test.cpp rename to tests/apps/standalone/auinotebook/auinotebook_test.cpp diff --git a/tests/wasm-app/standalone/bitmapbuttons/bitmapbuttons_test.cpp b/tests/apps/standalone/bitmapbuttons/bitmapbuttons_test.cpp similarity index 100% rename from tests/wasm-app/standalone/bitmapbuttons/bitmapbuttons_test.cpp rename to tests/apps/standalone/bitmapbuttons/bitmapbuttons_test.cpp diff --git a/tests/wasm-app/standalone/bitmask/bitmask_test.cpp b/tests/apps/standalone/bitmask/bitmask_test.cpp similarity index 100% rename from tests/wasm-app/standalone/bitmask/bitmask_test.cpp rename to tests/apps/standalone/bitmask/bitmask_test.cpp diff --git a/tests/wasm-app/standalone/calendar/calendar_test.cpp b/tests/apps/standalone/calendar/calendar_test.cpp similarity index 100% rename from tests/wasm-app/standalone/calendar/calendar_test.cpp rename to tests/apps/standalone/calendar/calendar_test.cpp diff --git a/tests/wasm-app/standalone/clipboard/clipboard_test.cpp b/tests/apps/standalone/clipboard/clipboard_test.cpp similarity index 100% rename from tests/wasm-app/standalone/clipboard/clipboard_test.cpp rename to tests/apps/standalone/clipboard/clipboard_test.cpp diff --git a/tests/wasm-app/standalone/collapsible/collapsible_test.cpp b/tests/apps/standalone/collapsible/collapsible_test.cpp similarity index 100% rename from tests/wasm-app/standalone/collapsible/collapsible_test.cpp rename to tests/apps/standalone/collapsible/collapsible_test.cpp diff --git a/tests/wasm-app/standalone/dataview/dataview_test.cpp b/tests/apps/standalone/dataview/dataview_test.cpp similarity index 100% rename from tests/wasm-app/standalone/dataview/dataview_test.cpp rename to tests/apps/standalone/dataview/dataview_test.cpp diff --git a/tests/wasm-app/standalone/dataviewvirtual/dataviewvirtual_test.cpp b/tests/apps/standalone/dataviewvirtual/dataviewvirtual_test.cpp similarity index 100% rename from tests/wasm-app/standalone/dataviewvirtual/dataviewvirtual_test.cpp rename to tests/apps/standalone/dataviewvirtual/dataviewvirtual_test.cpp diff --git a/tests/wasm-app/standalone/dialog/dialog_test.cpp b/tests/apps/standalone/dialog/dialog_test.cpp similarity index 100% rename from tests/wasm-app/standalone/dialog/dialog_test.cpp rename to tests/apps/standalone/dialog/dialog_test.cpp diff --git a/tests/wasm-app/standalone/dnd/dnd_test.cpp b/tests/apps/standalone/dnd/dnd_test.cpp similarity index 100% rename from tests/wasm-app/standalone/dnd/dnd_test.cpp rename to tests/apps/standalone/dnd/dnd_test.cpp diff --git a/tests/wasm-app/standalone/earlysize/earlysize_test.cpp b/tests/apps/standalone/earlysize/earlysize_test.cpp similarity index 100% rename from tests/wasm-app/standalone/earlysize/earlysize_test.cpp rename to tests/apps/standalone/earlysize/earlysize_test.cpp diff --git a/tests/wasm-app/standalone/filedialog/filedialog_test.cpp b/tests/apps/standalone/filedialog/filedialog_test.cpp similarity index 100% rename from tests/wasm-app/standalone/filedialog/filedialog_test.cpp rename to tests/apps/standalone/filedialog/filedialog_test.cpp diff --git a/tests/wasm-app/standalone/fontenum/fontenum_test.cpp b/tests/apps/standalone/fontenum/fontenum_test.cpp similarity index 100% rename from tests/wasm-app/standalone/fontenum/fontenum_test.cpp rename to tests/apps/standalone/fontenum/fontenum_test.cpp diff --git a/tests/wasm-app/standalone/grid/grid_test.cpp b/tests/apps/standalone/grid/grid_test.cpp similarity index 100% rename from tests/wasm-app/standalone/grid/grid_test.cpp rename to tests/apps/standalone/grid/grid_test.cpp diff --git a/tests/wasm-app/standalone/gridedit/gridedit_test.cpp b/tests/apps/standalone/gridedit/gridedit_test.cpp similarity index 100% rename from tests/wasm-app/standalone/gridedit/gridedit_test.cpp rename to tests/apps/standalone/gridedit/gridedit_test.cpp diff --git a/tests/wasm-app/standalone/gridrenderers/gridrenderers_test.cpp b/tests/apps/standalone/gridrenderers/gridrenderers_test.cpp similarity index 100% rename from tests/wasm-app/standalone/gridrenderers/gridrenderers_test.cpp rename to tests/apps/standalone/gridrenderers/gridrenderers_test.cpp diff --git a/tests/wasm-app/standalone/htmlwin/htmlwin_test.cpp b/tests/apps/standalone/htmlwin/htmlwin_test.cpp similarity index 100% rename from tests/wasm-app/standalone/htmlwin/htmlwin_test.cpp rename to tests/apps/standalone/htmlwin/htmlwin_test.cpp diff --git a/tests/wasm-app/standalone/infobar/infobar_test.cpp b/tests/apps/standalone/infobar/infobar_test.cpp similarity index 100% rename from tests/wasm-app/standalone/infobar/infobar_test.cpp rename to tests/apps/standalone/infobar/infobar_test.cpp diff --git a/tests/wasm-app/standalone/layout/layout_test.cpp b/tests/apps/standalone/layout/layout_test.cpp similarity index 100% rename from tests/wasm-app/standalone/layout/layout_test.cpp rename to tests/apps/standalone/layout/layout_test.cpp diff --git a/tests/wasm-app/standalone/listctrl/listctrl_test.cpp b/tests/apps/standalone/listctrl/listctrl_test.cpp similarity index 100% rename from tests/wasm-app/standalone/listctrl/listctrl_test.cpp rename to tests/apps/standalone/listctrl/listctrl_test.cpp diff --git a/tests/wasm-app/standalone/logerror/logerror_test.cpp b/tests/apps/standalone/logerror/logerror_test.cpp similarity index 100% rename from tests/wasm-app/standalone/logerror/logerror_test.cpp rename to tests/apps/standalone/logerror/logerror_test.cpp diff --git a/tests/wasm-app/standalone/maximize/maximize_test.cpp b/tests/apps/standalone/maximize/maximize_test.cpp similarity index 100% rename from tests/wasm-app/standalone/maximize/maximize_test.cpp rename to tests/apps/standalone/maximize/maximize_test.cpp diff --git a/tests/wasm-app/standalone/menu/menu_test.cpp b/tests/apps/standalone/menu/menu_test.cpp similarity index 100% rename from tests/wasm-app/standalone/menu/menu_test.cpp rename to tests/apps/standalone/menu/menu_test.cpp diff --git a/tests/wasm-app/standalone/ownerdrawn/ownerdrawn_test.cpp b/tests/apps/standalone/ownerdrawn/ownerdrawn_test.cpp similarity index 100% rename from tests/wasm-app/standalone/ownerdrawn/ownerdrawn_test.cpp rename to tests/apps/standalone/ownerdrawn/ownerdrawn_test.cpp diff --git a/tests/wasm-app/standalone/pickers/pickers_test.cpp b/tests/apps/standalone/pickers/pickers_test.cpp similarity index 100% rename from tests/wasm-app/standalone/pickers/pickers_test.cpp rename to tests/apps/standalone/pickers/pickers_test.cpp diff --git a/tests/wasm-app/standalone/popup/popup_test.cpp b/tests/apps/standalone/popup/popup_test.cpp similarity index 100% rename from tests/wasm-app/standalone/popup/popup_test.cpp rename to tests/apps/standalone/popup/popup_test.cpp diff --git a/tests/wasm-app/standalone/print/print_test.cpp b/tests/apps/standalone/print/print_test.cpp similarity index 100% rename from tests/wasm-app/standalone/print/print_test.cpp rename to tests/apps/standalone/print/print_test.cpp diff --git a/tests/wasm-app/standalone/printpreview/printpreview_test.cpp b/tests/apps/standalone/printpreview/printpreview_test.cpp similarity index 100% rename from tests/wasm-app/standalone/printpreview/printpreview_test.cpp rename to tests/apps/standalone/printpreview/printpreview_test.cpp diff --git a/tests/wasm-app/standalone/propgrid/propgrid_test.cpp b/tests/apps/standalone/propgrid/propgrid_test.cpp similarity index 100% rename from tests/wasm-app/standalone/propgrid/propgrid_test.cpp rename to tests/apps/standalone/propgrid/propgrid_test.cpp diff --git a/tests/wasm-app/standalone/regions/regions_test.cpp b/tests/apps/standalone/regions/regions_test.cpp similarity index 100% rename from tests/wasm-app/standalone/regions/regions_test.cpp rename to tests/apps/standalone/regions/regions_test.cpp diff --git a/tests/wasm-app/standalone/specialized/specialized_test.cpp b/tests/apps/standalone/specialized/specialized_test.cpp similarity index 100% rename from tests/wasm-app/standalone/specialized/specialized_test.cpp rename to tests/apps/standalone/specialized/specialized_test.cpp diff --git a/tests/wasm-app/standalone/stc/stc_test.cpp b/tests/apps/standalone/stc/stc_test.cpp similarity index 100% rename from tests/wasm-app/standalone/stc/stc_test.cpp rename to tests/apps/standalone/stc/stc_test.cpp diff --git a/tests/wasm-app/standalone/textdecor/textdecor_test.cpp b/tests/apps/standalone/textdecor/textdecor_test.cpp similarity index 100% rename from tests/wasm-app/standalone/textdecor/textdecor_test.cpp rename to tests/apps/standalone/textdecor/textdecor_test.cpp diff --git a/tests/wasm-app/standalone/threadpool/threadpool_test.cpp b/tests/apps/standalone/threadpool/threadpool_test.cpp similarity index 100% rename from tests/wasm-app/standalone/threadpool/threadpool_test.cpp rename to tests/apps/standalone/threadpool/threadpool_test.cpp diff --git a/tests/wasm-app/standalone/timer/timer_test.cpp b/tests/apps/standalone/timer/timer_test.cpp similarity index 100% rename from tests/wasm-app/standalone/timer/timer_test.cpp rename to tests/apps/standalone/timer/timer_test.cpp diff --git a/tests/wasm-app/standalone/toolbar/toolbar_test.cpp b/tests/apps/standalone/toolbar/toolbar_test.cpp similarity index 100% rename from tests/wasm-app/standalone/toolbar/toolbar_test.cpp rename to tests/apps/standalone/toolbar/toolbar_test.cpp diff --git a/tests/wasm-app/standalone/tree/tree_test.cpp b/tests/apps/standalone/tree/tree_test.cpp similarity index 100% rename from tests/wasm-app/standalone/tree/tree_test.cpp rename to tests/apps/standalone/tree/tree_test.cpp diff --git a/tests/wasm-app/standalone/validators/validators_test.cpp b/tests/apps/standalone/validators/validators_test.cpp similarity index 100% rename from tests/wasm-app/standalone/validators/validators_test.cpp rename to tests/apps/standalone/validators/validators_test.cpp diff --git a/tests/wasm-app/standalone/wasmedge/wasmedge_test.cpp b/tests/apps/standalone/wasmedge/wasmedge_test.cpp similarity index 100% rename from tests/wasm-app/standalone/wasmedge/wasmedge_test.cpp rename to tests/apps/standalone/wasmedge/wasmedge_test.cpp diff --git a/tests/wasm-app/standalone/wizard/wizard_test.cpp b/tests/apps/standalone/wizard/wizard_test.cpp similarity index 100% rename from tests/wasm-app/standalone/wizard/wizard_test.cpp rename to tests/apps/standalone/wizard/wizard_test.cpp diff --git a/tests/wasm-app/standalone/xml/xml_test.cpp b/tests/apps/standalone/xml/xml_test.cpp similarity index 100% rename from tests/wasm-app/standalone/xml/xml_test.cpp rename to tests/apps/standalone/xml/xml_test.cpp diff --git a/tests/package.json b/tests/package.json index 2fd3cdd..b0135d2 100644 --- a/tests/package.json +++ b/tests/package.json @@ -6,8 +6,8 @@ "test": "playwright test", "test:ui": "playwright test --ui", "test:headed": "playwright test --headed", - "build-wasm": "cd wasm-app && make -f Makefile.wasm", - "serve": "npx serve wasm-app -p 8080 -c ../serve.json", + "build-wasm": "cd apps && make -f Makefile.wasm", + "serve": "npx serve apps -p 8080 -c ../serve.json", "setup:kicad": "./scripts/setup-kicad-wasm.sh", "test:kicad": "playwright test kicad/", "test:kicad:headed": "playwright test kicad/ --headed" diff --git a/tests/playwright-button-finder.config.ts b/tests/playwright-button-finder.config.ts index 52a6457..e9e27cd 100644 --- a/tests/playwright-button-finder.config.ts +++ b/tests/playwright-button-finder.config.ts @@ -28,7 +28,7 @@ export default defineConfig({ ], webServer: { - command: 'npx serve wasm-app -p 8080', + command: 'npx serve apps -p 8080', port: 8080, reuseExistingServer: true, }, diff --git a/tests/playwright.config.ts b/tests/playwright.config.ts index 021032e..681e884 100644 --- a/tests/playwright.config.ts +++ b/tests/playwright.config.ts @@ -73,7 +73,7 @@ export default defineConfig({ ], webServer: { - command: `npx serve wasm-app -p ${port} -c ../serve.json`, + command: `npx serve apps -p ${port} -c ../serve.json`, port: port, reuseExistingServer: !process.env.CI, }, diff --git a/tests/scripts/setup-kicad-wasm.sh b/tests/scripts/setup-kicad-wasm.sh index 481fb04..b87ab98 100755 --- a/tests/scripts/setup-kicad-wasm.sh +++ b/tests/scripts/setup-kicad-wasm.sh @@ -8,7 +8,7 @@ set -e SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" -KICAD_TEST="$PROJECT_ROOT/tests/wasm-app/kicad" +KICAD_TEST="$PROJECT_ROOT/tests/apps/kicad" OUTPUT_DIR="$PROJECT_ROOT/output" mkdir -p "$KICAD_TEST" diff --git a/tests/wasm-app/minimal_test.html b/tests/wasm-app/minimal_test.html deleted file mode 100644 index 54cc16a..0000000 --- a/tests/wasm-app/minimal_test.html +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - -
- -
-
Loading...
-
-
-
-
-
- -
- - - - - diff --git a/wasm/patches/kicad-wasm-port.patch b/wasm/patches/kicad-wasm-port.patch deleted file mode 100644 index 9bb6abb..0000000 --- a/wasm/patches/kicad-wasm-port.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1107,7 +1107,9 @@ if( wxWidgets_FIND_STYLE STREQUAL "win32" ) - add_compile_definitions( __WXGTK__ ) - endif() - elseif( _wx_selected_config ) -- string(REGEX MATCH "(msw|qt|gtk|osx)" KICAD_WX_PORT "${_wx_selected_config}") -+ string(REGEX MATCH "(msw|qt|gtk|osx|wasm)" KICAD_WX_PORT "${_wx_selected_config}") - endif() - --if( KICAD_WX_PORT ) -+if( KICAD_WX_PORT STREQUAL "wasm" ) -+ message( STATUS "Detected wxWidgets port: wasm (WebAssembly)") -+elseif( KICAD_WX_PORT ) - message( STATUS "Detected wxWidgets port: ${KICAD_WX_PORT}") diff --git a/wasm/patches/kiplatform-wasm.patch b/wasm/patches/kiplatform-wasm.patch deleted file mode 100644 index 2d758b3..0000000 --- a/wasm/patches/kiplatform-wasm.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/libs/kiplatform/CMakeLists.txt -+++ b/libs/kiplatform/CMakeLists.txt -@@ -37,6 +37,12 @@ elseif( KICAD_WX_PORT STREQUAL gtk ) - message( STATUS "Configuring KiCad not to hide any GTK error messages" ) - string( APPEND PLATFORM_COMPILE_DEFS "-DKICAD_SHOW_GTK_MESSAGES" ) - endif() -+elseif( KICAD_WX_PORT STREQUAL wasm ) -+ # WASM port - uses stub implementations from wasm layer -+ set( PLATFORM_SRCS -+ ${PROJECT_SOURCE_DIR}/../wasm/kiplatform/ui.cpp -+ ) -+ message( STATUS "Using WASM kiplatform stub implementation" ) - endif() - - diff --git a/lib/gl_immediate_shim.js b/wasm/shims/gl_immediate_shim.js similarity index 100% rename from lib/gl_immediate_shim.js rename to wasm/shims/gl_immediate_shim.js