2025-05-03 08:51:19 -05:00
203 changed files with 5032 additions and 2234 deletions
--- a/.github/workflows/abicheck.yml
+++ b/.github/workflows/abicheck.yml
@ -3,8 +3,8 @@ name: abicheck
 env:
  build_options: -Dbuildtype=debug -Denable-true-color=yes -Dwith-proxy=yes -Dc_args=-DPERL_EUPXS_ALWAYS_EXPORT
  prefix: /usr/local
-  apt_build_deps: ninja-build libutf8proc-dev libperl-dev libotr5-dev libglib2.0-dev
-  get_pip_build_deps: pip3 install 'setuptools<66'; pip3 install wheel; pip3 install 'meson<0.59.0'
+  apt_build_deps: ninja-build libutf8proc-dev libperl-dev libotr5-dev
+  get_pip_build_deps: pip3 install setuptools; pip3 install wheel; pip3 install 'meson<0.59.0'
  getabidef_def: getabidef() { awk '$1=="#define" && $2=="IRSSI_ABI_VERSION" { print $3 }' "$1"/include/irssi/src/common.h; }
 jobs:
  build-base-ref:
@ -36,8 +36,8 @@ jobs:
          base_abi=$(getabidef base$prefix)
          echo base abi : $base_abi
          ./base$prefix/bin/irssi --version
-          echo base_abi=$base_abi >> $GITHUB_OUTPUT
-      - uses: actions/upload-artifact@v4
+          echo "::set-output name=base_abi::$base_abi"
+      - uses: actions/upload-artifact@v2
        with:
          name: base.inst
          path: base
@ -70,8 +70,8 @@ jobs:
          merge_abi=$(getabidef merge$prefix)
          echo merge abi : $merge_abi
          ./merge$prefix/bin/irssi --version
-          echo merge_abi=$merge_abi >> $GITHUB_OUTPUT
-      - uses: actions/upload-artifact@v4
+          echo "::set-output name=merge_abi::$merge_abi"
+      - uses: actions/upload-artifact@v2
        with:
          name: merge.inst
          path: merge
@ -89,12 +89,12 @@ jobs:
        run: |
          sudo apt install abigail-tools
      - name: fetch base build
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v2
        with:
          name: base.inst
          path: base
      - name: fetch merge build
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v2
        with:
          name: merge.inst
          path: merge
@ -103,7 +103,7 @@ jobs:
          abipkgdiff -l base merge >abipkgdiff.out && diff_ret=0 || diff_ret=$?
          echo "diff_ret=$diff_ret" >> $GITHUB_ENV
          cat abipkgdiff.out
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v2
        with:
          path: abipkgdiff.out
      - run: |
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@ -5,50 +5,27 @@ on:
  pull_request:
 name: Check Irssi
 env:
-  apt_build_deps: ninja-build libutf8proc-dev libperl-dev libotr5-dev libglib2.0-dev
+  apt_build_deps: libutf8proc-dev libperl-dev libotr5-dev
+  apt_build_deps_meson: ninja-build
+  apt_build_deps_autotools: autoconf automake libtool
  get_pip_build_deps_meson: pip3 install setuptools${setuptools_ver}; pip3 install wheel; pip3 install meson${meson_ver}
  build_options_meson: -Dwith-proxy=yes -Dwith-bot=yes -Dwith-perl=yes -Dwith-otr=yes
+  build_options_configure: --with-proxy=module --with-bot --with-perl=module --with-otr=module
  prefix: ~/irssi-build
 jobs:
  dist:
    runs-on: ubuntu-latest
-    env:
-      meson_ver: <0.63.0
-      setuptools_ver: <66
    steps:
      - name: prepare required software
        run: |
-          sudo apt update && sudo apt install $apt_build_deps
-          eval "$get_pip_build_deps_meson"
-          patch ~/.local/lib/python3.12/site-packages/pkg_resources/__init__.py <<- PATCH
-          --- __init__.py       2024-12-16 20:37:46.733230351 +0100
-          +++ __init__.py       2024-12-16 20:38:42.479554540 +0100
-          @@ -2188,7 +2188,8 @@ def resolve_egg_link(path):
-               return next(dist_groups, ())
-           
-           
-          -register_finder(pkgutil.ImpImporter, find_on_path)
-          +if hasattr(pkgutil, 'ImpImporter'):
-          +    register_finder(pkgutil.ImpImporter, find_on_path)
-           
-           if hasattr(importlib_machinery, 'FileFinder'):
-               register_finder(importlib_machinery.FileFinder, find_on_path)
-          @@ -2345,7 +2346,8 @@ def file_ns_handler(importer, path_item,
-                   return subpath
-           
-           
-          -register_namespace_handler(pkgutil.ImpImporter, file_ns_handler)
-          +if hasattr(pkgutil, 'ImpImporter'):
-          +    register_namespace_handler(pkgutil.ImpImporter, file_ns_handler)
-           register_namespace_handler(zipimport.zipimporter, file_ns_handler)
-           
-           if hasattr(importlib_machinery, 'FileFinder'):
-          PATCH
+          sudo apt update && sudo apt install $apt_build_deps $apt_build_deps_autotools
      - uses: actions/checkout@main
      - name: make dist
        run: |
-          ./utils/make-dist.sh
-      - uses: actions/upload-artifact@v4
+          # make dist
+          ./autogen.sh $build_options_configure
+          make dist
+      - uses: actions/upload-artifact@v2
        with:
          path: irssi-*.tar.gz
          retention-days: 1
@ -61,21 +38,24 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu-22.04, ubuntu-latest]
+        os: [ubuntu-18.04, ubuntu-latest]
+        builder: [meson, configure]
        compiler: [clang, gcc]
        flags: [regular]
-        setuptools_ver: [<66]
        include:
-          - os: ubuntu-22.04
-            meson_ver: ==0.53.2
+          - os: ubuntu-18.04
+            builder: meson
+            meson_ver: ==0.49.2
            setuptools_ver: <51
          - os: ubuntu-latest
-            meson_ver: <0.63.0
+            builder: meson
+            meson_ver: <0.60.0
          - os: ubuntu-latest
+            builder: meson
            flags: meson-latest FAILURE-OK
    steps:
      - name: fetch dist
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v2
      - name: set PATH
        run: |
          echo "$HOME/.local/bin" >> $GITHUB_PATH
@ -84,8 +64,8 @@ jobs:
          meson_ver: ${{ matrix.meson_ver }}
          setuptools_ver: ${{ matrix.setuptools_ver }}
        run: |
-          sudo apt update && sudo apt install $apt_build_deps
-          eval "$get_pip_build_deps_meson"
+          sudo apt update && sudo apt install $apt_build_deps $apt_build_deps_${{ matrix.builder }}
+          eval "$get_pip_build_deps_${{ matrix.builder }}"
          curl -SLf https://github.com/irssi-import/actions-irssi/raw/master/check-irssi/render.pl -o ~/render.pl && chmod +x ~/render.pl
      - name: unpack archive
        run: tar xaf artifact/irssi-*.tar.gz
@ -96,12 +76,31 @@ jobs:
          meson Build $build_options_meson --prefix=${prefix/\~/~}
          ninja -C Build
          ninja -C Build install
+        if: ${{ matrix.builder == 'meson' }}
+      - name: build and install with Makefile
+        run: |
+          # make install
+          cd irssi-*/
+          mkdir Build
+          cd Build
+          ../configure $build_options_configure --prefix=${prefix/\~/~} --enable-always-build-tests
+          make CFLAGS="-Wall -Werror -Werror=declaration-after-statement"
+          make install
+        if: ${{ matrix.builder == 'configure' }}
+      - name: run tests with Makefile
+        run: |
+          # make check
+          cd irssi-*/Build
+          make -C tests -sk check
+          find -name test-suite.log -exec cat {} +
+        if: ${{ matrix.builder == 'configure' }}
      - name: run tests with Meson
        run: |
          # ninja test
          cd irssi-*/
          ninja -C Build test
          find -name testlog.txt -exec sed -i -e '/Inherited environment:.* GITHUB/d' {} + -exec cat {} +
+        if: ${{ matrix.builder == 'meson' }}
      - name: run launch test
        env:
          TERM: xterm
@ -115,66 +114,9 @@ jobs:
          ^set -clear log_day_changed
          ^set -clear log_open_string
          ^set log_timestamp * 
-          ^window log on
-          load irc
-          load dcc
-          load flood
-          load notifylist
-          load perl
-          load otr
-          load proxy
-          ^quit' > irssi-test/startup
-          irssi-build/bin/irssi --home irssi-test | perl -Mutf8 -C ~/render.pl
-          cat irc.log.*
-  annotation-warnings:
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'pull_request' }}
-    env:
-      CC: clang
-    steps:
-      - name: prepare required software
-        run: |
-          sudo apt update && sudo apt install $apt_build_deps
-      - uses: actions/checkout@main
-      - name: Setup local annotations
-        uses: irssi-import/actions-irssi/problem-matchers@master
-      - name: set PATH
-        run: |
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
-      - name: prepare required software
-        env:
-          meson_ver: ${{ matrix.meson_ver }}
-          setuptools_ver: ${{ matrix.setuptools_ver }}
-        run: |
-          sudo apt update && sudo apt install $apt_build_deps
-          eval "$get_pip_build_deps_meson"
-          curl -SLf https://github.com/irssi-import/actions-irssi/raw/master/check-irssi/render.pl -o ~/render.pl && chmod +x ~/render.pl
-      - name: build and install with meson
-        run: |
-          meson Build $build_options_meson --prefix=${prefix/\~/~}
-          ninja -C Build
-          ninja -C Build install >/dev/null
-      - name: run launch test
-        env:
-          TERM: xterm
-        run: |
-          # automated irssi launch test
-          cd
-          mkdir irssi-test
-          echo 'echo automated irssi launch test
-          ^set settings_autosave off
-          ^set -clear log_close_string
-          ^set -clear log_day_changed
-          ^set -clear log_open_string
-          ^set log_timestamp * 
-          ^window log on
-          load irc
-          load dcc
-          load flood
-          load notifylist
-          load perl
-          load otr
-          load proxy
-          ^quit' > irssi-test/startup
+          ^window log on' > irssi-test/startup
+          echo load perl >> irssi-test/startup
+          echo load proxy >> irssi-test/startup
+          echo ^quit >> irssi-test/startup
          irssi-build/bin/irssi --home irssi-test | perl -Mutf8 -C ~/render.pl
          cat irc.log.*
--- a/.github/workflows/cifuzz.yml
+++ b/.github/workflows/cifuzz.yml
@ -44,7 +44,7 @@ jobs:
        dry-run: false
        sanitizer: ${{ matrix.sanitizer }}
    - name: Upload Crash
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v1
      if: failure() && steps.build.outcome == 'success'
      with:
        name: ${{ matrix.sanitizer }}-artifacts
--- a/.github/workflows/clangformat.yml
+++ b/.github/workflows/clangformat.yml
@ -22,7 +22,7 @@ jobs:
          |
            CLANG_FORMAT=clang-format-14 git-clang-format-14 --diff FETCH_HEAD HEAD | tee git-clang-format.diff
            cmp -s <(echo no modified files to format) git-clang-format.diff || cmp -s <(echo -n) git-clang-format.diff
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v1
        if: failure()
        with:
          name: git-clang-format.diff
