Version 3.4

debian: update changelog
doc: update polish translation
2026-06-12 22:24:47 +02:00 · 2021-12-18 08:57:32 +01:00 · 2021-12-18 08:41:05 +01:00 · 2021-12-17 23:28:35 +01:00 · 2021-12-17 09:19:32 +01:00 · 2021-12-16 20:41:12 +01:00
1127 changed files with 267940 additions and 114639 deletions
@@ -5,5 +5,4 @@ debian-devel           export-ignore
 debian-stable          export-ignore
 weechat.spec           export-ignore
 .mailmap               export-ignore
-tests/ubuntu/          export-ignore
 tools/build-debian.sh  export-ignore
@@ -0,0 +1 @@
+custom: https://weechat.org/donate/
@@ -0,0 +1,43 @@
+---
+name: Bug report
+about: Create a bug report (please do not report security issues here)
+labels: bug
+
+---
+
+<!-- Please do not report any security issue here, see file Contributing.adoc -->
+
+## Bug summary
+
+
+
+## Steps to reproduce
+
+1. 
+2. 
+3. 
+
+## Current behavior
+
+
+
+## Expected behavior
+
+
+
+## Suggested solutions
+
+
+
+## Additional information
+
+
+
+---
+
+<!-- MANDATORY INFO: -->
+
+- WeeChat version: 
+- OS, distribution and version: 
+- Terminal: 
+- Terminal multiplexer (screen/tmux/…/none): 
@@ -0,0 +1 @@
+blank_issues_enabled: false
@@ -0,0 +1,8 @@
+---
+name: Feature request
+about: Request a new feature / enhancement
+labels: feature
+
+---
+
+## Feature description
@@ -0,0 +1,15 @@
+---
+name: Question
+about: Ask a question (please read first FAQ and docs)
+labels: question
+
+---
+
+## Question
+
+
+
+---
+
+- WeeChat version: 
+- OS, distribution and version: 
@@ -0,0 +1,131 @@
+name: CI
+
+on:
+  - push
+  - pull_request
+
+jobs:
+
+  build_linux:
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-20.04
+        config:
+          - { name: "cmake_gcc", cc: "gcc", cxx: "g++", tool: "cmake", args: "" }
+          - { name: "cmake_gcc_ninja", cc: "gcc", cxx: "g++", tool: "cmake", args: "-G Ninja" }
+          - { name: "cmake_gcc_no_nls", cc: "gcc", cxx: "g++", tool: "cmake", args: "-DENABLE_NLS=OFF" }
+          - { name: "cmake_gcc_py2", cc: "gcc", cxx: "g++", tool: "cmake", args: "-DENABLE_PYTHON2=ON" }
+          - { name: "cmake_gcc_coverage", cc: "gcc", cxx: "g++", tool: "cmake", args: "-DENABLE_CODE_COVERAGE=ON" }
+          - { name: "cmake_clang", cc: "clang", cxx: "clang++", tool: "cmake", args: "" }
+          - { name: "autotools_gcc", cc: "gcc", cxx: "g++", tool: "autotools", args: "" }
+          - { name: "autotools_clang", cc: "clang", cxx: "clang++", tool: "autotools", args: "" }
+
+    name: ${{ matrix.config.name }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    steps:
+
+    - uses: actions/checkout@v2
+
+    - name: Install dependencies
+      run: |
+        sudo apt-add-repository --yes ppa:ondrej/php
+        sudo apt-get update -qq
+        sudo apt-get --yes purge php8.1-dev
+        sudo apt-get --yes --no-install-recommends install devscripts equivs python3-pip libenchant-dev autopoint cmake ninja-build lcov pkg-config libncursesw5-dev gem2deb libperl-dev python2-dev python3-dev libaspell-dev liblua5.3-dev tcl8.6-dev guile-2.0-dev libv8-dev libcurl4-gnutls-dev libgcrypt20-dev libgnutls28-dev zlib1g-dev curl libcpputest-dev php8.0-dev libphp8.0-embed libargon2-0-dev libsodium-dev pylint python3-bandit asciidoctor
+        sudo -H pip3 install --ignore-installed msgcheck
+
+    - name: Test patches
+      run: ./tools/build-debian.sh test-patches
+
+    - name: Check gettext files
+      run: msgcheck po/*.po
+
+    - name: Check Python scripts
+      run: |
+        pylint --additional-builtins=_ doc/docgen.py
+        pylint doc/python_stub.py
+        pylint tests/scripts/python/testapigen.py tests/scripts/python/testapi.py tests/scripts/python/unparse.py
+        bandit doc/docgen.py doc/python_stub.py
+        bandit tests/scripts/python/testapigen.py tests/scripts/python/testapi.py tests/scripts/python/unparse.py
+
+    - name: Check Python stub file
+      run: ./doc/python_stub.py | diff src/plugins/python/weechat.pyi -
+
+    - name: Build and run tests
+      env:
+        CC: ${{ matrix.config.cc }}
+        CXX: ${{ matrix.config.cxx }}
+        BUILDTOOL: ${{ matrix.config.tool }}
+        BUILDARGS: ${{ matrix.config.args }}
+      run: ./tools/build-test.sh
+
+    - name: Run WeeChat
+      env:
+        TERM: xterm-256color
+      run: |
+        weechat --help
+        weechat-curses --help
+        weechat --colors
+        weechat --license
+        weechat --version
+        weechat --temp-dir --run-command "/debug dirs;/debug libs" --run-command "/quit"
+
+    - name: Code coverage
+      if: ${{ matrix.config.name == 'cmake_gcc_coverage' }}
+      env:
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      run: |
+        cd build-tmp-*
+        lcov --directory . --capture --output-file coverage.info
+        lcov --remove coverage.info '/usr/*' --output-file coverage.info
+        lcov --list coverage.info
+        bash <(curl -s https://codecov.io/bash) -f coverage.info || echo 'Codecov error'
+
+  build_macos:
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - macos-11
+          - macos-10.15
+        config:
+          - { name: "cmake_gcc", cc: "gcc", cxx: "g++" }
+          - { name: "cmake_clang", cc: "clang", cxx: "clang++" }
+
+    name: ${{ matrix.config.name }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    steps:
+
+    - uses: actions/checkout@v2
+
+    - name: Install dependencies
+      run: |
+        brew update
+        brew install asciidoctor lua ruby
+
+    - name: Build
+      env:
+        CC: ${{ matrix.config.cc }}
+        CXX: ${{ matrix.config.cxx }}
+      run: |
+        mkdir build-tmp && cd build-tmp
+        cmake .. -DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_PHP=OFF
+        make VERBOSE=1 -j2
+        sudo make install
+
+    - name: Run WeeChat
+      env:
+        TERM: xterm-256color
+      run: |
+        weechat --help
+        weechat-curses --help
+        weechat --colors
+        weechat --license
+        weechat --version
+        weechat --temp-dir --run-command "/debug dirs;/debug libs" --run-command "/quit"
@@ -16,7 +16,8 @@

 ABOUT-NLS
 autom4te*
-build*/*
+build/*
+builddir/*
 compile
 config.guess
 config.h
@@ -11,7 +11,7 @@ Sébastien Helleu <flashcode@flashtux.org> <flashcode>
 Sébastien Helleu <flashcode@flashtux.org> <uid67137>
 Nils Görs <weechatter@arcor.de>
 Ryuunosuke Ayanokouzi <i38w7i3@yahoo.co.jp>
-Krzysztof Korościk <soltys1@gmail.com> <soltys@szluug.org>
+Krzysztof Korościk <soltys1@gmail.com> <soltys@szluug.org> <soltys@soltys.info>
 Marco Paolone <marcopaolone@gmail.com>
 <marcopaolone@gmail.com> <marco@DrB4tch.sitecomwl601>
 <mikaela.suomalainen@outlook.com> <mkaysi@outlook.com>
@@ -1,43 +1,46 @@
+dist: bionic
+sudo: required
 language: c

-compiler:
-    - gcc
-    - clang
-
-sudo: required
-dist: trusty
-
 env:
-    - BUILDTOOL="cmake" BUILDARGS=""
-    # - BUILDTOOL="cmake" BUILDARGS="-DENABLE_PYTHON3=ON"
-    - BUILDTOOL="cmake" BUILDARGS="-DENABLE_GNUTLS=OFF"
-    - BUILDTOOL="autotools" BUILDARGS=""
-    # - BUILDTOOL="autotools" BUILDARGS="--enable-python3"
-    - BUILDTOOL="autotools" BUILDARGS="--disable-gnutls"
+    - CC="gcc" CXX="g++" BUILDTOOL="cmake" BUILDARGS=""
+    - CC="gcc" CXX="g++" BUILDTOOL="cmake" BUILDARGS="-DENABLE_PYTHON2=ON"
+    # - CC="gcc" CXX="g++" BUILDTOOL="cmake" BUILDARGS="-DENABLE_CODE_COVERAGE=ON" CODECOVERAGE="1"
+    - CC="gcc" CXX="g++" BUILDTOOL="autotools" BUILDARGS=""
+    - CC="gcc" CXX="g++" BUILDTOOL="autotools" BUILDARGS="--enable-python2"
+    - CC="clang" CXX="clang++" BUILDTOOL="cmake" BUILDARGS=""
+    - CC="clang" CXX="clang++" BUILDTOOL="cmake" BUILDARGS="-DENABLE_PYTHON2=ON"
+    - CC="clang" CXX="clang++" BUILDTOOL="autotools" BUILDARGS=""
+    - CC="clang" CXX="clang++" BUILDTOOL="autotools" BUILDARGS="--enable-python2"
+
+matrix:
+    fast_finish: true

 before_script:
-    # Workaround https://github.com/travis-ci/travis-ci/issues/5326
-    - export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
    - echo 'APT::Install-Recommends "false";' | sudo tee -a /etc/apt/apt.conf
-    - sudo add-apt-repository -y ppa:ondrej/php
-    - sudo apt-get update -qq
-    - sudo apt-get -y install devscripts equivs python-pip libenchant-dev autopoint cmake pkg-config libncursesw5-dev gem2deb libperl-dev python-dev python3-dev libaspell-dev liblua5.1-0-dev tcl8.5-dev guile-2.0-dev libv8-dev libcurl4-gnutls-dev libgcrypt11-dev libgnutls-dev zlib1g-dev curl libcpputest-dev php7.0-dev libphp7.0-embed
-    - sudo gem install asciidoctor
-    - sudo pip install msgcheck pylint
+    - travis_retry sudo apt-get update -qq
+    - travis_retry sudo apt-get -y install devscripts equivs python-pip libenchant-dev autopoint cmake lcov pkg-config libncursesw5-dev gem2deb libperl-dev python-dev python3-dev libaspell-dev liblua5.3-dev tcl8.6-dev guile-2.0-dev libv8-dev libcurl4-gnutls-dev libgcrypt20-dev libgnutls28-dev zlib1g-dev curl libcpputest-dev php7.2-dev libphp7.2-embed libargon2-0-dev libsodium-dev pylint3
+    - travis_retry sudo gem install asciidoctor
+    - travis_retry sudo -H pip install --ignore-installed msgcheck
    - phpenv local system
+      # work around broken travis environment variables, see https://github.com/travis-ci/travis-ci/issues/5301
+    - unset PYTHON_CFLAGS

 script:
    - ./tools/build-test.sh
    - msgcheck po/*.po
-    - pylint --version
-    - pylint doc/docgen.py
-    - pylint tests/scripts/python/testapigen.py
-    - pylint tests/scripts/python/testapi.py
-    - pylint tests/scripts/python/unparse.py
+    - pylint3 --version
+    - pylint3 --additional-builtins=_ doc/docgen.py
+    - pylint3 tests/scripts/python/testapigen.py
+    - pylint3 tests/scripts/python/testapi.py
+    - pylint3 tests/scripts/python/unparse.py
+    - ./tools/build-debian.sh test-patches

 after_success:
    - weechat --help
    - weechat-curses --help
-
-matrix:
-    fast_finish: true
+    - weechat --colors
+    - weechat --license
+    - weechat --version
+    - weechat --temp-dir --run-command "/debug dirs;/debug libs" --run-command "/quit"
+    # - if [ "$CODECOVERAGE" = "1" ]; then bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov error"; fi
@@ -16,6 +16,7 @@
 Alphabetically:

 * Adam Saponara (adsr)
+* Adrian Bjugård
 * Ailin Nemui (Nei)
 * Aleksey V Zapparov
 * Alex Tarkovsky
@@ -26,46 +27,71 @@ Alphabetically:
 * Asakura
 * Bazerka
 * Benoit Papillault (benoit)
+* Chris Hills
+* Christian Duerr
 * Christian Heinz
 * Christopher O'Neill (deltafire)
 * coypoop
+* Danilo Spinella
 * David Flatz
 * Dmitry Kobylin
 * Dominik Honnef
+* Dominique Martinet
+* dotflac
 * Eduardo Elias
+* Eli Schwartz
 * Elizabeth Myers (Elizacat)
 * Elián Hanisch (m4v)
 * Emanuele Giaquinta
+* Emir Sarı
+* emk
+* Érico Nogueira
 * Esteban I. Ruiz Moreno (Exio)
 * Evgeny Shmarnev
 * Felix Eckhofer
 * Frank Zacharias
+* Fredrik Fornwall
 * Grant Wu
 * Gu1ll4um3r0m41n
 * Guido Berhoerster
 * Gwenn
 * Hasan Kiran (turgay)
+* Ivan Pešić
 * Ivan Sichmann Freitas
+* Jakub Jirutka
+* Jan Palus
 * Jason A. Donenfeld (zx2c4)
 * JD Horelick (jdhore)
+* jesopo
 * Jim Ramsay (lack)
 * Jiri Golembiovsky (GolemJ)
 * Joey Pabalinas (alyptik)
+* Johan Rylander
+* Joram Schrijver
+* Jos Ahrens
+* Joseph Kichline
 * Juan Francisco Cantero Hurtado
 * Julien Louis (ptitlouis)
 * Karthik K
 * Koka El Kiwi (KiwiDash)
 * Krzysztof Koroscik (soltys)
 * Kyle Fuller (kylef)
+* Kyle Sabo
 * Leonid Evdokimov
 * Lázaro A.
 * Linus Heckemann
 * Maarten de Vries
 * Mantas Mikulėnas (grawity)
 * Marco Paolone
+* Marco Sirabella
 * Mateusz Poszwa
 * Matt Robinson
+* Matthew Horan
+* Matthew Martin
+* Matti Virkkunen
 * Max Anton Teufel
+* Maxim Baz
+* Michael Siegel
 * Miroslav Koskar
 * Murilo Opsfelder Araujo
 * Neui
@@ -76,6 +102,7 @@ Alphabetically:
 * Odin
 * Ondřej Súkup
 * Patrick Steinhardt
+* Patrik Janoušek
 * Paul Komkoff
 * Pavel Shevchuk (Stalwart)
 * Peter Boström (pbos)
@@ -86,20 +113,25 @@ Alphabetically:
 * Quentin Glidic (SardemFF7)
 * Quentin Pradet
 * Quico Noizeux
+* rafasc
 * Raghavendra Prabhu
 * raspbeguy
 * Rettub
 * Rob Campbell
 * Romero B. de S. Malaquias
 * Rudolf Polzer (divVerent)
+* Ruslan Bekenev
+* Ryan Farley
 * Ryuunosuke Ayanokouzi
 * scumjr
 * Sergio Durigan Junior
 * Shane McCarron
 * Shawn Smith
+* Shun Sakai
 * Simmo Saan (sim642)
 * Simon Arlott
 * Simon Kuhnle
+* Simon Ser
 * Stefano Pigozzi
 * Stfn
 * Sven Knurr (Cthulhux)
@@ -107,15 +139,21 @@ Alphabetically:
 * Tim Harder
 * Tobias Stoeckmann
 * Tom Alsberg
+* Tom Fitzhenry
 * Tomoe Mami
 * Tor Hveem (xt)
+* Trevor Bergeron
 * Valentin Lorentz (progval)
 * Vasco Almeida
+* Victorhck
 * Voroskoi
 * Wojciech Kwolek
+* W. Trevor King
 * Yannick Palanque
+* ZethJack
+* Ørjan Malde

 == Contact

 See https://weechat.org/files/doc/devel/weechat_user.en.html#support[user's guide]
-or https://weechat.org/dev/support
+or https://weechat.org/about/support
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2007-2008 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2008-2009 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -16,10 +16,10 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

-cmake_minimum_required(VERSION 2.4)
+cmake_minimum_required(VERSION 3.0)

 project(weechat C)

@@ -27,8 +27,8 @@ project(weechat C)
 set(CMAKE_VERBOSE_MAKEFILE OFF)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 set(CMAKE_SKIP_RPATH ON)
-set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wall -Wextra -Werror-implicit-function-declaration")
-set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror-implicit-function-declaration")
+set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fsigned-char -fms-extensions -Wall -Wextra -Werror-implicit-function-declaration")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char -fms-extensions -Wall -Wextra")

 # version
 execute_process(COMMAND ${CMAKE_SOURCE_DIR}/version.sh devel-major OUTPUT_VARIABLE VERSION_MAJOR)
@@ -58,22 +58,28 @@ endif()
 set(PKG_STRING "${PROJECT_NAME} ${VERSION}")
 string(REPLACE "\";\"" "\ " PKG_STRING ${PKG_STRING})

-if(DEFINED LIBDIR)
-  set(LIBDIR ${LIBDIR}/${PROJECT_NAME})
-else()
-  set(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME})
+if(NOT DEFINED LIBDIR)
+  set(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib)
 endif()

-if(NOT DEFINED SHAREDIR)
-  set(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share)
+if(NOT DEFINED WEECHAT_LIBDIR)
+  set(WEECHAT_LIBDIR ${LIBDIR}/${PROJECT_NAME})
+endif()
+
+if(NOT DEFINED DATAROOTDIR)
+  set(DATAROOTDIR ${CMAKE_INSTALL_PREFIX}/share)
+endif()
+
+if(NOT DEFINED WEECHAT_SHAREDIR)
+  set(WEECHAT_SHAREDIR ${DATAROOTDIR}/weechat)
 endif()

 if(NOT DEFINED MANDIR)
-  set(MANDIR ${SHAREDIR}/man)
+  set(MANDIR ${DATAROOTDIR}/man)
 endif()

 if(NOT DEFINED LOCALEDIR)
-  set(LOCALEDIR ${SHAREDIR}/locale)
+  set(LOCALEDIR ${DATAROOTDIR}/locale)
 endif()

 if(DEFINED INCLUDEDIR)
@@ -82,56 +88,58 @@ else()
  set(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME})
 endif()

-option(ENABLE_NCURSES    "Enable Ncurses interface"                  ON)
-option(ENABLE_NLS        "Enable Native Language Support"            ON)
-option(ENABLE_GNUTLS     "Enable SSLv3/TLS support"                  ON)
-option(ENABLE_LARGEFILE  "Enable Large File Support"                 ON)
-option(ENABLE_ALIAS      "Enable Alias plugin"                       ON)
-option(ENABLE_ASPELL     "Enable Aspell plugin"                      ON)
-option(ENABLE_ENCHANT    "Enable Enchant lib for Aspell plugin"      OFF)
-option(ENABLE_BUFLIST    "Enable Buflist plugin"                     ON)
-option(ENABLE_CHARSET    "Enable Charset plugin"                     ON)
-option(ENABLE_EXEC       "Enable Exec plugin"                        ON)
-option(ENABLE_FIFO       "Enable FIFO plugin"                        ON)
-option(ENABLE_FSET       "Enable Fast Set plugin"                    ON)
-option(ENABLE_IRC        "Enable IRC plugin"                         ON)
-option(ENABLE_LOGGER     "Enable Logger plugin"                      ON)
-option(ENABLE_RELAY      "Enable Relay plugin"                       ON)
-option(ENABLE_SCRIPT     "Enable Script plugin (scripts manager)"    ON)
-option(ENABLE_SCRIPTS    "Enable script plugins (perl, python, ...)" ON)
-option(ENABLE_PERL       "Enable Perl scripting language"            ON)
-option(ENABLE_PYTHON     "Enable Python scripting language"          ON)
-option(ENABLE_PYTHON3    "Use Python 3.x if found (NOT recommended because many \"official\" scripts won't work)" OFF)
-option(ENABLE_RUBY       "Enable Ruby scripting language"            ON)
-option(ENABLE_LUA        "Enable Lua scripting language"             ON)
-option(ENABLE_TCL        "Enable Tcl scripting language"             ON)
-option(ENABLE_GUILE      "Enable Scheme (guile) scripting language"  ON)
-option(ENABLE_JAVASCRIPT "Enable JavaScript scripting language"      ON)
-option(ENABLE_PHP        "Enable PHP scripting language"             ON)
-option(ENABLE_TRIGGER    "Enable Trigger plugin"                     ON)
-option(ENABLE_XFER       "Enable Xfer plugin"                        ON)
-option(ENABLE_MAN        "Enable build of man page"                  OFF)
-option(ENABLE_DOC        "Enable build of documentation"             OFF)
-option(ENABLE_TESTS      "Enable tests"                              OFF)
+option(ENABLE_NCURSES       "Compile the Ncurses interface"               ON)
+option(ENABLE_HEADLESS      "Compile the headless binary (required for tests)" ON)
+option(ENABLE_NLS           "Enable Native Language Support"              ON)
+option(ENABLE_LARGEFILE     "Enable Large File Support"                   ON)
+option(ENABLE_ALIAS         "Enable Alias plugin"                         ON)
+option(ENABLE_BUFLIST       "Enable Buflist plugin"                       ON)
+option(ENABLE_CHARSET       "Enable Charset plugin"                       ON)
+option(ENABLE_EXEC          "Enable Exec plugin"                          ON)
+option(ENABLE_FIFO          "Enable FIFO plugin"                          ON)
+option(ENABLE_FSET          "Enable Fast Set plugin"                      ON)
+option(ENABLE_IRC           "Enable IRC plugin"                           ON)
+option(ENABLE_LOGGER        "Enable Logger plugin"                        ON)
+option(ENABLE_RELAY         "Enable Relay plugin"                         ON)
+option(ENABLE_SCRIPT        "Enable Script plugin (script manager)"       ON)
+option(ENABLE_SCRIPTS       "Enable script plugins (perl, python, ...)"   ON)
+option(ENABLE_PERL          "Enable Perl scripting language"              ON)
+option(ENABLE_PYTHON        "Enable Python scripting language"            ON)
+option(ENABLE_PYTHON2       "Use Python 2 instead of Python 3"            OFF)
+option(ENABLE_RUBY          "Enable Ruby scripting language"              ON)
+option(ENABLE_LUA           "Enable Lua scripting language"               ON)
+option(ENABLE_TCL           "Enable Tcl scripting language"               ON)
+option(ENABLE_GUILE         "Enable Scheme (guile) scripting language"    ON)
+option(ENABLE_JAVASCRIPT    "Enable JavaScript scripting language"        OFF)
+option(ENABLE_PHP           "Enable PHP scripting language"               ON)
+option(ENABLE_SPELL         "Enable Spell checker plugin"                 ON)
+option(ENABLE_ENCHANT       "Enable Enchant lib for Spell checker plugin" OFF)
+option(ENABLE_TRIGGER       "Enable Trigger plugin"                       ON)
+option(ENABLE_TYPING        "Enable Typing plugin"                        ON)
+option(ENABLE_XFER          "Enable Xfer plugin"                          ON)
+option(ENABLE_MAN           "Enable build of man page"                    OFF)
+option(ENABLE_DOC           "Enable build of documentation"               OFF)
+option(ENABLE_TESTS         "Enable tests"                                OFF)
+option(ENABLE_CODE_COVERAGE "Enable code coverage"                        OFF)
+
+# code coverage
+add_library(coverage_config INTERFACE)
+if(ENABLE_CODE_COVERAGE)
+  target_compile_options(coverage_config INTERFACE -O0 -g --coverage)
+  target_link_libraries(coverage_config INTERFACE --coverage)
+endif()
+
+# headless mode is required for tests
+if(ENABLE_TESTS AND NOT ENABLE_HEADLESS)
+  message(FATAL_ERROR "Headless mode is required for tests.")
+endif()

 # option WEECHAT_HOME
-if(NOT DEFINED WEECHAT_HOME OR "${WEECHAT_HOME}" STREQUAL "")
-  set(WEECHAT_HOME "~/.weechat")
-endif()
 set(WEECHAT_HOME "${WEECHAT_HOME}" CACHE
-  STRING "WeeChat home directory for config, logs, scripts.. (default is \"~/.weechat\")"
+  STRING "Force a single WeeChat home directory for config, logs, scripts, etc."
  FORCE)
 mark_as_advanced(CLEAR WEECHAT_HOME)

-# option CA_FILE
-if(NOT DEFINED CA_FILE OR "${CA_FILE}" STREQUAL "")
-  set(CA_FILE "/etc/ssl/certs/ca-certificates.crt")
-endif()
-set(CA_FILE "${CA_FILE}" CACHE
-  STRING "File containing the certificate authorities (default is \"/etc/ssl/certs/ca-certificates.crt\"). This is the default value of option \"weechat.network.gnutls_ca_file\"."
-  FORCE)
-mark_as_advanced(CLEAR CA_FILE)
-
 if(COMMAND cmake_policy)
  if(POLICY CMP0003)
    cmake_policy(SET CMP0003 NEW)
@@ -151,6 +159,7 @@ check_include_files("langinfo.h" HAVE_LANGINFO_CODESET)
 check_include_files("sys/resource.h" HAVE_SYS_RESOURCE_H)

 check_function_exists(mallinfo HAVE_MALLINFO)
+check_function_exists(mallinfo2 HAVE_MALLINFO2)

 check_symbol_exists("eat_newline_glitch" "term.h" HAVE_EAT_NEWLINE_GLITCH)

@@ -164,6 +173,12 @@ if(ENABLE_NLS)
  find_package(Gettext)
  if(GETTEXT_FOUND)
    add_definitions(-DENABLE_NLS)
+    find_package(Intl)
+    if(Intl_FOUND)
+      list(APPEND EXTRA_LIBS "${Intl_LIBRARIES}")
+    endif()
+  else()
+    message(SEND_ERROR "Gettext not found")
  endif()
 endif()

@@ -173,16 +188,11 @@ add_definitions(-DHAVE_GCRYPT)
 list(APPEND EXTRA_LIBS ${GCRYPT_LDFLAGS})

 # Check for GnuTLS
-if(ENABLE_GNUTLS)
-  find_package(GnuTLS)
-  if(GNUTLS_FOUND)
-    string(REGEX REPLACE "/[^/]*$" "" GNUTLS_LIBRARY_PATH "${GNUTLS_LIBRARY}")
-    add_definitions(-DHAVE_GNUTLS)
-    include_directories(${GNUTLS_INCLUDE_PATH})
-    set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -L${GNUTLS_LIBRARY_PATH}")
-    list(APPEND EXTRA_LIBS gnutls)
-  endif()
-endif()
+find_package(GnuTLS REQUIRED)
+string(REGEX REPLACE "/[^/]*$" "" GNUTLS_LIBRARY_PATH "${GNUTLS_LIBRARY}")
+include_directories(${GNUTLS_INCLUDE_PATH})
+set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -L${GNUTLS_LIBRARY_PATH}")
+list(APPEND EXTRA_LIBS gnutls)

 # Check for zlib
 find_package(ZLIB REQUIRED)
@@ -211,6 +221,8 @@ if(DL_LIBRARY)
  list(APPEND EXTRA_LIBS dl)
 endif()

+add_subdirectory(icons)
+
 if(ENABLE_NLS)
  add_subdirectory(po)
 endif()
@@ -218,10 +230,14 @@ endif()
 add_subdirectory(src)
 add_subdirectory(doc)

-find_package(CppUTest)
-if(ENABLE_TESTS AND CPPUTEST_FOUND)
-  enable_testing()
-  add_subdirectory(tests)
+if(ENABLE_TESTS)
+  find_package(CppUTest)
+  if(CPPUTEST_FOUND)
+    enable_testing()
+    add_subdirectory(tests)
+  else()
+    message(SEND_ERROR "CppUTest not found")
+  endif()
 endif()

 configure_file(config.h.cmake config.h @ONLY)
@@ -229,28 +245,32 @@ configure_file(config.h.cmake config.h @ONLY)
 # set the git version in "config-git.h"
 add_custom_target(version_git ALL
  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/tools/git-version.sh" "${CMAKE_CURRENT_SOURCE_DIR}" "${VERSION}" "config-git.h"
-  WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+  WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+)

 configure_file(
  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-  IMMEDIATE @ONLY)
+  IMMEDIATE @ONLY
+)

 add_custom_target(uninstall
-  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+)

 add_custom_target(dist
  "${CMAKE_CURRENT_SOURCE_DIR}/tools/makedist.sh" "${VERSION}" "HEAD" "${CMAKE_CURRENT_BINARY_DIR}"
-  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+)

 # pkgconfig file
 set(PACKAGE "${PROJECT_NAME}")
 set(prefix "${CMAKE_INSTALL_PREFIX}")
 set(exec_prefix "\${prefix}")
-set(libdir "\${exec_prefix}/lib")
+string(REPLACE "${CMAKE_INSTALL_PREFIX}" "\${prefix}" libdir "${LIBDIR}")
 set(includedir "\${prefix}/include")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${LIBDIR}/../pkgconfig)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${LIBDIR}/pkgconfig)

 # cygport file (used to build Cygwin packages)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/weechat.cygport.in ${CMAKE_CURRENT_BINARY_DIR}/weechat-${VERSION}-1.cygport @ONLY)
@@ -263,11 +283,12 @@ if(CYGWIN)
    ${CMAKE_CURRENT_SOURCE_DIR}/Contributing.adoc
    ${CMAKE_CURRENT_SOURCE_DIR}/README.adoc
    ${CMAKE_CURRENT_SOURCE_DIR}/ReleaseNotes.adoc
-    DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+    DESTINATION ${DATAROOTDIR}/doc/${PROJECT_NAME}
+  )
 endif()

-# icon
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.png DESTINATION ${SHAREDIR}/icons/hicolor/32x32/apps)
+# desktop file
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.desktop DESTINATION ${DATAROOTDIR}/applications)

 # packages
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat client")
@@ -285,7 +306,8 @@ set(CPACK_PACKAGE_FILE_NAME weechat-binary-${VERSION})
 # source package
 set(CPACK_SOURCE_GENERATOR "TGZ;TBZ2")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME weechat-${VERSION})
-set(CPACK_SOURCE_IGNORE_FILES "/\\\\.git" "/build/" "/m4/"
+set(CPACK_SOURCE_IGNORE_FILES
+  "/\\\\.git" "/build/" "/m4/"
  "/autom4te\\\\.cache/" "/ABOUT-NLS$" "/config\\\\.guess$" "/config\\\\.h$"
  "/config\\\\.h.in$" "/config\\\\.log$" "/config\\\\.rpath$"
  "/config\\\\.status$" "/config\\\\.sub$" "/configure$" "/depcomp$"
@@ -1,7 +1,7 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 Also add information on how to contact you by electronic and paper mail.

@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.

  The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
@@ -65,7 +65,7 @@ instead.
 == Translations

 Pull requests on GitHub for fixes or new translations are welcome at any
-time, for https://github.com/weechat/weechat[WeeChat] and the web site
+time, for https://github.com/weechat/weechat[WeeChat] and the website
 https://github.com/weechat/weechat.org[weechat.org].

 To start a translation in a new language (not yet supported), please look at
@@ -82,7 +82,7 @@ https://github.com/weechat/weechat/milestones[milestones] on GitHub.
 Pull requests on GitHub are welcome for minor new features.

 For major new features, it's better to discuss about it in IRC
-(server: _chat.freenode.net_, channel _#weechat_).
+(server: _irc.libera.chat_, channel _#weechat_).

 Before submitting any pull request, be sure you have read the
 https://weechat.org/files/doc/devel/weechat_dev.en.html#coding_rules[coding rules]
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2005 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2006-2009 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

 # This target will update file config-git.h with output of command "git describe"
@@ -29,7 +29,7 @@ if TESTS
 tests_dir = tests
 endif

-SUBDIRS = po doc intl src $(tests_dir)
+SUBDIRS = icons po doc intl src $(tests_dir)

 EXTRA_DIST = AUTHORS.adoc \
             ChangeLog.adoc \
@@ -51,12 +51,10 @@ EXTRA_DIST = AUTHORS.adoc \
             cmake/FindIconv.cmake \
             cmake/FindLua.cmake \
             cmake/FindNcurses.cmake \
-             cmake/FindPackageHandleStandardArgs.cmake \
             cmake/FindPerl.cmake \
             cmake/FindPkgConfig.cmake \
             cmake/FindPython.cmake \
             cmake/FindRuby.cmake \
-             cmake/FindTCL.cmake \
             cmake/FindV8.cmake \
             cmake/FindZLIB.cmake \
             cmake/cmake_uninstall.cmake.in \
@@ -66,17 +64,17 @@ EXTRA_DIST = AUTHORS.adoc \
             tools/git-version.sh \
             tools/makedist.sh \
             version.sh \
-             weechat.png \
+             weechat.desktop \
             weechat.pc.in \
             weechat.cygport.in

 ACLOCAL_AMFLAGS = -I m4

-pkgconfigdir   = $(libdir)/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = weechat.pc

-icondir   = $(datadir)/icons/hicolor/32x32/apps
-icon_DATA = weechat.png
+desktopdir = $(datadir)/applications
+desktop_DATA = weechat.desktop

 clean-local:
 	$(RM) config-git.h
@@ -1,18 +1,21 @@
-= WeeChat
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: en


+pass:[<p align="center">] image:https://weechat.org/media/images/weechat_logo_large.png[align="center"] pass:[</p>]
+
 image:https://img.shields.io/badge/diaspora*-follow-blue.svg["Diaspora*", link="https://diasp.eu/u/weechat"]
-image:https://img.shields.io/badge/google%2B-follow-blue.svg["Google+", link="https://plus.google.com/+WeeChat"]
-image:https://img.shields.io/badge/devel%20blog-follow-blue.svg["Devel blog", link="https://weechat.org/blog/"]
-image:https://img.shields.io/badge/slant-recommend-28acad.svg["Slant", link="http://www.slant.co/topics/1323/~irc-clients-for-linux"]
-image:https://img.shields.io/badge/paypal-donate%20%E2%9D%A4-yellow.svg["Paypal", link="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4LSMSNLUAJWNS"]
+image:https://img.shields.io/badge/mastodon-follow-blue.svg["Mastodon", link="https://hostux.social/@weechat"]
+image:https://img.shields.io/badge/twitter-follow-blue.svg["Twitter", link="https://twitter.com/WeeChatClient"]
+image:https://img.shields.io/badge/devel%20blog-follow-blue.svg["Devel blog", link="https://blog.weechat.org/"]
+image:https://img.shields.io/badge/slant-recommend-28acad.svg["Slant", link="https://www.slant.co/topics/1323/~best-irc-clients-for-linux"]
+image:https://img.shields.io/badge/help-donate%20%E2%9D%A4-ff69b4.svg["Donate", link="https://weechat.org/donate/"]

-image:https://travis-ci.org/weechat/weechat.svg?branch=master["Build Status", link="https://travis-ci.org/weechat/weechat"]
+image:https://github.com/weechat/weechat/workflows/CI/badge.svg["CI", link="https://github.com/weechat/weechat/actions"]
+image:https://codecov.io/gh/weechat/weechat/branch/master/graph/badge.svg["Code coverage", link="https://codecov.io/gh/weechat/weechat"]

-WeeChat (Wee Enhanced Environment for Chat) is a free chat client, fast and
+*WeeChat* (Wee Enhanced Environment for Chat) is a free chat client, fast and
 light, designed for many operating systems.
 It is highly customizable and extensible with scripts.

@@ -20,98 +23,31 @@ Homepage: https://weechat.org/

 == Features

-* *Modular chat client*: WeeChat has a lightweight core and optional plugins. All plugins (including IRC) are independent and can be unloaded.
-* *Multi-platform*: WeeChat runs on GNU/Linux, *BSD, GNU/Hurd, Mac OS X and Windows (Bash/Ubuntu and Cygwin).
+* *Modular chat client*: WeeChat has a lightweight core and optional https://weechat.org/files/doc/stable/weechat_user.en.html#plugins[plugins]. All plugins (including https://weechat.org/files/doc/stable/weechat_user.en.html#irc_plugin[IRC]) are independent and can be unloaded.
+* *Multi-platform*: WeeChat runs on GNU/Linux, *BSD, GNU/Hurd, Haiku, macOS and Windows (Bash/Ubuntu and Cygwin).
 * *Multi-protocols*: WeeChat is designed to support multiple protocols by plugins, like IRC.
-* *Standards-compliant*: the IRC plugin is compliant with RFCs 1459, 2810, 2811, 2812 and 2813.
-* *Small, fast and very light*: the core is and should stay as light and fast as possible.
-* *Customizable and extensible*: there are a lot of options to customize WeeChat, and it is extensible with C plugins and scripts (Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP).
-* *Fully documented*: there is comprehensive documentation, which is translated into several languages.
+* *Standards-compliant*: the IRC plugin is compliant with RFCs https://tools.ietf.org/html/rfc1459[1459], https://tools.ietf.org/html/rfc2810[2810], https://tools.ietf.org/html/rfc2811[2811], https://tools.ietf.org/html/rfc2812[2812], and https://tools.ietf.org/html/rfc2813[2813].
+* *Small, fast, and very light*: the core is and should stay as light and fast as possible.
+* *Customizable and extensible*: there are a lot of options to customize WeeChat, and it is extensible with C plugins and https://weechat.org/scripts/[scripts] (https://weechat.org/scripts/language/perl/[Perl], https://weechat.org/scripts/language/python/[Python], https://weechat.org/scripts/language/ruby[Ruby], https://weechat.org/scripts/language/lua/[Lua], https://weechat.org/scripts/language/tcl/[Tcl], https://weechat.org/scripts/language/guile/[Scheme], https://weechat.org/scripts/language/javascript/[JavaScript] and https://weechat.org/scripts/language/php/[PHP]).
+* *Fully documented*: there is comprehensive https://weechat.org/doc/[documentation], which is https://weechat.org/files/doc/stable/weechat_dev.en.html#translations[translated] into several languages.
 * *Developed from scratch*: WeeChat was built from scratch and is not based on any other client.
-* *Free software*: WeeChat is released under GPLv3.
+* *Free software*: WeeChat is released under https://www.gnu.org/licenses/gpl-3.0.html[GPLv3].

-image::https://weechat.org/media/images/screenshots/weechat/medium/weechat_2013-04-27_phlux_shadow.png[align="center"]
+pass:[<p align="center">] image:https://weechat.org/media/images/screenshots/weechat/medium/weechat_2013-04-27_phlux_shadow.png[align="center"] pass:[</p>]

-Other screenshots are on https://weechat.org/about/screenshots/[this page].
+On WeeChat's website you can find https://weechat.org/about/screenshots/[more screenshots].

-== Install
+== Installation

-=== Dependencies
+WeeChat can be installed using your favorite package manager (recommended)
+or by compiling it yourself.

-Following packages are *required*:
-
-* CMake
-* libncurses
-* libcurl
-* zlib
-* libgcrypt
-
-Following packages are optional:
-
-* for i18n: gettext
-* for SSL: gnutls, ca-certificates
-* for spell checking: aspell
-* for scripting: python, perl, ruby, lua, tcl, guile, libv8 (javascript), php
-* for building doc and man page: asciidoctor
-* for building tests: C++ compiler, CppUTest
-
-For a complete list of dependencies and versions recommended, please look at
-https://weechat.org/files/doc/devel/weechat_user.en.html#dependencies[user's guide].
-
-=== Compile
-
-WeeChat can be built with http://cmake.org/[CMake] (recommended) or autotools.
-
-[NOTE]
-Only CMake is officially supported to build WeeChat. You should only use
-autotools if you are not able to use CMake. +
-Building with autotools requires more dependencies and is slower than with CMake.
-
-* Installation in system directories (requires _root_ privileges):
-
----
-$ mkdir build
-$ cd build
-$ cmake ..
-$ make
-$ sudo make install
----
-
-* Installation in custom directory (for example your home):
-
----
-$ mkdir build
-$ cd build
-$ cmake .. -DCMAKE_INSTALL_PREFIX=/path/to/directory
-$ make
-$ make install
----
-
-For more information or installation with autotools, please look at
-https://weechat.org/files/doc/devel/weechat_user.en.html#compile_with_autotools[user's guide].
-
-=== Run tests
-
-Following packages are *required* to compile tests:
-
-* libcpputest-dev
-* C++ compiler
-
-Tests must be enabled when compiling WeeChat:
-
----
-$ cmake .. -DENABLE_TESTS=ON
----
-
-They can be launched after compilation from the build directory:
-
----
-$ ctest -V
----
+For detailed instructions, please check the
+https://weechat.org/files/doc/stable/weechat_user.en.html#install[WeeChat user's guide].

 == Copyright

-Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>

 This file is part of WeeChat, the extensible chat client.

@@ -126,4 +62,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.

 You should have received a copy of the GNU General Public License
-along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2005 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2005-2006 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -17,15 +17,15 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

 ###
 ### common stuff
 ###

-DIR=$(cd $(dirname "$0"); pwd)
-cd $DIR
+DIR=$(cd "$(dirname "$0")" || exit 1; pwd)
+cd "$DIR" || exit 1

 AUTOGEN_LOG=autogen.log

@@ -34,16 +34,15 @@ err ()
    echo "-------"
    echo "Error :"
    echo "---8<-----------------------------------"
-    cat $AUTOGEN_LOG
+    cat "$AUTOGEN_LOG"
    echo "----------------------------------->8---"
    exit 1
 }

 run ()
 {
-    echo -n "Running \"$@\"..."
-    eval $@ >$AUTOGEN_LOG 2>&1
-    if [ $? = 0 ] ; then
+    printf "Running \"%s\"..." "$@"
+    if eval "$@" >"$AUTOGEN_LOG" 2>&1 ; then
        echo " OK"
    else
        echo " FAILED"
@@ -64,7 +63,7 @@ run "rm -f ABOUT-NLS"
 run "rm -rf intl"

 # execute autoreconf cmds
-run "autoreconf -fvi"
+run "autoreconf -vi"

 # ending
-rm -f $AUTOGEN_LOG
+rm -f "$AUTOGEN_LOG"
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

 # - Find Asciidoctor
@@ -34,7 +34,7 @@ if(ASCIIDOCTOR_EXECUTABLE)
  execute_process(
    COMMAND ${ASCIIDOCTOR_EXECUTABLE} --version
    OUTPUT_VARIABLE ASCIIDOCTOR_VERSION
-    )
+  )

  string(REGEX REPLACE "^Asciidoctor ([^ ]+) .*" "\\1" ASCIIDOCTOR_VERSION "${ASCIIDOCTOR_VERSION}")

@@ -45,5 +45,5 @@ if(ASCIIDOCTOR_EXECUTABLE)
  mark_as_advanced(
    ASCIIDOCTOR_EXECUTABLE
    ASCIIDOCTOR_VERSION
-    )
+  )
 endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

 # - Find Aspell
@@ -55,4 +55,4 @@ endif()
 mark_as_advanced(
  ASPELL_INCLUDE_PATH
  ASPELL_LIBRARY
-  )
+)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2014-2021 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

 # - Find CppUTest
@@ -27,8 +27,8 @@
 # CPPUTEST_LIBRARIES    = Link options to compile with CppUTest

 if(CPPUTEST_FOUND)
-   # Already in cache, be silent
-   set(CPPUTEST_FIND_QUIETLY TRUE)
+  # Already in cache, be silent
+  set(CPPUTEST_FIND_QUIETLY TRUE)
 endif()

 find_package(PkgConfig)
@@ -13,10 +13,8 @@


 if(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
-
  # in cache already
  set(ENCHANT_FOUND TRUE)
-
 else()
  if(NOT WIN32)
    # use pkg-config to get the directories and then use these values
@@ -27,17 +25,19 @@ else()
  endif()

  find_path(ENCHANT_INCLUDE_DIR
-            NAMES enchant++.h
-            HINTS ${PC_ENCHANT_INCLUDEDIR}
-                  ${PC_ENCHANT_INCLUDE_DIRS}
-            PATH_SUFFIXES enchant )
+    NAMES enchant++.h
+    HINTS ${PC_ENCHANT_INCLUDEDIR} ${PC_ENCHANT_INCLUDE_DIRS}
+    PATH_SUFFIXES enchant
+  )

-  find_library(ENCHANT_LIBRARIES NAMES enchant
-               HINTS ${PC_ENCHANT_LIBDIR}
-                      ${PC_ENCHANT_LIBRARY_DIRS} )
+  find_library(ENCHANT_LIBRARIES
+    NAMES enchant
+    HINTS ${PC_ENCHANT_LIBDIR}
+    ${PC_ENCHANT_LIBRARY_DIRS}
+  )

  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(ENCHANT  DEFAULT_MSG  ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES )
+  find_package_handle_standard_args(ENCHANT DEFAULT_MSG ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES)

  mark_as_advanced(ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES)

@@ -47,5 +47,4 @@ else()
  check_symbol_exists(enchant_get_version "enchant.h" HAVE_ENCHANT_GET_VERSION)
  set(CMAKE_REQUIRED_INCLUDES)
  set(CMAKE_REQUIRED_LIBRARIES)
-
 endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

 # - Find Gcrypt
@@ -34,18 +34,18 @@ set(GCRYPT_CFLAGS)

 if(LIBGCRYPT_CONFIG_EXECUTABLE)

-   exec_program(${LIBGCRYPT_CONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GCRYPT_LDFLAGS)
-   exec_program(${LIBGCRYPT_CONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GCRYPT_CFLAGS)
+  execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} --libs RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
+  execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} --cflags RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)

-   if(${GCRYPT_CFLAGS} MATCHES "\n")
-      set(GCRYPT_CFLAGS " ")
-   endif()
+  if(NOT DEFINED ${GCRYPT_CFLAGS})
+    set(GCRYPT_CFLAGS " ")
+  endif()

 endif()

 # handle the QUIETLY and REQUIRED arguments and set GCRYPT_FOUND to TRUE if
 # all listed variables are TRUE
-include(${CMAKE_HOME_DIRECTORY}/cmake/FindPackageHandleStandardArgs.cmake)
+include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(GCRYPT REQUIRED_VARS GCRYPT_LDFLAGS GCRYPT_CFLAGS)

 if(GCRYPT_FOUND)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2007 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

 # - Find Gettext
@@ -28,8 +28,8 @@
 #  GETTEXT_FOUND = is gettext usable on system?

 if(GETTEXT_FOUND)
-   # Already in cache, be silent
-   set(GETTEXT_FIND_QUIETLY TRUE)
+  # Already in cache, be silent
+  set(GETTEXT_FIND_QUIETLY TRUE)
 endif()

 include(CheckIncludeFiles)
@@ -54,7 +54,7 @@ if(HAVE_LIBINTL_H)
      PATHS
      /usr/local/lib
      /usr/lib
-      )
+    )
    if(LIBINTL_LIBRARY)
      if(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
        set(CMAKE_REQUIRED_LIBRARIES "iconv")
@@ -62,7 +62,6 @@ if(HAVE_LIBINTL_H)
      else()
        check_library_exists(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
      endif()
-
      if(LIBINTL_HAS_DGETTEXT)
        set(GETTEXT_FOUND TRUE)
      endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

 # - Find GnuTLS
@@ -30,23 +30,23 @@
 #  GNUTLS_LDFLAGS = ldflags to use to compile

 if(GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
-   # Already in cache, be silent
-   set(GNUTLS_FIND_QUIETLY TRUE)
+  # Already in cache, be silent
+  set(GNUTLS_FIND_QUIETLY TRUE)
 endif()

 find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config)

 execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=prefix gnutls
-   OUTPUT_VARIABLE GNUTLS_PREFIX
+  OUTPUT_VARIABLE GNUTLS_PREFIX
 )

 execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --cflags gnutls
-   OUTPUT_VARIABLE GNUTLS_CFLAGS
+  OUTPUT_VARIABLE GNUTLS_CFLAGS
 )
 string(REGEX REPLACE "[\r\n]" "" GNUTLS_CFLAGS "${GNUTLS_CFLAGS}")

 execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --libs gnutls
-   OUTPUT_VARIABLE GNUTLS_LDFLAGS
+  OUTPUT_VARIABLE GNUTLS_LDFLAGS
 )
 string(REGEX REPLACE "[\r\n]" "" GNUTLS_LDFLAGS "${GNUTLS_LDFLAGS}")

@@ -63,8 +63,8 @@ find_library(GNUTLS_LIBRARY
  PATHS GNUTLS_POSSIBLE_LIB_DIR
 )

-if(GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
-  set(GNUTLS_FOUND TRUE)
+if(NOT GNUTLS_INCLUDE_PATH OR NOT GNUTLS_LIBRARY)
+  message(FATAL_ERROR "GnuTLS was not found")
 endif()

 mark_as_advanced(
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2011-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2011-2021 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

 # - Find Guile
@@ -27,13 +27,13 @@
 # GUILE_LIBRARIES    = Link options to compile Guile

 if(GUILE_FOUND)
-   # Already in cache, be silent
-   set(GUILE_FIND_QUIETLY TRUE)
+  # Already in cache, be silent
+  set(GUILE_FIND_QUIETLY TRUE)
 endif()

 find_package(PkgConfig)
 if(PKG_CONFIG_FOUND)
-  pkg_search_module(GUILE guile-2.0)
+  pkg_search_module(GUILE guile-3.0 guile-2.2 guile-2.0)
  if(GUILE_FOUND)
    # check if variable "scm_install_gmp_memory_functions" exists
    set(CMAKE_REQUIRED_INCLUDES ${GUILE_INCLUDE_DIRS})
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

 # - Find Iconv
@@ -29,8 +29,8 @@
 #  ICONV_FOUND = is iconv usable on system?

 if(ICONV_FOUND)
-   # Already in cache, be silent
-   set(ICONV_FIND_QUIETLY TRUE)
+  # Already in cache, be silent
+  set(ICONV_FIND_QUIETLY TRUE)
 endif()

 include(CheckLibraryExists)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

 # - Find Lua
@@ -29,11 +29,11 @@
 #  LUA_FOUND = is liblua usable on system?

 if(LUA_FOUND)
-   # Already in cache, be silent
-   set(LUA_FIND_QUIETLY TRUE)
+  # Already in cache, be silent
+  set(LUA_FIND_QUIETLY TRUE)
 endif()

 find_package(PkgConfig)
 if(PKG_CONFIG_FOUND)
-  pkg_search_module(LUA lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua-5.0 lua5.0 lua50 lua)
+  pkg_search_module(LUA lua5.4 lua-5.4 lua54 lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua-5.0 lua5.0 lua50 lua)
 endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

 if(NCURSES_FOUND)
@@ -23,9 +23,8 @@ endif()

 find_path(NCURSES_INCLUDE_PATH
  NAMES ncurses.h curses.h
-  PATHS /usr/include/ncursesw /usr/include/ncurses /usr/include
-  /usr/local/include/ncursesw /usr/local/include/ncurses /usr/local/include
-  /usr/pkg/include/ncursesw /usr/pkg/include/ncurses /usr/pkg/include
+  PATH_SUFFIXES ncursesw ncurses
+  PATHS /usr/include /usr/local/include /usr/pkg/include
 )

 find_library(NCURSESW_LIBRARY
@@ -1,5 +1,6 @@
 #
-# Copyright (C) 2003-2017 Adam Saponara <as@php.net>
+# Copyright (C) 2017 Adam Saponara <as@php.net>
+# Copyright (C) 2017-2021 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

 if(PHP_FOUND)
@@ -23,24 +24,32 @@ endif()

 find_package(PkgConfig)
 if(PKG_CONFIG_FOUND)
-  pkg_search_module(PHP php7)
+  pkg_search_module(PHP php8 php7)
 endif()

 if(NOT PHP_FOUND)
  find_program(PHP_CONFIG_EXECUTABLE NAMES
+    php-config8.1 php-config81
+    php-config8.0 php-config80
+    php-config8
+    php-config7.4 php-config74
+    php-config7.3 php-config73
    php-config7.2 php-config72
    php-config7.1 php-config71
    php-config7.0 php-config70
-    php-config php-config7)
+    php-config7
+    php-config
+  )
  if (PHP_CONFIG_EXECUTABLE)
    execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --prefix OUTPUT_VARIABLE PHP_LIB_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
    execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --includes OUTPUT_VARIABLE PHP_INCLUDE_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE)
    execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --libs OUTPUT_VARIABLE PHP_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
    execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --version OUTPUT_VARIABLE PHP_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if(${PHP_VERSION} MATCHES "^7")
+    if(${PHP_VERSION} MATCHES "^[78]")
      find_library(PHP_LIB
-        NAMES php7.2 php7.1 php7.0 php7
-        HINTS ${PHP_LIB_PREFIX} ${PHP_LIB_PREFIX}/lib ${PHP_LIB_PREFIX}/lib64)
+        NAMES php8.1 php8.0 php8 php7.4 php7.3 php7.2 php7.1 php7.0 php7 php
+        HINTS ${PHP_LIB_PREFIX} ${PHP_LIB_PREFIX}/lib ${PHP_LIB_PREFIX}/lib64
+      )
      if(PHP_LIB)
        get_filename_component(PHP_LIB_DIR ${PHP_LIB} DIRECTORY)
        string(REPLACE "-I" "" PHP_INCLUDE_DIRS ${PHP_INCLUDE_DIRS})
@@ -53,9 +62,9 @@ if(NOT PHP_FOUND)
 endif()

 if(NOT PHP_FOUND)
-  message(WARNING "Could not find libphp7. "
+  message(WARNING "Could not find libphp. "
    "Ensure PHP >=7.0.0 development libraries are installed and compiled with `--enable-embed`. "
    "Ensure `php-config` is in `PATH`. "
-    "You may set `-DCMAKE_LIBRARY_PATH=...` to the directory containing libphp7."
+    "You may set `-DCMAKE_LIBRARY_PATH=...` to the directory containing libphp."
  )
 endif()
@@ -1,260 +0,0 @@
-# FIND_PACKAGE_HANDLE_STANDARD_ARGS(<name> ... )
-#
-# This function is intended to be used in FindXXX.cmake modules files.
-# It handles the REQUIRED, QUIET and version-related arguments to FIND_PACKAGE().
-# It also sets the <UPPERCASED_NAME>_FOUND variable.
-# The package is considered found if all variables <var1>... listed contain
-# valid results, e.g. valid filepaths.
-#
-# There are two modes of this function. The first argument in both modes is
-# the name of the Find-module where it is called (in original casing).
-#
-# The first simple mode looks like this:
-#    FIND_PACKAGE_HANDLE_STANDARD_ARGS(<name> (DEFAULT_MSG|"Custom failure message") <var1>...<varN> )
-# If the variables <var1> to <varN> are all valid, then <UPPERCASED_NAME>_FOUND
-# will be set to TRUE.
-# If DEFAULT_MSG is given as second argument, then the function will generate
-# itself useful success and error messages. You can also supply a custom error message
-# for the failure case. This is not recommended.
-#
-# The second mode is more powerful and also supports version checking:
-#    FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME [REQUIRED_VARS <var1>...<varN>]
-#                                           [VERSION_VAR   <versionvar>
-#                                           [CONFIG_MODE]
-#                                           [FAIL_MESSAGE "Custom failure message"] )
-#
-# As above, if <var1> through <varN> are all valid, <UPPERCASED_NAME>_FOUND
-# will be set to TRUE.
-# After REQUIRED_VARS the variables which are required for this package are listed.
-# Following VERSION_VAR the name of the variable can be specified which holds
-# the version of the package which has been found. If this is done, this version
-# will be checked against the (potentially) specified required version used
-# in the find_package() call. The EXACT keyword is also handled. The default
-# messages include information about the required version and the version
-# which has been actually found, both if the version is ok or not.
-# Use the option CONFIG_MODE if your FindXXX.cmake module is a wrapper for
-# a find_package(... NO_MODULE) call, in this case all the information
-# provided by the config-mode of find_package() will be evaluated
-# automatically.
-# Via FAIL_MESSAGE a custom failure message can be specified, if this is not
-# used, the default message will be displayed.
-#
-# Example for mode 1:
-#
-#    FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2  DEFAULT_MSG  LIBXML2_LIBRARY LIBXML2_INCLUDE_DIR)
-#
-# LibXml2 is considered to be found, if both LIBXML2_LIBRARY and
-# LIBXML2_INCLUDE_DIR are valid. Then also LIBXML2_FOUND is set to TRUE.
-# If it is not found and REQUIRED was used, it fails with FATAL_ERROR,
-# independent whether QUIET was used or not.
-# If it is found, success will be reported, including the content of <var1>.
-# On repeated Cmake runs, the same message won't be printed again.
-#
-# Example for mode 2:
-#
-#    FIND_PACKAGE_HANDLE_STANDARD_ARGS(BISON  REQUIRED_VARS BISON_EXECUTABLE
-#                                             VERSION_VAR BISON_VERSION)
-# In this case, BISON is considered to be found if the variable(s) listed
-# after REQUIRED_VAR are all valid, i.e. BISON_EXECUTABLE in this case.
-# Also the version of BISON will be checked by using the version contained
-# in BISON_VERSION.
-# Since no FAIL_MESSAGE is given, the default messages will be printed.
-#
-# Another example for mode 2:
-#
-#    FIND_PACKAGE(Automoc4 QUIET NO_MODULE HINTS /opt/automoc4)
-#    FIND_PACKAGE_HANDLE_STANDARD_ARGS(Automoc4  CONFIG_MODE)
-# In this case, FindAutmoc4.cmake wraps a call to FIND_PACKAGE(Automoc4 NO_MODULE)
-# and adds an additional search directory for automoc4.
-# The following FIND_PACKAGE_HANDLE_STANDARD_ARGS() call produces a proper
-# success/error message.
-
-#=============================================================================
-# Copyright 2007-2009 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-INCLUDE(FindPackageMessage)
-INCLUDE(CMakeParseArguments)
-
-# internal helper macro
-MACRO(_FPHSA_FAILURE_MESSAGE _msg)
-  IF (${_NAME}_FIND_REQUIRED)
-    MESSAGE(FATAL_ERROR "${_msg}")
-  ELSE (${_NAME}_FIND_REQUIRED)
-    IF (NOT ${_NAME}_FIND_QUIETLY)
-      MESSAGE(STATUS "${_msg}")
-    ENDIF (NOT ${_NAME}_FIND_QUIETLY)
-  ENDIF (${_NAME}_FIND_REQUIRED)
-ENDMACRO(_FPHSA_FAILURE_MESSAGE _msg)
-
-
-# internal helper macro to generate the failure message when used in CONFIG_MODE:
-MACRO(_FPHSA_HANDLE_FAILURE_CONFIG_MODE)
-  # <name>_CONFIG is set, but FOUND is false, this means that some other of the REQUIRED_VARS was not found:
-  IF(${_NAME}_CONFIG)
-    _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: missing: ${MISSING_VARS} (found ${${_NAME}_CONFIG} ${VERSION_MSG})")
-  ELSE(${_NAME}_CONFIG)
-    # If _CONSIDERED_CONFIGS is set, the config-file has been found, but no suitable version.
-    # List them all in the error message:
-    IF(${_NAME}_CONSIDERED_CONFIGS)
-      SET(configsText "")
-      LIST(LENGTH ${_NAME}_CONSIDERED_CONFIGS configsCount)
-      MATH(EXPR configsCount "${configsCount} - 1")
-      FOREACH(currentConfigIndex RANGE ${configsCount})
-        LIST(GET ${_NAME}_CONSIDERED_CONFIGS ${currentConfigIndex} filename)
-        LIST(GET ${_NAME}_CONSIDERED_VERSIONS ${currentConfigIndex} version)
-        SET(configsText "${configsText}    ${filename} (version ${version})\n")
-      ENDFOREACH(currentConfigIndex)
-      _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} ${VERSION_MSG}, checked the following files:\n${configsText}")
-
-    ELSE(${_NAME}_CONSIDERED_CONFIGS)
-      # Simple case: No Config-file was found at all:
-      _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: found neither ${_NAME}Config.cmake nor ${_NAME_LOWER}-config.cmake ${VERSION_MSG}")
-    ENDIF(${_NAME}_CONSIDERED_CONFIGS)
-  ENDIF(${_NAME}_CONFIG)
-ENDMACRO(_FPHSA_HANDLE_FAILURE_CONFIG_MODE)
-
-
-FUNCTION(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
-
-# set up the arguments for CMAKE_PARSE_ARGUMENTS and check whether we are in
-# new extended or in the "old" mode:
-  SET(options CONFIG_MODE)
-  SET(oneValueArgs FAIL_MESSAGE VERSION_VAR)
-  SET(multiValueArgs REQUIRED_VARS)
-  SET(_KEYWORDS_FOR_EXTENDED_MODE  ${options} ${oneValueArgs} ${multiValueArgs} )
-  LIST(FIND _KEYWORDS_FOR_EXTENDED_MODE "${_FIRST_ARG}" INDEX)
-
-  IF(${INDEX} EQUAL -1)
-    SET(FPHSA_FAIL_MESSAGE ${_FIRST_ARG})
-    SET(FPHSA_REQUIRED_VARS ${ARGN})
-    SET(FPHSA_VERSION_VAR)
-  ELSE(${INDEX} EQUAL -1)
-
-    CMAKE_PARSE_ARGUMENTS(FPHSA "${options}" "${oneValueArgs}" "${multiValueArgs}"  ${_FIRST_ARG} ${ARGN})
-
-    IF(FPHSA_UNPARSED_ARGUMENTS)
-      MESSAGE(FATAL_ERROR "Unknown keywords given to FIND_PACKAGE_HANDLE_STANDARD_ARGS(): \"${FPHSA_UNPARSED_ARGUMENTS}\"")
-    ENDIF(FPHSA_UNPARSED_ARGUMENTS)
-
-    IF(NOT FPHSA_FAIL_MESSAGE)
-      SET(FPHSA_FAIL_MESSAGE  "DEFAULT_MSG")
-    ENDIF(NOT FPHSA_FAIL_MESSAGE)
-  ENDIF(${INDEX} EQUAL -1)
-
-# now that we collected all arguments, process them
-
-  IF("${FPHSA_FAIL_MESSAGE}" STREQUAL "DEFAULT_MSG")
-    SET(FPHSA_FAIL_MESSAGE "Could NOT find ${_NAME}")
-  ENDIF("${FPHSA_FAIL_MESSAGE}" STREQUAL "DEFAULT_MSG")
-
-  # In config-mode, we rely on the variable <package>_CONFIG, which is set by find_package()
-  # when it successfully found the config-file, including version checking:
-  IF(FPHSA_CONFIG_MODE)
-    LIST(INSERT FPHSA_REQUIRED_VARS 0 ${_NAME}_CONFIG)
-    LIST(REMOVE_DUPLICATES FPHSA_REQUIRED_VARS)
-    SET(FPHSA_VERSION_VAR ${_NAME}_VERSION)
-  ENDIF(FPHSA_CONFIG_MODE)
-
-  IF(NOT FPHSA_REQUIRED_VARS)
-    MESSAGE(FATAL_ERROR "No REQUIRED_VARS specified for FIND_PACKAGE_HANDLE_STANDARD_ARGS()")
-  ENDIF(NOT FPHSA_REQUIRED_VARS)
-
-  LIST(GET FPHSA_REQUIRED_VARS 0 _FIRST_REQUIRED_VAR)
-
-  STRING(TOUPPER ${_NAME} _NAME_UPPER)
-  STRING(TOLOWER ${_NAME} _NAME_LOWER)
-
-  # collect all variables which were not found, so they can be printed, so the
-  # user knows better what went wrong (#6375)
-  SET(MISSING_VARS "")
-  SET(DETAILS "")
-  SET(${_NAME_UPPER}_FOUND TRUE)
-  # check if all passed variables are valid
-  FOREACH(_CURRENT_VAR ${FPHSA_REQUIRED_VARS})
-    IF(NOT ${_CURRENT_VAR})
-      SET(${_NAME_UPPER}_FOUND FALSE)
-      SET(MISSING_VARS "${MISSING_VARS} ${_CURRENT_VAR}")
-    ELSE(NOT ${_CURRENT_VAR})
-      SET(DETAILS "${DETAILS}[${${_CURRENT_VAR}}]")
-    ENDIF(NOT ${_CURRENT_VAR})
-  ENDFOREACH(_CURRENT_VAR)
-
-
-  # version handling:
-  SET(VERSION_MSG "")
-  SET(VERSION_OK TRUE)
-  SET(VERSION ${${FPHSA_VERSION_VAR}} )
-  IF (${_NAME}_FIND_VERSION)
-
-    IF(VERSION)
-
-      IF(${_NAME}_FIND_VERSION_EXACT)       # exact version required
-        IF (NOT "${${_NAME}_FIND_VERSION}" VERSION_EQUAL "${VERSION}")
-          SET(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"")
-          SET(VERSION_OK FALSE)
-        ELSE (NOT "${${_NAME}_FIND_VERSION}" VERSION_EQUAL "${VERSION}")
-          SET(VERSION_MSG "(found suitable exact version \"${VERSION}\")")
-        ENDIF (NOT "${${_NAME}_FIND_VERSION}" VERSION_EQUAL "${VERSION}")
-
-      ELSE(${_NAME}_FIND_VERSION_EXACT)     # minimum version specified:
-        IF ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}")
-          SET(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is at least \"${${_NAME}_FIND_VERSION}\"")
-          SET(VERSION_OK FALSE)
-        ELSE ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}")
-          SET(VERSION_MSG "(found suitable version \"${VERSION}\", required is \"${${_NAME}_FIND_VERSION}\")")
-        ENDIF ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}")
-      ENDIF(${_NAME}_FIND_VERSION_EXACT)
-
-    ELSE(VERSION)
-
-      # if the package was not found, but a version was given, add that to the output:
-      IF(${_NAME}_FIND_VERSION_EXACT)
-         SET(VERSION_MSG "(Required is exact version \"${${_NAME}_FIND_VERSION}\")")
-      ELSE(${_NAME}_FIND_VERSION_EXACT)
-         SET(VERSION_MSG "(Required is at least version \"${${_NAME}_FIND_VERSION}\")")
-      ENDIF(${_NAME}_FIND_VERSION_EXACT)
-
-    ENDIF(VERSION)
-  ELSE (${_NAME}_FIND_VERSION)
-    IF(VERSION)
-      SET(VERSION_MSG "(found version \"${VERSION}\")")
-    ENDIF(VERSION)
-  ENDIF (${_NAME}_FIND_VERSION)
-
-  IF(VERSION_OK)
-    SET(DETAILS "${DETAILS}[v${VERSION}(${${_NAME}_FIND_VERSION})]")
-  ELSE(VERSION_OK)
-    SET(${_NAME_UPPER}_FOUND FALSE)
-  ENDIF(VERSION_OK)
-
-
-  # print the result:
-  IF (${_NAME_UPPER}_FOUND)
-    FIND_PACKAGE_MESSAGE(${_NAME} "Found ${_NAME}: ${${_FIRST_REQUIRED_VAR}} ${VERSION_MSG}" "${DETAILS}")
-  ELSE (${_NAME_UPPER}_FOUND)
-
-    IF(FPHSA_CONFIG_MODE)
-      _FPHSA_HANDLE_FAILURE_CONFIG_MODE()
-    ELSE(FPHSA_CONFIG_MODE)
-      IF(NOT VERSION_OK)
-        _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: ${VERSION_MSG} (found ${${_FIRST_REQUIRED_VAR}})")
-      ELSE(NOT VERSION_OK)
-        _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} (missing: ${MISSING_VARS}) ${VERSION_MSG}")
-      ENDIF(NOT VERSION_OK)
-    ENDIF(FPHSA_CONFIG_MODE)
-
-  ENDIF (${_NAME_UPPER}_FOUND)
-
-  SET(${_NAME_UPPER}_FOUND ${${_NAME_UPPER}_FOUND} PARENT_SCOPE)
-
-ENDFUNCTION(FIND_PACKAGE_HANDLE_STANDARD_ARGS _FIRST_ARG)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

 # - Find Perl libraries
@@ -29,31 +29,31 @@
 #  PERL_LFLAGS = perl compiler options for linking

 if(PERL_FOUND)
-   # Already in cache, be silent
-   set(PERL_FIND_QUIETLY TRUE)
+  # Already in cache, be silent
+  set(PERL_FIND_QUIETLY TRUE)
 endif()

 find_program(PERL_EXECUTABLE
  NAMES perl perl5
  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
-  )
+)

 if(PERL_EXECUTABLE)

  execute_process(
    COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \"\$Config{archlibexp}/CORE\""
    OUTPUT_VARIABLE PERL_INTERNAL_DIR
-    )
+  )

  execute_process(
    COMMAND ${PERL_EXECUTABLE} -MExtUtils::Embed -e ccopts
    OUTPUT_VARIABLE PERL_CFLAGS
-    )
+  )

  execute_process(
    COMMAND ${PERL_EXECUTABLE} -MExtUtils::Embed -e ldopts
    OUTPUT_VARIABLE PERL_LFLAGS
-    )
+  )

  # remove the new lines from the output by replacing them with empty strings
  string(REPLACE "\n" "" PERL_INTERNAL_DIR "${PERL_INTERNAL_DIR}")
@@ -63,12 +63,12 @@ if(PERL_EXECUTABLE)
  find_path(PERL_INCLUDE_PATH
    NAMES perl.h
    PATHS ${PERL_INTERNAL_DIR}
-    )
+  )

  find_library(PERL_LIBRARY
    NAMES perl
    PATHS /usr/lib /usr/local/lib /usr/pkg/lib ${PERL_INTERNAL_DIR}
-    )
+  )

  if(PERL_LIBRARY AND PERL_INCLUDE_PATH)
    set(PERL_FOUND TRUE)
@@ -80,5 +80,5 @@ if(PERL_EXECUTABLE)
    PERL_LIBRARY
    PERL_CFLAGS
    PERL_LFLAGS
-    )
+  )
 endif()
@@ -1,117 +1,60 @@
-# - a pkg-config module for CMake
-#
-# Usage:
-#   pkg_check_modules(<PREFIX> [REQUIRED] <MODULE> [<MODULE>]*)
-#     checks for all the given modules
-#
-#   pkg_search_module(<PREFIX> [REQUIRED] <MODULE> [<MODULE>]*)
-#     checks for given modules and uses the first working one
-#
-# When the 'REQUIRED' argument was set, macros will fail with an error
-# when module(s) could not be found
-#
-# It sets the following variables:
-#   PKG_CONFIG_FOUND         ... true iff pkg-config works on the system
-#   PKG_CONFIG_EXECUTABLE    ... pathname of the pkg-config program
-#   <PREFIX>_FOUND           ... set to 1 iff module(s) exist
-#
-# For the following variables two sets of values exist; first one is the
-# common one and has the given PREFIX. The second set contains flags
-# which are given out when pkgconfig was called with the '--static'
-# option.
-#   <XPREFIX>_LIBRARIES      ... only the libraries (w/o the '-l')
-#   <XPREFIX>_LIBRARY_DIRS   ... the paths of the libraries (w/o the '-L')
-#   <XPREFIX>_LDFLAGS        ... all required linker flags
-#   <XPREFIX>_LDFLAGS_OTHER ... all other linker flags
-#   <XPREFIX>_INCLUDE_DIRS   ... the '-I' preprocessor flags (w/o the '-I')
-#   <XPREFIX>_CFLAGS         ... all required cflags
-#   <XPREFIX>_CFLAGS_OTHER  ... the other compiler flags
-#
-#   <XPREFIX> = <PREFIX>        for common case
-#   <XPREFIX> = <PREFIX>_STATIC for static linking
-#
-# There are some special variables whose prefix depends on the count
-# of given modules. When there is only one module, <PREFIX> stays
-# unchanged. When there are multiple modules, the prefix will be
-# changed to <PREFIX>_<MODNAME>:
-#   <XPREFIX>_VERSION    ... version of the module
-#   <XPREFIX>_PREFIX     ... prefix-directory of the module
-#   <XPREFIX>_INCLUDEDIR ... include-dir of the module
-#   <XPREFIX>_LIBDIR     ... lib-dir of the module
-#
-#   <XPREFIX> = <PREFIX>  when |MODULES| == 1, else
-#   <XPREFIX> = <PREFIX>_<MODNAME>
-#
-# A <MODULE> parameter can have the following formats:
-#   {MODNAME}            ... matches any version
-#   {MODNAME}>={VERSION} ... at least version <VERSION> is required
-#   {MODNAME}={VERSION}  ... exactly version <VERSION> is required
-#   {MODNAME}<={VERSION} ... modules must not be newer than <VERSION>
-#
-# Examples
-#   pkg_check_modules (GLIB2   glib-2.0)
-#
-#   pkg_check_modules (GLIB2   glib-2.0>=2.10)
-#     requires at least version 2.10 of glib2 and defines e.g.
-#       GLIB2_VERSION=2.10.3
-#
-#   pkg_check_modules (FOO     glib-2.0>=2.10 gtk+-2.0)
-#     requires both glib2 and gtk2, and defines e.g.
-#       FOO_glib-2.0_VERSION=2.10.3
-#       FOO_gtk+-2.0_VERSION=2.8.20
-#
-#   pkg_check_modules (XRENDER REQUIRED xrender)
-#     defines e.g.:
-#       XRENDER_LIBRARIES=Xrender;X11
-#       XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp
-#
-#   pkg_search_module (BAR     libxml-2.0 libxml2 libxml>=2)
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.

+#[========================================[.rst:
+FindPkgConfig
+-------------

-# Copyright (C) 2006 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
-#
-# Redistribution and use, with or without modification, are permitted
-# provided that the following conditions are met:
-#
-#    1. Redistributions must retain the above copyright notice, this
-#       list of conditions and the following disclaimer.
-#    2. The name of the author may not be used to endorse or promote
-#       products derived from this software without specific prior
-#       written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+A ``pkg-config`` module for CMake.

+Finds the ``pkg-config`` executable and adds the :command:`pkg_get_variable`,
+:command:`pkg_check_modules` and :command:`pkg_search_module` commands. The
+following variables will also be set:
+
+``PKG_CONFIG_FOUND``
+  if pkg-config executable was found
+``PKG_CONFIG_EXECUTABLE``
+  pathname of the pkg-config program
+``PKG_CONFIG_VERSION_STRING``
+  version of pkg-config (since CMake 2.8.8)
+
+#]========================================]

 ### Common stuff ####
 set(PKG_CONFIG_VERSION 1)
-set(PKG_CONFIG_FOUND   0)

+# find pkg-config, use PKG_CONFIG if set
+if((NOT PKG_CONFIG_EXECUTABLE) AND (NOT "$ENV{PKG_CONFIG}" STREQUAL ""))
+  set(PKG_CONFIG_EXECUTABLE "$ENV{PKG_CONFIG}" CACHE FILEPATH "pkg-config executable")
+endif()
 find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
 mark_as_advanced(PKG_CONFIG_EXECUTABLE)

-if(PKG_CONFIG_EXECUTABLE)
-  set(PKG_CONFIG_FOUND 1)
-endif(PKG_CONFIG_EXECUTABLE)
+if (PKG_CONFIG_EXECUTABLE)
+  execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --version
+    OUTPUT_VARIABLE PKG_CONFIG_VERSION_STRING
+    ERROR_QUIET
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+endif ()

+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(PkgConfig
+                                  REQUIRED_VARS PKG_CONFIG_EXECUTABLE
+                                  VERSION_VAR PKG_CONFIG_VERSION_STRING)
+
+# This is needed because the module name is "PkgConfig" but the name of
+# this variable has always been PKG_CONFIG_FOUND so this isn't automatically
+# handled by FPHSA.
+set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}")

 # Unsets the given variables
 macro(_pkgconfig_unset var)
  set(${var} "" CACHE INTERNAL "")
-endmacro(_pkgconfig_unset)
+endmacro()

 macro(_pkgconfig_set var value)
  set(${var} ${value} CACHE INTERNAL "")
-endmacro(_pkgconfig_set)
+endmacro()

 # Invokes pkgconfig, cleans up the result and sets variables
 macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp)
@@ -120,55 +63,311 @@ macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp)
  execute_process(
    COMMAND ${PKG_CONFIG_EXECUTABLE} ${ARGN} ${_pkglist}
    OUTPUT_VARIABLE _pkgconfig_invoke_result
-    RESULT_VARIABLE _pkgconfig_failed)
+    RESULT_VARIABLE _pkgconfig_failed
+    OUTPUT_STRIP_TRAILING_WHITESPACE)

  if (_pkgconfig_failed)
    set(_pkgconfig_${_varname} "")
    _pkgconfig_unset(${_prefix}_${_varname})
-  else(_pkgconfig_failed)
-    string(REGEX REPLACE "[\r\n]"                  " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
-    string(REGEX REPLACE " +$"                     ""  _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+  else()
+    string(REGEX REPLACE "[\r\n]"       " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")

    if (NOT ${_regexp} STREQUAL "")
      string(REGEX REPLACE "${_regexp}" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
-    endif(NOT ${_regexp} STREQUAL "")
+    endif()

    separate_arguments(_pkgconfig_invoke_result)

    #message(STATUS "  ${_varname} ... ${_pkgconfig_invoke_result}")
    set(_pkgconfig_${_varname} ${_pkgconfig_invoke_result})
    _pkgconfig_set(${_prefix}_${_varname} "${_pkgconfig_invoke_result}")
-  endif(_pkgconfig_failed)
-endmacro(_pkgconfig_invoke)
+  endif()
+endmacro()
+
+# Internal version of pkg_get_variable; expects PKG_CONFIG_PATH to already be set
+function (_pkg_get_variable result pkg variable)
+  _pkgconfig_invoke("${pkg}" "prefix" "result" "" "--variable=${variable}")
+  set("${result}"
+    "${prefix_result}"
+    PARENT_SCOPE)
+endfunction ()

 # Invokes pkgconfig two times; once without '--static' and once with
 # '--static'
 macro(_pkgconfig_invoke_dyn _pkglist _prefix _varname cleanup_regexp)
  _pkgconfig_invoke("${_pkglist}" ${_prefix}        ${_varname} "${cleanup_regexp}" ${ARGN})
  _pkgconfig_invoke("${_pkglist}" ${_prefix} STATIC_${_varname} "${cleanup_regexp}" --static  ${ARGN})
-endmacro(_pkgconfig_invoke_dyn)
+endmacro()

 # Splits given arguments into options and a package list
-macro(_pkgconfig_parse_options _result _is_req)
+macro(_pkgconfig_parse_options _result _is_req _is_silent _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global)
  set(${_is_req} 0)
+  set(${_is_silent} 0)
+  set(${_no_cmake_path} 0)
+  set(${_no_cmake_environment_path} 0)
+  set(${_imp_target} 0)
+  set(${_imp_target_global} 0)
+  if(DEFINED PKG_CONFIG_USE_CMAKE_PREFIX_PATH)
+    if(NOT PKG_CONFIG_USE_CMAKE_PREFIX_PATH)
+      set(${_no_cmake_path} 1)
+      set(${_no_cmake_environment_path} 1)
+    endif()
+  elseif(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.1)
+    set(${_no_cmake_path} 1)
+    set(${_no_cmake_environment_path} 1)
+  endif()

  foreach(_pkg ${ARGN})
    if (_pkg STREQUAL "REQUIRED")
      set(${_is_req} 1)
-    endif (_pkg STREQUAL "REQUIRED")
-  endforeach(_pkg ${ARGN})
+    endif ()
+    if (_pkg STREQUAL "QUIET")
+      set(${_is_silent} 1)
+    endif ()
+    if (_pkg STREQUAL "NO_CMAKE_PATH")
+      set(${_no_cmake_path} 1)
+    endif()
+    if (_pkg STREQUAL "NO_CMAKE_ENVIRONMENT_PATH")
+      set(${_no_cmake_environment_path} 1)
+    endif()
+    if (_pkg STREQUAL "IMPORTED_TARGET")
+      set(${_imp_target} 1)
+    endif()
+    if (_pkg STREQUAL "GLOBAL")
+      set(${_imp_target_global} 1)
+    endif()
+  endforeach()
+
+  if (${_imp_target_global} AND NOT ${_imp_target})
+    message(SEND_ERROR "the argument GLOBAL may only be used together with IMPORTED_TARGET")
+  endif()

  set(${_result} ${ARGN})
  list(REMOVE_ITEM ${_result} "REQUIRED")
-endmacro(_pkgconfig_parse_options)
+  list(REMOVE_ITEM ${_result} "QUIET")
+  list(REMOVE_ITEM ${_result} "NO_CMAKE_PATH")
+  list(REMOVE_ITEM ${_result} "NO_CMAKE_ENVIRONMENT_PATH")
+  list(REMOVE_ITEM ${_result} "IMPORTED_TARGET")
+  list(REMOVE_ITEM ${_result} "GLOBAL")
+endmacro()
+
+# Add the content of a variable or an environment variable to a list of
+# paths
+# Usage:
+#  - _pkgconfig_add_extra_path(_extra_paths VAR)
+#  - _pkgconfig_add_extra_path(_extra_paths ENV VAR)
+function(_pkgconfig_add_extra_path _extra_paths_var _var)
+  set(_is_env 0)
+  if(ARGC GREATER 2 AND _var STREQUAL "ENV")
+    set(_var ${ARGV2})
+    set(_is_env 1)
+  endif()
+  if(NOT _is_env)
+    if(NOT "${${_var}}" STREQUAL "")
+      list(APPEND ${_extra_paths_var} ${${_var}})
+    endif()
+  else()
+    if(NOT "$ENV{${_var}}" STREQUAL "")
+      file(TO_CMAKE_PATH "$ENV{${_var}}" _path)
+      list(APPEND ${_extra_paths_var} ${_path})
+      unset(_path)
+    endif()
+  endif()
+  set(${_extra_paths_var} ${${_extra_paths_var}} PARENT_SCOPE)
+endfunction()
+
+# scan the LDFLAGS returned by pkg-config for library directories and
+# libraries, figure out the absolute paths of that libraries in the
+# given directories
+function(_pkg_find_libs _prefix _no_cmake_path _no_cmake_environment_path)
+  unset(_libs)
+  unset(_find_opts)
+
+  # set the options that are used as long as the .pc file does not provide a library
+  # path to look into
+  if(_no_cmake_path)
+    list(APPEND _find_opts "NO_CMAKE_PATH")
+  endif()
+  if(_no_cmake_environment_path)
+    list(APPEND _find_opts "NO_CMAKE_ENVIRONMENT_PATH")
+  endif()
+
+  unset(_search_paths)
+  foreach (flag IN LISTS ${_prefix}_LDFLAGS)
+    if (flag MATCHES "^-L(.*)")
+      list(APPEND _search_paths ${CMAKE_MATCH_1})
+      continue()
+    endif()
+    if (flag MATCHES "^-l(.*)")
+      set(_pkg_search "${CMAKE_MATCH_1}")
+    else()
+      continue()
+    endif()
+
+    if(_search_paths)
+        # Firstly search in -L paths
+        find_library(pkgcfg_lib_${_prefix}_${_pkg_search}
+                     NAMES ${_pkg_search}
+                     HINTS ${_search_paths} NO_DEFAULT_PATH)
+    endif()
+    find_library(pkgcfg_lib_${_prefix}_${_pkg_search}
+                 NAMES ${_pkg_search}
+                 ${_find_opts})
+    mark_as_advanced(pkgcfg_lib_${_prefix}_${_pkg_search})
+    if(pkgcfg_lib_${_prefix}_${_pkg_search})
+      list(APPEND _libs "${pkgcfg_lib_${_prefix}_${_pkg_search}}")
+    else()
+      list(APPEND _libs ${_pkg_search})
+    endif()
+  endforeach()
+
+  set(${_prefix}_LINK_LIBRARIES "${_libs}" PARENT_SCOPE)
+endfunction()
+
+# create an imported target from all the information returned by pkg-config
+function(_pkg_create_imp_target _prefix _imp_target_global)
+  # only create the target if it is linkable, i.e. no executables
+  if (NOT TARGET PkgConfig::${_prefix}
+      AND ( ${_prefix}_INCLUDE_DIRS OR ${_prefix}_LINK_LIBRARIES OR ${_prefix}_LDFLAGS_OTHER OR ${_prefix}_CFLAGS_OTHER ))
+    if(${_imp_target_global})
+      set(_global_opt "GLOBAL")
+    else()
+      unset(_global_opt)
+    endif()
+    add_library(PkgConfig::${_prefix} INTERFACE IMPORTED ${_global_opt})
+
+    if(${_prefix}_INCLUDE_DIRS)
+      set_property(TARGET PkgConfig::${_prefix} PROPERTY
+                   INTERFACE_INCLUDE_DIRECTORIES "${${_prefix}_INCLUDE_DIRS}")
+    endif()
+    if(${_prefix}_LINK_LIBRARIES)
+      set_property(TARGET PkgConfig::${_prefix} PROPERTY
+                   INTERFACE_LINK_LIBRARIES "${${_prefix}_LINK_LIBRARIES}")
+    endif()
+    if(${_prefix}_LDFLAGS_OTHER)
+      set_property(TARGET PkgConfig::${_prefix} PROPERTY
+                   INTERFACE_LINK_OPTIONS "${${_prefix}_LDFLAGS_OTHER}")
+    endif()
+    if(${_prefix}_CFLAGS_OTHER)
+      set_property(TARGET PkgConfig::${_prefix} PROPERTY
+                   INTERFACE_COMPILE_OPTIONS "${${_prefix}_CFLAGS_OTHER}")
+    endif()
+  endif()
+endfunction()
+
+# recalculate the dynamic output
+# this is a macro and not a function so the result of _pkg_find_libs is automatically propagated
+macro(_pkg_recalculate _prefix _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global)
+  _pkg_find_libs(${_prefix} ${_no_cmake_path} ${_no_cmake_environment_path})
+  if(${_imp_target})
+    _pkg_create_imp_target(${_prefix} ${_imp_target_global})
+  endif()
+endmacro()

 ###
-macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
+macro(_pkg_set_path_internal)
+  set(_extra_paths)
+
+  if(NOT _no_cmake_path)
+    _pkgconfig_add_extra_path(_extra_paths CMAKE_PREFIX_PATH)
+    _pkgconfig_add_extra_path(_extra_paths CMAKE_FRAMEWORK_PATH)
+    _pkgconfig_add_extra_path(_extra_paths CMAKE_APPBUNDLE_PATH)
+  endif()
+
+  if(NOT _no_cmake_environment_path)
+    _pkgconfig_add_extra_path(_extra_paths ENV CMAKE_PREFIX_PATH)
+    _pkgconfig_add_extra_path(_extra_paths ENV CMAKE_FRAMEWORK_PATH)
+    _pkgconfig_add_extra_path(_extra_paths ENV CMAKE_APPBUNDLE_PATH)
+  endif()
+
+  if(NOT _extra_paths STREQUAL "")
+    # Save the PKG_CONFIG_PATH environment variable, and add paths
+    # from the CMAKE_PREFIX_PATH variables
+    set(_pkgconfig_path_old "$ENV{PKG_CONFIG_PATH}")
+    set(_pkgconfig_path "${_pkgconfig_path_old}")
+    if(NOT _pkgconfig_path STREQUAL "")
+      file(TO_CMAKE_PATH "${_pkgconfig_path}" _pkgconfig_path)
+    endif()
+
+    # Create a list of the possible pkgconfig subfolder (depending on
+    # the system
+    set(_lib_dirs)
+    if(NOT DEFINED CMAKE_SYSTEM_NAME
+        OR (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$"
+            AND NOT CMAKE_CROSSCOMPILING))
+      if(EXISTS "/etc/debian_version") # is this a debian system ?
+        if(CMAKE_LIBRARY_ARCHITECTURE)
+          list(APPEND _lib_dirs "lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig")
+        endif()
+      else()
+        # not debian, check the FIND_LIBRARY_USE_LIB32_PATHS and FIND_LIBRARY_USE_LIB64_PATHS properties
+        get_property(uselib32 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS)
+        if(uselib32 AND CMAKE_SIZEOF_VOID_P EQUAL 4)
+          list(APPEND _lib_dirs "lib32/pkgconfig")
+        endif()
+        get_property(uselib64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
+        if(uselib64 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+          list(APPEND _lib_dirs "lib64/pkgconfig")
+        endif()
+        get_property(uselibx32 GLOBAL PROPERTY FIND_LIBRARY_USE_LIBX32_PATHS)
+        if(uselibx32 AND CMAKE_INTERNAL_PLATFORM_ABI STREQUAL "ELF X32")
+          list(APPEND _lib_dirs "libx32/pkgconfig")
+        endif()
+      endif()
+    endif()
+    if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND NOT CMAKE_CROSSCOMPILING)
+      list(APPEND _lib_dirs "libdata/pkgconfig")
+    endif()
+    list(APPEND _lib_dirs "lib/pkgconfig")
+    list(APPEND _lib_dirs "share/pkgconfig")
+
+    # Check if directories exist and eventually append them to the
+    # pkgconfig path list
+    foreach(_prefix_dir ${_extra_paths})
+      foreach(_lib_dir ${_lib_dirs})
+        if(EXISTS "${_prefix_dir}/${_lib_dir}")
+          list(APPEND _pkgconfig_path "${_prefix_dir}/${_lib_dir}")
+          list(REMOVE_DUPLICATES _pkgconfig_path)
+        endif()
+      endforeach()
+    endforeach()
+
+    # Prepare and set the environment variable
+    if(NOT _pkgconfig_path STREQUAL "")
+      # remove empty values from the list
+      list(REMOVE_ITEM _pkgconfig_path "")
+      file(TO_NATIVE_PATH "${_pkgconfig_path}" _pkgconfig_path)
+      if(UNIX)
+        string(REPLACE ";" ":" _pkgconfig_path "${_pkgconfig_path}")
+        string(REPLACE "\\ " " " _pkgconfig_path "${_pkgconfig_path}")
+      endif()
+      set(ENV{PKG_CONFIG_PATH} "${_pkgconfig_path}")
+    endif()
+
+    # Unset variables
+    unset(_lib_dirs)
+    unset(_pkgconfig_path)
+  endif()
+endmacro()
+
+macro(_pkg_restore_path_internal)
+  if(NOT _extra_paths STREQUAL "")
+    # Restore the environment variable
+    set(ENV{PKG_CONFIG_PATH} "${_pkgconfig_path_old}")
+  endif()
+
+  unset(_extra_paths)
+  unset(_pkgconfig_path_old)
+endmacro()
+
+###
+macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global _prefix)
  _pkgconfig_unset(${_prefix}_FOUND)
  _pkgconfig_unset(${_prefix}_VERSION)
  _pkgconfig_unset(${_prefix}_PREFIX)
  _pkgconfig_unset(${_prefix}_INCLUDEDIR)
  _pkgconfig_unset(${_prefix}_LIBDIR)
+  _pkgconfig_unset(${_prefix}_MODULE_NAME)
  _pkgconfig_unset(${_prefix}_LIBS)
  _pkgconfig_unset(${_prefix}_LIBS_L)
  _pkgconfig_unset(${_prefix}_LIBS_PATHS)
@@ -193,83 +392,77 @@ macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
    # give out status message telling checked module
    if (NOT ${_is_silent})
      if (_pkg_check_modules_cnt EQUAL 1)
-        message(STATUS "checking for module '${_pkg_check_modules_list}'")
-      else(_pkg_check_modules_cnt EQUAL 1)
-        message(STATUS "checking for modules '${_pkg_check_modules_list}'")
-      endif(_pkg_check_modules_cnt EQUAL 1)
-    endif(NOT ${_is_silent})
+        message(STATUS "Checking for module '${_pkg_check_modules_list}'")
+      else()
+        message(STATUS "Checking for modules '${_pkg_check_modules_list}'")
+      endif()
+    endif()

    set(_pkg_check_modules_packages)
    set(_pkg_check_modules_failed)

+    _pkg_set_path_internal()
+
    # iterate through module list and check whether they exist and match the required version
    foreach (_pkg_check_modules_pkg ${_pkg_check_modules_list})
      set(_pkg_check_modules_exist_query)

      # check whether version is given
-      if (_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*")
-        string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\1" _pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}")
-        string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\2" _pkg_check_modules_pkg_op   "${_pkg_check_modules_pkg}")
-        string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\3" _pkg_check_modules_pkg_ver  "${_pkg_check_modules_pkg}")
-      else(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*")
+      if (_pkg_check_modules_pkg MATCHES "(.*[^><])(=|[><]=?)(.*)")
+        set(_pkg_check_modules_pkg_name "${CMAKE_MATCH_1}")
+        set(_pkg_check_modules_pkg_op "${CMAKE_MATCH_2}")
+        set(_pkg_check_modules_pkg_ver "${CMAKE_MATCH_3}")
+      else()
        set(_pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}")
        set(_pkg_check_modules_pkg_op)
        set(_pkg_check_modules_pkg_ver)
-      endif(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*")
-
-      # handle the operands
-      if (_pkg_check_modules_pkg_op STREQUAL ">=")
-        list(APPEND _pkg_check_modules_exist_query --atleast-version)
-      endif(_pkg_check_modules_pkg_op STREQUAL ">=")
-
-      if (_pkg_check_modules_pkg_op STREQUAL "=")
-        list(APPEND _pkg_check_modules_exist_query --exact-version)
-      endif(_pkg_check_modules_pkg_op STREQUAL "=")
-
-      if (_pkg_check_modules_pkg_op STREQUAL "<=")
-        list(APPEND _pkg_check_modules_exist_query --max-version)
-      endif(_pkg_check_modules_pkg_op STREQUAL "<=")
-
-      # create the final query which is of the format:
-      # * --atleast-version <version> <pkg-name>
-      # * --exact-version <version> <pkg-name>
-      # * --max-version <version> <pkg-name>
-      # * --exists <pkg-name>
-      if (_pkg_check_modules_pkg_op)
-        list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_ver}")
-      else(_pkg_check_modules_pkg_op)
-        list(APPEND _pkg_check_modules_exist_query --exists)
-      endif(_pkg_check_modules_pkg_op)
+      endif()

      _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_VERSION)
      _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_PREFIX)
      _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_INCLUDEDIR)
      _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_LIBDIR)

-      list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name}")
      list(APPEND _pkg_check_modules_packages    "${_pkg_check_modules_pkg_name}")

+      # create the final query which is of the format:
+      # * <pkg-name> > <version>
+      # * <pkg-name> >= <version>
+      # * <pkg-name> = <version>
+      # * <pkg-name> <= <version>
+      # * <pkg-name> < <version>
+      # * --exists <pkg-name>
+      list(APPEND _pkg_check_modules_exist_query --print-errors --short-errors)
+      if (_pkg_check_modules_pkg_op)
+        list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name} ${_pkg_check_modules_pkg_op} ${_pkg_check_modules_pkg_ver}")
+      else()
+        list(APPEND _pkg_check_modules_exist_query --exists)
+        list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name}")
+      endif()
+
      # execute the query
      execute_process(
        COMMAND ${PKG_CONFIG_EXECUTABLE} ${_pkg_check_modules_exist_query}
-        RESULT_VARIABLE _pkgconfig_retval)
+        RESULT_VARIABLE _pkgconfig_retval
+        ERROR_VARIABLE _pkgconfig_error
+        ERROR_STRIP_TRAILING_WHITESPACE)

      # evaluate result and tell failures
      if (_pkgconfig_retval)
        if(NOT ${_is_silent})
-          message(STATUS "  package '${_pkg_check_modules_pkg}' not found")
-        endif(NOT ${_is_silent})
+          message(STATUS "  ${_pkgconfig_error}")
+        endif()

        set(_pkg_check_modules_failed 1)
-      endif(_pkgconfig_retval)
-    endforeach(_pkg_check_modules_pkg)
+      endif()
+    endforeach()

    if(_pkg_check_modules_failed)
      # fail when requested
      if (${_is_required})
-        message(SEND_ERROR "A required package was not found")
-      endif (${_is_required})
-    else(_pkg_check_modules_failed)
+        message(FATAL_ERROR "A required package was not found")
+      endif ()
+    else()
      # when we are here, we checked whether requested modules
      # exist. Now, go through them and set variables

@@ -281,17 +474,23 @@ macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
        # handle case when there is only one package required
        if (pkg_count EQUAL 1)
          set(_pkg_check_prefix "${_prefix}")
-        else(pkg_count EQUAL 1)
+        else()
          set(_pkg_check_prefix "${_prefix}_${_pkg_check_modules_pkg}")
-        endif(pkg_count EQUAL 1)
+        endif()

        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" VERSION    ""   --modversion )
-        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" PREFIX     ""   --variable=prefix )
-        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" INCLUDEDIR ""   --variable=includedir )
-        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" LIBDIR     ""   --variable=libdir )
+        pkg_get_variable("${_pkg_check_prefix}_PREFIX" ${_pkg_check_modules_pkg} "prefix")
+        pkg_get_variable("${_pkg_check_prefix}_INCLUDEDIR" ${_pkg_check_modules_pkg} "includedir")
+        pkg_get_variable("${_pkg_check_prefix}_LIBDIR" ${_pkg_check_modules_pkg} "libdir")
+        foreach (variable IN ITEMS PREFIX INCLUDEDIR LIBDIR)
+          _pkgconfig_set("${_pkg_check_prefix}_${variable}" "${${_pkg_check_prefix}_${variable}}")
+        endforeach ()
+          _pkgconfig_set("${_pkg_check_prefix}_MODULE_NAME" "${_pkg_check_modules_pkg}")

-        message(STATUS "  found ${_pkg_check_modules_pkg}, version ${_pkgconfig_VERSION}")
-      endforeach(_pkg_check_modules_pkg)
+        if (NOT ${_is_silent})
+          message(STATUS "  Found ${_pkg_check_modules_pkg}, version ${_pkgconfig_VERSION}")
+        endif ()
+      endforeach()

      # set variables which are combined for multiple modules
      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARIES           "(^| )-l" --libs-only-l )
@@ -302,58 +501,271 @@ macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" INCLUDE_DIRS        "(^| )-I" --cflags-only-I )
      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS              ""        --cflags )
      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS_OTHER        ""        --cflags-only-other )
-    endif(_pkg_check_modules_failed)
-  else(PKG_CONFIG_EXECUTABLE)
+
+      _pkg_recalculate("${_prefix}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global})
+    endif()
+
+    _pkg_restore_path_internal()
+  else()
    if (${_is_required})
      message(SEND_ERROR "pkg-config tool not found")
-    endif (${_is_required})
-  endif(PKG_CONFIG_EXECUTABLE)
-endmacro(_pkg_check_modules_internal)
+    endif ()
+  endif()
+endmacro()

-###
-### User visible macros start here
-###

-###
+#[========================================[.rst:
+.. command:: pkg_check_modules
+
+  Checks for all the given modules, setting a variety of result variables in
+  the calling scope.
+
+  .. code-block:: cmake
+
+    pkg_check_modules(<prefix>
+                      [REQUIRED] [QUIET]
+                      [NO_CMAKE_PATH]
+                      [NO_CMAKE_ENVIRONMENT_PATH]
+                      [IMPORTED_TARGET [GLOBAL]]
+                      <moduleSpec> [<moduleSpec>...])
+
+  When the ``REQUIRED`` argument is given, the command will fail with an error
+  if module(s) could not be found.
+
+  When the ``QUIET`` argument is given, no status messages will be printed.
+
+  By default, if :variable:`CMAKE_MINIMUM_REQUIRED_VERSION` is 3.1 or
+  later, or if :variable:`PKG_CONFIG_USE_CMAKE_PREFIX_PATH` is set to a
+  boolean ``True`` value, then the :variable:`CMAKE_PREFIX_PATH`,
+  :variable:`CMAKE_FRAMEWORK_PATH`, and :variable:`CMAKE_APPBUNDLE_PATH` cache
+  and environment variables will be added to the ``pkg-config`` search path.
+  The ``NO_CMAKE_PATH`` and ``NO_CMAKE_ENVIRONMENT_PATH`` arguments
+  disable this behavior for the cache variables and environment variables
+  respectively.
+
+  The ``IMPORTED_TARGET`` argument will create an imported target named
+  ``PkgConfig::<prefix>`` that can be passed directly as an argument to
+  :command:`target_link_libraries`. The ``GLOBAL`` argument will make the
+  imported target available in global scope.
+
+  Each ``<moduleSpec>`` can be either a bare module name or it can be a
+  module name with a version constraint (operators ``=``, ``<``, ``>``,
+  ``<=`` and ``>=`` are supported).  The following are examples for a module
+  named ``foo`` with various constraints:
+
+  - ``foo`` matches any version.
+  - ``foo<2`` only matches versions before 2.
+  - ``foo>=3.1`` matches any version from 3.1 or later.
+  - ``foo=1.2.3`` requires that foo must be exactly version 1.2.3.
+
+  The following variables may be set upon return.  Two sets of values exist:
+  One for the common case (``<XXX> = <prefix>``) and another for the
+  information ``pkg-config`` provides when called with the ``--static``
+  option (``<XXX> = <prefix>_STATIC``).
+
+  ``<XXX>_FOUND``
+    set to 1 if module(s) exist
+  ``<XXX>_LIBRARIES``
+    only the libraries (without the '-l')
+  ``<XXX>_LINK_LIBRARIES``
+    the libraries and their absolute paths
+  ``<XXX>_LIBRARY_DIRS``
+    the paths of the libraries (without the '-L')
+  ``<XXX>_LDFLAGS``
+    all required linker flags
+  ``<XXX>_LDFLAGS_OTHER``
+    all other linker flags
+  ``<XXX>_INCLUDE_DIRS``
+    the '-I' preprocessor flags (without the '-I')
+  ``<XXX>_CFLAGS``
+    all required cflags
+  ``<XXX>_CFLAGS_OTHER``
+    the other compiler flags
+
+  All but ``<XXX>_FOUND`` may be a :ref:`;-list <CMake Language Lists>` if the
+  associated variable returned from ``pkg-config`` has multiple values.
+
+  There are some special variables whose prefix depends on the number of
+  ``<moduleSpec>`` given.  When there is only one ``<moduleSpec>``,
+  ``<YYY>`` will simply be ``<prefix>``, but if two or more ``<moduleSpec>``
+  items are given, ``<YYY>`` will be ``<prefix>_<moduleName>``.
+
+  ``<YYY>_VERSION``
+    version of the module
+  ``<YYY>_PREFIX``
+    prefix directory of the module
+  ``<YYY>_INCLUDEDIR``
+    include directory of the module
+  ``<YYY>_LIBDIR``
+    lib directory of the module
+
+  Examples:
+
+  .. code-block:: cmake
+
+    pkg_check_modules (GLIB2 glib-2.0)
+
+  Looks for any version of glib2.  If found, the output variable
+  ``GLIB2_VERSION`` will hold the actual version found.
+
+  .. code-block:: cmake
+
+    pkg_check_modules (GLIB2 glib-2.0>=2.10)
+
+  Looks for at least version 2.10 of glib2.  If found, the output variable
+  ``GLIB2_VERSION`` will hold the actual version found.
+
+  .. code-block:: cmake
+
+    pkg_check_modules (FOO glib-2.0>=2.10 gtk+-2.0)
+
+  Looks for both glib2-2.0 (at least version 2.10) and any version of
+  gtk2+-2.0.  Only if both are found will ``FOO`` be considered found.
+  The ``FOO_glib-2.0_VERSION`` and ``FOO_gtk+-2.0_VERSION`` variables will be
+  set to their respective found module versions.
+
+  .. code-block:: cmake
+
+    pkg_check_modules (XRENDER REQUIRED xrender)
+
+  Requires any version of ``xrender``.  Example output variables set by a
+  successful call::
+
+    XRENDER_LIBRARIES=Xrender;X11
+    XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp
+#]========================================]
 macro(pkg_check_modules _prefix _module0)
+  _pkgconfig_parse_options(_pkg_modules _pkg_is_required _pkg_is_silent _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global "${_module0}" ${ARGN})
  # check cached value
-  if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION})
-    _pkgconfig_parse_options   (_pkg_modules _pkg_is_required "${_module0}" ${ARGN})
-    _pkg_check_modules_internal("${_pkg_is_required}" 0 "${_prefix}" ${_pkg_modules})
+  if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND OR
+      (NOT "${ARGN}" STREQUAL "" AND NOT "${__pkg_config_arguments_${_prefix}}" STREQUAL "${_module0};${ARGN}") OR
+      (    "${ARGN}" STREQUAL "" AND NOT "${__pkg_config_arguments_${_prefix}}" STREQUAL "${_module0}"))
+    _pkg_check_modules_internal("${_pkg_is_required}" "${_pkg_is_silent}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global} "${_prefix}" ${_pkg_modules})

    _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
-  endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION})
-endmacro(pkg_check_modules)
+    if (${_prefix}_FOUND)
+      _pkgconfig_set(__pkg_config_arguments_${_prefix} "${_module0};${ARGN}")
+    endif()
+  else()
+    if (${_prefix}_FOUND)
+      _pkg_recalculate("${_prefix}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global})
+    endif()
+  endif()
+endmacro()

-###
+
+#[========================================[.rst:
+.. command:: pkg_search_module
+
+  The behavior of this command is the same as :command:`pkg_check_modules`,
+  except that rather than checking for all the specified modules, it searches
+  for just the first successful match.
+
+  .. code-block:: cmake
+
+    pkg_search_module(<prefix>
+                      [REQUIRED] [QUIET]
+                      [NO_CMAKE_PATH]
+                      [NO_CMAKE_ENVIRONMENT_PATH]
+                      [IMPORTED_TARGET [GLOBAL]]
+                      <moduleSpec> [<moduleSpec>...])
+
+  If a module is found, the ``<prefix>_MODULE_NAME`` variable will contain the
+  name of the matching module. This variable can be used if you need to run
+  :command:`pkg_get_variable`.
+
+  Example:
+
+  .. code-block:: cmake
+
+    pkg_search_module (BAR libxml-2.0 libxml2 libxml>=2)
+#]========================================]
 macro(pkg_search_module _prefix _module0)
+  _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required _pkg_is_silent _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global "${_module0}" ${ARGN})
  # check cached value
  if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
    set(_pkg_modules_found 0)
-    _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required "${_module0}" ${ARGN})

-    message(STATUS "checking for one of the modules '${_pkg_modules_alt}'")
+    if (NOT ${_pkg_is_silent})
+      message(STATUS "Checking for one of the modules '${_pkg_modules_alt}'")
+    endif ()

    # iterate through all modules and stop at the first working one.
    foreach(_pkg_alt ${_pkg_modules_alt})
      if(NOT _pkg_modules_found)
-        _pkg_check_modules_internal(0 1 "${_prefix}" "${_pkg_alt}")
-      endif(NOT _pkg_modules_found)
+        _pkg_check_modules_internal(0 1 ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global} "${_prefix}" "${_pkg_alt}")
+      endif()

      if (${_prefix}_FOUND)
        set(_pkg_modules_found 1)
-      endif(${_prefix}_FOUND)
-    endforeach(_pkg_alt)
+        break()
+      endif()
+    endforeach()

    if (NOT ${_prefix}_FOUND)
      if(${_pkg_is_required})
        message(SEND_ERROR "None of the required '${_pkg_modules_alt}' found")
-      endif(${_pkg_is_required})
-    endif(NOT ${_prefix}_FOUND)
+      endif()
+    endif()

    _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
-  endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
-endmacro(pkg_search_module)
+  elseif (${_prefix}_FOUND)
+    _pkg_recalculate("${_prefix}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global})
+  endif()
+endmacro()
+
+#[========================================[.rst:
+.. command:: pkg_get_variable
+
+  Retrieves the value of a pkg-config variable ``varName`` and stores it in the
+  result variable ``resultVar`` in the calling scope.
+
+  .. code-block:: cmake
+
+    pkg_get_variable(<resultVar> <moduleName> <varName>)
+
+  If ``pkg-config`` returns multiple values for the specified variable,
+  ``resultVar`` will contain a :ref:`;-list <CMake Language Lists>`.
+
+  For example:
+
+  .. code-block:: cmake
+
+    pkg_get_variable(GI_GIRDIR gobject-introspection-1.0 girdir)
+#]========================================]
+function (pkg_get_variable result pkg variable)
+  _pkg_set_path_internal()
+  _pkgconfig_invoke("${pkg}" "prefix" "result" "" "--variable=${variable}")
+  set("${result}"
+    "${prefix_result}"
+    PARENT_SCOPE)
+  _pkg_restore_path_internal()
+endfunction ()
+
+
+#[========================================[.rst:
+Variables Affecting Behavior
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. variable:: PKG_CONFIG_EXECUTABLE
+
+  This can be set to the path of the pkg-config executable.  If not provided,
+  it will be set by the module as a result of calling :command:`find_program`
+  internally.  The ``PKG_CONFIG`` environment variable can be used as a hint.
+
+.. variable:: PKG_CONFIG_USE_CMAKE_PREFIX_PATH
+
+  Specifies whether :command:`pkg_check_modules` and
+  :command:`pkg_search_module` should add the paths in the
+  :variable:`CMAKE_PREFIX_PATH`, :variable:`CMAKE_FRAMEWORK_PATH` and
+  :variable:`CMAKE_APPBUNDLE_PATH` cache and environment variables to the
+  ``pkg-config`` search path.
+
+  If this variable is not set, this behavior is enabled by default if
+  :variable:`CMAKE_MINIMUM_REQUIRED_VERSION` is 3.1 or later, disabled
+  otherwise.
+#]========================================]
+

 ### Local Variables:
 ### mode: cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2009 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

 # - Find Python
@@ -24,80 +24,17 @@
 # code sets the following variables:
 #
 #  PYTHON_EXECUTABLE   = full path to the python binary
-#  PYTHON_INCLUDE_PATH = path to where python.h can be found
-#  PYTHON_LIBRARY = path to where libpython.so* can be found
-#  PYTHON_LFLAGS = python compiler options for linking
+#  PYTHON_INCLUDE_DIRS = path to where python.h can be found
+#  PYTHON_LIBRARIES = path to where libpython.so* can be found
+#  PYTHON_LDFLAGS = python compiler options for linking

-if(PYTHON_FOUND)
-   # Already in cache, be silent
-   set(PYTHON_FIND_QUIETLY TRUE)
-endif()
+include(FindPkgConfig)

-if(ENABLE_PYTHON3)
-  find_program(PYTHON_EXECUTABLE
-    NAMES python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
-    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
-    )
+if(ENABLE_PYTHON2)
+  pkg_check_modules(PYTHON python2 IMPORTED_TARGET GLOBAL)
 else()
-  find_program(PYTHON_EXECUTABLE
-    NAMES python2.7 python2.6 python2.5 python
-    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
-    )
-endif()
-
-if(PYTHON_EXECUTABLE)
-  execute_process(
-    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('INCLUDEPY'))"
-    OUTPUT_VARIABLE PYTHON_INC_DIR
-    )
-
-  execute_process(
-    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LIBPL'))"
-    OUTPUT_VARIABLE PYTHON_POSSIBLE_LIB_PATH
-    )
-
-  execute_process(
-    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LIBS') + ' ' + get_config_var('LINKFORSHARED'))"
-    OUTPUT_VARIABLE PYTHON_LFLAGS
-    )
-
-  find_path(PYTHON_INCLUDE_PATH
-    NAMES Python.h
-    HINTS ${PYTHON_INC_DIR}
-    )
-  if(ENABLE_PYTHON3)
-    find_library(PYTHON_LIBRARY
-      NAMES python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
-      HINTS ${PYTHON_POSSIBLE_LIB_PATH}
-      )
-  else()
-    find_library(PYTHON_LIBRARY
-      NAMES python2.7 python2.6 python2.5 python
-      HINTS ${PYTHON_POSSIBLE_LIB_PATH}
-      )
+  pkg_check_modules(PYTHON python3-embed IMPORTED_TARGET GLOBAL)
+  if(NOT PYTHON_FOUND)
+    pkg_check_modules(PYTHON python3 IMPORTED_TARGET GLOBAL)
  endif()
-
-  if(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)
-    execute_process(
-      COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(sys.version[:3])"
-      OUTPUT_VARIABLE PYTHON_VERSION
-      )
-    execute_process(
-      COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(str(sys.version_info < (2,5)))"
-      OUTPUT_VARIABLE PYTHON_OLD_VERSION
-      )
-    if(${PYTHON_OLD_VERSION} STREQUAL "True")
-      message("Python >= 2.5 is needed to build python plugin, version found: ${PYTHON_VERSION}")
-    else()
-      set(PYTHON_FOUND TRUE)
-    endif()
-  endif()
-
-  mark_as_advanced(
-    PYTHON_EXECUTABLE
-    PYTHON_INCLUDE_PATH
-    PYTHON_LIBRARY
-    PYTHON_LFLAGS
-    )
-
 endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

 # - Find Ruby
@@ -27,57 +27,19 @@
 #  RUBY_LIB          = ruby library (found without pkg-config)

 if(RUBY_FOUND)
-   # Already in cache, be silent
-   set(RUBY_FIND_QUIETLY TRUE)
+  # Already in cache, be silent
+  set(RUBY_FIND_QUIETLY TRUE)
 endif()

 find_package(PkgConfig)
 if(PKG_CONFIG_FOUND)
-  pkg_search_module(RUBY ruby-2.4 ruby-2.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8)
-endif()
-
-if(RUBY_FOUND)
-  set(RUBY_LIB "")
-  mark_as_advanced(RUBY_LIB)
-else()
-  find_program(RUBY_EXECUTABLE
-    NAMES ruby2.4.0 ruby240 ruby2.4 ruby2.3.0 ruby230 ruby2.3 ruby23 ruby2.2.3 ruby223 ruby2.2.2 ruby222 ruby2.2.1 ruby221 ruby2.2.0 ruby220 ruby2.2 ruby22 ruby2.1.7 ruby217 ruby2.1.6 ruby216 ruby2.1.5 ruby215 ruby2.1.4 ruby214 ruby2.1.3 ruby213 ruby2.1.2 ruby212 ruby2.1.1 ruby211 ruby2.1.0 ruby210 ruby2.1 ruby21 ruby2.0 ruby20 ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby
-    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
-    )
-  if(RUBY_EXECUTABLE)
-    execute_process(
-      COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['archdir']"
-      OUTPUT_VARIABLE RUBY_ARCH_DIR
-      )
-    execute_process(
-      COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['arch']"
-      OUTPUT_VARIABLE RUBY_ARCH
-      )
-    execute_process(
-      COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['libdir']"
-      OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH
-      )
-    execute_process(
-      COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubylibdir']"
-      OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH
-      )
-    find_path(RUBY_INCLUDE_DIRS
-      NAMES ruby.h
-      PATHS ${RUBY_ARCH_DIR}
-      )
-    set(RUBY_INCLUDE_ARCH "${RUBY_INCLUDE_DIRS}/${RUBY_ARCH}")
-    find_library(RUBY_LIB
-      NAMES ruby-1.9.3 ruby1.9.3 ruby193 ruby-1.9.2 ruby1.9.2 ruby192 ruby-1.9.1 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby
-      PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
-      )
-    if(RUBY_LIB AND RUBY_INCLUDE_DIRS)
-      set(RUBY_FOUND TRUE)
-    endif()
-    set(RUBY_INCLUDE_DIRS "${RUBY_INCLUDE_DIRS};${RUBY_INCLUDE_ARCH}")
-    mark_as_advanced(
-      RUBY_INCLUDE_DIRS
-      RUBY_LIBRARY_DIRS
-      RUBY_LIB
-      )
+  if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    # set specific search path for macOS
+    set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/opt/ruby/lib/pkgconfig")
+  endif()
+  pkg_search_module(RUBY ruby-3.0 ruby-2.7 ruby-2.6 ruby-2.5 ruby-2.4 ruby-2.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby)
+  if(RUBY_FOUND AND ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    # FIXME: weird hack: hardcoding the Ruby lib location on macOS
+    set(RUBY_LDFLAGS "${RUBY_LDFLAGS} -L/usr/local/opt/ruby/lib")
  endif()
 endif()
@@ -1,162 +0,0 @@
-#
-# Copyright (C) 2008 Julien Louis <ptitlouis@sysif.net>
-# Copyright (C) 2008-2017 Sébastien Helleu <flashcode@flashtux.org>
-#
-# This file is part of WeeChat, the extensible chat client.
-#
-# WeeChat is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# WeeChat is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# - Find Tcl includes and libraries.
-# This module finds if Tcl is installed and determines where the
-# include files and libraries are. It also determines what the name of
-# the library is. This code sets the following variables:
-#  TCL_FOUND              = Tcl was found
-#  TK_FOUND               = Tk was found
-#  TCLTK_FOUND            = Tcl and Tk were found
-#  TCL_LIBRARY            = path to Tcl library (tcl tcl80)
-#  TCL_INCLUDE_PATH       = path to where tcl.h can be found
-#  TCL_TCLSH              = path to tclsh binary (tcl tcl80)
-#  TK_LIBRARY             = path to Tk library (tk tk80 etc)
-#  TK_INCLUDE_PATH        = path to where tk.h can be found
-#  TK_WISH                = full path to the wish executable
-#
-# In an effort to remove some clutter and clear up some issues for people
-# who are not necessarily Tcl/Tk gurus/developpers, some variables were
-# moved or removed. Changes compared to CMake 2.4 are:
-# - The stub libraries are now found in FindTclStub.cmake
-#   => they were only useful for people writing Tcl/Tk extensions.
-# - TCL_LIBRARY_DEBUG and TK_LIBRARY_DEBUG were removed.
-#   => these libs are not packaged by default with Tcl/Tk distributions.
-#      Even when Tcl/Tk is built from source, several flavors of debug libs
-#      are created and there is no real reason to pick a single one
-#      specifically (say, amongst tcl84g, tcl84gs, or tcl84sgx).
-#      Let's leave that choice to the user by allowing him to assign
-#      TCL_LIBRARY to any Tcl library, debug or not.
-# - TK_INTERNAL_PATH was removed.
-#   => this ended up being only a Win32 variable, and there is a lot of
-#      confusion regarding the location of this file in an installed Tcl/Tk
-#      tree anyway (see 8.5 for example). If you need the internal path at
-#      this point it is safer you ask directly where the *source* tree is
-#      and dig from there.
-
-if(TCL_FOUND)
-  set(TCL_FIND_QUIETLY TRUE)
-endif()
-
-include(CMakeFindFrameworks)
-include(FindTclsh)
-
-get_filename_component(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH)
-get_filename_component(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH)
-string(REGEX REPLACE
-  "^.*tclsh([0-9]\\.*[0-9]).*$" "\\1" TCL_TCLSH_VERSION "${TCL_TCLSH}")
-
-get_filename_component(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
-
-get_filename_component(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH)
-get_filename_component(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH)
-string(REGEX REPLACE
-  "^.*tcl([0-9]\\.*[0-9]).*$" "\\1" TCL_VERSION "${TCL_LIBRARY}")
-
-set(TCL_POSSIBLE_LIB_PATHS
-  "${TCL_INCLUDE_PATH_PARENT}/lib"
-  "${TCL_INCLUDE_PATH_PARENT}/lib64"
-  "${TCL_LIBRARY_PATH}"
-  "${TCL_TCLSH_PATH_PARENT}/lib"
-  "${TCL_TCLSH_PATH_PARENT}/lib64"
-  /usr/lib
-  /usr/lib64
-  /usr/local/lib
-  /usr/local/lib64
-  )
-
-if(WIN32)
-  get_filename_component(
-    ActiveTcl_CurrentVersion
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]"
-    NAME)
-  set(TCLTK_POSSIBLE_LIB_PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/lib"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/lib"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/lib"
-    "$ENV{ProgramFiles}/Tcl/Lib"
-    "C:/Program Files/Tcl/lib"
-    "C:/Tcl/lib"
-    )
-endif()
-
-find_library(TCL_LIBRARY
-  NAMES
-  tcl86 tcl8.6
-  tcl85 tcl8.5
-  tcl
-  tcl${TCL_VERSION} tcl${TCL_TCLSH_VERSION}
-  PATHS ${TCL_POSSIBLE_LIB_PATHS}
-  )
-
-cmake_find_frameworks(Tcl)
-
-set(TCL_FRAMEWORK_INCLUDES)
-if(Tcl_FRAMEWORKS)
-  if(NOT TCL_INCLUDE_PATH)
-    foreach(dir ${Tcl_FRAMEWORKS})
-      set(TCL_FRAMEWORK_INCLUDES ${TCL_FRAMEWORK_INCLUDES} ${dir}/Headers)
-    endforeach(dir)
-  endif()
-endif()
-
-set(TCL_POSSIBLE_INCLUDE_PATHS
-  "${TCL_LIBRARY_PATH_PARENT}/include"
-  "${TCL_INCLUDE_PATH}"
-  ${TCL_FRAMEWORK_INCLUDES}
-  "${TCL_TCLSH_PATH_PARENT}/include"
-  /usr/include/tcl8.6
-  /usr/include/tcl8.5
-  /usr/include
-  /usr/local/include
-  /usr/include/tcl${TCL_VERSION}
-  /usr/local/include/tcl${TCL_VERSION}
-  /usr/local/include/tcl8.6
-  /usr/local/include/tcl8.5
-  )
-
-if(WIN32)
-  set(TCLTK_POSSIBLE_INCLUDE_PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/include"
-    "$ENV{ProgramFiles}/Tcl/include"
-    "C:/Program Files/Tcl/include"
-    "C:/Tcl/include"
-    )
-endif()
-
-find_path(TCL_INCLUDE_PATH
-  NAMES tcl.h
-  PATHS ${TCL_POSSIBLE_INCLUDE_PATHS}
-  )
-
-if(TCL_LIBRARY AND TCL_INCLUDE_PATH)
-  set(TCL_VERSION ${TCL_VERSION})
-  set(TCL_LIBARY ${TCL_LIBRARY})
-  set(TCL_INCLUDE_PATH ${TCL_INCLUDE_PATH})
-  set(TCL_FOUND TRUE)
-endif()
-
-mark_as_advanced(
-  TCL_INCLUDE_PATH
-  TCL_LIBRARY
-  TCL_VERSION
-  )
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2015-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2015-2021 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

 # - Find V8 (Google's JavaScript engine)
@@ -41,7 +41,7 @@ find_library(ZLIB_LIBRARY
  ${ZLIB_NAMES}
  PATHS
  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]/lib"
-  )
+)
 mark_as_advanced(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)

 if(ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h")
@@ -66,8 +66,7 @@ endif()

 # handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if
 # all listed variables are TRUE
-#INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-include(${CMAKE_HOME_DIRECTORY}/cmake/FindPackageHandleStandardArgs.cmake)
+include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(ZLIB REQUIRED_VARS ZLIB_LIBRARY ZLIB_INCLUDE_DIR
  VERSION_VAR ZLIB_VERSION_STRING)

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

 if(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
@@ -28,13 +28,11 @@ list(REVERSE files)
 foreach(file ${files})
  message(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
  if(EXISTS "$ENV{DESTDIR}${file}")
-    exec_program("@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
-      OUTPUT_VARIABLE rm_out
-      RETURN_VARIABLE rm_retval)
+    execute_process(COMMAND "@CMAKE_COMMAND@" -E remove "$ENV{DESTDIR}${file}" OUTPUT_VARIABLE rm_out RESULT_VARIABLE rm_retval)
    if("${rm_retval}" GREATER 0)
      message(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
    endif()
  else()
    message(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
  endif()
-endforeach(file)
+endforeach()
@@ -5,6 +5,7 @@
 #cmakedefine HAVE_BACKTRACE
 #cmakedefine ICONV_2ARG_IS_CONST 1
 #cmakedefine HAVE_MALLINFO
+#cmakedefine HAVE_MALLINFO2
 #cmakedefine HAVE_EAT_NEWLINE_GLITCH
 #cmakedefine HAVE_ASPELL_VERSION_STRING
 #cmakedefine HAVE_ENCHANT_GET_VERSION
@@ -13,9 +14,8 @@
 #define PACKAGE "@PROJECT_NAME@"
 #define PACKAGE_NAME "@PROJECT_NAME@"
 #define PACKAGE_STRING "@PKG_STRING@"
-#define WEECHAT_LIBDIR "@LIBDIR@"
-#define WEECHAT_SHAREDIR "@SHAREDIR@"
+#define WEECHAT_LIBDIR "@WEECHAT_LIBDIR@"
+#define WEECHAT_SHAREDIR "@WEECHAT_SHAREDIR@"
 #define LOCALEDIR "@LOCALEDIR@"
 #define WEECHAT_HOME "@WEECHAT_HOME@"
-#define CA_FILE "@CA_FILE@"
 #define _GNU_SOURCE 1
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2005 Benoit Papillault <benoit.papillault@free.fr>
 # Copyright (C) 2005-2006 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2005-2009 Emmanuel Bouthenot <kolter@openics.org>
@@ -17,7 +17,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

 #                                               -*- Autoconf -*-
@@ -37,6 +37,7 @@ AC_PROG_MAKE_SET
 AC_GNU_SOURCE
 AC_PROG_LN_S
 AM_PROG_LIBTOOL
+PKG_PROG_PKG_CONFIG

 # Files to generate
 AC_CONFIG_FILES([weechat.pc])
@@ -46,10 +47,12 @@ AC_CONFIG_FILES([weechat-${VERSION}-1.cygport:weechat.cygport.in])
 case "$host_os" in
 freebsd* | openbsd*)
        CFLAGS="$CFLAGS -I/usr/local/include"
+        CXXFLAGS="$CXXFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
        ;;
 netbsd*)
        CFLAGS="$CFLAGS -I/usr/pkg/include"
+        CXXFLAGS="$CXXFLAGS -I/usr/pkg/include"
        LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
        ;;
 solaris*)
@@ -61,7 +64,7 @@ darwin*)
 esac

 # Gettext
-ALL_LINGUAS="cs de es fr hu it ja pl pt pt_BR ru tr"
+ALL_LINGUAS="cs de es fr hu it ja pl pt pt_BR ru sr tr"
 AM_GNU_GETTEXT
 AM_GNU_GETTEXT_VERSION([0.18])

@@ -95,20 +98,19 @@ AC_MSG_RESULT($ac_cv_type_socklen_t)
 AC_FUNC_SELECT_ARGTYPES
 AC_TYPE_SIGNAL
 AC_CHECK_FUNCS([mallinfo])
+AC_CHECK_FUNCS([mallinfo2])

 # Variables in config.h

 AH_VERBATIM([PREFIX], [#undef PREFIX])
 AH_VERBATIM([WEECHAT_LIBDIR], [#undef WEECHAT_LIBDIR])
 AH_VERBATIM([WEECHAT_SHAREDIR], [#undef WEECHAT_SHAREDIR])
-AH_VERBATIM([HAVE_GNUTLS], [#undef HAVE_GNUTLS])
 AH_VERBATIM([HAVE_FLOCK], [#undef HAVE_FLOCK])
 AH_VERBATIM([HAVE_EAT_NEWLINE_GLITCH], [#undef HAVE_EAT_NEWLINE_GLITCH])
 AH_VERBATIM([HAVE_ASPELL_VERSION_STRING], [#undef HAVE_ASPELL_VERSION_STRING])
 AH_VERBATIM([HAVE_ENCHANT_GET_VERSION], [#undef HAVE_ENCHANT_GET_VERSION])
 AH_VERBATIM([HAVE_GUILE_GMP_MEMORY_FUNCTIONS], [#undef HAVE_GUILE_GMP_MEMORY_FUNCTIONS])
 AH_VERBATIM([PLUGIN_ALIAS], [#undef PLUGIN_ALIAS])
-AH_VERBATIM([PLUGIN_ASPELL], [#undef PLUGIN_ASPELL])
 AH_VERBATIM([PLUGIN_BUFLIST], [#undef PLUGIN_BUFLIST])
 AH_VERBATIM([PLUGIN_CHARSET], [#undef PLUGIN_CHARSET])
 AH_VERBATIM([PLUGIN_EXEC], [#undef PLUGIN_EXEC])
@@ -126,22 +128,21 @@ AH_VERBATIM([PLUGIN_PHP], [#undef PLUGIN_PHP])
 AH_VERBATIM([PLUGIN_TCL], [#undef PLUGIN_TCL])
 AH_VERBATIM([PLUGIN_GUILE], [#undef PLUGIN_GUILE])
 AH_VERBATIM([PLUGIN_JAVASCRIPT], [#undef PLUGIN_JAVASCRIPT])
+AH_VERBATIM([PLUGIN_SPELL], [#undef PLUGIN_SPELL])
 AH_VERBATIM([PLUGIN_TRIGGER], [#undef PLUGIN_TRIGGER])
+AH_VERBATIM([PLUGIN_TYPING], [#undef PLUGIN_TYPING])
 AH_VERBATIM([PLUGIN_XFER], [#undef PLUGIN_XFER])
 AH_VERBATIM([TESTS], [#undef TESTS])
 AH_VERBATIM([MAN], [#undef MAN])
 AH_VERBATIM([DOC], [#undef DOC])
-AH_VERBATIM([WEECHAT_HOME], [#define WEECHAT_HOME "~/.weechat"])
-AH_VERBATIM([CA_FILE], [#define CA_FILE "/etc/ssl/certs/ca-certificates.crt"])
+AH_VERBATIM([WEECHAT_HOME], [#define WEECHAT_HOME ""])

 # Arguments for ./configure

 AC_ARG_ENABLE(ncurses,      [  --disable-ncurses       turn off ncurses interface (default=compiled if found)],enable_ncurses=$enableval,enable_ncurses=yes)
-AC_ARG_ENABLE(gnutls,       [  --disable-gnutls        turn off gnutls support (default=compiled if found)],enable_gnutls=$enableval,enable_gnutls=yes)
+AC_ARG_ENABLE(headless,     [  --disable-headless      turn off headless binary (default=compiled), this is required for tests],enable_headless=$enableval,enable_headless=yes)
 AC_ARG_ENABLE(largefile,    [  --disable-largefile     turn off Large File Support (default=on)],enable_largefile=$enableval,enable_largefile=yes)
 AC_ARG_ENABLE(alias,        [  --disable-alias         turn off Alias plugin (default=compiled)],enable_alias=$enableval,enable_alias=yes)
-AC_ARG_ENABLE(aspell,       [  --disable-aspell        turn off Aspell plugin (default=compiled)],enable_aspell=$enableval,enable_aspell=yes)
-AC_ARG_ENABLE(enchant,      [  --enable-enchant        turn on Enchant lib for Aspell plugin (default=off)],enable_enchant=$enableval,enable_enchant=no)
 AC_ARG_ENABLE(buflist,      [  --disable-buflist       turn off Buflist plugin (default=compiled)],enable_buflist=$enableval,enable_buflist=yes)
 AC_ARG_ENABLE(charset,      [  --disable-charset       turn off Charset plugin (default=compiled)],enable_charset=$enableval,enable_charset=yes)
 AC_ARG_ENABLE(exec,         [  --disable-exec          turn off Exec plugin (default=compiled)],enable_exec=$enableval,enable_exec=yes)
@@ -154,37 +155,35 @@ AC_ARG_ENABLE(script,       [  --disable-script        turn off Script plugin (d
 AC_ARG_ENABLE(scripts,      [  --disable-scripts       turn off script plugins (perl, python, ...) (default=compiled if found)],enable_scripts=$enableval,enable_scripts=yes)
 AC_ARG_ENABLE(perl,         [  --disable-perl          turn off Perl script plugin (default=compiled if found)],enable_perl=$enableval,enable_perl=yes)
 AC_ARG_ENABLE(python,       [  --disable-python        turn off Python script plugin (default=compiled if found)],enable_python=$enableval,enable_python=yes)
-AC_ARG_ENABLE(python3,      [  --enable-python3        use Python 3.x if found (NOT recommended because many "official" scripts won't work) (default=off)],enable_python3=$enableval,enable_python3=no)
+AC_ARG_ENABLE(python2,      [  --enable-python2        use Python 2 instead of Python 3 (default=off)],enable_python2=$enableval,enable_python2=no)
 AC_ARG_ENABLE(ruby,         [  --disable-ruby          turn off Ruby script plugin (default=compiled if found)],enable_ruby=$enableval,enable_ruby=yes)
 AC_ARG_ENABLE(lua,          [  --disable-lua           turn off Lua script plugin (default=compiled if found)],enable_lua=$enableval,enable_lua=yes)
 AC_ARG_ENABLE(tcl,          [  --disable-tcl           turn off Tcl script plugin (default=compiled if found)],enable_tcl=$enableval,enable_tcl=yes)
 AC_ARG_ENABLE(guile,        [  --disable-guile         turn off Guile (scheme) script plugin (default=compiled if found)],enable_guile=$enableval,enable_guile=yes)
-AC_ARG_ENABLE(javascript,   [  --disable-javascript    turn off JavaScript script plugin (default=compiled if found)],enable_javascript=$enableval,enable_javascript=yes)
+AC_ARG_ENABLE(javascript,   [  --enable-javascript     turn on JavaScript script plugin (default=off)],enable_javascript=$enableval,enable_javascript=no)
 AC_ARG_ENABLE(php,          [  --disable-php           turn off PHP script plugin (default=compiled if found)],enable_php=$enableval,enable_php=yes)
+AC_ARG_ENABLE(spell,        [  --disable-spell         turn off Spell checker plugin (default=compiled)],enable_spell=$enableval,enable_spell=yes)
+AC_ARG_ENABLE(enchant,      [  --enable-enchant        turn on Enchant lib for Spell checker plugin (default=off)],enable_enchant=$enableval,enable_enchant=no)
 AC_ARG_ENABLE(trigger,      [  --disable-trigger       turn off Trigger plugin (default=compiled)],enable_trigger=$enableval,enable_trigger=yes)
+AC_ARG_ENABLE(typing,       [  --disable-typing        turn off Typing plugin (default=compiled)],enable_trigger=$enableval,enable_typing=yes)
 AC_ARG_ENABLE(xfer,         [  --disable-xfer          turn off Xfer (file transfer) plugin (default=compiled)],enable_xfer=$enableval,enable_xfer=yes)
 AC_ARG_WITH(tclconfig,      [  --with-tclconfig=DIR    directory containing tcl configuration (tclConfig.sh)],tclconfig=$withval,tclconfig='')
-AC_ARG_WITH(debug,          [  --with-debug            debugging: 0=no debug, 1=debug compilation (default=1)],debug=$withval,debug=1)
+AC_ARG_WITH(debug,          [  --with-debug            debugging: 0=no debug, 1=debug compilation (default=0)],debug=$withval,debug=0)
 AC_ARG_ENABLE(tests,        [  --enable-tests          turn on build of tests (default=not built)],enable_tests=$enableval,enable_tests=no)
 AC_ARG_ENABLE(man,          [  --enable-man            turn on build of man page (default=not built)],enable_man=$enableval,enable_man=no)
 AC_ARG_ENABLE(doc,          [  --enable-doc            turn on build of documentation (default=not built)],enable_doc=$enableval,enable_doc=no)

-AC_ARG_VAR(WEECHAT_HOME, [WeeChat home directory for config, logs, scripts.. (default is "~/.weechat")])
-AC_ARG_VAR(CA_FILE, [File containing the certificate authorities (default is "/etc/ssl/certs/ca-certificates.crt"). This is the default value of option "weechat.network.gnutls_ca_file".])
+AC_ARG_VAR(WEECHAT_HOME, [Force a single WeeChat home directory for config, logs, scripts, etc.])

-if test "x$WEECHAT_HOME" = "x" ; then
-    WEECHAT_HOME="~/.weechat"
-fi
 AC_DEFINE_UNQUOTED(WEECHAT_HOME, "$WEECHAT_HOME")

-if test "x$CA_FILE" = "x" ; then
-    CA_FILE="/etc/ssl/certs/ca-certificates.crt"
-fi
-AC_DEFINE_UNQUOTED(CA_FILE, "$CA_FILE")
-
 not_asked=""
 not_found=""

+if test "x$enable_headless" != "xyes" && test "x$enable_tests" = "xyes"; then
+    AC_MSG_ERROR([*** Headless mode is required for tests.])
+fi
+
 # ------------------------------------------------------------------------------
 #                                  pkg-config
 # ------------------------------------------------------------------------------
@@ -241,6 +240,14 @@ else
    not_asked="$not_asked ncurses"
 fi

+# ------------------------------------------------------------------------------
+#                                   headless
+# ------------------------------------------------------------------------------
+
+if test "x$enable_headless" != "xyes" ; then
+    not_asked="$not_asked headless"
+fi
+
 # ------------------------------------------------------------------------------
 #                                    iconv
 # ------------------------------------------------------------------------------
@@ -309,79 +316,6 @@ else
    not_asked="$not_asked alias"
 fi

-# ---------------------------------- aspell ------------------------------------
-
-if test "x$enable_aspell" = "xyes" ; then
-    ac_found_enchant_lib="no"
-    if test "x$enable_enchant" = "xyes" ; then
-        PKG_CHECK_MODULES(ENCHANT, [enchant], ac_found_enchant_lib="yes", ac_found_enchant_lib="no")
-    fi
-    if test "x$ac_found_enchant_lib" = "xyes" ; then
-        CFLAGS="$CFLAGS -DUSE_ENCHANT"
-        ASPELL_LIB_USED="enchant"
-
-        # check if function enchant_get_version() exists
-        ac_save_CFLAGS="$CFLAGS"
-        ac_save_LDFLAGS="$LDFLAGS"
-        CFLAGS="$CFLAGS $ENCHANT_CFLAGS"
-        LDFLAGS="$LDFLAGS $ENCHANT_LIBS"
-        AC_CACHE_CHECK([for enchant_get_version() support], ac_cv_have_enchant_get_version, [
-        AC_LINK_IFELSE([AC_LANG_PROGRAM(
-            [[ #include <enchant.h>]],
-            [[ const char *version = enchant_get_version(); ]])],
-            [ ac_have_enchant_get_version="yes" ],
-            [ ac_have_enchant_get_version="no" ])])
-        CFLAGS="$ac_save_CFLAGS"
-        LDFLAGS="$ac_save_LDFLAGS"
-        if test "x$ac_have_enchant_get_version" = "xyes"; then
-            AC_DEFINE(HAVE_ENCHANT_GET_VERSION)
-        fi
-    else
-        ASPELL_CFLAGS=""
-        ASPELL_LFLAGS=""
-
-        AC_CHECK_HEADER(aspell.h,ac_found_aspell_header="yes",ac_found_aspell_header="no")
-        AC_CHECK_LIB(aspell,new_aspell_speller,ac_found_aspell_lib="yes",ac_found_aspell_lib="no")
-
-        AC_MSG_CHECKING(for aspell headers and libraries)
-        if test "x$ac_found_aspell_header" = "xno" -o "x$ac_found_aspell_lib" = "xno" ; then
-            AC_MSG_RESULT(no)
-            AC_MSG_WARN([
-*** Aspell headers and/or libraries couldn't be found on your system.
-*** Try to install them with your software package manager.
-*** WeeChat will be built without Aspell support.])
-            enable_aspell="no"
-            not_found="$not_found aspell"
-        else
-            AC_MSG_RESULT(yes)
-            ASPELL_LFLAGS="$ASPELL_LFLAGS -laspell"
-            ASPELL_LIB_USED="aspell"
-
-            # check if function aspell_version_string() exists
-            ac_save_LDFLAGS="$LDFLAGS"
-            LDFLAGS="$LDFLAGS $ASPELL_LFLAGS"
-            AC_CACHE_CHECK([for aspell_version_string() support], ac_cv_have_aspell_version_string, [
-            AC_LINK_IFELSE([AC_LANG_PROGRAM(
-                [[ #include <aspell.h>]],
-                [[ const char *version = aspell_version_string(); ]])],
-                [ ac_have_aspell_version_string="yes" ],
-                [ ac_have_aspell_version_string="no" ])])
-            LDFLAGS="$ac_save_LDFLAGS"
-            if test "x$ac_have_aspell_version_string" = "xyes"; then
-                AC_DEFINE(HAVE_ASPELL_VERSION_STRING)
-            fi
-        fi
-    fi
-else
-    not_asked="$not_asked aspell"
-fi
-
-if test "x$enable_aspell" = "xyes" ; then
-    AC_SUBST(ASPELL_CFLAGS)
-    AC_SUBST(ASPELL_LFLAGS)
-    AC_DEFINE(PLUGIN_ASPELL)
-fi
-
 # --------------------------------- buflist ------------------------------------

 if test "x$enable_buflist" = "xyes" ; then
@@ -533,66 +467,21 @@ fi
 PYTHON_VERSION=

 if test "x$enable_python" = "xyes" ; then
-    if test "x$enable_python3" = "xyes" ; then
-        AC_PATH_PROGS(PYTHON, python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python2 python)
+    if test "x$enable_python2" = "xyes" ; then
+        PKG_CHECK_MODULES(PYTHON, [python2], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python2`], [PYTHON_FOUND=no])
    else
-        AC_PATH_PROGS(PYTHON, python2.7 python2.6 python2.5 python2 python)
+        PKG_CHECK_MODULES(PYTHON, [python3-embed], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python3-embed`], [PYTHON_FOUND=no])
+        if test "x$PYTHON_FOUND" != "xyes"; then
+            PKG_CHECK_MODULES(PYTHON, [python3], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python3`], [PYTHON_FOUND=no])
+        fi
    fi
-    if test -z $PYTHON ; then
+    if test "x$PYTHON_FOUND" != "xyes" ; then
        AC_MSG_WARN([
 *** Python must be installed on your system but python interpreter couldn't be found in path.
 *** Please check that python is in path, or install it with your software package manager.
 *** WeeChat will be built without Python support.])
        enable_python="no"
        not_found="$not_found python"
-    else
-        PYTHON_SYSPREFIX=`$PYTHON -c 'import sys; sys.stdout.write("%s" % sys.prefix)'`
-        PYTHON_VERSION=`$PYTHON -c 'import sys; sys.stdout.write(sys.version[[:3]])'`
-        PYTHON_INCLUDE=`$PYTHON -c "import sys, distutils.sysconfig, string; sys.stdout.write(distutils.sysconfig.get_config_var('INCLUDEPY'))"`
-        PYTHON_OLD_VERSION=`$PYTHON -c "import sys; sys.stdout.write(str(sys.version_info < (2,5)))"`
-        if test "x$PYTHON_OLD_VERSION" = "xTrue" ; then
-            AC_MSG_WARN([
-*** Python >= 2.5 is needed to build Python plugin, version found: $PYTHON_VERSION.
-*** WeeChat will be built without Python support.])
-            enable_python="no"
-            not_found="$not_found python"
-        else
-            AC_MSG_CHECKING(for Python header files)
-            if test -r "$PYTHON_INCLUDE/Python.h"; then
-                PYTHON_CFLAGS="-I$PYTHON_INCLUDE"
-                AC_MSG_RESULT(found)
-                PYTHON_LIB=`$PYTHON -c "import sys, distutils.sysconfig; sys.stdout.write(distutils.sysconfig.get_config_var('LIBPL'))"`
-                PYTHON_LFLAGS="-lpython$PYTHON_VERSION "`$PYTHON -c "import sys, distutils.sysconfig; sys.stdout.write(distutils.sysconfig.get_config_var('LIBS')+' '+distutils.sysconfig.get_config_var('SYSLIBS')+' '+distutils.sysconfig.get_config_var('LINKFORSHARED'))"`
-                AC_MSG_CHECKING(for Python library)
-                if test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.so"; then
-                   PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
-                   AC_MSG_RESULT(found)
-                elif test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.a"; then
-                   PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
-                   AC_MSG_RESULT(found)
-                elif test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.dll.a"; then
-                   PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
-                   AC_MSG_RESULT(found)
-                elif test -r "$PYTHON_SYSPREFIX/lib/libpython$PYTHON_VERSION.so"; then
-                   PYTHON_LFLAGS="-L$PYTHON_SYSPREFIX/lib/ $PYTHON_LFLAGS"
-                   AC_MSG_RESULT(found)
-                else
-                    AC_MSG_WARN([
-*** Python library couldn't be found on your system.
-*** Try to install it with your software package manager.
-*** WeeChat will be built without Python support.])
-                    enable_python="no"
-                    not_found="$not_found python"
-                fi
-            else
-                AC_MSG_WARN([
-*** Python header files couldn't be found on your system.
-*** Try to install them with your software package manager.
-*** WeeChat will be built without Python support.])
-                enable_python="no"
-                not_found="$not_found python"
-            fi
-        fi
    fi
 else
    not_asked="$not_asked python"
@@ -600,7 +489,8 @@ fi

 if test "x$enable_python" = "xyes" ; then
    AC_SUBST(PYTHON_CFLAGS)
-    AC_SUBST(PYTHON_LFLAGS)
+    AC_SUBST(PYTHON_LIBS)
+    AC_SUBST(PYTHON_VERSION)
    AC_DEFINE(PLUGIN_PYTHON)
 fi

@@ -611,7 +501,7 @@ RUBY_VERSION=
 if test "x$enable_ruby" = "xyes" ; then
    RUBY_CFLAGS=""
    RUBY_LFLAGS=""
-    for v in "2.3" "2.2" "2.1" "2.0" "1.9" "1.8" ; do
+    for v in "3.0" "2.7" "2.6" "2.5" "2.4" "2.3" "2.2" "2.1" "2.0" "1.9" "1.8" ; do
        pkgconfig_ruby_found=`$PKGCONFIG --exists ruby-$v 2>/dev/null`
        if test "x$?" = "x0" ; then
            RUBY_VERSION=`$PKGCONFIG --modversion ruby-$v`
@@ -621,8 +511,9 @@ if test "x$enable_ruby" = "xyes" ; then
        fi
    done

+    # detect old Ruby versions
    if test "x$RUBY_CFLAGS" = "x" -o "x$RUBY_LFLAGS" = "x" ; then
-        AC_PATH_PROGS(RUBY, ruby1.9.3 ruby1.9.2 ruby1.9.1 ruby1.9 ruby1.8 ruby)
+        AC_PATH_PROGS(RUBY, ruby1.9.3 ruby1.9.2 ruby1.9.1 ruby1.9 ruby)
        if test -z $RUBY ; then
            AC_MSG_WARN([
 *** Ruby must be installed on your system but ruby interpreter couldn't be found in path.
@@ -664,7 +555,7 @@ fi
 LUA_VERSION=

 if test "x$enable_lua" = "xyes" ; then
-    ac_save_CPPFLAGS="$CPPFLAGS"
+    ac_save_CXXFLAGS="$CXXFLAGS"
    ac_save_CFLAGS="$CFLAGS"
    ac_save_LDFLAGS="$LDFLAGS"

@@ -673,7 +564,7 @@ if test "x$enable_lua" = "xyes" ; then

    if test -n "$lua_inc"; then
       CFLAGS="$CFLAGS -I$lua_inc"
-       CPPFLAGS="$CPPFLAGS -I$lua_inc"
+       CXXFLAGS="$CXXFLAGS -I$lua_inc"
    fi
    if test -n "$lua_lib"; then
       LDFLAGS="$LDFLAGS -L$lua_lib"
@@ -682,7 +573,7 @@ if test "x$enable_lua" = "xyes" ; then
    if test "x$LUA_CFLAGS" = "x" -o "x$LUA_LFLAGS" = "x" ; then
        AC_MSG_CHECKING(for Lua headers and libraries with pkg-config)
        echo
-        for l in "$lua_suffix" "" "52" "5.2" "51" "5.1" "50" "5.0" ; do
+        for l in "54" "5.4" "53" "5.3" "52" "5.2" "51" "5.1" "50" "5.0" "$lua_suffix" "" ; do
            pkgconfig_lua_found=`$PKGCONFIG --exists lua$l 2>/dev/null`
            if test "x$?" = "x0" ; then
                LUA_VERSION=`$PKGCONFIG --modversion lua$l`
@@ -701,7 +592,7 @@ if test "x$enable_lua" = "xyes" ; then

    if test "x$LUA_CFLAGS" = "x" -o "x$LUA_LFLAGS" = "x" ; then
        LUACONFIG=""
-        AC_CHECK_PROGS(LUACONFIG, lua-config lua-config52 lua-config5.2 lua-config51 lua-config5.1 lua-config50 lua-config5.0)
+        AC_CHECK_PROGS(LUACONFIG, lua-config54 lua-config5.4 lua-config53 lua-config5.3 lua-config52 lua-config5.2 lua-config51 lua-config5.1 lua-config50 lua-config5.0 lua-config)
        if test "x$LUACONFIG" != "x" ; then
            AC_MSG_CHECKING(for Lua headers and libraries with lua-config)
            echo
@@ -719,7 +610,7 @@ if test "x$enable_lua" = "xyes" ; then
        if test "x$ac_found_lua_header" = "xyes" -a "x$ac_found_liblua_header" = "xyes"; then
            LUA_CFLAGS="$CFLAGS"
        fi
-        for l in "$lua_suffix" "" "52" "5.2" "51" "5.1" "50" "5.0" ; do
+        for l in "54" "5.4" "53" "5.3" "52" "5.2" "51" "5.1" "50" "5.0" "$lua_suffix" "" ; do
            AC_CHECK_LIB(lua$l,lua_call,ac_found_lua_lib="yes",ac_found_lua_lib="no")
            if test "x$ac_found_lua_lib" = "xyes" ; then
                LUA_VERSION=">=5.1.0"
@@ -770,7 +661,7 @@ if test "x$enable_lua" = "xyes" ; then
    fi

    CFLAGS="$ac_save_CFLAGS"
-    CPPFLAGS="$ac_save_CPPFLAGS"
+    CXXFLAGS="$ac_save_CXXFLAGS"
    LDFLAGS="$ac_save_LDFLAGS"
 else
    not_asked="$not_asked lua"
@@ -832,7 +723,7 @@ if test "x$enable_guile" = "xyes" ; then
    guile_found="no"
    AC_MSG_CHECKING(for Guile headers and libraries)
    echo
-    for v in "2.0" ; do
+    for v in "3.0" "2.2" "2.0" ; do
        pkgconfig_guile_found=`$PKGCONFIG --exists guile-$v 2>/dev/null`
        if test "x$?" = "x0" ; then
            GUILE_VERSION=`$PKGCONFIG --modversion guile-$v`
@@ -889,7 +780,7 @@ if test "x$enable_javascript" = "xyes" ; then
    if test "x$ac_found_v8_header" = "xyes" ; then
        #AC_CHECK_LIB(v8,v8,ac_found_v8_lib="yes",ac_found_v8_lib="no")
        ac_save_LIBS="$LIBS"
-        LIBS="$LIBS -lv8"
+        LIBS="$LIBS -lv8 -lpthread"
        AC_MSG_CHECKING(for v8 usability in programs)
        AC_TRY_RUN([
            #include <v8.h>
@@ -903,7 +794,7 @@ if test "x$enable_javascript" = "xyes" ; then
            AC_MSG_RESULT(yes)
            v8_found="yes"
            V8_CFLAGS=""
-            V8_LFLAGS="-lv8"
+            V8_LFLAGS="-lv8 -lpthread"
        else
            AC_MSG_RESULT(no)
            AC_MSG_WARN([
@@ -936,16 +827,17 @@ AC_LANG_POP
 PHP_VERSION=

 if test "x$enable_php" = "xyes" ; then
-    ac_save_CPPFLAGS="$CPPFLAGS"
+    ac_save_CXXFLAGS="$CXXFLAGS"
    ac_save_CFLAGS="$CFLAGS"
    ac_save_LDFLAGS="$LDFLAGS"

    PHP_CFLAGS=""
    PHP_LFLAGS=""
+    PHP_VERSIONS="8.1 81 8.0 80 8 7.4 74 7.3 73 7.2 72 7.1 71 7.0 70 7 $php_suffix"

    if test -n "$php_inc"; then
       CFLAGS="$CFLAGS -I$php_inc"
-       CPPFLAGS="$CPPFLAGS -I$php_inc"
+       CXXFLAGS="$CXXFLAGS -I$php_inc"
    fi
    if test -n "$php_lib"; then
       LDFLAGS="$LDFLAGS -L$php_lib"
@@ -954,7 +846,7 @@ if test "x$enable_php" = "xyes" ; then
    if test "x$PHP_CFLAGS" = "x" -o "x$PHP_LFLAGS" = "x" ; then
        AC_MSG_CHECKING(for PHP headers and libraries with pkg-config)
        echo
-        for l in "7.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; do
+        for l in $PHP_VERSIONS "" ; do
            pkgconfig_php_found=`$PKGCONFIG --exists php$l 2>/dev/null`
            if test "x$?" = "x0" ; then
                pkgconfig_php_found=`$PKGCONFIG --atleast-version=7 php$l 2>/dev/null`
@@ -971,11 +863,12 @@ if test "x$enable_php" = "xyes" ; then
    if test "x$PHP_CFLAGS" = "x" -o "x$PHP_LFLAGS" = "x" ; then
        PHPCONFIG=""
        AC_MSG_CHECKING(for PHP headers and libraries with php-config)
-        for l in "7.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; do
+        echo
+        for l in $PHP_VERSIONS "" ; do
            AC_CHECK_PROG(PHPCONFIG, "php-config$l", "php-config$l")
            if test "x$PHPCONFIG" != "x" ; then
                php_config_version=`$PHPCONFIG --version`
-                if test "x${php_config_version#7}" != "x${php_config_version}" ; then
+                if echo "x$php_config_version" | grep -e "^x7" -e "^x8" 1>/dev/null 2>&1 ; then
                    PHP_VERSION=$php_config_version
                    PHP_CFLAGS=`$PHPCONFIG --includes`
                    PHP_LFLAGS="-L$($PHPCONFIG --prefix)/lib/ $($PHPCONFIG --libs) -lphp$l"
@@ -992,23 +885,25 @@ if test "x$enable_php" = "xyes" ; then
        if test "x$ac_found_php_header" = "xyes" ; then
            PHP_CFLAGS="$CFLAGS"
        fi
-        for l in "7.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; do
-            AC_CHECK_LIB(php$l,php_execute_script,ac_found_php_lib="yes",ac_found_php_lib="no")
-            if test "x$ac_found_php_lib" = "xyes" ; then
-                PHP_VERSION=">=7.0.0"
+        for l in $PHP_VERSIONS "" ; do
+            for PHP_LIB_SUFFIX in "$l" "$(echo $l | cut -c1)" "" ; do
+                AC_CHECK_LIB(php$PHP_LIB_SUFFIX,php_execute_script,ac_found_php_lib="yes",ac_found_php_lib="no")
+                if test "x$ac_found_php_lib" = "xyes" ; then
+                    PHP_VERSION=">=7.0.0"

-                PHP_LFLAGS="$LDFLAGS -lphp7 -lm"
+                    PHP_LFLAGS="$LDFLAGS -lphp$PHP_LIB_SUFFIX -lm"

-                ac2_save_LDFLAGS="$LDFLAGS"
-                LDFLAGS="$LDFLAGS -lphp7 -lm"
+                    ac2_save_LDFLAGS="$LDFLAGS"
+                    LDFLAGS="$LDFLAGS -lphp$PHP_LIB_SUFFIX -lm"

-                if echo "$host_os" | grep "^linux" 1>/dev/null 2>&1 ; then
-                    LDFLAGS="$LDFLAGS -ldl"
+                    if echo "$host_os" | grep "^linux" 1>/dev/null 2>&1 ; then
+                        LDFLAGS="$LDFLAGS -ldl"
+                    fi
+
+                    LDFLAGS="$ac2_save_LDFLAGS"
+                    break 2
                fi
-
-                LDFLAGS="$ac2_save_LDFLAGS"
-                break
-            fi
+            done
        done
    fi

@@ -1027,7 +922,7 @@ if test "x$enable_php" = "xyes" ; then
    fi

    CFLAGS="$ac_save_CFLAGS"
-    CPPFLAGS="$ac_save_CPPFLAGS"
+    CXXFLAGS="$ac_save_CXXFLAGS"
    LDFLAGS="$ac_save_LDFLAGS"
 else
    not_asked="$not_asked php"
@@ -1039,6 +934,79 @@ if test "x$enable_php" = "xyes" ; then
    AC_DEFINE(PLUGIN_PHP)
 fi

+# ----------------------------------- spell ------------------------------------
+
+if test "x$enable_spell" = "xyes" ; then
+    ac_found_enchant_lib="no"
+    if test "x$enable_enchant" = "xyes" ; then
+        PKG_CHECK_MODULES(ENCHANT, [enchant], ac_found_enchant_lib="yes", ac_found_enchant_lib="no")
+    fi
+    if test "x$ac_found_enchant_lib" = "xyes" ; then
+        CFLAGS="$CFLAGS -DUSE_ENCHANT"
+        SPELL_LIB_USED="enchant"
+
+        # check if function enchant_get_version() exists
+        ac_save_CFLAGS="$CFLAGS"
+        ac_save_LDFLAGS="$LDFLAGS"
+        CFLAGS="$CFLAGS $ENCHANT_CFLAGS"
+        LDFLAGS="$LDFLAGS $ENCHANT_LIBS"
+        AC_CACHE_CHECK([for enchant_get_version() support], ac_cv_have_enchant_get_version, [
+        AC_LINK_IFELSE([AC_LANG_PROGRAM(
+            [[ #include <enchant.h>]],
+            [[ const char *version = enchant_get_version(); ]])],
+            [ ac_have_enchant_get_version="yes" ],
+            [ ac_have_enchant_get_version="no" ])])
+        CFLAGS="$ac_save_CFLAGS"
+        LDFLAGS="$ac_save_LDFLAGS"
+        if test "x$ac_have_enchant_get_version" = "xyes"; then
+            AC_DEFINE(HAVE_ENCHANT_GET_VERSION)
+        fi
+    else
+        ASPELL_CFLAGS=""
+        ASPELL_LFLAGS=""
+
+        AC_CHECK_HEADER(aspell.h,ac_found_aspell_header="yes",ac_found_aspell_header="no")
+        AC_CHECK_LIB(aspell,new_aspell_speller,ac_found_aspell_lib="yes",ac_found_aspell_lib="no")
+
+        AC_MSG_CHECKING(for aspell headers and libraries)
+        if test "x$ac_found_aspell_header" = "xno" -o "x$ac_found_aspell_lib" = "xno" ; then
+            AC_MSG_RESULT(no)
+            AC_MSG_WARN([
+*** Aspell headers and/or libraries couldn't be found on your system.
+*** Try to install them with your software package manager.
+*** WeeChat will be built without Aspell support.])
+            enable_spell="no"
+            not_found="$not_found spell"
+        else
+            AC_MSG_RESULT(yes)
+            ASPELL_LFLAGS="$ASPELL_LFLAGS -laspell"
+            SPELL_LIB_USED="aspell"
+
+            # check if function aspell_version_string() exists
+            ac_save_LDFLAGS="$LDFLAGS"
+            LDFLAGS="$LDFLAGS $ASPELL_LFLAGS"
+            AC_CACHE_CHECK([for aspell_version_string() support], ac_cv_have_aspell_version_string, [
+            AC_LINK_IFELSE([AC_LANG_PROGRAM(
+                [[ #include <aspell.h>]],
+                [[ const char *version = aspell_version_string(); ]])],
+                [ ac_have_aspell_version_string="yes" ],
+                [ ac_have_aspell_version_string="no" ])])
+            LDFLAGS="$ac_save_LDFLAGS"
+            if test "x$ac_have_aspell_version_string" = "xyes"; then
+                AC_DEFINE(HAVE_ASPELL_VERSION_STRING)
+            fi
+        fi
+    fi
+else
+    not_asked="$not_asked spell"
+fi
+
+if test "x$enable_spell" = "xyes" ; then
+    AC_SUBST(ASPELL_CFLAGS)
+    AC_SUBST(ASPELL_LFLAGS)
+    AC_DEFINE(PLUGIN_SPELL)
+fi
+
 # --------------------------------- trigger ------------------------------------

 if test "x$enable_trigger" = "xyes" ; then
@@ -1051,6 +1019,18 @@ else
    not_asked="$not_asked trigger"
 fi

+# ---------------------------------- typing ------------------------------------
+
+if test "x$enable_typing" = "xyes" ; then
+    TYPING_CFLAGS=""
+    TYPING_LFLAGS=""
+    AC_SUBST(TYPING_CFLAGS)
+    AC_SUBST(TYPING_LFLAGS)
+    AC_DEFINE(PLUGIN_TYPING)
+else
+    not_asked="$not_asked typing"
+fi
+
 # ---------------------------------- xfer --------------------------------------

 if test "x$enable_xfer" = "xyes" ; then
@@ -1074,8 +1054,8 @@ AC_MSG_CHECKING(for gcrypt headers and libraries)
 if test "x$ac_found_gcrypt_header" = "xno" -o "x$ac_found_gcrypt_lib" = "xno" ; then
    AC_MSG_RESULT(no)
    AC_MSG_ERROR([
-*** libgcrypt was not found. You may want to get it from ftp://ftp.gnupg.org/gcrypt/libgcrypt/
-*** or try to install libgcrypt-dev with your software package manager.])
+*** libgcrypt was not found. You may want to get it from https://www.gnupg.org/ftp/gcrypt/libgcrypt/
+*** or try to install it with your software package manager.])
 else
    AC_MSG_RESULT(yes)
    GCRYPT_CFLAGS=`libgcrypt-config --cflags`
@@ -1088,29 +1068,21 @@ fi
 #                                   gnutls
 # ------------------------------------------------------------------------------

-if test "x$enable_gnutls" = "xyes" ; then
-    AC_CHECK_HEADER(gnutls/gnutls.h,ac_found_gnutls_header="yes",ac_found_gnutls_header="no")
-    AC_CHECK_LIB(gnutls,gnutls_global_init,ac_found_gnutls_lib="yes",ac_found_gnutls_lib="no")
+AC_CHECK_HEADER(gnutls/gnutls.h,ac_found_gnutls_header="yes",ac_found_gnutls_header="no")
+AC_CHECK_LIB(gnutls,gnutls_global_init,ac_found_gnutls_lib="yes",ac_found_gnutls_lib="no")

-    AC_MSG_CHECKING(for gnutls headers and libraries)
-    if test "x$ac_found_gnutls_header" = "xno" -o "x$ac_found_gnutls_lib" = "xno" ; then
-        AC_MSG_RESULT(no)
-        AC_MSG_WARN([
-*** libgnutls was not found. You may want to get it from ftp://ftp.gnutls.org/pub/gnutls/
-*** WeeChat will be built without GnuTLS support.])
-        enable_gnutls="no"
-        not_found="$not_found gnutls"
-    else
-        AC_MSG_RESULT(yes)
-        GNUTLS_CFLAGS=`pkg-config gnutls --cflags`
-        GNUTLS_LFLAGS=`pkg-config gnutls --libs`
-        AC_SUBST(GNUTLS_CFLAGS)
-        AC_SUBST(GNUTLS_LFLAGS)
-        AC_DEFINE(HAVE_GNUTLS)
-        CFLAGS="$CFLAGS -DHAVE_GNUTLS"
-    fi
+AC_MSG_CHECKING(for gnutls headers and libraries)
+if test "x$ac_found_gnutls_header" = "xno" -o "x$ac_found_gnutls_lib" = "xno" ; then
+    AC_MSG_RESULT(no)
+    AC_MSG_ERROR([
+*** libgnutls was not found. You may want to get it from https://www.gnupg.org/ftp/gcrypt/gnutls/
+*** or try to install it with your software package manager.])
 else
-    not_asked="$not_asked gnutls"
+    AC_MSG_RESULT(yes)
+    GNUTLS_CFLAGS=`pkg-config gnutls --cflags`
+    GNUTLS_LFLAGS=`pkg-config gnutls --libs`
+    AC_SUBST(GNUTLS_CFLAGS)
+    AC_SUBST(GNUTLS_LFLAGS)
 fi

 # ------------------------------------------------------------------------------
@@ -1138,6 +1110,7 @@ fi

 if test "x$enable_largefile" = "xyes" ; then
   CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -D_LARGE_FILES"
+   CXXFLAGS="$CXXFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -D_LARGE_FILES"
 else
   not_asked="$not_asked largefile"
 fi
@@ -1192,8 +1165,8 @@ AC_MSG_CHECKING(for zlib headers and libraries)
 if test "x$ac_found_zlib_header" = "xno" -o "x$ac_found_zlib_lib" = "xno" ; then
    AC_MSG_RESULT(no)
    AC_MSG_ERROR([
-*** zlib was not found. You may want to get it from http://zlib.net/
-*** or try to install zlib1g-dev with your software package manager.])
+*** zlib was not found. You may want to get it from https://zlib.net/
+*** or try to install it with your software package manager.])
 else
    AC_MSG_RESULT(yes)
    ZLIB_CFLAGS=`pkg-config zlib --cflags`
@@ -1290,7 +1263,9 @@ if test "x$enable_man" = "xyes" -o "x$enable_doc" = "xyes"; then
        enable_man="no"
        enable_doc="no"
    fi
+    ASCIIDOCTOR_ARGS="-a experimental -a reproducible -a 'prewrap!' -a 'webfonts!' -a icons=font -a sectanchors -a source-highlighter=pygments -a pygments-style=native"
    AC_SUBST(ASCIIDOCTOR)
+    AC_SUBST(ASCIIDOCTOR_ARGS)
 fi

 # ------------------------------------------------------------------------------
@@ -1316,11 +1291,14 @@ AC_DEFINE_UNQUOTED(WEECHAT_SHAREDIR, "$WEECHAT_SHAREDIR")
 weechat_libdir=${libdir}/weechat
 AC_SUBST(weechat_libdir)

-COMMON_CFLAGS="-Wall -Wextra -Werror-implicit-function-declaration"
+COMMON_CFLAGS="-fsigned-char -Wall -Wextra -Werror-implicit-function-declaration"
+COMMON_CXXFLAGS="-fsigned-char -Wall -Wextra"
+
 AC_MSG_CHECKING([whether we have GNU assembler])
 GAS=`as --version < /dev/null 2>/dev/null | grep GNU`
 if test "$GAS"; then
    COMMON_CFLAGS="${COMMON_CFLAGS} -pipe"
+    COMMON_CXXFLAGS="${COMMON_CXXFLAGS} -pipe"
    AC_MSG_RESULT(yes)
 else
    AC_MSG_RESULT(no)
@@ -1330,10 +1308,18 @@ CFLAGS=`echo $CFLAGS | sed 's/ -g / /g'`
 CFLAGS=`echo $CFLAGS | sed 's/^-g //g'`
 CFLAGS=`echo $CFLAGS | sed 's/ -g$//g'`
 CFLAGS=`echo $CFLAGS | sed 's/^-g$//g'`
+
+CXXFLAGS=`echo $CXXFLAGS | sed 's/ -g / /g'`
+CXXFLAGS=`echo $CXXFLAGS | sed 's/^-g //g'`
+CXXFLAGS=`echo $CXXFLAGS | sed 's/ -g$//g'`
+CXXFLAGS=`echo $CXXFLAGS | sed 's/^-g$//g'`
+
 if test "x$debug" = "x0" ; then
    CFLAGS="$COMMON_CFLAGS $CFLAGS"
+    CXXFLAGS="$COMMON_CXXFLAGS $CXXFLAGS"
 else
    CFLAGS="$COMMON_CFLAGS $CFLAGS -g -O0"
+    CXXFLAGS="$COMMON_CXXFLAGS $CXXFLAGS -g -O0"
 fi

 LIBS="$LIBS $INTLLIBS"
@@ -1343,7 +1329,7 @@ freebsd*)
        if test "x$enable_perl" = "xyes" -o "x$enable_python" = "xyes" ; then
            CFLAGS="$CFLAGS -pthread"
        fi
-        CFLAGS="$CFLAGS $CPPFLAGS"
+        CFLAGS="$CFLAGS $CXXFLAGS"
        ;;
 openbsd*)
        if test "x$enable_python" = "xyes" ; then
@@ -1354,28 +1340,30 @@ netbsd*)
        if test "x$enable_perl" = "xyes" -o "x$enable_python" = "xyes" ; then
            CFLAGS="$CFLAGS -pthread"
        fi
-        CFLAGS="$CFLAGS $CPPFLAGS"
+        CFLAGS="$CFLAGS $CXXFLAGS"
        ;;
 gnu*)
        LDFLAGS="$LDFLAGS -lpthread"
        ;;
+haiku*)
+        LDFLAGS="$LDFLAGS -lnetwork"
+        ;;
 *)
        ;;
 esac

 CFLAGS="$CFLAGS -DWEECHAT_VERSION=\\\"$VERSION\\\" -DWEECHAT_LICENSE=\\\"$LICENSE\\\""
-CPPFLAGS="$CPPFLAGS -DWEECHAT_VERSION=\\\"$VERSION\\\" -DWEECHAT_LICENSE=\\\"$LICENSE\\\""
+CXXFLAGS="$CXXFLAGS -DWEECHAT_VERSION=\\\"$VERSION\\\" -DWEECHAT_LICENSE=\\\"$LICENSE\\\""

 # ------------------------------------------------------------------------------
 #                                output Makefiles
 # ------------------------------------------------------------------------------

-AM_CONDITIONAL(HAVE_GNUTLS,             test "$enable_gnutls" = "yes")
 AM_CONDITIONAL(HAVE_FLOCK,              test "$enable_flock" = "yes")
 AM_CONDITIONAL(HAVE_EAT_NEWLINE_GLITCH, test "$enable_eatnewlineglitch" = "yes")
 AM_CONDITIONAL(GUI_NCURSES,             test "$enable_ncurses" = "yes")
+AM_CONDITIONAL(HEADLESS,                test "$enable_headless" = "yes")
 AM_CONDITIONAL(PLUGIN_ALIAS,            test "$enable_alias" = "yes")
-AM_CONDITIONAL(PLUGIN_ASPELL,           test "$enable_aspell" = "yes")
 AM_CONDITIONAL(PLUGIN_BUFLIST,          test "$enable_buflist" = "yes")
 AM_CONDITIONAL(PLUGIN_CHARSET,          test "$enable_charset" = "yes")
 AM_CONDITIONAL(PLUGIN_EXEC,             test "$enable_exec" = "yes")
@@ -1393,28 +1381,31 @@ AM_CONDITIONAL(PLUGIN_TCL,              test "$enable_tcl" = "yes")
 AM_CONDITIONAL(PLUGIN_GUILE,            test "$enable_guile" = "yes")
 AM_CONDITIONAL(PLUGIN_JAVASCRIPT,       test "$enable_javascript" = "yes")
 AM_CONDITIONAL(PLUGIN_PHP,              test "$enable_php" = "yes")
+AM_CONDITIONAL(PLUGIN_SPELL,            test "$enable_spell" = "yes")
 AM_CONDITIONAL(PLUGIN_TRIGGER,          test "$enable_trigger" = "yes")
+AM_CONDITIONAL(PLUGIN_TYPING,           test "$enable_typing" = "yes")
 AM_CONDITIONAL(PLUGIN_XFER,             test "$enable_xfer" = "yes")
 AM_CONDITIONAL(TESTS,                   test "$enable_tests" = "yes")
 AM_CONDITIONAL(MAN,                     test "$enable_man" = "yes")
 AM_CONDITIONAL(DOC,                     test "$enable_doc" = "yes")

 AC_OUTPUT([Makefile
+           icons/Makefile
           doc/Makefile
+           doc/cs/Makefile
+           doc/de/Makefile
           doc/en/Makefile
+           doc/es/Makefile
           doc/fr/Makefile
           doc/it/Makefile
-           doc/de/Makefile
-           doc/pl/Makefile
-           doc/es/Makefile
-           doc/ru/Makefile
           doc/ja/Makefile
-           doc/cs/Makefile
+           doc/pl/Makefile
+           doc/ru/Makefile
+           doc/sr/Makefile
           src/Makefile
           src/core/Makefile
           src/plugins/Makefile
           src/plugins/alias/Makefile
-           src/plugins/aspell/Makefile
           src/plugins/buflist/Makefile
           src/plugins/charset/Makefile
           src/plugins/exec/Makefile
@@ -1432,10 +1423,14 @@ AC_OUTPUT([Makefile
           src/plugins/guile/Makefile
           src/plugins/javascript/Makefile
           src/plugins/php/Makefile
+           src/plugins/spell/Makefile
           src/plugins/trigger/Makefile
+           src/plugins/typing/Makefile
           src/plugins/xfer/Makefile
           src/gui/Makefile
           src/gui/curses/Makefile
+           src/gui/curses/normal/Makefile
+           src/gui/curses/headless/Makefile
           tests/Makefile
           intl/Makefile
           po/Makefile.in])
@@ -1448,20 +1443,20 @@ listgui=""
 if test "x$enable_ncurses" = "xyes" ; then
    listgui="$listgui ncurses"
 fi
+if test "x$enable_headless" = "xyes" ; then
+    listgui="$listgui headless"
+fi

 if test "x$listgui" = "x" ; then
    AC_MSG_ERROR([
 *** No interface specified...
-*** Please enable at least ncurses.])
+*** Please enable at least ncurses or headless.])
 fi

 listplugins=""
 if test "x$enable_alias" = "xyes"; then
    listplugins="$listplugins alias"
 fi
-if test "x$enable_aspell" = "xyes"; then
-    listplugins="$listplugins aspell($ASPELL_LIB_USED)"
-fi
 if test "x$enable_buflist" = "xyes"; then
    listplugins="$listplugins buflist"
 fi
@@ -1513,17 +1508,20 @@ fi
 if test "x$enable_php" = "xyes"; then
    listplugins="$listplugins php($PHP_VERSION)"
 fi
+if test "x$enable_spell" = "xyes"; then
+    listplugins="$listplugins spell($SPELL_LIB_USED)"
+fi
 if test "x$enable_trigger" = "xyes"; then
    listplugins="$listplugins trigger"
 fi
+if test "x$enable_typing" = "xyes"; then
+    listplugins="$listplugins typing"
+fi
 if test "x$enable_xfer" = "xyes"; then
    listplugins="$listplugins xfer"
 fi

 listoptional=""
-if test "x$enable_gnutls" = "xyes"; then
-    listoptional="$listoptional gnutls"
-fi
 if test "x$enable_flock" = "xyes"; then
    listoptional="$listoptional flock"
 fi
@@ -1564,7 +1562,6 @@ echo "   Compile with debug..... : $msg_debug"
 echo "   Compile tests.......... : $msg_tests"
 echo "   Man page............... : $msg_man"
 echo "   Documentation.......... : $msg_doc"
-echo "   Certificate authorities : ${CA_FILE}"

 if test "x$not_asked" != "x" || test "x$not_found" != "x"; then
    echo ""
@@ -1578,8 +1575,10 @@ if test "x$not_asked" != "x" || test "x$not_found" != "x"; then
 fi

 echo ""
-echo "WeeChat home directory is ${WEECHAT_HOME}"
-echo ""
+if test "x$WEECHAT_HOME" != "x" ; then
+    echo "WeeChat home directory is forced by default to: ${WEECHAT_HOME}"
+    echo ""
+fi
 eval echo "WeeChat will be installed in $bindir"
 echo ""
 echo "configure complete, now type 'make' to build WeeChat $VERSION"
@@ -1 +1 @@
-9
+12
@@ -4,31 +4,32 @@ Priority: optional
 Maintainer: Sébastien Helleu <flashcode@flashtux.org>
 Build-Depends:
    asciidoctor (>= 1.5.4),
-    debhelper (>= 9),
-    dh-exec,
+    debhelper (>= 12),
    cmake, pkg-config,
    libncursesw5-dev,
    gem2deb,
    libperl-dev,
-    python-dev,
+    python3-dev,
    libaspell-dev,
-    liblua5.1-0-dev,
+    liblua5.3-dev,
    tcl8.6-dev,
-    guile-2.0-dev,
-    libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
-    php7.1-dev, libphp7.1-embed, libxml2-dev,
+    guile-2.2-dev,
+    php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
+    libxml2-dev,
    libcurl4-gnutls-dev,
    libgcrypt20-dev,
    libgnutls28-dev,
    zlib1g-dev
-Standards-Version: 3.9.8
+Standards-Version: 4.6.0.1
 Homepage: https://weechat.org/
-Vcs-Git: https://anonscm.debian.org/git/users/kolter/weechat.git
-Vcs-Browser: https://anonscm.debian.org/git/users/kolter/weechat.git
+Vcs-Git: https://salsa.debian.org/kolter/weechat.git
+Vcs-Browser: https://salsa.debian.org/kolter/weechat

 Package: weechat-devel
 Architecture: all
-Depends: ${misc:Depends}, weechat-devel-curses (>= ${source:Version})
+Depends:
+    ${misc:Depends},
+    weechat-devel-curses (>= ${source:Version}) | weechat-devel-headless (>= ${source:Version})
 Suggests: weechat-devel-doc (= ${source:Version})
 Conflicts: weechat
 Description: Fast, light and extensible chat client (metapackage)
@@ -45,18 +46,22 @@ Description: Fast, light and extensible chat client (metapackage)
  - 256 colors support
  - incremental text search
  - dynamic filtering of buffer content
-  - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
-  - scripts manager
+  - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+  - script manager
  - spell checking
  - highly customizable and extensible
  - and much more!

 Package: weechat-devel-curses
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-core (= ${binary:Version})
-Conflicts: weechat-curses
-Recommends: weechat-devel-plugins (= ${binary:Version})
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-devel-core (= ${binary:Version})
+Recommends:
+    weechat-devel-plugins (= ${binary:Version})
 Suggests: weechat-devel-doc (= ${source:Version})
+Conflicts: weechat-curses
 Description: Fast, light and extensible chat client - console client
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
@@ -71,30 +76,71 @@ Description: Fast, light and extensible chat client - console client
  - 256 colors support
  - incremental text search
  - dynamic filtering of buffer content
-  - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
-  - scripts manager
+  - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+  - script manager
  - spell checking
  - highly customizable and extensible
  - and much more!
 .
 This package provides the console client (ncurses).

+Package: weechat-devel-headless
+Architecture: any
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-devel-core (= ${binary:Version})
+Recommends: weechat-devel-plugins (= ${binary:Version})
+Suggests: weechat-devel-doc (= ${source:Version})
+Conflicts: weechat-headless
+Description: Fast, light and extensible chat client - headless client
+ WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
+ for many operating systems. Everything can be done with a keyboard.
+ It is customizable and extensible with plugins/scripts, and includes:
+  - support of IRC protocol (native)
+  - support of XMPP/Jabber protocol (with additional script)
+  - nicklist
+  - smart hotlist
+  - horizontal and vertical split
+  - double charset support (decode/encode)
+  - FIFO pipe for remote control
+  - 256 colors support
+  - incremental text search
+  - dynamic filtering of buffer content
+  - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+  - script manager
+  - spell checking
+  - highly customizable and extensible
+  - and much more!
+ .
+ This package provides the headless client.
+
 Package: weechat-devel-core
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: weechat-core
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends}
 Suggests: weechat-devel-doc (= ${source:Version})
+Conflicts: weechat-core
 Description: Fast, light and extensible chat client - core files
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
 This package provides core plugins and locales files for WeeChat. It
 currently ships the following plugins: alias, buflist, charset, fset, irc,
- logger and xfer. It is useless without weechat-curses.
+ logger and xfer. It is useless without weechat-curses or weechat-headless.

 Package: weechat-devel-plugins
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
+Recommends:
+    weechat-devel-perl,
+    weechat-devel-python,
+    weechat-devel-ruby
+Suggests: weechat-scripts (>> 20090221-1)
 Conflicts: weechat-plugins
 Description: Fast, light and extensible chat client - plugins
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -102,27 +148,34 @@ Description: Fast, light and extensible chat client - plugins
 .
 This package provides some plugins to enhance WeeChat. It currently
 ships the following plugins:
-  - scripts manager
+  - script manager
  - Spell checking (thanks to aspell)
  - FIFO pipe for remote control
  - Relay (IRC proxy and WeeChat protocol)
  - Trigger
+  - Typing

 Package: weechat-devel-python
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
 Conflicts: weechat-python
-Description: Fast, light and extensible chat client - python plugin
+Description: Fast, light and extensible chat client - Python 3 plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
- This package provides the Python scripting API plugin.
+ This package provides the Python 3 scripting API plugin.

 Package: weechat-devel-perl
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
 Conflicts: weechat-perl
-Description: Fast, light and extensible chat client - perl plugin
+Description: Fast, light and extensible chat client - Perl plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -130,9 +183,12 @@ Description: Fast, light and extensible chat client - perl plugin

 Package: weechat-devel-ruby
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
 Conflicts: weechat-ruby
-Description: Fast, light and extensible chat client - ruby plugin
+Description: Fast, light and extensible chat client - Ruby plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -140,9 +196,12 @@ Description: Fast, light and extensible chat client - ruby plugin

 Package: weechat-devel-lua
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
 Conflicts: weechat-lua
-Description: Fast, light and extensible chat client - lua plugin
+Description: Fast, light and extensible chat client - Lua plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -150,40 +209,39 @@ Description: Fast, light and extensible chat client - lua plugin

 Package: weechat-devel-tcl
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
 Conflicts: weechat-tcl
-Description: Fast, light and extensible chat client - tcl plugin
+Description: Fast, light and extensible chat client - Tcl plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
- This package provides the TCL scripting API plugin.
+ This package provides the Tcl scripting API plugin.

 Package: weechat-devel-guile
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
 Conflicts: weechat-guile
-Description: Fast, light and extensible chat client - guile plugin
+Description: Fast, light and extensible chat client - Guile plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
 This package provides the Guile scripting API plugin.

-Package: weechat-devel-javascript
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
-Conflicts: weechat-javascript
-Description: Fast, light and extensible chat client - javascript plugin
- WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
- for many operating systems. Everything can be done with a keyboard.
- .
- This package provides the JavaScript scripting API plugin.
-
 Package: weechat-devel-php
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version}),
- libphp7.1-embed
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version}),
+    libphp-embed
 Conflicts: weechat-php
-Description: Fast, light and extensible chat client - php plugin
+Description: Fast, light and extensible chat client - PHP plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -202,7 +260,7 @@ Description: Fast, light and extensible chat client - documentation

 Package: weechat-devel-dev
 Section: devel
-Architecture: all
+Architecture: any
 Depends: ${misc:Depends}
 Conflicts: weechat-dev
 Description: Fast, light and extensible chat client - development headers
@@ -210,16 +268,3 @@ Description: Fast, light and extensible chat client - development headers
 for many operating systems. Everything can be done with a keyboard.
 .
 This package contains the headers needed to build plugins.
-
-Package: weechat-devel-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: ${misc:Depends}, weechat-devel-curses (= ${binary:Version}) |
- weechat-devel-core (= ${binary:Version}), weechat-devel-plugins (= ${binary:Version})
-Conflicts: weechat-dbg
-Description: Fast, light and extensible chat client - debugging symbols
- WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
- for many operating systems. Everything can be done with a keyboard.
- .
- This package contains gdb debugging symbols for the WeeChat packages.
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f

+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
 BUILDDIR = builddir

 $(BUILDDIR)/Makefile:
@@ -7,6 +9,7 @@ $(BUILDDIR)/Makefile:
 	cd $(BUILDDIR) && \
 	cmake .. \
 		-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
+		-DLIBDIR=/usr/lib/${DEB_HOST_MULTIARCH} \
 		-DENABLE_DOC:BOOL=ON \
 		-DENABLE_MAN:BOOL=ON \
 		-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
@@ -15,19 +18,16 @@ $(BUILDDIR)/Makefile:
 		-DCMAKE_SKIP_RPATH:BOOL=ON \
 		-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON

-override_dh_auto_build: $(BUILDDIR)/Makefile
-	dh_auto_build
-
 override_dh_auto_configure:
 	# the package also has autotools buildsys and
 	# debhelper try to use it but that's not needed
 	echo

+override_dh_auto_build: $(BUILDDIR)/Makefile
+	dh_auto_build
+
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog.adoc

-override_dh_strip:
-	dh_strip --dbg-package=weechat-devel-dbg
-
 %:
-	dh $@ --parallel --builddirectory=$(BUILDDIR)
+	dh $@ --builddirectory=$(BUILDDIR) --without autoreconf
@@ -0,0 +1,10 @@
+Document: weechat-faq-es
+Title: WeeChat FAQ (Spanish)
+Author: Sébastien Helleu
+Abstract: This document answers frequently asked questions
+ about the WeeChat IRC client (Spanish version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_faq.es.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_faq.es.html
@@ -1,10 +0,0 @@
-Document: weechat-tester-de
-Title: WeeChat tester's guide (German)
-Author: Sébastien Helleu
-Abstract: This document describes how to test and report
- bugs against the WeeChat IRC Client (German version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_tester.de.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_tester.de.html
@@ -1,10 +0,0 @@
-Document: weechat-tester-en
-Title: WeeChat tester's guide (English)
-Author: Sébastien Helleu
-Abstract: This document describes how to test and report
- bugs against the WeeChat IRC Client (English version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_tester.en.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_tester.en.html
@@ -1,10 +0,0 @@
-Document: weechat-tester-fr
-Title: WeeChat tester's guide (French)
-Author: Sébastien Helleu
-Abstract: This document describes how to test and report
- bugs against the WeeChat IRC Client (French version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_tester.fr.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_tester.fr.html
@@ -1,10 +0,0 @@
-Document: weechat-tester-it
-Title: WeeChat tester's guide (Italian)
-Author: Sébastien Helleu
-Abstract: This document describes how to test and report
- bugs against the WeeChat IRC Client (Italian version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_tester.it.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_tester.it.html
@@ -1,10 +0,0 @@
-Document: weechat-tester-ja
-Title: WeeChat tester's guide (Japanese)
-Author: Sébastien Helleu
-Abstract: This document describes how to test and report
- bugs against the WeeChat IRC Client (Japanese version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_tester.ja.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_tester.ja.html
@@ -1,10 +0,0 @@
-Document: weechat-tester-pl
-Title: WeeChat tester's guide (Polish)
-Author: Sébastien Helleu
-Abstract: This document describes how to test and report
- bugs against the WeeChat IRC Client (Polish version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_tester.pl.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_tester.pl.html
@@ -0,0 +1 @@
+../debian-stable/weechat-headless.dirs
@@ -0,0 +1 @@
+../debian-stable/weechat-headless.install
@@ -1 +0,0 @@
-../debian-stable/weechat-javascript.dirs
@@ -1 +0,0 @@
-../debian-stable/weechat-javascript.install
@@ -1,9 +1,22 @@
+weechat (2.1-1) unstable; urgency=medium
+
+  This release introduces a new headless client and a new PHP plugin for
+  scripting (respectively weechat-headless and weechat-php binary
+  packages).
+  To avoid at least unnecessary dependencies, each plugin has its own
+  separate binary package:
+    weechat-{perl,python,ruby,lua,guile,javascript,php}
+  Depending on your needs about scripting with weechat you should consider
+  to install the missing packages.
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Wed, 21 Mar 2018 07:53:40 +0100
+
 weechat (1.1.1-1) unstable; urgency=medium

  Since version 1.1, there is a new format for regexp replacement in
  triggers. This format is incompatible with version 1.0. The existing
  triggers will not be automatically updated.
-  See http://www.weechat.org/files/releasenotes/ReleaseNotes-1.1.html
+  See https://weechat.org/files/releasenotes/ReleaseNotes-1.1.html

 -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 25 Jan 2015 20:41:50 +0100

@@ -13,7 +26,7 @@ weechat (0.3.1-1) unstable; urgency=low
  are stronger checks while connecting with SSL. By default, if a connection
  is not fully trusted it will fail.
  You can find more information on how to handle this new behaviour here:
-    https://weechat.org/blog/post/2009/12/01/SSL-certificates
+    https://blog.weechat.org/post/2009/12/01/SSL-certificates

 -- Emmanuel Bouthenot <kolter@debian.org>  Mon, 25 Jan 2010 12:35:11 +0100

@@ -1,3 +1,193 @@
+weechat (3.3-1) unstable; urgency=medium
+
+  * New upstream release
+  * Remove patch merged upstream (which command detection in libgcrypt)
+  * Minor updates in debian/copyright
+  * Enable Typing plugin
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Mon, 20 Sep 2021 10:05:56 +0000
+
+weechat (3.2.1-1) unstable; urgency=medium
+
+  * New upstream release
+    - fix CVE-2021-40516: possible denial of service (crash) via a crafted
+    WebSocket in relay plugin (Closes: #993803)
+  * Add a patch to fix a FTBFS (related to recent changes on which command
+    output) (Closes: #993333)
+  * Bump Standards-Version to 4.6.0.1
+  * Remove useless HomePage field in upstream/metadata
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 07 Sep 2021 20:25:39 +0000
+
+weechat (3.0.1-1) unstable; urgency=medium
+
+  * New upstream release
+  * Bump Standards-Version to 4.5.1
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Wed, 03 Mar 2021 05:30:44 +0000
+
+weechat (3.0-1) unstable; urgency=medium
+
+  * New upstream release
+  * Build against Guile 3.0 (instead of 2.2) (Closes: #969680)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sat, 21 Nov 2020 07:34:12 +0000
+
+weechat (2.9-1) unstable; urgency=medium
+
+  * New upstream release
+  * Refresh ASCII Doctor options patch
+  * Switch debhelper compatibility to 13 and add debian/not-installed
+    accordingly
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sat, 15 Aug 2020 20:31:09 +0000
+
+weechat (2.8-1) unstable; urgency=medium
+
+  * New upstream release
+    - Fix FTBFS with ruby 2.7 (Closes: #954701, #954789)
+    - Remove patch to fix compilation error while testing iconv support
+    - Remove patch to fix a crash when loading script with PHP 7.4
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sat, 04 Apr 2020 09:01:45 +0000
+
+weechat (2.7.1-1) unstable; urgency=medium
+
+  * New upstream release
+    - fix CVE-2020-8955: possible remote DOS via malformed IRC messages
+      (Closes: #951289)
+    - rebuilt against python 3.8 (Closes: #953620)
+  * Remove Guile 2.2 support patch (merged upstream)
+  * Add a patch to fix compilation error while testing iconv support
+  * Add a patch to fix a crash when loading script with PHP 7.4
+  * Bump Standards-Version to 4.5.0
+  * Replace gem2deb build dependency by ruby-dev to facilitate
+    transitions to new versions of ruby (Closes: #951713)
+  * Set Rules-Requires-Root to no
+  * Switch debhelper compatibility to 12
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Mon, 09 Mar 2020 14:59:31 +0000
+
+weechat (2.6-2) unstable; urgency=medium
+
+  * Add a patch from upstream to support Guile 2.2 (Closes: #885235)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Fri, 11 Oct 2019 15:07:22 +0000
+
+weechat (2.6-1) unstable; urgency=medium
+
+  * New upstream release
+  * Build only with Python3 (Closes: #938817)
+  * Bump Standards-Version to 4.4.0
+  * Build Lua plugin against Lua 5.3
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 17 Sep 2019 13:30:32 +0000
+
+weechat (2.4-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 03 Mar 2019 19:29:13 +0000
+
+weechat (2.3-1) unstable; urgency=medium
+
+  * New upstream release
+  * Bump Standards-Version to 4.3.0
+  * Switch debhelper compatibility to 12
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Fri, 04 Jan 2019 16:06:44 +0000
+
+weechat (2.2-1) unstable; urgency=medium
+
+  * New upstream release
+  * Remove upstream patch about localized manpages for weechat-headless
+  * Bump Standards-Version to 4.1.5
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Wed, 19 Sep 2018 09:41:45 +0000
+
+weechat (2.1-2) unstable; urgency=medium
+
+  * Disable build of javascript plugin to fix weechat autoremoval from
+    testing (RC bugs in libv8) (Closes: #894680)
+  * Add missing localized manpages for weechat-headless
+  * Fix debian/copyright Format URI
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 03 Apr 2018 10:48:35 +0200
+
+weechat (2.1-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #887114)
+    - Enable build against Ruby 2.5 (Closes: #892072)
+    - New PHP plugin (update build dependencies accordingly)
+  * Split up the package so that plugins are now separated in multiple
+    binary packages to avoid unnecessary dependencies (Closes: #745266)
+  * Switch debhelper compatibility to 11
+  * Bump Standards-Version to 4.1.3
+  * Add debian/upstream/metadata (DEP 12)
+  * Rewrite debian/copyright to be more accurate
+  * Update Vcs-Git and Vcs-Browser with new repository on salsa.debian.org
+  * Update debian/NEWS to introduces weechat-headless and the package split
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Wed, 21 Mar 2018 07:46:21 +0100
+
+weechat (1.9.1-1) unstable; urgency=medium
+
+  * New upstream release
+    - CVE-2017-14727 - Include a patch which fix a possible crash in logger
+      plugin (Closes: #876553)
+  * Disable build of javascript plugin to fix weechat autoremoval from
+    testing (RC bugs in libv8)
+  * Bump Standards-Version to 4.1.0
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sat, 23 Sep 2017 21:47:32 +0200
+
+weechat (1.9-1) unstable; urgency=medium
+
+  * New upstream release
+  * Remove useless weechat-dbg binary package
+  * Bump Standards-Version to 4.0.0
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 04 Jul 2017 13:29:55 +0200
+
+weechat (1.8-1) unstable; urgency=medium
+
+  * New upstream release
+  * Remove usless patches (backports from upstream)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 16 May 2017 14:53:07 +0200
+
+weechat (1.7-3) unstable; urgency=medium
+
+  * Add a patch to fix CVE-2017-8073 which allows a remote crash by
+    sending a filename via DCC to the IRC plugin (Closes: #861121)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 25 Apr 2017 10:46:10 +0200
+
+weechat (1.7-2) unstable; urgency=medium
+
+  * Add a patch to fix slowness after terminal resize (Closes: #855079)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Fri, 24 Feb 2017 16:43:09 +0100
+
+weechat (1.7-1) unstable; urgency=medium
+
+  * New upstream release
+  * Remove lintian-override for weechat-curses manpage
+  * Add a lintian-override about no hardening flags on fifo.so plugin
+    (false positive)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Thu, 09 Feb 2017 20:15:48 +0100
+
+weechat (1.6-1) unstable; urgency=medium
+
+  * New upstream release
+  * Add a patch to build html documentation without requiring data
+    (javascript, fonts) on external websites (potential privacy breach)
+  * Documentation is now built with asciidoctor (adjust dependencies
+    accordingly)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Thu, 06 Oct 2016 13:55:35 +0200
+
 weechat (1.5-1) unstable; urgency=medium

  * New upstream release
@@ -1 +1 @@
-9
+12
@@ -4,31 +4,32 @@ Priority: optional
 Maintainer: Emmanuel Bouthenot <kolter@debian.org>
 Build-Depends:
    asciidoctor (>= 1.5.4),
-    debhelper (>= 9),
-    dh-exec,
+    debhelper (>= 12),
    cmake, pkg-config,
    libncursesw5-dev,
    gem2deb,
    libperl-dev,
-    python-dev,
+    python3-dev,
    libaspell-dev,
-    liblua5.1-0-dev,
+    liblua5.3-dev,
    tcl8.6-dev,
-    guile-2.0-dev,
-    libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
-    php7.1-dev, libphp7.1-embed, libxml2-dev,
+    guile-2.2-dev,
+    php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
+    libxml2-dev,
    libcurl4-gnutls-dev,
    libgcrypt20-dev,
    libgnutls28-dev,
    zlib1g-dev
-Standards-Version: 3.9.8
+Standards-Version: 4.6.0.1
 Homepage: https://weechat.org/
-Vcs-Git: https://anonscm.debian.org/git/users/kolter/weechat.git
-Vcs-Browser: https://anonscm.debian.org/git/users/kolter/weechat.git
+Vcs-Git: https://salsa.debian.org/kolter/weechat.git
+Vcs-Browser: https://salsa.debian.org/kolter/weechat

 Package: weechat
 Architecture: all
-Depends: ${misc:Depends}, weechat-curses (>= ${source:Version})
+Depends:
+    ${misc:Depends},
+    weechat-curses (>= ${source:Version}) | weechat-headless (>= ${source:Version})
 Suggests: weechat-doc (= ${source:Version})
 Description: Fast, light and extensible chat client (metapackage)
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -44,18 +45,20 @@ Description: Fast, light and extensible chat client (metapackage)
  - 256 colors support
  - incremental text search
  - dynamic filtering of buffer content
-  - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
-  - scripts manager
+  - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+  - script manager
  - spell checking
  - highly customizable and extensible
  - and much more!

 Package: weechat-curses
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-core (= ${binary:Version})
-Conflicts: weechat-common
-Breaks: weechat-scripts (<= 20090221-1)
-Recommends: weechat-plugins (= ${binary:Version})
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-core (= ${binary:Version})
+Recommends:
+    weechat-plugins (= ${binary:Version})
 Suggests: weechat-doc (= ${source:Version})
 Description: Fast, light and extensible chat client - console client
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -71,18 +74,49 @@ Description: Fast, light and extensible chat client - console client
  - 256 colors support
  - incremental text search
  - dynamic filtering of buffer content
-  - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
-  - scripts manager
+  - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+  - script manager
  - spell checking
  - highly customizable and extensible
  - and much more!
 .
 This package provides the console client (ncurses).

+Package: weechat-headless
+Architecture: any
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-core (= ${binary:Version})
+Recommends: weechat-plugins (= ${binary:Version})
+Suggests: weechat-doc (= ${source:Version})
+Description: Fast, light and extensible chat client - headless client
+ WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
+ for many operating systems. Everything can be done with a keyboard.
+ It is customizable and extensible with plugins/scripts, and includes:
+  - support of IRC protocol (native)
+  - support of XMPP/Jabber protocol (with additional script)
+  - nicklist
+  - smart hotlist
+  - horizontal and vertical split
+  - double charset support (decode/encode)
+  - FIFO pipe for remote control
+  - 256 colors support
+  - incremental text search
+  - dynamic filtering of buffer content
+  - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+  - script manager
+  - spell checking
+  - highly customizable and extensible
+  - and much more!
+ .
+ This package provides the headless client.
+
 Package: weechat-core
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: weechat-common, weechat-plugins (<< 0.3.0)
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends}
 Suggests: weechat-doc (= ${source:Version})
 Description: Fast, light and extensible chat client - core files
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -90,11 +124,18 @@ Description: Fast, light and extensible chat client - core files
 .
 This package provides core plugins and locales files for WeeChat. It
 currently ships the following plugins: alias, buflist, charset, fset, irc,
- logger and xfer. It is useless without weechat-curses.
+ logger and xfer. It is useless without weechat-curses or weechat-headless.

 Package: weechat-plugins
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
+Recommends:
+    weechat-perl,
+    weechat-python,
+    weechat-ruby
 Suggests: weechat-scripts (>> 20090221-1)
 Description: Fast, light and extensible chat client - plugins
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -102,25 +143,32 @@ Description: Fast, light and extensible chat client - plugins
 .
 This package provides some plugins to enhance WeeChat. It currently
 ships the following plugins:
-  - scripts manager
+  - script manager
  - Spell checking (thanks to aspell)
  - FIFO pipe for remote control
  - Relay (IRC proxy and WeeChat protocol)
  - Trigger
+  - Typing

 Package: weechat-python
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
-Description: Fast, light and extensible chat client - python plugin
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
+Description: Fast, light and extensible chat client - Python 3 plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
- This package provides the Python scripting API plugin.
+ This package provides the Python 3 scripting API plugin.

 Package: weechat-perl
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
-Description: Fast, light and extensible chat client - perl plugin
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
+Description: Fast, light and extensible chat client - Perl plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -128,8 +176,11 @@ Description: Fast, light and extensible chat client - perl plugin

 Package: weechat-ruby
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
-Description: Fast, light and extensible chat client - ruby plugin
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
+Description: Fast, light and extensible chat client - Ruby plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -137,8 +188,11 @@ Description: Fast, light and extensible chat client - ruby plugin

 Package: weechat-lua
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
-Description: Fast, light and extensible chat client - lua plugin
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
+Description: Fast, light and extensible chat client - Lua plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -146,36 +200,36 @@ Description: Fast, light and extensible chat client - lua plugin

 Package: weechat-tcl
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
-Description: Fast, light and extensible chat client - tcl plugin
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
+Description: Fast, light and extensible chat client - Tcl plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
- This package provides the TCL scripting API plugin.
+ This package provides the Tcl scripting API plugin.

 Package: weechat-guile
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
-Description: Fast, light and extensible chat client - guile plugin
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
+Description: Fast, light and extensible chat client - Guile plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
 This package provides the Guile scripting API plugin.

-Package: weechat-javascript
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
-Description: Fast, light and extensible chat client - javascript plugin
- WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
- for many operating systems. Everything can be done with a keyboard.
- .
- This package provides the JavaScript scripting API plugin.
-
 Package: weechat-php
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}),
- libphp7.1-embed
-Description: Fast, light and extensible chat client - php plugin
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version}),
+    libphp-embed
+Description: Fast, light and extensible chat client - PHP plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -193,22 +247,10 @@ Description: Fast, light and extensible chat client - documentation

 Package: weechat-dev
 Section: devel
-Architecture: all
+Architecture: any
 Depends: ${misc:Depends}
 Description: Fast, light and extensible chat client - development headers
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
 This package contains the headers needed to build plugins.
-
-Package: weechat-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: ${misc:Depends}, weechat-curses (= ${binary:Version}) |
- weechat-core (= ${binary:Version}), weechat-plugins (= ${binary:Version})
-Description: Fast, light and extensible chat client - debugging symbols
- WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
- for many operating systems. Everything can be done with a keyboard.
- .
- This package contains gdb debugging symbols for the WeeChat packages.
@@ -1,17 +1,147 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: weechat
 Upstream-Contact: Sébastien Helleu <flashcode@flashtux.org>
 Source: https://weechat.org/

 Files: *
-Copyright: 2003-2017, Sébastien Helleu <flashcode@flashtux.org>
-           2005-2009, Emmanuel Bouthenot <kolter@openics.org>
-           2008-2009, Dmitry Kobylin <fnfal@academ.tsc.ru>
+Copyright: 2003-2021, Sébastien Helleu <flashcode@flashtux.org>
+License: GPL-3+
+
+Files: src/core/wee-command.c
+       src/core/wee-command.h
+Copyright: 2005-2006, Emmanuel Bouthenot <kolter@openics.org>
+License: GPL-3+
+
+Files: src/core/wee-config-file.c
+       src/core/wee-config-file.h
+       src/core/wee-config.c
+       src/core/wee-config.h
+Copyright: 2005-2006, Emmanuel Bouthenot <kolter@openics.org>
+License: GPL-3+
+
+Files: src/core/hook/wee-hook-connect.c
+Copyright: 2012, Simon Arlott
+License: GPL-3+
+
+Files: src/core/hook/wee-hook-connect.h
+Copyright: 2012, Simon Arlott
+License: GPL-3+
+
+Files: src/gui/gui-history.c
+Copyright: 2005, Emmanuel Bouthenot <kolter@openics.org>
+License: GPL-3+
+
+Files: src/core/wee-completion.c
+       src/core/wee-log.c
+       src/core/wee-utf8.c
+       src/core/weechat.h
+       src/plugins/spell/spell-config.c
+       src/plugins/spell/spell-config.h
+       src/plugins/spell/spell-speller.c
+       src/plugins/spell/spell-speller.h
+       src/plugins/spell/spell.h
+       src/plugins/irc/irc-command.c
+       src/plugins/irc/irc.h
+Copyright: 2006, Emmanuel Bouthenot <kolter@openics.org>
+License: GPL-3+
+
+Files: src/core/wee-network.c
+Copyright: 2005-2010, Emmanuel Bouthenot <kolter@openics.org>
+           2010, Gu1ll4um3r0m41n <aeroxteam@gmail.com>
+           2012, Simon Arlott
+License: GPL-3+
+
+Files: src/plugins/spell/spell-bar-item.c
+       src/plugins/spell/spell-bar-item.h
+Copyright: 2012, Nils Görs <weechatter@arcor.de>
+License: GPL-3+
+
+Files: src/plugins/spell/spell.c
+Copyright: 2006, Emmanuel Bouthenot <kolter@openics.org>
+           2012, Nils Görs <weechatter@arcor.de>
+License: GPL-3+
+
+Files: src/plugins/guile/weechat-guile-api.c
+       src/plugins/irc/irc-server.h
+       src/plugins/plugin-script-api.c
+       src/plugins/plugin-script-api.h
+Copyright: 2012, Simon Arlott
+License: GPL-3+
+
+Files: src/plugins/irc/irc-protocol.c
+Copyright: 2006, Emmanuel Bouthenot <kolter@openics.org>
+           2014, Shawn Smith <ShawnSmith0828@gmail.com>
+License: GPL-3+
+
+Files: src/plugins/irc/irc-server.c
+Copyright: 2005-2010, Emmanuel Bouthenot <kolter@openics.org>
+           2012, Simon Arlott
+License: GPL-3+
+
+Files: src/plugins/lua/weechat-lua-api.c
+Copyright: 2006-2007, Emmanuel Bouthenot <kolter@openics.org>
+           2012, Simon Arlott
+License: GPL-3+
+
+Files: src/plugins/lua/weechat-lua-api.h
+       src/plugins/lua/weechat-lua.c
+       src/plugins/lua/weechat-lua.h
+Copyright: 2006-2007, Emmanuel Bouthenot <kolter@openics.org>
+License: GPL-3+
+
+Files: src/plugins/perl/weechat-perl-api.c
+Copyright: 2005-2008, Emmanuel Bouthenot <kolter@openics.org>
+           2012, Simon Arlott
+License: GPL-3+
+
+Files: src/plugins/perl/weechat-perl.c
+Copyright: 2005-2008, Emmanuel Bouthenot <kolter@openics.org>
+License: GPL-3+
+
+Files: src/plugins/php/weechat-php-api.c
+       src/plugins/php/weechat-php-api.h
+       src/plugins/php/weechat-php.c
+       src/plugins/php/weechat-php.h
+Copyright: 2006-2017, Adam Saponara <as@php.net>
+License: GPL-3-with-openssl-exception
+
+Files: src/plugins/python/weechat-python-api.c
+Copyright: 2005-2007, Emmanuel Bouthenot <kolter@openics.org>
+           2012, Simon Arlott
+License: GPL-3+
+
+Files: src/plugins/python/weechat-python-api.h
+       src/plugins/ruby/weechat-ruby-api.h
+       src/plugins/ruby/weechat-ruby.c
+       src/plugins/ruby/weechat-ruby.h
+Copyright: 2005-2007, Emmanuel Bouthenot <kolter@openics.org>
+License: GPL-3+
+
+Files: src/plugins/python/weechat-python.c
+       src/plugins/ruby/weechat-ruby-api.c
+Copyright: 2005-2007, Emmanuel Bouthenot <kolter@openics.org>
+           2012, Simon Arlott
+License: GPL-3+
+
+Files: src/plugins/python/weechat-python.h
+Copyright: 2005-2007, Emmanuel Bouthenot <kolter@openics.org>
+License: GPL-3+
+
+Files: src/plugins/tcl/weechat-tcl-api.c
+Copyright: 2008-2010, Dmitry Kobylin <fnfal@academ.tsc.ru>
+           2008, Julien Louis <ptitlouis@sysif.net>
+           2012, Simon Arlott
+License: GPL-3+
+
+Files: src/plugins/tcl/weechat-tcl-api.h
+       src/plugins/tcl/weechat-tcl.c
+       src/plugins/tcl/weechat-tcl.h
+Copyright: 2008-2010, Dmitry Kobylin <fnfal@academ.tsc.ru>
 License: GPL-3+

 Files: debian/*
 Copyright: 2005-2008, Julien Louis <ptitlouis@sysif.net>
-           2008-2016, Emmanuel Bouthenot <kolter@openics.org>
+           2008-2018, Emmanuel Bouthenot <kolter@openics.org>
 License: GPL-3+

 License: GPL-3+
@@ -26,7 +156,35 @@ License: GPL-3+
 General Public License for more details.
 .
 You should have received a copy of the GNU General Public License along
- with this program.  If not, see <http://www.gnu.org/licenses/>.
+ with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 On Debian systems, the complete text of the GNU General Public License,
 Version 3 can be found in the file /usr/share/common-licenses/GPL-3
+
+License: GPL-3-with-openssl-exception
+ WeeChat is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation, either version 3 of the License, or (at your
+ option) any later version.
+ .
+ WeeChat is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program.  If not, see <https://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License,
+ Version 3 can be found in the file /usr/share/common-licenses/GPL-3
+ .
+ Additional permission under GNU GPL version 3 section 7:
+ .
+ If you modify the Program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the licensors of the Program
+ grant you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work.
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f

+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
 BUILDDIR = builddir

 $(BUILDDIR)/Makefile:
@@ -7,6 +9,7 @@ $(BUILDDIR)/Makefile:
 	cd $(BUILDDIR) && \
 	cmake .. \
 		-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
+		-DLIBDIR=/usr/lib/${DEB_HOST_MULTIARCH} \
 		-DENABLE_DOC:BOOL=ON \
 		-DENABLE_MAN:BOOL=ON \
 		-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
@@ -15,19 +18,16 @@ $(BUILDDIR)/Makefile:
 		-DCMAKE_SKIP_RPATH:BOOL=ON \
 		-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON

-override_dh_auto_build: $(BUILDDIR)/Makefile
-	dh_auto_build
-
 override_dh_auto_configure:
 	# the package also has autotools buildsys and
 	# debhelper try to use it but that's not needed
 	echo

+override_dh_auto_build: $(BUILDDIR)/Makefile
+	dh_auto_build
+
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog.adoc

-override_dh_strip:
-	dh_strip --dbg-package=weechat-dbg
-
 %:
-	dh $@ --parallel --builddirectory=$(BUILDDIR)
+	dh $@ --builddirectory=$(BUILDDIR) --without autoreconf
@@ -1,2 +1,2 @@
-version=3
-opts=pgpsigurlmangle=s/$/.asc/  https://weechat.org/files/src/weechat-(\d.*)\.tar\.bz2
+version=4
+opts=pgpsigurlmangle=s/$/.asc/  https://weechat.org/download/ /files/src/weechat-(\d.*)\.tar\.xz
@@ -1,8 +1,8 @@
 usr/share/locale/
-usr/lib/weechat/plugins/alias.so
-usr/lib/weechat/plugins/buflist.so
-usr/lib/weechat/plugins/charset.so
-usr/lib/weechat/plugins/fset.so
-usr/lib/weechat/plugins/irc.so
-usr/lib/weechat/plugins/logger.so
-usr/lib/weechat/plugins/xfer.so
+usr/lib/*/weechat/plugins/alias.so
+usr/lib/*/weechat/plugins/buflist.so
+usr/lib/*/weechat/plugins/charset.so
+usr/lib/*/weechat/plugins/fset.so
+usr/lib/*/weechat/plugins/irc.so
+usr/lib/*/weechat/plugins/logger.so
+usr/lib/*/weechat/plugins/xfer.so
@@ -1,5 +1,6 @@
 usr/bin/weechat usr/bin/weechat-curses
 usr/share/man/man1/weechat.1.gz usr/share/man/man1/weechat-curses.1.gz
+usr/share/man/cs/man1/weechat.1.gz usr/share/man/cs/man1/weechat-curses.1.gz
 usr/share/man/de/man1/weechat.1.gz usr/share/man/de/man1/weechat-curses.1.gz
 usr/share/man/fr/man1/weechat.1.gz usr/share/man/fr/man1/weechat-curses.1.gz
 usr/share/man/it/man1/weechat.1.gz usr/share/man/it/man1/weechat-curses.1.gz
@@ -1,2 +1,2 @@
 usr/include/weechat/*
-usr/lib/pkgconfig/*
+usr/lib/*/pkgconfig/*
@@ -0,0 +1,10 @@
+Document: weechat-faq-es
+Title: WeeChat FAQ (Spanish)
+Author: Sébastien Helleu
+Abstract: This document answers frequently asked questions
+ about the WeeChat IRC client (Spanish version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/html/weechat_faq.es.html
+Files: /usr/share/doc/weechat-doc/html/weechat_faq.es.html
@@ -1,10 +0,0 @@
-Document: weechat-tester-de
-Title: WeeChat tester's guide (German)
-Author: Sébastien Helleu
-Abstract: This document describes how to test and report
- bugs against the WeeChat IRC Client (German version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-doc/html/weechat_tester.de.html
-Files: /usr/share/doc/weechat-doc/html/weechat_tester.de.html
@@ -1,10 +0,0 @@
-Document: weechat-tester-en
-Title: WeeChat tester's guide (English)
-Author: Sébastien Helleu
-Abstract: This document describes how to test and report
- bugs against the WeeChat IRC Client (English version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-doc/html/weechat_tester.en.html
-Files: /usr/share/doc/weechat-doc/html/weechat_tester.en.html
@@ -1,10 +0,0 @@
-Document: weechat-tester-fr
-Title: WeeChat tester's guide (French)
-Author: Sébastien Helleu
-Abstract: This document describes how to test and report
- bugs against the WeeChat IRC Client (French version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-doc/html/weechat_tester.fr.html
-Files: /usr/share/doc/weechat-doc/html/weechat_tester.fr.html
@@ -1,10 +0,0 @@
-Document: weechat-tester-it
-Title: WeeChat tester's guide (Italian)
-Author: Sébastien Helleu
-Abstract: This document describes how to test and report
- bugs against the WeeChat IRC Client (Italian version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-doc/html/weechat_tester.it.html
-Files: /usr/share/doc/weechat-doc/html/weechat_tester.it.html
@@ -1,10 +0,0 @@
-Document: weechat-tester-ja
-Title: WeeChat tester's guide (Japanese)
-Author: Sébastien Helleu
-Abstract: This document describes how to test and report
- bugs against the WeeChat IRC Client (Japanese version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-doc/html/weechat_tester.ja.html
-Files: /usr/share/doc/weechat-doc/html/weechat_tester.ja.html
@@ -1,10 +0,0 @@
-Document: weechat-tester-pl
-Title: WeeChat tester's guide (Polish)
-Author: Sébastien Helleu
-Abstract: This document describes how to test and report
- bugs against the WeeChat IRC Client (Polish version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-doc/html/weechat_tester.pl.html
-Files: /usr/share/doc/weechat-doc/html/weechat_tester.pl.html
@@ -1 +1 @@
-usr/lib/weechat/plugins/guile.so
+usr/lib/*/weechat/plugins/guile.so
@@ -0,0 +1 @@
+usr/bin
@@ -0,0 +1,3 @@
+usr/bin/weechat-headless
+usr/share/man/man1/weechat-headless.1
+usr/share/man/*/man1/weechat-headless.1
@@ -1 +0,0 @@
-usr/lib
@@ -1,3 +0,0 @@
-#!/usr/bin/dh-exec
-
-[amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel] usr/lib/weechat/plugins/javascript.so
@@ -1 +1 @@
-usr/lib/weechat/plugins/lua.so
+usr/lib/*/weechat/plugins/lua.so
@@ -1 +1 @@
-usr/lib/weechat/plugins/perl.so
+usr/lib/*/weechat/plugins/perl.so
@@ -1 +1 @@
-usr/lib/weechat/plugins/php.so
+usr/lib/*/weechat/plugins/php.so
@@ -1,6 +1,7 @@
-usr/lib/weechat/plugins/aspell.so
-usr/lib/weechat/plugins/exec.so
-usr/lib/weechat/plugins/fifo.so
-usr/lib/weechat/plugins/relay.so
-usr/lib/weechat/plugins/script.so
-usr/lib/weechat/plugins/trigger.so
+usr/lib/*/weechat/plugins/exec.so
+usr/lib/*/weechat/plugins/fifo.so
+usr/lib/*/weechat/plugins/relay.so
+usr/lib/*/weechat/plugins/script.so
+usr/lib/*/weechat/plugins/spell.so
+usr/lib/*/weechat/plugins/trigger.so
+usr/lib/*/weechat/plugins/typing.so
@@ -1 +1 @@
-usr/lib/weechat/plugins/python.so
+usr/lib/*/weechat/plugins/python.so
@@ -1 +1 @@
-usr/lib/weechat/plugins/ruby.so
+usr/lib/*/weechat/plugins/ruby.so
@@ -1 +1 @@
-usr/lib/weechat/plugins/tcl.so
+usr/lib/*/weechat/plugins/tcl.so
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -15,17 +15,64 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

 if(ENABLE_MAN OR ENABLE_DOC)
-
  find_package(Asciidoctor)
-
  if(ASCIIDOCTOR_FOUND)
+    # common asciidoctor arguments
+    set(ASCIIDOCTOR_ARGS -a experimental -a reproducible -a "prewrap!" -a "webfonts!" -a icons=font -a revnumber="${VERSION}" -a sectanchors -a source-highlighter=pygments -a pygments-style=native)

-    set(ASCIIDOCTOR_ARGS -a experimental -a icons=font -a revnumber="${VERSION}" -a sectanchors -a source-highlighter=prettify)
+    # sed arguments used to replace links in ChangeLog and release notes
+    set(SED_LINKS_ARGS
+      -e "'s/issue #\\([0-9][0-9]*\\)/https:\\/\\/github.com\\/weechat\\/weechat\\/issues\\/\\1[issue #\\1^]/g'"
+      -e "'s/bug #\\([0-9][0-9]*\\)/https:\\/\\/savannah.nongnu.org\\/bugs\\/?\\1[bug #\\1^]/g'"
+      -e "'s/task #\\([0-9][0-9]*\\)/https:\\/\\/savannah.nongnu.org\\/task\\/?\\1[task #\\1^]/g'"
+      -e "'s/patch #\\([0-9][0-9]*\\)/https:\\/\\/savannah.nongnu.org\\/patch\\/?\\1[patch #\\1^]/g'"
+      -e "'s/debian #\\([0-9][0-9]*\\)/http:\\/\\/bugs.debian.org\\/cgi-bin\\/bugreport.cgi?bug=\\1[debian bug #\\1^]/g'"
+      -e "'s/\\(CVE-[0-9][0-9]*-[0-9][0-9]*\\)/https:\\/\\/cve.mitre.org\\/cgi-bin\\/cvename.cgi?name=\\1[\\1^]/g'"
+    )

+    # ChangeLog
+    add_custom_command(
+      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ChangeLog-links.adoc
+      COMMAND sed ARGS ${SED_LINKS_ARGS} ${CMAKE_CURRENT_SOURCE_DIR}/../ChangeLog.adoc > ${CMAKE_CURRENT_BINARY_DIR}/ChangeLog-links.adoc
+      DEPENDS
+      ${CMAKE_CURRENT_SOURCE_DIR}/../ChangeLog.adoc
+      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+    add_custom_command(
+      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ChangeLog.html
+      COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -a docinfodir="${CMAKE_CURRENT_SOURCE_DIR}" -o ChangeLog.html ${CMAKE_CURRENT_BINARY_DIR}/ChangeLog-links.adoc
+      DEPENDS
+      ${CMAKE_CURRENT_SOURCE_DIR}/docinfo.html
+      ${CMAKE_CURRENT_BINARY_DIR}/ChangeLog-links.adoc
+      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+      COMMENT "Building ChangeLog.html"
+    )
+    add_custom_target(changelog DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ChangeLog.html)
+
+    # Release notes
+    add_custom_command(
+      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes-links.adoc
+      COMMAND sed ARGS ${SED_LINKS_ARGS} ${CMAKE_CURRENT_SOURCE_DIR}/../ReleaseNotes.adoc > ${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes-links.adoc
+      DEPENDS
+      ${CMAKE_CURRENT_SOURCE_DIR}/../ReleaseNotes.adoc
+      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+    add_custom_command(
+      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes.html
+      COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -a docinfodir="${CMAKE_CURRENT_SOURCE_DIR}" -o ReleaseNotes.html ${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes-links.adoc
+      DEPENDS
+      ${CMAKE_CURRENT_SOURCE_DIR}/docinfo.html
+      ${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes-links.adoc
+      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+      COMMENT "Building ReleaseNotes.html"
+    )
+    add_custom_target(rn DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes.html)
+
+    # man/doc in all languages
    add_subdirectory(cs)
    add_subdirectory(de)
    add_subdirectory(en)
@@ -35,7 +82,8 @@ if(ENABLE_MAN OR ENABLE_DOC)
    add_subdirectory(ja)
    add_subdirectory(pl)
    add_subdirectory(ru)
-
+    add_subdirectory(sr)
+  else()
+    message(SEND_ERROR "Asciidoctor not found")
  endif()
-
 endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2006 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -15,10 +15,10 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

-SUBDIRS = . cs de en es fr it ja pl ru
+SUBDIRS = . cs de en es fr it ja pl ru sr

 EXTRA_DIST = docgen.py \
             docinfo.html \
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,22 +14,39 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

 if(ENABLE_MAN)
-  # man page
+  # man page: weechat
  add_custom_command(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1
    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.cs.adoc
    DEPENDS
    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.cs.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.cs.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.cs.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes/man.cs.adoc
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
    COMMENT "Building weechat.1 (cs)"
  )
-  add_custom_target(doc-man-cs ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1)
+  add_custom_target(doc-man-weechat-cs ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1)
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/cs/man1)
+
+  if(ENABLE_HEADLESS)
+    # man page: weechat-headless
+    add_custom_command(
+      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1
+      COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat-headless.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.cs.adoc
+      DEPENDS
+      ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.cs.adoc
+      ${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.cs.adoc
+      ${CMAKE_CURRENT_SOURCE_DIR}/includes/man.cs.adoc
+      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+      COMMENT "Building weechat-headless.1 (cs)"
+    )
+    add_custom_target(doc-man-weechat-headless-cs ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1 DESTINATION ${MANDIR}/cs/man1)
+  endif()
 endif()

 if(ENABLE_DOC)
@@ -45,6 +62,6 @@ if(ENABLE_DOC)
    COMMENT "Building weechat_quickstart.cs.html"
  )
  add_custom_target(doc-quickstart-cs ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.cs.html)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.cs.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.cs.html DESTINATION ${DATAROOTDIR}/doc/${PROJECT_NAME})

 endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

 docdir = $(datadir)/doc/$(PACKAGE)
@@ -22,13 +22,14 @@ docdir = $(datadir)/doc/$(PACKAGE)
 EXTRA_DIST = CMakeLists.txt \
             docinfo.html \
             weechat.1.cs.adoc \
-             cmdline_options.cs.adoc \
+             weechat-headless.1.cs.adoc \
             weechat_quickstart.cs.adoc \
-             $(wildcard autogen/user/*.adoc) \
-             $(wildcard autogen/plugin_api/*.adoc)
+             includes/cmdline_options.cs.adoc \
+             includes/man.cs.adoc

 if MAN
-  man_targets = weechat.1
+  man_targets = weechat.1 \
+                weechat-headless.1
  man_install = install-man
  man_uninstall = uninstall-man
 endif
@@ -39,13 +40,15 @@ if DOC
 endif
 all-local: $(man_targets) $(doc_targets)

-# man page
-weechat.1: weechat.1.cs.adoc cmdline_options.cs.adoc
-	$(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/cs/weechat.1.cs.adoc
+# man pages
+weechat.1: weechat.1.cs.adoc includes/cmdline_options.cs.adoc includes/man.cs.adoc
+	$(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/cs/weechat.1.cs.adoc
+weechat-headless.1: weechat-headless.1.cs.adoc includes/cmdline_options.cs.adoc includes/man.cs.adoc
+	$(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -b manpage -o weechat-headless.1 $(abs_top_srcdir)/doc/cs/weechat-headless.1.cs.adoc

 # quickstart
 weechat_quickstart.cs.html: weechat_quickstart.cs.adoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=prettify -o weechat_quickstart.cs.html $(abs_top_srcdir)/doc/cs/weechat_quickstart.cs.adoc
+	$(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -o weechat_quickstart.cs.html $(abs_top_srcdir)/doc/cs/weechat_quickstart.cs.adoc

 # install man/docs

@@ -65,6 +68,7 @@ uninstall-hook: $(man_uninstall) $(doc_uninstall)

 uninstall-man:
 	$(RM) $(DESTDIR)$(mandir)/cs/man1/weechat.1
+	$(RM) $(DESTDIR)$(mandir)/cs/man1/weechat-headless.1
 	-rmdir $(DESTDIR)$(mandir)/cs/man1

 uninstall-doc:
@@ -74,4 +78,4 @@ uninstall-doc:
 # clean

 clean-local:
-	-rm -f weechat.1 weechat_*.html
+	-$(RM) weechat.1 weechat-headless.1 weechat_*.html
@@ -1,38 +0,0 @@
-*-a*, *--no-connect*::
-    Zakaž automatické pripojení k serverům když WeeChat startuje.
-
-*-c*, *--colors*::
-    Zobraz defaultní barvy v terminálu.
-
-*-d*, *--dir* _<path>_::
-    Nastav cestu jako dovmský adresář pro WeeChat (použitou pro konfigurační
-    soubory, logy, uživatelské pluginy a skripty), výchozí hodnota je
-    "~/.weechat" (poznámka: složka bude vytvořena pokud nebude nalezena
-    Weechatem)
-    Pokud tato volba není zadána, použije se promněná prostředí WEECHAT_HOME
-    (pokud není prázdná)
-
-*-h*, *--help*::
-    Zobrazí nápovědu.
-
-*-l*, *--license*::
-    Zobrazí licenci WeeChatu.
-
-*-p*, *--no-plugin*::
-    Vypne automatické nahrání pluginů.
-
-*-r*, *--run-command* _<command>_::
-    Spustí příkaz(y) po startu (více přůkazů může být odděleno středníky).
-
-*-s*, *--no-script*::
-    Vypni automatické nahrání scriptů.
-
-*--upgrade*::
-    Aktualizuj WeeChat použitím souborů relací generovaných
-    příkazem `/upgrade -quit`.
-
-*-v*, *--version*::
-    Zobraz verzi WeeChatu.
-
-*plugin:option*::
-   Nastavení pluginů.
@@ -0,0 +1,89 @@
+// tag::standard[]
+*-a*, *--no-connect*::
+    Zakaž automatické pripojení k serverům když WeeChat startuje.
+
+*-c*, *--colors*::
+    Zobraz defaultní barvy v terminálu.
+
+// TRANSLATION MISSING
+*--daemon*::
+    Run WeeChat in background, as a daemon (works only with the command
+    *weechat-headless*).
+
+// TRANSLATION MISSING
+*--stdout*::
+    Display log messages on standard output instead of writing them in log file
+    (works only with the command *weechat-headless*, not compatible with option
+    "--daemon").
+
+// TRANSLATION MISSING
+*-d*, *--dir* _<path>_::
+    Force a single directory for all WeeChat files (directory is created if not found).
+    Four directories can be given, separated by colons (in this order: config,
+    data, cache, runtime).
+    Pokud tato volba není zadána, použije se promněná prostředí WEECHAT_HOME
+    (pokud není prázdná)
+
+// TRANSLATION MISSING
+*-t*, *--temp-dir*::
+    Create a temporary WeeChat home directory and delete it on exit
+    (incompatible with option "-d"). +
+    The name of the directory is automatically built by WeeChat, with this
+    template: "weechat_temp_XXXXXX" (where "XXXXXX" is random). It it created
+    in the first available directory in this list: environment variable "TMPDIR",
+    "/tmp" (may be different according to the operating system), environment
+    variable "HOME", current directory. +
+    The temporary home directory has permissions 0700 (only owner can read,
+    write and execute).
+
+*-h*, *--help*::
+    Zobrazí nápovědu.
+
+*-l*, *--license*::
+    Zobrazí licenci WeeChatu.
+
+*-p*, *--no-plugin*::
+    Vypne automatické nahrání pluginů.
+
+// TRANSLATION MISSING
+*-P*, *--plugins* _<plugins>_::
+    Load only these plugins at startup (see /help weechat.plugin.autoload).
+    If this option is given, the option weechat.plugin.autoload is not used.
+
+// TRANSLATION MISSING
+*-r*, *--run-command* _<command>_::
+    Run command(s) after startup; many commands can be separated by semicolons,
+    this option can be given multiple times.
+
+*-s*, *--no-script*::
+    Vypni automatické nahrání scriptů.
+
+*--upgrade*::
+    Aktualizuj WeeChat použitím souborů relací generovaných
+    příkazem `/upgrade -quit`.
+
+*-v*, *--version*::
+    Zobraz verzi WeeChatu.
+
+*plugin:option*::
+   Nastavení pluginů.
+// end::standard[]
+
+// tag::debug[]
+// TRANSLATION MISSING
+*--no-dlclose*::
+    Do not call the function dlclose after plugins are unloaded.
+    This is useful with tools like Valgrind to display stack for unloaded
+    plugins.
+
+// TRANSLATION MISSING
+*--no-gnutls*::
+    Do not call the init and deinit functions of GnuTLS library.
+    This is useful with tools like Valgrind and electric-fence, to prevent
+    GnuTLS memory errors.
+
+// TRANSLATION MISSING
+*--no-gcrypt*::
+    Do not call the init and deinit functions of Gcrypt library.
+    This is useful with tools like Valgrind, to prevent Gcrypt memory errors.
+// end::debug[]
@@ -0,0 +1,112 @@
+// tag::plugin_options[]
+Pro kompletní dokumentaci nastavení pluginů a jejich volby podívejte se na
+https://weechat.org/doc[WeeChat user's guide].
+
+S irc pluginem se můžete doččasně připojit na server s URL jako:
+
+    irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2...]]
+
+K připojení na IRC kanál Weechatu pro podporu s přezdívkou "mynick":
+
+    irc://mynick@irc.libera.chat/#weechat
+
+IPv6 adresa může být uzavřena do hranatých závorek k přidání portu, například:
+
+    irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test
+// end::plugin_options[]
+
+// tag::files[]
+$HOME/.config/weechat/weechat.conf::
+    hlavní konfigurační soubor WeeChatu
+
+$HOME/.config/weechat/plugins.conf::
+    soubor konfigurace pluginů
+
+$HOME/.config/weechat/sec.conf::
+    konfigurační soubor s chráněnými daty
+
+$HOME/.config/weechat/alias.conf::
+    configurační soubor pro _alias_ plugin
+
+$HOME/.config/weechat/buflist.conf::
+    konfigurační soubor pro _buflist_ plugin
+
+$HOME/.config/weechat/charset.conf::
+    konfigurační soubor pro _charset_ plugin
+
+$HOME/.config/weechat/exec.conf::
+    konfigurační soubor pro _exec_ plugin
+
+$HOME/.config/weechat/fifo.conf::
+    konfigurační soubor pro _fifo_ plugin
+
+$HOME/.config/weechat/fset.conf::
+    konfigurační soubor pro _fset_ plugin
+
+$HOME/.config/weechat/guile.conf::
+    konfigurační soubor pro _guile_ plugin
+
+$HOME/.config/weechat/irc.conf::
+    konfigurační soubor pro _irc_ plugin
+
+$HOME/.config/weechat/javascript.conf::
+    konfigurační soubor pro _javascript_ plugin
+
+$HOME/.config/weechat/logger.conf::
+    konfigurační soubor pro _logger_ plugin
+
+$HOME/.config/weechat/lua.conf::
+    konfigurační soubor pro _lua_ plugin
+
+$HOME/.config/weechat/perl.conf::
+    konfigurační soubor pro _perl_ plugin
+
+$HOME/.config/weechat/php.conf::
+    konfigurační soubor pro _php_ plugin
+
+$HOME/.config/weechat/python.conf::
+    konfigurační soubor pro _python_ plugin
+
+$HOME/.config/weechat/relay.conf::
+    konfigurační soubor pro _relay_ plugin
+
+$HOME/.config/weechat/ruby.conf::
+    konfigurační soubor pro _ruby_ plugin
+
+$HOME/.config/weechat/script.conf::
+    konfigurační soubor pro _script_ plugin
+
+$HOME/.config/weechat/spell.conf::
+    konfigurační soubor pro _spell_ plugin
+
+$HOME/.config/weechat/tcl.conf::
+    konfigurační soubor pro _tcl_ plugin
+
+$HOME/.config/weechat/trigger.conf::
+    konfigurační soubor pro _trigger_ plugin
+
+$HOME/.config/weechat/typing.conf::
+    konfigurační soubor pro _typing_ plugin
+
+$HOME/.config/weechat/xfer.conf::
+    konfigurační soubor pro _xfer_ plugin
+
+$HOME/.local/share/weechat/weechat.log::
+    soubor záznamů WeeChatu
+// end::files[]
+
+// tag::copyright[]
+WeeChat je napsán Sébastienem Helleu a přispěvovateli (kompletní seznam je v
+souboru AUTHORS.adoc).
+
+Copyright (C) 2003-2021 {author}
+
+WeeChat is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+Prosím přečtěte si soubor COPYING pro více informací.
+
+Web: https://weechat.org/
+// end::copyright[]
@@ -0,0 +1,70 @@
+// TRANSLATION MISSING
+= weechat-headless(1)
+:doctype: manpage
+:author: Sébastien Helleu
+:email: flashcode@flashtux.org
+:lang: cs
+// TRANSLATION MISSING
+:man manual: WeeChat Manual
+:man source: WeeChat {revnumber}
+
+== JMÉNO
+
+weechat-headless - the extensible chat client (headless version)
+
+== PŘEHLED
+
+// TRANSLATION MISSING
+[verse]
+*weechat-headless* [-a|--no-connect] [--daemon] [--stdout] [-d|--dir <path>] [-t|--temp-dir] [-p|--no-plugin] [-P|--plugins <plugins>] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [debug-option...] [plugin:option...]
+*weechat-headless* [-c|--colors]
+*weechat-headless* [-h|--help]
+*weechat-headless* [-l|--license]
+*weechat-headless* [-v|--version]
+
+== POPIS
+
+WeeChat (Wee Enhanced Environment for Chat) je svobodný chatovací klient.
+Je lehký, plně konfigurovatelný a lehce rozšiřitelný pomocí pluginů a scriptů
+v obvyklých sciptovacích jazycích.
+
+// TRANSLATION MISSING
+The command *weechat-headless* runs WeeChat in a headless mode (no interface).
+It can be used for tests or to daemonize WeeChat with the option "--daemon".
+
+== VOLBY
+
+include::includes/cmdline_options.cs.adoc[tag=standard]
+
+// TRANSLATION MISSING
+== DEBUG OPTIONS
+
+*WARNING:* these options are for debug purposes only, *DO NOT USE IN PRODUCTION!*
+
+include::includes/cmdline_options.cs.adoc[tag=debug]
+
+== VOLBY PLUGINŮ
+
+include::includes/man.cs.adoc[tag=plugin_options]
+
+== SOUBORY
+
+include::includes/man.cs.adoc[tag=files]
+
+// TRANSLATION MISSING
+== SEE ALSO
+
+*weechat*(1)
+
+== AUTOŘI
+
+Tato manuálová stránka byla napsána {author}.
+Tato manuálová stránka byla přeložena Ondřejem Súkupem.
+
+== COPYRIGHT
+
+include::includes/man.cs.adoc[tag=copyright]
+
+== PODPORA / HLÁŠENÍ CHYB
+
+Pro pomoc nebo hlášení chyb https://weechat.org/about/support
@@ -13,8 +13,9 @@ weechat - the extensible chat client

 == PŘEHLED

+// TRANSLATION MISSING
 [verse]
-*weechat* [-a|--no-connect] [-d|--dir <path>] [-p|--no-plugin] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [plugin:option...]
+*weechat* [-a|--no-connect] [-d|--dir <path>] [-t|--temp-dir]  [-p|--no-plugin] [-P|--plugins <plugins>] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [debug-option...] [plugin:option...]
 *weechat* [-c|--colors]
 *weechat* [-h|--help]
 *weechat* [-l|--license]
@@ -26,82 +27,29 @@ WeeChat (Wee Enhanced Environment for Chat) je svobodný chatovací klient.
 Je lehký, plně konfigurovatelný a lehce rozšiřitelný pomocí pluginů a scriptů
 v obvyklých sciptovacích jazycích.

-
 == VOLBY

-include::cmdline_options.cs.adoc[]
+include::includes/cmdline_options.cs.adoc[tag=standard]
+
+// TRANSLATION MISSING
+== DEBUG OPTIONS
+
+*WARNING:* these options are for debug purposes only, *DO NOT USE IN PRODUCTION!*
+
+include::includes/cmdline_options.cs.adoc[tag=debug]

 == VOLBY PLUGINŮ

-Pro kompletní dokumentaci nastavení pluginů a jejich volby podívejte se na
-https://weechat.org/doc[WeeChat user's guide].
-
-S irc pluginem se můžete doččasně připojit na server s URL jako:
-
-    irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2...]]
-
-K připojení na IRC kanál Weechatu pro podporu s přezdívkou "mynick":
-
-    irc://mynick@chat.freenode.net/#weechat
-
-IPv6 adresa může být uzavřena do hranatých závorek k přidání portu, například:
-
-    irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test
+include::includes/man.cs.adoc[tag=plugin_options]

 == SOUBORY

-$HOME/.weechat/weechat.conf::
-    hlavní konfigurační soubor WeeChatu
-
-$HOME/.weechat/plugins.conf::
-    soubor konfigurace pluginů
-
-$HOME/.weechat/sec.conf::
-    konfigurační soubor s chráněnými daty
-
-$HOME/.weechat/alias.conf::
-    configurační soubor pro _alias_ plugin
-
-$HOME/.weechat/aspell.conf::
-    konfigurační soubor pro _aspell_ plugin
-
-$HOME/.weechat/buflist.conf::
-    konfigurační soubor pro _buflist_ plugin
-
-$HOME/.weechat/charset.conf::
-    konfigurační soubor pro _charset_ plugin
-
-$HOME/.weechat/exec.conf::
-    konfigurační soubor pro _exec_ plugin
+include::includes/man.cs.adoc[tag=files]

 // TRANSLATION MISSING
-$HOME/.weechat/fifo.conf::
-    configuration file for _fifo_ plugin
+== SEE ALSO

-// TRANSLATION MISSING
-$HOME/.weechat/fset.conf::
-    configuration file for _fset_ plugin
-
-$HOME/.weechat/irc.conf::
-    konfigurační soubor pro _irc_ plugin
-
-$HOME/.weechat/logger.conf::
-    konfigurační soubor pro _logger_ plugin
-
-$HOME/.weechat/relay.conf::
-    konfigurační soubor pro _relay_ plugin
-
-$HOME/.weechat/script.conf::
-    konfigurační soubor pro _script_ plugin
-
-$HOME/.weechat/trigger.conf::
-    konfigurační soubor pro _trigger_ plugin
-
-$HOME/.weechat/xfer.conf::
-    konfigurační soubor pro _xfer_ plugin
-
-$HOME/.weechat/weechat.log::
-    soubor záznamů WeeChatu
+*weechat-headless*(1)

 == AUTOŘI

@@ -110,20 +58,8 @@ Tato manuálová stránka byla přeložena Ondřejem Súkupem.

 == COPYRIGHT

-WeeChat je napsán Sébastienem Helleu a přispěvovateli (kompletní seznam je v
-souboru AUTHORS.adoc).
-
-Copyright (C) 2003-2017 {author}
-
-WeeChat is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-Prosím přečtěte si soubor COPYING pro více informací.
-
-Web: https://weechat.org/
+include::includes/man.cs.adoc[tag=copyright]

 == PODPORA / HLÁŠENÍ CHYB

-Pro pomoc nebo hlášení chyb https://weechat.org/dev/support
+Pro pomoc nebo hlášení chyb https://weechat.org/about/support
@@ -20,8 +20,8 @@ Spustění z Vašeho shellu:
 $ weechat
 ----

-[[help_options]]
-== On-line nápověda/ volby
+[[help]]
+== On-line nápověda

 WeeChat má nápovědů pro všechny příkazy, postě vložte:

@@ -35,46 +35,29 @@ K získání nápovědy pro specifický příkaz napište:
 /help příkaz
 ----

+// TRANSLATION MISSING
+Help is available for options as well:
+
+----
+/help config.section.option
+----
+
+(kde `config` je jméno konfigurace (`weechat` pro jádro, nebo jméno pluginu),
+`section` sekce této konfigurace a `option` jméno volby).
+
+// TRANSLATION MISSING
+[[options]]
+== Set options
+
 K nastavení voleb napište:

 ----
 /set config.section.option value
 ----

-(kde `config` je jméno konfigurace (`weechat` pro jádro, nebo jméno pluginu),
-`section` sekce této konfigurace a `option` jméno volby).
-
 WeeChat okamžitě použije novou hodnotu (*nikdy* nebudete potřebovat restart
 WeeChatu po změně konfigurace).

-Můžete použít v příkazu `/set` volbu s částečným jménem a zástupným znakem "*"
-na konci nebo začátku k zobrazení všech voleb obsahující dané znaky.
-Například:
-
-* zobrazí všechny volby (WeeChatu a pluginů):
-
----
-/set
----
-
-* zobraz volby WeeChatu:
-
----
-/set weechat.*
----
-
-* zobraz volby IRC pluginu:
-
----
-/set irc.*
----
-
-Můžete zobrazit nápovědu pro voblby s `/help`, například:
-
----
-/help weechat.look.highlight
----
-
 Všechna nastavení jsou uložena při ukončení WeeChatu (nebo použitím příkazu
 `/save` k vynucení zapsaní voleb).

@@ -87,6 +70,31 @@ that were not yet saved with `/save`). +
 You can use the command `/set`, which checks the value and applies immediately
 the changes.

+// TRANSLATION MISSING
+The plugin _fset_ allows you to easily browse options and change them.
+
+// TRANSLATION MISSING
+For example to display WeeChat options:
+
+----
+/fset weechat.*
+----
+
+// TRANSLATION MISSING
+IRC options:
+
+----
+/fset irc.*
+----
+
+// TRANSLATION MISSING
+The `/fset` command has completion on part of option names, so for example if
+you type `/fset hot` and press kbd:[Tab] this is completed as `/fset hotlist`.
+If you press kbd:[Enter], options about the hotlist are displayed.
+
+// TRANSLATION MISSING
+For more information about `/fset` command and keys, see `/help fset`.
+
 [[core_vs_plugins]]
 == Jádro versus pluginy

@@ -105,9 +113,14 @@ Použijte příkaz `/plugin` k zobrazení nahraných pluginů, pravděpodobně u
 Můžete přidat irc server příkazem `/server`, například:

 ----
-/server add freenode chat.freenode.net
+/server add libera irc.libera.chat/6697 -ssl
 ----

+// TRANSLATION MISSING
+In this command, `libera` is the internal server name used by WeeChat:
+you'll be able to connect with `/connect libera` and the server options
+are _irc.server.libera.xxx_.
+
 Jako obvykle je poskytována nápověda pokud se ztratíte:

 ----
@@ -125,45 +138,38 @@ Pro každou serverovou volbu WeeChat použije její hodnotu pokud je definována
 (není "prázdná"). Jinak WeeChat použije výchozí hodnotu ("irc.server_default.xxx).

 Například, je zde výchozí přezdívka (založena na vašem un*x loginu), můžete
-ji přepsat pro freenode s následujícím příkazem:
+ji přepsat pro libera s následujícím příkazem:

 ----
-/set irc.server.freenode.nicks "mynick,mynick2,mynick3,mynick4,mynick5"
+/set irc.server.libera.nicks "mynick,mynick2,mynick3,mynick4,mynick5"
 ----

 Nastavení username a realname:

 ----
-/set irc.server.freenode.username "Mé uživatelské jméno"
-/set irc.server.freenode.realname "Mé skutečné jméno"
+/set irc.server.libera.username "Mé uživatelské jméno"
+/set irc.server.libera.realname "Mé skutečné jméno"
 ----

 K zapnutí automatického připojení při spuštění:

 ----
-/set irc.server.freenode.autoconnect on
----
-
-K připojení s SSL:
-
----
-/set irc.server.freenode.addresses "chat.freenode.net/7000"
-/set irc.server.freenode.ssl on
+/set irc.server.libera.autoconnect on
 ----

 Pokud je na serveru podporován SASL, můžete jej použít pro autentizaci (mužete
 být identifikován před připojením kanálů):

 ----
-/set irc.server.freenode.sasl_username "mynick"
-/set irc.server.freenode.sasl_password "xxxxxxx"
+/set irc.server.libera.sasl_username "mynick"
+/set irc.server.libera.sasl_password "xxxxxxx"
 ----

 K spuštění příkazů po připojení k serveru, například k autentizaci s nickserv
 (pouze pokud nepoužíváte autentizaci přes SASL):

 ----
-/set irc.server.freenode.command "/msg nickserv identify xxxxxxx"
+/set irc.server.libera.command "/msg nickserv identify xxxxxxx"
 ----

 [NOTE]
@@ -181,24 +187,24 @@ First setup a passphrase:
 ----

 // TRANSLATION MISSING
-Then add a secured data with your freenode password:
+Then add a secured data with your libera password:

 ----
-/secure set freenode_password xxxxxxx
+/secure set libera_password xxxxxxx
 ----

 // TRANSLATION MISSING
-Then you can use `+${sec.data.freenode_password}+` instead of your password in
+Then you can use `+${sec.data.libera_password}+` instead of your password in
 IRC options mentioned above, for example:

 ----
-/set irc.server.freenode.sasl_password "${sec.data.freenode_password}"
+/set irc.server.libera.sasl_password "${sec.data.libera_password}"
 ----

 K automatickému připojení některých kanálů při připojování k serveru:

 ----
-/set irc.server.freenode.autojoin "#channel1,#channel2"
+/set irc.server.libera.autojoin "#channel1,#channel2"
 ----

 // TRANSLATION MISSING
@@ -211,29 +217,33 @@ K smazání hodnoty serverové volby a k použití výchozí hodnoty místo ní,
 například k požití výchozích přezdívek (irc.server_default.nicks):

 ----
-/set irc.server.freenode.nicks null
+/unset irc.server.libera.nicks
 ----

 Ostatní volby: můžete nastavit ostatní volby s následujícím příkazem ("xxx" je
 název volby):

 ----
-/set irc.server.freenode.xxx value
+/set irc.server.libera.xxx value
 ----

 [[connect_to_irc_server]]
-== Připojení k IRC serveru a automatické ořipojení kanálů
+== Připojení k IRC serveru

 ----
-/connect freenode
+/connect libera
 ----

+// TRANSLATION MISSING
+With this command, WeeChat connects to the libera server and auto-joins the
+channels configured in the "autojoin" server option.
+
+// TRANSLATION MISSING
 [NOTE]
 Tento příkaz může být použit k vytvoření nového připojení k serveru bez
-použití příkazu `/server` (mohu zopakovat že můžete zobrazit nápovědu
-pro tento příkaz s `/help connect` ?).
+použití příkazu `/server` (see `/help connect`).

-Ve výchozím nastavení jsou serverové bufery spojen s Weechat _core_ buferem.
+Ve výchozím nastavení jsou serverové bufery spojen s WeeChat _core_ buferem.
 K přepnutí mezi _core_ a server bufery můžete použít klávesu kbd:[Ctrl+x].

 Je možné vypnout automatické sloučení serverových buferů a mít nezávislé
@@ -309,8 +319,6 @@ Příkazy k spravování buferů a oken:
 /window
 ----

-(nebudu se zde opakovat, můžete k těmto příkazům získat nápovědu pomocí /help)
-
 Například, k svislému rozdělení obrazovky na malé okno (1/3 šířky), a velké
 okno (2/3), použijte příkaz:

@@ -328,10 +336,12 @@ To remove the split:
 [[key_bindings]]
 == Předvoblby klávesových zkratek

-Weechat používá ve výchozím nastavení mnoho klávesových zkratek, Všechny
+WeeChat používá ve výchozím nastavení mnoho klávesových zkratek, Všechny
 najdete v dokumentaci, ale je dobré znát alespoň pár těchto důležitých:

 - kbd:[Alt+←] / kbd:[Alt+→] nebo kbd:[F5] / kbd:[F6]: přepnout na předchozí/další bufer
+// TRANSLATION MISSING
+- kbd:[F1] / kbd:[F2]: scroll bar with list of buffers ("buflist")
 - kbd:[F7] / kbd:[F8]: přepnout na předchozí/další okno (pokud je obrazovka rozdělena)
 - kbd:[F9] / kbd:[F10]: posunoutí titulku
 - kbd:[F11] / kbd:[F12]: posunutí seznamu přezdívek
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,26 +14,45 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

 if(ENABLE_MAN)
-  # man page
+  # man page: weechat
  add_custom_command(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1
    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.adoc
    DEPENDS
    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.de.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes/man.de.adoc
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
    COMMENT "Building weechat.1 (de)"
  )
-  add_custom_target(doc-man-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1)
+  add_custom_target(doc-man-weechat-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1)
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/de/man1)
+
+  if(ENABLE_HEADLESS)
+    # man page: weechat-headless
+    add_custom_command(
+      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1
+      COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat-headless.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.de.adoc
+      DEPENDS
+      ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.de.adoc
+      ${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.de.adoc
+      ${CMAKE_CURRENT_SOURCE_DIR}/includes/man.de.adoc
+      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+      COMMENT "Building weechat-headless.1 (de)"
+    )
+    add_custom_target(doc-man-weechat-headless-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1 DESTINATION ${MANDIR}/de/man1)
+  endif()
 endif()

 if(ENABLE_DOC)

+  file(GLOB AUTOGEN_USER "${CMAKE_CURRENT_SOURCE_DIR}/includes/autogen_user_*.adoc")
+
  # user's guide
  add_custom_command(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html
@@ -41,13 +60,13 @@ if(ENABLE_DOC)
    DEPENDS
    ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.de.adoc
+    ${AUTOGEN_USER}
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
    COMMENT "Building weechat_user.de.html"
  )
  add_custom_target(doc-user-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html DESTINATION ${DATAROOTDIR}/doc/${PROJECT_NAME})

  # scripting guide
  add_custom_command(
@@ -60,7 +79,7 @@ if(ENABLE_DOC)
    COMMENT "Building weechat_scripting.de.html"
  )
  add_custom_target(doc-scripting-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html DESTINATION ${DATAROOTDIR}/doc/${PROJECT_NAME})

  # FAQ
  add_custom_command(
@@ -73,7 +92,7 @@ if(ENABLE_DOC)
    COMMENT "Building weechat_faq.de.html"
  )
  add_custom_target(doc-faq-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html DESTINATION ${DATAROOTDIR}/doc/${PROJECT_NAME})

  # quickstart
  add_custom_command(
@@ -86,19 +105,6 @@ if(ENABLE_DOC)
    COMMENT "Building weechat_quickstart.de.html"
  )
  add_custom_target(doc-quickstart-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
-
-  # tester's guide
-  add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_tester.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.adoc
-    DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.adoc
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    COMMENT "Building weechat_tester.de.html"
-  )
-  add_custom_target(doc-tester-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html DESTINATION ${DATAROOTDIR}/doc/${PROJECT_NAME})

 endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2006 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #

 docdir = $(datadir)/doc/$(PACKAGE)
@@ -23,16 +23,28 @@ docdir = $(datadir)/doc/$(PACKAGE)
 EXTRA_DIST = CMakeLists.txt \
             docinfo.html \
             weechat.1.de.adoc \
-             cmdline_options.de.adoc \
+             weechat-headless.1.de.adoc \
             weechat_user.de.adoc \
             weechat_scripting.de.adoc \
             weechat_faq.de.adoc \
             weechat_quickstart.de.adoc \
-             weechat_tester.de.adoc \
-             $(wildcard autogen/user/*.adoc)
+             includes/autogen_api_completions.de.adoc \
+             includes/autogen_api_hdata.de.adoc \
+             includes/autogen_api_infolists.de.adoc \
+             includes/autogen_api_infos.de.adoc \
+             includes/autogen_api_infos_hashtable.de.adoc \
+             includes/autogen_api_plugins_priority.de.adoc \
+             includes/autogen_api_url_options.de.adoc \
+             includes/autogen_user_commands.de.adoc \
+             includes/autogen_user_default_aliases.de.adoc \
+             includes/autogen_user_irc_colors.de.adoc \
+             includes/autogen_user_options.de.adoc \
+             includes/cmdline_options.de.adoc \
+             includes/man.de.adoc

 if MAN
-  man_targets = weechat.1
+  man_targets = weechat.1 \
+                weechat-headless.1
  man_install = install-man
  man_uninstall = uninstall-man
 endif
@@ -40,36 +52,33 @@ if DOC
  doc_targets = weechat_user.de.html \
 		weechat_scripting.de.html \
 		weechat_faq.de.html \
-		weechat_quickstart.de.html \
-		weechat_tester.de.html
+		weechat_quickstart.de.html
  doc_install = install-doc
  doc_uninstall = uninstall-doc
 endif
 all-local: $(man_targets) $(doc_targets)

-# man page
-weechat.1: weechat.1.de.adoc cmdline_options.de.adoc
-	$(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/de/weechat.1.de.adoc
+# man pages
+weechat.1: weechat.1.de.adoc includes/cmdline_options.de.adoc includes/man.de.adoc
+	$(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/de/weechat.1.de.adoc
+weechat-headless.1: weechat-headless.1.de.adoc includes/cmdline_options.de.adoc includes/man.de.adoc
+	$(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -b manpage -o weechat-headless.1 $(abs_top_srcdir)/doc/de/weechat-headless.1.de.adoc

 # user's guide
-weechat_user.de.html: weechat_user.de.adoc cmdline_options.de.adoc $(wildcard autogen/user/*.adoc) $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=prettify -o weechat_user.de.html $(abs_top_srcdir)/doc/de/weechat_user.de.adoc
+weechat_user.de.html: weechat_user.de.adoc includes/cmdline_options.de.adoc $(wildcard includes/autogen_user_*.adoc) $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -o weechat_user.de.html $(abs_top_srcdir)/doc/de/weechat_user.de.adoc

 # scripting guide
 weechat_scripting.de.html: weechat_scripting.de.adoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=prettify -o weechat_scripting.de.html $(abs_top_srcdir)/doc/de/weechat_scripting.de.adoc
+	$(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -o weechat_scripting.de.html $(abs_top_srcdir)/doc/de/weechat_scripting.de.adoc

 # FAQ
 weechat_faq.de.html: weechat_faq.de.adoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=prettify -o weechat_faq.de.html $(abs_top_srcdir)/doc/de/weechat_faq.de.adoc
+	$(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -o weechat_faq.de.html $(abs_top_srcdir)/doc/de/weechat_faq.de.adoc

 # quickstart
 weechat_quickstart.de.html: weechat_quickstart.de.adoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=prettify -o weechat_quickstart.de.html $(abs_top_srcdir)/doc/de/weechat_quickstart.de.adoc
-
-# tester's guide
-weechat_tester.de.html: weechat_tester.de.adoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=prettify -o weechat_tester.de.html $(abs_top_srcdir)/doc/de/weechat_tester.de.adoc
+	$(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -o weechat_quickstart.de.html $(abs_top_srcdir)/doc/de/weechat_quickstart.de.adoc

 # install man/docs

@@ -89,6 +98,7 @@ uninstall-hook: $(man_uninstall) $(doc_uninstall)

 uninstall-man:
 	$(RM) $(DESTDIR)$(mandir)/de/man1/weechat.1
+	$(RM) $(DESTDIR)$(mandir)/de/man1/weechat-headless.1
 	-rmdir $(DESTDIR)$(mandir)/de/man1

 uninstall-doc:
@@ -98,4 +108,4 @@ uninstall-doc:
 # clean

 clean-local:
-	-rm -f weechat.1 weechat_*.html
+	-$(RM) weechat.1 weechat-headless.1 weechat_*.html
@@ -1,89 +0,0 @@
-//
-// This file is auto-generated by script docgen.py.
-// DO NOT EDIT BY HAND!
-//
-[width="100%",cols="^1,^2,6,6",options="header"]
-|===
-| Erweiterung | Name | Beschreibung | Argumente
-
-| aspell | aspell_dict | durch Kommata getrennte Liste von Wörterbüchern, die in diesem Buffer genutzt werden sollen | Buffer-Pointer ("0x12345678") oder der vollständige Buffername ("irc.freenode.#weechat")
-
-| fifo | fifo_filename | Name der FIFO-Pipe | -
-
-| irc | irc_buffer | holt Buffer Pointer für einen IRC Server/Channel/Nick | server,channel,nick (Channel und Nicks sind optional)
-
-| irc | irc_is_channel | 1, falls die Zeichenkette ein gültiger IRC-Channelname für den Server ist | Server,Channel (Server ist optional)
-
-| irc | irc_is_nick | 1, falls die Zeichenkette ein gültiger IRC Nickname ist | Nickname
-
-| irc | irc_nick | aktuellen Nicknamen für den Server erhalten | Servername
-
-| irc | irc_nick_color | erhalte nick color code (*veraltet* ab Version 1.5, wird ersetzt durch "nick_color") | Nickname
-
-| irc | irc_nick_color_name | erhalte nick color name (*veraltet* ab Version 1.5, wird ersetzt durch "nick_color_name") | Nickname
-
-| irc | irc_nick_from_host | Nicknamen des IRC-Hosts erhalten | IRC host (in der Form `:nick!name@server.com`)
-
-| irc | irc_server_isupport | 1 falls der Server die Funktion unterstützen sollte (durch IRC Message 005) | Server,Funktion
-
-| irc | irc_server_isupport_value | Wert der Funktion, sofern es vom Server unterstützt wird (durch IRC Message 005) | Server,Funktion
-
-| python | python2_bin | Pfad für Python 2.x Interpreter | -
-
-| relay | relay_client_count | Anzahl an Clients für Relay | Statusname (optional): connecting, waiting_auth, connected, auth_failed, disconnected
-
-| weechat | charset_internal | Interner WeeChat Zeichensatz | -
-
-| weechat | charset_terminal | Terminal Zeichensatz | -
-
-| weechat | color_ansi_regex | erweiterte reguläre POSIX Ausdrücke um ANSI Escapesequenz zu suchen | -
-
-| weechat | color_rgb2term | RGB Farbe wurde umgewandelt in Terminalfarbe (0-255) | RGB,limit (Obergrenze ist optional und ist Standardmäßig 256)
-
-| weechat | color_term2rgb | Terminalfarbe (0-255) wurde umgewandelt in RGB Farbe | Farben (Terminalfarben: 0-255)
-
-| weechat | cursor_mode | 1, falls Cursor-Modus aktiviert ist | -
-
-| weechat | date | Datum der WeeChat Kompilierung | -
-
-| weechat | dir_separator | Trennzeichen für Verzeichnis | -
-
-| weechat | filters_enabled | 1, falls Filter aktiviert sind | -
-
-| weechat | inactivity | Inaktivität der Tastatur (Sekunden) | -
-
-| weechat | locale | Lokalisation welche für die übersetzten Nachrichten verwendet werden soll | -
-
-| weechat | nick_color | zeigt Farbecode des Nick | Nickname
-
-| weechat | nick_color_name | zeigt Farbnamen des Nick | Nickname
-
-| weechat | pid | WeeChat PID (Prozess-ID) | -
-
-| weechat | term_height | Höhe des Terminals | -
-
-| weechat | term_width | Breite des Terminals | -
-
-| weechat | uptime | Laufzeit von Weechat (Format: "days:hh:mm:ss") | "days" (Anzahl der Tage) oder "seconds" (Anzahl der Sekunden) (optional)
-
-| weechat | version | WeeChat-Version | -
-
-| weechat | version_git | WeeChat Git Version (Ausgabe des Befehls "git describe", ausschließlich für eine Entwicklerversion. Eine stabile Version gibt keine Information zurück) | -
-
-| weechat | version_number | WeeChat-Version (als Zahl) | -
-
-| weechat | weechat_dir | WeeChat Verzeichnis | -
-
-| weechat | weechat_libdir | WeeChat "lib" Verzeichnis | -
-
-| weechat | weechat_localedir | "lokales" Verzeichnis von WeeChat | -
-
-| weechat | weechat_sharedir | WeeChat "share" Verzeichnis | -
-
-| weechat | weechat_site | WeeChat Seite | -
-
-| weechat | weechat_site_download | Download-Seite von WeeChat | -
-
-| weechat | weechat_upgrading | 1 falls WeeChat ein Upgrade durchführt (Befehl `/upgrade`) | -
-
-|===
@@ -1,13 +0,0 @@
-//
-// This file is auto-generated by script docgen.py.
-// DO NOT EDIT BY HAND!
-//
-[width="100%",cols="^1,^2,6,6,8",options="header"]
-|===
-| Erweiterung | Name | Beschreibung | Hashtable (Eingabe) | Hashtable (Ausgabe)
-
-| irc | irc_message_parse | Parse eine IRC Nachricht | "message": IRC Nachricht, "server": Servername (optional) | "tags": Tags, "message_without_tags": Nachrichten ohne Tags, "nick": Nick, "host": Host, "command": Befehl, "channel": Channel, "arguments": Argumente (schließt Channel ein), "text": Text (zum Beispiel eine Nachricht von einem User), "pos_command": Index der "command" Nachricht ("-1" falls "command" nicht gefunden wird), "pos_arguments": Index der "arguments" Nachricht ("-1" falls "arguments" nicht gefunden wird), "pos_channel": Index der "channel" Nachricht ("-1" falls "channel" nicht gefunden wird),"pos_text": Index für "text" Nachricht ("-1" falls "text" nicht gefunden wird)
-
-| irc | irc_message_split | dient zum Aufteilen einer überlangen IRC Nachricht (in maximal 512 Bytes große Nachrichten) | "message": IRC Nachricht, "server": Servername (optional) | "msg1" ... "msgN": Nachrichten die versendet werden sollen (ohne abschließendes "\r\n"), "args1" ... "argsN": Argumente für Nachrichten, "count": Anzahl der Nachrichten
-
-|===
@@ -1,18 +0,0 @@
-//
-// This file is auto-generated by script docgen.py.
-// DO NOT EDIT BY HAND!
-//
-. charset (15000)
-. logger (14000)
-. exec (13000)
-. trigger (12000)
-. aspell (11000)
-. alias (10000)
-. buflist (9000)
-. fifo (8000)
-. xfer (7000)
-. irc (6000)
-. relay (5000)
-. guile, javascript, lua, perl, php, python, ruby, tcl (4000)
-. script (3000)
-. fset (2000)
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`../debian-stable/weechat-javascript.install`