ruby: add detection of Ruby 2.2

(cherry picked from commit 515e8b7b1a)
2026-06-13 06:34:47 +02:00 · 2015-06-10 23:20:46 +02:00
1365 changed files with 119239 additions and 248503 deletions
@@ -1,8 +1,6 @@
 # files/directories excluded from tarballs

-.git*                  export-ignore
-debian-devel           export-ignore
-debian-stable          export-ignore
-weechat.spec           export-ignore
-.mailmap               export-ignore
-tools/build-debian.sh  export-ignore
+.git*               export-ignore
+debian              export-ignore
+weechat.spec        export-ignore
+.mailmap            export-ignore
@@ -1 +0,0 @@
-custom: https://weechat.org/donate/
@@ -1,41 +0,0 @@
---
-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: 
@@ -1,8 +0,0 @@
---
-name: Feature request
-about: Request a new feature / enhancement
-labels: feature
-
---
-
-## Feature description
@@ -1,15 +0,0 @@
---
-name: Question
-about: Ask a question (please read first FAQ and docs)
-labels: question
-
---
-
-## Question
-
-
-
---
-
- WeeChat version: 
- OS, distribution and version: 
@@ -2,6 +2,7 @@

 *.a
 *.gmo
+*.html
 *.la
 *.lai
 *.lo
@@ -16,8 +17,7 @@

 ABOUT-NLS
 autom4te*
-build/*
-builddir/*
+build*/*
 compile
 config.guess
 config.h
@@ -28,11 +28,7 @@ config.rpath
 config.status
 config.sub
 configure