--- a/.github/workflows/solarisvm.yml
+++ b/.github/workflows/solarisvm.yml
@ -1,104 +0,0 @@
-on:
-  push:
-    branches:
-     - master
-  pull_request:
-  workflow_dispatch:
-name: Check Irssi on Solaris
-env:
-  get_pip_build_deps_meson: pip3 install setuptools${setuptools_ver}; pip3 install wheel
-  prefix: ~/irssi-build
-jobs:
-  dist:
-    runs-on: ubuntu-latest
-    env:
-      setuptools_ver: <66
-    steps:
-      - name: prepare required software
-        run: |
-          sudo apt update && sudo apt install $apt_build_deps
-          eval "$get_pip_build_deps_meson"
-          patch ~/.local/lib/python3.12/site-packages/pkg_resources/__init__.py <<- PATCH
-          --- __init__.py       2024-12-16 20:37:46.733230351 +0100
-          +++ __init__.py       2024-12-16 20:38:42.479554540 +0100
-          @@ -2188,7 +2188,8 @@ def resolve_egg_link(path):
-               return next(dist_groups, ())
-           
-           
-          -register_finder(pkgutil.ImpImporter, find_on_path)
-          +if hasattr(pkgutil, 'ImpImporter'):
-          +    register_finder(pkgutil.ImpImporter, find_on_path)
-           
-           if hasattr(importlib_machinery, 'FileFinder'):
-               register_finder(importlib_machinery.FileFinder, find_on_path)
-          @@ -2345,7 +2346,8 @@ def file_ns_handler(importer, path_item,
-                   return subpath
-           
-           
-          -register_namespace_handler(pkgutil.ImpImporter, file_ns_handler)
-          +if hasattr(pkgutil, 'ImpImporter'):
-          +    register_namespace_handler(pkgutil.ImpImporter, file_ns_handler)
-           register_namespace_handler(zipimport.zipimporter, file_ns_handler)
-           
-           if hasattr(importlib_machinery, 'FileFinder'):
-          PATCH
-      - uses: actions/checkout@main
-      - name: make dist
-        run: |
-          ./utils/make-dist.sh
-      - uses: actions/upload-artifact@v4
-        with:
-          path: irssi-*.tar.gz
-          retention-days: 1
-  install:
-    runs-on: ubuntu-latest
-    needs: dist
-    steps:
-      - name: fetch dist
-        uses: actions/download-artifact@v4
-      - name: Test in Solaris
-        uses: vmactions/solaris-vm@v1
-        with:
-          usesh: true
-          sync: rsync
-          release: "11.4-gcc"
-          prepare: |
-            pkg update --accept
-            pkg install meson
-            pkgutil -y -i curl
-            pkgutil -y -i gtar
-            pkgutil -y -i findutils
-          run: |
-            set -ex
-            export PKG_CONFIG_PATH=/usr/lib/64/pkgconfig
-            curl -SLf https://github.com/irssi-import/actions-irssi/raw/master/check-irssi/render.pl -o ~/render.pl && chmod +x ~/render.pl
-            gtar xzf artifact/irssi-*.tar.gz
-            # ninja install
-            cd irssi-*/
-            meson Build -Dwith-proxy=yes -Dwith-bot=yes -Dwith-perl=yes --prefix=$HOME/irssi-build
-            ninja -C Build
-            ninja -C Build install
-            # ninja test
-            ninja -C Build test
-            gfind -name testlog.txt -exec gsed -i -e '/Inherited environment:.* GITHUB/d' {} + -exec cat {} +
-            export TERM=xterm
-            # automated irssi launch test
-            cd
-            mkdir irssi-test
-            echo 'echo automated irssi launch test
-            ^set settings_autosave off
-            ^set -clear log_close_string
-            ^set -clear log_day_changed
-            ^set -clear log_open_string
-            ^set log_timestamp * 
-            ^window log on
-            load irc
-            load dcc
-            load flood
-            load notifylist
-            load perl
-            load otr
-            load proxy
-            ^quit' > irssi-test/startup
-            irssi-build/bin/irssi --home irssi-test | perl -Mutf8 -C ~/render.pl
-            cat irc.log.*
--- a/.github/workflows/termuxpkg.yml
+++ b/.github/workflows/termuxpkg.yml
@ -1,79 +0,0 @@
-on:
-  push:
-    branches:
-     - master
-  pull_request:
-name: Build Irssi Termux package
-jobs:
-  termux-package:
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout termux-packages
-        uses: actions/checkout@main
-        with:
-          repository: termux/termux-packages
-      - name: checkout irssi
-        uses: actions/checkout@main
-        with:
-          path: src.irssi.git
-      - name: download termux docker container
-        uses: docker://termux/package-builder:latest
-      - name: create irssi build receipe
-        run: |
-          mkdir packages/irssi-an
-          cat << 'BUILD_SH' > packages/irssi-an/build.sh
-          TERMUX_PKG_HOMEPAGE=https://irssi.org/
-          TERMUX_PKG_DESCRIPTION="Terminal based IRC client"
-          TERMUX_PKG_LICENSE="GPL-2.0"
-          TERMUX_PKG_MAINTAINER="@irssi"
-          TERMUX_PKG_VERSION=@VERSION@
-          TERMUX_PKG_REVISION=@REVISION@
-          TERMUX_PKG_SRCURL=git+file:///home/builder/termux-packages/src.irssi.git
-          TERMUX_PKG_AUTO_UPDATE=true
-          TERMUX_PKG_DEPENDS="glib, libandroid-glob, libiconv, libotr, ncurses, openssl, perl, utf8proc"
-          TERMUX_PKG_BREAKS="irssi"
-          TERMUX_PKG_REPLACES="irssi"
-          TERMUX_MESON_PERL_CROSS_FILE=$TERMUX_PKG_TMPDIR/meson-perl-cross-$TERMUX_ARCH.txt
-          TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-          -Dfhs-prefix=$TERMUX_PREFIX
-          --cross-file $TERMUX_MESON_PERL_CROSS_FILE
-          "
-
-          termux_step_pre_configure() {
-              LDFLAGS+=" -landroid-glob"
-
-              # Make build log less noisy.
-              CFLAGS+=" -Wno-compound-token-split-by-macro"
-
-              local perl_version=$(. $TERMUX_SCRIPTDIR/packages/perl/build.sh; echo $TERMUX_PKG_VERSION)
-
-              cat << MESON_PERL_CROSS >$TERMUX_MESON_PERL_CROSS_FILE
-          [properties]
-          perl_version = '$perl_version'
-          perl_ccopts = ['-I$TERMUX_PREFIX/include', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-I$TERMUX_PREFIX/lib/perl5/$perl_version/${TERMUX_ARCH}-android/CORE']
-          perl_ldopts = ['-Wl,-E', '-I$TERMUX_PREFIX/include', '-L$TERMUX_PREFIX/lib/perl5/$perl_version/${TERMUX_ARCH}-android/CORE', '-lperl', '-lm', '-ldl']
-          perl_archname = '${TERMUX_ARCH}-android'
-          perl_installsitearch = '$TERMUX_PREFIX/lib/perl5/site_perl/$perl_version/${TERMUX_ARCH}-android'
-          perl_installvendorarch = ''
-          perl_inc = ['$TERMUX_PREFIX/lib/perl5/site_perl/$perl_version/${TERMUX_ARCH}-android', '$TERMUX_PREFIX/lib/perl5/site_perl/$perl_version', '$TERMUX_PREFIX/lib/perl5/$perl_version/${TERMUX_ARCH}-android', '$TERMUX_PREFIX/lib/perl5/$perl_version']
-          MESON_PERL_CROSS
-          }
-
-          BUILD_SH
-          version=$(awk '/^v/ { $0=$1; gsub(/^v/,""); gsub(/-head/,"dev"); gsub(/-/,""); print; exit }' src.irssi.git/NEWS)
-          version=$version+g$(git -C src.irssi.git rev-parse --short HEAD)
-          sed -i \
-              -e "s:@VERSION@:$version:" \
-              -e "s:@REVISION@:$GITHUB_RUN_NUMBER:" \
-              packages/irssi-an/build.sh
-          git -C src.irssi.git tag v$version
-      - name: prepare output folder
-        run: |
-          install -m a+rwx -d output
-      - name: build irssi package
-        run: |
-          sudo ./scripts/run-docker.sh ./build-package.sh -I irssi-an
-      - uses: actions/upload-artifact@v4
-        with:
-          name: irssi-termux-pkg
-          path: output/irssi-an*.deb
--- a/.github/workflows/trigger-pages.yml
+++ b/.github/workflows/trigger-pages.yml
@ -1,20 +0,0 @@
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  rebuild-pages:
-    if: github.repository == 'irssi/irssi'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/github-script@v6
-        with:
-          github-token: ${{ secrets.PAT_TOKEN }}
-          script: |
-            await github.rest.actions.createWorkflowDispatch({
-              owner: context.repo.owner,
-              repo: 'irssi.github.io',
-              workflow_id: 'pages.yml',
-              ref: 'main'
-            })
--- a/.github/workflows/voiddocker.yml
+++ b/.github/workflows/voiddocker.yml
@ -1,73 +0,0 @@
-on:
-  push:
-    branches:
-     - master
-  pull_request:
-  workflow_dispatch:
-name: Check Irssi on Void Linux glibc
-jobs:
-  dist:
-    runs-on: ubuntu-latest
-    container: ghcr.io/void-linux/void-glibc:latest
-    steps:
-      - name: prepare required software
-        run: |
-          xbps-install -Syu
-          xbps-install -Sy git findutils python3-setuptools tar xz gzip
-      - uses: actions/checkout@main
-      - name: make dist
-        run: |
-          git config --global --add safe.directory /__w/irssi/irssi
-          ./utils/make-dist.sh
-      - uses: actions/upload-artifact@v4
-        with:
-          path: irssi-*.tar.gz
-          retention-days: 1
-  install:
-    runs-on: ubuntu-latest
-    container: ghcr.io/void-linux/void-glibc:latest
-    needs: dist
-    steps:
-      - name: prepare required software
-        run: |
-          xbps-install -Syu
-          xbps-install -Sy meson base-devel libglib-devel libutf8proc-devel ncurses-devel ncurses-base openssl-devel libotr-devel libgcrypt-devel tar findutils curl
-      - name: fetch dist
-        uses: actions/download-artifact@v4
-      - name: Setup local annotations
-        uses: irssi-import/actions-irssi/problem-matchers@master
-      - name: Test on Void Linux glibc
-        run: |
-          set -ex
-          curl -SLf https://github.com/irssi-import/actions-irssi/raw/master/check-irssi/render.pl -o ~/render.pl && chmod +x ~/render.pl
-          tar xzf artifact/irssi-*.tar.gz
-          # ninja install
-          cd irssi-*/
-          meson Build -Dwith-proxy=yes -Dwith-bot=yes -Dwith-perl=yes --prefix=$HOME/irssi-build --buildtype debugoptimized
-          ninja -C Build
-          ninja -C Build install
-          # ninja test
-          ninja -C Build test
-          find -name testlog.txt -exec sed -i -e '/Inherited environment:.* GITHUB/d' {} + -exec cat {} +
-          export TERM=xterm
-          # automated irssi launch test
-          cd
-          mkdir irssi-test
-          echo 'echo automated irssi launch test
-          ^set settings_autosave off
-          ^set -clear log_close_string
-          ^set -clear log_day_changed
-          ^set -clear log_open_string
-          ^set log_timestamp * 
-          ^window log on
-          load irc
-          load dcc
-          load flood
-          load notifylist
-          load perl
-          load otr
-          load proxy
-          ^quit' > irssi-test/startup
-          export LC_CTYPE=C.utf8
-          irssi-build/bin/irssi --home irssi-test | perl -Mutf8 -C ~/render.pl
-          cat irc.log.*
--- a/.gitignore
+++ b/.gitignore
@ -86,6 +86,3 @@ src/fe-fuzz/oom-*
 Build
 subprojects/*
 !subprojects/*.wrap
-Irssi-Dist
-setup.cfg
-*.egg-info
--- a/.obs/workflows.yml
+++ b/.obs/workflows.yml
@ -1,13 +0,0 @@
-workflow:
-  steps:
-    - branch_package:
-        source_project: home:ailin_nemui:irssi-git-an
-        source_package: irssi-git-an
-        target_project: home:ailin_nemui:CI
-    - set_flags:
-        flags:
-          - type: publish
-            status: enable
-            project: home:ailin_nemui:CI
-  filters:
-    event: pull_request
--- a/65
+++ b/65
@ -4,11 +4,10 @@

 To compile Irssi you need:

- meson-0.53 build system with ninja-1.8 or greater
- pkg-config (or compatible)
+- meson-0.49 build system with ninja-1.5 or greater
 - glib-2.32 or greater
 - openssl (for ssl support)
- perl-5.8 or greater (for building, and optionally Perl scripts)
+- perl-5.6 or greater (for Perl support)
 - terminfo or ncurses (for text frontend)

 For most people, this should work just fine:
@ -18,12 +17,21 @@ For most people, this should work just fine:
 su
 ninja -C Build install
 
-meson options
+For the moment, autotools is also supported:

-  These options can be given to meson.
+ ./autogen.sh     (for people who just cloned the repository)
+ ./configure      (if this script already exists, skip ./autogen.sh)
+ make
+ su
+ make install     (not _really_ required except for perl support)
+
+configure options
+
+  These options can be given to meson or ./configure.
+  The first syntax is for meson, the 2nd for ./configure
  
  For a complete list of options, run
-   meson configure
+   meson configure   /   ./configure --help

  --prefix

@ -31,28 +39,33 @@ meson options
  YES, you can install Irssi WITHOUT ROOT permissions
  by using --prefix=/home/dir

-  -Dwith-proxy=yes
+  -Dwith-proxy=yes   /   --with-proxy

  Build the Irssi proxy (see startup-HOWTO).

-  -Dwith-perl=[yes|no]
+  -Dwith-perl=[yes|no]   /   --with-perl=[yes|no|module]

  Enable Perl support
  yes    enable builtin (default)
  no     disable
+  module enable as module

-  -Dwith-perl-lib=[site|vendor|DIR]
+  -Dwith-perl-lib=[site|vendor|DIR]   /   --with-perl-lib=[site|vendor|DIR]

  Specify installation dir for Perl libraries
  site   install in dir for site-specific modules (default)
  vendor install in dir for vendor-specific modules
  DIR    install in DIR

-  -Dwith-bot=yes
+  [N/A]   /   --with-socks
+
+  Build with socks library
+
+  -Dwith-bot=yes   /   --with-bot

  Build irssi-bot

-  -Dwithout-textui=yes
+  -Dwithout-textui=yes   /   --without-textui

  Build without text frontend

@ -69,18 +82,31 @@ the -Dc_args and -Dc_link_args options variable, eg.:
 Perl support generates most of the problems. There's quite a many
 things that can go wrong:

+ - Compiling fails if you compile irssi with GCC in a system that has
+   perl compiled with some other C compiler. Very common problem with
+   non-Linux/BSD systems. You'll need to edit src/perl/*/Makefile files
+   and remove the parameters that gcc doesn't like. Mostly you'll just
+   need to keep the -I and -D parameters and add -fPIC.
 - If there's any weird crashing at startup, you might have older irssi's
   perl libraries installed somewhere, and you should remove those.
- - If meson complains that it doesn't find some perl stuff, you're
+ - Dynamic libraries don't want to work with some systems, so if your
+   system complains about some missing symbol in Irssi.so file, configure
+   irssi with --with-perl-staticlib option (NOT same as --with-perl=static).
+ - If configure complains that it doesn't find some perl stuff, you're
   probably missing libperl.so or libperl.a. In debian, you'll need to do
   apt-get install libperl-dev
+ - For unprivileged home directory installations, you probably do not want 
+   to specify --with-perl-lib=(site|vendor). Instead, you can use the 
+   default perl installation target (below the irssi prefix). If you are
+   using local::lib you can also choose to install there by specifying
+   --with-perl-lib=$PERL_LOCAL_LIB_ROOT/lib/perl5

 You can verify that the perl module is loaded and working with "/LOAD"
 command. It should print something like:

 Module               Type    Submodules
 ...
-perl                 dynamic fe core
+perl                 static  core fe


 System specific notes
@ -108,12 +134,13 @@ would call:

 Getting perl scripting to work needs a few things:

- - TODO
+ - configure with --with-perl-staticlib

+ - libperl.dll is required in linking and running irssi, it's normally
+   located somewhere around /usr/lib/perl5/5.6.1/cygwin/CORE/libperl5_6_1.dll
+   copy it to eg. /usr/bin/libperl.dll

- Apple MacOS / Darwin
+ - -DUSEIMPORTLIB is needed to be defined while compiling src/perl directory.
+   It doesn't hurt to be defined everywhere, so configure irssi with:

-At the time of writing, meson has an open issue with correctly linking
-libraries on macos.
-
-See docs/meson-macos-ar.txt for a workaround.
+     CFLAGS='-DUSEIMPORTLIB' ./configure --with-perl-staticlib
--- a/MANIFEST.in
+++ b/MANIFEST.in
@ -1,35 +0,0 @@
-global-include meson.build
-
-recursive-include src *.c *.h meson.build
-recursive-include src/perl *.c *.h *.xs *.pm *.pl typemap meson.build
-recursive-include src/fe-fuzz *.c *.h *.txt meson.build
-recursive-include tests *.c meson.build
-
-include meson_options.txt
-
-include subprojects/*.wrap
-# prune subprojects/*
-
-include utils/*.pl utils/*.sh
-exclude utils/make-dist.sh
-
-include irssi.conf
-include themes/*.theme
-include docs/*.1 docs/*.txt docs/*.html
-include docs/help/in/[a-z]*.in
-include scripts/*.pl scripts/examples/*.pl
-include irssi-icon.png
-
-include NEWS
-include INSTALL
-include TODO
-include ChangeLog
-
-include .clang-format
-
-# prune Build
-# prune dist
-prune *.egg-info
-
-# ignore fuzz-support/fuzz.diff
-# ignore utils/clang-format-xs/*
--- a/Makefile.am
+++ b/Makefile.am
@ -0,0 +1,35 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+# create default-config.h
+BUILT_SOURCES = default-config.h default-theme.h irssi-version.h
+CLEANFILES = default-config.h default-theme.h
+
+@MAINTAINER_MODE_TRUE@.PHONY: irssi-version.h
+
+default-config.h: $(srcdir)/irssi.conf
+	$(srcdir)/utils/file2header.sh $(srcdir)/irssi.conf default_config > default-config.h
+
+default-theme.h: $(srcdir)/themes/default.theme
+	$(srcdir)/utils/file2header.sh $(srcdir)/themes/default.theme default_theme > default-theme.h
+
+irssi-version.h:
+	VERSION="$(VERSION)" $(srcdir)/utils/irssi-version.sh $(srcdir) | \
+		cmp -s - $@ || VERSION="$(VERSION)" $(srcdir)/utils/irssi-version.sh $(srcdir) >$@
+
+SUBDIRS = src tests docs scripts themes utils
+
+confdir = $(sysconfdir)
+conf_DATA = irssi.conf
+
+pkgconfig_DATA = irssi-1.pc
+
+pkginclude_HEADERS = irssi-config.h irssi-version.h
+
+EXTRA_DIST = \
+	ChangeLog \
+	autogen.sh \
+	README.md \
+	$(conf_DATA) \
+	irssi-icon.png \
+	meson.build \
+	meson_options.txt
--- a/44
+++ b/44
@ -1,45 +1,3 @@
-v1.5-head 202x-xx-xx  The Irssi team <staff@irssi.org>
-
-v1.4.5 2023-10-03  The Irssi team <staff@irssi.org>
-	+ Add workaround for Perl 5.38.0 bug that breaks the Irssi
-          locale and glyph rendering (scripts.irssi.org#857, #1498)
-	- Fix Perl scripts broken by Perl 5.38 (scripts.irssi.org#851,
-          #1474). With input from Leon Timmermans
-	- Document workaround to fix linker errors when building with
-          meson on Apple (#1435, #1492)
-	- Fix meson using wrong filenames on Apple, leading to broken
-          Perl support (#1483, #1493)
-	- Fix /upgrade not accepting `~' (#1460, #1462). By Lukas Mai 
-	- Improve compatibility with Perl5-IDEA (#1465, #1467). By
-          Charlie Daffern
-	- Fix logic in how own actions are printed for other protocols
-          (codeberg!5, #1471). By Andrej Kacian
-	- Fix crash on old PowerPC Mac (#1482, #1484)
-	- Fix wrong prototype of library function used in terminal
-          handling (#1495). By Emil Engler
-	- Minor cleanups (#1488, #1497). Includes work by Emil Engler
-	- Minor help and documentation fixes (#1458, #1494, #1477,
-          #1478). Includes work by KindOne
-
-v1.4.4 2023-03-31  The Irssi team <staff@irssi.org>
-	* Expose location of signals.txt via pkg-config (codeberg!1,
-          #1439, #1446, #1447). By Andrej Kacian
-	+ Levels can now be inverted using `^' prefix in the /WINDOW
-	  (HIDE)LEVEL commands (#1428)
-	+ Support receiving monospace (#1370, #1442). By Linus
-	  Heckemann
-	- Fix config broken by /WINDOW LOGFILE without parameter
-          (#1392, #1432)
-	- Fix broken /LASTLOG -window switch (#1418, #1424, regression
-          introduced in #1398)
-	- Fix logic in how actions are printed for other protocols
-          (codeberg!3, #1454). By Andrej Kacian
-	- Fix stale special collector use after free (#1456). Reported
-          by ednash
-	- Help and message fixes (#1421, #1429, #1431, #1434, #1438,
-          #1452, #1453, #1455). Includes work by Jimmie Tyrrell and
-          Sven Grewe
-
 v1.4.3 2022-10-31  The Irssi team <staff@irssi.org>
 	- Fix freeze on Alt+arrows (#1416, #1417)
 	- Fix crash on /upgrade (#1399, #1419)
@ -154,7 +112,7 @@ v1.4.1 2022-06-12  The Irssi team <staff@irssi.org>

 	* Channel sync requests (WHO, MODE) are now sent "later" than
          user commands. This should improve responsiveness to user
-          commands in the autojoin phase (#1300, an#26, an#32, an#33)
+          commands in the autojoin phase (an#26, an#32, an#33)
 	* Irssi is now using full paths in #include directives and
          consequently does not add all directories to the include
          path anymore (#1040)
--- a/README.md
+++ b/README.md
@ -17,7 +17,7 @@ available.

 #### Development source installation

-[Ninja](https://ninja-build.org/) 1.8 and [Meson](https://mesonbuild.com/) 0.53
+[Ninja](https://ninja-build.org/) 1.5 and [Meson](https://mesonbuild.com/) 0.49

 ```
 git clone https://github.com/irssi/irssi
@ -29,7 +29,7 @@ ninja -C Build && sudo ninja -C Build install
 #### Release source installation

 * Download [release](https://github.com/irssi/irssi/releases)
-* Verify signature
+* [Verify](https://irssi.org/download/#release-sources) signature
 ```
 tar xJf irssi-*.tar.xz
 cd irssi-*
@ -41,15 +41,15 @@ ninja -C Build && sudo ninja -C Build install

 - [glib-2.32](https://wiki.gnome.org/Projects/GLib) or greater
 - [openssl](https://www.openssl.org/)
- [perl-5.8](https://www.perl.org/) or greater (for perl support)
+- [perl-5.6](https://www.perl.org/) or greater (for perl support)
 - terminfo or ncurses (for text frontend)

 #### See the [INSTALL](INSTALL) file for details

 ## [Documentation](https://irssi.org/documentation/)

-* [New users guide](https://irssi.org/New-users/)
-* [Questions and Answers](https://irssi.org/documentation/qna/)
+* [Frequently Asked Questions](https://irssi.org/documentation/faq)
+* [Startup How-To](https://irssi.org/documentation/startup)
 * Check the built-in `/HELP`, it has all the details on command syntax

 ## [Themes](https://irssi-import.github.io/themes/)
@ -62,7 +62,7 @@ ninja -C Build && sudo ninja -C Build install

 Please report security issues to staff@irssi.org. Thanks!

-## [Bugs](https://github.com/irssi/irssi/issues) / Suggestions / Contributing
+## [Bugs](https://github.com/irssi/irssi/issues) / Suggestions / [Contributing](https://irssi.org/development/)

 Check the GitHub issues if it is already listed in there; if not, open
 an issue on GitHub or send a mail to [staff@irssi.org](mailto:staff@irssi.org).
--- a/autogen.sh
+++ b/autogen.sh
@ -0,0 +1,67 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+PKG_NAME="Irssi"
+
+srcdir=`dirname "$0"`
+test -z "$srcdir" && srcdir=.
+mydir=`pwd`
+
+if test ! -f "$srcdir"/configure.ac; then
+    echo -n "**Error**: Directory \`$srcdir' does not look like the"
+    echo " top-level $PKG_NAME directory"
+    exit 1
+fi
+
+cd "$srcdir"
+
+# create help files
+echo "Creating help files..."
+perl utils/syntax.pl
+
+echo "Creating ChangeLog..."
+git log > ChangeLog
+if test "$?" -ne 0; then
+    echo "**Error**: ${PKG_NAME} Autogen must be run in a git clone, cannot proceed."
+    exit 1
+fi
+
+files=`echo docs/help/in/*.in|sed -e 's,docs/help/in/Makefile.in ,,' -e 's,docs/help/in/,!,g' -e 's/\.in /.in ?/g'`
+cat docs/help/in/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!?' '\t\n' > docs/help/in/Makefile.am
+
+files=`echo $files|sed 's/\.in//g'`
+cat docs/help/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!?' '\t\n' > docs/help/Makefile.am
+
+if test x$NOCONFIGURE = x && test -z "$*"; then
+  echo "**Warning**: I am going to run \`configure' with no arguments."
+  echo "If you wish to pass any to it, please specify them on the"
+  echo \`$0\'" command line."
+  echo
+fi
+
+rm -f aclocal.m4
+echo "Running autoreconf ..."
+autoreconf -i || exit $?
+
+# make sure perl hashes have correct length
+find src/perl -name '*.c' -o -name '*.xs' -exec grep -n hv_store {} + | perl -l -ne 'if (/"(\w+)",\s*(\d+)/ && $2 != length $1) { $X=1; print "Incorrect key length in $_" } END { exit $X }'
+
+cd "$mydir"
+
+conf_flags="--enable-maintainer-mode"
+
+if test x$NOCONFIGURE = x; then
+  echo Running "$srcdir"/configure $conf_flags "$@" ...
+  "$srcdir"/configure $conf_flags "$@" \
+  && echo Now type \`make\' to compile $PKG_NAME || exit 1
+else
+  echo Skipping configure process.
+fi
+
+if grep -q '==\|\[\[' "$srcdir"/build-aux/test-driver; then
+    echo
+    echo "************************************************************************"
+    echo "**Warning**: your build is not portable, please do not make dist"
+    echo "             see https://bugzilla.opensuse.org/show_bug.cgi?id=1076146"
+    echo "************************************************************************"
+fi
--- a/configure.ac
+++ b/configure.ac
@ -0,0 +1,821 @@
+AC_INIT(irssi, 1.4.3)
+AC_CONFIG_SRCDIR([src])
+AC_CONFIG_AUX_DIR(build-aux)
+AC_PREREQ(2.50)
+
+AC_CONFIG_HEADERS([irssi-config.h])
+AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE([1.9 no-define foreign subdir-objects nostdinc])
+
+AM_SILENT_RULES([yes])
+
+AM_MAINTAINER_MODE
+
+AC_PROG_CC
+AC_PROG_CPP
+AM_PROG_LIBTOOL
+
+AC_PATH_PROG(sedpath, sed)
+AC_PATH_PROG(perlpath, perl)
+
+PKG_INSTALLDIR
+
+AC_CHECK_HEADERS(unistd.h dirent.h sys/ioctl.h sys/resource.h)
+
+# check posix headers..
+AC_CHECK_HEADERS(sys/socket.h sys/time.h sys/utsname.h)
+
+AC_SYS_LARGEFILE
+
+AC_ARG_WITH(socks,
+[  --with-socks            Build with socks support],
+	if test x$withval = xno; then
+		want_socks=no
+	else
+		want_socks=yes
+	fi,
+	want_socks=no)
+
+AC_ARG_WITH(textui,
+[  --without-textui        Build without text frontend],
+	if test x$withval = xno; then
+		want_textui=no
+	else
+		want_textui=yes
+	fi,
+	want_textui=yes)
+
+AC_ARG_WITH(bot,
+[  --with-bot              Build irssi-bot],
+	if test x$withval = xno; then
+		want_irssibot=no
+	else
+		want_irssibot=yes
+	fi,
+	want_irssibot=no)
+
+AC_ARG_WITH(fuzzer,
+[  --with-fuzzer           Build irssi-fuzzer],
+	if test x$withval = xno; then
+		want_irssifuzzer=no
+	else
+		want_irssifuzzer=yes
+	fi,
+	want_irssifuzzer=no)
+
+AC_ARG_WITH(fuzzer-lib,
+[  --with-fuzzer-lib       Specify path to fuzzer library],
+	fuzzerlibpath="$withval")
+
+AC_ARG_WITH(proxy,
+[  --with-proxy            Build irssi-proxy],
+	if test x$withval = xno; then
+		want_irssiproxy=no
+	else
+		want_irssiproxy=yes
+	fi,
+	want_irssiproxy=no)
+
+AC_ARG_WITH(modules,
+[  --with-modules          Specify what modules to build in binary],
+	if test x$withval != xyes -a x$withval != xno; then
+		build_modules="$withval"
+	fi)
+
+if test "x$prefix" != "xNONE"; then
+	prefix=`eval echo $prefix`
+	PERL_MM_PARAMS="INSTALLDIRS=perl INSTALL_BASE=$prefix"
+	perl_set_use_lib=yes
+
+	perl_prefix_note=yes
+fi
+
+AC_ARG_WITH(perl-staticlib,
+[  --with-perl-staticlib   Specify that we want to link perl libraries
+                          statically in irssi, default is no],
+	if test x$withval = xno; then
+		want_staticperllib=no
+	else
+		want_staticperllib=yes
+	fi,
+	want_staticperllib=no)
+
+
+AC_ARG_WITH(perl-lib,
+[  --with-perl-lib=[perl|site|vendor|DIR]  Specify where to install the
+                          Perl libraries for irssi, default is site],
+	if test "x$withval" = xyes; then
+		want_perl=yes
+	elif test "x$withval" = xno; then
+		want_perl=no
+	elif test "x$withval" = xperl; then
+		want_perl=yes
+		perl_prefix_note=no
+		PERL_MM_PARAMS="INSTALLDIRS=perl"
+		perl_set_use_lib=no
+	elif test "x$withval" = xsite; then
+		want_perl=yes
+		perl_prefix_note=no
+		PERL_MM_PARAMS=""
+		perl_set_use_lib=no
+	elif test "x$withval" = xvendor; then
+		want_perl=yes
+		perl_prefix_note=no
+		if test -z "`$perlpath -v|grep '5\.0'`"; then
+			PERL_MM_PARAMS="INSTALLDIRS=vendor"
+		else
+			PERL_MM_PARAMS="INSTALLDIRS=perl PREFIX=`$perlpath -e 'use Config; print $Config{prefix}'`"
+		fi
+		perl_set_use_lib=no
+	else
+		want_perl=yes
+		perl_prefix_note=no
+		PERL_MM_PARAMS="INSTALLDIRS=perl LIB=$withval"
+		perl_set_use_lib=yes
+	fi,
+	want_perl=yes)
+
+AC_ARG_WITH(perl,
+[  --with-perl[=yes|no|module]  Build with Perl support - also specifies
+                          if it should be built into main irssi binary
+                          (static, default) or as module],
+	if test x$withval = xyes; then
+		want_perl=static
+	elif test x$withval = xstatic; then
+		want_perl=static
+	elif test x$withval = xmodule; then
+		want_perl=module
+	else
+		want_perl=no
+	fi,
+	want_perl=static)
+
+AC_ARG_WITH(otr,
+[  --with-otr[=yes|no|static]   Build with OTR support - also specifies
+                                if it should be built into the main irssi
+                                binary (static) or as a module (default)],
+	if test x$withval = xyes; then
+		want_otr=module
+	elif test x$withval = xstatic; then
+		want_otr=static
+	elif test x$withval = xmodule; then
+		want_otr=module
+	else
+		want_otr=no
+	fi,
+	want_otr=no)
+
+AC_ARG_ENABLE(true-color,
+[  --enable-true-color     Build with true color support in terminal],
+	if test x$enableval = xno ; then
+		want_truecolor=no
+	else
+		want_truecolor=yes
+	fi,
+	want_truecolor=no)
+
+AC_ARG_ENABLE(gregex,
+[  --disable-gregex        Build without GRegex (fall back to regex.h)],
+	if test x$enableval = xno ; then
+		want_gregex=no
+	else
+		want_gregex=yes
+	fi,
+	want_gregex=yes)
+
+AC_ARG_ENABLE(utf8proc,
+[  --disable-utf8proc        Build without Julia's utf8proc],
+	if test x$enableval = xno ; then
+		want_utf8proc=no
+	else
+		want_utf8proc=yes
+	fi,
+	want_utf8proc=yes)
+
+AC_ARG_WITH(capsicum,
+[  --with-capsicum         Build with Capsicum support],
+	if test x$withval = xno; then
+		want_capsicum=no
+	else
+		want_capsicum=yes
+	fi,
+	want_capsicum=yes)
+
+dnl **
+dnl ** just some generic stuff...
+dnl **
+
+dnl * OS specific options
+case "$host_os" in
+  hpux*)
+    CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
+    ;;
+  *)
+    ;;
+esac
+
+
+AC_SEARCH_LIBS([socket], [network socket])
+
+AC_SEARCH_LIBS([inet_addr], [nsl])
+
+dnl * gcc specific options
+if test "x$ac_cv_prog_gcc" = "xyes"; then
+  CFLAGS="$CFLAGS -Wall"
+fi
+
+AC_CHECK_TYPE(socklen_t, ,
+	[AC_DEFINE([socklen_t], [int], [Define to 'int' if <sys/socket.h> doesn't define.])], [
+AC_INCLUDES_DEFAULT
+#ifdef HAVE_SYS_SOCKET_H
+#  include <sys/socket.h>
+#endif
+])
+
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(long long)
+AC_CHECK_SIZEOF(off_t)
+
+if test $ac_cv_sizeof_off_t = 8; then
+  offt_64bit=yes
+else
+  offt_64bit=no
+fi
+
+dnl **
+dnl ** check for socks
+dnl **
+
+if test "x$want_socks" = "xyes"; then
+	AC_CHECK_LIB(socks, connect, [
+		AC_DEFINE(HAVE_SOCKS,, Build with socks support)
+		LIBS="$LIBS -lsocks"
+		AC_CHECK_HEADER(socks.h, [
+			AC_DEFINE(HAVE_SOCKS_H)
+			CFLAGS="$CFLAGS -DSOCKS"
+			AC_MSG_RESULT(["socks5 library found, building with it"])
+		], [
+			AC_MSG_RESULT(["socks4 library found, building with it"])
+			CFLAGS="$CFLAGS -Dconnect=Rconnect -Dgetsockname=Rgetsockname -Dgetpeername=Rgetpeername -Dbind=Rbind -Daccept=Raccept -Dlisten=Rlisten -Dselect=Rselect"
+		])
+	])
+fi
+
+dnl **
+dnl ** fe-text checks
+dnl **
+
+for try in 1 2; do
+  if test $try = 1; then
+    glib_modules=gmodule
+  else
+    echo "*** trying without -lgmodule"
+    glib_modules=
+  fi
+  AM_PATH_GLIB_2_0(2.32.0,,, $glib_modules)
+  if test "$GLIB_LIBS"; then
+    if test $glib_modules = gmodule; then
+      AC_DEFINE(HAVE_GMODULE)
+      have_gmodule=yes
+    fi
+    break
+  fi
+done
+
+if test -z "$GLIB_LIBS"; then
+  echo
+  echo "*** If you don't have GLIB, you can get it from ftp://ftp.gtk.org/pub/glib/"
+  echo "*** We recommend you get the latest stable GLIB 2 version."
+  echo "*** Compile and install it, and make sure pkg-config finds it,"
+  echo "*** by adding the path where the .pc file is located to PKG_CONFIG_PATH"
+  echo -n "*** Or alternatively install your distribution's package"
+  if test -f /etc/debian_version; then
+    echo :
+    echo "*** sudo apt-get install libglib2.0-dev"
+  elif test -f /etc/redhat-release; then
+    echo " (glib2-devel)"
+  else
+    echo .
+  fi
+  echo
+
+  AC_ERROR([GLIB is required to build irssi.])
+fi
+
+LIBS="$LIBS $GLIB_LIBS"
+
+GLIB_TESTS
+
+dnl **
+dnl ** OpenSSL checks
+dnl **
+PKG_CHECK_MODULES([OPENSSL], [openssl], [
+	CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
+	LIBS="$LIBS $OPENSSL_LIBS"
+], [
+	AC_CHECK_LIB([ssl], [SSL_library_init], [
+		LIBS="$LIBS -lssl -lcrypto"
+	], [
+		AC_MSG_ERROR([The OpenSSL library was not found])
+	])
+])
+
+dnl **
+dnl ** utf8proc
+dnl **
+if test "x$want_utf8proc" != "xno"; then
+	AC_CHECK_HEADER([utf8proc.h], [
+		AC_CHECK_LIB([utf8proc], [utf8proc_version], [
+			want_utf8proc=yes
+			AC_DEFINE(HAVE_LIBUTF8PROC,, [Define to 1 if you have the `utf8proc' library (-lutf8proc).])
+			LIBS="$LIBS -lutf8proc"
+		], [
+			want_utf8proc="no, library not found"
+		])
+	], [
+		want_utf8proc="no, library header not found"
+	])
+fi
+
+dnl **
+dnl ** curses checks
+dnl **
+
+if test "x$want_textui" != "xno"; then
+
+	TEXTUI_NO_LIBS="$LIBS"
+	LIBS=
+	AC_SEARCH_LIBS([setupterm], [tinfo ncursesw ncurses terminfo], [want_textui=yes], [
+		AC_ERROR(Terminfo not found - install libncurses-dev or ncurses-devel package)
+		want_textui="no, Terminfo not found"
+	])
+
+	TEXTUI_LIBS="$LIBS"
+	AC_SUBST(TEXTUI_LIBS)
+	LIBS="$TEXTUI_NO_LIBS"
+
+	AC_CHECK_HEADER([term.h], [
+		AC_DEFINE(HAVE_TERM_H, [], [Define to 1 if you have the `term.h' header.])
+	])
+
+fi
+
+dnl **
+dnl ** irssifuzzer checks
+dnl **
+
+if test "$want_irssifuzzer" != "no"; then
+	dnl * we need to build with -fsanitize-coverage=trace-pc-guard
+	dnl * otherwise fuzzer won't be very successful at finding bugs :)
+	if test -z "$SANFLAGS"; then
+		SANFLAGS="-g -fsanitize=address -fsanitize-coverage=trace-pc-guard"
+	fi
+	CFLAGS="$CFLAGS $SANFLAGS"
+	CXXFLAGS="$CXXFLAGS $SANFLAGS"
+
+	AC_MSG_CHECKING(for fuzzer library)
+
+	if test -z "$fuzzerlibpath"; then
+		AC_MSG_RESULT([not found, building without fuzzer front end])
+		want_irssifuzzer=no
+	else
+		FUZZER_LIBS="$fuzzerlibpath"
+		AC_SUBST(FUZZER_LIBS)
+	fi
+fi
+
+dnl **
+dnl ** perl checks
+dnl **
+
+if test "$want_perl" != "no"; then
+	AC_MSG_CHECKING(for working Perl support)
+
+	if test -z "$perlpath"; then
+		perl_check_error="perl binary not found"
+	else
+		PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
+	fi
+
+	if test "x$ac_cv_prog_gcc" = "xyes" -a -z "`echo $host_os|grep 'bsd\|linux'`"; then
+		dnl * several systems have Perl compiled with native compiler
+		dnl * but irssi is being compiled with GCC. Here we try to
+		dnl * fix those command line options a bit so GCC won't
+		dnl * complain about them. Normally there's only few options
+		dnl * that we want to keep:
+		dnl * -Ddefine -Uundef -I/path -fopt -mopt -iwithsysroot
+		PERL_CFLAGS=`echo $PERL_CFLAGS | $perlpath -pe 's/^(.* )?-@<:@^DUIifm@:>@@<:@^ @:>@+/\1/g; s/^(.* )?\+@<:@^ @:>@+/\1/g'`
+
+		PERL_EXTRA_OPTS="CCCDLFLAGS=\"-fPIC\""
+		AC_SUBST(PERL_EXTRA_OPTS)
+	fi
+
+	if test -z "$PERL_CFLAGS"; then
+		if test -n "$perl_check_error"; then
+			perl_check_error="Error getting perl CFLAGS"
+		fi
+		AC_MSG_RESULT([not found, building without Perl])
+		want_perl=no
+	else
+		PERL_LDFLAGS=`$perlpath -MExtUtils::Embed -e ldopts 2>/dev/null`
+
+		dnl * remove all database stuffs
+		dnl * nsl is already in ldflags
+		dnl * libc is of course linked without needing -lc
+		dnl * -rdynamic must not be in LIBADD line
+		for word in -ldb -ldbm -lndbm -lgdbm -lc -rdynamic; do
+		  PERL_LDFLAGS=`echo $PERL_LDFLAGS | $sedpath -e "s/$word //" -e "s/$word$//"`
+		done
+
+		case "$host_os" in
+		  linux*)
+		    PERL_LDFLAGS=`echo $PERL_LDFLAGS | $sedpath -e 's/-lposix //' -e 's/-lposix$//'`
+		    ;;
+		  hpux*)
+		    if test "x$ac_cv_prog_gcc" = "xyes"; then
+		      PERL_CFLAGS=`echo $PERL_CFLAGS | $sedpath -e 's/-Ae //' -e 's/-Ae$//'`
+		      PERL_LDFLAGS=`echo $PERL_LDFLAGS | $sedpath -e 's/-Ae //' -e 's/-Ae$//'`
+		    fi
+		    ;;
+		  *)
+		    ;;
+		esac
+
+		dnl * check that perl's ldflags actually work
+		echo "#include <EXTERN.h>" > conftest.c
+		echo "#include <perl.h>" >> conftest.c
+		echo "int main(){perl_alloc(); return 0;}" >> conftest.c
+		$CC $CFLAGS $PERL_CFLAGS conftest.c -o conftest $LDFLAGS $PERL_LDFLAGS 2> perl.error.tmp > /dev/null
+		if test ! -s conftest -a "x$ignore_perl_errors" = "x"; then
+			perl_check_error="Error linking with perl libraries: $PERL_LDFLAGS: `cat perl.error.tmp`"
+			AC_MSG_RESULT([error linking with perl libraries, building without Perl])
+			want_perl=no
+		fi
+
+		rm -f perl.error.tmp
+	fi
+
+	if test "x$want_perl" != "xno"; then
+		AC_MSG_RESULT(ok)
+
+		if test "x$want_perl" = "xstatic"; then
+			dnl * building with static perl support
+			dnl * all PERL_LDFLAGS linking is done in fe-text
+			PERL_LINK_FLAGS="$PERL_LDFLAGS"
+			PERL_LINK_LIBS="../perl/libperl_core_static.la"
+			PERL_FE_LINK_LIBS="../perl/libfe_perl_static.la"
+			PERL_LDFLAGS=
+			AC_DEFINE(HAVE_STATIC_PERL)
+
+			dnl * build only static library of perl module
+			perl_module_lib=
+			perl_module_fe_lib=
+			perl_static_lib=libperl_core_static.la
+			perl_static_fe_lib=libfe_perl_static.la
+		else
+			dnl * build dynamic library of perl module
+			perl_module_lib=libperl_core.la
+			perl_module_fe_lib=libfe_perl.la
+			perl_static_lib=
+			perl_static_fe_lib=
+		fi
+
+		if test "x$want_staticperllib" = "xyes"; then
+			PERL_MM_PARAMS="$PERL_MM_PARAMS LINKTYPE=static"
+			PERL_LINK_LIBS="$PERL_LINK_LIBS ../perl/common/blib/arch/auto/Irssi/Irssi.a ../perl/irc/blib/arch/auto/Irssi/Irc/Irc.a ../perl/ui/blib/arch/auto/Irssi/UI/UI.a ../perl/textui/blib/arch/auto/Irssi/TextUI/TextUI.a"
+			PERL_STATIC_LIBS=1
+		else
+			PERL_STATIC_LIBS=0
+		fi
+
+		# remove any prefix from PERL_MM_OPT
+		PERL_MM_OPT=`perl -MText::ParseWords -e 'sub qu{$_=shift;s{^(.*?)=(.*)$}{($a,$b)=($1,$2);$b=~s/"/\\\\"/g;qq{$a="$b"}}ge if /@<:@\s"@:>@/;$_} local $,=" "; print map qu($_), grep !/^(INSTALL_BASE|PREFIX)=/, shellwords(@ARGV)' "$PERL_MM_OPT"`
+		# figure out the correct @INC path - we'll need to do this
+		# through MakeMaker since it's difficult to get it right
+		# otherwise.
+		$perlpath -MExtUtils::MakeMaker -e 'WriteMakefile(NAME => "test", MAKEFILE => "Makefile.test", FIRST_MAKEFILE => "/dev/null", NO_META => 1, NO_MYMETA => 1);' $PERL_MM_PARAMS >/dev/null
+		echo 'show-INSTALLDIRS:' >> Makefile.test
+		echo '	@echo $(INSTALLDIRS)' >> Makefile.test
+		perl_INSTALLDIRS=`$am_make -s -f Makefile.test show-INSTALLDIRS`
+		if test "x$perl_INSTALLDIRS" = "xsite"; then
+			perl_library_dir="site default"
+			perl_INSTALL_VAR=INSTALLSITEARCH
+		elif test "x$perl_INSTALLDIRS" = "xvendor"; then
+			perl_library_dir="vendor default"
+			perl_INSTALL_VAR=INSTALLVENDORARCH
+		else
+			perl_library_dir="module default"
+			perl_INSTALL_VAR=INSTALLARCHLIB
+		fi
+		echo 'show-ARCHLIB:' >> Makefile.test
+		echo '	@echo $('"$perl_INSTALL_VAR"')' >> Makefile.test
+		perl_use_lib=`$am_make -s -f Makefile.test show-ARCHLIB`
+		rm -f Makefile.test
+		if test "x$perl_set_use_lib" = "xyes"; then
+			if $perlpath -e 'exit ! grep $_ eq $ARGV@<:@0@:>@, grep /^\//, @INC' "$perl_use_lib"; then
+				perl_library_dir="other path in @INC"
+				perl_set_use_lib=no
+			else
+				perl_library_dir="prepends to @INC with /set perl_use_lib"
+				PERL_USE_LIB="$perl_use_lib"
+			fi
+		fi
+
+		AC_SUBST(perl_module_lib)
+		AC_SUBST(perl_static_lib)
+		AC_SUBST(perl_module_fe_lib)
+		AC_SUBST(perl_static_fe_lib)
+
+		AC_SUBST(PERL_LINK_FLAGS)
+		AC_SUBST(PERL_LINK_LIBS)
+		AC_SUBST(PERL_FE_LINK_LIBS)
+
+		AC_SUBST(PERL_LDFLAGS)
+		AC_SUBST(PERL_CFLAGS)
+
+		AC_SUBST(PERL_USE_LIB)
+		AC_SUBST(PERL_MM_OPT)
+		AC_SUBST(PERL_MM_PARAMS)
+		AC_SUBST(PERL_STATIC_LIBS)
+	fi
+fi
+
+dnl **
+dnl ** check for capsicum
+dnl **
+
+if test "x$want_capsicum" = "xyes"; then
+	AC_CHECK_LIB(c, cap_enter, [
+		AC_CHECK_LIB(nv, nvlist_create, [
+			AC_DEFINE(HAVE_CAPSICUM,, Build with Capsicum support)
+			LIBS="$LIBS -lnv"
+		], [
+			want_capsicum="no, nvlist_create not found"
+		])
+	], [
+		want_capsicum="no, cap_enter not found"
+	])
+fi
+
+dnl **
+dnl ** OTR checks
+dnl **
+
+have_otr=no
+if test "x$want_otr" != "xno"; then
+	AM_PATH_LIBGCRYPT(1:1.2.0, [], [AC_ERROR(libgcrypt 1.2.0 or newer is required.)])
+	AM_PATH_LIBOTR(4.1.0, [], [AC_ERROR([libotr 4.1.0 or newer is required.])])
+
+	OTR_CFLAGS="$LIBOTR_CFLAGS $LIBGCRYPT_CFLAGS"
+	OTR_LDFLAGS="$LIBOTR_LIBS $LIBGCRYPT_LIBS"
+
+	AC_SUBST(otr_module_lib)
+	AC_SUBST(otr_static_lib)
+
+	if test "x$want_otr" != "xno"; then
+		if test "x$want_otr" = "xstatic"; then
+			otr_module_lib=
+			otr_static_lib=libotr_core_static.la
+
+			OTR_LINK_LIBS="../otr/libotr_core_static.la"
+			OTR_LINK_FLAGS="$OTR_LDFLAGS"
+
+			AC_DEFINE(HAVE_STATIC_OTR)
+		else
+			otr_module_lib=libotr_core.la
+			otr_static_lib=
+		fi
+	fi
+
+	AC_SUBST(otr_module_lib)
+	AC_SUBST(otr_static_lib)
+
+	AC_SUBST(OTR_CFLAGS)
+	AC_SUBST(OTR_LDFLAGS)
+
+	AC_SUBST(OTR_LINK_LIBS)
+	AC_SUBST(OTR_LINK_FLAGS)
+
+	have_otr=yes
+fi
+
+dnl ** check what we want to build
+AM_CONDITIONAL(BUILD_TEXTUI, test "$want_textui" = "yes")
+AM_CONDITIONAL(BUILD_IRSSIBOT, test "$want_irssibot" = "yes")
+AM_CONDITIONAL(BUILD_IRSSIFUZZER, test "$want_irssifuzzer" = "yes")
+AM_CONDITIONAL(BUILD_IRSSIPROXY, test "$want_irssiproxy" = "yes")
+AM_CONDITIONAL(HAVE_PERL, test "$want_perl" != "no")
+AM_CONDITIONAL(HAVE_CAPSICUM, test "x$want_capsicum" = "xyes")
+AM_CONDITIONAL(USE_GREGEX, test "x$want_gregex" = "xyes")
+AM_CONDITIONAL(HAVE_OTR, test "x$have_otr" != "xno")
+
+# move LIBS to PROG_LIBS so they're not tried to be used when linking eg. perl libraries
+PROG_LIBS=$LIBS
+LIBS=
+AC_SUBST(PROG_LIBS)
+
+dnl **
+dnl ** Keep all the libraries here so each frontend doesn't need to
+dnl ** keep track of them all
+dnl **
+dnl ** (these could be made configurable)
+
+CHAT_MODULES="irc"
+irc_MODULES="dcc flood notifylist"
+if test -n "$build_modules"; then
+	irc_MODULES="$irc_MODULES $build_modules"
+fi
+
+dnl ****************************************
+
+AC_SUBST(CHAT_MODULES)
+AC_SUBST(irc_MODULES)
+
+CORE_LIBS="../core/libcore.a ../lib-config/libirssi_config.a"
+FE_COMMON_LIBS=""
+
+CHAT_LIBS=""
+for c in $CHAT_MODULES; do
+	CHAT_LIBS="$CHAT_LIBS ../$c/lib$c.a ../$c/core/lib${c}_core.a"
+	if test -f $srcdir/src/fe-common/$c/module.h; then
+		FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/libfe_common_$c.a "
+	fi
+	for s in `eval echo \\$${c}_MODULES`; do
+		CHAT_LIBS="$CHAT_LIBS ../$c/$s/lib${c}_$s.a"
+		if test -f $srcdir/src/fe-common/$c/$s/module.h; then
+			FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/$s/libfe_${c}_$s.a "
+		fi
+	done
+done
+
+FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/core/libfe_common_core.a"
+
+dnl ** common libraries needed by frontends
+COMMON_NOUI_LIBS="$CHAT_LIBS $CORE_LIBS"
+COMMON_LIBS="$FE_COMMON_LIBS $COMMON_NOUI_LIBS"
+AC_SUBST(COMMON_NOUI_LIBS)
+AC_SUBST(COMMON_LIBS)
+
+if test "x$want_truecolor" = "xyes"; then
+	AC_DEFINE([TERM_TRUECOLOR], [], [true color support in terminal])
+else
+	want_truecolor=no
+fi
+
+if test "x$want_gregex" = "xyes"; then
+	AC_DEFINE([USE_GREGEX], [], [use GRegex for regular expressions])
+else
+	want_gregex=no
+fi
+
+AC_DEFINE([FHS_PREFIX], [""], [Alternate filesystem prefix for Termux])
+AH_TEMPLATE(HAVE_GMODULE)
+AH_TEMPLATE(HAVE_SOCKS_H, [misc..])
+AH_TEMPLATE(HAVE_STATIC_PERL)
+AH_TEMPLATE(HAVE_STATIC_OTR)
+AH_TEMPLATE(PRIuUOFF_T, [printf()-format for uoff_t, eg. "u" or "lu" or "llu"])
+AH_TEMPLATE(UOFF_T_INT, [What type should be used for uoff_t])
+AH_TEMPLATE(UOFF_T_LONG)
+AH_TEMPLATE(UOFF_T_LONG_LONG)
+
+AC_CONFIG_FILES([
+Makefile
+src/Makefile
+src/core/Makefile
+src/irc/Makefile
+src/irc/core/Makefile
+src/irc/dcc/Makefile
+src/irc/notifylist/Makefile
+src/irc/proxy/Makefile
+src/irc/flood/Makefile
+src/fe-common/Makefile
+src/fe-common/core/Makefile
+src/fe-common/irc/Makefile
+src/fe-common/irc/dcc/Makefile
+src/fe-common/irc/notifylist/Makefile
+src/fe-fuzz/Makefile
+src/fe-fuzz/irc/Makefile
+src/fe-fuzz/irc/core/Makefile
+src/fe-fuzz/fe-common/Makefile
+src/fe-fuzz/fe-common/core/Makefile
+src/fe-none/Makefile
+src/fe-text/Makefile
+src/lib-config/Makefile
+src/perl/Makefile
+src/perl/common/Makefile.PL
+src/perl/irc/Makefile.PL
+src/perl/ui/Makefile.PL
+src/perl/textui/Makefile.PL
+src/otr/Makefile
+scripts/Makefile
+scripts/examples/Makefile
+tests/Makefile
+tests/fe-common/Makefile
+tests/fe-common/core/Makefile
+tests/fe-text/Makefile
+tests/irc/Makefile
+tests/irc/core/Makefile
+tests/irc/flood/Makefile
+docs/Makefile
+docs/help/Makefile
+docs/help/in/Makefile
+utils/Makefile
+themes/Makefile
+irssi-1.pc
+])
+
+dnl ** make the paths like include headers later
+AC_CONFIG_LINKS([irssi/irssi-config.h:irssi-config.h])
+AC_LINK_FILES([$srcdir/src],[irssi/src])
+
+AC_OUTPUT
+$LN_S ../irssi-version.h irssi/irssi-version.h
+
+dnl ** for building from objdir
+old_dir=`pwd` && cd $srcdir && whole_dir=`pwd` && cd $old_dir
+if test "x$old_dir" != "x$whole_dir"; then
+	$LN_S $srcdir/irssi-version.h irssi-version.h
+	if test "x$want_perl" != "xno"; then
+		subdirfiles=""
+		for i in $whole_dir/src/perl/common $whole_dir/src/perl/irc $whole_dir/src/perl/ui $whole_dir/src/perl/textui; do
+			subdirfiles=`echo $subdirfiles $i/typemap $i/*.h $i/*.pm $i/*.xs`
+		done
+		for file in $whole_dir/src/perl/module.h $subdirfiles; do
+			link=`echo $file|$sedpath "s?$whole_dir/??"`
+			rm -f $link
+			$LN_S $file $link
+		done
+	fi
+fi
+
+echo
+
+echo "Building text frontend ........... : $want_textui"
+echo "Building irssi bot ............... : $want_irssibot"
+echo "Building irssi proxy ............. : $want_irssiproxy"
+if test "x$have_gmodule" = "xyes"; then
+	echo "Building with module support ..... : yes"
+else
+	echo "Building with module support : NO!! /LOAD will not work!"
+	echo " - You're missing gmodule (comes with glib) for some reason,"
+	echo "   or it doesn't work in your system."
+fi
+
+if test "x$want_perl" = "xstatic"; then
+	echo "Building with Perl support ....... : static (in irssi binary)"
+elif test "x$want_perl" = "xmodule"; then
+	echo "Building with Perl support ....... : module"
+else
+	if test -z "$perl_check_error"; then
+		echo "Building with Perl support ....... : no"
+	else
+		echo "Building with Perl support ....... : NO!"
+		echo " - $perl_check_error"
+                if test -f /etc/debian_version; then
+                  echo " - Try: sudo apt-get install libperl-dev"
+                elif test -f /etc/redhat-release; then
+                  echo " - Try installing perl-devel"
+                fi
+	fi
+fi
+
+if test "x$want_perl" != "xno" -a "x$perl_mod_error" != "x"; then
+	echo " - NOTE: Perl support will be compiled statically to irssi, not as"
+	echo "   a module as requested. Reason:"
+	echo "   $perl_mod_error"
+
+	if test -f /etc/debian_version; then
+		echo " - Try: sudo apt-get install libperl-dev"
+	fi
+fi
+
+if test "x$want_perl" != "xno"; then
+	echo "Perl library directory ........... : ($perl_library_dir - $perl_use_lib)"
+	if test "x$perl_prefix_note" = "xyes"; then
+		echo "  - NOTE: This was automatically set to the same directory you gave with"
+		echo "  --prefix. If you want the perl libraries to install to their 'correct'"
+		echo "  path, you'll need to give --with-perl-lib=site option to configure."
+		echo "  Anyway, installing perl to this directory should work just as well."
+	fi
+fi
+echo "Install prefix ................... : $prefix"
+
+echo
+
+echo "Building with 64bit DCC support .. : $offt_64bit"
+echo "Building with true color support.. : $want_truecolor"
+echo "Building with GRegex ............. : $want_gregex"
+echo "Building with Capsicum ........... : $want_capsicum"
+echo "Building with utf8proc ........... : $want_utf8proc"
+if test "x$want_otr" = "xstatic"; then
+	echo "Building with OTR support ........ : static (in irssi binary)"
+elif test "x$want_otr" = "xmodule"; then
+	echo "Building with OTR support ........ : module"
+else
+	echo "Building with OTR support ........ : no"
+fi
+
+
+echo
+echo "If there are any problems, read the INSTALL file."
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@ -0,0 +1,21 @@
+man_MANS = \
+	irssi.1
+
+doc_DATA = \
+	capsicum.txt \
+	design.html \
+	design.txt \
+	formats.txt \
+	manual.txt \
+	faq.html \
+	faq.txt \
+	perl.txt \
+	signals.txt \
+	special_vars.txt \
+	startup-HOWTO.html \
+	startup-HOWTO.txt
+
+EXTRA_DIST = $(doc_DATA) $(man_MANS) \
+	meson.build
+
+SUBDIRS = help
--- a/docs/capsicum.txt
+++ b/docs/capsicum.txt
@ -9,13 +9,13 @@ To make Irssi enter capability mode on startup, add
 capsicum = "yes";
 awaylog_file = "~/irclogs/away.log";

-to your ~/.irssi/config in the settings/core section, and restart the
-client.  Alternatively you can enter it "by hand", using the
-"/capsicum enter" command.  From the security point of view it's strongly
-preferable to use the former method, to avoid establishing connections
-without the sandbox protection; the "/capsicum" command is only intended
-for experimentation, and in cases where you need to do something that's not
-possible in capability mode - run scripts, for example - before continuing.
+to your ~/.irssi/config and restart the client.  Alternatively you can
+enter it "by hand", using the "/capsicum enter" command.  From the security
+point of view it's strongly preferable to use the former method, to avoid
+establishing connections without the sandbox protection; the "/capsicum"
+command is only intended for experimentation, and in cases where you need
+to do something that's not possible in capability mode - run scripts,
+for example - before continuing.

 There is no way to leave the capability mode, apart from exiting Irssi.
 When running in capability mode, there are certain restrictions - Irssi
--- a/docs/help/Makefile.am.gen
+++ b/docs/help/Makefile.am.gen
@ -0,0 +1,13 @@
+# Makefile.am is autogenerated by autogen.sh from Makefile.am.gen
+
+helpdir = $(datadir)/irssi/help
+
+help_DATA = \
+@HELPFILES@
+
+EXTRA_DIST = \
+	Makefile.am.gen \
+	$(help_DATA) \
+	meson.build
+
+SUBDIRS = in
--- a/docs/help/in/Makefile.am.gen
+++ b/docs/help/in/Makefile.am.gen
@ -0,0 +1,5 @@
+# Makefile.am is autogenerated by autogen.sh from Makefile.am.gen
+
+EXTRA_DIST = \
+	Makefile.am.gen \
+@HELPFILES@
--- a/docs/help/in/bind.in
+++ b/docs/help/in/bind.in
@ -17,15 +17,13 @@ Details:
    Adds or removes a binding; the binding itself is case-sensitive and may
    contain as many characters as you want.

-    Key bindings are case sensitive so uppercase letters mean you also have
-    to use the shift key, except for ctrl which does not support shift but
-    the keys must always be typed in uppercase.
+    Uppercase characters usually indicate that you need to keep the shift-key
+    pressed to use the binding.

 %9Examples:%9

    /BIND
    /BIND meta-c /CLEAR
-    /BIND meta-C /CYCLE
    /BIND meta-q change_window 16
    /BIND -delete meta-y
    /BIND ^W^C /WINDOW NEW HIDE
--- a/docs/help/in/ignore.in
+++ b/docs/help/in/ignore.in
@ -29,8 +29,6 @@
    because it is allowed in addition to other ignores for the same target.
    The special level 'HIDDEN' can be used to hide matching messages that can
    later be revealed using /WINDOW HIDELEVEL -HIDDEN
-    The special level 'NOHILIGHT' can be used to suppress hilights without actually
-    ignoring the message.

 %9Examples:%9

--- a/docs/help/in/levels.in
+++ b/docs/help/in/levels.in
@ -20,10 +20,9 @@
        MODES           A channel mode is modified.
        MSGS            Private messages.
        NICKS           A nickname changes to another nickname.
-        NOTICES         Private notices.
+        NOTICES         Notices sent from a nickname.
        PARTS           A nickname leaves a channel.
        PUBLIC          Public messages in a channel.
-        PUBNOTICES      Public notices in a channel.
        QUITS           A nickname disconnects from IRC.
        SNOTES          Notices sent from a server.
        TOPICS          A channel topic is modified.
@ -36,7 +35,6 @@
        HIDDEN          Hides the message when window HIDELEVEL includes HIDDEN.
        NO_ACT          Doesn't trigger any activity in the statusbar.
        NOHILIGHT       The text is not highlighted.
-                        Suppresses hilights when used with /ignore.

    When using levels from Irssi scripts, you need to prepend the level with
    'MSGLEVEL_'; for example 'CRAP' becomes 'MSGLEVEL_CRAP'.
--- a/docs/help/in/network.in
+++ b/docs/help/in/network.in
@ -36,8 +36,8 @@
    -cmdmax:         Specifies the maximum number of commands to perform before
                     starting the internal flood protection.
    -sasl_mechanism  Specifies the mechanism to use for the SASL authentication.
-                     Irssi supports: PLAIN, EXTERNAL, SCRAM-SHA-1, SCRAM-SHA-256
-                     and SCRAM-SHA-512
+                     At the moment irssi only supports the 'plain' and the
+                     'external' mechanisms.
                     Use '' to disable the authentication.
    -sasl_username   Specifies the username to use during the SASL authentication.
    -sasl_password   Specifies the password to use during the SASL authentication.
--- a/docs/help/in/scrollback.in
+++ b/docs/help/in/scrollback.in
@ -20,10 +20,10 @@

 %9Description:%9

-    Manipulate the text in the window to go to the given line number, or
+    Manipulate the text in the window to go to a to the given line number, or
    clear the buffers.

-    The timestamp format is '[dd[.mm] | -<days ago>] hh:mi[:ss]'.
+    The timestamp format is format is '[dd[.mm] | -<days ago>] hh:mi[:ss]'.

 %9Examples:%9

--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@ -16,13 +16,11 @@
    -4:                 Connects using IPv4.
    -6:                 Connects using IPv6.
    -tls:               Connects using TLS encryption.
-    -notls:             Connect without TLS encrption.
    -tls_cert:          The TLS client certificate file.
    -tls_pkey:          The TLS client private key, if not included in the
                        certificate file.
    -tls_pass:          The password for the TLS client private key or certificate.
    -tls_verify:        Verifies the TLS certificate of the server.
-    -notls_verify:      Doesn't verify the TLS certificate of the server.
    -tls_cafile:        The file with the list of CA certificates.
    -tls_capath:        The directory which contains the CA certificates.
    -tls_ciphers:       TLS cipher suite preference lists.
--- a/docs/help/in/statusbar.in
+++ b/docs/help/in/statusbar.in
@ -10,7 +10,7 @@
    RESET:        Restores the default statusbar configuration.
    ADDITEM:      Adds an item to the specified statusbar. It can be set to
                  appear before/after another item and left/right aligned
-                  on the screen.
+                  to a specified position on the screen.
    MODIFYITEM:   Changes an item position inside a bar.
    REMOVEITEM:   Removes an item from the specified statusbar.
    INFO:         List the current details and items of the specified
@ -18,16 +18,15 @@

    -disable:     Removes a statusbar from the list.
    -type:        Sets the type of statusbar, for each split window or only
-                  once at the root (very top or bottom) of the screen.
+                  for the current root screen.
    -placement:   Sets the placement of the statusbar, either at the top or
-                  the bottom of the screen or split window.
+                  the bottom of the screen.
    -position:    Sets the position of the statusbar. Represented as a
-                  number, with smaller numbers implying a position further
-                  to the top.
-    -visible:     Sets the visibility of the statusbar. If set to always,
-                  it is visible on all split windows, otherwise if set to
-                  inactive or active then it is only visible on inactive or
-                  active split windows, respectively.
+                  number, with 0 implying the first position.
+    -visible:     Sets the visibility of the statusbar or item. If set to
+                  always it is visible on all screens, otherwise if set to
+                  inactive or active then it is only visible on inactive
+                  or active screens, respectively.
    -before:      This item is added before the other item.
    -after:       This item is added after the other item.
    -priority:    When the statusbar items overflow, the item with the
@ -36,10 +35,8 @@
                  quoted (e.g. -priority "-1")
    -alignment:   Display the item on the right side.

-    Where statusbar refers to the name of the statusbar; if no
-    argument is given, or `LIST` is given, the entire list of
-    statusbars along with a quick overview of their properties will be
-    displayed.
+    Where statusbar refers to the name of the statusbar; if no argument is
+    given, the entire list of statusbars will be displayed.

 %9Description:%9

--- a/docs/help/in/window.in
+++ b/docs/help/in/window.in
@ -42,7 +42,6 @@
    LEFT:         %|Go to the previous window numerically that is part of the current sticky group (or not part of any sticky group).
    RIGHT:        %|Go to the next window numerically that is part of the current sticky group (or not part of any sticky group).
    STICK:        %|Make the currently active window sticky, or stick the window specified by number to the currently visible split window. Or turn off stickyness of the currently active window or the window specified by number.
-    HIDELEVEL:    %|Changes the levels of text lines that should be hidden from view, or query the current hidden level.
    MOVE LEFT:    %|Move the window to the numerically previous location inside the current sticky group.
    MOVE RIGHT:   %|Move the window to the numerically next location inside the current sticky group.
    MOVE UP:      %|Move the current window to the sticky group of the previous split window. If no sticky group remains, the split window collapses.
@ -53,8 +52,6 @@

   %|Add the required arguments for the given command. Without arguments, the details (size, immortality, levels, server, name and sticky group) of the currently active window are displayed. If used with a number as argument, same as WINDOW REFNUM.

-   %|LEVEL and HIDELEVEL modify the currently set level. Without arguments, the current level is displayed. Levels listed starting with `+' are added to the current levels. Levels listed starting with `-' are removed from the current levels. To clear the levels, start the new level setting with `NONE'. Levels listed starting with `^' are either removed or added from the current setting, depending on whether they were previously set or not (since Irssi 1.4.4). Levels listed as is are also added to the current levels. Afterwards, the new level setting is displayed.
-
 %9Description:%9

    Manipulates the window layout and positioning attributes.
@ -71,8 +68,7 @@
    /WINDOW LOG OFF
    /WINDOW LOG ON ~/logs/debug.log
    /WINDOW LEVEL -ALL +NOTICES
-    /WINDOW HIDELEVEL ^JOINS ^PARTS ^QUITS
    /WINDOW LOGFILE ~/logs/notices.log

-%9See also:%9 JOIN, LEVELS, LOG, QUERY, SET window_default_level, SET window_default_hidelevel
+%9See also:%9 JOIN, LEVELS, LOG, QUERY

--- a/docs/manual.txt
+++ b/docs/manual.txt
@ -18,16 +18,16 @@
 	9. Text highlighting
 	10. Ignoring
 	11. Logging
-	12. Commands
-	14. Last log (currently text version only)
-	15. Word completion
-	16. Recode
-	18. Key bindings (text version)
-	19. Perl scripting

 	( not written yet: )
+	12. Commands
 	13. Themes
+	14. Last log (currently text version only)
+	15. Nick and word completion
+	16. Recode
 	17. Windowing system (text version)
+	18. Keyboard (text version)
+	19. Perl scripting



@ -141,7 +141,44 @@
 	--hostname -h		Specify what host name to use


- 2. Message levels <https://irssi.org/documentation/help/levels/>
+ 2. Message levels
+
+
+	Message levels (or in short, levels) are used almost everywhere.
+	They describe what kind of messages we're dealing with. Here's a
+	list of them all:
+
+	CRAP            - Can be almost anything
+	MSGS            - Private messages
+	PUBLIC          - Public messages in channel
+	NOTICES         - Notices
+	SNOTES          - Server notices
+	CTCPS           - CTCP messages
+	ACTIONS         - Actions (/me) - usually ORed with PUBLIC or MSGS
+	JOINS           - Someone joins a channel
+	PARTS           - Someone parts a channel
+	QUITS           - Someone quits IRC
+	KICKS           - Someone gets kicked from channel
+	MODES           - Channel mode is changed
+	TOPICS          - Channel topic is changed
+	WALLOPS         - Wallop is received
+	INVITES         - Invite is received
+	NICKS           - Someone changes nick
+	DCC             - DCC related messages
+	DCCMSGS         - DCC chat messages
+	CLIENTNOTICES   - Irssi's notices
+	CLIENTERRORS    - Irssi's error messages
+	CLIENTCRAP      - Some other messages from Irssi
+
+	And a few special ones that could be included with the
+	levels above:
+
+	HILIGHT         - Text is highlighted
+	NOHILIGHT       - Don't check highlighting for this message
+	NO_ACT          - Don't trigger channel activity when printing
+	                  this message
+	NEVER           - Never ignore or log this message
+

 3. Flood protection

@ -215,12 +252,47 @@
 	Currently only messages, notices and ctcps are checked for
 	flooding.

-	/SET flood_max_msgs <count>, default is 4
-	/SET flood_timecheck <seconds>, default is 5 seconds
+	/SET flood_max_msgs = <count>, default is 4
+	/SET flood_timecheck = <seconds>, default is 5 seconds
 	If either of these is 0, the flood checking is disabled.


- 4. Configuration <https://irssi.org/documentation/manual/configuration/>
+ 4. Configuration
+
+ 4.1 Configuration files
+
+	The configuration is saved to ~/.irssi/config file. You can edit
+	it with text editor if you want, you can also add comments to it
+	and they stay there even if /SAVE is used. Comments are the lines
+	starting with # character. Any errors in config file are displayed
+	at startup.
+
+	Irssi uses it's own config library for handling the config file.
+	The format is pretty much the same as in libPropList and should be
+	easily understandable.
+
+	You can reload the config file on the fly with /RELOAD command, you
+	can also read a different config file with /RELOAD <filename>.
+
+	If you change any settings, they aren't saved to file until you use
+	/SAVE. You can save the config file to different place with
+	/SAVE <filename>.
+
+ 4.2 Settings
+
+	You can view or change the settings with /SET command.
+
+	/SET without any arguments displays all the settings.
+	/SET <key> displays settings which key (partly) matches <key>
+	/SET <key> <value> sets <key> to <value>
+
+	Boolean settings accepts only values ON, OFF and TOGGLE. You can
+	also use /TOGGLE command to change them, so /TOGGLE <key> behaves
+	like /SET <key> TOGGLE. /TOGGLE also accepts arguments ON and OFF
+	when /TOGGLE behaves exactly like /SET.
+
+	Remember that changes are not saved until you use /SAVE!
+

 5. Servers

@ -295,11 +367,11 @@
 	you setup the server using /SERVER ADD (see next section). If the
 	settings can't be found there either, Irssi will use the defaults:

-	/SET default_nick <nick>, defaults to user_name
-	/SET alternate_nick <nick>, defaults to <default_nick>_
-	/SET user_name <user>, defaults to your login name
-	/SET real_name <name>, taken from /etc/passwd by default
-	/SET hostname <host>, what host name to use when connecting
+	/SET default_nick = <nick>, defaults to user_name
+	/SET alternate_nick = <nick>, defaults to <default_nick>_
+	/SET user_name = <user>, defaults to your login name
+	/SET real_name = <name>, taken from /etc/passwd by default
+	/SET hostname = <host>, what host name to use when connecting
 	/SET skip_motd ON|OFF|TOGGLE - Don't show server's MOTD

 	NOTE: /CONNECT is also a command for IRC operators to connect IRC
@ -720,7 +792,13 @@
 	/SET massjoin_max_joins <count>.


- 7. IRC commands and features <https://irssi.org/documentation/help/>
+ 7. IRC commands and features (FIXME)
+
+ 7.x Basic commands
+
+ 7.x IRC operator commands
+
+ 7.x Away features

 8. Notify list

@ -768,9 +846,9 @@

 	/HILIGHT without any arguments displays list of the hilights.

-	If <color> is a number, Irssi will treat it as a MIRC color
-	code. You can also use bolds (^B), underlines (^_) etc. as
-	<color> if you like.
+If <color> is a
+	number, Irssi will treat it as a MIRC color code. You can also use
+	bolds (^B), underlines (^_) etc. as <color> if you like.


 10. Ignoring
@ -915,24 +993,29 @@

 	You can disable this feature by setting awaylog_level to NONE.

- 12. Commands <https://irssi.org/documentation/manual/commands/>
+ 12. Commands

- 13. Themes
+	Any char in the `cmdchars' setting can begin a command. The
+	syntax for a command is the following:

- 14. Last log <https://irssi.org/documentation/help/lastlog/>
+	<CMDCHAR>[<CMDCHAR>][^]<DATA>

- 15. Word completion <https://irssi.org/documentation/help/completion/>
+	If <CMDCHAR> is repeated two times, alias expansion is
+	disabled, enabled otherwise. If `^' is present, command output
+	is disabled. If <DATA> begins with a space, command lookup is
+	inhibited and the data is sent to the active window item
+	(useful to send a line that begins with <CMDCHAR>).

 16. Recode

-	Irssi supports selective encoding of incoming/outgoing messages
+	irssi supports selective encoding of incoming/outgoing messages
 	through the recode system. All incoming/outgoing messages can be
 	optionally converted to/from the charset specified by the
 	`term_charset' variable (which defaults to the locale encoding and
 	should _not_ be changed in most cases), by setting the `recode'
 	variable to 'ON'.
 	Since there is no way in IRC to know the encoding associated to a
-	message, for incoming messages Irssi uses the following algorithm:
+	message, for incoming messages irssi uses the following algorithm:

 	if `recode_autodetect_utf8' is 'ON' and the message is valid UTF-8 the
 	encoding is assumed to be UTF-8.
@ -949,9 +1032,5 @@
 	iconv specific extension to peform transliteration (locale dependent)
 	when a character is not representable in the destination encoding.

- 18. Key bindings <https://irssi.org/documentation/help/bind_-list/>
-
- 19. Scripting <https://irssi.org/documentation/scripting/>
-
 .. no, the docs end here, I got bored of writing these after a few days and 
 haven't touched these since then.
--- a/docs/meson-macos-ar.txt
+++ b/docs/meson-macos-ar.txt
@ -1,6 +0,0 @@
-;; manual workaround for meson bug https://github.com/mesonbuild/meson/issues/11165
-;; fixes compilation with meson on apple macos
-;; usage: meson --native-file ./docs/meson-macos-ar.txt ...
-
-[binaries]
-ar = ['/bin/sh', '-c', 'ar=${AR:-ar}; ranlib=${RANLIB:-ranlib -c -}; case "x$1" in xcsr*) $ar "$@" && $ranlib "$2" || exit $?; ;; *) exec $ar "$@"; ;; esac;', 'ar']
--- a/docs/perl.txt
+++ b/docs/perl.txt
@ -205,12 +205,6 @@ Window::command(cmd)
 Windowitem::command(cmd)
  Send a command `cmd' (in current channel). The '/' char isn't needed.

-version() - return client release date and time (format YYYYMMDD.hhmm)
-
-parse_special(cmd, data="", flags=0)
-Server::parse_special(cmd, data="", flags=0)
-Windowitem::parse_special(cmd, data="", flags=0)
-  evaluate a string with special vars

 *** Themes

@ -522,8 +516,6 @@ Connect->{}
  address - Address where we connected (irc.blah.org)
  port - Port where we connected
  chatnet - Chat network
-  chosen_family - IP family chosen to connect to
-  ipaddr - IP address connected to

  password - Password we used in connection.
  wanted_nick - Nick which we would prefer to use
--- a/docs/special_vars.txt
+++ b/docs/special_vars.txt
@ -94,8 +94,6 @@ $A .. $Z is important.
   $winname             window name
   $itemname            like $T, but use item's visible_name which may be
                        different (eg. $T = !12345chan, $itemname = !chan)
-   $abiversion          IRSSI_ABI_VERSION
-                         https://github.com/irssi/irssi/wiki/irssi_abi_version

 For example, assume you have the following alias:

--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@ -515,12 +515,12 @@ Ctrl-X                - set the next server in list active

 <p><strong>SOCKS</strong></p>

-<p>Using <a href="https://github.com/rofl0r/proxychains-ng">proxychains-ng</a> is recommended for using irssi with a socks proxy.</p>
-
-<p>Irssi does not support socks proxy natively.</p>
+<p>Irssi can be compiled with socks support (<code>--with-socks</code> option to configure), which requires “dante” and routes all connections through the proxy specified in the system-wide /etc/socks.conf. This method is known to have issues in Mac OS X.</p>

 <p>Note that <code>/SET proxy</code> settings don’t have anything to do with socks.</p>

+<p>Using <a href="https://github.com/rofl0r/proxychains-ng">proxychains-ng</a> is recommended over recompiling irssi.</p>
+
 <p><strong>Others</strong></p>

 <p>IRC bouncers usually work like IRC servers, and want a password. You can give it with:</p>
--- a/docs/startup-HOWTO.txt
+++ b/docs/startup-HOWTO.txt
@ -578,12 +578,15 @@ Irssi proxy works fine with other IRC clients as well.

 SOCKS

-Using [4]proxychains-ng is recommended for using irssi with a socks proxy.
-
-Irssi does not support socks proxy natively.
+Irssi can be compiled with socks support (--with-socks option to configure),
+which requires “dante” and routes all connections through the proxy specified
+in the system-wide /etc/socks.conf. This method is known to have issues in Mac
+OS X.

 Note that /SET proxy settings don’t have anything to do with socks.

+Using [4]proxychains-ng is recommended over recompiling irssi.
+
 Others

 IRC bouncers usually work like IRC servers, and want a password. You can give
--- a/irssi-1.pc.in
+++ b/irssi-1.pc.in
@ -0,0 +1,20 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+prog_libs="@PROG_LIBS@"
+common_libs="@COMMON_LIBS@"
+
+perl_link_libs="@PERL_LINK_LIBS@"
+perl_fe_link_libs="@PERL_FE_LINK_LIBS@"
+perl_link_flags="@PERL_LINK_FLAGS@"
+
+chat_modules="@CHAT_MODULES@"
+irc_modules="@irc_MODULES@"
+
+Name: Irssi
+Description: Irssi chat client
+Version: @PACKAGE_VERSION@
+Cflags: -I${includedir} @OPENSSL_CFLAGS@
+Requires: glib-2.0
--- a/m4/glib-2.0.m4
+++ b/m4/glib-2.0.m4
@ -0,0 +1,208 @@
+# Configure paths for GLIB
+# Owen Taylor     1997-2001
+
+dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or 
+dnl gthread is specified in MODULES, pass to pkg-config
+dnl
+AC_DEFUN([AM_PATH_GLIB_2_0],
+[dnl 
+dnl Get the cflags and libraries from pkg-config
+dnl
+AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run a test GLIB program],
+		    , enable_glibtest=yes)
+
+  pkg_config_args=glib-2.0
+  for module in . $4
+  do
+      case "$module" in
+         gmodule) 
+             pkg_config_args="$pkg_config_args gmodule-2.0"
+         ;;
+         gmodule-no-export) 
+             pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
+         ;;
+         gobject) 
+             pkg_config_args="$pkg_config_args gobject-2.0"
+         ;;
+         gthread) 
+             pkg_config_args="$pkg_config_args gthread-2.0"
+         ;;
+      esac
+  done
+
+  PKG_PROG_PKG_CONFIG([0.7])
+
+  no_glib=""
+
+  if test "x$PKG_CONFIG" = x ; then
+    no_glib=yes
+    PKG_CONFIG=no
+  fi
+
+  min_glib_version=ifelse([$1], ,2.0.0,$1)
+  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
+
+  if test "x$PKG_CONFIG" != xno ; then
+    ## don't try to run the test against uninstalled libtool libs
+    if $PKG_CONFIG --uninstalled $pkg_config_args; then
+	  echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
+	  enable_glibtest=no
+    fi
+
+    if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
+	  :
+    else
+	  no_glib=yes
+    fi
+  fi
+
+  if test x"$no_glib" = x ; then
+    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
+    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+
+    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
+    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
+    glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_glibtest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GLIB_CFLAGS"
+      LIBS="$GLIB_LIBS $LIBS"
+dnl
+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
+dnl checks the results of pkg-config to some extent)
+dnl
+      rm -f conf.glibtest
+      AC_TRY_RUN([
+#include <glib.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int 
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  system ("touch conf.glibtest");
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_glib_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_glib_version");
+     exit(1);
+   }
+
+  if ((glib_major_version != $glib_config_major_version) ||
+      (glib_minor_version != $glib_config_minor_version) ||
+      (glib_micro_version != $glib_config_micro_version))
+    {
+      printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
+             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
+             glib_major_version, glib_minor_version, glib_micro_version);
+      printf ("*** was found! If pkg-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
+      printf("*** to point to the correct configuration files\n");
+    } 
+  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
+	   (glib_minor_version != GLIB_MINOR_VERSION) ||
+           (glib_micro_version != GLIB_MICRO_VERSION))
+    {
+      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
+	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+	     glib_major_version, glib_minor_version, glib_micro_version);
+    }
+  else
+    {
+      if ((glib_major_version > major) ||
+        ((glib_major_version == major) && (glib_minor_version > minor)) ||
+        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
+               glib_major_version, glib_minor_version, glib_micro_version);
+        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
+	       major, minor, micro);
+        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
+        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_glib" = x ; then
+     AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$PKG_CONFIG" = "no" ; then
+       echo "*** A new enough version of pkg-config was not found."
+       echo "*** See http://www.freedesktop.org/software/pkgconfig/"
+     else
+       if test -f conf.glibtest ; then
+        :
+       else
+          echo "*** Could not run GLIB test program, checking why..."
+          ac_save_CFLAGS="$CFLAGS"
+          ac_save_LIBS="$LIBS"
+          CFLAGS="$CFLAGS $GLIB_CFLAGS"
+          LIBS="$LIBS $GLIB_LIBS"
+          AC_TRY_LINK([
+#include <glib.h>
+#include <stdio.h>
+],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
+          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occurred. This usually means GLIB is incorrectly installed."])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GLIB_CFLAGS=""
+     GLIB_LIBS=""
+     GLIB_GENMARSHAL=""
+     GOBJECT_QUERY=""
+     GLIB_MKENUMS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GLIB_CFLAGS)
+  AC_SUBST(GLIB_LIBS)
+  AC_SUBST(GLIB_GENMARSHAL)
+  AC_SUBST(GOBJECT_QUERY)
+  AC_SUBST(GLIB_MKENUMS)
+  rm -f conf.glibtest
+])
--- a/m4/glibtests.m4
+++ b/m4/glibtests.m4
@ -0,0 +1,28 @@
+dnl GLIB_TESTS
+dnl
+
+AC_DEFUN([GLIB_TESTS],
+[
+  AC_ARG_ENABLE(installed-tests,
+                AS_HELP_STRING([--enable-installed-tests],
+                               [Enable installation of some test cases]),
+                [case ${enableval} in
+                  yes) ENABLE_INSTALLED_TESTS="1"  ;;
+                  no)  ENABLE_INSTALLED_TESTS="" ;;
+                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-installed-tests]) ;;
+                 esac])
+  AM_CONDITIONAL([ENABLE_INSTALLED_TESTS], test "$ENABLE_INSTALLED_TESTS" = "1")
+  AC_ARG_ENABLE(always-build-tests,
+                AS_HELP_STRING([--enable-always-build-tests],
+                               [Enable always building tests during 'make all']),
+                [case ${enableval} in
+                  yes) ENABLE_ALWAYS_BUILD_TESTS="1"  ;;
+                  no)  ENABLE_ALWAYS_BUILD_TESTS="" ;;
+                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-always-build-tests]) ;;
+                 esac])
+  AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], test "$ENABLE_ALWAYS_BUILD_TESTS" = "1")
+  if test "$ENABLE_INSTALLED_TESTS" = "1"; then
+    AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME)
+    AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME)
+  fi
+])
--- a/m4/libgcrypt.m4
+++ b/m4/libgcrypt.m4
@ -0,0 +1,143 @@
+# libgcrypt.m4 - Autoconf macros to detect libgcrypt
+# Copyright (C) 2002, 2003, 2004, 2011, 2014 g10 Code GmbH
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This file is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Last-changed: 2014-10-02
+
+
+dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
+dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
+dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
+dnl with the API version to also check the API compatibility. Example:
+dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
+dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1.  Using
+dnl this features allows to prevent build against newer versions of libgcrypt
+dnl with a changed API.
+dnl
+dnl If a prefix option is not used, the config script is first
+dnl searched in $SYSROOT/bin and then along $PATH.  If the used
+dnl config script does not match the host specification the script
+dnl is added to the gpg_config_script_warn variable.
+dnl
+AC_DEFUN([AM_PATH_LIBGCRYPT],
+[ AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_ARG_WITH(libgcrypt-prefix,
+            AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
+                           [prefix where LIBGCRYPT is installed (optional)]),
+     libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
+  if test x"${LIBGCRYPT_CONFIG}" = x ; then
+     if test x"${libgcrypt_config_prefix}" != x ; then
+        LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config"
+     else
+       case "${SYSROOT}" in
+         /*)
+           if test -x "${SYSROOT}/bin/libgcrypt-config" ; then
+             LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config"
+           fi
+           ;;
+         '')
+           ;;
+          *)
+           AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
+           ;;
+       esac
+     fi
+  fi
+
+  AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
+  tmp=ifelse([$1], ,1:1.2.0,$1)
+  if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
+     req_libgcrypt_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
+     min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
+  else
+     req_libgcrypt_api=0
+     min_libgcrypt_version="$tmp"
+  fi
+
+  AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version)
+  ok=no
+  if test "$LIBGCRYPT_CONFIG" != "no" ; then
+    req_major=`echo $min_libgcrypt_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+    req_minor=`echo $min_libgcrypt_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
+    req_micro=`echo $min_libgcrypt_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+    libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
+    major=`echo $libgcrypt_config_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
+    minor=`echo $libgcrypt_config_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
+    micro=`echo $libgcrypt_config_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
+    if test "$major" -gt "$req_major"; then
+        ok=yes
+    else
+        if test "$major" -eq "$req_major"; then
+            if test "$minor" -gt "$req_minor"; then
+               ok=yes
+            else
+               if test "$minor" -eq "$req_minor"; then
+                   if test "$micro" -ge "$req_micro"; then
+                     ok=yes
+                   fi
+               fi
+            fi
+        fi
+    fi
+  fi
+  if test $ok = yes; then
+    AC_MSG_RESULT([yes ($libgcrypt_config_version)])
+  else
+    AC_MSG_RESULT(no)
+  fi
+  if test $ok = yes; then
+     # If we have a recent libgcrypt, we should also check that the
+     # API is compatible
+     if test "$req_libgcrypt_api" -gt 0 ; then
+        tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
+        if test "$tmp" -gt 0 ; then
+           AC_MSG_CHECKING([LIBGCRYPT API version])
+           if test "$req_libgcrypt_api" -eq "$tmp" ; then
+             AC_MSG_RESULT([okay])
+           else
+             ok=no
+             AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp])
+           fi
+        fi
+     fi
+  fi
+  if test $ok = yes; then
+    LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
+    LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
+    ifelse([$2], , :, [$2])
+    libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
+    if test x"$libgcrypt_config_host" != xnone ; then
+      if test x"$libgcrypt_config_host" != x"$host" ; then
+  AC_MSG_WARN([[
+***
+*** The config script $LIBGCRYPT_CONFIG was
+*** built for $libgcrypt_config_host and thus may not match the
+*** used host $host.
+*** You may want to use the configure option --with-libgcrypt-prefix
+*** to specify a matching config script or use \$SYSROOT.
+***]])
+        gpg_config_script_warn="$gpg_config_script_warn libgcrypt"
+      fi
+    fi
+  else
+    LIBGCRYPT_CFLAGS=""
+    LIBGCRYPT_LIBS=""
+    ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(LIBGCRYPT_CFLAGS)
+  AC_SUBST(LIBGCRYPT_LIBS)
+])
--- a/m4/libotr.m4
+++ b/m4/libotr.m4
@ -0,0 +1,134 @@
+dnl
+dnl  Off-the-Record Messaging library
+dnl  Copyright (C) 2004-2007  Ian Goldberg, Chris Alexander, Nikita Borisov
+dnl                           <otr@cypherpunks.ca>
+dnl
+dnl  This library is free software; you can redistribute it and/or
+dnl  modify it under the terms of version 2.1 of the GNU Lesser General
+dnl  Public License as published by the Free Software Foundation.
+dnl
+dnl  This library is distributed in the hope that it will be useful,
+dnl  but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl  Lesser General Public License for more details.
+dnl
+dnl  You should have received a copy of the GNU Lesser General Public
+dnl  License along with this library; if not, write to the Free Software
+dnl  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+
+dnl AM_PATH_LIBOTR([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for libotr, and define LIBOTR_CFLAGS and LIBOTR_LIBS as appropriate.
+dnl enables arguments --with-libotr-prefix=
+dnl                   --with-libotr-inc-prefix=
+dnl
+dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT
+dnl
+dnl Adapted from alsa.m4, originally by
+dnl      Richard Boulton <richard-alsa@tartarus.org>
+dnl      Christopher Lansdown <lansdoct@cs.alfred.edu>
+dnl      Jaroslav Kysela <perex@suse.cz>
+
+AC_DEFUN([AM_PATH_LIBOTR],
+[dnl Save the original CFLAGS, LDFLAGS, and LIBS
+libotr_save_CFLAGS="$CFLAGS"
+libotr_save_LDFLAGS="$LDFLAGS"
+libotr_save_LIBS="$LIBS"
+libotr_found=yes
+
+dnl
+dnl Get the cflags and libraries for libotr
+dnl
+AC_ARG_WITH(libotr-prefix,
+[  --with-libotr-prefix=PFX  Prefix where libotr is installed(optional)],
+[libotr_prefix="$withval"], [libotr_prefix=""])
+
+AC_ARG_WITH(libotr-inc-prefix,
+[  --with-libotr-inc-prefix=PFX  Prefix where libotr includes are (optional)],
+[libotr_inc_prefix="$withval"], [libotr_inc_prefix=""])
+
+dnl Add any special include directories
+AC_MSG_CHECKING(for libotr CFLAGS)
+if test "$libotr_inc_prefix" != "" ; then
+	LIBOTR_CFLAGS="$LIBOTR_CFLAGS -I$libotr_inc_prefix"
+	CFLAGS="$CFLAGS $LIBOTR_CFLAGS"
+fi
+AC_MSG_RESULT($LIBOTR_CFLAGS)
+
+dnl add any special lib dirs
+AC_MSG_CHECKING(for libotr LIBS)
+if test "$libotr_prefix" != "" ; then
+	LIBOTR_LIBS="$LIBOTR_LIBS -L$libotr_prefix"
+	LDFLAGS="$LDFLAGS $LIBOTR_LIBS"
+fi
+
+dnl add the libotr library
+LIBOTR_LIBS="$LIBOTR_LIBS -lotr"
+LIBS="$LIBOTR_LIBS $LIBS"
+AC_MSG_RESULT($LIBOTR_LIBS)
+
+dnl Check for a working version of libotr that is of the right version.
+min_libotr_version=ifelse([$1], ,3.0.0,$1)
+no_libotr=""
+    libotr_min_major_version=`echo $min_libotr_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    libotr_min_minor_version=`echo $min_libotr_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    libotr_min_sub_version=`echo $min_libotr_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+AC_MSG_CHECKING(for libotr headers version $libotr_min_major_version.x >= $min_libotr_version)
+
+AC_LANG_SAVE
+AC_LANG_C
+AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <libotr/version.h>
+], [
+#  if(OTRL_VERSION_MAJOR != $libotr_min_major_version)
+#    error not present
+#  else
+
+#    if(OTRL_VERSION_MINOR > $libotr_min_minor_version)
+       exit(0);
+#    else
+#      if(OTRL_VERSION_MINOR < $libotr_min_minor_version)
+#        error not present
+#      endif
+
+#      if(OTRL_VERSION_SUB < $libotr_min_sub_version)
+#        error not present
+#      endif
+#    endif
+#  endif
+exit(0);
+],
+  [AC_MSG_RESULT(found.)],
+  [AC_MSG_RESULT(not present.)
+   ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr not found.)])
+   libotr_found=no]
+)
+AC_LANG_RESTORE
+
+dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.
+AC_CHECK_LIB([otr], [otrl_message_receiving],,
+	[ifelse([$3], , [AC_MSG_ERROR(No linkable libotr was found.)])
+	 libotr_found=no],
+	 $LIBGCRYPT_LIBS
+)
+
+LDFLAGS="$libotr_save_LDFLAGS"
+LIBS="$libotr_save_LIBS"
+
+if test "x$libotr_found" = "xyes" ; then
+   ifelse([$2], , :, [$2])
+else
+   LIBOTR_CFLAGS=""
+   LIBOTR_LIBS=""
+   ifelse([$3], , :, [$3])
+fi
+
+dnl That should be it.  Now just export our symbols:
+AC_SUBST(LIBOTR_CFLAGS)
+AC_SUBST(LIBOTR_LIBS)
+])
+
--- a/m4/pkg.m4
+++ b/m4/pkg.m4
@ -0,0 +1,275 @@
+# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+# serial 12 (pkg-config-0.29.2)
+
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29.2])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])dnl PKG_PROG_PKG_CONFIG
+
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])dnl _PKG_CONFIG
+
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
+
+
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $2])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+        AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+        AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])dnl PKG_CHECK_MODULES
+
+
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_INSTALLDIR
+
+
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_NOARCH_INSTALLDIR
+
+
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])dnl PKG_CHECK_VAR
--- a/meson.build
+++ b/meson.build
@ -1,13 +1,12 @@
 project('irssi', 'c',
-  version : '1.5-head',
-  meson_version : '>=0.53',
+  version : '1.4.3',
+  meson_version : '>=0.49',
  default_options : ['warning_level=1'])

 ############################
 ############################

-glib_internal_version = 'glib-2.74.3' # keep this in sync with subprojects/glib.wrap
-glib_pcre2_internal_version = 'pcre2-10.40'
+glib_internal_version = 'glib-2.58.3' # keep this in sync with subprojects/glib.wrap
 cc = meson.get_compiler('c')
 rootinc = include_directories('.')
 dep = []
@ -33,6 +32,8 @@ want_fuzzer         = get_option('with-fuzzer') == 'yes'
 fuzzer_lib          = get_option('with-fuzzer-lib')
 fuzzer_link_language = get_option('fuzzer-link-language')
 want_proxy          = get_option('with-proxy') == 'yes'
+want_truecolor      = get_option('enable-true-color') == 'yes'
+want_gregex         = get_option('disable-gregex') != 'yes'

 require_capsicum    = get_option('with-capsicum') == 'yes'
 want_capsicum       = get_option('with-capsicum') != 'no'
@ -54,20 +55,15 @@ want_static_dependency = get_option('static-dependency') == 'yes'

 package_version     = get_option('PACKAGE_VERSION') != '' ? get_option('PACKAGE_VERSION') : meson.project_version()

-fs = import('fs')
-if fs.exists('config.status') or fs.exists('irssi-version.h') or fs.exists('default-config.h') or fs.exists('default-theme.h') or fs.exists('src/perl/irssi-core.pl.h') or fs.exists('src/perl/perl-signals-list.h') or fs.exists('irssi-config.h')
-  error('this tree has been configured with autotools, cannot proceed')
-endif
-
 UNSET = '=INVALID='
 UNSET_ARR = [UNSET]

 chat_modules = ['irc']

-run_command('mkdir', meson.current_build_dir() / incdir, check : false)
-run_command('ln', '-s', meson.current_source_dir() / 'src', meson.current_build_dir() / incdir, check : false)
-run_command('ln', '-s', meson.current_build_dir() / 'irssi-config.h', meson.current_build_dir() / incdir, check : false)
-run_command('ln', '-s', meson.current_build_dir() / 'irssi-version.h', meson.current_build_dir() / incdir, check : false)
+run_command('mkdir', meson.current_build_dir() / incdir)
+run_command('ln', '-s', meson.current_source_dir() / 'src', meson.current_build_dir() / incdir)
+run_command('ln', '-s', meson.current_build_dir() / 'irssi-config.h', meson.current_build_dir() / incdir)
+run_command('ln', '-s', meson.current_build_dir() / 'irssi-version.h', meson.current_build_dir() / incdir)

 def_moduledir  = '-D' + 'MODULEDIR'  + '="' + (get_option('prefix') / moduledir) + '"'
 def_sysconfdir = '-D' + 'SYSCONFDIR' + '="' + (get_option('prefix') / get_option('sysconfdir')) + '"'
@ -77,16 +73,6 @@ def_scriptdir  = '-D' + 'SCRIPTDIR'  + '="' + (get_option('prefix') / scriptdir)

 def_suppress_printf_fallback = '-D' + 'SUPPRESS_PRINTF_FALLBACK'

-
-module_suffix = []
-perl_module_suffix = []
-# Meson uses the wrong module extensions on Mac.
-# https://gitlab.gnome.org/GNOME/glib/issues/520
-if ['darwin', 'ios'].contains(host_machine.system())
-  module_suffix = 'so'
-  perl_module_suffix = 'bundle'
-endif
-
 ##############
 # Help files #
 ##############
@ -97,7 +83,7 @@ if meson.is_cross_build()
 else
  cross_perl = build_perl
 endif
-run_command(build_perl, files('utils/syntax.pl'), check : true)
+run_command(build_perl, files('utils/syntax.pl'))

 ###################
 # irssi-version.h #
@ -249,7 +235,7 @@ if not glib_dep.found()
  glib_internal_configure_t = custom_target('glib-internal-configure',
    command : [ meson_cmd, 'setup', '--prefix=/irssi-glib-internal',
      '--buildtype=' + get_option('buildtype'),
-      '-Dlibmount=disabled', '-Dselinux=disabled', '-Ddefault_library=static', '-Dforce_fallback_for=pcre2',
+      '-Dlibmount=false', '-Dselinux=false', '-Ddefault_library=static', '-Dinternal_pcre=true',
      glib_internal_configure_args,
      (meson.current_build_dir() / 'build-subprojects' / 'glib'),
      (meson.current_source_dir() / 'subprojects' / glib_internal_version) ],
@ -258,7 +244,6 @@ if not glib_dep.found()
    depends : glib_internal_download_t,)
  glib_internal_build_t = custom_target('glib-internal-build',
    command : [ ninja, '-C', meson.current_build_dir() / 'build-subprojects' / 'glib',
-      'subprojects' / glib_pcre2_internal_version / 'libpcre2-8.a',
      'glib' / 'libglib-2.0.a',
      'gmodule' / 'libgmodule-2.0.a'],
    console : true,
@ -272,10 +257,7 @@ if not glib_dep.found()
      '-isystem' + (meson.current_source_dir() / 'subprojects' / glib_internal_version),
      '-isystem' + (meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib'),
    ],
-    link_args : [
-      meson.current_build_dir() / 'build-subprojects' / 'glib' / 'subprojects' / glib_pcre2_internal_version / 'libpcre2-8.a',
-      meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib' / 'libglib-2.0.a',
-    ],
+    link_args : [ meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib' / 'libglib-2.0.a' ],
  )
  built_src += glib_internal_build_t
  libdl_dep = []
@ -354,7 +336,7 @@ if want_perl
  #### ccopts ####
  perl_ccopts = meson.get_cross_property('perl_ccopts', UNSET_ARR)
  if perl_ccopts == UNSET_ARR
-    res = run_command(cross_perl, '-MExtUtils::Embed', '-e', 'ccopts', check : true)
+    res = run_command(cross_perl, '-MExtUtils::Embed', '-e', 'ccopts')
    perl_ccopts = res.stdout().strip().split()
  endif
  foreach fl : perl_ccopts
@ -371,7 +353,7 @@ if want_perl
  #### ldopts ####
  perl_ldopts = meson.get_cross_property('perl_ldopts', UNSET_ARR)
  if perl_ldopts == UNSET_ARR
-    res = run_command(cross_perl, '-MExtUtils::Embed', '-e', 'ldopts', check : true)
+    res = run_command(cross_perl, '-MExtUtils::Embed', '-e', 'ldopts')
    perl_ldopts = res.stdout().strip().split()
  endif
  skip_libs = ['-ldb', '-ldbm', '-lndbm', '-lgdbm', '-lc', '-lposix', '-rdynamic']
@ -388,12 +370,7 @@ if want_perl

  perl_version = meson.get_cross_property('perl_version', UNSET)
  if perl_version == UNSET
-    perl_version = run_command(cross_perl, '-V::version:', check : true).stdout().split('\'')[1]
-  endif
-
-  # disable clang warning
-  if perl_version.version_compare('<5.35.2')
-    perl_cflags += cc.get_supported_arguments('-Wno-compound-token-split-by-macro')
+    perl_version = run_command(cross_perl, '-V::version:').stdout().split('\'')[1]
  endif
  perl_dep = declare_dependency(compile_args : perl_cflags, link_args : perl_ldflags,
    version : perl_version)
@ -417,7 +394,7 @@ int main()
  else
    xsubpp_file_c = meson.get_cross_property('perl_xsubpp', UNSET)
    if xsubpp_file_c == UNSET
-      xsubpp_file_c = run_command(build_perl, '-MExtUtils::ParseXS', '-e($r = $INC{"ExtUtils/ParseXS.pm"}) =~ s{ParseXS\\.pm$}{xsubpp}; print $r', check : true).stdout()
+      xsubpp_file_c = run_command(build_perl, '-MExtUtils::ParseXS', '-Eprint $INC{"ExtUtils/ParseXS.pm"} =~ s{ParseXS\\.pm$}{xsubpp}r').stdout()
    endif
    xsubpp = generator(build_perl,
      output : '@BASENAME@.c',
@ -427,7 +404,7 @@ int main()
    xsubpp_file = files(xsubpp_file_c)

    if with_perl_lib == 'module'
-      perl_install_base = run_command(build_perl, '-MText::ParseWords=shellwords', '-e', 'grep { s/^INSTALL_BASE=// && print && exit } shellwords $ENV{PERL_MM_OPT}', check : true).stdout()
+      perl_install_base = run_command(build_perl, '-MText::ParseWords=shellwords', '-e', 'grep { s/^INSTALL_BASE=// && print && exit } shellwords $ENV{PERL_MM_OPT}').stdout()
      if perl_install_base == ''
        with_perl_lib = ''
      endif
@ -446,12 +423,12 @@ int main()
      if with_perl_lib in ['site', 'vendor']
        perlmoddir = meson.get_cross_property('perl_install' + with_perl_lib + 'arch', UNSET)
        if perlmoddir == UNSET
-          perlmoddir = run_command(cross_perl, '-V::install' + with_perl_lib + 'arch:', check : true).stdout().split('\'')[1]
+          perlmoddir = run_command(cross_perl, '-V::install' + with_perl_lib + 'arch:').stdout().split('\'')[1]
        endif
      elif with_perl_lib == 'module'
        perl_archname = meson.get_cross_property('perl_archname', UNSET)
        if perl_archname == UNSET
-          perl_archname = run_command(cross_perl, '-V::archname:', check : true).stdout().split('\'')[1]
+          perl_archname = run_command(cross_perl, '-V::archname:').stdout().split('\'')[1]
        endif
        perlmoddir = perl_install_base / 'lib' / 'perl5' / perl_archname
      endif
@ -472,7 +449,7 @@ int main()
    if set_perl_use_lib
      perl_inc = meson.get_cross_property('perl_inc', UNSET_ARR)
      if perl_inc == UNSET_ARR
-        set_perl_use_lib = run_command(cross_perl, '-e', 'exit ! grep $_ eq $ARGV[0], grep /^\\//, @INC', perl_use_lib, check : false).returncode() != 0
+        set_perl_use_lib = run_command(cross_perl, '-e', 'exit ! grep $_ eq $ARGV[0], grep /^\\//, @INC', perl_use_lib).returncode() != 0
      else
        set_perl_use_lib = not perl_inc.contains(perl_use_lib)
      endif
@ -549,8 +526,9 @@ conf = configuration_data()

 conf.set('HAVE_CAPSICUM', have_capsicum, description : 'Build with Capsicum support')
 conf.set('HAVE_GMODULE', true)
-conf.set('TERM_TRUECOLOR', true)
-conf.set('USE_GREGEX', true)
+conf.set('HAVE_SOCKS', false, description : 'Build with socks support')
+conf.set('TERM_TRUECOLOR', want_truecolor, description : 'true color support in terminal')
+conf.set('USE_GREGEX', want_gregex, description : 'use GRegex for regular expressions')
 conf.set10('_DARWIN_USE_64_BIT_INODE', true, description : 'Enable large inode numbers on Mac OS X 10.5.')
 conf.set_quoted('FHS_PREFIX', get_option('fhs-prefix'))

@ -569,28 +547,6 @@ foreach h : headers
  endif
 endforeach

-if want_textui and conf.get('HAVE_TERM_H', 0) == 1
-  if not cc.links('''
-#include <stdio.h>
-#include <term.h>
-int main () {
-  return tputs("x", 1, putchar);
-}
-''', dependencies : textui_dep)
-    if cc.has_header('curses.h') and cc.links('''
-#include <curses.h>
-#include <term.h>
-int main () {
-  return tputs("x", 1, putchar);
-}
-''', dependencies : textui_dep, name : 'working Curses')
-      conf.set('NEED_CURSES_H', 1, description : 'tputs needs curses.h')
-    else
-      error('could not link terminfo')
-    endif
-  endif
-endif
-
 conf.set('HAVE_LIBUTF8PROC', have_libutf8proc)
 conf.set_quoted('PACKAGE_VERSION', package_version)
 conf.set_quoted('PACKAGE_TARNAME', meson.project_name())
@ -633,26 +589,12 @@ pc_requires = []
 if not glib_internal
  pc_requires += glib_dep
 endif
-signalsfile = docdir / 'signals.txt'
-if signalsfile.startswith('/')
-  signalsfile = signalsfile.split(get_option('prefix'))
-  if signalsfile[0] == ''
-    signalsfile = '${prefix}' + signalsfile[1]
-  else
-    signalsfile = signalsfile[0]
-  endif
-else
-  signalsfile = '${prefix}' / signalsfile
-endif
 pc.generate(filebase : 'irssi-1',
  name : 'Irssi',
  description : 'Irssi chat client',
  version : package_version,
  requires : pc_requires,
-  variables : [
-    'irssimoduledir=${libdir}' / incdir / 'modules',
-    'signalsfile=' + signalsfile
-  ])
+  variables : ['irssimoduledir=${libdir}' / incdir / 'modules'])

 ###########
 # irssi.1 #
@ -692,6 +634,8 @@ if have_perl
 endif
 message('Install prefix ................... : ' + get_option('prefix'))
 message('')
+message('Building with true color support.. : ' + want_truecolor.to_string('yes', 'no'))
+message('Building with GRegex ............. : ' + want_gregex.to_string('yes', 'no'))
 message('Building with Capsicum ........... : ' + have_capsicum.to_string('yes', 'no'))
 message('Building with utf8proc ........... : ' + have_libutf8proc.to_string('yes', 'no'))
 message('Building with OTR support ........ : ' + have_otr.to_string('yes', 'no'))
--- a/meson_options.txt
+++ b/meson_options.txt
@ -7,6 +7,8 @@ option('with-proxy',        type : 'combo',  description : 'Build irssi-proxy',
 option('with-perl-lib',     type : 'string', description : 'Specify where to install the Perl libraries for Irssi')
 option('with-perl',         type : 'combo',  description : 'Build with Perl support',                     choices : ['auto', 'yes', 'no'])
 option('with-otr',          type : 'combo',  description : 'Build with OTR support',                      choices : ['auto', 'yes', 'no'])
+option('enable-true-color', type : 'combo',  description : 'Build with true color support in terminal',   choices : ['no', 'yes'])
+option('disable-gregex',    type : 'combo',  description : 'Build without GRegex (fall back to regex.h)', choices : ['no', 'yes'])
 option('disable-utf8proc',  type : 'combo',  description : 'Build without Julia\'s utf8proc',             choices : ['auto', 'yes', 'no'])
 option('with-capsicum',     type : 'combo',  description : 'Build with Capsicum support',                 choices : ['auto', 'yes', 'no'])
 option('static-dependency', type : 'combo',  description : 'Request static dependencies',                 choices : ['no', 'yes'])
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@ -0,0 +1,18 @@
+SUBDIRS = examples
+
+scriptdir = $(datadir)/irssi/scripts
+
+script_DATA = \
+	autoop.pl \
+	autorejoin.pl \
+	buf.pl \
+	dns.pl \
+	kills.pl \
+	mail.pl \
+	mlock.pl \
+	quitmsg.pl \
+	scriptassist.pl \
+	usercount.pl
+
+EXTRA_DIST = $(script_DATA) \
+	meson.build
--- a/scripts/examples/Makefile.am
+++ b/scripts/examples/Makefile.am
@ -0,0 +1,8 @@
+scriptdir = $(datadir)/irssi/scripts
+
+script_DATA = \
+	command.pl \
+	msg-event.pl \
+	redirect.pl
+
+EXTRA_DIST = $(script_DATA)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -0,0 +1,27 @@
+if BUILD_TEXTUI
+TEXTUI=fe-text
+endif
+
+if BUILD_IRSSIBOT
+BOTUI=fe-none
+endif
+
+if BUILD_IRSSIFUZZER
+FUZZERUI=fe-fuzz
+endif
+
+if HAVE_PERL
+PERLDIR=perl
+endif
+
+if HAVE_OTR
+OTRDIR=otr
+endif
+
+pkginc_srcdir=$(pkgincludedir)/src
+pkginc_src_HEADERS = \
+	common.h
+
+SUBDIRS = lib-config core irc fe-common $(PERLDIR) $(OTRDIR) $(TEXTUI) $(BOTUI) $(FUZZERUI)
+
+EXTRA_DIST = meson.build
--- a/src/common.h
+++ b/src/common.h
@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */

-#define IRSSI_ABI_VERSION 56
+#define IRSSI_ABI_VERSION 46

 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
@ -37,7 +37,9 @@
 #include <fcntl.h>

 #include <glib.h>
-#include <gmodule.h>
+#ifdef HAVE_GMODULE
+#  include <gmodule.h>
+#endif

 typedef guint64 uoff_t;
 #define PRIuUOFF_T G_GUINT64_FORMAT
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@ -0,0 +1,122 @@
+noinst_LIBRARIES = libcore.a
+
+AM_CPPFLAGS = \
+	-I$(top_builddir) \
+	$(GLIB_CFLAGS) \
+	-DSYSCONFDIR=\""$(sysconfdir)"\" \
+	-DMODULEDIR=\""$(libdir)/irssi/modules"\"
+
+if USE_GREGEX
+regex_impl=iregex-gregex.c
+else
+regex_impl=iregex-regexh.c
+endif
+
+libcore_a_SOURCES = \
+	args.c \
+	channels.c \
+	channels-setup.c \
+	commands.c \
+	chat-commands.c \
+	chat-protocols.c \
+	chatnets.c \
+	core.c \
+	expandos.c \
+        ignore.c \
+        levels.c \
+	line-split.c \
+	log.c \
+	log-away.c \
+	masks.c \
+	misc.c \
+	modules.c \
+	modules-load.c \
+	net-disconnect.c \
+	net-nonblock.c \
+	net-sendbuffer.c \
+	network.c \
+	network-openssl.c \
+	nicklist.c \
+	nickmatch-cache.c \
+	pidwait.c \
+	queries.c \
+	rawlog.c \
+	recode.c \
+	refstrings.c \
+	servers.c \
+	servers-reconnect.c \
+	servers-setup.c \
+	session.c \
+	settings.c \
+	signals.c \
+	special-vars.c \
+	utf8.c \
+	$(regex_impl) \
+	wcwidth.c \
+	wcwidth-wrapper.c \
+	tls.c \
+	write-buffer.c
+
+if HAVE_CAPSICUM
+libcore_a_SOURCES += \
+	capsicum.c
+endif
+
+structure_headers = \
+	channel-rec.h \
+	channel-setup-rec.h \
+	chatnet-rec.h \
+	query-rec.h \
+	server-rec.h \
+	server-setup-rec.h \
+	server-connect-rec.h \
+	window-item-rec.h
+
+pkginc_coredir=$(pkgincludedir)/src/core
+pkginc_core_HEADERS = \
+	args.h \
+	capsicum.h \
+	channels.h \
+	channels-setup.h \
+	commands.h \
+	chat-protocols.h \
+	chatnets.h \
+	core.h \
+	expandos.h \
+        ignore.h \
+        levels.h \
+	line-split.h \
+	log.h \
+	masks.h \
+	misc.h \
+	module.h \
+	modules.h \
+	modules-load.h \
+	net-disconnect.h \
+	net-nonblock.h \
+	net-sendbuffer.h \
+	network.h \
+	network-openssl.h \
+	nick-rec.h \
+	nicklist.h \
+	nickmatch-cache.h \
+	pidwait.h \
+	queries.h \
+	rawlog.h \
+	recode.h \
+	refstrings.h \
+	servers.h \
+	servers-reconnect.h \
+	servers-setup.h \
+	session.h \
+	settings.h \
+	signals.h \
+	special-vars.h \
+	utf8.h \
+	iregex.h \
+	window-item-def.h \
+	tls.h \
+	write-buffer.h \
+	$(structure_headers)
+
+EXTRA_DIST = meson.build
--- a/src/core/channels-setup.c
+++ b/src/core/channels-setup.c
@ -227,7 +227,8 @@ void channels_setup_init(void)
        setupchannels = NULL;
 	source_host_ok = FALSE;

-	signal_add("setup reread channels", (SIGNAL_FUNC) channels_read_config);
+        signal_add("setup reread", (SIGNAL_FUNC) channels_read_config);
+        signal_add("irssi init read settings", (SIGNAL_FUNC) channels_read_config);
 }

 void channels_setup_deinit(void)
@ -235,5 +236,6 @@ void channels_setup_deinit(void)
 	while (setupchannels != NULL)
 		channel_setup_destroy(setupchannels->data);

-	signal_remove("setup reread channels", (SIGNAL_FUNC) channels_read_config);
+        signal_remove("setup reread", (SIGNAL_FUNC) channels_read_config);
+        signal_remove("irssi init read settings", (SIGNAL_FUNC) channels_read_config);
 }
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@ -30,7 +30,6 @@
 #include <irssi/src/core/servers-setup.h>
 #include <irssi/src/core/servers-reconnect.h>
 #include <irssi/src/core/channels.h>
-#include <irssi/src/core/chatnets.h>
 #include <irssi/src/core/queries.h>
 #include <irssi/src/core/window-item-def.h>
 #include <irssi/src/core/rawlog.h>
@ -92,7 +91,7 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
 		return NULL;
 	}

-	if (strchr(addr, '/') != NULL && chatnet_find(addr) == NULL)
+	if (strchr(addr, '/') != NULL)
 		conn->unix_socket = TRUE;

 	/* TLS options are handled in server_create_conn_opt ... -> server_setup_fill_optlist */
@ -212,8 +211,8 @@ static void cmd_server(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 	command_runsub("server", data, server, item);
 }

-/* SYNTAX: SERVER CONNECT [-4 | -6] [-tls | -notls] [-tls_cert <cert>] [-tls_pkey <pkey>]
-                  [-tls_pass <password>] [-tls_verify | -notls_verify] [-tls_cafile <cafile>]
+/* SYNTAX: SERVER CONNECT [-4 | -6] [-tls] [-tls_cert <cert>] [-tls_pkey <pkey>]
+                  [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>]
                  [-tls_capath <capath>] [-tls_ciphers <list>]
                  [-tls_pinned_cert <fingerprint>] [-tls_pinned_pubkey <fingerprint>]
                  [-!] [-noautosendcmd] [-nocap]
--- a/src/core/chat-protocols.c
+++ b/src/core/chat-protocols.c
@ -47,7 +47,7 @@ int chat_protocol_lookup(const char *name)
 	g_return_val_if_fail(name != NULL, -1);

 	rec = chat_protocol_find(name);
-	return rec == NULL ? -1 : rec->not_initialized ? CHAT_PROTOCOL_NOT_INITIALIZED : rec->id;
+	return rec == NULL ? -1 : rec->id;
 }

 CHAT_PROTOCOL_REC *chat_protocol_find(const char *name)
@ -99,22 +99,6 @@ CHAT_PROTOCOL_REC *chat_protocol_find_net(GHashTable *optlist)
 	return NULL;
 }

-static void chat_protocol_destroy(CHAT_PROTOCOL_REC *rec)
-{
-	g_return_if_fail(rec != NULL);
-
-	chat_protocols = g_slist_remove(chat_protocols, rec);
-
-	if (default_proto == rec) {
-		chat_protocol_set_default(chat_protocols == NULL ? NULL : chat_protocols->data);
-	}
-
-	signal_emit("chat protocol destroyed", 1, rec);
-
-	g_free(rec->name);
-	g_free(rec);
-}
-
 /* Register new chat protocol. */
 CHAT_PROTOCOL_REC *chat_protocol_register(CHAT_PROTOCOL_REC *rec)
 {
@ -124,11 +108,7 @@ CHAT_PROTOCOL_REC *chat_protocol_register(CHAT_PROTOCOL_REC *rec)
 	g_return_val_if_fail(rec != NULL, NULL);

 	newrec = chat_protocol_find(rec->name);
-	if (newrec != NULL && newrec->not_initialized) {
-		chat_protocol_destroy(newrec);
-		newrec = NULL;
-	}
-	created = newrec == NULL;
+        created = newrec == NULL;
 	if (newrec == NULL) {
 		newrec = g_new0(CHAT_PROTOCOL_REC, 1);
 		chat_protocols = g_slist_append(chat_protocols, newrec);
@ -151,6 +131,23 @@ CHAT_PROTOCOL_REC *chat_protocol_register(CHAT_PROTOCOL_REC *rec)
        return newrec;
 }

+static void chat_protocol_destroy(CHAT_PROTOCOL_REC *rec)
+{
+	g_return_if_fail(rec != NULL);
+
+	chat_protocols = g_slist_remove(chat_protocols, rec);
+
+	if (default_proto == rec) {
+		chat_protocol_set_default(chat_protocols == NULL ? NULL :
+					  chat_protocols->data);
+	}
+
+	signal_emit("chat protocol destroyed", 1, rec);
+
+	g_free(rec->name);
+	g_free(rec);
+}
+
 /* Unregister chat protocol. */
 void chat_protocol_unregister(const char *name)
 {
@ -194,6 +191,15 @@ static CHANNEL_SETUP_REC *create_channel_setup(void)
        return g_new0(CHANNEL_SETUP_REC, 1);
 }

+static SERVER_CONNECT_REC *create_server_connect(void)
+{
+        return g_new0(SERVER_CONNECT_REC, 1);
+}
+
+static void destroy_server_connect(SERVER_CONNECT_REC *conn)
+{
+}
+
 /* Return "unknown chat protocol" record. Used when protocol name is
   specified but it isn't registered yet. */
 CHAT_PROTOCOL_REC *chat_protocol_get_unknown(const char *name)
@ -212,10 +218,8 @@ CHAT_PROTOCOL_REC *chat_protocol_get_unknown(const char *name)
 	rec->create_chatnet = create_chatnet;
        rec->create_server_setup = create_server_setup;
        rec->create_channel_setup = create_channel_setup;
-	/*
 	rec->create_server_connect = create_server_connect;
 	rec->destroy_server_connect = destroy_server_connect;
-	*/

 	newrec = chat_protocol_register(rec);
 	g_free(rec);
--- a/src/core/chat-protocols.h
+++ b/src/core/chat-protocols.h
@ -35,8 +35,6 @@ void *chat_protocol_check_cast(void *object, int type_pos, const char *id);
 	((object) == NULL ? chat_protocol_get_default() : \
 	chat_protocol_find_id((object)->chat_type))

-#define CHAT_PROTOCOL_NOT_INITIALIZED -2
-
 /* Register new chat protocol. */
 CHAT_PROTOCOL_REC *chat_protocol_register(CHAT_PROTOCOL_REC *rec);

--- a/src/core/chatnets.c
+++ b/src/core/chatnets.c
@ -24,13 +24,12 @@
 #include <irssi/src/core/special-vars.h>
 #include <irssi/src/lib-config/iconfig.h>
 #include <irssi/src/core/settings.h>
-#include <irssi/src/core/misc.h>

 #include <irssi/src/core/chat-protocols.h>
 #include <irssi/src/core/chatnets.h>
 #include <irssi/src/core/servers.h>

-GSList *chatnets, *chatnets_unavailable; /* list of available chat networks */
+GSList *chatnets; /* list of available chat networks */

 static void chatnet_config_save(CHATNET_REC *chatnet)
 {
@ -61,9 +60,8 @@ static void chatnet_config_remove(CHATNET_REC *chatnet)
 void chatnet_create(CHATNET_REC *chatnet)
 {
 	g_return_if_fail(chatnet != NULL);
-	g_return_if_fail(!CHAT_PROTOCOL(chatnet)->not_initialized);

-	chatnet->type = module_get_uniq_id("CHATNET", 0);
+        chatnet->type = module_get_uniq_id("CHATNET", 0);
 	if (g_slist_find(chatnets, chatnet) == NULL)
 		chatnets = g_slist_append(chatnets, chatnet);

@ -114,21 +112,6 @@ CHATNET_REC *chatnet_find(const char *name)
 	return NULL;
 }

-gboolean chatnet_find_unavailable(const char *name)
-{
-	CHAT_PROTOCOL_REC *proto;
-
-	if (i_slist_find_icase_string(chatnets_unavailable, name) != NULL)
-		return TRUE;
-
-	proto = CHAT_PROTOCOL(chatnet_find(name));
-
-	if (proto == NULL || proto->not_initialized)
-		return TRUE;
-
-	return FALSE;
-}
-
 static void sig_connected(SERVER_REC *server)
 {
 	CHATNET_REC *rec;
@ -153,23 +136,15 @@ static void chatnet_read(CONFIG_NODE *node)
 		return;

 	type = config_node_get_str(node, "type", NULL);
-	if (type == NULL) {
-		proto = chat_protocol_get_default();
-	} else {
-		proto = chat_protocol_find(type);
-	}
-
+	proto = type == NULL ? NULL : chat_protocol_find(type);
 	if (proto == NULL) {
-		/* protocol not loaded */
-		if (i_slist_find_icase_string(chatnets_unavailable, node->key) == NULL)
-			chatnets_unavailable =
-			    g_slist_append(chatnets_unavailable, g_strdup(node->key));
-
-		return;
-	} else if (type == NULL) {
-		iconfig_node_set_str(node, "type", proto->name);
+		proto = type == NULL ? chat_protocol_get_default() :
+			chat_protocol_get_unknown(type);
 	}

+	if (type == NULL)
+		iconfig_node_set_str(node, "type", proto->name);
+
 	rec = proto->create_chatnet();
 	rec->type = module_get_uniq_id("CHATNET", 0);
 	rec->chat_type = proto->id;
@ -192,12 +167,6 @@ static void read_chatnets(void)
 	while (chatnets != NULL)
                chatnet_destroy(chatnets->data);

-	while (chatnets_unavailable != NULL) {
-		char *name = chatnets_unavailable->data;
-		chatnets_unavailable = g_slist_remove(chatnets_unavailable, name);
-		g_free(name);
-	}
-
 	node = iconfig_node_traverse("chatnets", FALSE);
 	if (node != NULL) {
 		tmp = config_node_first(node->value);
@ -211,7 +180,8 @@ void chatnets_init(void)
 	chatnets = NULL;

 	signal_add_first("event connected", (SIGNAL_FUNC) sig_connected);
-	signal_add("setup reread chatnets", (SIGNAL_FUNC) read_chatnets);
+	signal_add("setup reread", (SIGNAL_FUNC) read_chatnets);
+        signal_add_first("irssi init read settings", (SIGNAL_FUNC) read_chatnets);
 }

 void chatnets_deinit(void)
@ -219,5 +189,6 @@ void chatnets_deinit(void)
 	module_uniq_destroy("CHATNET");

 	signal_remove("event connected", (SIGNAL_FUNC) sig_connected);
-	signal_remove("setup reread chatnets", (SIGNAL_FUNC) read_chatnets);
+	signal_remove("setup reread", (SIGNAL_FUNC) read_chatnets);
+        signal_remove("irssi init read settings", (SIGNAL_FUNC) read_chatnets);
 }
--- a/src/core/chatnets.h
+++ b/src/core/chatnets.h
@ -25,8 +25,6 @@ void chatnet_destroy(CHATNET_REC *chatnet);

 /* Find the chat network by name */
 CHATNET_REC *chatnet_find(const char *name);
-/* Check if this chatnet is unavailable because the protocol is not loaded */
-gboolean chatnet_find_unavailable(const char *name);

 void chatnets_init(void);
 void chatnets_deinit(void);
--- a/src/core/core.c
+++ b/src/core/core.c
@ -68,7 +68,6 @@ void wcwidth_wrapper_deinit(void);
 int irssi_gui;
 int irssi_init_finished;
 int sighup_received;
-int sigterm_received;
 time_t client_start_time;

 static char *irssi_dir, *irssi_config_file;
@ -90,11 +89,6 @@ static void sig_hup(int signo)
 	sighup_received = TRUE;
 }

-static void sig_term(int signo)
-{
-	sigterm_received = TRUE;
-}
-
 static void read_settings(void)
 {
 	static int signals[] = {
@ -119,15 +113,8 @@ static void read_settings(void)
 	sigaction(SIGHUP, &act, NULL);

 	for (n = 0; n < sizeof(signals)/sizeof(signals[0]); n++) {
-		if (find_substr(ignores, signames[n])) {
-			act.sa_handler = SIG_IGN;
-		} else {
-			/* set default handlers */
-			if (signals[n] == SIGTERM)
-				act.sa_handler = sig_term;
-			else
-				act.sa_handler = SIG_DFL;
-		}
+		act.sa_handler = find_substr(ignores, signames[n]) ?
+			SIG_IGN : SIG_DFL;
 		sigaction(signals[n], &act, NULL);
 	}

@ -236,13 +223,6 @@ static void sig_irssi_init_finished(void)
        irssi_init_finished = TRUE;
 }

-static void reread_setup(void)
-{
-	signal_emit("setup reread chatnets", 0);
-	signal_emit("setup reread servers", 0);
-	signal_emit("setup reread channels", 0);
-}
-
 void core_init(void)
 {
 	dialog_type_queue = NULL;
@ -289,16 +269,13 @@ void core_init(void)
 	settings_add_str("misc", "ignore_signals", "");
 	settings_add_bool("misc", "override_coredump_limit", FALSE);
 	settings_add_bool("misc", "quit_on_hup", FALSE);
-	settings_add_str("misc", "autoload_modules", "irc dcc flood notifylist perl otr");
+	settings_add_str("misc", "autoload_modules", "perl otr");

 #ifdef HAVE_SYS_RESOURCE_H
 	getrlimit(RLIMIT_CORE, &orig_core_rlimit);
 #endif
 	read_settings();
 	signal_add("setup changed", (SIGNAL_FUNC) read_settings);
-	signal_add("setup reread", (SIGNAL_FUNC) reread_setup);
-	signal_add("irssi init read settings", (SIGNAL_FUNC) reread_setup);
-	signal_add_last("chat protocol created", (SIGNAL_FUNC) reread_setup);
 	signal_add("irssi init finished", (SIGNAL_FUNC) sig_irssi_init_finished);

 	settings_check();
@ -311,9 +288,6 @@ void core_deinit(void)
 	module_uniq_destroy("WINDOW ITEM TYPE");

 	signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
-	signal_remove("setup reread", (SIGNAL_FUNC) reread_setup);
-	signal_remove("irssi init read settings", (SIGNAL_FUNC) reread_setup);
-	signal_remove("chat protocol created", (SIGNAL_FUNC) reread_setup);
 	signal_remove("irssi init finished", (SIGNAL_FUNC) sig_irssi_init_finished);

 	wcwidth_wrapper_deinit();
--- a/src/core/core.h
+++ b/src/core/core.h
@ -14,7 +14,6 @@
 extern int irssi_gui;
 extern int irssi_init_finished; /* TRUE after "irssi init finished" signal is sent */
 extern int sighup_received; /* TRUE after received SIGHUP. */
-extern int sigterm_received; /* TRUE after received SIGTERM. */
 extern time_t client_start_time;

 void core_preinit(const char *path);
--- a/src/core/iregex-regexh.c
+++ b/src/core/iregex-regexh.c
@ -0,0 +1,99 @@
+#include <irssi/src/core/iregex.h>
+
+Regex *
+i_regex_new (const gchar *pattern,
+             GRegexCompileFlags compile_options,
+             GRegexMatchFlags match_options,
+             GError **error)
+{
+	Regex *regex;
+	char *errbuf;
+	int cflags;
+	int errcode, errbuf_len;
+
+	regex = g_new0(Regex, 1);
+	cflags = REG_EXTENDED;
+	if (compile_options & G_REGEX_CASELESS)
+		cflags |= REG_ICASE;
+	if (compile_options & G_REGEX_MULTILINE)
+		cflags |= REG_NEWLINE;
+	if (match_options & G_REGEX_MATCH_NOTBOL)
+		cflags |= REG_NOTBOL;
+	if (match_options & G_REGEX_MATCH_NOTEOL)
+		cflags |= REG_NOTEOL;
+
+	errcode = regcomp(regex, pattern, cflags);
+	if (errcode != 0) {
+		errbuf_len = regerror(errcode, regex, 0, 0);
+		errbuf = g_malloc(errbuf_len);
+		regerror(errcode, regex, errbuf, errbuf_len);
+		g_set_error(error, G_REGEX_ERROR, errcode, "%s", errbuf);
+		g_free(errbuf);
+		g_free(regex);
+		return NULL;
+	} else {
+		return regex;
+	}
+}
+
+void
+i_regex_unref (Regex *regex)
+{
+	regfree(regex);
+	g_free(regex);
+}
+
+gboolean
+i_regex_match (const Regex *regex,
+               const gchar *string,
+               GRegexMatchFlags match_options,
+               MatchInfo **match_info)
+{
+	int groups;
+	int eflags;
+
+	g_return_val_if_fail(regex != NULL, FALSE);
+
+	if (match_info != NULL) {
+		groups = 1 + regex->re_nsub;
+		*match_info = g_new0(MatchInfo, groups);
+	} else {
+		groups = 0;
+	}
+
+	eflags = 0;
+	if (match_options & G_REGEX_MATCH_NOTBOL)
+		eflags |= REG_NOTBOL;
+	if (match_options & G_REGEX_MATCH_NOTEOL)
+		eflags |= REG_NOTEOL;
+
+	return regexec(regex, string, groups, groups ? *match_info : NULL, eflags) == 0;
+}
+
+gboolean
+i_match_info_fetch_pos (const MatchInfo *match_info,
+                        gint match_num,
+                        gint *start_pos,
+                        gint *end_pos)
+{
+	if (start_pos != NULL)
+		*start_pos = match_info[match_num].rm_so;
+	if (end_pos != NULL)
+		*end_pos = match_info[match_num].rm_eo;
+
+	return TRUE;
+}
+
+gboolean
+i_match_info_matches (const MatchInfo *match_info)
+{
+	g_return_val_if_fail(match_info != NULL, FALSE);
+
+	return match_info[0].rm_so != -1;
+}
+
+void
+i_match_info_free (MatchInfo *match_info)
+{
+	g_free(match_info);
+}
--- a/src/core/iregex.h
+++ b/src/core/iregex.h
@ -3,10 +3,20 @@

 #include <irssi/src/common.h>

+#ifdef USE_GREGEX
+
 #include <glib.h>
 typedef	GRegex Regex;
 typedef	struct _MatchInfo MatchInfo;

+#else
+
+#include <regex.h>
+typedef	regex_t Regex;
+typedef regmatch_t MatchInfo;
+
+#endif
+
 gboolean
 i_match_info_matches (const MatchInfo *match_info);

--- a/src/core/levels.c
+++ b/src/core/levels.c
@ -23,12 +23,10 @@

 /* the order of these levels must match the bits in levels.h */
 static const char *levels[] = {
-	/* clang-format off */
 	"CRAP",
 	"MSGS",
 	"PUBLICS",
 	"NOTICES",
-	"PUBNOTICES",
 	"SNOTES",
 	"CTCPS",
 	"ACTIONS",
@ -48,7 +46,6 @@ static const char *levels[] = {
 	"CLIENTERRORS",
 	"HILIGHTS",
 	NULL
-	/* clang-format on */
 };

 int level_get(const char *level)
@ -184,15 +181,13 @@ int combine_level(int dest, const char *src)

 	list = g_strsplit(src, " ", -1);
 	for (item = list; *item != NULL; item++) {
-		itemname = *item + (**item == '+' || **item == '-' || **item == '^' ? 1 : 0);
+		itemname = *item + (**item == '+' || **item == '-' ? 1 : 0);
 		itemlevel = level_get(itemname);

-		if (g_ascii_strcasecmp(itemname, "NONE") == 0)
-			dest = 0;
+		if (g_strcmp0(itemname, "NONE") == 0)
+                        dest = 0;
 		else if (**item == '-')
 			dest &= ~(itemlevel);
-		else if (**item == '^')
-			dest ^= itemlevel;
 		else
 			dest |= itemlevel;
 	}
--- a/src/core/levels.h
+++ b/src/core/levels.h
@ -13,27 +13,26 @@ enum {
 	MSGLEVEL_MSGS         = 0x0000002,
 	MSGLEVEL_PUBLIC       = 0x0000004,
 	MSGLEVEL_NOTICES      = 0x0000008,
-	MSGLEVEL_PUBNOTICES   = 0x0000010,
-	MSGLEVEL_SNOTES       = 0x0000020,
-	MSGLEVEL_CTCPS        = 0x0000040,
-	MSGLEVEL_ACTIONS      = 0x0000080,
-	MSGLEVEL_JOINS        = 0x0000100,
-	MSGLEVEL_PARTS        = 0x0000200,
-	MSGLEVEL_QUITS        = 0x0000400,
-	MSGLEVEL_KICKS        = 0x0000800,
-	MSGLEVEL_MODES        = 0x0001000,
-	MSGLEVEL_TOPICS       = 0x0002000,
-	MSGLEVEL_WALLOPS      = 0x0004000,
-	MSGLEVEL_INVITES      = 0x0008000,
-	MSGLEVEL_NICKS        = 0x0010000,
-	MSGLEVEL_DCC          = 0x0020000,
-	MSGLEVEL_DCCMSGS      = 0x0040000,
-	MSGLEVEL_CLIENTNOTICE = 0x0080000,
-	MSGLEVEL_CLIENTCRAP   = 0x0100000,
-	MSGLEVEL_CLIENTERROR  = 0x0200000,
-	MSGLEVEL_HILIGHT      = 0x0400000,
+	MSGLEVEL_SNOTES       = 0x0000010,
+	MSGLEVEL_CTCPS        = 0x0000020,
+	MSGLEVEL_ACTIONS      = 0x0000040,
+	MSGLEVEL_JOINS        = 0x0000080,
+	MSGLEVEL_PARTS        = 0x0000100,
+	MSGLEVEL_QUITS        = 0x0000200,
+	MSGLEVEL_KICKS        = 0x0000400,
+	MSGLEVEL_MODES        = 0x0000800,
+	MSGLEVEL_TOPICS       = 0x0001000,
+	MSGLEVEL_WALLOPS      = 0x0002000,
+	MSGLEVEL_INVITES      = 0x0004000,
+	MSGLEVEL_NICKS        = 0x0008000,
+	MSGLEVEL_DCC          = 0x0010000,
+	MSGLEVEL_DCCMSGS      = 0x0020000,
+	MSGLEVEL_CLIENTNOTICE = 0x0040000,
+	MSGLEVEL_CLIENTCRAP   = 0x0080000,
+	MSGLEVEL_CLIENTERROR  = 0x0100000,
+	MSGLEVEL_HILIGHT      = 0x0200000,

-	MSGLEVEL_ALL          = 0x07fffff,
+	MSGLEVEL_ALL          = 0x03fffff,

 	MSGLEVEL_NOHILIGHT    = 0x1000000, /* Don't highlight this message */
 	MSGLEVEL_NO_ACT       = 0x2000000, /* Don't trigger channel activity */
--- a/src/core/meson.build
+++ b/src/core/meson.build
@ -1,5 +1,11 @@
 # this file is part of irssi

+if want_gregex
+  regex_impl = files('iregex-gregex.c')
+else
+  regex_impl = files('iregex-regexh.c')
+endif
+
 if have_capsicum
  core_capsicum_source = files('capsicum.c')
 else
@ -18,7 +24,6 @@ libcore_a = static_library('core',
    'core.c',
    'expandos.c',
    'ignore.c',
-    'iregex-gregex.c',
    'levels.c',
    'line-split.c',
    'log-away.c',
@ -53,6 +58,7 @@ libcore_a = static_library('core',
    'write-buffer.c',
  )
  + core_capsicum_source
+  + regex_impl
  + [
    default_config_h,
    irssi_version_h,
--- a/src/core/modules-load.c
+++ b/src/core/modules-load.c
@ -27,6 +27,8 @@
 #include <irssi/src/core/commands.h>
 #include <irssi/src/core/misc.h>

+#ifdef HAVE_GMODULE
+
 /* Returns the module name without path, "lib" prefix or ".so" suffix */
 static char *module_get_name(const char *path, int *start, int *end)
 {
@ -102,41 +104,10 @@ static char *module_get_sub(const char *name, const char *root)
        return g_strdup(name);
 }

-static GModule *module_open(const char *name)
+static GModule *module_open(const char *name, int *found)
 {
-	GModule *module;
-#if GLIB_CHECK_VERSION(2, 75, 0)
-	/* in this version of glib, g_module_open knows how to construct system-dependent module
-	   file names, and g_module_build_path is deprecated. */
-
-	char *path;
-
-	if (g_path_is_absolute(name) || *name == '~' ||
-	    (*name == '.' && name[1] == G_DIR_SEPARATOR))
-		path = g_strdup(name);
-	else {
-		/* first try from home dir */
-		path = g_strdup_printf("%s/modules/%s", get_irssi_dir(), name);
-
-		module = g_module_open(path, (GModuleFlags) 0);
-		g_free(path);
-		if (module != NULL) {
-			return module;
-		}
-
-		/* module not found from home dir, try global module dir */
-		path = g_strdup_printf("%s/%s", MODULEDIR, name);
-	}
-
-	module = g_module_open(path, (GModuleFlags) 0);
-	g_free(path);
-	return module;
-
-#else /* GLib < 2.75.0 */
-	/* in this version of glib, we build the module path with g_module_build_path.
-	   unfortunately, this is broken on Darwin when compiled with meson. */
-
 	struct stat statbuf;
+	GModule *module;
 	char *path, *str;

 	if (g_path_is_absolute(name) || *name == '~' ||
@ -151,6 +122,7 @@ static GModule *module_open(const char *name)
 		if (stat(path, &statbuf) == 0) {
 			module = g_module_open(path, (GModuleFlags) 0);
 			g_free(path);
+			*found = TRUE;
 			return module;
 		}

@ -159,11 +131,10 @@ static GModule *module_open(const char *name)
 		path = g_module_build_path(MODULEDIR, name);
 	}

+	*found = stat(path, &statbuf) == 0;
 	module = g_module_open(path, (GModuleFlags) 0);
 	g_free(path);
 	return module;
-
-#endif
 }

 static char *module_get_func(const char *rootmodule, const char *submodule,
@ -182,7 +153,8 @@ static char *module_get_func(const char *rootmodule, const char *submodule,
 	signal_emit("module error", 4, GINT_TO_POINTER(error), text, \
 		    rootmodule, submodule)

-/* Returns 1 if ok, 0 if not */
+/* Returns 1 if ok, 0 if error in module and
+   -1 if module wasn't found */
 static int module_load_name(const char *path, const char *rootmodule,
 			    const char *submodule, int silent)
 {
@ -196,15 +168,15 @@ static int module_load_name(const char *path, const char *rootmodule,
 	gpointer value1, value2 = NULL;
 	char *versionfunc, *initfunc, *deinitfunc;
 	int module_abi_version = 0;
-	int valid;
+        int found;

-	gmodule = module_open(path);
+	gmodule = module_open(path, &found);
 	if (gmodule == NULL) {
-		if (!silent) {
+		if (!silent || found) {
 			module_error(MODULE_ERROR_LOAD, g_module_error(),
 				     rootmodule, submodule);
 		}
-		return 0;
+		return found ? 0 : -1;
 	}

 	/* get the module's irssi abi version and bail out on mismatch */
@ -231,12 +203,12 @@ static int module_load_name(const char *path, const char *rootmodule,
 	/* get the module's init() and deinit() functions */
 	initfunc = module_get_func(rootmodule, submodule, "init");
 	deinitfunc = module_get_func(rootmodule, submodule, "deinit");
-	valid = g_module_symbol(gmodule, initfunc, &value1) &&
-	        g_module_symbol(gmodule, deinitfunc, &value2);
+	found = g_module_symbol(gmodule, initfunc, &value1) &&
+		g_module_symbol(gmodule, deinitfunc, &value2);
 	g_free(initfunc);
 	g_free(deinitfunc);

-	if (!valid) {
+	if (!found) {
 		module_error(MODULE_ERROR_INVALID, NULL,
 			     rootmodule, submodule);
 		g_module_close(gmodule);
@ -340,7 +312,7 @@ static int module_load_full(const char *path, const char *rootmodule,
 	/* check if the given module exists.. */
 	try_prefixes = g_strcmp0(rootmodule, submodule) == 0;
 	status = module_load_name(path, rootmodule, submodule, try_prefixes);
-	if (status <= 0 && try_prefixes) {
+	if (status == -1 && try_prefixes) {
 		/* nope, try loading the module_core,
 		   fe_module, etc. */
 		status = module_load_prefixes(path, rootmodule,
@ -423,6 +395,15 @@ static void module_file_deinit_gmodule(MODULE_FILE_REC *file)
 	g_module_close(file->gmodule);
 }

+#else /* !HAVE_GMODULE - modules are not supported */
+
+int module_load(const char *path, char **prefixes)
+{
+        return FALSE;
+}
+
+#endif
+
 void module_file_unload(MODULE_FILE_REC *file)
 {
 	MODULE_REC *root;
@ -433,8 +414,10 @@ void module_file_unload(MODULE_FILE_REC *file)
        if (file->initialized)
 		signal_emit("module unloaded", 2, file->root, file);

+#ifdef HAVE_GMODULE
 	if (file->gmodule != NULL)
                module_file_deinit_gmodule(file);
+#endif

 	g_free(file->name);
 	g_free(file->defined_module_name);
--- a/src/core/modules.h
+++ b/src/core/modules.h
@ -16,7 +16,13 @@
 #define MODULE_DATA(rec) \
 	g_hash_table_lookup((rec)->module_data, MODULE_NAME)

-#define MODULE_IS_STATIC(rec) ((rec)->gmodule == NULL)
+
+#ifdef HAVE_GMODULE
+#  define MODULE_IS_STATIC(rec) \
+        ((rec)->gmodule == NULL)
+#else
+#  define MODULE_IS_STATIC(rec) TRUE
+#endif

 #define MODULE_ABICHECK(fn_modulename) \
 void fn_modulename ## _abicheck(int *version)	\
@ -39,7 +45,9 @@ typedef struct {
        char *defined_module_name;
 	void (*module_deinit) (void);

+#ifdef HAVE_GMODULE
 	GModule *gmodule; /* static, if NULL */
+#endif
 	unsigned int initialized:1;
 } MODULE_FILE_REC;

--- a/src/core/net-disconnect.c
+++ b/src/core/net-disconnect.c
@ -21,8 +21,6 @@
 #include "module.h"
 #include <irssi/src/core/network.h>

-#include <sys/select.h>
-
 /* when quitting, wait for max. 5 seconds before forcing to close the socket */
 #define MAX_QUIT_CLOSE_WAIT 5

--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@ -28,7 +28,6 @@
 #include <irssi/src/core/tls.h>

 #include <openssl/crypto.h>
-#include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include <openssl/pem.h>
@ -752,49 +751,44 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
 #ifdef SSL_get_server_tmp_key
 	/* Show ephemeral key information. */
 	EVP_PKEY *ephemeral_key = NULL;
+
+	/* OPENSSL_NO_EC is for solaris 11.3 (2016), github ticket #598 */
+#ifndef OPENSSL_NO_EC
+	EC_KEY *ec_key = NULL;
+#endif
 	char *ephemeral_key_algorithm = NULL;
+	char *cname = NULL;
+	int nid;

 	g_return_if_fail(tls != NULL);
 	g_return_if_fail(ssl != NULL);

 	if (SSL_get_server_tmp_key(ssl, &ephemeral_key)) {
-		int keytype = EVP_PKEY_id(ephemeral_key);
-		switch (keytype) {
-		case EVP_PKEY_DH:
-			tls_rec_set_ephemeral_key_algorithm(tls, "DH");
-			tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key));
-			break;
+		switch (EVP_PKEY_id(ephemeral_key)) {
+			case EVP_PKEY_DH:
+				tls_rec_set_ephemeral_key_algorithm(tls, "DH");
+				tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key));
+				break;

-			/* OPENSSL_NO_EC is for solaris 11.3 (2016), github ticket #598 */
 #ifndef OPENSSL_NO_EC
-		case EVP_PKEY_EC: {
-#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
-			char cname[50];
-			EVP_PKEY_get_group_name(ephemeral_key, cname, sizeof(cname), NULL);
-#else
-			EC_KEY *ec_key = NULL;
-			char *cname = NULL;
-			int nid;
+			case EVP_PKEY_EC:
+				ec_key = EVP_PKEY_get1_EC_KEY(ephemeral_key);
+				nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec_key));
+				EC_KEY_free(ec_key);
+				cname = (char *)OBJ_nid2sn(nid);
+				ephemeral_key_algorithm = g_strdup_printf("ECDH: %s", cname);

-			ec_key = EVP_PKEY_get1_EC_KEY(ephemeral_key);
-			nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec_key));
-			EC_KEY_free(ec_key);
-			cname = (char *) OBJ_nid2sn(nid);
-#endif
-			ephemeral_key_algorithm = g_strdup_printf("ECDH: %s", cname);
+				tls_rec_set_ephemeral_key_algorithm(tls, ephemeral_key_algorithm);
+				tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key));

-			tls_rec_set_ephemeral_key_algorithm(tls, ephemeral_key_algorithm);
-			tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key));
-
-			g_free_and_null(ephemeral_key_algorithm);
-			break;
-		}
+				g_free_and_null(ephemeral_key_algorithm);
+				break;
 #endif

-		default:
-			tls_rec_set_ephemeral_key_algorithm(tls, OBJ_nid2ln(keytype));
-			tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key));
-			break;
+			default:
+				tls_rec_set_ephemeral_key_algorithm(tls, "Unknown");
+				tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key));
+				break;
 		}

 		EVP_PKEY_free(ephemeral_key);
--- a/src/core/network.c
+++ b/src/core/network.c
@ -430,7 +430,7 @@ int net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6)
 	}

 	if (count_v4 == 0 && count_v6 == 0)
-		return EAI_NONAME; /* shouldn't happen? */
+		return HOST_NOT_FOUND; /* shouldn't happen? */

 	/* if there are multiple addresses, return random one */
 	use_v4 = count_v4 <= 1 ? 0 : rand() % count_v4;
@ -491,6 +491,8 @@ int net_ip2host(IPADDR *ip, char *host)

 int net_host2ip(const char *host, IPADDR *ip)
 {
+	unsigned long addr;
+
 	if (strchr(host, ':') != NULL) {
 		/* IPv6 */
 		ip->family = AF_INET6;
@ -499,8 +501,16 @@ int net_host2ip(const char *host, IPADDR *ip)
 	} else {
 		/* IPv4 */
 		ip->family = AF_INET;
-		if (inet_pton(AF_INET, host, &ip->ip) == 0)
+#ifdef HAVE_INET_ATON
+		if (inet_aton(host, &ip->ip.s_addr) == 0)
 			return -1;
+#else
+		addr = inet_addr(host);
+		if (addr == INADDR_NONE)
+			return -1;
+
+		memcpy(&ip->ip, &addr, 4);
+#endif
 	}

 	return 0;
--- a/src/core/network.h
+++ b/src/core/network.h
@ -1,11 +1,15 @@
 #ifndef IRSSI_CORE_NETWORK_H
 #define IRSSI_CORE_NETWORK_H

+#ifdef HAVE_SOCKS_H
+#include <socks.h>
+#endif
+
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <arpa/inet.h>
+#  include <sys/socket.h>
+#  include <netinet/in.h>
+#  include <netdb.h>
+#  include <arpa/inet.h>

 #ifndef AF_INET6
 #  ifdef PF_INET6
--- a/src/core/server-connect-rec.h
+++ b/src/core/server-connect-rec.h
@ -12,7 +12,6 @@ char *proxy_string, *proxy_string_after, *proxy_password;

 unsigned short family; /* 0 = don't care, AF_INET or AF_INET6 */
 unsigned short chosen_family; /* family actually chosen during name resolution */
-char *ipaddr;
 char *tag; /* try to keep this tag when connected to server */
 char *address;
 int port;
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@ -305,13 +305,6 @@ static SERVER_CONNECT_REC *create_addr_conn(int chat_type, const char *address,
 	proto = chat_type >= 0 ? chat_protocol_find_id(chat_type) :
                chat_protocol_get_default();

-	if (proto == NULL) {
-		signal_stop();
-		return NULL;
-	}
-
-	g_return_val_if_fail(proto != NULL, NULL);
-
 	conn = proto->create_server_connect();
 	server_connect_ref(conn);

@ -453,7 +446,6 @@ static SERVER_SETUP_REC *server_setup_read(CONFIG_NODE *node)
 {
 	SERVER_SETUP_REC *rec;
 	CHATNET_REC *chatnetrec;
-	CHAT_PROTOCOL_REC *proto;
 	char *server, *chatnet, *family;
 	int port;
 	char *value = NULL;
@ -474,40 +466,23 @@ static SERVER_SETUP_REC *server_setup_read(CONFIG_NODE *node)

 	rec = NULL;

-	if (chatnet != NULL) {
-		chatnetrec = chatnet_find(chatnet);
-		if (chatnetrec != NULL) {
-			proto = CHAT_PROTOCOL(chatnetrec);
-		} else {
-			/* chat network not found, create it. */
-			if (chatnet_find_unavailable(chatnet)) {
-				/* no protocols loaded, skip loading servers */
-				return NULL;
-			}
-			proto = chat_protocol_get_default();
-			chatnetrec = proto->create_chatnet();
-			chatnetrec->chat_type = chat_protocol_get_default()->id;
-			chatnetrec->name = g_strdup(chatnet);
-			chatnet_create(chatnetrec);
-		}
-	} else {
-		chatnetrec = NULL;
-		proto = chat_protocol_get_default();
-		if (proto == NULL) {
-			/* no protocols loaded, skip loading servers */
-			return NULL;
-		}
+	chatnetrec = chatnet == NULL ? NULL : chatnet_find(chatnet);
+	if (chatnetrec == NULL && chatnet != NULL) {
+                /* chat network not found, create it. */
+		chatnetrec = chat_protocol_get_default()->create_chatnet();
+		chatnetrec->chat_type = chat_protocol_get_default()->id;
+		chatnetrec->name = g_strdup(chatnet);
+		chatnet_create(chatnetrec);
 	}

 	family = config_node_get_str(node, "family", "");

-	rec = proto->create_server_setup();
+	rec = CHAT_PROTOCOL(chatnetrec)->create_server_setup();
 	rec->type = module_get_uniq_id("SERVER SETUP", 0);
-	rec->chat_type = proto->id;
+        rec->chat_type = CHAT_PROTOCOL(chatnetrec)->id;
 	rec->chatnet = chatnetrec == NULL ? NULL : g_strdup(chatnetrec->name);
-	rec->family = g_ascii_strcasecmp(family, "inet6") == 0 ?
-	                  AF_INET6 :
-	                  (g_ascii_strcasecmp(family, "inet") == 0 ? AF_INET : 0);
+	rec->family = g_ascii_strcasecmp(family, "inet6") == 0 ? AF_INET6 :
+		(g_ascii_strcasecmp(family, "inet") == 0 ? AF_INET : 0);
 	rec->address = g_strdup(server);
 	rec->password = g_strdup(config_node_get_str(node, "password", NULL));

@ -784,7 +759,8 @@ void servers_setup_init(void)
 	read_settings();

 	signal_add("setup changed", (SIGNAL_FUNC) read_settings);
-	signal_add("setup reread servers", (SIGNAL_FUNC) read_servers);
+	signal_add("setup reread", (SIGNAL_FUNC) read_servers);
+        signal_add("irssi init read settings", (SIGNAL_FUNC) read_servers);
 }

 void servers_setup_deinit(void)
@ -797,7 +773,8 @@ void servers_setup_deinit(void)
 		server_setup_destroy(setupservers->data);

 	signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
-	signal_remove("setup reread servers", (SIGNAL_FUNC) read_servers);
+	signal_remove("setup reread", (SIGNAL_FUNC) read_servers);
+        signal_remove("irssi init read settings", (SIGNAL_FUNC) read_servers);

 	module_uniq_destroy("SERVER SETUP");
 }
--- a/src/core/servers.c
+++ b/src/core/servers.c
@ -212,18 +212,13 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,

 	g_return_if_fail(ip != NULL || unix_socket != NULL);

-	if (ip != NULL) {
-		server->connrec->chosen_family = ip->family;
-		net_ip2host(ip, ipaddr);
-		server->connrec->ipaddr = g_strdup(ipaddr);
-	}
-
 	signal_emit("server connecting", 2, server, ip);

 	if (server->connrec->no_connect)
 		return;

 	if (ip != NULL) {
+		server->connrec->chosen_family = ip->family;
 		own_ip = IPADDR_IS_V6(ip) ? server->connrec->own_ip6 : server->connrec->own_ip4;
 		port = server->connrec->proxy != NULL ?
 			server->connrec->proxy_port : server->connrec->port;
@ -642,7 +637,6 @@ void server_connect_unref(SERVER_CONNECT_REC *conn)
 	g_free_not_null(conn->proxy_string_after);
 	g_free_not_null(conn->proxy_password);

-	g_free_not_null(conn->ipaddr);
 	g_free_not_null(conn->tag);
 	g_free_not_null(conn->address);
 	g_free_not_null(conn->chatnet);
@ -770,7 +764,7 @@ static void sig_chat_protocol_deinit(CHAT_PROTOCOL_REC *proto)

 void servers_init(void)
 {
-	settings_add_bool("server", "resolve_prefer_ipv6", TRUE);
+	settings_add_bool("server", "resolve_prefer_ipv6", FALSE);
 	lookup_servers = servers = NULL;

 	signal_add("chat protocol deinit", (SIGNAL_FUNC) sig_chat_protocol_deinit);
--- a/src/core/session.c
+++ b/src/core/session.c
@ -26,7 +26,6 @@
 #include <irssi/src/core/net-sendbuffer.h>
 #include <irssi/src/core/pidwait.h>
 #include <irssi/src/lib-config/iconfig.h>
-#include <irssi/src/core/misc.h>

 #include <irssi/src/core/chat-protocols.h>
 #include <irssi/src/core/servers.h>
@ -60,19 +59,13 @@ void session_upgrade(void)
 static void cmd_upgrade(const char *data)
 {
 	CONFIG_REC *session;
-	char *session_file, *str, *name;
+	char *session_file, *str;
 	char *binary;

 	if (*data == '\0')
-		name = irssi_binary;
-	else
-		name = convert_home(data);
+		data = irssi_binary;

-	binary = g_find_program_in_path(name);
-	if (name != irssi_binary)
-		g_free(name);
-
-	if (binary == NULL)
+	if ((binary = g_find_program_in_path(data)) == NULL)
 		cmd_return_error(CMDERR_PROGRAM_NOT_FOUND);

 	/* save the session */
--- a/src/core/settings.c
+++ b/src/core/settings.c
@ -673,6 +673,18 @@ GSList *settings_get_sorted(void)
 	return list;
 }

+void sig_term(int n)
+{
+	/* if we get SIGTERM after this, just die instead of coming back here. */
+	signal(SIGTERM, SIG_DFL);
+
+	/* quit from all servers too.. */
+	signal_emit("command quit", 1, "");
+
+	/* and die */
+	raise(SIGTERM);
+}
+
 /* Yes, this is my own stupid checksum generator, some "real" algorithm
   would be nice but would just take more space without much real benefit */
 static unsigned int file_checksum(const char *fname)
@ -793,6 +805,8 @@ static void init_configfile(void)
 		signal_emit("gui dialog", 2, "error", str);
                g_free(str);
 	}
+
+	signal(SIGTERM, sig_term);
 }

 int settings_reread(const char *fname)
--- a/src/fe-common/Makefile.am
+++ b/src/fe-common/Makefile.am
@ -0,0 +1,3 @@
+SUBDIRS = core irc
+
+EXTRA_DIST = meson.build
--- a/src/fe-common/core/Makefile.am
+++ b/src/fe-common/core/Makefile.am
@ -0,0 +1,73 @@
+noinst_LIBRARIES = libfe_common_core.a
+
+AM_CPPFLAGS = \
+	-I$(top_builddir) \
+	$(GLIB_CFLAGS) \
+	-DHELPDIR=\""$(datadir)/irssi/help"\" \
+	-DTHEMESDIR=\""$(datadir)/irssi/themes"\"
+
+libfe_common_core_a_SOURCES = \
+	chat-completion.c \
+	command-history.c \
+	completion.c \
+	fe-channels.c \
+	fe-common-core.c \
+	fe-core-commands.c \
+	fe-exec.c \
+	fe-expandos.c \
+	fe-help.c \
+	fe-ignore.c \
+	fe-ignore-messages.c \
+	fe-log.c \
+	fe-messages.c \
+	fe-modules.c \
+	fe-queries.c \
+	fe-server.c \
+	fe-settings.c \
+	fe-tls.c \
+	formats.c \
+	hilight-text.c \
+	keyboard.c \
+	module-formats.c \
+	printtext.c \
+	fe-recode.c \
+	themes.c \
+	window-activity.c \
+	window-commands.c \
+	window-items.c \
+	windows-layout.c \
+	fe-windows.c
+
+if HAVE_CAPSICUM
+libfe_common_core_a_SOURCES += \
+	fe-capsicum.c
+endif
+
+pkginc_fe_common_coredir=$(pkgincludedir)/src/fe-common/core
+pkginc_fe_common_core_HEADERS = \
+	command-history.h \
+	chat-completion.h \
+	completion.h \
+	fe-capsicum.h \
+	fe-channels.h \
+	fe-common-core.h \
+	fe-core-commands.h \
+	fe-exec.h \
+	fe-messages.h \
+	fe-queries.h \
+	fe-settings.h \
+	fe-tls.h \
+	formats.h \
+	hilight-text.h \
+	keyboard.h \
+	module-formats.h \
+	module.h \
+	printtext.h \
+	fe-recode.h \
+	themes.h \
+	window-activity.h \
+	window-items.h \
+	windows-layout.h \
+	fe-windows.h
+
+EXTRA_DIST = meson.build
--- a/src/fe-common/core/command-history.c
+++ b/src/fe-common/core/command-history.c
@ -261,12 +261,7 @@ static const char *command_history_prev_int(WINDOW_REC *window, const char *text
 	if (*text != '\0' &&
 	    (pos == NULL || g_strcmp0(((HISTORY_ENTRY_REC *)pos->data)->text, text) != 0)) {
 		/* save the old entry to history */
-		if (pos != NULL && settings_get_bool("command_history_editable")) {
-			history_entry_destroy(pos->data);
-			pos->data = history_entry_new(history, text);
-		} else {
-			command_history_add(history, text);
-		}
+		command_history_add(history, text);
 	}

 	return history->pos == NULL ? text : ((HISTORY_ENTRY_REC *)history->pos->data)->text;
@ -297,12 +292,7 @@ static const char *command_history_next_int(WINDOW_REC *window, const char *text
 	if (*text != '\0' &&
 	    (pos == NULL || g_strcmp0(((HISTORY_ENTRY_REC *)pos->data)->text, text) != 0)) {
 		/* save the old entry to history */
-		if (pos != NULL && settings_get_bool("command_history_editable")) {
-			history_entry_destroy(pos->data);
-			pos->data = history_entry_new(history, text);
-		} else {
-			command_history_add(history, text);
-		}
+		command_history_add(history, text);
 	}
 	return history->pos == NULL ? "" : ((HISTORY_ENTRY_REC *)history->pos->data)->text;
 }
@ -477,7 +467,6 @@ void command_history_init(void)
 {
 	settings_add_int("history", "max_command_history", 100);
 	settings_add_bool("history", "window_history", FALSE);
-	settings_add_bool("history", "command_history_editable", FALSE);

 	special_history_func_set(special_history_func);

--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@ -646,7 +646,7 @@ void fe_channels_init(void)
 	command_bind("channel modify", NULL, (SIGNAL_FUNC) cmd_channel_modify);
 	command_bind("channel remove", NULL, (SIGNAL_FUNC) cmd_channel_remove);
 	command_bind("channel list", NULL, (SIGNAL_FUNC) cmd_channel_list);
-	command_bind_first("names", NULL, (SIGNAL_FUNC) cmd_names);
+	command_bind("names", NULL, (SIGNAL_FUNC) cmd_names);
 	command_bind("cycle", NULL, (SIGNAL_FUNC) cmd_cycle);

 	command_set_options("channel add", "auto noauto -bots -botcmd");
--- a/src/fe-common/core/fe-log.c
+++ b/src/fe-common/core/fe-log.c
@ -57,19 +57,18 @@ static int skip_next_printtext;
 static char *log_theme_name;

 static char **autolog_ignore_targets;
-static GTimeZone *utc;

 static char *log_colorizer_strip(const char *str)
 {
-	return strip_codes(str);
+        return strip_codes(str);
 }

 static void log_add_targets(LOG_REC *log, const char *targets, const char *tag)
 {
 	char **tmp, **items;

-	g_return_if_fail(log != NULL);
-	g_return_if_fail(targets != NULL);
+        g_return_if_fail(log != NULL);
+        g_return_if_fail(targets != NULL);

 	items = g_strsplit(targets, " ", -1);

@ -84,18 +83,18 @@ static void log_add_targets(LOG_REC *log, const char *targets, const char *tag)
 		    <fname> [<levels>] */
 static void cmd_log_open(const char *data)
 {
-	SERVER_REC *server;
-	GHashTable *optlist;
+        SERVER_REC *server;
+        GHashTable *optlist;
 	char *targetarg, *fname, *levels, *servertag;
 	void *free_arg;
 	char window[MAX_INT_STRLEN];
 	LOG_REC *log;
 	int level;

-	if (!cmd_get_params(data, &free_arg,
-	                    2 | PARAM_FLAG_GETREST | PARAM_FLAG_UNKNOWN_OPTIONS |
-	                        PARAM_FLAG_OPTIONS | PARAM_FLAG_STRIP_TRAILING_WS,
-	                    "log open", &optlist, &fname, &levels))
+	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST |
+			    PARAM_FLAG_UNKNOWN_OPTIONS | PARAM_FLAG_OPTIONS |
+			    PARAM_FLAG_STRIP_TRAILING_WS, "log open", &optlist, 
+			    &fname, &levels))
 		return;
 	if (*fname == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);

@ -113,7 +112,8 @@ static void cmd_log_open(const char *data)
 			ltoa(window, active_win->refnum);
 			targetarg = window;
 		}
-		log_item_add(log, LOG_ITEM_WINDOW_REFNUM, targetarg, servertag);
+		log_item_add(log, LOG_ITEM_WINDOW_REFNUM, targetarg,
+			     servertag);
 	} else {
 		targetarg = g_hash_table_lookup(optlist, "targets");
 		if (targetarg != NULL && *targetarg != '\0')
@ -133,13 +133,14 @@ static void cmd_log_open(const char *data)
 	if (log->handle == -1 && g_hash_table_lookup(optlist, "noopen") == NULL) {
 		/* start logging */
 		if (log_start_logging(log)) {
-			printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_LOG_OPENED, fname);
+			printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
+				    TXT_LOG_OPENED, fname);
 		} else {
 			log_close(log);
 		}
 	}

-	cmd_params_free(free_arg);
+        cmd_params_free(free_arg);
 }

 static LOG_REC *log_find_from_data(const char *data)
@ -208,7 +209,7 @@ static char *log_items_get_list(LOG_REC *log)
 	for (tmp = log->items; tmp != NULL; tmp = tmp->next) {
 		rec = tmp->data;

-		g_string_append_printf(str, "%s, ", rec->name);
+                g_string_append_printf(str, "%s, ", rec->name);
 	}
 	g_string_truncate(str, str->len-2);
 	if(rec->servertag != NULL)
@ -230,11 +231,13 @@ static void cmd_log_list(void)
 		LOG_REC *rec = tmp->data;

 		levelstr = bits2level(rec->level);
-		items = rec->items == NULL ? NULL : log_items_get_list(rec);
+		items = rec->items == NULL ? NULL :
+                        log_items_get_list(rec);

-		printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_LOG_LIST, index, rec->fname,
-		            items != NULL ? items : "", levelstr, rec->autoopen ? " -autoopen" : "",
-		            rec->handle != -1 ? " active" : "");
+		printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_LOG_LIST,
+			    index, rec->fname, items != NULL ? items : "",
+			    levelstr, rec->autoopen ? " -autoopen" : "",
+			    rec->handle != -1 ? " active" : "");

 		g_free_not_null(items);
 		g_free(levelstr);
@ -250,8 +253,8 @@ static void cmd_log(const char *data, SERVER_REC *server, void *item)
 		command_runsub("log", data, server, item);
 }