-debian
-!tools/debian
-debian-devel/changelog
-debian-devel/*.log
-debian-stable/*.log
+debian/*.log
 depcomp
 insert-header.sin
 install-sh
@@ -54,4 +50,3 @@ weechat-*.cygport
 stamp*

 src/gui/curses/weechat
-src/gui/curses/weechat-curses
@@ -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> <soltys@soltys.info>
+Krzysztof Korościk <soltys@szluug.org>
 Marco Paolone <marcopaolone@gmail.com>
 <marcopaolone@gmail.com> <marco@DrB4tch.sitecomwl601>
 <mikaela.suomalainen@outlook.com> <mkaysi@outlook.com>
@@ -1,5 +1,3 @@
-dist: xenial
-sudo: required
 language: c

 compiler:
@@ -8,46 +6,29 @@ compiler:

 env:
    - BUILDTOOL="cmake" BUILDARGS=""
-    - BUILDTOOL="cmake" BUILDARGS="-DENABLE_PYTHON2=ON"
+    - BUILDTOOL="cmake" BUILDARGS="-DENABLE_PYTHON3=ON"
    - BUILDTOOL="cmake" BUILDARGS="-DENABLE_GNUTLS=OFF"
-    - BUILDTOOL="cmake" BUILDARGS="-DENABLE_CODE_COVERAGE=ON" CODECOVERAGE="1"
    - BUILDTOOL="autotools" BUILDARGS=""
-    - BUILDTOOL="autotools" BUILDARGS="--enable-python2"
+    - BUILDTOOL="autotools" BUILDARGS="--enable-python3"
    - BUILDTOOL="autotools" BUILDARGS="--disable-gnutls"

-matrix:
-    fast_finish: true
-    exclude:
-      - compiler: clang
-        env: BUILDTOOL="cmake" BUILDARGS="-DENABLE_CODE_COVERAGE=ON" CODECOVERAGE="1"
-
 before_script:
-    - rm -rf "$HOME/.pyenv"
-    - sudo rm -rf /opt/pyenv
    - echo 'APT::Install-Recommends "false";' | sudo tee -a /etc/apt/apt.conf
-    - 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 libgnutls-dev zlib1g-dev curl libcpputest-dev php7.0-dev libphp7.0-embed
-    - travis_retry sudo gem install asciidoctor
-    - travis_retry sudo -H pip install --ignore-installed msgcheck pylint
-    - phpenv local system
-      # work around broken travis environment variables, see https://github.com/travis-ci/travis-ci/issues/5301
-    - unset PYTHON_CFLAGS
+    - sudo apt-get update -qq
+    - sudo apt-get -y install devscripts equivs python-pip libenchant-dev autopoint asciidoc source-highlight xsltproc docbook-xsl docbook-xml 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
+    - curl -OL https://weechat.org/files/tests/ubuntu/precise/amd64/libcpputest-dev_3.4-3_amd64.deb
+    - sudo dpkg -i libcpputest-dev_3.4-3_amd64.deb
+    - sudo pip install msgcheck pylint

 script:
-    - ./tools/build-test.sh
+    - ./scripts/build.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
-    - ./tools/build-debian.sh test-patches

 after_success:
    - weechat --help
    - weechat-curses --help
-    - 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
+    - weechat -r "/debug libs;/quit"
+
+matrix:
+    fast_finish: true
@@ -15,8 +15,6 @@

 Alphabetically:

-* Adam Saponara (adsr)
-* Adrian Bjugård
 * Ailin Nemui (Nei)
 * Aleksey V Zapparov
 * Alex Tarkovsky
@@ -27,71 +25,46 @@ Alphabetically:
 * Asakura
 * Bazerka
 * Benoit Papillault (benoit)
-* Chris Hills
 * Christian Heinz
 * Christopher O'Neill (deltafire)
-* coypoop
 * David Flatz
 * Dmitry Kobylin
 * Dominik Honnef
-* Dominique Martinet
 * Eduardo Elias
-* Eli Schwartz
 * Elizabeth Myers (Elizacat)
 * Elián Hanisch (m4v)
 * Emanuele Giaquinta
-* emk
 * Esteban I. Ruiz Moreno (Exio)
-* Evgeny Shmarnev
 * Felix Eckhofer
 * Frank Zacharias
-* Fredrik Fornwall
-* Grant Wu
 * Gu1ll4um3r0m41n
 * Guido Berhoerster
 * Gwenn
 * Hasan Kiran (turgay)
 * Ivan Sichmann Freitas
-* Jakub Jirutka
 * Jason A. Donenfeld (zx2c4)
 * JD Horelick (jdhore)
-* jesopo
 * Jim Ramsay (lack)
 * Jiri Golembiovsky (GolemJ)
-* Joey Pabalinas (alyptik)
-* Johan Rylander
-* 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
 * Mateusz Poszwa
 * Matt Robinson
-* Matthew Martin
 * Max Anton Teufel
-* Maxim Baz
-* Michael Siegel
-* Miroslav Koskar
 * Murilo Opsfelder Araujo
-* Neui
-* Nick (SolitaryCipher)
 * Nicolas Cavigneaux
 * Nils Görs (nils_2)
 * nyuszika7h
 * Odin
-* Ondřej Súkup
 * Patrick Steinhardt
-* Patrik Janoušek
 * Paul Komkoff
 * Pavel Shevchuk (Stalwart)
 * Peter Boström (pbos)
@@ -102,43 +75,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
-* Simmo Saan (sim642)
+* Simmo Saan
 * Simon Arlott
 * Simon Kuhnle
 * Stefano Pigozzi
 * Stfn
 * Sven Knurr (Cthulhux)
 * Tim D. Smith
-* Tim Harder
-* Tobias Stoeckmann
 * Tom Alsberg
-* Tomoe Mami
 * Tor Hveem (xt)
-* Trevor Bergeron
 * Valentin Lorentz (progval)
-* Vasco Almeida
 * 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/about/support
+or https://weechat.org/dev/support
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

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

 project(weechat C)

@@ -27,16 +27,16 @@ 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} -fsigned-char -Wall -Wextra -Werror-implicit-function-declaration")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char -Wall -Wextra")
+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")
+if(PREFIX)
+  set(CMAKE_INSTALL_PREFIX ${PREFIX} CACHE PATH "Install path prefix" FORCE)
+endif()

 # version
-execute_process(COMMAND ${CMAKE_SOURCE_DIR}/version.sh devel-major OUTPUT_VARIABLE VERSION_MAJOR)
-execute_process(COMMAND ${CMAKE_SOURCE_DIR}/version.sh devel-minor OUTPUT_VARIABLE VERSION_MINOR)
-execute_process(COMMAND ${CMAKE_SOURCE_DIR}/version.sh devel-patch OUTPUT_VARIABLE VERSION_PATCH)
-string(REGEX REPLACE "\n" "" VERSION_MAJOR "${VERSION_MAJOR}")
-string(REGEX REPLACE "\n" "" VERSION_MINOR "${VERSION_MINOR}")
-string(REGEX REPLACE "\n" "" VERSION_PATCH "${VERSION_PATCH}")
+set(VERSION_MAJOR "1")
+set(VERSION_MINOR "2")
+set(VERSION_PATCH "")
 if(VERSION_PATCH STREQUAL "")
  set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR})
 else()
@@ -58,12 +58,10 @@ endif()
 set(PKG_STRING "${PROJECT_NAME} ${VERSION}")
 string(REPLACE "\";\"" "\ " PKG_STRING ${PKG_STRING})

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

 if(NOT DEFINED SHAREDIR)
@@ -84,51 +82,34 @@ else()
  set(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME})
 endif()

-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_GNUTLS        "Enable SSLv3/TLS 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"        ON)
-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_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(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_CHARSET    "Enable Charset plugin"                     ON)
+option(ENABLE_EXEC       "Enable Exec plugin"                        ON)
+option(ENABLE_FIFO       "Enable FIFO 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)" 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_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 WEECHAT_HOME
 if(NOT DEFINED WEECHAT_HOME OR "${WEECHAT_HOME}" STREQUAL "")
@@ -180,12 +161,6 @@ 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()

@@ -203,8 +178,6 @@ if(ENABLE_GNUTLS)
    include_directories(${GNUTLS_INCLUDE_PATH})
    set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -L${GNUTLS_LIBRARY_PATH}")
    list(APPEND EXTRA_LIBS gnutls)
-  else()
-    message(SEND_ERROR "GnuTLS not found")
  endif()
 endif()

@@ -235,8 +208,6 @@ if(DL_LIBRARY)
  list(APPEND EXTRA_LIBS dl)
 endif()

-add_subdirectory(icons)
-
 if(ENABLE_NLS)
  add_subdirectory(po)
 endif()
@@ -245,46 +216,37 @@ add_subdirectory(src)
 add_subdirectory(doc)

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

 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}"
-)
+  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/scripts/git-version.sh" "${CMAKE_CURRENT_SOURCE_DIR}" "${VERSION}" "config-git.h"
+  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}
-)
+  "${CMAKE_CURRENT_SOURCE_DIR}/makedist.sh" "${VERSION}" "HEAD" "${CMAKE_CURRENT_BINARY_DIR}"
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

 # pkgconfig file
 set(PACKAGE "${PROJECT_NAME}")
 set(prefix "${CMAKE_INSTALL_PREFIX}")
 set(exec_prefix "\${prefix}")
-string(REPLACE "${CMAKE_INSTALL_PREFIX}" "\${prefix}" libdir "${LIBDIR}")
+set(libdir "\${exec_prefix}/lib")
 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)
@@ -292,22 +254,21 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/weechat.cygport.in ${CMAKE_CURRENT_BI
 # install some files (only on Cygwin)
 if(CYGWIN)
  install(FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/Contributing.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/README.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/ReleaseNotes.adoc
-    DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME}
-  )
+    ${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/Contributing.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/README.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/ReleaseNotes.asciidoc
+    DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
 endif()

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

 # packages
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat client")
 set(CPACK_PACKAGE_VENDOR "Sébastien Helleu")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.adoc")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.asciidoc")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
 set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
 set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
@@ -320,8 +281,7 @@ 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. <https://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://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 <https://www.gnu.org/licenses/>.
+    along with this program.  If not, see <http://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
-<https://www.gnu.org/licenses/>.
+<http://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
-<https://www.gnu.org/philosophy/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
@@ -9,8 +9,6 @@
 First, some basic things:

 * Use only English to communicate with developers.
-* Search in issues if the same problem or feature request has already been
-  reported (a duplicate is waste of time for you and the developers!).
 * If you can, please check if the problem has been fixed in development version
  (if you are using a stable release or old version).
 * Report only one bug or feature request per issue.
@@ -25,26 +23,24 @@ email to <security@weechat.org> instead.
 When reporting https://github.com/weechat/weechat/issues[issues] on GitHub,
 please include:

-* Your *WeeChat version*: the output of `/v` in WeeChat, for example:
-  _WeeChat 1.7-dev (git: v1.6-6-g997f47f)_. +
+* your *WeeChat version*: the output of `/v` in WeeChat, for example:
+  'WeeChat 1.0-dev (git: v0.4.3-475-gb174b3c)'. +
  If WeeChat does not start at all, please include the version displayed by
  `weechat --help` (or the version installed with your package manager).
-* Your *operating system*: its name and version (examples: Linux Debian Wheezy,
-  FreeBSD 10.0, Windows/Cygwin 64-bit, Windows/Ubuntu 64-bit...).
-* The *steps to reproduce*: if possible, please include a reproducible example:
+* your *operating system*: its name and version (examples: Linux Debian Wheezy,
+  FreeBSD 10.0, Windows/Cygwin 64-bit, ...).
+* the *steps to reproduce*: if possible, please include a reproducible example:
  explain the steps which led you to the problem. +
  It's even better if you can reproduce the problem with a new config (and no
  scripts loaded): try `weechat --dir /tmp/weechat` and check if you have the
  problem here.
-* The *gdb's backtrace* (only for a crash): if you can reproduce the crash
-  (or if you have a core file), please include the backtrace from gdb (look at
-  https://weechat.org/files/doc/devel/weechat_user.en.html#report_crashes[User's guide]
-  for more info).
-* The *actual result*.
-* The *expected result*: the correct result you are expecting.
+* the *gdb's backtrace* (only for a crash): if you can reproduce the crash
+(or if you have a core file), please include the backtrace from gdb (look at
+https://weechat.org/files/doc/devel/weechat_user.en.html#report_crashes[User's guide]
+for more info).

 [IMPORTANT]
-Most of times, the WeeChat crash log file (_weechat_crash_YYYYMMDD_xxx.log_) is
+Most of times, the WeeChat crash log file ('weechat_crash_YYYYMMDD_xxx.log') is
 *NOT USEFUL* to fix the bug, so please report this file *ONLY* if a developer
 asked you to send it (and be extremely careful, this file can contain personal
 data like passwords and contents of your chats).
@@ -65,8 +61,8 @@ 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 website
-https://github.com/weechat/weechat.org[weechat.org].
+time, for https://github.com/weechat/weechat[WeeChat] and
+the web site https://github.com/weechat/weechat.org[weechat.org].

 To start a translation in a new language (not yet supported), please look at
 https://weechat.org/files/doc/devel/weechat_dev.en.html#translations[translations]
@@ -82,7 +78,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: 'chat.freenode.net', 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-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2005 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2006-2009 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -16,31 +16,32 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 # This target will update file config-git.h with output of command "git describe"
 # (if needed, and only for a devel/rc version).
 BUILT_SOURCES = build-config-git.h
 build-config-git.h:
-	-$(abs_top_srcdir)/tools/git-version.sh "$(abs_top_srcdir)" "$(VERSION)" config-git.h
+	-$(abs_top_srcdir)/scripts/git-version.sh "$(abs_top_srcdir)" "$(VERSION)" config-git.h

 if TESTS
 tests_dir = tests
 endif

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

-EXTRA_DIST = AUTHORS.adoc \
-             ChangeLog.adoc \
-             Contributing.adoc \
-             README.adoc \
-             ReleaseNotes.adoc \
+EXTRA_DIST = AUTHORS.asciidoc \
+             ChangeLog.asciidoc \
+             Contributing.asciidoc \
+             README.asciidoc \
+             ReleaseNotes.asciidoc \
             CMakeLists.txt \
             config.rpath \
             config.h.cmake \
+             makedist.sh \
             cmake/CMakeParseArguments.cmake \
-             cmake/FindAsciidoctor.cmake \
+             cmake/FindAsciidoc.cmake \
             cmake/FindAspell.cmake \
             cmake/FindCppUTest.cmake \
             cmake/FindENCHANT.cmake \
@@ -56,26 +57,26 @@ EXTRA_DIST = AUTHORS.adoc \
             cmake/FindPkgConfig.cmake \
             cmake/FindPython.cmake \
             cmake/FindRuby.cmake \
+             cmake/FindSourcehighlight.cmake \
+             cmake/FindTCL.cmake \
             cmake/FindV8.cmake \
             cmake/FindZLIB.cmake \
             cmake/cmake_uninstall.cmake.in \
             po/CMakeLists.txt \
             po/srcfiles.cmake \
-             tools/build-test.sh \
-             tools/git-version.sh \
-             tools/makedist.sh \
-             version.sh \
-             weechat.desktop \
+             scripts/build.sh \
+             scripts/git-version.sh \
+             weechat.png \
             weechat.pc.in \
             weechat.cygport.in

 ACLOCAL_AMFLAGS = -I m4

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

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

 clean-local:
 	$(RM) config-git.h
@@ -1,132 +0,0 @@
-: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/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://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
-light, designed for many operating systems.
-It is highly customizable and extensible with scripts.
-
-Homepage: https://weechat.org/
-
-== Features
-
-* *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 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/stable/language/perl/[Perl], https://weechat.org/scripts/stable/language/python/[Python], https://weechat.org/scripts/stable/language/ruby[Ruby], https://weechat.org/scripts/stable/language/lua/[Lua], https://weechat.org/scripts/stable/language/tcl/[Tcl], https://weechat.org/scripts/stable/language/guile/[Scheme], https://weechat.org/scripts/stable/language/javascript/[JavaScript] and https://weechat.org/scripts/stable/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 https://www.gnu.org/licenses/gpl-3.0.html[GPLv3].
-
-pass:[<p align="center">] image:https://weechat.org/media/images/screenshots/weechat/medium/weechat_2013-04-27_phlux_shadow.png[align="center"] pass:[</p>]
-
-On WeeChat's website you can find https://weechat.org/about/screenshots/[more screenshots].
-
-== Install
-
-=== Dependencies
-
-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 or enchant
-* 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 https://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
----
-
-== Copyright
-
-Copyright (C) 2003-2019 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 <https://www.gnu.org/licenses/>.
@@ -0,0 +1,92 @@
+= WeeChat
+:author: Sébastien Helleu
+:email: flashcode@flashtux.org
+:lang: en
+
+
+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.
+
+Homepage: https://weechat.org/
+
+image:https://travis-ci.org/weechat/weechat.svg?branch=master["Build Status", link="https://travis-ci.org/weechat/weechat"]
+
+== Features
+
+* Modular chat client with a lightweight core and optional plugins.
+* Multi-platform (GNU/Linux, *BSD, Mac OS X, QNX, Windows & other).
+* Multi-protocols architecture (mainly IRC).
+* Compliant with IRC RFCs 1459, 2810, 2811, 2812 and 2813.
+* Small, fast and very light.
+* Customizable and extensible with plugins (C, Perl, Python, Ruby, Lua, Tcl,
+  Guile, Javascript).
+* Fully documented and translated into several languages.
+* Developed from scratch.
+* Free software, released under GPLv3.
+
+image::https://weechat.org/media/images/screenshots/weechat/medium/weechat_2013-04-27_phlux_shadow.png[align="center"]
+
+== Install
+
+=== Dependencies
+
+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)
+* for building doc: asciidoc, source-highlight
+  (for man page: xsltproc, docbook-xml, docbook-xsl)
+* 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 use autotools
+only if you are not able to use CMake. +
+Build with autotools requires more dependencies and is slower than with CMake.
+
+----
+$ mkdir build
+$ cd build
+$ cmake .. -DPREFIX=/path/to/directory
+$ make
+$ make install     (as root for installation in system directories)
+----
+
+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].
+
+== Copyright
+
+Copyright (C) 2003-2015 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/>.
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 ###
 ### common stuff
 ###

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

 AUTOGEN_LOG=autogen.log

@@ -41,8 +41,9 @@ err ()

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

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

 # ending
 rm -f $AUTOGEN_LOG
@@ -0,0 +1,55 @@
+#
+# Copyright (C) 2003-2015 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 Asciidoc
+# This module finds if asciidoc (version 8 or newer) is installed.
+
+if(ASCIIDOC_FOUND)
+  # Already in cache, be silent
+  set(ASCIIDOC_FIND_QUIETLY TRUE)
+endif()
+
+find_program(
+  ASCIIDOC_EXECUTABLE asciidoc
+  PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin
+)
+
+find_program(
+  A2X_EXECUTABLE a2x
+  PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin
+)
+
+if(ASCIIDOC_EXECUTABLE AND A2X_EXECUTABLE)
+  execute_process(
+    COMMAND ${ASCIIDOC_EXECUTABLE} --version
+    OUTPUT_VARIABLE ASCIIDOC_VERSION
+    )
+
+  string(STRIP ${ASCIIDOC_VERSION} ASCIIDOC_VERSION)
+  string(REPLACE "asciidoc " "" ASCIIDOC_VERSION ${ASCIIDOC_VERSION})
+
+  if(ASCIIDOC_VERSION VERSION_EQUAL "8.0.0" OR ASCIIDOC_VERSION VERSION_GREATER "8.0.0")
+    set(ASCIIDOC_FOUND TRUE)
+  endif()
+
+  mark_as_advanced(
+    ASCIIDOC_EXECUTABLE
+    ASCIIDOC_VERSION
+    )
+endif()
@@ -1,49 +0,0 @@
-#
-# Copyright (C) 2003-2019 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 <https://www.gnu.org/licenses/>.
-#
-
-# - Find Asciidoctor
-# This module finds if asciidoctor (version 1.5.4 or newer) is installed.
-
-if(ASCIIDOCTOR_FOUND)
-  # Already in cache, be silent
-  set(ASCIIDOCTOR_FIND_QUIETLY TRUE)
-endif()
-
-find_program(
-  ASCIIDOCTOR_EXECUTABLE asciidoctor
-  PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin
-)
-
-if(ASCIIDOCTOR_EXECUTABLE)
-  execute_process(
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} --version
-    OUTPUT_VARIABLE ASCIIDOCTOR_VERSION
-  )
-
-  string(REGEX REPLACE "^Asciidoctor ([^ ]+) .*" "\\1" ASCIIDOCTOR_VERSION "${ASCIIDOCTOR_VERSION}")
-
-  if(ASCIIDOCTOR_VERSION VERSION_EQUAL "1.5.4" OR ASCIIDOCTOR_VERSION VERSION_GREATER "1.5.4")
-    set(ASCIIDOCTOR_FOUND TRUE)
-  endif()
-
-  mark_as_advanced(
-    ASCIIDOCTOR_EXECUTABLE
-    ASCIIDOCTOR_VERSION
-  )
-endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://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-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2014-2015 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,24 +14,24 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 # - Find CppUTest
-# This module finds if CppUTest 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:
+# This module finds if Guile 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:
 #
 # CPPUTEST_FOUND        = CppUTest is installed
 # CPPUTEST_INCLUDE_DIRS = CppUTest include directory
 # 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)
 if(PKG_CONFIG_FOUND)
-  pkg_search_module(CPPUTEST cpputest)
+  pkg_search_module(CPPUTEST REQUIRED cpputest)
 endif()
@@ -13,8 +13,10 @@


 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
@@ -25,19 +27,17 @@ 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,4 +47,5 @@ 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-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 # - Find Gcrypt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://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,6 +62,7 @@ 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-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://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}")

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2011-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2011-2015 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://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.2 guile-2.0)
+  pkg_search_module(GUILE 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-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://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)
@@ -48,8 +48,9 @@ find_library(ICONV_LIBRARY

 if(ICONV_INCLUDE_PATH)
  if(ICONV_LIBRARY)
-    check_library_exists("${ICONV_LIBRARY}" libiconv_open "" LIBICONV_OPEN_FOUND)
-    check_library_exists("${ICONV_LIBRARY}" iconv_open "" ICONV_OPEN_FOUND)
+    string(REGEX REPLACE "/[^/]*$" "" ICONV_LIB_PATH "${ICONV_LIBRARY}")
+    check_library_exists(iconv libiconv_open ${ICONV_LIB_PATH} LIBICONV_OPEN_FOUND)
+    check_library_exists(iconv iconv_open ${ICONV_LIB_PATH} ICONV_OPEN_FOUND)
    if(LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND)
       set(ICONV_FOUND TRUE)
    endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://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.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-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

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

 find_path(NCURSES_INCLUDE_PATH
  NAMES ncurses.h curses.h
-  PATH_SUFFIXES ncursesw ncurses
-  PATHS /usr/include /usr/local/include /usr/pkg/include
+  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
 )

 find_library(NCURSESW_LIBRARY
@@ -33,22 +34,12 @@ find_library(NCURSESW_LIBRARY
 )

 if(NCURSESW_LIBRARY)
-  find_package(PkgConfig QUIET)
-  if(PKG_CONFIG_FOUND)
-    pkg_search_module(NCURSES ncursesw)
-    set(NCURSESW_LIBRARY ${NCURSES_LIBRARIES} ${NCURSES_CFLAGS_OTHER})
-  endif()
  set(NCURSES_LIBRARY ${NCURSESW_LIBRARY})
 else()
  find_library(NCURSES_LIBRARY
    NAMES ncurses
    PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
  )
-  find_package(PkgConfig QUIET)
-  if(PKG_CONFIG_FOUND)
-    pkg_search_module(NCURSES ncurses)
-    set(NCURSES_LIBRARY ${NCURSES_LIBRARIES} ${NCURSES_CFLAGS_OTHER})
-  endif()
  if(NCURSES_LIBRARY)
    message("*** WARNING:\n"
      "*** ncursesw library not found! Falling back to \"ncurses\"\n"
@@ -1,64 +0,0 @@
-#
-# Copyright (C) 2003-2017 Adam Saponara <as@php.net>
-#
-# 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 <https://www.gnu.org/licenses/>.
-#
-
-if(PHP_FOUND)
-  set(PHP_FIND_QUIETLY TRUE)
-endif()
-
-find_package(PkgConfig)
-if(PKG_CONFIG_FOUND)
-  pkg_search_module(PHP php7)
-endif()
-
-if(NOT PHP_FOUND)
-  find_program(PHP_CONFIG_EXECUTABLE NAMES
-    php-config7.3 php-config73
-    php-config7.2 php-config72
-    php-config7.1 php-config71
-    php-config7.0 php-config70
-    php-config php-config7
-  )
-  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")
-      find_library(PHP_LIB
-        NAMES php7.3 php7.2 php7.1 php7.0 php7
-        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})
-        SEPARATE_ARGUMENTS(PHP_INCLUDE_DIRS)
-        set(PHP_LDFLAGS "-L${PHP_LIB_DIR} ${PHP_LIBS}")
-        set(PHP_FOUND 1)
-      endif()
-    endif()
-  endif()
-endif()
-
-if(NOT PHP_FOUND)
-  message(WARNING "Could not find libphp7. "
-    "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."
-  )
-endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://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,60 +1,117 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
+# - 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)

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

-A ``pkg-config`` module for CMake.
+# 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.

-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)
-  execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --version
-    OUTPUT_VARIABLE PKG_CONFIG_VERSION_STRING
-    ERROR_QUIET
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-endif ()
+if(PKG_CONFIG_EXECUTABLE)
+  set(PKG_CONFIG_FOUND 1)
+endif(PKG_CONFIG_EXECUTABLE)

-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-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()
+endmacro(_pkgconfig_unset)

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

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

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

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

    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()
-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 ()
+  endif(_pkgconfig_failed)
+endmacro(_pkgconfig_invoke)

 # 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()
+endmacro(_pkgconfig_invoke_dyn)

 # Splits given arguments into options and a package list
-macro(_pkgconfig_parse_options _result _is_req _is_silent _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global)
+macro(_pkgconfig_parse_options _result _is_req)
  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 ()
-    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()
+    endif (_pkg STREQUAL "REQUIRED")
+  endforeach(_pkg ${ARGN})

  set(${_result} ${ARGN})
  list(REMOVE_ITEM ${_result} "REQUIRED")
-  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()
+endmacro(_pkgconfig_parse_options)

 ###
-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)
+macro(_pkg_check_modules_internal _is_required _is_silent _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)
@@ -392,77 +193,83 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma
    # 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()
-        message(STATUS "Checking for modules '${_pkg_check_modules_list}'")
-      endif()
-    endif()
+        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})

    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 "(.*[^><])(=|[><]=?)(.*)")
-        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()
+      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 ".*(>=|=|<=).*")
        set(_pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}")
        set(_pkg_check_modules_pkg_op)
        set(_pkg_check_modules_pkg_ver)
-      endif()
+      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)

      _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
-        ERROR_VARIABLE _pkgconfig_error
-        ERROR_STRIP_TRAILING_WHITESPACE)
+        RESULT_VARIABLE _pkgconfig_retval)

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

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

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

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

        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" VERSION    ""   --modversion )
-        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}")
+        _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 )

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

      # set variables which are combined for multiple modules
      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARIES           "(^| )-l" --libs-only-l )
@@ -501,271 +302,58 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma
      _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 )
-
-      _pkg_recalculate("${_prefix}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global})
-    endif()
-
-    _pkg_restore_path_internal()
-  else()
+    endif(_pkg_check_modules_failed)
+  else(PKG_CONFIG_EXECUTABLE)
    if (${_is_required})
      message(SEND_ERROR "pkg-config tool not found")
-    endif ()
-  endif()
-endmacro()
+    endif (${_is_required})
+  endif(PKG_CONFIG_EXECUTABLE)
+endmacro(_pkg_check_modules_internal)

+###
+### 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} 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})
+  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})

    _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
-    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()
+  endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION})
+endmacro(pkg_check_modules)

-
-#[========================================[.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})

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

    # 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 ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global} "${_prefix}" "${_pkg_alt}")
-      endif()
+        _pkg_check_modules_internal(0 1 "${_prefix}" "${_pkg_alt}")
+      endif(NOT _pkg_modules_found)

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

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

    _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
-  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.
-#]========================================]
-
+  endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
+endmacro(pkg_search_module)

 ### Local Variables:
 ### mode: cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 # - Find Python
@@ -24,17 +24,80 @@
 # code sets the following variables:
 #
 #  PYTHON_EXECUTABLE   = full path to the python binary
-#  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
+#  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
+
+if(PYTHON_FOUND)
+   # Already in cache, be silent
+   set(PYTHON_FIND_QUIETLY TRUE)
+endif()
+
+if(ENABLE_PYTHON3)
+  find_program(PYTHON_EXECUTABLE
+    NAMES 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
+    )
+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('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.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}
+      )
+  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
+    )

-include(FindPkgConfig)
-
-if(ENABLE_PYTHON2)
-  pkg_check_modules(PYTHON python2 IMPORTED_TARGET GLOBAL)
-else()
-  pkg_check_modules(PYTHON python3-embed IMPORTED_TARGET GLOBAL)
-  if(NOT PYTHON_FOUND)
-    pkg_check_modules(PYTHON python3 IMPORTED_TARGET GLOBAL)
-  endif()
 endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 # - Find Ruby
@@ -27,13 +27,13 @@
 #  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.6 ruby-2.5 ruby-2.4 ruby-2.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9)
+  pkg_search_module(RUBY ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8)
 endif()

 if(RUBY_FOUND)
@@ -41,35 +41,35 @@ if(RUBY_FOUND)
  mark_as_advanced(RUBY_LIB)
 else()
  find_program(RUBY_EXECUTABLE
-    NAMES ruby2.6.0 ruby260 ruby2.6 ruby2.5.0 ruby250 ruby2.5 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 ruby
+    NAMES 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 ruby
+      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()
@@ -78,6 +78,6 @@ else()
      RUBY_INCLUDE_DIRS
      RUBY_LIBRARY_DIRS
      RUBY_LIB
-    )
+      )
  endif()
 endif()
@@ -1,5 +1,6 @@
 #
-# Copyright (C) 2006-2017 Adam Saponara <as@php.net>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,19 +15,25 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

-add_library(php MODULE
-  weechat-php.c weechat-php.h
-  weechat-php-api.c weechat-php-api.h
-)
-set_target_properties(php PROPERTIES PREFIX "")
+# - Find Source-Highlight
+# This module finds if source-highlight is installed.

-if(PHP_FOUND)
-  include_directories(${PHP_INCLUDE_DIRS})
-  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${PHP_LDFLAGS}")
-  target_link_libraries(php ${PHP_LIB} weechat_plugins_scripts coverage_config)
+if(SOURCEHIGHLIGHT_FOUND)
+  # Already in cache, be silent
+  set(SOURCEHIGHLIGHT_FIND_QUIETLY TRUE)
 endif()

-install(TARGETS php LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins)
+find_program(
+  SOURCEHIGHLIGHT_EXECUTABLE source-highlight
+  PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin
+)
+
+if(SOURCEHIGHLIGHT_EXECUTABLE)
+  set(SOURCEHIGHLIGHT_FOUND TRUE)
+  mark_as_advanced(
+    SOURCEHIGHLIGHT_EXECUTABLE
+    )
+endif()
@@ -0,0 +1,162 @@
+#
+# Copyright (C) 2008 Julien Louis <ptitlouis@sysif.net>
+# Copyright (C) 2008-2015 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-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2015 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,11 +14,11 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

-# - Find V8 (Google's JavaScript engine)
-# This module finds if libv8 is installed and determines where
+# - Find Aspell
+# This module finds if libaspell is installed and determines where
 # the include files and libraries are.
 #
 # This code sets the following variables:
@@ -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")
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 if(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
@@ -37,4 +37,4 @@ foreach(file ${files})
  else()
    message(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
  endif()
-endforeach()
+endforeach(file)
@@ -13,7 +13,7 @@
 #define PACKAGE "@PROJECT_NAME@"
 #define PACKAGE_NAME "@PROJECT_NAME@"
 #define PACKAGE_STRING "@PKG_STRING@"
-#define WEECHAT_LIBDIR "@WEECHAT_LIBDIR@"
+#define WEECHAT_LIBDIR "@LIBDIR@"
 #define WEECHAT_SHAREDIR "@SHAREDIR@"
 #define LOCALEDIR "@LOCALEDIR@"
 #define WEECHAT_HOME "@WEECHAT_HOME@"
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 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,14 +17,14 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.56)
-AC_INIT(WeeChat, m4_esyscmd([./version.sh devel-full | tr -d '\n']), flashcode@flashtux.org)
+AC_INIT(WeeChat, 1.2, flashcode@flashtux.org)
 AC_CONFIG_SRCDIR([configure.ac])
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([foreign])
@@ -37,7 +37,6 @@ 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])
@@ -56,13 +55,10 @@ netbsd*)
 solaris*)
        LDFLAGS="$LDFLAGS -lsocket -lxnet"
        ;;
-darwin*)
-        LDFLAGS="$LDFLAGS -lresolv"
-        ;;
 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_BR ru tr"
 AM_GNU_GETTEXT
 AM_GNU_GETTEXT_VERSION([0.18])

@@ -109,11 +105,10 @@ 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_BUFLIST], [#undef PLUGIN_BUFLIST])
+AH_VERBATIM([PLUGIN_ASPELL], [#undef PLUGIN_ASPELL])
 AH_VERBATIM([PLUGIN_CHARSET], [#undef PLUGIN_CHARSET])
 AH_VERBATIM([PLUGIN_EXEC], [#undef PLUGIN_EXEC])
 AH_VERBATIM([PLUGIN_FIFO], [#undef PLUGIN_FIFO])
-AH_VERBATIM([PLUGIN_FSET], [#undef PLUGIN_FSET])
 AH_VERBATIM([PLUGIN_IRC], [#undef PLUGIN_IRC])
 AH_VERBATIM([PLUGIN_LOGGER], [#undef PLUGIN_LOGGER])
 AH_VERBATIM([PLUGIN_RELAY], [#undef PLUGIN_RELAY])
@@ -122,11 +117,9 @@ AH_VERBATIM([PLUGIN_PERL], [#undef PLUGIN_PERL])
 AH_VERBATIM([PLUGIN_PYTHON], [#undef PLUGIN_PYTHON])
 AH_VERBATIM([PLUGIN_RUBY], [#undef PLUGIN_RUBY])
 AH_VERBATIM([PLUGIN_LUA], [#undef PLUGIN_LUA])
-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_XFER], [#undef PLUGIN_XFER])
 AH_VERBATIM([TESTS], [#undef TESTS])
@@ -138,15 +131,14 @@ AH_VERBATIM([CA_FILE], [#define CA_FILE "/etc/ssl/certs/ca-certificates.crt"])
 # 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(headless,     [  --disable-headless      turn off headless binary (default=compiled), this is required for tests],enable_headless=$enableval,enable_headless=yes)
 AC_ARG_ENABLE(gnutls,       [  --disable-gnutls        turn off gnutls support (default=compiled if found)],enable_gnutls=$enableval,enable_gnutls=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(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(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(charset,      [  --disable-charset       turn off Charset plugin (default=compiled if found)],enable_charset=$enableval,enable_charset=yes)
 AC_ARG_ENABLE(exec,         [  --disable-exec          turn off Exec plugin (default=compiled)],enable_exec=$enableval,enable_exec=yes)
 AC_ARG_ENABLE(fifo,         [  --disable-fifo          turn off Fifo plugin (default=compiled)],enable_fifo=$enableval,enable_fifo=yes)
-AC_ARG_ENABLE(fset,         [  --disable-fset          turn off Fast Set plugin (default=compiled)],enable_fset=$enableval,enable_fset=yes)
 AC_ARG_ENABLE(irc,          [  --disable-irc           turn off IRC plugin (default=compiled)],enable_irc=$enableval,enable_irc=yes)
 AC_ARG_ENABLE(logger,       [  --disable-logger        turn off Logger plugin (default=compiled)],enable_logger=$enableval,enable_logger=yes)
 AC_ARG_ENABLE(relay,        [  --disable-relay         turn off Relay plugin (default=compiled)],enable_relay=$enableval,enable_relay=yes)
@@ -154,17 +146,14 @@ 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(python2,      [  --enable-python2        use Python 2 instead of Python 3 (default=off)],enable_python2=$enableval,enable_python2=no)
+AC_ARG_ENABLE(python3,      [  --enable-python3        use Python 3.x if found (NOT recommended) (default=off)],enable_python3=$enableval,enable_python3=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(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(javascript,   [  --disable-javascript    turn off Javascript script plugin (default=compiled if found)],enable_javascript=$enableval,enable_javascript=yes)
 AC_ARG_ENABLE(trigger,      [  --disable-trigger       turn off Trigger plugin (default=compiled)],enable_trigger=$enableval,enable_trigger=yes)
-AC_ARG_ENABLE(xfer,         [  --disable-xfer          turn off Xfer (file transfer) plugin (default=compiled)],enable_xfer=$enableval,enable_xfer=yes)
+AC_ARG_ENABLE(xfer,         [  --disable-xfer          turn off Xfer (file transfer) plugin (default=compiled if found)],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_ENABLE(tests,        [  --enable-tests          turn on build of tests (default=not built)],enable_tests=$enableval,enable_tests=no)
@@ -187,10 +176,6 @@ 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
 # ------------------------------------------------------------------------------
@@ -247,14 +232,6 @@ else
    not_asked="$not_asked ncurses"
 fi

-# ------------------------------------------------------------------------------
-#                                   headless
-# ------------------------------------------------------------------------------
-
-if test "x$enable_headless" != "xyes" ; then
-    not_asked="$not_asked headless"
-fi
-
 # ------------------------------------------------------------------------------
 #                                    iconv
 # ------------------------------------------------------------------------------
@@ -308,7 +285,6 @@ if test "x$enable_scripts" = "xno" ; then
    enable_tcl="no"
    enable_guile="no"
    enable_javascript="no"
-    enable_php="no"
 fi

 # ---------------------------------- alias -------------------------------------
@@ -323,12 +299,77 @@ else
    not_asked="$not_asked alias"
 fi

-# --------------------------------- buflist ------------------------------------
+# ---------------------------------- aspell ------------------------------------

-if test "x$enable_buflist" = "xyes" ; then
-    AC_DEFINE(PLUGIN_BUFLIST)
+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 librairies)
+        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 buflist"
+    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

 # --------------------------------- charset ------------------------------------
@@ -367,14 +408,6 @@ else
    not_asked="$not_asked fifo"
 fi

-# --------------------------------- fset ---------------------------------------
-
-if test "x$enable_fset" = "xyes" ; then
-    AC_DEFINE(PLUGIN_FSET)
-else
-    not_asked="$not_asked fset"
-fi
-
 # ----------------------------------- irc --------------------------------------

 if test "x$enable_irc" = "xyes" ; then
@@ -474,21 +507,66 @@ fi
 PYTHON_VERSION=

 if test "x$enable_python" = "xyes" ; then
-    if test "x$enable_python2" = "xyes" ; then
-        PKG_CHECK_MODULES(PYTHON, [python2], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python2`], [PYTHON_FOUND=no])
+    if test "x$enable_python3" = "xyes" ; then
+        AC_PATH_PROGS(PYTHON, python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python2 python)
    else
-        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
+        AC_PATH_PROGS(PYTHON, python2.7 python2.6 python2.5 python2 python)
    fi
-    if test "x$PYTHON_FOUND" != "xyes" ; then
+    if test -z $PYTHON ; 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"
@@ -496,8 +574,7 @@ fi

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

@@ -508,7 +585,7 @@ RUBY_VERSION=
 if test "x$enable_ruby" = "xyes" ; then
    RUBY_CFLAGS=""
    RUBY_LFLAGS=""
-    for v in "2.6" "2.5" "2.4" "2.3" "2.2" "2.1" "2.0" "1.9" "1.8" ; do
+    for v in "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`
@@ -518,9 +595,8 @@ 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 ruby)
+        AC_PATH_PROGS(RUBY, ruby1.9.3 ruby1.9.2 ruby1.9.1 ruby1.9 ruby1.8 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.
@@ -578,9 +654,9 @@ if test "x$enable_lua" = "xyes" ; then
    fi

    if test "x$LUA_CFLAGS" = "x" -o "x$LUA_LFLAGS" = "x" ; then
-        AC_MSG_CHECKING(for Lua headers and libraries with pkg-config)
+        AC_MSG_CHECKING(for Lua headers and librairies with pkg-config)
        echo
-        for l in "53" "5.3" "52" "5.2" "51" "5.1" "50" "5.0" "$lua_suffix" "" ; do
+        for l in "$lua_suffix" "" "52" "5.2" "51" "5.1" "50" "5.0" ; do
            pkgconfig_lua_found=`$PKGCONFIG --exists lua$l 2>/dev/null`
            if test "x$?" = "x0" ; then
                LUA_VERSION=`$PKGCONFIG --modversion lua$l`
@@ -599,9 +675,9 @@ 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-config53 lua-config5.3 lua-config52 lua-config5.2 lua-config51 lua-config5.1 lua-config50 lua-config5.0 lua-config)
+        AC_CHECK_PROGS(LUACONFIG, lua-config lua-config52 lua-config5.2 lua-config51 lua-config5.1 lua-config50 lua-config5.0)
        if test "x$LUACONFIG" != "x" ; then
-            AC_MSG_CHECKING(for Lua headers and libraries with lua-config)
+            AC_MSG_CHECKING(for Lua headers and librairies with lua-config)
            echo
            LUA_CFLAGS=`$LUACONFIG --include`
            LUA_LFLAGS=`$LUACONFIG --libs`
@@ -610,14 +686,14 @@ if test "x$enable_lua" = "xyes" ; then
    fi

    if test "x$LUA_CFLAGS" = "x" -o "x$LUA_LFLAGS" = "x" ; then
-        AC_MSG_CHECKING(for Lua headers and libraries)
+        AC_MSG_CHECKING(for Lua headers and librairies)
        echo
        AC_CHECK_HEADER(lua.h,ac_found_lua_header="yes",ac_found_lua_header="no")
        AC_CHECK_HEADER(lualib.h,ac_found_liblua_header="yes",ac_found_liblua_header="no")
        if test "x$ac_found_lua_header" = "xyes" -a "x$ac_found_liblua_header" = "xyes"; then
            LUA_CFLAGS="$CFLAGS"
        fi
-        for l in "53" "5.3" "52" "5.2" "51" "5.1" "50" "5.0" "$lua_suffix" "" ; do
+        for l in "$lua_suffix" "" "52" "5.2" "51" "5.1" "50" "5.0" ; 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"
@@ -655,7 +731,7 @@ if test "x$enable_lua" = "xyes" ; then
        if test "x$LUA52_TEST" != "x0" ; then
            AC_MSG_RESULT(no)
            AC_MSG_WARN([
-*** Lua (>=5.0) headers and/or libraries couldn't be found on your system.
+*** Lua (>=5.0) headers and/or librairies couldn't be found on your system.
 *** Try to install liblua, liblualib and liblua-dev with your software package manager.
 *** WeeChat will be built without Lua support.])
            enable_lua="no"
@@ -689,7 +765,7 @@ if test "x$enable_tcl" = "xyes" ; then

    AC_MSG_CHECKING(for tclConfig.sh)
    tcl_found="no"
-    tcl_dirs="/usr/lib/tcl8.6 /usr/lib64/tcl8.6 /usr/lib/tcl8.5 /usr/lib64/tcl8.5 /lib /lib64 /usr/lib /usr/lib64 /usr/tcl/lib /usr/tcl/lib64 /usr/local/tcl-8.6/lib /usr/local/tcl-8.6/lib64 /usr/local/tcl-8.5/lib /usr/local/tcl-8.5/lib64 /usr/local/lib /usr/local/lib64 /usr/local/tcl/lib /usr/local/tcl/lib64 /opt/lib /opt/lib64"
+    tcl_dirs="/usr/lib/tcl8.5 /usr/lib64/tcl8.5 /lib /lib64 /usr/lib /usr/lib64 /usr/tcl/lib /usr/tcl/lib64 /usr/local/tcl-8.5/lib /usr/local/tcl-8.5/lib64 /usr/local/lib /usr/local/lib64 /usr/local/tcl/lib /usr/local/tcl/lib64 /opt/lib /opt/lib64"
    if test "x$tclconfig" != "x" ; then
      tcl_dirs="${tclconfig} ${tcl_dirs}"
    fi
@@ -728,9 +804,9 @@ if test "x$enable_guile" = "xyes" ; then
    enable_plugins="yes"

    guile_found="no"
-    AC_MSG_CHECKING(for Guile headers and libraries)
+    AC_MSG_CHECKING(for Guile headers and librairies)
    echo
-    for v in "2.2" "2.0" ; do
+    for v in "2.0" ; do
        pkgconfig_guile_found=`$PKGCONFIG --exists guile-$v 2>/dev/null`
        if test "x$?" = "x0" ; then
            GUILE_VERSION=`$PKGCONFIG --modversion guile-$v`
@@ -786,8 +862,8 @@ if test "x$enable_javascript" = "xyes" ; then
    AC_CHECK_HEADER(v8.h,ac_found_v8_header="yes",ac_found_v8_header="no")
    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 -lpthread"
+        ac_save_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS -lv8"
        AC_MSG_CHECKING(for v8 usability in programs)
        AC_TRY_RUN([
            #include <v8.h>
@@ -796,24 +872,24 @@ if test "x$enable_javascript" = "xyes" ; then
                const char *version = V8::GetVersion();
                return 0;
            }],ac_found_v8_lib="yes", ac_found_v8_lib="no", ac_found_v8_lib="assume-yes")
-        LIBS="$ac_save_LIBS"
+        LDFLAGS="$ac_save_LDFLAGS"
        if test "x$ac_found_v8_lib" = "xyes" ; then
            AC_MSG_RESULT(yes)
            v8_found="yes"
            V8_CFLAGS=""
-            V8_LFLAGS="-lv8 -lpthread"
+            V8_LFLAGS="-lv8"
        else
            AC_MSG_RESULT(no)
            AC_MSG_WARN([
 *** V8 library couldn't be found on your system.
-*** WeeChat will be built without JavaScript support.])
+*** WeeChat will be built without Javascript support.])
            enable_javascript="no"
            not_found="$not_found javascript/v8"
        fi
    else
        AC_MSG_WARN([
 *** V8 header files couldn't be found on your system.
-*** WeeChat will be built without JavaScript support.])
+*** WeeChat will be built without Javascript support.])
        enable_javascript="no"
        not_found="$not_found javascript/v8"
    fi
@@ -829,187 +905,6 @@ fi

 AC_LANG_POP

-# ---------------------------------- php --------------------------------------
-
-PHP_VERSION=
-
-if test "x$enable_php" = "xyes" ; then
-    ac_save_CPPFLAGS="$CPPFLAGS"
-    ac_save_CFLAGS="$CFLAGS"
-    ac_save_LDFLAGS="$LDFLAGS"
-
-    PHP_CFLAGS=""
-    PHP_LFLAGS=""
-
-    if test -n "$php_inc"; then
-       CFLAGS="$CFLAGS -I$php_inc"
-       CPPFLAGS="$CPPFLAGS -I$php_inc"
-    fi
-    if test -n "$php_lib"; then
-       LDFLAGS="$LDFLAGS -L$php_lib"
-    fi
-
-    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.3" "73" "7.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; 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`
-                if test "x$?" = "x0" ; then
-                    PHP_VERSION=`$PKGCONFIG --modversion php$l`
-                    PHP_CFLAGS="$PHP_CFLAGS "`$PKGCONFIG --cflags php$l`
-                    PHP_LFLAGS="$PHP_LFLAGS "`$PKGCONFIG --libs php$l`
-                    break
-                fi
-            fi
-        done
-    fi
-
-    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.3" "73" "7.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; 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
-                    PHP_VERSION=$php_config_version
-                    PHP_CFLAGS=`$PHPCONFIG --includes`
-                    PHP_LFLAGS="-L$($PHPCONFIG --prefix)/lib/ $($PHPCONFIG --libs) -lphp$l"
-                    break
-                fi
-            fi
-        done
-    fi
-
-    if test "x$PHP_CFLAGS" = "x" -o "x$PHP_LFLAGS" = "x" ; then
-        AC_MSG_CHECKING(for PHP headers and libraries)
-        echo
-        AC_CHECK_HEADER(php.h,ac_found_php_header="yes",ac_found_php_header="no")
-        if test "x$ac_found_php_header" = "xyes" ; then
-            PHP_CFLAGS="$CFLAGS"
-        fi
-        for l in "7.3" "73" "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"
-
-                PHP_LFLAGS="$LDFLAGS -lphp7 -lm"
-
-                ac2_save_LDFLAGS="$LDFLAGS"
-                LDFLAGS="$LDFLAGS -lphp7 -lm"
-
-                if echo "$host_os" | grep "^linux" 1>/dev/null 2>&1 ; then
-                    LDFLAGS="$LDFLAGS -ldl"
-                fi
-
-                LDFLAGS="$ac2_save_LDFLAGS"
-                break
-            fi
-        done
-    fi
-
-    AC_MSG_CHECKING(for PHP compiling and linking)
-    PHP_TEST=`LT=phptest.c ; echo "#include <sapi/embed/php_embed.h>" > $LT; echo "int main() { php_embed_init(0, NULL); php_embed_shutdown(); return 0; }" >> $LT ; $CC -Wall $LT -o $LT.out $PHP_CFLAGS $PHP_LFLAGS $CFLAGS $LDFLAGS 1>/dev/null 2>&1 ; echo $?; rm -f $LT $LT.out 1>/dev/null 2>&1`
-    if test "x$PHP_TEST" != "x0" ; then
-        AC_MSG_RESULT(no)
-        AC_MSG_WARN([
-*** PHP (>=7.0) headers and/or libraries couldn't be found on your system.
-*** Try to install libphp-embed with your software package manager.
-*** WeeChat will be built without PHP support.])
-        enable_php="no"
-        not_found="$not_found php"
-    else
-        AC_MSG_RESULT(yes)
-    fi
-
-    CFLAGS="$ac_save_CFLAGS"
-    CPPFLAGS="$ac_save_CPPFLAGS"
-    LDFLAGS="$ac_save_LDFLAGS"
-else
-    not_asked="$not_asked php"
-fi
-
-if test "x$enable_php" = "xyes" ; then
-    AC_SUBST(PHP_CFLAGS)
-    AC_SUBST(PHP_LFLAGS)
-    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
@@ -1041,7 +936,7 @@ fi
 AC_CHECK_HEADER(gcrypt.h,ac_found_gcrypt_header="yes",ac_found_gcrypt_header="no")
 AC_CHECK_LIB(gcrypt,gcry_check_version,ac_found_gcrypt_lib="yes",ac_found_gcrypt_lib="no")

-AC_MSG_CHECKING(for gcrypt headers and libraries)
+AC_MSG_CHECKING(for gcrypt headers and librairies)
 if test "x$ac_found_gcrypt_header" = "xno" -o "x$ac_found_gcrypt_lib" = "xno" ; then
    AC_MSG_RESULT(no)
    AC_MSG_ERROR([
@@ -1063,7 +958,7 @@ 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_MSG_CHECKING(for gnutls headers and libraries)
+    AC_MSG_CHECKING(for gnutls headers and librairies)
    if test "x$ac_found_gnutls_header" = "xno" -o "x$ac_found_gnutls_lib" = "xno" ; then
        AC_MSG_RESULT(no)
        AC_MSG_WARN([
@@ -1093,10 +988,10 @@ AC_CACHE_CHECK([for flock() support], ac_cv_have_flock, [
 AC_LINK_IFELSE([AC_LANG_PROGRAM(
 [[ #include <sys/file.h>]],
 [[ flock(0, LOCK_SH); ]])],
-[ ac_cv_have_flock="yes" ],
-[ ac_cv_have_flock="no" ])])
+[ ac_have_flock="yes" ],
+[ ac_have_flock="no" ])])

-if test "x$ac_cv_have_flock" = "xyes"; then
+if test "x$ac_have_flock" = "xyes"; then
    enable_flock="yes"
    AC_DEFINE(HAVE_FLOCK)
 else
@@ -1123,9 +1018,9 @@ if test "x$debug" != "x0" ; then
        AC_LINK_IFELSE([AC_LANG_PROGRAM(
            [[ #include <execinfo.h> ]],
            [[ void *trace[128]; int n = backtrace(trace, 128); ]])],
-            [ ac_cv_have_backtrace="yes" ],
-            [ ac_cv_have_backtrace="no"  ])])
-    if test "x$ac_cv_have_backtrace" = "xyes"; then
+            [ ac_have_backtrace="yes" ],
+            [ ac_have_backtrace="no"  ])])
+    if test "x$ac_have_backtrace" = "xyes"; then
        enable_backtrace="yes"
        AC_DEFINE(HAVE_BACKTRACE,1,[glibc backtrace function])
    else
@@ -1142,10 +1037,10 @@ AC_CACHE_CHECK([for eat_newline_glitch support], ac_cv_have_eatnewlineglitch, [
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
 [[ #include <term.h> ]],
 [[ eat_newline_glitch = 0; ]])],
-[ ac_cv_have_eatnewlineglitch="yes" ],
-[ ac_cv_have_eatnewlineglitch="no" ])])
+[ ac_have_eatnewlineglitch="yes" ],
+[ ac_have_eatnewlineglitch="no" ])])

-if test "x$ac_cv_have_eatnewlineglitch" = "xyes"; then
+if test "x$ac_have_eatnewlineglitch" = "xyes"; then
    enable_eatnewlineglitch="yes"
    AC_DEFINE(HAVE_EAT_NEWLINE_GLITCH)
 else
@@ -1159,12 +1054,12 @@ fi
 AC_CHECK_HEADER(zlib.h,ac_found_zlib_header="yes",ac_found_zlib_header="no")
 AC_CHECK_LIB(z,compress2,ac_found_zlib_lib="yes",ac_found_zlib_lib="no")

-AC_MSG_CHECKING(for zlib headers and libraries)
+AC_MSG_CHECKING(for zlib headers and librairies)
 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 https://zlib.net/
-*** or try to install zlib1g-dev with your software package manager.])
+*** zlib was not found. You may want to get it from http://zlib.net/
+*** or try to install libcurl-dev with your software package manager.])
 else
    AC_MSG_RESULT(yes)
    ZLIB_CFLAGS=`pkg-config zlib --cflags`
@@ -1194,7 +1089,7 @@ AC_SUBST(CURL_LFLAGS)

 if test "x$enable_tests" = "xyes" ; then
    cpputest_found="no"
-    AC_MSG_CHECKING(for CppUTest headers and libraries)
+    AC_MSG_CHECKING(for CppUTest headers and librairies)
    echo
    pkgconfig_cpputest_found=`$PKGCONFIG --exists cpputest 2>/dev/null`
    if test "x$?" = "x0" ; then
@@ -1233,35 +1128,54 @@ if test "x$enable_doc" = "xno"; then
 fi

 if test "x$enable_man" = "xyes" -o "x$enable_doc" = "xyes"; then
-    AC_CHECK_PROGS(ASCIIDOCTOR, [asciidoctor])
-    if test -n "$ASCIIDOCTOR"; then
-        AC_MSG_CHECKING([for asciidoctor version])
-        asciidoctor_version=`$ASCIIDOCTOR --version 2>/dev/null | head -n 1 | cut -d" " -f2`
-        case "${asciidoctor_version}" in
-        Asciidoctor' '0.*|Asciidoctor' '1.5.[0-3]*)
-                AC_MSG_RESULT([${asciidoctor_version} (too old)])
-                not_found="$not_found asciidoctor"
+    DOC_ASCIIDOC8=""
+    AC_CHECK_PROGS(ASCIIDOC, [asciidoc])
+    AC_CHECK_PROGS(A2X, [a2x])
+    AC_CHECK_PROGS(SOURCEHIGHLIGHT, [source-highlight])
+    if test -z "$A2X"; then
+        not_found="$not_found a2x(from asciidoc)"
+    fi
+    if test -z "$SOURCEHIGHLIGHT"; then
+        not_found="$not_found source-highlight(needed by asciidoc)"
+    fi
+    if test -n "$ASCIIDOC"; then
+        AC_MSG_CHECKING([for asciidoc version])
+        asciidoc_version=`$ASCIIDOC --version 2>/dev/null`
+        case "${asciidoc_version}" in
+        asciidoc' '8*)
+                DOC_ASCIIDOC8="yes"
+                AC_MSG_RESULT([${asciidoc_version}])
+                if test "x$enable_man" = "xyes"; then
+                    if test -n "$A2X"; then
+                        msg_man="asciidoc(with a2x) $msg_man"
+                        AC_DEFINE(MAN)
+                    else
+                        enable_man="no"
+                    fi
+                fi
+                if test "x$enable_doc" = "xyes"; then
+                    if test -n "$SOURCEHIGHLIGHT"; then
+                        msg_doc="asciidoc(with source-highlight) $msg_doc"
+                        AC_DEFINE(DOC)
+                    else
+                        enable_doc="no"
+                    fi
+                fi
+                ;;
+        *)
+                AC_MSG_RESULT([${asciidoc_version} (too old)])
+                not_found="$not_found asciidoc"
                enable_man="no"
                enable_doc="no"
                ;;
-        *)
-                AC_MSG_RESULT([${asciidoctor_version}])
-                if test "x$enable_man" = "xyes"; then
-                    msg_man="asciidoctor(${asciidoctor_version}) $msg_man"
-                    AC_DEFINE(MAN)
-                fi
-                if test "x$enable_doc" = "xyes"; then
-                    msg_doc="asciidoctor(${asciidoctor_version}) $msg_doc"
-                    AC_DEFINE(DOC)
-                fi
-                ;;
        esac
    else
-        not_found="$not_found asciidoctor"
+        not_found="$not_found asciidoc"
        enable_man="no"
        enable_doc="no"
    fi
-    AC_SUBST(ASCIIDOCTOR)
+    AC_SUBST(ASCIIDOC)
+    AC_SUBST(A2X)
 fi

 # ------------------------------------------------------------------------------
@@ -1287,7 +1201,7 @@ AC_DEFINE_UNQUOTED(WEECHAT_SHAREDIR, "$WEECHAT_SHAREDIR")
 weechat_libdir=${libdir}/weechat
 AC_SUBST(weechat_libdir)

-COMMON_CFLAGS="-fsigned-char -Wall -Wextra -Werror-implicit-function-declaration"
+COMMON_CFLAGS="-Wall -Wextra -Werror-implicit-function-declaration"
 AC_MSG_CHECKING([whether we have GNU assembler])
 GAS=`as --version < /dev/null 2>/dev/null | grep GNU`
 if test "$GAS"; then
@@ -1330,9 +1244,6 @@ netbsd*)
 gnu*)
        LDFLAGS="$LDFLAGS -lpthread"
        ;;
-haiku*)
-        LDFLAGS="$LDFLAGS -lnetwork"
-        ;;
 *)
        ;;
 esac
@@ -1348,13 +1259,11 @@ 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_BUFLIST,          test "$enable_buflist" = "yes")
+AM_CONDITIONAL(PLUGIN_ASPELL,           test "$enable_aspell" = "yes")
 AM_CONDITIONAL(PLUGIN_CHARSET,          test "$enable_charset" = "yes")
 AM_CONDITIONAL(PLUGIN_EXEC,             test "$enable_exec" = "yes")
 AM_CONDITIONAL(PLUGIN_FIFO,             test "$enable_fifo" = "yes")
-AM_CONDITIONAL(PLUGIN_FSET,             test "$enable_fset" = "yes")
 AM_CONDITIONAL(PLUGIN_IRC,              test "$enable_irc" = "yes")
 AM_CONDITIONAL(PLUGIN_LOGGER,           test "$enable_logger" = "yes")
 AM_CONDITIONAL(PLUGIN_RELAY,            test "$enable_relay" = "yes")
@@ -1366,8 +1275,6 @@ AM_CONDITIONAL(PLUGIN_LUA,              test "$enable_lua" = "yes")
 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_XFER,             test "$enable_xfer" = "yes")
 AM_CONDITIONAL(TESTS,                   test "$enable_tests" = "yes")
@@ -1375,7 +1282,6 @@ AM_CONDITIONAL(MAN,                     test "$enable_man" = "yes")
 AM_CONDITIONAL(DOC,                     test "$enable_doc" = "yes")

 AC_OUTPUT([Makefile
-           icons/Makefile
           doc/Makefile
           doc/en/Makefile
           doc/fr/Makefile
@@ -1385,16 +1291,14 @@ AC_OUTPUT([Makefile
           doc/es/Makefile
           doc/ru/Makefile
           doc/ja/Makefile
-           doc/cs/Makefile
           src/Makefile
           src/core/Makefile
           src/plugins/Makefile
           src/plugins/alias/Makefile
-           src/plugins/buflist/Makefile
+           src/plugins/aspell/Makefile
           src/plugins/charset/Makefile
           src/plugins/exec/Makefile
           src/plugins/fifo/Makefile
-           src/plugins/fset/Makefile
           src/plugins/irc/Makefile
           src/plugins/logger/Makefile
           src/plugins/relay/Makefile
@@ -1406,14 +1310,10 @@ AC_OUTPUT([Makefile
           src/plugins/tcl/Makefile
           src/plugins/guile/Makefile
           src/plugins/javascript/Makefile
-           src/plugins/php/Makefile
-           src/plugins/spell/Makefile
           src/plugins/trigger/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])
@@ -1426,22 +1326,19 @@ 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 or headless.])
+*** Please enable at least ncurses.])
 fi

 listplugins=""
 if test "x$enable_alias" = "xyes"; then
    listplugins="$listplugins alias"
 fi
-if test "x$enable_buflist" = "xyes"; then
-    listplugins="$listplugins buflist"
+if test "x$enable_aspell" = "xyes"; then
+    listplugins="$listplugins aspell($ASPELL_LIB_USED)"
 fi
 if test "x$enable_charset" = "xyes"; then
    listplugins="$listplugins charset"
@@ -1452,9 +1349,6 @@ fi
 if test "x$enable_fifo" = "xyes"; then
    listplugins="$listplugins fifo"
 fi
-if test "x$enable_fset" = "xyes"; then
-    listplugins="$listplugins fset"
-fi
 if test "x$enable_irc" = "xyes" ; then
    listplugins="$listplugins irc"
 fi
@@ -1488,12 +1382,6 @@ fi
 if test "x$enable_javascript" = "xyes"; then
    listplugins="$listplugins javascript/v8"
 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
@@ -1 +0,0 @@
-12
@@ -1,283 +0,0 @@
-Source: weechat-devel
-Section: net
-Priority: optional
-Maintainer: Sébastien Helleu <flashcode@flashtux.org>
-Build-Depends:
-    asciidoctor (>= 1.5.4),
-    debhelper (>= 12),
-    cmake, pkg-config,
-    libncursesw5-dev,
-    gem2deb,
-    libperl-dev,
-    python3-dev,
-    libaspell-dev,
-    liblua5.3-dev,
-    tcl8.6-dev,
-    guile-2.2-dev,
-    libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
-    php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
-    libxml2-dev,
-    libcurl4-gnutls-dev,
-    libgcrypt20-dev,
-    libgnutls28-dev,
-    zlib1g-dev
-Standards-Version: 4.4.0
-Homepage: https://weechat.org/
-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}) | weechat-devel-headless (>= ${source:Version})
-Suggests: weechat-devel-doc (= ${source:Version})
-Conflicts: weechat
-Description: Fast, light and extensible chat client (metapackage)
- 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, JavaScript 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})
-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.
- 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, JavaScript 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, JavaScript 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}
-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 or weechat-headless.
-
-Package: weechat-devel-plugins
-Architecture: any
-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
- for many operating systems. Everything can be done with a keyboard.
- .
- This package provides some plugins to enhance WeeChat. It currently
- ships the following plugins:
-  - script manager
-  - Spell checking (thanks to aspell)
-  - FIFO pipe for remote control
-  - Relay (IRC proxy and WeeChat protocol)
-  - Trigger
-
-Package: weechat-devel-python
-Architecture: any
-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 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 3 scripting API plugin.
-
-Package: weechat-devel-perl
-Architecture: any
-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
- 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 Perl scripting API plugin.
-
-Package: weechat-devel-ruby
-Architecture: any
-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
- 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 Ruby scripting API plugin.
-
-Package: weechat-devel-lua
-Architecture: any
-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
- 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 Lua scripting API plugin.
-
-Package: weechat-devel-tcl
-Architecture: any
-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
- 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.
-
-Package: weechat-devel-guile
-Architecture: any
-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
- 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: amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends},
-    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${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}) | weechat-devel-headless (= ${binary:Version}),
-    libphp-embed
-Conflicts: weechat-php
-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.
- .
- This package provides the PHP scripting API plugin.
-
-Package: weechat-devel-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Conflicts: weechat-doc
-Description: Fast, light and extensible chat client - documentation
- 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 html documentation for WeeChat.
-
-Package: weechat-devel-dev
-Section: devel
-Architecture: any
-Depends: ${misc:Depends}
-Conflicts: weechat-dev
-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.
@@ -1 +0,0 @@
-../debian-stable/copyright
@@ -1 +0,0 @@
-../debian-stable/gbp.conf
@@ -1 +0,0 @@
-../debian-stable/watch
@@ -1 +0,0 @@
-../debian-stable/weechat-core.docs
@@ -1 +0,0 @@
-../debian-stable/weechat-core.install
@@ -1 +0,0 @@
-../debian-stable/weechat-curses.dirs
@@ -1 +0,0 @@
-../debian-stable/weechat-curses.install
@@ -1 +0,0 @@
-../debian-stable/weechat-curses.links
@@ -1 +0,0 @@
-../debian-stable/weechat-curses.menu
@@ -1 +0,0 @@
-../debian-stable/weechat-dev.dirs
@@ -1 +0,0 @@
-../debian-stable/weechat-dev.install
@@ -1,10 +0,0 @@
-Document: weechat-dev-en
-Title: WeeChat developer's guide (English)
-Author: Sébastien Helleu
-Abstract: This manual describes WeeChat internals and
- how to contribute to WeeChat (English version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_dev.en.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_dev.en.html
@@ -1,10 +0,0 @@
-Document: weechat-dev-fr
-Title: WeeChat developer's guide (French)
-Author: Sébastien Helleu
-Abstract: This manual describes WeeChat internals and
- how to contribute to WeeChat (French version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_dev.fr.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_dev.fr.html
@@ -1,10 +0,0 @@
-Document: weechat-dev-ja
-Title: WeeChat developer's guide (Japanese)
-Author: Sébastien Helleu
-Abstract: This manual describes WeeChat internals and
- how to contribute to WeeChat (Japanese version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_dev.ja.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_dev.ja.html
@@ -1,10 +0,0 @@
-Document: weechat-faq-de
-Title: WeeChat FAQ (German)
-Author: Sébastien Helleu
-Abstract: This document answers frequently asked questions
- about the WeeChat IRC client (German version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_faq.de.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_faq.de.html
@@ -1,10 +0,0 @@
-Document: weechat-faq-en
-Title: WeeChat FAQ (English)
-Author: Sébastien Helleu
-Abstract: This document answers frequently asked questions
- about the WeeChat IRC client (English version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_faq.en.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_faq.en.html
@@ -1,10 +0,0 @@
-Document: weechat-faq-fr
-Title: WeeChat FAQ (French)
-Author: Sébastien Helleu
-Abstract: This document answers frequently asked questions
- about the WeeChat IRC client (French version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_faq.fr.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_faq.fr.html
@@ -1,10 +0,0 @@
-Document: weechat-faq-it
-Title: WeeChat FAQ (Italian)
-Author: Sébastien Helleu
-Abstract: This document answers frequently asked questions
- about the WeeChat IRC client (Italian version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_faq.it.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_faq.it.html
@@ -1,10 +0,0 @@
-Document: weechat-faq-ja
-Title: WeeChat FAQ (Japanese)
-Author: Sébastien Helleu
-Abstract: This document answers frequently asked questions
- about the WeeChat IRC client (Japanese version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_faq.ja.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_faq.ja.html
@@ -1,10 +0,0 @@
-Document: weechat-faq-pl
-Title: WeeChat FAQ (Polish)
-Author: Sébastien Helleu
-Abstract: This document answers frequently asked questions
- about the WeeChat IRC client (Polish version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_faq.pl.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_faq.pl.html
@@ -1,10 +0,0 @@
-Document: weechat-plugin-en
-Title: WeeChat plugin API reference (English)
-Author: Sébastien Helleu
-Abstract: This document describes the API to create plugins
- for WeeChat (English version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_plugin_api.en.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_plugin_api.en.html
@@ -1,10 +0,0 @@
-Document: weechat-plugin-fr
-Title: WeeChat plugin API reference (French)
-Author: Sébastien Helleu
-Abstract: This document describes the API to create plugins
- for WeeChat (French version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_plugin_api.fr.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_plugin_api.fr.html
@@ -1,10 +0,0 @@
-Document: weechat-plugin-it
-Title: WeeChat plugin API reference (Italian)
-Author: Sébastien Helleu
-Abstract: This document describes the API to create plugins
- for WeeChat (Italian version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_plugin_api.it.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_plugin_api.it.html
@@ -1,10 +0,0 @@
-Document: weechat-plugin-ja
-Title: WeeChat plugin API reference (Japanese)
-Author: Sébastien Helleu
-Abstract: This document describes the API to create plugins
- for WeeChat (Japanese version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_plugin_api.ja.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_plugin_api.ja.html
@@ -1,9 +0,0 @@
-Document: weechat-quickstart-de
-Title: WeeChat quick start guide (German)
-Author: Sébastien Helleu
-Abstract: A short HowTo for new WeeChat users (German version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.de.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.de.html
@@ -1,9 +0,0 @@
-Document: weechat-quickstart-en
-Title: WeeChat quick start guide (English)
-Author: Sébastien Helleu
-Abstract: A short HowTo for new WeeChat users (English version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.en.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.en.html
@@ -1,9 +0,0 @@
-Document: weechat-quickstart-es
-Title: WeeChat quick start guide (Spanish)
-Author: Sébastien Helleu
-Abstract: A short HowTo for new WeeChat users (Spanish version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.es.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.es.html
@@ -1,9 +0,0 @@
-Document: weechat-quickstart-fr
-Title: WeeChat quick start guide (French)
-Author: Sébastien Helleu
-Abstract: A short HowTo for new WeeChat users (French version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.fr.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.fr.html
@@ -1,9 +0,0 @@
-Document: weechat-quickstart-it
-Title: WeeChat quick start guide (Italian)
-Author: Sébastien Helleu
-Abstract: A short HowTo for new WeeChat users (Italian version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.it.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.it.html
@@ -1,9 +0,0 @@
-Document: weechat-quickstart-ja
-Title: WeeChat quick start guide (Japanese)
-Author: Sébastien Helleu
-Abstract: A short HowTo for new WeeChat users (Japanese version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.ja.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.ja.html
@@ -1,9 +0,0 @@
-Document: weechat-quickstart-pl
-Title: WeeChat quick start guide (Polish)
-Author: Sébastien Helleu
-Abstract: A short HowTo for new WeeChat users (Polish version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.pl.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.pl.html
@@ -1,9 +0,0 @@
-Document: weechat-quickstart-ru
-Title: WeeChat quick start guide (Russian)
-Author: Sébastien Helleu
-Abstract: A short HowTo for new WeeChat users (Russian version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.ru.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.ru.html
@@ -1,10 +0,0 @@
-Document: weechat-relay-protocol-en
-Title: WeeChat Relay protocol (English)
-Author: Sébastien Helleu
-Abstract: This manual describes WeeChat Relay Protocol, used by
- remote GUI to communicate with Relay plugin (English version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_relay_protocol.en.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_relay_protocol.en.html
@@ -1,10 +0,0 @@
-Document: weechat-relay-protocol-fr
-Title: WeeChat Relay protocol (French)
-Author: Sébastien Helleu
-Abstract: This manual describes WeeChat Relay Protocol, used by
- remote GUI to communicate with Relay plugin (French version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_relay_protocol.fr.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_relay_protocol.fr.html
@@ -1,10 +0,0 @@
-Document: weechat-relay-protocol-ja
-Title: WeeChat Relay protocol (Japanese)
-Author: Sébastien Helleu
-Abstract: This manual describes WeeChat Relay Protocol, used by
- remote GUI to communicate with Relay plugin (Japanese version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_relay_protocol.ja.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_relay_protocol.ja.html
@@ -1,10 +0,0 @@
-Document: weechat-scripting-de
-Title: WeeChat scripting guide (German)
-Author: Sébastien Helleu
-Abstract: This document describes the API to create scripts
- for WeeChat (German version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.de.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.de.html
@@ -1,10 +0,0 @@
-Document: weechat-scripting-en
-Title: WeeChat scripting guide (English)
-Author: Sébastien Helleu
-Abstract: This document describes the API to create scripts
- for WeeChat (English version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.en.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.en.html
@@ -1,10 +0,0 @@
-Document: weechat-scripting-fr
-Title: WeeChat scripting guide (French)
-Author: Sébastien Helleu
-Abstract: This document describes the API to create scripts
- for WeeChat (French version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.fr.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.fr.html
@@ -1,10 +0,0 @@
-Document: weechat-scripting-it
-Title: WeeChat scripting guide (Italian)
-Author: Sébastien Helleu
-Abstract: This document describes the API to create scripts
- for WeeChat (Italian version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.it.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.it.html
@@ -1,10 +0,0 @@
-Document: weechat-scripting-ja
-Title: WeeChat scripting guide (Japanese)
-Author: Sébastien Helleu
-Abstract: This document describes the API to create scripts
- for WeeChat (Japanese version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.ja.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.ja.html
@@ -1,10 +0,0 @@
-Document: weechat-scripting-pl
-Title: WeeChat scripting guide (Polish)
-Author: Sébastien Helleu
-Abstract: This document describes the API to create scripts
- for WeeChat (Polish version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.pl.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.pl.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
@@ -1,10 +0,0 @@
-Document: weechat-user-de
-Title: WeeChat user's guide (German)
-Author: Sébastien Helleu
-Abstract: This manual describes how to use the WeeChat
- IRC client (German version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_user.de.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_user.de.html
@@ -1,10 +0,0 @@
-Document: weechat-user-en
-Title: WeeChat user's guide (English)
-Author: Sébastien Helleu
-Abstract: This manual describes how to use the WeeChat
- IRC client (English version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_user.en.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_user.en.html
@@ -1,10 +0,0 @@
-Document: weechat-user-fr
-Title: WeeChat user's guide (French)
-Author: Sébastien Helleu
-Abstract: This manual describes how to use the WeeChat
- IRC client (French version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_user.fr.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_user.fr.html
@@ -1,10 +0,0 @@
-Document: weechat-user-it
-Title: WeeChat user's guide (Italian)
-Author: Sébastien Helleu
-Abstract: This manual describes how to use the WeeChat
- IRC client (Italian version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_user.it.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_user.it.html
@@ -1,10 +0,0 @@
-Document: weechat-user-ja
-Title: WeeChat user's guide (Japanese)
-Author: Sébastien Helleu
-Abstract: This manual describes how to use the WeeChat
- IRC client (Japanese version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_user.ja.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_user.ja.html
@@ -1,10 +0,0 @@
-Document: weechat-user-pl
-Title: WeeChat user's guide (Polish)
-Author: Sébastien Helleu
-Abstract: This manual describes how to use the WeeChat
- IRC client (Polish version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_user.pl.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_user.pl.html
@@ -1 +0,0 @@
-usr/share/doc/weechat/*.html usr/share/doc/weechat-devel-doc/html
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`usr/share/doc/weechat/*.html usr/share/doc/weechat-devel-doc/html`