-static LOG_REC *logs_find_item(int type, const char *item, const char *servertag,
-                               LOG_ITEM_REC **ret_item)
+static LOG_REC *logs_find_item(int type, const char *item,
+			       const char *servertag, LOG_ITEM_REC **ret_item)
 {
 	LOG_ITEM_REC *logitem;
 	GSList *tmp;
@ -281,17 +284,17 @@ static void cmd_window_log(const char *data)
 	if (!cmd_get_params(data, &free_arg, 2, &set, &fname))
 		return;

-	ltoa(window, active_win->refnum);
+        ltoa(window, active_win->refnum);
 	log = logs_find_item(LOG_ITEM_WINDOW_REFNUM, window, NULL, NULL);

-	open_log = close_log = FALSE;
+        open_log = close_log = FALSE;
 	if (g_ascii_strcasecmp(set, "ON") == 0)
 		open_log = TRUE;
 	else if (g_ascii_strcasecmp(set, "OFF") == 0) {
 		close_log = TRUE;
 	} else if (g_ascii_strcasecmp(set, "TOGGLE") == 0) {
-		open_log = log == NULL;
-		close_log = log != NULL;
+                open_log = log == NULL;
+                close_log = log != NULL;
 	} else {
 		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_NOT_TOGGLE);
 		cmd_params_free(free_arg);
@ -306,7 +309,7 @@ static void cmd_window_log(const char *data)
 					active_win->name != NULL ? "" : window);
 		log = log_create_rec(fname, MSGLEVEL_ALL);
 		log->colorizer = log_colorizer_strip;
-		log_item_add(log, LOG_ITEM_WINDOW_REFNUM, window, NULL);
+                log_item_add(log, LOG_ITEM_WINDOW_REFNUM, window, NULL);
 		log_update(log);
 		g_free(fname);
 	}
@ -319,7 +322,7 @@ static void cmd_window_log(const char *data)
 		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_LOG_CLOSED, log->fname);
 	}

-	cmd_params_free(free_arg);
+        cmd_params_free(free_arg);
 }

 /* Create log file entry to window, but don't start logging */
@ -328,34 +331,21 @@ static void cmd_window_logfile(const char *data)
 {
 	LOG_REC *log;
 	char window[MAX_INT_STRLEN];
-	void *free_arg;
-	char *fname;

-	if (!cmd_get_params(data, &free_arg, 1, &fname)) {
-		return;
-	}
-
-	if (!fname || strlen(fname) == 0) {
-		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
-	}
-
-	ltoa(window, active_win->refnum);
+        ltoa(window, active_win->refnum);
 	log = logs_find_item(LOG_ITEM_WINDOW_REFNUM, window, NULL, NULL);

 	if (log != NULL) {
 		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_WINDOWLOG_FILE_LOGGING);
-		cmd_params_free(free_arg);
 		return;
 	}

-	log = log_create_rec(fname, MSGLEVEL_ALL);
+	log = log_create_rec(data, MSGLEVEL_ALL);
 	log->colorizer = log_colorizer_strip;
 	log_item_add(log, LOG_ITEM_WINDOW_REFNUM, window, NULL);
 	log_update(log);

 	printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_WINDOWLOG_FILE, data);
-
-	cmd_params_free(free_arg);
 }

 /* window's refnum changed - update the logs to log the new window refnum */
@ -365,7 +355,7 @@ static void sig_window_refnum_changed(WINDOW_REC *window, gpointer old_refnum)
 	LOG_REC *log;
 	LOG_ITEM_REC *item;

-	ltoa(winnum, GPOINTER_TO_INT(old_refnum));
+        ltoa(winnum, GPOINTER_TO_INT(old_refnum));
 	log = logs_find_item(LOG_ITEM_WINDOW_REFNUM, winnum, NULL, &item);

 	if (log != NULL) {
@ -378,7 +368,7 @@ static void sig_window_refnum_changed(WINDOW_REC *window, gpointer old_refnum)

 static void sig_server_disconnected(SERVER_REC *server)
 {
-	LOG_ITEM_REC *logitem;
+        LOG_ITEM_REC *logitem;
 	GSList *tmp, *next;

 	for (tmp = logs; tmp != NULL; tmp = next) {
@ -386,13 +376,13 @@ static void sig_server_disconnected(SERVER_REC *server)
 		next = tmp->next;

 		if (!log->temp || log->items == NULL)
-			continue;
+                        continue;

 		logitem = log->items->data;
-		if (logitem->type == LOG_ITEM_TARGET && logitem->servertag != NULL &&
+		if (logitem->type == LOG_ITEM_TARGET &&
+		    logitem->servertag != NULL &&
 		    g_ascii_strcasecmp(logitem->servertag, server->tag) == 0 &&
-		    server_ischannel(
-		        server, logitem->name)) /* kludge again.. so we won't close dcc chats */
+		    server_ischannel(server, logitem->name)) /* kludge again.. so we won't close dcc chats */
 			log_close(log);
 	}
 }
@ -424,14 +414,15 @@ static char *escape_target(const char *target)
 			*p++ = *target;
 		}

-		target++;
+                target++;
 	}
 	*p = '\0';

-	return str;
+        return str;
 }

-static void autolog_open(SERVER_REC *server, const char *server_tag, const char *target)
+static void autolog_open(SERVER_REC *server, const char *server_tag,
+			 const char *target)
 {
 	LOG_REC *log;
 	char *fname, *dir, *fixed_target, *params;
@ -452,16 +443,17 @@ static void autolog_open(SERVER_REC *server, const char *server_tag, const char
 	if (CHAT_PROTOCOL(server)->case_insensitive)
 		ascii_strdown(fixed_target);

-	/* $0 = target, $1 = server tag */
-	params = g_strconcat(fixed_target, " ", server_tag, NULL);
+        /* $0 = target, $1 = server tag */
+        params = g_strconcat(fixed_target, " ", server_tag, NULL);
 	g_free(fixed_target);

-	fname = parse_special_string(autolog_path, server, NULL, params, NULL, 0);
+	fname = parse_special_string(autolog_path, server, NULL,
+				     params, NULL, 0);
 	g_free(params);

 	if (log_find(fname) == NULL) {
 		log = log_create_rec(fname, autolog_level);
-		if (!settings_get_bool("autolog_colors"))
+                if (!settings_get_bool("autolog_colors"))
 			log->colorizer = log_colorizer_strip;
 		log_item_add(log, LOG_ITEM_TARGET, target, server_tag);

@ -492,8 +484,8 @@ static void autolog_open_check(TEXT_DEST_REC *dest)
 	   we're parting the channel with /WINDOW CLOSE.. Maybe a small
 	   timeout would be nice instead of immediately closing the log file
 	   after "window item destroyed" */
-	if (level == MSGLEVEL_PARTS || (autolog_level & level) == 0 || target == NULL ||
-	    *target == '\0')
+	if (level == MSGLEVEL_PARTS ||
+	    (autolog_level & level) == 0 || target == NULL || *target == '\0')
 		return;

 	deftarget = server ? server->nick : "unknown";
@ -503,7 +495,8 @@ static void autolog_open_check(TEXT_DEST_REC *dest)
 		&& channel_setup_find(target, server_tag) == NULL)
 		return;

-	if (autolog_ignore_targets != NULL && strarray_find_dest(autolog_ignore_targets, dest))
+	if (autolog_ignore_targets != NULL &&
+	    strarray_find_dest(autolog_ignore_targets, dest))
 		return;

 	if (target != NULL)
@ -519,7 +512,8 @@ static void log_single_line(WINDOW_REC *window, const char *server_tag, const ch
 	if (window != NULL) {
 		/* save to log created with /WINDOW LOG */
 		ltoa(windownum, window->refnum);
-		log = logs_find_item(LOG_ITEM_WINDOW_REFNUM, windownum, NULL, NULL);
+		log = logs_find_item(LOG_ITEM_WINDOW_REFNUM,
+				     windownum, NULL, NULL);
 		if (log != NULL)
 			log_write_rec(log, text, level, t);
 	}
@ -548,7 +542,7 @@ static void log_line(TEXT_DEST_REC *dest, const char *text)
 		char *val;
 		if ((val = g_hash_table_lookup(dest->meta, "time")) != NULL) {
 			GDateTime *time;
-			if ((time = g_date_time_new_from_iso8601(val, utc)) != NULL) {
+			if ((time = g_date_time_new_from_iso8601(val, NULL)) != NULL) {
 				t = g_date_time_to_unix(time);
 				g_date_time_unref(time);
 			}
@ -559,7 +553,8 @@ static void log_line(TEXT_DEST_REC *dest, const char *text)
 	g_strfreev(lines);
 }

-static void sig_printtext(TEXT_DEST_REC *dest, const char *text, const char *stripped)
+static void sig_printtext(TEXT_DEST_REC *dest, const char *text,
+			  const char *stripped)
 {
 	if (skip_next_printtext) {
 		skip_next_printtext = FALSE;
@ -569,8 +564,8 @@ static void sig_printtext(TEXT_DEST_REC *dest, const char *text, const char *str
 	log_line(dest, text);
 }

-static void sig_print_format(THEME_REC *theme, const char *module, TEXT_DEST_REC *dest,
-                             void *formatnum, char **args)
+static void sig_print_format(THEME_REC *theme, const char *module,
+			     TEXT_DEST_REC *dest, void *formatnum, char **args)
 {
 	char *str, *linestart, *tmp;

@ -584,14 +579,14 @@ static void sig_print_format(THEME_REC *theme, const char *module, TEXT_DEST_REC
 	if (theme == log_theme)
 		return;

-	str = format_get_text_theme_charargs(log_theme, module, dest, GPOINTER_TO_INT(formatnum),
-	                                     args);
+	str = format_get_text_theme_charargs(log_theme, module, dest,
+					     GPOINTER_TO_INT(formatnum), args);
 	if (str != NULL && *str != '\0') {
 		skip_next_printtext = TRUE;

 		/* add the line start format */
 		linestart = format_get_level_tag(log_theme, dest);
-		tmp = str;
+                tmp = str;
 		str = format_add_linestart(tmp, linestart);
 		g_free_not_null(linestart);
 		g_free(tmp);
@ -610,14 +605,14 @@ static int sig_autoremove(void)
 	GSList *tmp, *next;
 	time_t removetime;

-	removetime = time(NULL) - AUTOLOG_INACTIVITY_CLOSE;
+        removetime = time(NULL)-AUTOLOG_INACTIVITY_CLOSE;
 	for (tmp = logs; tmp != NULL; tmp = next) {
 		LOG_REC *log = tmp->data;

 		next = tmp->next;

 		if (!log->temp || log->last > removetime || log->items == NULL)
-			continue;
+                        continue;

 		/* Close only logs with private messages */
 		logitem = log->items->data;
@ -625,8 +620,8 @@ static int sig_autoremove(void)
 			continue;

 		server = server_find_tag(logitem->servertag);
-		if (logitem->type == LOG_ITEM_TARGET && server != NULL &&
-		    !server_ischannel(server, logitem->name))
+		if (logitem->type == LOG_ITEM_TARGET &&
+		    server != NULL && !server_ischannel(server, logitem->name))
 			log_close(log);
 	}
 	return 1;
@ -637,40 +632,43 @@ static void sig_window_item_remove(WINDOW_REC *window, WI_ITEM_REC *item)
 	LOG_REC *log;

 	log = logs_find_item(LOG_ITEM_TARGET, item->visible_name,
-	                     item->server == NULL ? NULL : item->server->tag, NULL);
+			     item->server == NULL ? NULL :
+			     item->server->tag, NULL);
 	if (log != NULL && log->temp)
 		log_close(log);
 }

 static void sig_log_locked(LOG_REC *log)
 {
-	printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_LOG_LOCKED, log->real_fname);
+	printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
+		    TXT_LOG_LOCKED, log->real_fname);
 }

 static void sig_log_create_failed(LOG_REC *log)
 {
-	printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_LOG_CREATE_FAILED, log->real_fname,
-	            g_strerror(errno));
+	printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
+		    TXT_LOG_CREATE_FAILED,
+		    log->real_fname, g_strerror(errno));
 }

 static void sig_log_new(LOG_REC *log)
 {
 	if (!settings_get_bool("awaylog_colors") &&
 	    g_strcmp0(log->fname, settings_get_str("awaylog_file")) == 0)
-		log->colorizer = log_colorizer_strip;
+                log->colorizer = log_colorizer_strip;
 }

 static void sig_log_config_read(LOG_REC *log, CONFIG_NODE *node)
 {
-	if (!config_node_get_bool(node, "colors", FALSE))
+        if (!config_node_get_bool(node, "colors", FALSE))
 		log->colorizer = log_colorizer_strip;
 }

 static void sig_log_config_save(LOG_REC *log, CONFIG_NODE *node)
 {
-	if (log->colorizer == NULL)
+        if (log->colorizer == NULL)
 		iconfig_node_set_bool(node, "colors", TRUE);
-	else
+        else
 		iconfig_node_set_str(node, "colors", NULL);
 }

@ -687,7 +685,7 @@ static void sig_awaylog_show(LOG_REC *log, gpointer pmsgs, gpointer pfilepos)
 	else {
 		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_LOG_AWAY_MSGS, log->real_fname, msgs);

-		str = g_strdup_printf("\"%s\" %d", log->real_fname, filepos);
+                str = g_strdup_printf("\"%s\" %d", log->real_fname, filepos);
 		signal_emit("command cat", 1, str);
 		g_free(str);
 	}
@ -746,16 +744,15 @@ void fe_log_init(void)
 {
 	autoremove_tag = g_timeout_add(60000, (GSourceFunc) sig_autoremove, NULL);
 	skip_next_printtext = FALSE;
-	utc = g_time_zone_new_utc();

 	settings_add_bool("log", "awaylog_colors", TRUE);
-	settings_add_bool("log", "autolog", FALSE);
+        settings_add_bool("log", "autolog", FALSE);
 	settings_add_bool("log", "autolog_colors", FALSE);
 	settings_add_bool("log", "autolog_only_saved_channels", FALSE);
 	settings_add_choice("log", "log_server_time", 2, "off;on;auto");
 	settings_add_str("log", "autolog_path", "~/irclogs/$tag/$0.log");
 	settings_add_level("log", "autolog_level", "all -crap -clientcrap -ctcps");
-	settings_add_str("log", "log_theme", "");
+        settings_add_str("log", "log_theme", "");
 	settings_add_str("log", "autolog_ignore_targets", "");

 	autolog_level = 0;
@ -814,7 +811,6 @@ void fe_log_deinit(void)
 	if (autolog_ignore_targets != NULL)
 		g_strfreev(autolog_ignore_targets);

-	g_time_zone_unref(utc);
 	g_free_not_null(autolog_path);
 	g_free_not_null(log_theme_name);
 }
--- a/src/fe-common/core/fe-modules.c
+++ b/src/fe-common/core/fe-modules.c
@ -29,6 +29,8 @@

 #include <irssi/src/fe-common/core/printtext.h>

+#ifdef HAVE_GMODULE
+
 static void sig_module_error(void *number, const char *data,
 			     const char *rootmodule, const char *submodule)
 {
@ -271,3 +273,22 @@ void fe_modules_deinit(void)
 	command_unbind("load", (SIGNAL_FUNC) cmd_load);
 	command_unbind("unload", (SIGNAL_FUNC) cmd_unload);
 }
+
+#else /* !HAVE_GMODULE */
+
+static void cmd_load(const char *data)
+{
+	printtext(NULL, NULL, MSGLEVEL_CLIENTERROR,
+		  "Dynamic modules loading not supported");
+}
+
+void fe_modules_init(void)
+{
+	command_bind("load", NULL, (SIGNAL_FUNC) cmd_load);
+}
+
+void fe_modules_deinit(void)
+{
+	command_unbind("load", (SIGNAL_FUNC) cmd_load);
+}
+#endif
--- a/src/fe-common/core/fe-queries.c
+++ b/src/fe-common/core/fe-queries.c
@ -355,7 +355,7 @@ static void read_settings(void)

 void fe_queries_init(void)
 {
-	settings_add_level("lookandfeel", "autocreate_query_level", "MSGS DCCMSGS NOTICES");
+	settings_add_level("lookandfeel", "autocreate_query_level", "MSGS DCCMSGS");
 	settings_add_bool("lookandfeel", "autocreate_own_query", TRUE);
 	settings_add_time("lookandfeel", "autoclose_query", "0");

--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@ -101,14 +101,8 @@ static SERVER_SETUP_REC *create_server_setup(GHashTable *optlist)
 		}
 	}

-	if (rec == NULL) {
-		/* no protocols loaded, bail out */
-		signal_emit("chat protocol unknown", 1, "(none)");
-		return NULL;
-	}
-
-	server = rec->create_server_setup();
-	server->chat_type = rec->id;
+        server = rec->create_server_setup();
+        server->chat_type = rec->id;
 	server->tls_verify = TRUE;
 	return server;
 }
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@ -142,6 +142,7 @@ static void format_ext_color_unexpand(GString *out, gboolean bg, int base, char
 	g_string_append_c(out, ext_color_al[value % 36]);
 }

+#ifdef TERM_TRUECOLOR
 void unformat_24bit_color(char **ptr, int off, int *fgcolor, int *bgcolor, int *flags)
 {
 	unsigned int color;
@ -190,10 +191,12 @@ static void format_24bit_color_unexpand(GString *out, int off, const char **ptr)
 	g_string_append_c(out, rgbx[3] & 0x1 ? 'z' : 'Z');
 	g_string_append_printf(out, "%06X", color);
 }
+#endif

 void format_24bit_color(GString *out, int bg, unsigned int color)
 {
 	unsigned char rgb[] = { color >> 16, color >> 8, color };
+#ifdef TERM_TRUECOLOR
 	unsigned char x = bg ? 0x1 : 0;
 	unsigned int i;
 	g_string_append_c(out, 4);
@ -207,6 +210,9 @@ void format_24bit_color(GString *out, int bg, unsigned int color)
 		}
 	}
 	g_string_append_c(out, 0x20 + x);
+#else /* !TERM_TRUECOLOR */
+	format_ext_color(out, bg, color_24bit_256(rgb));
+#endif /* TERM_TRUECOLOR */
 }

 int format_expand_styles(GString *out, const char **format, int *flags)
@ -662,9 +668,11 @@ char *format_string_unexpand(const char *text, int flags)
 			case FORMAT_COLOR_EXT3_BG:
 				format_ext_color_unexpand(out, TRUE, 0xb0, *++text);
 				break;
+#ifdef TERM_TRUECOLOR
 			case FORMAT_COLOR_24:
 				format_24bit_color_unexpand(out, 1, &text);
 				break;
+#endif
 			case FORMAT_STYLE_BLINK:
 				format_flag_unexpand(out, 'F');
 				break;
@ -921,10 +929,10 @@ char *format_add_lineend(const char *text, const char *linestart)
 #define LINE_START_IRSSI_LEVEL \
 	(MSGLEVEL_CLIENTERROR | MSGLEVEL_CLIENTNOTICE)

-#define NOT_LINE_START_LEVEL                                                                       \
-	(MSGLEVEL_NEVER | MSGLEVEL_LASTLOG | MSGLEVEL_CLIENTCRAP | MSGLEVEL_MSGS |                 \
-	 MSGLEVEL_PUBLIC | MSGLEVEL_DCC | MSGLEVEL_DCCMSGS | MSGLEVEL_ACTIONS | MSGLEVEL_NOTICES | \
-	 MSGLEVEL_PUBNOTICES | MSGLEVEL_SNOTES | MSGLEVEL_CTCPS)
+#define NOT_LINE_START_LEVEL \
+	(MSGLEVEL_NEVER | MSGLEVEL_LASTLOG | MSGLEVEL_CLIENTCRAP | \
+	MSGLEVEL_MSGS | MSGLEVEL_PUBLIC | MSGLEVEL_DCC | MSGLEVEL_DCCMSGS | \
+	MSGLEVEL_ACTIONS | MSGLEVEL_NOTICES | MSGLEVEL_SNOTES | MSGLEVEL_CTCPS)

 /* return the "-!- " text at the start of the line */
 char *format_get_level_tag(THEME_REC *theme, TEXT_DEST_REC *dest)
@ -1049,6 +1057,13 @@ void format_newline(TEXT_DEST_REC *dest)
 	               GINT_TO_POINTER(-1), GINT_TO_POINTER(GUI_PRINT_FLAG_NEWLINE), "", dest);
 }

+#ifndef TERM_TRUECOLOR
+inline static int color_24bit_256_int(unsigned int color)
+{
+	unsigned char rgb[] = { color >> 16, color >> 8, color };
+	return color_24bit_256(rgb);
+}
+#endif /* !TERM_TRUECOLOR */

 /* parse ANSI color string */
 static const char *get_ansi_color(THEME_REC *theme, const char *str,
@ -1176,7 +1191,7 @@ static const char *get_ansi_color(THEME_REC *theme, const char *str,
 				}

 				if (i == -1) break;
-
+#ifdef TERM_TRUECOLOR
 				if (num == 38) {
 					flags |= GUI_PRINT_FLAG_COLOR_24_FG;
 					fg = num2;
@ -1184,6 +1199,15 @@ static const char *get_ansi_color(THEME_REC *theme, const char *str,
 					flags |= GUI_PRINT_FLAG_COLOR_24_BG;
 					bg = num2;
 				}
+#else /* !TERM_TRUECOLOR */
+				if (num == 38) {
+					flags &= ~GUI_PRINT_FLAG_COLOR_24_FG;
+					fg = color_24bit_256_int(num2);
+				} else if (num == 48) {
+					flags &= ~GUI_PRINT_FLAG_COLOR_24_BG;
+					bg = color_24bit_256_int(num2);
+				}
+#endif

 				break;
 			case 5:
@ -1279,7 +1303,7 @@ static void get_mirc_color(const char **str, int *fg_ret, int *bg_ret)

 #define IS_COLOR_CODE(c) \
 	((c) == 2 || (c) == 3 || (c) == 4 || (c) == 6 || (c) == 7 || \
-	(c) == 15 || (c) == 17 || (c) == 22 || (c) == 27 || (c) == 29 || (c) == 31)
+	(c) == 15 || (c) == 22 || (c) == 27 || (c) == 29 || (c) == 31)

 /* Return how many characters in `str' must be skipped before `len'
   characters of text is skipped. */
@ -1308,6 +1332,7 @@ int strip_real_length(const char *str, int len,
 			/* We expect 4 to indicate an internal Irssi color code. However 4
 			 * also means hex color, an alternative to mIRC color codes. We
 			 * don't support those. */
+#ifdef TERM_TRUECOLOR
 			if (str[1] == FORMAT_COLOR_24 && str[2] != '\0') {
 				if (str[3] == '\0') str++;
 				else if (str[4] == '\0') str += 2;
@ -1319,7 +1344,9 @@ int strip_real_length(const char *str, int len,
 						*last_color_len = 6;
 					str+=4;
 				}
-			} else if (str[1] < FORMAT_STYLE_SPECIAL && str[2] != '\0') {
+			} else
+#endif
+			if (str[1] < FORMAT_STYLE_SPECIAL && str[2] != '\0') {
 				if (last_color_pos != NULL)
 					*last_color_pos = (int) (str-start);
 				if (last_color_len != NULL)
@ -1368,12 +1395,14 @@ char *strip_codes(const char *input)

 			/* irssi color */
 			if (p[2] != '\0') {
+#ifdef TERM_TRUECOLOR
 				if (p[1] == FORMAT_COLOR_24) {
 					if (p[3] == '\0') p += 2;
 					else if (p[4] == '\0') p += 3;
 					else if (p[5] == '\0') p += 4;
 					else p += 5;
 				} else
+#endif /* TERM_TRUECOLOR */
 				p += 2;
 				continue;
 			}
@ -1521,9 +1550,11 @@ void format_send_as_gui_flags(TEXT_DEST_REC *dest, const char *text, SIGNAL_FUNC
 				bgcolor = 0xb0 + *++ptr - FORMAT_COLOR_NOCHANGE;
 				flags &= ~GUI_PRINT_FLAG_COLOR_24_BG;
 				break;
+#ifdef TERM_TRUECOLOR
 			case FORMAT_COLOR_24:
 				unformat_24bit_color(&ptr, 1, &fgcolor, &bgcolor, &flags);
 				break;
+#endif
 			default:
 				if (*ptr != FORMAT_COLOR_NOCHANGE) {
 					flags &= ~GUI_PRINT_FLAG_COLOR_24_FG;
@ -1554,10 +1585,6 @@ void format_send_as_gui_flags(TEXT_DEST_REC *dest, const char *text, SIGNAL_FUNC
 			bgcolor = -1;
 			flags &= GUI_PRINT_FLAG_INDENT|GUI_PRINT_FLAG_MONOSPACE;
 			break;
-		case 17:
-			if (!hide_text_style)
-				flags ^= GUI_PRINT_FLAG_MONOSPACE;
-			break;
 		case 22:
 			/* reverse */
 			if (!hide_text_style)
@ -1610,11 +1637,13 @@ void format_gui_flags(GString *out, int *last_fg, int *last_bg, int *last_flags,
 	    (flags & GUI_PRINT_FLAG_COLOR_24_FG) != (*last_flags & GUI_PRINT_FLAG_COLOR_24_FG)) {
 		*last_fg = fg;

+#ifdef TERM_TRUECOLOR
 		if (flags & GUI_PRINT_FLAG_COLOR_24_FG) {
 			*last_flags |= GUI_PRINT_FLAG_COLOR_24_FG;
 			format_24bit_color(out, 0, fg);
 		} else {
 			*last_flags &= ~GUI_PRINT_FLAG_COLOR_24_FG;
+#endif
 			if (fg < 0) {
 				g_string_append_c(out, 4);
 				g_string_append_c(out, (char) -1);
@ -1622,16 +1651,20 @@ void format_gui_flags(GString *out, int *last_fg, int *last_bg, int *last_flags,
 			} else {
 				format_ext_color(out, 0, fg);
 			}
+#ifdef TERM_TRUECOLOR
 		}
+#endif
 	}
 	if (bg != *last_bg ||
 	    (flags & GUI_PRINT_FLAG_COLOR_24_BG) != (*last_flags & GUI_PRINT_FLAG_COLOR_24_BG)) {
 		*last_bg = bg;
+#ifdef TERM_TRUECOLOR
 		if (flags & GUI_PRINT_FLAG_COLOR_24_BG) {
 			*last_flags |= GUI_PRINT_FLAG_COLOR_24_BG;
 			format_24bit_color(out, 1, bg);
 		} else {
 			*last_flags &= ~GUI_PRINT_FLAG_COLOR_24_BG;
+#endif
 			if (bg < 0) {
 				g_string_append_c(out, 4);
 				g_string_append_c(out, FORMAT_COLOR_NOCHANGE);
@ -1639,7 +1672,9 @@ void format_gui_flags(GString *out, int *last_fg, int *last_bg, int *last_flags,
 			} else {
 				format_ext_color(out, 1, bg);
 			}
+#ifdef TERM_TRUECOLOR
 		}
+#endif
 	}

 	if ((flags & GUI_PRINT_FLAG_UNDERLINE) != (*last_flags & GUI_PRINT_FLAG_UNDERLINE)) {
--- a/src/fe-common/core/formats.h
+++ b/src/fe-common/core/formats.h
@ -158,7 +158,9 @@ void format_send_as_gui_flags(TEXT_DEST_REC *dest, const char *text, SIGNAL_FUNC
 #define FORMAT_COLOR_EXT1_BG	('0'-5)
 #define FORMAT_COLOR_EXT2_BG	('0'-9)
 #define FORMAT_COLOR_EXT3_BG	('0'-10)
+#ifdef TERM_TRUECOLOR
 #define FORMAT_COLOR_24	('0'-13)
+#endif

 #define FORMAT_STYLE_SPECIAL	0x60
 #define FORMAT_STYLE_BLINK	(0x01 + FORMAT_STYLE_SPECIAL)
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@ -39,9 +39,9 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ "set_server_sticky", "Window's server set sticky", 1, { 0 } },
 	{ "unset_server_sticky", "Window's server isn't sticky anymore", 0 },
 	{ "window_name_not_unique", "Window names must be unique", 1, { 0 } },
-	{ "window_level", "Window level is $0", 1, { 0 } },
-	{ "window_set_immortal", "Window is immortal", 0 },
-	{ "window_unset_immortal", "Window isn't immortal", 0 },
+	{ "window_level", "Window level is now $0", 1, { 0 } },
+	{ "window_set_immortal", "Window is now immortal", 0 },
+	{ "window_unset_immortal", "Window isn't immortal anymore", 0 },
 	{ "window_immortal_error", "Window is immortal, if you really want to close it, say /WINDOW IMMORTAL OFF", 0 },
 	{ "windowlist_header", "%#Ref  Name                 Active item     Server          Level", 0 },
 	{ "windowlist_line", "%#$[4]0 %|$[20]1 $[15]2 $[15]3 $4", 5, { 1, 0, 0, 0, 0 } },
--- a/src/fe-common/core/window-activity.c
+++ b/src/fe-common/core/window-activity.c
@ -143,7 +143,7 @@ void window_activity_init(void)
 {
 	settings_add_str("lookandfeel", "activity_hide_targets", "");
 	settings_add_level("lookandfeel", "activity_hide_level", "");
-	settings_add_level("lookandfeel", "activity_msg_level", "PUBLIC NOTICES");
+	settings_add_level("lookandfeel", "activity_msg_level", "PUBLIC");
 	settings_add_level("lookandfeel", "activity_hilight_level", "MSGS DCCMSGS");
 	signal_window_hilight_check = signal_get_uniq_id("window hilight check");

--- a/src/fe-common/core/window-commands.c
+++ b/src/fe-common/core/window-commands.c
@ -400,7 +400,7 @@ static void cmd_window_previous(void)
 	window_set_active(window_find_refnum(num));
 }

-/* SYNTAX: WINDOW LEVEL [<levels>] */
+/* SYNTAX: WINDOW LEVEL [<level>] */
 static void cmd_window_level(const char *data)
 {
 	char *level;
--- a/src/fe-common/irc/Makefile.am
+++ b/src/fe-common/irc/Makefile.am
@ -0,0 +1,42 @@
+SUBDIRS = dcc notifylist
+
+noinst_LIBRARIES = libfe_common_irc.a
+
+AM_CPPFLAGS = \
+	-I$(top_builddir) \
+	$(GLIB_CFLAGS) \
+	-DHELPDIR=\""$(datadir)/irssi/help"\" \
+	-DSYSCONFDIR=\""$(sysconfdir)"\"
+
+real_sources = \
+	fe-irc-channels.c \
+	fe-irc-commands.c \
+	fe-irc-messages.c \
+	fe-irc-queries.c \
+	fe-irc-server.c \
+	fe-ircnet.c \
+	fe-ctcp.c \
+	fe-events.c \
+	fe-events-numeric.c \
+	fe-modes.c \
+	fe-netjoin.c \
+	fe-netsplit.c \
+	fe-common-irc.c \
+	fe-whois.c \
+	fe-sasl.c \
+	fe-cap.c \
+	irc-completion.c \
+	module-formats.c 
+
+libfe_common_irc_a_SOURCES = \
+	$(real_sources) \
+        irc-modules.c
+
+pkginc_fe_common_ircdir=$(pkgincludedir)/src/fe-common/irc
+pkginc_fe_common_irc_HEADERS = \
+	fe-irc-server.h \
+	fe-irc-channels.h \
+	module.h \
+	module-formats.h
+
+EXTRA_DIST = meson.build
--- a/src/fe-common/irc/dcc/Makefile.am
+++ b/src/fe-common/irc/dcc/Makefile.am
@ -0,0 +1,24 @@
+noinst_LIBRARIES = libfe_irc_dcc.a
+
+AM_CPPFLAGS = \
+	-I$(top_builddir) \
+	$(GLIB_CFLAGS) \
+	-DHELPDIR=\""$(datadir)/irssi/help"\" \
+	-DSYSCONFDIR=\""$(sysconfdir)"\"
+
+libfe_irc_dcc_a_SOURCES = \
+	fe-dcc.c \
+	fe-dcc-chat.c \
+	fe-dcc-chat-messages.c \
+	fe-dcc-get.c \
+	fe-dcc-send.c \
+	module-formats.c \
+	fe-dcc-server.c
+
+pkginc_fe_common_irc_dccdir=$(pkgincludedir)/src/fe-common/irc/dcc
+pkginc_fe_common_irc_dcc_HEADERS = \
+	module.h \
+	module-formats.h \
+	fe-dcc.h
+
+EXTRA_DIST = meson.build
--- a/src/fe-common/irc/dcc/meson.build
+++ b/src/fe-common/irc/dcc/meson.build
@ -17,12 +17,6 @@ libfe_irc_dcc_a = static_library('fe_irc_dcc',
    def_sysconfdir,
  ],
  dependencies : dep)
-shared_module('fe_irc_dcc',
-  name_suffix : module_suffix,
-  install : true,
-  install_dir : moduledir,
-  link_with : dl_cross_irc_dcc,
-  link_whole : libfe_irc_dcc_a)

 install_headers(
  files(
--- a/src/fe-common/irc/fe-common-irc.c
+++ b/src/fe-common/irc/fe-common-irc.c
@ -30,6 +30,9 @@
 #include <irssi/src/fe-common/irc/fe-irc-server.h>
 #include <irssi/src/fe-common/irc/fe-irc-channels.h>

+void fe_irc_modules_init(void);
+void fe_irc_modules_deinit(void);
+
 void fe_irc_queries_init(void);
 void fe_irc_queries_deinit(void);

@ -100,10 +103,14 @@ void fe_common_irc_init(void)

 	settings_check();
 	module_register("irc", "fe-common");
+
+	fe_irc_modules_init();
 }

 void fe_common_irc_deinit(void)
 {
+	fe_irc_modules_deinit();
+
 	fe_irc_channels_deinit();
 	fe_irc_queries_deinit();
 	fe_irc_messages_deinit();
--- a/src/fe-common/irc/fe-ctcp.c
+++ b/src/fe-common/irc/fe-ctcp.c
@ -119,10 +119,11 @@ static void ctcp_default_reply(IRC_SERVER_REC *server, const char *data,
 	g_free(ctcp);
 }

-static void ctcp_ping_reply(IRC_SERVER_REC *server, const char *data, const char *nick,
-                            const char *addr, const char *target)
+static void ctcp_ping_reply(IRC_SERVER_REC *server, const char *data,
+			    const char *nick, const char *addr,
+			    const char *target)
 {
-	gint64 tv, tv2 = 0;
+	gint64 tv, tv2;
 	long usecs;

 	g_return_if_fail(data != NULL);
@ -140,9 +141,8 @@ static void ctcp_ping_reply(IRC_SERVER_REC *server, const char *data, const char
 	tv2 += tv * G_TIME_SPAN_SECOND;
 	tv = g_get_real_time();
 	usecs = tv - tv2;
-	printformat(server, server_ischannel(SERVER(server), target) ? target : nick,
-	            MSGLEVEL_CTCPS, IRCTXT_CTCP_PING_REPLY, nick, usecs / G_TIME_SPAN_SECOND,
-	            usecs % G_TIME_SPAN_SECOND);
+	printformat(server, server_ischannel(SERVER(server), target) ? target : nick, MSGLEVEL_CTCPS,
+		    IRCTXT_CTCP_PING_REPLY, nick, usecs / G_TIME_SPAN_SECOND, usecs % G_TIME_SPAN_SECOND);
 }

 void fe_ctcp_init(void)
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@ -35,7 +35,6 @@
 #include <irssi/src/fe-common/core/printtext.h>
 #include <irssi/src/fe-common/core/fe-channels.h>
 #include <irssi/src/fe-common/irc/fe-irc-server.h>
-#include <irssi/src/fe-common/irc/fe-irc-channels.h>

 static void print_event_received(IRC_SERVER_REC *server, const char *data,
 				 const char *nick, int target_param);
@ -144,74 +143,45 @@ static void event_ban_list(IRC_SERVER_REC *server, const char *data)
 	IRC_CHANNEL_REC *chanrec;
 	BAN_REC *banrec;
 	const char *channel;
-	char *params, *ban, *setby, *tims, *timestr, *ago;
+	char *params, *ban, *setby, *tims;
+	long secs;

 	g_return_if_fail(data != NULL);

 	params = event_get_params(data, 5, NULL, &channel,
 				  &ban, &setby, &tims);
-	timestr = my_asctime((time_t) atoll(tims));
-	ago = time_ago((time_t) atoll(tims));
+	secs = *tims == '\0' ? 0 :
+		(long) (time(NULL) - atol(tims));

 	chanrec = irc_channel_find(server, channel);
 	banrec = chanrec == NULL ? NULL : banlist_find(chanrec->banlist, ban);

 	channel = get_visible_target(server, channel);
 	printformat(server, channel, MSGLEVEL_CRAP,
-	            *setby == '\0' ? IRCTXT_BANLIST : IRCTXT_BANLIST_LONG,
-	            banrec == NULL ? 0 : g_slist_index(chanrec->banlist, banrec) + 1, channel, ban,
-	            setby, ago, timestr);
+		    *setby == '\0' ? IRCTXT_BANLIST : IRCTXT_BANLIST_LONG,
+		    banrec == NULL ? 0 : g_slist_index(chanrec->banlist, banrec)+1,
+		    channel, ban, setby, secs);

-	g_free(timestr);
 	g_free(params);
 }

 static void event_eban_list(IRC_SERVER_REC *server, const char *data)
 {
 	const char *channel;
-	char *params, *ban, *setby, *tims, *timestr, *ago;
+	char *params, *ban, *setby, *tims;
+	long secs;

 	g_return_if_fail(data != NULL);

 	params = event_get_params(data, 5, NULL, &channel,
 				  &ban, &setby, &tims);
-	timestr = my_asctime((time_t) atoll(tims));
-	ago = time_ago((time_t) atoll(tims));
+	secs = *tims == '\0' ? 0 :
+		(long) (time(NULL) - atol(tims));

 	channel = get_visible_target(server, channel);
 	printformat(server, channel, MSGLEVEL_CRAP,
-	            *setby == '\0' ? IRCTXT_EBANLIST : IRCTXT_EBANLIST_LONG, channel, ban, setby,
-	            timestr, ago);
-
-	g_free(timestr);
-	g_free(params);
-}
-
-static void do_quiet_list(IRC_SERVER_REC *server, const char *channel, char *ban, char *setby,
-                          char *tims)
-{
-	char *timestr, *ago;
-
-	timestr = my_asctime((time_t) atoll(tims));
-	ago = time_ago((time_t) atoll(tims));
-
-	channel = get_visible_target(server, channel);
-	printformat(server, channel, MSGLEVEL_CRAP,
-	            *setby == '\0' ? IRCTXT_QUIETLIST : IRCTXT_QUIETLIST_LONG, channel, ban, setby,
-	            ago, timestr);
-
-	g_free(timestr);
-}
-
-static void event_quiet_list(IRC_SERVER_REC *server, const char *data)
-{
-	const char *channel;
-	char *params, *ban, *setby, *tims;
-
-	g_return_if_fail(data != NULL);
-
-	params = event_get_params(data, 6, NULL, &channel, NULL, &ban, &setby, &tims);
-	do_quiet_list(server, channel, ban, setby, tims);
+		    *setby == '\0' ? IRCTXT_EBANLIST : IRCTXT_EBANLIST_LONG,
+		    channel, ban, setby, secs);

 	g_free(params);
 }
@ -244,21 +214,20 @@ static void event_accept_list(IRC_SERVER_REC *server, const char *data)
 static void event_invite_list(IRC_SERVER_REC *server, const char *data)
 {
 	const char *channel;
-	char *params, *invite, *setby, *tims, *timestr, *ago;
+	char *params, *invite, *setby, *tims;
+	long secs;

 	g_return_if_fail(data != NULL);

 	params = event_get_params(data, 5, NULL, &channel, &invite,
 			&setby, &tims);
-	timestr = my_asctime((time_t) atoll(tims));
-	ago = time_ago((time_t) atoll(tims));
+	secs = *tims == '\0' ? 0 :
+		(long) (time(NULL) - atol(tims));

 	channel = get_visible_target(server, channel);
 	printformat(server, channel, MSGLEVEL_CRAP,
-	            *setby == '\0' ? IRCTXT_INVITELIST : IRCTXT_INVITELIST_LONG, channel, invite,
-	            setby, timestr, ago);
-
-	g_free(timestr);
+		    *setby == '\0' ? IRCTXT_INVITELIST : IRCTXT_INVITELIST_LONG,
+		    channel, invite, setby, secs);
 	g_free(params);
 }

@ -726,26 +695,6 @@ static void event_target_received(IRC_SERVER_REC *server, const char *data,
        print_event_received(server, data, nick, TRUE);
 }

-static void event_hybrid_quiet_list(IRC_SERVER_REC *server, const char *data)
-{
-	const char *channel;
-	char *params, *ban, *setby, *tims;
-
-	g_return_if_fail(data != NULL);
-
-	params = event_get_params(data, 5, NULL, &channel, &ban, &setby, &tims);
-
-	if (*tims == '\0') {
-		/* probably not a quiet list */
-		event_target_received(server, data, NULL);
-		return;
-	}
-
-	do_quiet_list(server, channel, ban, setby, tims);
-
-	g_free(params);
-}
-
 static void event_motd(IRC_SERVER_REC *server, const char *data,
 		       const char *nick, const char *addr)
 {
@ -778,8 +727,6 @@ void fe_events_numeric_init(void)
 	signal_add("event 281", (SIGNAL_FUNC) event_accept_list);
 	signal_add("event 367", (SIGNAL_FUNC) event_ban_list);
 	signal_add("event 348", (SIGNAL_FUNC) event_eban_list);
-	signal_add("event 728", (SIGNAL_FUNC) event_quiet_list);
-	signal_add("event 344", (SIGNAL_FUNC) event_hybrid_quiet_list); /* used by ircd-hybrid */
 	signal_add("event 346", (SIGNAL_FUNC) event_invite_list);
 	signal_add("event 433", (SIGNAL_FUNC) event_nick_in_use);
 	signal_add("event 332", (SIGNAL_FUNC) event_topic_get);
@ -838,7 +785,8 @@ void fe_events_numeric_init(void)
 	signal_add("event 470", (SIGNAL_FUNC) event_received);
 	signal_add("event 479", (SIGNAL_FUNC) event_received);

-	signal_add("event 345", (SIGNAL_FUNC) event_target_received); /* end of reop list/hybrid quiet list */
+	signal_add("event 344", (SIGNAL_FUNC) event_target_received); /* reop list */
+	signal_add("event 345", (SIGNAL_FUNC) event_target_received); /* end of reop list */
 	signal_add("event 347", (SIGNAL_FUNC) event_target_received); /* end of invite exception list */
 	signal_add("event 349", (SIGNAL_FUNC) event_target_received); /* end of ban exception list */
 	signal_add("event 368", (SIGNAL_FUNC) event_target_received); /* end of ban list */
@ -856,6 +804,7 @@ void fe_events_numeric_init(void)
 	signal_add("event 506", (SIGNAL_FUNC) event_target_received); /* cannot send (+R) */
 	signal_add("event 716", (SIGNAL_FUNC) event_target_received); /* cannot /msg (+g) */
 	signal_add("event 717", (SIGNAL_FUNC) event_target_received); /* +g notified */
+	signal_add("event 728", (SIGNAL_FUNC) event_target_received); /* quiet (or other) list */
 	signal_add("event 729", (SIGNAL_FUNC) event_target_received); /* end of quiet (or other) list */
 	/* clang-format on */
 }
@ -876,8 +825,6 @@ void fe_events_numeric_deinit(void)
 	signal_remove("event 281", (SIGNAL_FUNC) event_accept_list);
 	signal_remove("event 367", (SIGNAL_FUNC) event_ban_list);
 	signal_remove("event 348", (SIGNAL_FUNC) event_eban_list);
-	signal_remove("event 728", (SIGNAL_FUNC) event_quiet_list);
-	signal_remove("event 344", (SIGNAL_FUNC) event_hybrid_quiet_list);
 	signal_remove("event 346", (SIGNAL_FUNC) event_invite_list);
 	signal_remove("event 433", (SIGNAL_FUNC) event_nick_in_use);
 	signal_remove("event 332", (SIGNAL_FUNC) event_topic_get);
@ -932,6 +879,7 @@ void fe_events_numeric_deinit(void)
 	signal_remove("event 470", (SIGNAL_FUNC) event_received);
 	signal_remove("event 479", (SIGNAL_FUNC) event_received);

+	signal_remove("event 344", (SIGNAL_FUNC) event_target_received);
 	signal_remove("event 345", (SIGNAL_FUNC) event_target_received);
 	signal_remove("event 347", (SIGNAL_FUNC) event_target_received);
 	signal_remove("event 349", (SIGNAL_FUNC) event_target_received);
@ -950,5 +898,6 @@ void fe_events_numeric_deinit(void)
 	signal_remove("event 506", (SIGNAL_FUNC) event_target_received);
 	signal_remove("event 716", (SIGNAL_FUNC) event_target_received);
 	signal_remove("event 717", (SIGNAL_FUNC) event_target_received);
+	signal_remove("event 728", (SIGNAL_FUNC) event_target_received);
 	signal_remove("event 729", (SIGNAL_FUNC) event_target_received);
 }
--- a/src/fe-common/irc/fe-irc-channels.c
+++ b/src/fe-common/irc/fe-irc-channels.c
@ -73,38 +73,6 @@ const char *fe_channel_skip_prefix(IRC_SERVER_REC *server, const char *target)
 	return target;
 }

-/* Get time elapsed since an event */
-char *time_ago(time_t seconds)
-{
-	static char ret[128];
-	long unsigned years, weeks, days, hours, minutes;
-
-	seconds = time(NULL) - seconds;
-
-	years = seconds / (86400 * 365);
-	seconds %= (86400 * 365);
-	weeks = seconds / 604800;
-	days = (seconds / 86400) % 7;
-	hours = (seconds / 3600) % 24;
-	minutes = (seconds / 60) % 60;
-	seconds %= 60;
-
-	if (years)
-		snprintf(ret, sizeof(ret), "%luy %luw %lud", years, weeks, days);
-	else if (weeks)
-		snprintf(ret, sizeof(ret), "%luw %lud %luh", weeks, days, hours);
-	else if (days)
-		snprintf(ret, sizeof(ret), "%lud %luh %lum", days, hours, minutes);
-	else if (hours)
-		snprintf(ret, sizeof(ret), "%luh %lum", hours, minutes);
-	else if (minutes)
-		snprintf(ret, sizeof(ret), "%lum %lus", minutes, (long unsigned) seconds);
-	else
-		snprintf(ret, sizeof(ret), "%lus", (long unsigned) seconds);
-
-	return ret;
-}
-
 static void sig_channel_rejoin(SERVER_REC *server, REJOIN_REC *rec)
 {
 	g_return_if_fail(rec != NULL);
--- a/src/fe-common/irc/fe-irc-channels.h
+++ b/src/fe-common/irc/fe-irc-channels.h
@ -3,7 +3,6 @@

 int fe_channel_is_opchannel(IRC_SERVER_REC *server, const char *target);
 const char *fe_channel_skip_prefix(IRC_SERVER_REC *server, const char *target);
-char *time_ago(time_t seconds);

 void fe_irc_channels_init(void);
 void fe_irc_channels_deinit(void);
--- a/src/fe-common/irc/fe-irc-commands.c
+++ b/src/fe-common/irc/fe-irc-commands.c
@ -39,7 +39,6 @@
 #include <irssi/src/fe-common/core/window-items.h>
 #include <irssi/src/fe-common/core/printtext.h>
 #include <irssi/src/fe-common/core/keyboard.h>
-#include <irssi/src/fe-common/irc/fe-irc-channels.h>

 /* SYNTAX: ME <message> */
 static void cmd_me(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
@ -225,16 +224,15 @@ static void bans_show_channel(IRC_CHANNEL_REC *channel, IRC_SERVER_REC *server)
 	/* show bans.. */
        counter = 1;
 	for (tmp = channel->banlist; tmp != NULL; tmp = tmp->next) {
-		char *timestr, *ago;
 		BAN_REC *rec = tmp->data;
-		timestr = my_asctime(rec->time);
-		ago = time_ago(rec->time);

 		printformat(server, channel->visible_name, MSGLEVEL_CRAP,
-		            (rec->setby == NULL || *rec->setby == '\0') ? IRCTXT_BANLIST :
-		                                                          IRCTXT_BANLIST_LONG,
-		            counter, channel->visible_name, rec->ban, rec->setby, ago, timestr);
-		counter++;
+			    (rec->setby == NULL || *rec->setby == '\0') ?
+			    IRCTXT_BANLIST : IRCTXT_BANLIST_LONG,
+			    counter, channel->visible_name,
+			    rec->ban, rec->setby,
+			    (int) (time(NULL)-rec->time));
+                counter++;
 	}
 }

--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@ -173,7 +173,7 @@ static void sig_message_own_action(IRC_SERVER_REC *server, const char *msg,
 	oldtarget = target;
 	target = fe_channel_skip_prefix(IRC_SERVER(server), target);
 	if (server_ischannel(SERVER(server), target))
-		item = channel_find(SERVER(server), target);
+		item = irc_channel_find(server, target);
 	else
 		item = irc_query_find(server, target);

@ -208,7 +208,7 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
 		return;

 	if (server_ischannel(SERVER(server), target)) {
-		item = channel_find(SERVER(server), target);
+		item = irc_channel_find(server, target);
 	} else {
 		own = (!g_strcmp0(nick, server->nick));
 		item = privmsg_get_query(SERVER(server), own ? target : nick, FALSE, level);
@ -269,22 +269,13 @@ static char *notice_channel_context(SERVER_REC *server, const char *msg)

 static void sig_message_own_notice(IRC_SERVER_REC *server, const char *msg, const char *target)
 {
-	gboolean is_public;
-	const char *cleantarget;
-	char *context_channel;
-
-	cleantarget = fe_channel_skip_prefix(server, target);
-	is_public = server_ischannel(SERVER(server), cleantarget);
+	char *channel;
 	/* check if this is a cnotice */
-	context_channel = is_public ? NULL : notice_channel_context((SERVER_REC *) server, msg);
-
-	printformat(
-	    server, context_channel != NULL ? context_channel : cleantarget,
-	    (is_public || context_channel != NULL ? MSGLEVEL_PUBNOTICES : MSGLEVEL_NOTICES) |
-	        MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT,
-	    IRCTXT_OWN_NOTICE, target, msg);
-
-	g_free(context_channel);
+	channel = notice_channel_context((SERVER_REC *) server, msg);
+	printformat(server, channel != NULL ? channel : fe_channel_skip_prefix(server, target),
+	            MSGLEVEL_NOTICES | MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT, IRCTXT_OWN_NOTICE,
+	            target, msg);
+	g_free(channel);
 }

 static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
@ -292,9 +283,7 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
 				   const char *target)
 {
 	const char *oldtarget;
-	char *context_channel;
-	int level;
-	gboolean is_public;
+	int level = MSGLEVEL_NOTICES;

 	oldtarget = target;
 	target = fe_channel_skip_prefix(IRC_SERVER(server), target);
@ -310,32 +299,29 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
                return;
 	}

-	is_public = server_ischannel(SERVER(server), target);
-	/* check if this is a cnotice */
-	context_channel = is_public ? NULL : notice_channel_context(server, msg);
-	level = (is_public || context_channel != NULL) ? MSGLEVEL_PUBNOTICES : MSGLEVEL_NOTICES;
-
-	if (ignore_check_plus(server, nick, address, is_public ? target : context_channel, msg,
-	                      &level, TRUE)) {
-		g_free(context_channel);
+	if (ignore_check_plus(server, nick, address,
+			 server_ischannel(SERVER(server), target) ? target : NULL,
+			      msg, &level, TRUE))
 		return;
-	}

-	if (is_public) {
+	if (server_ischannel(SERVER(server), target)) {
 		/* notice in some channel */
-		char *nickmode;
-		nickmode = channel_get_nickmode(channel_find(server, target), nick);
-		printformat(server, target, level, IRCTXT_NOTICE_PUBLIC, nick, oldtarget, msg,
-		            nickmode);
+		printformat(server, target, level,
+			    IRCTXT_NOTICE_PUBLIC, nick, oldtarget, msg);
 	} else {
-		if (context_channel == NULL) {
+		char *channel;
+		/* check if this is a cnotice */
+		channel = notice_channel_context(server, msg);
+
+		if (channel == NULL) {
 			/* private notice */
 			privmsg_get_query(SERVER(server), nick, FALSE, MSGLEVEL_NOTICES);
 		}
-		printformat(server, context_channel == NULL ? nick : context_channel, level,
-		            IRCTXT_NOTICE_PRIVATE, nick, address, msg);
+		printformat(server, channel == NULL ? nick : channel, level, IRCTXT_NOTICE_PRIVATE,
+		            nick, address, msg);
+
+		g_free(channel);
 	}
-	g_free(context_channel);
 }

 static void sig_message_own_ctcp(IRC_SERVER_REC *server, const char *cmd,
--- a/src/fe-common/irc/fe-irc-queries.c
+++ b/src/fe-common/irc/fe-irc-queries.c
@ -24,11 +24,6 @@
 #include <irssi/src/core/servers.h>
 #include <irssi/src/core/queries.h>
 #include <irssi/src/core/nicklist.h>
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-queries.h>
-#include <irssi/src/fe-common/core/fe-windows.h>
-
-int query_type;

 static QUERY_REC *query_find_address(SERVER_REC *server, const char *address)
 {
@ -93,42 +88,14 @@ static void event_privmsg(SERVER_REC *server, const char *data,
 	}
 }

-static void sig_window_bound_query(SERVER_REC *server)
-{
-	GSList *wtmp, *btmp, *bounds;
-
-	if (!IS_IRC_SERVER(server))
-		return;
-
-	for (wtmp = windows; wtmp != NULL; wtmp = wtmp->next) {
-		WINDOW_REC *win = wtmp->data;
-		bounds = g_slist_copy(win->bound_items);
-
-		for (btmp = bounds; btmp != NULL; btmp = btmp->next) {
-			WINDOW_BIND_REC *bound = btmp->data;
-
-			if (bound->type == query_type &&
-			    g_strcmp0(server->tag, bound->servertag) == 0) {
-				irc_query_create(bound->servertag, bound->name, TRUE);
-			}
-		}
-
-		g_slist_free(bounds);
-	}
-}
-
 void fe_irc_queries_init(void)
 {
-	query_type = module_get_uniq_id_str("WINDOW ITEM TYPE", "QUERY");
+        settings_add_bool("lookandfeel", "query_track_nick_changes", TRUE);

-	settings_add_bool("lookandfeel", "query_track_nick_changes", TRUE);
-
-	signal_add("server connected", sig_window_bound_query);
 	signal_add_first("event privmsg", (SIGNAL_FUNC) event_privmsg);
 }

 void fe_irc_queries_deinit(void)
 {
-	signal_remove("server connected", sig_window_bound_query);
 	signal_remove("event privmsg", (SIGNAL_FUNC) event_privmsg);
 }
--- a/src/fe-common/irc/irc-modules.c
+++ b/src/fe-common/irc/irc-modules.c
@ -0,0 +1,4 @@
+void fe_irc_dcc_init(void);void fe_irc_notifylist_init(void);
+void fe_irc_notifylist_deinit(void);void fe_irc_dcc_deinit(void);
+void fe_irc_modules_init(void) {  fe_irc_dcc_init(); fe_irc_notifylist_init(); }
+void fe_irc_modules_deinit(void) { fe_irc_notifylist_deinit(); fe_irc_dcc_deinit();  }
--- a/src/fe-common/irc/meson.build
+++ b/src/fe-common/irc/meson.build
@ -20,6 +20,8 @@ libfe_common_irc_a = static_library('fe_common_irc',
    'fe-whois.c',
    'irc-completion.c',
    'module-formats.c',
+
+    'irc-modules.c',
  ),
  include_directories : rootinc,
  implicit_include_directories : false,
@ -28,12 +30,6 @@ libfe_common_irc_a = static_library('fe_common_irc',
    def_themesdir,
  ],
  dependencies : dep)
-shared_module('fe_common_irc',
-  name_suffix : module_suffix,
-  install : true,
-  install_dir : moduledir,
-  link_with : dl_cross_irc_core,
-  link_whole : libfe_common_irc_a)

 install_headers(
  files(
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@ -81,14 +81,12 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "bantype", "Ban type changed to {channel $0}", 1, { 0 } },
 	{ "no_bans", "No bans in channel {channel $0}", 1, { 0 } },
 	{ "banlist", "$0 - {channel $1}: ban {ban $2}", 3, { 1, 0, 0 } },
-        { "banlist_long", "$0 - {channel $1}: ban {ban $2} {comment by {nick $3}, on $5 ($4 ago)}", 6, { 1, 0, 0, 0, 0, 0 } },
-	{ "quietlist", "{channel $0}: quiet {ban $1}", 2, { 0, 0 } },
-        { "quietlist_long", "{channel $0}: quiet {ban $1} {comment by {nick $2}, on $4 ($3 ago)}", 5, { 0, 0, 0, 0, 0 } },
+        { "banlist_long", "$0 - {channel $1}: ban {ban $2} {comment by {nick $3}, $4 secs ago}", 5, { 1, 0, 0, 0, 1 } },
 	{ "ebanlist", "{channel $0}: ban exception {ban $1}", 2, { 0, 0 } },
-        { "ebanlist_long", "{channel $0}: ban exception {ban $1} {comment by {nick $2}, on $4 ($3 ago)}", 5, { 0, 0, 0, 0, 0 } },
+        { "ebanlist_long", "{channel $0}: ban exception {ban $1} {comment by {nick $2}, $3 secs ago}", 4, { 0, 0, 0, 1 } },
 	{ "no_invitelist", "Invite list is empty in channel {channel $0}", 1, { 0 } },
 	{ "invitelist", "{channel $0}: invite {ban $1}", 2, { 0, 0 } },
-	{ "invitelist_long", "{channel $0}: invite {ban $1} {comment by {nick $2}, on $3 ($4 ago)}", 5, { 0, 0, 0, 0, 0 } },
+	{ "invitelist_long", "{channel $0}: invite {ban $1} {comment by {nick $2}, $3 secs ago}", 4, { 0, 0, 0, 1 } },
 	{ "no_such_channel", "{channel $0}: No such channel", 1, { 0 } },
 	{ "channel_synced", "Join to {channel $0} was synced in {hilight $1} secs", 2, { 0, 2 } },
 	{ "server_help_start", "$1", 2, { 0, 0 } },
@ -142,8 +140,8 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ NULL, "Received messages", 0 },

 	{ "notice_server", "{servernotice $0}$1", 2, { 0, 0 } },
-	{ "notice_public", "{pubnotice $3 $0}$2", 4, { 0, 0, 0, 0 } },
-	{ "notice_private", "{notice $0}$2", 3, { 0, 0, 0 } },
+	{ "notice_public", "{notice $0{pubnotice_channel $1}}$2", 3, { 0, 0, 0 } },
+	{ "notice_private", "{notice $0{pvtnotice_host $1}}$2", 3, { 0, 0, 0 } },
 	{ "action_private", "{pvtaction $0}$2", 3, { 0, 0, 0 } },
 	{ "action_private_query", "{pvtaction_query $0}$2", 3, { 0, 0, 0 } },
 	{ "action_public", "{pubaction $0}$1", 2, { 0, 0 } },
--- a/src/fe-common/irc/module-formats.h
+++ b/src/fe-common/irc/module-formats.h
@ -59,8 +59,6 @@ enum {
 	IRCTXT_NO_BANS,
 	IRCTXT_BANLIST,
 	IRCTXT_BANLIST_LONG,
-	IRCTXT_QUIETLIST,
-	IRCTXT_QUIETLIST_LONG,
 	IRCTXT_EBANLIST,
 	IRCTXT_EBANLIST_LONG,
 	IRCTXT_NO_INVITELIST,
--- a/Show More
+++ b/Show More