release v0.21.11

output/alsa: log when generating silence due to slow decoder
MPD used to do that when this code lived in the player thread, but it was removed by commit 98a7c62d7a4f716d90af6d78e18d1a3b10bc54b3; and the replacement code in the ALSA output plugin didn't have it.
2019-07-03 15:16:27 +02:00 · 2019-06-28 18:15:30 +02:00 · 2019-06-28 18:04:49 +02:00 · 2019-06-28 18:04:49 +02:00 · 2019-06-28 18:04:49 +02:00 · 2019-06-28 18:04:49 +02:00
1522 changed files with 47382 additions and 34707 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,88 +1,8 @@
-*.Plo
-*.Po
-*.a
-*.d
-*.la
-*.lo
-*.o
-*.exe
-
 *~

 .#*
 .stgit*
-.deps
-.dirstamp

-tags
-
-/Makefile
-/Makefile.in
-/aclocal.m4
-/autom4te.cache
-/config.h
-/config.h.in
-/config.log
-/config.mk
-/config.status
-/config_detected.h
-/config_detected.mk
-/configure
-/configure.lineno
-/depmode
-/libtool
-/ltmain.sh
-/mkinstalldirs
-/build
-/src/mpd
-/systemd/system/mpd.service
-/systemd/user/mpd.service
-/stamp-h1
-
-/src/dsd2pcm/dsd2pcm
-/src/win32/mpd_win32_rc.rc
-
-/doc/doxygen.conf
-/doc/protocol.html
-/doc/protocol
-/doc/user
-/doc/developer
-/doc/sticker
-/doc/api
-
-/test/software_volume
-/test/run_convert
-/test/run_decoder
-/test/read_tags
-/test/run_filter
-/test/run_encoder
-/test/run_output
-/test/read_conf
-/test/run_input
-/test/read_mixer
-/test/dump_playlist
-/test/run_normalize
-/test/tmp
-/test/run_inotify
-/test/test_queue_priority
-/test/test_protocol
-/test/run_ntp_server
-/test/run_resolver
-/test/run_tcp_connect
-/test/test_pcm
-/test/dump_rva2
-/test/dump_text_file
-/test/test_util
-/test/test_byte_reverse
-/test/test_mixramp
-/test/test_vorbis_encoder
-/test/DumpDatabase
-
-/lib/
-
-/*.tar.gz
-/*.tar.bz2
-/*.tar.xz
-/mpd-*/
+/output/

 __pycache__/
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,36 +1,82 @@
-dist: trusty
 language: cpp

-addons:
-  apt:
-    packages:
-      - libcppunit-dev
-      - libboost-dev
+matrix:
+  include:
+    - os: linux
+      dist: trusty
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - sourceline: 'ppa:mhier/libboost-latest'
+            - sourceline: 'ppa:mstipicevic/ninja-build-1-7-2'
+            - sourceline: 'ppa:deadsnakes/ppa' # for Python 3.7 (required by Meson)
+          packages:
+            - g++-6
+            - libgtest-dev
+            - boost1.67
+            - python3.6
+            - python3-urllib3
+            - ninja-build
+      before_install:
+        - wget https://bootstrap.pypa.io/get-pip.py
+        - /usr/bin/python3.6 get-pip.py --user
+      install:
+        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson
+      env:
+        # use gold as workaround for https://sourceware.org/bugzilla/show_bug.cgi?id=17068
+        - MATRIX_EVAL="export CC=gcc-6 CXX=g++-6 LDFLAGS=-fuse-ld=gold PATH=$HOME/.local/bin:$PATH"

-os:
-  - linux
-  - osx
+    - os: linux
+      dist: trusty
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - sourceline: 'ppa:mhier/libboost-latest'
+            - sourceline: 'ppa:mstipicevic/ninja-build-1-7-2'
+            - sourceline: 'ppa:deadsnakes/ppa' # for Python 3.7 (required by Meson)
+          packages:
+            - g++-8
+            - libgtest-dev
+            - boost1.67
+            - python3.6
+            - python3-urllib3
+            - ninja-build
+      before_install:
+        - wget https://bootstrap.pypa.io/get-pip.py
+        - /usr/bin/python3.6 get-pip.py --user
+      install:
+        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson
+      env:
+        # use gold as workaround for https://sourceware.org/bugzilla/show_bug.cgi?id=17068
+        - MATRIX_EVAL="export CC=gcc-8 CXX=g++-8 LDFLAGS=-fuse-ld=gold PATH=$HOME/.local/bin:$PATH"

-env:
-  global:
-    - MAKEFLAGS="-j2"
+    - os: osx
+      osx_image: xcode9.3beta
+      env:
+        - MATRIX_EVAL=""
+
+cache:
+  - apt
+  - ccache

 before_install:
+  - eval "${MATRIX_EVAL}"
  # C++14
-  - test "$TRAVIS_OS_NAME" != "linux" || sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-  - test "$TRAVIS_OS_NAME" != "linux" || sudo apt-get update -qq
  - test "$TRAVIS_OS_NAME" != "osx" || brew update

 install:
  # C++14
-  - test "$TRAVIS_OS_NAME" != "linux" || sudo apt-get install -qq g++-5
-  - test "$TRAVIS_OS_NAME" != "osx" || brew install cppunit
+  - test "$TRAVIS_OS_NAME" != "osx" || brew install ccache meson
+  - test "$TRAVIS_OS_NAME" != "osx" || brew install --HEAD https://gist.githubusercontent.com/Kronuz/96ac10fbd8472eb1e7566d740c4034f8/raw/gtest.rb
+
+before_script:
+  - ccache -s

 script:
-  - OPTIONS="--enable-test"
-  - test "$TRAVIS_OS_NAME" != "linux" || export CC=gcc-5 CXX=g++-5
-  - test "$TRAVIS_OS_NAME" != "osx" || OPTIONS="$OPTIONS --enable-osx"
-  - ./autogen.sh
-  - ./configure --disable-silent-rules --disable-dependency-tracking $OPTIONS
-  - make
-  - make check
+  - eval "${MATRIX_EVAL}"
+  - OPTIONS="-Dtest=true"
+  - meson . output --werror $OPTIONS
+  - ninja -C output -v test
+  - ccache -s
--- a/13
+++ b/13
@@ -1,5 +1,5 @@
 Music Player Daemon - http://www.musicpd.org
-Copyright 2003-2017 The Music Player Daemon Project
+Copyright 2003-2018 The Music Player Daemon Project

 The following people have contributed code to MPD:

@@ -36,3 +36,14 @@ The following people have contributed code to MPD:
 François Revol <revol@free.fr>
 Jacob Vosmaer <contact@jacobvosmaer.nl>
 Thomas Guillem <thomas@gllm.fr>
+ Andrew Basterfield <abasterfield@gmail.com>
+ Bart Nagel <bart@tremby.net>
+ Christian Kröner <ckroener@gmx.net>
+ Christopher Zimmermann <madroach@gmerlin.de>
+ John Regan <john@jrjrtech.com>
+ Joshua Wise <joshua@joshuawise.com>
+ Ryan Walklin
+ Stefan Roellin <stefan@roellin-baumann.ch>
+ Stefano Miccoli <stefano.miccoli@polimi.it>
+ Steven O'Brien <steven_obrien1@yahoo.co.uk>
+ Thomas Zander <thomas.e.zander@googlemail.com>
--- a/Makefile.am
+++ b/Makefile.am
--- a/197
+++ b/197
@@ -1,3 +1,200 @@
+ver 0.21.11 (2019/07/03)
+* input
+  - tidal: deprecated because Tidal has changed the protocol
+* decoder
+  - wildmidi: log error if library initialization fails
+* output
+  - alsa: fix busy loop while draining
+  - alsa: fix missing drain call
+  - alsa: improve xrun-avoiding silence generator
+  - alsa: log when generating silence due to slow decoder
+  - alsa, osx: fix distortions with DSD_U32 and DoP on 32 bit CPUs
+* protocol
+  - fix "list" with multiple "group" levels
+
+ver 0.21.10 (2019/06/05)
+* decoder
+  - opus: fix duplicate tags
+* output
+  - httpd: reject some well-known URIs
+* fix crash bug (0.21.9 regression)
+
+ver 0.21.9 (2019/05/20)
+* input
+  - buffer: fix deadlock bug
+* Android
+  - fix crash on ARMv7
+  - request storage permission on Android 6+
+* fix spurious "single" mode bug
+
+ver 0.21.8 (2019/04/23)
+* input
+  - smbclient: download to buffer instead of throttling transfer
+* output
+  - httpd: add missing mutex lock
+  - httpd: fix use-after-free bug
+* playlist
+  - soundcloud: fix "Unsupported URI scheme" (0.21.6 regression)
+* fix Bonjour bug
+* fix build failure with GCC 9
+* fix build failure with -Ddatabase=false
+* systemd: add user socket unit
+* doc: "list file" is deprecated
+
+ver 0.21.7 (2019/04/03)
+* input
+  - qobuz/tidal: scan tags when loading a playlist
+* require Meson 0.49.0 for native libgcrypt-config support
+* fix build failure with -Dlocal_socket=false
+* Haiku
+  - fix build
+  - add version info
+
+ver 0.21.6 (2019/03/17)
+* protocol
+  - allow loading playlists specified as absolute filesystem paths
+  - fix negated filter expressions with multiple tag values
+  - fix "list" with filter expression
+  - omit empty playlist names in "listplaylists"
+* input
+  - cdio_paranoia: fix build failure due to missing #include
+* decoder
+  - opus: fix replay gain when there are no other tags
+  - opus: fix seeking to beginning of song
+  - vorbis: fix Tremor conflict resulting in crash
+* output
+  - pulse: work around error with unusual channel count
+  - osx: fix build failure
+* playlist
+  - flac: fix use-after-free bug
+* support abstract sockets on Linux
+* Windows
+  - remove the unused libwinpthread-1.dll dependency
+* Android
+  - enable SLES power saving mode
+
+ver 0.21.5 (2019/02/22)
+* protocol
+  - fix deadlock in "albumart" command
+  - fix "tagtypes disable" command
+* database
+  - simple: fix assertion failure
+  - fix assertion failures with mount points
+* storage
+  - udisks: fix "AlreadyMounted" error
+  - udisks: use relative path from mount URI
+  - fix memory leak
+* input
+  - buffer: fix crash bug when playing remote WAV file
+* tags
+  - ape: map "Album Artist"
+* output
+  - shout: add support for TLS
+* mixer
+  - pulse: add "scale_volume" setting
+
+ver 0.21.4 (2019/01/04)
+* database
+  - inotify: fix crash bug "terminate called after throwing ..."
+  - upnp: implement "list ... group"
+* output
+  - httpd: declare protocol "HTTP/1.1" instead of "ICY"
+* remove libwrap support
+* Windows
+  - fix "Failed to accept connection: unknown error"
+* fix Haiku build
+
+ver 0.21.3 (2018/11/16)
+* output
+  - alsa: fix crash bug
+  - alsa: fix stuttering at start of playback
+  - alsa: fix discarded samples at end of song
+  - alsa: clear error after reopening device
+* log: default to journal if MPD was started as systemd service
+
+ver 0.21.2 (2018/11/12)
+* protocol
+  - operator "=~" matches a regular expression
+  - operator "contains" matches substrings
+* decoder
+  - ffmpeg: require FFmpeg 3.1 or later
+  - ffmpeg: fix broken sound with certain codecs
+* output
+  - alsa: fix high CPU usage with dmix
+  - httpd: fix three crash bugs
+* mixer
+  - alsa: fix more rounding errors
+* fix zlib support
+
+ver 0.21.1 (2018/11/04)
+* protocol
+  - allow escaping quotes in filter expressions
+  - operator "==" never searches substrings in filter expressions
+* decoder
+  - ffmpeg: fix build failure with non-standard FFmpeg installation path
+  - flac: fix linker failure when building without FLAC support
+* encoder
+  - vorbis: fix linker failure when building without Vorbis decoder
+* fix build failure on Linux-PowerPC
+* fix build failure on FreeBSD
+* eliminate DLL dependencies on Windows
+* add warning about buggy Boost version 1.67
+* require Meson 0.47.2 because a Meson 0.47.1 bug breaks our build
+
+ver 0.21 (2018/10/31)
+* configuration
+  - add "include" directive, allows including config files
+  - incremental "metadata_to_use" setting
+* protocol
+  - "tagtypes" can be used to hide tags
+  - "find" and "search" can sort
+  - "outputs" prints the plugin name
+  - "outputset" sets runtime attributes
+  - close connection when client sends HTTP request
+  - new filter syntax for "find"/"search" etc. with negation
+* database
+  - simple: scan audio formats
+  - proxy: require libmpdclient 2.9
+  - proxy: forward `sort` and `window` to server
+* player
+  - hard-code "buffer_before_play" to 1 second, independent of audio format
+  - "one-shot" single mode
+* input
+  - curl: download to buffer instead of throttling transfer
+  - qobuz: new plugin to play Qobuz streams
+  - tidal: new plugin to play Tidal streams
+* tags
+  - new tags "OriginalDate", "MUSICBRAINZ_WORKID"
+* decoder
+  - ffmpeg: require at least version 11.12
+  - gme: try loading m3u sidecar files
+  - hybrid_dsd: new decoder plugin
+  - mad: move "gapless_mp3_playback" setting to "decoder" block
+  - mikmod: require at least version 3.2
+  - pcm: support audio/L24 (RFC 3190)
+  - sidplay: support basic and kernal rom (libsidplayfp)
+* resampler
+  - soxr: flush resampler at end of song
+* output
+  - alsa: non-blocking mode
+  - alsa: change "dop" and "allowed_formats" settings at runtime
+  - ao: fix crash bug due to partial frames
+  - shout: support the Shine encoder plugin
+  - sndio: remove support for the broken RoarAudio sndio emulation
+  - osx: initial support for DSD over PCM
+  - roar: removed
+  - httpd_output: support for unix sockets
+* mixer
+  - sndio: new mixer plugin
+* encoder
+  - opus: support for sending metadata using ogg stream chaining
+* listen on $XDG_RUNTIME_DIR/mpd/socket by default
+* append hostname to Zeroconf service name
+* systemd watchdog support
+* require GCC 6
+* build with Meson instead of autotools
+* use GTest instead of cppunit
+
 ver 0.20.23 (2018/10/29)
 * protocol
  - emit "player" idle event when restarting the current song
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -1 +0,0 @@
-/build
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
          package="org.musicpd"
          android:installLocation="auto"
-          android:versionCode="22"
-          android:versionName="0.20.23">
+          android:versionCode="34"
+          android:versionName="0.21.11">

  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="26"/>

--- a/android/apk/make-unsigned-apk.sh
+++ b/android/apk/make-unsigned-apk.sh
@@ -0,0 +1,21 @@
+#!/bin/sh -e
+
+S=`dirname "$0"`
+ANDROID_ABI=$1
+STRIP=$2
+ZIP=$3
+UNSIGNED_APK=$4
+LIBMPD_SO=$5
+CLASSES_DEX=$6
+RESOURCES_APK=$7
+D=`dirname "$UNSIGNED_APK"`
+
+rm -rf "$D/apk"
+mkdir -p "$D/apk/lib/$ANDROID_ABI"
+
+"$STRIP" "$LIBMPD_SO" -o "$D/apk/lib/$ANDROID_ABI/`basename $LIBMPD_SO`"
+cp "$CLASSES_DEX" "$D/apk/"
+cp "$RESOURCES_APK" "$UNSIGNED_APK"
+
+cd "$D/apk"
+exec zip -q -r -X "../`basename $UNSIGNED_APK`" .
--- a/android/apk/meson.build
+++ b/android/apk/meson.build
@@ -0,0 +1,59 @@
+unsigned_apk = custom_target(
+  'mpd-unsigned.apk',
+  output: 'mpd-unsigned.apk',
+  input: [mpd, classes_dex, resources_apk[0]],
+  command: [
+    join_paths(meson.current_source_dir(), 'make-unsigned-apk.sh'),
+    android_abi,
+    get_option('android_strip'),
+    zip,
+    '@OUTPUT0@',
+    '@INPUT@',
+  ],
+)
+
+if get_option('android_debug_keystore') != ''
+  debug_apk = custom_target(
+    'mpd-debug.apk',
+    output: 'mpd-debug.apk',
+    input: unsigned_apk,
+    command: [
+      jarsigner,
+      '-keystore', get_option('android_debug_keystore'),
+      '-storepass', 'android',
+      '-signedjar', '@OUTPUT@',
+      '@INPUT@',
+      'androiddebugkey',
+    ],
+    build_by_default: true
+  )
+endif
+
+if get_option('android_keystore') != '' and get_option('android_keyalias') != '' and get_option('android_keypass') != ''
+  unaligned_apk = custom_target(
+    'mpd-unaligned.apk',
+    output: 'mpd-unaligned.apk',
+    input: unsigned_apk,
+    command: [
+      jarsigner,
+      '-digestalg', 'SHA1', '-sigalg', 'MD5withRSA',
+      '-keystore', get_option('android_keystore'),
+      '-storepass', get_option('android_keypass'),
+      '-signedjar', '@OUTPUT@',
+      '@INPUT@',
+      get_option('android_keyalias'),
+    ],
+  )
+
+  apk = custom_target(
+    'mpd.apk',
+    output: 'mpd.apk',
+    input: unaligned_apk,
+    command: [
+      android_zipalign,
+      '-f', '4',
+      '@INPUT@', '@OUTPUT@',
+    ],
+    build_by_default: true
+  )
+endif
--- a/android/build.py
+++ b/android/build.py
@@ -57,6 +57,7 @@ sys.path[0] = os.path.join(mpd_path, 'python')

 # output directories
 from build.dirs import lib_path, tarball_path, src_path
+from build.meson import configure as run_meson

 arch_path = os.path.join(lib_path, arch)
 build_path = os.path.join(arch_path, 'build')
@@ -137,6 +138,12 @@ class AndroidNdkToolchain:
        libstdcxx_ldflags = libstdcxx_flags + ' -L' + libcxx_libs_path
        libstdcxx_libs = '-lc++_static -lc++abi'

+        if self.is_armv7:
+            # On 32 bit ARM, clang generates no ".eh_frame" section;
+            # instead, the LLVM unwinder library is used for unwinding
+            # the stack after a C++ exception was thrown
+            libstdcxx_libs += ' -lunwind'
+
        if use_cxx:
            self.cxxflags += ' ' + libstdcxx_cxxflags
            self.ldflags += ' ' + libstdcxx_ldflags
@@ -146,7 +153,15 @@ class AndroidNdkToolchain:

        # redirect pkg-config to use our root directory instead of the
        # default one on the build host
-        self.env['PKG_CONFIG_LIBDIR'] = os.path.join(install_prefix, 'lib/pkgconfig')
+        import shutil
+        bin_dir = os.path.join(install_prefix, 'bin')
+        try:
+            os.makedirs(bin_dir)
+        except:
+            pass
+        self.pkg_config = shutil.copy(os.path.join(mpd_path, 'build', 'pkg-config.sh'),
+                                      os.path.join(bin_dir, 'pkg-config'))
+        self.env['PKG_CONFIG'] = self.pkg_config

 # a list of third-party libraries to be used by MPD on Android
 from build.libs import *
@@ -175,32 +190,13 @@ for x in thirdparty_libs:
 toolchain = AndroidNdkToolchain(tarball_path, src_path, build_path,
                                use_cxx=True)

-configure = [
-    os.path.join(mpd_path, 'configure'),
-    'CC=' + toolchain.cc,
-    'CXX=' + toolchain.cxx,
-    'CFLAGS=' + toolchain.cflags,
-    'CXXFLAGS=' + toolchain.cxxflags,
-    'CPPFLAGS=' + toolchain.cppflags,
-    'LDFLAGS=' + toolchain.ldflags,
-    'LIBS=' + toolchain.libs,
-    'AR=' + toolchain.ar,
-    'RANLIB=' + toolchain.ranlib,
-    'STRIP=' + toolchain.strip,
-    '--host=' + toolchain.arch,
-    '--prefix=' + toolchain.install_prefix,
-    '--with-sysroot=' + toolchain.sysroot,
-    '--with-android-sdk=' + sdk_path,
+configure_args += [
+    '-Dandroid_sdk=' + sdk_path,
+    '-Dandroid_ndk=' + ndk_path,
+    '-Dandroid_abi=' + android_abi,
+    '-Dandroid_strip=' + toolchain.strip,
+]

-    '--enable-silent-rules',
-
-    '--disable-icu',
-
-] + configure_args
-
-from build.cmdline import concatenate_cmdline_variables
-configure = concatenate_cmdline_variables(configure,
-    set(('CFLAGS', 'CXXFLAGS', 'CPPFLAGS', 'LDFLAGS', 'LIBS')))
-
-subprocess.check_call(configure, env=toolchain.env)
-subprocess.check_call(['/usr/bin/make', '--quiet', '-j12'], env=toolchain.env)
+from build.meson import configure as run_meson
+run_meson(toolchain, mpd_path, '.', configure_args)
+subprocess.check_call(['/usr/bin/ninja'], env=toolchain.env)
--- a/android/make-resources-apk.sh
+++ b/android/make-resources-apk.sh
@@ -0,0 +1,24 @@
+#!/bin/sh -e
+
+S=`dirname "$0"`
+AAPT=$1
+BASE_JAR=$2
+JAVA_PKG=$3
+JAVA_PKG_PATH=$4
+APK_FILE="$5"
+D=`dirname "$APK_FILE"`
+
+rm -rf "$D/res"
+mkdir -p "$D/res/drawable" "$D/src"
+cp "$D/icon.png" "$D/notification_icon.png"  "$D/res/drawable/"
+
+"$AAPT" package -f -m --auto-add-overlay \
+  --custom-package "$JAVA_PKG" \
+  -M "$S/AndroidManifest.xml" \
+  -S "$D/res" \
+  -S "$S/res" \
+  -J "$D/src" \
+  -I "$BASE_JAR" \
+  -F "$D/resources.apk"
+
+cp "$D/src/$JAVA_PKG_PATH/R.java" "$D/"
--- a/android/meson.build
+++ b/android/meson.build
@@ -0,0 +1,140 @@
+android_package = 'org.musicpd'
+android_package_path = join_paths(android_package.split('.'))
+
+android_ndk = get_option('android_ndk')
+android_sdk = get_option('android_sdk')
+android_abi = get_option('android_abi')
+
+android_sdk_build_tools_version = '27.0.0'
+android_sdk_platform = 'android-23'
+
+android_build_tools_dir = join_paths(android_sdk, 'build-tools', android_sdk_build_tools_version)
+android_sdk_platform_dir = join_paths(android_sdk, 'platforms', android_sdk_platform)
+
+android_aidl = join_paths(android_build_tools_dir, 'aidl')
+android_aapt = join_paths(android_build_tools_dir, 'aapt')
+android_dx = join_paths(android_build_tools_dir, 'dx')
+android_zipalign = join_paths(android_build_tools_dir, 'zipalign')
+
+javac = find_program('javac')
+jarsigner = find_program('jarsigner')
+rsvg_convert = find_program('rsvg-convert')
+convert = find_program('convert')
+zip = find_program('zip')
+
+common_cppflags += '-I' + join_paths(meson.current_build_dir(), 'include')
+
+#
+# AIDL
+#
+
+IMainCallback_java = custom_target(
+  'IMainCallback.java',
+  output: 'IMainCallback.java',
+  input: join_paths(meson.current_source_dir(), 'src', 'IMainCallback.aidl'),
+  command: [
+    join_paths(meson.current_source_dir(), 'run-aidl.sh'),
+    android_aidl,
+    '@INPUT@',
+    '@OUTPUT@',
+    join_paths(meson.current_build_dir(), 'src'),
+    android_package_path,
+  ],
+)
+
+IMain_java = custom_target(
+  'IMain.java',
+  output: 'IMain.java',
+  input: join_paths(meson.current_source_dir(), 'src', 'IMain.aidl'),
+  depends: IMainCallback_java,
+  command: [
+    join_paths(meson.current_source_dir(), 'run-aidl.sh'),
+    android_aidl,
+    '@INPUT@',
+    '@OUTPUT@',
+    join_paths(meson.current_build_dir(), 'src'),
+    android_package_path,
+  ],
+)
+
+#
+# Resources
+#
+
+android_icon = custom_target(
+  'Android icon',
+  output: 'icon.png',
+  input: '../mpd.svg',
+  command: [
+    rsvg_convert, '--width=48', '--height=48', '@INPUT@', '-o', '@OUTPUT@',
+  ],
+)
+
+android_notification_icon = custom_target(
+  'Android notification icon',
+  output: 'notification_icon.png',
+  input: android_icon,
+  command: [
+    convert, '@INPUT@', '-colorspace', 'Gray', '-gamma', '2.2', '@OUTPUT@',
+  ],
+)
+
+resources_apk = custom_target(
+  'resources.apk',
+  output: ['resources.apk', 'R.java'],
+  input: [
+    'res/layout/custom_notification_gb.xml',
+    'res/layout/log_item.xml',
+    'res/layout/settings.xml',
+    'res/values/strings.xml',
+    android_icon,
+    android_notification_icon,
+  ],
+  command: [
+    join_paths(meson.current_source_dir(), 'make-resources-apk.sh'),
+    android_aapt,
+    join_paths(android_sdk_platform_dir, 'android.jar'),
+    android_package,
+    android_package_path,
+    '@OUTPUT0@',
+  ],
+)
+
+#
+# Compile Java
+#
+
+classes_jar = custom_target(
+  'classes.jar',
+  output: 'classes.jar',
+  input: [
+    'src/Bridge.java',
+    'src/Loader.java',
+    'src/Main.java',
+    'src/Receiver.java',
+    'src/Settings.java',
+    IMain_java,
+    IMainCallback_java,
+    resources_apk[1],
+  ],
+  command: [
+    join_paths(meson.current_source_dir(), 'run-javac.sh'),
+    javac,
+    join_paths(android_sdk_platform_dir, 'android.jar'),
+    android_package_path,
+    zip,
+    '@OUTPUT@',
+    '@INPUT@',
+  ],
+)
+
+classes_dex = custom_target(
+  'classes.dex',
+  output: 'classes.dex',
+  input: classes_jar,
+  command: [
+    android_dx,
+    '--dex', '--output', '@OUTPUT@',
+    '@INPUT@',
+  ],
+)
--- a/android/run-aidl.sh
+++ b/android/run-aidl.sh
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+
+AIDL=$1
+SRC=$2
+DST=$3
+GENSRC=$4
+JAVA_PKG_PATH=$5
+
+mkdir -p "$GENSRC/$JAVA_PKG_PATH"
+cp "$SRC" "$GENSRC/$JAVA_PKG_PATH/"
+"$AIDL" -I"$GENSRC" -o"$GENSRC" "$GENSRC/$JAVA_PKG_PATH/`basename $SRC`"
+exec cp "$GENSRC/$JAVA_PKG_PATH/`basename $DST`" "$DST"
--- a/android/run-javac.sh
+++ b/android/run-javac.sh
@@ -0,0 +1,22 @@
+#!/bin/sh -e
+
+JAVAC=$1
+CLASSPATH=$2
+JAVA_PKG_PATH=$3
+ZIP=$4
+JARFILE=`realpath "$5"`
+shift 5
+
+D=`dirname "$JARFILE"`
+GENSRC="$D/src"
+GENCLASS="$D/classes"
+GENINCLUDE="$D/include"
+
+mkdir -p "$GENSRC/$JAVA_PKG_PATH"
+"$JAVAC" -source 1.6 -target 1.6 -Xlint:-options \
+	 -cp "$CLASSPATH" \
+	 -h "$GENINCLUDE" \
+	 -d "$GENCLASS" \
+	 "$@"
+cd "$GENCLASS"
+zip -q -r "$JARFILE" .
--- a/android/src/Bridge.java
+++ b/android/src/Bridge.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
--- a/android/src/Loader.java
+++ b/android/src/Loader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
--- a/android/src/Main.java
+++ b/android/src/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
--- a/android/src/Settings.java
+++ b/android/src/Settings.java
@@ -21,10 +21,12 @@ package org.musicpd;

 import java.util.LinkedList;

+import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -178,6 +180,14 @@ public class Settings extends Activity {

 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
+		/* TODO: this sure is the wrong place to request
+		   permissions - it will cause MPD to quit
+		   immediately; we should request permissions when we
+		   need them, but implementing that is complicated, so
+		   for now, we do it here to give users a quick
+		   solution for the problem */
+		requestAllPermissions();
+
 		setContentView(R.layout.settings);
 		mRunButton = (ToggleButton) findViewById(R.id.run);
 		mRunButton.setOnCheckedChangeListener(mOnRunChangeListener);
@@ -203,6 +213,31 @@ public class Settings extends Activity {
 		super.onCreate(savedInstanceState);
 	}

+	private void checkRequestPermission(String permission) {
+		if (checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED)
+			return;
+
+		try {
+			this.requestPermissions(new String[]{permission}, 0);
+		} catch (Exception e) {
+			Log.e(TAG, "requestPermissions(" + permission + ") failed",
+			      e);
+		}
+	}
+
+	private void requestAllPermissions() {
+		if (android.os.Build.VERSION.SDK_INT < 23)
+			/* we don't need to request permissions on
+			   this old Android version */
+			return;
+
+		/* starting with Android 6.0, we need to explicitly
+		   request all permissions before using them;
+		   mentioning them in the manifest is not enough */
+
+		checkRequestPermission(Manifest.permission.READ_EXTERNAL_STORAGE);
+	}
+
 	private void connectClient() {
 		mClient = new Main.Client(this, new Main.Client.Callback() {

--- a/autogen.sh
+++ b/autogen.sh
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-rm -rf config.cache build
-mkdir build
-
-aclocal -I m4 $ACLOCAL_FLAGS
-autoheader
-automake --add-missing $AUTOMAKE_FLAGS
-autoconf
--- a/build/pkg-config.sh
+++ b/build/pkg-config.sh
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+# This is a wrapper for pkg-config which helps with cross-compiling;
+# it sets up environment variables to pkg-config searches for
+# libraries in the sysroot where a copy of this script is located.
+
+BIN=`dirname $0`
+ROOT=`dirname "$BIN"`
+
+export PKG_CONFIG_DIR=
+export PKG_CONFIG_LIBDIR="${ROOT}/lib/pkgconfig:${ROOT}/share/pkgconfig"
+
+exec /usr/bin/pkg-config "$@"
--- a/configure.ac
+++ b/configure.ac
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -0,0 +1,214 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#
+# needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = ['sphinx.ext.intersphinx']
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+#
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
+
+# The encoding of source files.
+#
+# source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = 'Music Player Daemon'
+copyright = '2003-2018 The Music Player Daemon Project'
+author = 'Max Kellermann'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '0.21.11'
+# The full version, including alpha/beta/rc tags.
+release = version
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#
+# today = ''
+#
+# Else, today_fmt is used as the format for a strftime call.
+#
+# today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This patterns also effect to html_static_path and html_extra_path
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+#
+# default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#
+# add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#
+# add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#
+# show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+# modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+# keep_warnings = False
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'classic'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#
+# html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+# html_theme_path = []
+
+# The name for this set of Sphinx documents.
+# "<project> v<release> documentation" by default.
+#
+# html_title = ''
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#
+# html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#
+# html_logo = None
+
+# The name of an image file (relative to this directory) to use as a favicon of
+# the docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#
+# html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#
+# html_extra_path = []
+
+# If not None, a 'Last updated on:' timestamp is inserted at every page
+# bottom, using the given strftime format.
+# The empty string is equivalent to '%b %d, %Y'.
+#
+# html_last_updated_fmt = None
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#
+# html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#
+# html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#
+# html_additional_pages = {}
+
+# If false, no module index is generated.
+#
+# html_domain_indices = True
+
+# If false, no index is generated.
+#
+# html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#
+# html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#
+# html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#
+# html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#
+# html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#
+# html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+# html_file_suffix = None
+
+# Language to be used for generating the HTML full-text search index.
+# Sphinx supports the following languages:
+#   'da', 'de', 'en', 'es', 'fi', 'fr', 'h', 'it', 'ja'
+#   'nl', 'no', 'pt', 'ro', 'r', 'sv', 'tr', 'zh'
+#
+# html_search_language = 'en'
+
+# A dictionary with options for the search language support, empty by default.
+# 'ja' uses this config value.
+# 'zh' user can custom change `jieba` dictionary path.
+#
+# html_search_options = {'type': 'default'}
+
+# The name of a javascript file (relative to the configuration directory) that
+# implements a search results scorer. If empty, the default will be used.
+#
+# html_search_scorer = 'scorer.js'
--- a/doc/developer.rst
+++ b/doc/developer.rst
@@ -0,0 +1,99 @@
+Developer's Manual
+##################
+
+Introduction
+************
+
+This is a guide for those who wish to hack on the MPD source code.  MPD is an open project, and we are always happy about contributions.  So far, more than 150 people have contributed patches. This document is work in progress.  Most of it may be incomplete yet.  Please help!
+
+Code Style
+**********
+
+* indent with tabs (width 8)
+* don't write CPP when you can write C++: use inline functions and constexpr instead of macros
+* comment your code, document your APIs
+* the code should be C++14 compliant, and must compile with :program:`GCC` 6.0 and :program:`clang` 3.4
+* report error conditions with C++ exceptions, preferable derived from :envvar:`std::runtime_error`
+* all code must be exception-safe
+* classes and functions names use CamelCase; variables are lower-case with words separated by underscore
+
+Some example code:
+
+.. code-block:: c
+
+    Foo(const char *abc, int xyz)
+    {
+        if (abc == nullptr) {
+                LogWarning("Foo happened!");
+                return -1;
+        }
+
+        return xyz;
+    }
+
+Hacking The Source
+******************
+
+MPD sources are managed in a git repository on
+`Github <https://github.com/MusicPlayerDaemon/>`_.
+
+Always write your code against the latest git:
+
+.. code-block:: none
+
+    git clone git://github.com/MusicPlayerDaemon/MPD
+
+If you already have a clone, update it:
+
+.. code-block:: none
+
+    git pull --rebase git://github.com/MusicPlayerDaemon/MPD master
+
+You can do without :code:`--rebase`, but we recommend that you rebase
+your repository on the "master" repository all the time.
+
+Configure with the option :code:`--werror`.  Enable as many plugins as
+possible, to be sure that you don't break any disabled code.
+
+Don't mix several changes in one single patch.  Create a separate patch for every change. Tools like :program:`stgit` help you with that. This way, we can review your patches more easily, and we can pick the patches we like most first.
+
+Basic stgit usage
+=================
+
+stgit allows you to create a set of patches and refine all of them: you can go back to any patch at any time, and re-edit it (both the code and the commit message). You can reorder patches and insert new patches at any position. It encourages creating separate patches for tiny changes.
+
+stgit needs to be initialized on a git repository:
+
+.. code-block:: sh
+
+    stg init
+
+Before you edit the code, create a patch:
+
+.. code-block:: sh
+
+    stg new my-patch-name
+
+stgit now asks you for the commit message.
+
+Now edit the code. Once you're finished, you have to "refresh" the patch, i.e. your edits are incorporated into the patch you have created:
+
+.. code-block:: sh
+
+    stg refresh
+
+You may now continue editing the same patch, and refresh it as often as you like. Create more patches, edit and refresh them.
+
+To view the list of patches, type stg series. To go back to a specific patch, type stg goto my-patch-name; now you can re-edit it (don't forget stg refresh when you're finished with that patch).
+
+When the whole patch series is finished, convert stgit patches to git commits:
+
+.. code-block:: sh
+
+    stg commit
+
+Submitting Patches
+******************
+
+Submit pull requests on GitHub:
+https://github.com/MusicPlayerDaemon/MPD/pulls
--- a/doc/developer.xml
+++ b/doc/developer.xml
@@ -1,231 +0,0 @@
-<?xml version='1.0' encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<book>
-  <title>The Music Player Daemon - Developer's Manual</title>
-
-  <chapter id="introduction">
-    <title>Introduction</title>
-
-    <para>
-      This is a guide for those who wish to hack on the MPD source
-      code.  MPD is an open project, and we are always happy about
-      contributions.  So far, more than 150 people have contributed
-      patches.
-    </para>
-
-    <para>
-      This document is work in progress.  Most of it may be incomplete
-      yet.  Please help!
-    </para>
-  </chapter>
-
-  <chapter id="code_style">
-    <title>Code Style</title>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          indent with tabs (width 8)
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          don't write CPP when you can write C++: use inline
-          functions and constexpr instead of macros
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          comment your code, document your APIs
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          the code should be C++14 compliant, and must compile with
-          <application>GCC</application> 4.9 and
-          <application>clang</application> 3.4
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          report error conditions with C++ exceptions, preferable
-          derived from <varname>std::runtime_error</varname>
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          all code must be exception-safe
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          classes and functions names use CamelCase; variables are
-          lower-case with words separated by underscore
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Some example code:
-        </para>
-
-        <programlisting lang="C">static inline int
-Foo(const char *abc, int xyz)
-{
-        if (abc == nullptr) {
-                LogWarning("Foo happened!");
-                return -1;
-        }
-
-        return xyz;
-}
-        </programlisting>
-      </listitem>
-    </itemizedlist>
-  </chapter>
-
-  <chapter id="hacking">
-    <title>Hacking The Source</title>
-
-    <para>
-      MPD sources are managed in a git repository on <ulink
-      url="https://github.com/MusicPlayerDaemon/">GitHub</ulink>.
-    </para>
-
-    <para>
-      Always write your code against the latest git:
-    </para>
-
-    <programlisting>git clone git://github.com/MusicPlayerDaemon/MPD</programlisting>
-
-    <para>
-      If you already have a clone, update it:
-    </para>
-
-    <programlisting>git pull --rebase git://github.com/MusicPlayerDaemon/MPD master</programlisting>
-
-    <para>
-      You can do without "--rebase", but we recommend that you rebase
-      your repository on the "master" repository all the time.
-    </para>
-
-    <para>
-      Configure with the options <option>--enable-debug
-      --enable-werror</option>.  Enable as many plugins as possible,
-      to be sure that you don't break any disabled code.
-    </para>
-
-    <para>
-      Don't mix several changes in one single patch.  Create a
-      separate patch for every change.  Tools like
-      <application>stgit</application> help you with that.  This way,
-      we can review your patches more easily, and we can pick the
-      patches we like most first.
-    </para>
-
-
-    <section>
-      <title> Basic stgit usage</title>
-
-      <para>
-        stgit allows you to create a set of patches and refine all of
-        them: you can go back to any patch at any time, and re-edit it
-        (both the code and the commit message). You can reorder
-        patches and insert new patches at any position. It encourages
-        creating separate patches for tiny changes.
-      </para>
-
-      <para>
-        stgit needs to be initialized on a git repository: stg init
-      </para>
-
-      <para>
-        Before you edit the code, create a patch: stg new
-        my-patch-name (stgit now asks you for the commit message).
-      </para>
-
-      <para>
-        Now edit the code. Once you're finished, you have to "refresh"
-        the patch, i.e. your edits are incorporated into the patch you
-        have created: stg refresh
-      </para>
-
-      <para>
-        You may now continue editing the same patch, and refresh it as
-        often as you like. Create more patches, edit and refresh them.
-      </para>
-
-      <para>
-        To view the list of patches, type stg series. To go back to a
-        specific patch, type stg goto my-patch-name; now you can
-        re-edit it (don't forget stg refresh when you're finished with
-        that patch).
-      </para>
-
-      <para>
-        When the whole patch series is finished, convert stgit patches
-        to git commits: stg commit
-      </para>
-    </section>
-  </chapter>
-
-  <chapter id="submitting_patches">
-    <title>Submitting Patches</title>
-
-    <para>
-      Send your patches to the mailing list:
-      <email>mpd-devel@musicpd.org</email> (<ulink
-      url="http://mailman.blarg.de/listinfo/mpd-devel">subscribe
-      here</ulink>)
-    </para>
-
-    <para>
-      <command>git pull</command> requests are preferred.
-    </para>
-  </chapter>
-
-  <chapter id="tools">
-    <title>Development Tools</title>
-
-    <section>
-      <title>Clang Static Analyzer</title>
-
-      <para>
-        The <ulink url="http://clang-analyzer.llvm.org/">clang static
-        analyzer</ulink> is a tool that helps find bugs.  To run it on
-        the MPD code base, install LLVM and clang.  Configure MPD to
-        use clang:
-      </para>
-
-      <programlisting>./configure --enable-debug CXX=clang++ CC=clang ...</programlisting>
-
-      <para>
-        It is recommended to use <option>--enable-debug</option>,
-        because the analyzer takes advantage of
-        <function>assert()</function> calls, which are only enabled in
-        the debug build.
-      </para>
-
-      <para>
-        Now run the analyzer:
-      </para>
-
-      <programlisting>scan-build --use-c++=clang++ --use-cc=clang make</programlisting>
-
-      <para>
-        The options <option>--use-c++</option> and
-        <option>--use-cc</option> are necessary because it invokes
-        <command>cc</command> for actually compiling the sources by
-        default.  That breaks, because MPD requires a C99 compiler.
-      </para>
-    </section>
-  </chapter>
-</book>
--- a/doc/include/tags.xml
+++ b/doc/include/tags.xml
@@ -1,156 +0,0 @@
-<?xml version='1.0' encoding="utf-8"?>
-<!DOCTYPE itemizedlist PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-                              "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<itemizedlist>
-  <listitem>
-    <para>
-      <varname>artist</varname>: the artist name.  Its meaning is not
-      well-defined; see <varname>composer</varname> and
-      <varname>performer</varname> for more specific tags.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>artistsort</varname>: same as
-      <varname>artist</varname>, but for sorting.  This usually omits
-      prefixes such as "The".
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>album</varname>: the album name.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>albumsort</varname>: same as <varname>album</varname>,
-      but for sorting.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>albumartist</varname>: on multi-artist albums, this is
-      the artist name which shall be used for the whole album.  The
-      exact meaning of this tag is not well-defined.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>albumartistsort</varname>: same as
-      <varname>albumartist</varname>, but for sorting.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>title</varname>: the song title.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>track</varname>: the decimal track number within the
-      album.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>name</varname>: a name for this song.  This is not the
-      song title.  The exact meaning of this tag is not well-defined.
-      It is often used by badly configured internet radio stations
-      with broken tags to squeeze both the artist name and the song
-      title in one tag.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>genre</varname>: the music genre.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>date</varname>: the song's release date.  This is
-      usually a 4-digit year.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>composer</varname>: the artist who composed the song.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>performer</varname>: the artist who performed the song.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>comment</varname>: a human-readable comment about this
-      song.  The exact meaning of this tag is not well-defined.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>disc</varname>: the decimal disc number in a multi-disc
-      album.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>musicbrainz_artistid</varname>: the artist id in the
-      <ulink
-      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
-      database.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>musicbrainz_albumid</varname>: the album id in the
-      <ulink
-      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
-      database.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>musicbrainz_albumartistid</varname>: the album artist
-      id in the <ulink
-      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
-      database.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>musicbrainz_trackid</varname>: the track id in the
-      <ulink
-      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
-      database.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      <varname>musicbrainz_releasetrackid</varname>: the release track
-      id in the <ulink
-      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
-      database.
-    </para>
-  </listitem>
-</itemizedlist>
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -0,0 +1,18 @@
+Music Player Daemon
+===================
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Contents:
+
+   user
+   plugins
+   developer
+   protocol
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`search`
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -0,0 +1,33 @@
+install_man(['mpd.1', 'mpd.conf.5'])
+
+sphinx = find_program('sphinx-build')
+sphinx_output = custom_target(
+  'HTML documentation',
+  output: 'html',
+  input: [
+    'index.rst', 'user.rst', 'developer.rst',
+    'plugins.rst',
+    'protocol.rst',
+    'conf.py',
+  ],
+  command: [sphinx, '-q', '-b', 'html', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@'],
+  build_by_default: true,
+  install: true,
+  install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
+)
+
+custom_target(
+  'upload',
+  input: sphinx_output,
+  output: 'upload',
+  build_always_stale: true,
+  command: [
+    'rsync', '-vpruz', '--delete', meson.current_build_dir() + '/',
+    'www.musicpd.org:/var/www/mpd/doc/',
+    '--chmod=Dug+rwx,Do+rx,Fug+rw,Fo+r',
+    '--include=html', '--include=html/**',
+    '--exclude=*',
+  ],
+)
+  
+  
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -72,19 +72,6 @@ never run as root, and you may use this option to make MPD change its
 user id after initialization.  Do not use this option if you start MPD
 as an unprivileged user.
 .TP
-.B bind_to_address <ip address or hostname or any>
-This specifies which address mpd binds to and listens on.  Multiple
-bind_to_address parameters may be specified.  The default is "any", which binds
-to all available addresses.
-
-You can set a port that is different from the global port setting,
-e.g. "localhost:6602".  IPv6 addresses must be enclosed in square
-brackets if you want to configure a port, e.g. "[::1]:6602".
-
-To bind to a Unix domain socket, specify an absolute path or a path starting
-with a tilde (~).  For a system-wide MPD, we suggest the path
-"\fB/var/run/mpd/socket\fP".
-.TP
 .B port <port>
 This specifies the port that mpd listens on.  The default is 6600.
 .TP
@@ -112,23 +99,8 @@ information will be published with Zeroconf.  The default is yes.
 .B zeroconf_name <name>
 If Zeroconf is enabled, this is the service name to publish.  This name should
 be unique to your local network, but name collisions will be properly dealt
-with.  The default is "Music Player".
-.TP
-.B password <password@permissions>
-This specifies a password for access to mpd.  The format is
-"password@permissions" where permissions is a comma delimited list composed
-of "read", "add", "control", and/or "admin".  "read" allows for reading of the
-database, displaying the current playlist, and current status of mpd.  "add"
-allows for adding songs and loading playlists.  "control" allows for all other
-player and playlist manipulations.  "admin" allows the db to be updated and for
-the client to kill mpd.  An example value is "somePassword@read,add".  Multiple
-password parameters may be specified.
-.TP
-.B default_permissions <permissions>
-This specifies the permissions of a client that has not been authenticated
-using a password.  The format of permissions is specified in the description of
-the "password" config parameter.  If no passwords are specified, the default is
-"read,add,control,admin", otherwise it is "" (no permissions).
+with.  The default is "Music Player @ %h", where %h will be replaced with the
+hostname of the machine running MPD.
 .TP
 .B audio_output
 See \fBDESCRIPTION\fP and the various \fBAUDIO OUTPUT PARAMETERS\fP sections
@@ -156,14 +128,6 @@ This specifies the character set used for the filesystem.  A list of supported
 character sets can be obtained by running "iconv \-l".  The default is
 determined from the locale when the db was originally created.
 .TP
-.B gapless_mp3_playback <yes or no>
-This specifies whether to support gapless playback of MP3s which have the
-necessary headers.  Useful if your MP3s have headers with incorrect
-information.  If you have such MP3s, it is highly recommended that you fix them
-using vbrfix (available from <http://www.willwap.co.uk/Programs/vbrfix.php>)
-instead of disabling gapless MP3 playback.  The default is to support gapless
-MP3 playback.
-.TP
 .B save_absolute_paths_in_playlists <yes or no>
 This specifies whether relative or absolute paths for song filenames are used
 when saving playlists.  The default is "no".
@@ -176,7 +140,6 @@ of database.
 .B auto_update_depth <N>
 Limit the depth of the directories being watched, 0 means only watch
 the music directory itself.  There is no limit by default.
-.TP
 .SH REQUIRED AUDIO OUTPUT PARAMETERS
 .TP
 .B type <type>
@@ -200,57 +163,12 @@ Specifies how replay gain is applied.  The default is "software",
 which uses an internal software volume control.  "mixer" uses the
 configured (hardware) mixer control.  "none" disables replay gain on
 this audio output.
-.SH OPTIONAL ALSA OUTPUT PARAMETERS
-.TP
-.B device <dev>
-This specifies the device to use for audio output.  The default is "default".
 .TP
 .B mixer_type <hardware, software or none>
 Specifies which mixer should be used for this audio output: the
 hardware mixer (available for ALSA, OSS and PulseAudio), the software
 mixer or no mixer ("none").  By default, the hardware mixer is used
 for devices which support it, and none for the others.
-.TP
-.B mixer_device <mixer dev>
-This specifies which mixer to use.  The default is "default".  To use
-the second sound card in a system, use "hw:1".
-.TP
-.B mixer_control <mixer ctrl>
-This specifies which mixer control to use (sometimes referred to as
-the "device").  The default is "PCM".  Use "amixer scontrols" to see
-the list of possible controls.
-.TP
-.B mixer_index <mixer index>
-A number identifying the index of the named mixer control.  This is
-probably only useful if your alsa device has more than one
-identically\-named mixer control.  The default is "0".  Use "amixer
-scontrols" to see the list of controls with their indexes.
-.TP
-.B auto_resample <yes or no>
-Setting this to "no" disables ALSA's software resampling, if the
-hardware does not support a specific sample rate.  This lets MPD do
-the resampling.  "yes" is the default and allows ALSA to resample.
-.TP
-.B auto_channels <yes or no>
-Setting this to "no" disables ALSA's channel conversion, if the
-hardware does not support a specific number of channels.  Default: "yes".
-.TP
-.B auto_format <yes or no>
-Setting this to "no" disables ALSA's sample format conversion, if the
-hardware does not support a specific sample format.  Default: "yes".
-.TP
-.B buffer_time <time in microseconds>
-This sets the length of the hardware sample buffer in microseconds.  Increasing
-it may help to reduce or eliminate skipping on certain setups.  Most users do
-not need to change this.  The default is 500000 microseconds (0.5 seconds).
-.TP
-.B period_time <time in microseconds>
-This sets the time between hardware sample transfers in microseconds.
-Increasing this can reduce CPU usage while lowering it can reduce underrun
-errors on bandwidth-limited devices.  Some users have reported good results
-with this set to 50000, but not all devices support values this high.  Most
-users do not need to change this.  The default is 256000000 / sample_rate(kHz),
-or 5804 microseconds for CD-quality audio.
 .SH FILES
 .TP
 .BI ~/.mpdconf
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -32,7 +32,7 @@
 # settings.
 #
 # The special value "syslog" makes MPD use the local syslog daemon. This
-# setting defaults to logging to syslog, otherwise logging is disabled.
+# setting defaults to logging to syslog.
 #
 #log_file			"~/.mpd/log"
 #
@@ -96,14 +96,6 @@
 #
 #log_level			"default"
 #
-# If you have a problem with your MP3s ending abruptly it is recommended that 
-# you set this argument to "no" to attempt to fix the problem. If this solves
-# the problem, it is highly recommended to fix the MP3 files with vbrfix
-# (available from <http://www.willwap.co.uk/Programs/vbrfix.php>), at which
-# point gapless MP3 playback can be enabled.
-#
-#gapless_mp3_playback			"yes"
-#
 # Setting "restore_paused" to "yes" puts MPD into pause mode instead
 # of starting playback after startup.
 #
@@ -119,6 +111,10 @@
 # found in the user manual.
 #metadata_to_use	"artist,album,title,track,name,genre,date,composer,performer,disc"
 #
+# This example just enables the "comment" tag without disabling all
+# the other supported tags:
+#metadata_to_use "+comment"
+#
 # This setting enables automatic update of MPD's database when files in 
 # music_directory are changed.
 #
@@ -155,9 +151,9 @@
 #zeroconf_enabled		"yes"
 #
 # The argument to this setting will be the Zeroconf / Avahi unique name for
-# this MPD server on the network.
+# this MPD server on the network. %h will be replaced with the hostname.
 #
-#zeroconf_name			"Music Player"
+#zeroconf_name			"Music Player @ %h"
 #
 ###############################################################################

@@ -310,7 +306,7 @@ input {
 #audio_output {
 #	type		"sndio"
 #	name		"sndio output"
-#	mixer_type	"software"
+#	mixer_type	"hardware"
 #}
 #
 # An example of an OS X output:
--- a/doc/plugins.rst
+++ b/doc/plugins.rst
--- a/doc/protocol.rst
+++ b/doc/protocol.rst
--- a/doc/protocol.xml
+++ b/doc/protocol.xml
--- a/doc/user.rst
+++ b/doc/user.rst
--- a/doc/user.xml
+++ b/doc/user.xml
--- a/m4/ax_append_compile_flags.m4
+++ b/m4/ax_append_compile_flags.m4
@@ -1,67 +0,0 @@
-# ===========================================================================
-#  http://www.gnu.org/software/autoconf-archive/ax_append_compile_flags.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT])
-#
-# DESCRIPTION
-#
-#   For every FLAG1, FLAG2 it is checked whether the compiler works with the
-#   flag.  If it does, the flag is added FLAGS-VARIABLE
-#
-#   If FLAGS-VARIABLE is not specified, the current language's flags (e.g.
-#   CFLAGS) is used.  During the check the flag is always added to the
-#   current language's flags.
-#
-#   If EXTRA-FLAGS is defined, it is added to the current language's default
-#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
-#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
-#   force the compiler to issue an error when a bad flag is given.
-#
-#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
-#
-#   NOTE: This macro depends on the AX_APPEND_FLAG and
-#   AX_CHECK_COMPILE_FLAG. Please keep this macro in sync with
-#   AX_APPEND_LINK_FLAGS.
-#
-# LICENSE
-#
-#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 5
-
-AC_DEFUN([AX_APPEND_COMPILE_FLAGS],
-[AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
-AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
-for flag in $1; do
-  AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3], [$4])
-done
-])dnl AX_APPEND_COMPILE_FLAGS
--- a/m4/ax_append_flag.m4
+++ b/m4/ax_append_flag.m4
@@ -1,71 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_append_flag.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE])
-#
-# DESCRIPTION
-#
-#   FLAG is appended to the FLAGS-VARIABLE shell variable, with a space
-#   added in between.
-#
-#   If FLAGS-VARIABLE is not specified, the current language's flags (e.g.
-#   CFLAGS) is used.  FLAGS-VARIABLE is not changed if it already contains
-#   FLAG.  If FLAGS-VARIABLE is unset in the shell, it is set to exactly
-#   FLAG.
-#
-#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 6
-
-AC_DEFUN([AX_APPEND_FLAG],
-[dnl
-AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF
-AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])
-AS_VAR_SET_IF(FLAGS,[
-  AS_CASE([" AS_VAR_GET(FLAGS) "],
-    [*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])],
-    [
-     AS_VAR_APPEND(FLAGS,[" $1"])
-     AC_RUN_LOG([: FLAGS="$FLAGS"])
-    ])
-  ],
-  [
-  AS_VAR_SET(FLAGS,[$1])
-  AC_RUN_LOG([: FLAGS="$FLAGS"])
-  ])
-AS_VAR_POPDEF([FLAGS])dnl
-])dnl AX_APPEND_FLAG
--- a/m4/ax_append_link_flags.m4
+++ b/m4/ax_append_link_flags.m4
@@ -1,65 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_append_link_flags.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_APPEND_LINK_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT])
-#
-# DESCRIPTION
-#
-#   For every FLAG1, FLAG2 it is checked whether the linker works with the
-#   flag.  If it does, the flag is added FLAGS-VARIABLE
-#
-#   If FLAGS-VARIABLE is not specified, the linker's flags (LDFLAGS) is
-#   used. During the check the flag is always added to the linker's flags.
-#
-#   If EXTRA-FLAGS is defined, it is added to the linker's default flags
-#   when the check is done.  The check is thus made with the flags: "LDFLAGS
-#   EXTRA-FLAGS FLAG".  This can for example be used to force the linker to
-#   issue an error when a bad flag is given.
-#
-#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
-#
-#   NOTE: This macro depends on the AX_APPEND_FLAG and AX_CHECK_LINK_FLAG.
-#   Please keep this macro in sync with AX_APPEND_COMPILE_FLAGS.
-#
-# LICENSE
-#
-#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 5
-
-AC_DEFUN([AX_APPEND_LINK_FLAGS],
-[AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
-AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
-for flag in $1; do
-  AX_CHECK_LINK_FLAG([$flag], [AX_APPEND_FLAG([$flag], [m4_default([$2], [LDFLAGS])])], [], [$3], [$4])
-done
-])dnl AX_APPEND_LINK_FLAGS
--- a/m4/ax_boost_base.m4
+++ b/m4/ax_boost_base.m4
@@ -1,285 +0,0 @@
-# ===========================================================================
-#       http://www.gnu.org/software/autoconf-archive/ax_boost_base.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_BASE([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# DESCRIPTION
-#
-#   Test for the Boost C++ libraries of a particular version (or newer)
-#
-#   If no path to the installed boost library is given the macro searchs
-#   under /usr, /usr/local, /opt and /opt/local and evaluates the
-#   $BOOST_ROOT environment variable. Further documentation is available at
-#   <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS)
-#
-#   And sets:
-#
-#     HAVE_BOOST
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2009 Peter Adolphs
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 27
-
-AC_DEFUN([AX_BOOST_BASE],
-[
-AC_ARG_WITH([boost],
-  [AS_HELP_STRING([--with-boost@<:@=ARG@:>@],
-    [use Boost library from a standard location (ARG=yes),
-     from the specified location (ARG=<path>),
-     or disable it (ARG=no)
-     @<:@ARG=yes@:>@ ])],
-    [
-    if test "$withval" = "no"; then
-        want_boost="no"
-    elif test "$withval" = "yes"; then
-        want_boost="yes"
-        ac_boost_path=""
-    else
-        want_boost="yes"
-        ac_boost_path="$withval"
-    fi
-    ],
-    [want_boost="yes"])
-
-
-AC_ARG_WITH([boost-libdir],
-        AS_HELP_STRING([--with-boost-libdir=LIB_DIR],
-        [Force given directory for boost libraries. Note that this will override library path detection, so use this parameter only if default library detection fails and you know exactly where your boost libraries are located.]),
-        [
-        if test -d "$withval"
-        then
-                ac_boost_lib_path="$withval"
-        else
-                AC_MSG_ERROR(--with-boost-libdir expected directory name)
-        fi
-        ],
-        [ac_boost_lib_path=""]
-)
-
-if test "x$want_boost" = "xyes"; then
-    boost_lib_version_req=ifelse([$1], ,1.20.0,$1)
-    boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'`
-    boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'`
-    boost_lib_version_req_minor=`expr $boost_lib_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
-    boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
-    if test "x$boost_lib_version_req_sub_minor" = "x" ; then
-        boost_lib_version_req_sub_minor="0"
-        fi
-    WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+  $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
-    AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
-    succeeded=no
-
-    dnl On 64-bit systems check for system libraries in both lib64 and lib.
-    dnl The former is specified by FHS, but e.g. Debian does not adhere to
-    dnl this (as it rises problems for generic multi-arch support).
-    dnl The last entry in the list is chosen by default when no libraries
-    dnl are found, e.g. when only header-only libraries are installed!
-    libsubdirs="lib"
-    ax_arch=`uname -m`
-    case $ax_arch in
-      x86_64)
-        libsubdirs="lib64 libx32 lib lib64"
-        ;;
-      ppc64|s390x|sparc64|aarch64|ppc64le)
-        libsubdirs="lib64 lib lib64"
-        ;;
-    esac
-
-    dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give
-    dnl them priority over the other paths since, if libs are found there, they
-    dnl are almost assuredly the ones desired.
-    AC_REQUIRE([AC_CANONICAL_HOST])
-    libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
-
-    case ${host_cpu} in
-      i?86)
-        libsubdirs="lib/i386-${host_os} $libsubdirs"
-        ;;
-    esac
-
-    dnl first we check the system location for boost libraries
-    dnl this location ist chosen if boost libraries are installed with the --layout=system option
-    dnl or if you install boost with RPM
-    if test "$ac_boost_path" != ""; then
-        BOOST_CPPFLAGS="-I$ac_boost_path/include"
-        for ac_boost_path_tmp in $libsubdirs; do
-                if test -d "$ac_boost_path"/"$ac_boost_path_tmp" ; then
-                        BOOST_LDFLAGS="-L$ac_boost_path/$ac_boost_path_tmp"
-                        break
-                fi
-        done
-    elif test "$cross_compiling" != yes; then
-        for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
-            if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
-                for libsubdir in $libsubdirs ; do
-                    if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-                done
-                BOOST_LDFLAGS="-L$ac_boost_path_tmp/$libsubdir"
-                BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
-                break;
-            fi
-        done
-    fi
-
-    dnl overwrite ld flags if we have required special directory with
-    dnl --with-boost-libdir parameter
-    if test "$ac_boost_lib_path" != ""; then
-       BOOST_LDFLAGS="-L$ac_boost_lib_path"
-    fi
-
-    CPPFLAGS_SAVED="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-    export CPPFLAGS
-
-    LDFLAGS_SAVED="$LDFLAGS"
-    LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-    export LDFLAGS
-
-    AC_REQUIRE([AC_PROG_CXX])
-    AC_LANG_PUSH(C++)
-        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-    @%:@include <boost/version.hpp>
-    ]], [[
-    #if BOOST_VERSION >= $WANT_BOOST_VERSION
-    // Everything is okay
-    #else
-    #  error Boost version is too old
-    #endif
-    ]])],[
-        AC_MSG_RESULT(yes)
-    succeeded=yes
-    found_system=yes
-        ],[
-        ])
-    AC_LANG_POP([C++])
-
-
-
-    dnl if we found no boost with system layout we search for boost libraries
-    dnl built and installed without the --layout=system option or for a staged(not installed) version
-    if test "x$succeeded" != "xyes"; then
-        CPPFLAGS="$CPPFLAGS_SAVED"
-        LDFLAGS="$LDFLAGS_SAVED"
-        BOOST_CPPFLAGS=
-        BOOST_LDFLAGS=
-        _version=0
-        if test "$ac_boost_path" != ""; then
-            if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
-                for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
-                    _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
-                    V_CHECK=`expr $_version_tmp \> $_version`
-                    if test "$V_CHECK" = "1" ; then
-                        _version=$_version_tmp
-                    fi
-                    VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
-                    BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
-                done
-                dnl if nothing found search for layout used in Windows distributions
-                if test -z "$BOOST_CPPFLAGS"; then
-                    if test -d "$ac_boost_path/boost" && test -r "$ac_boost_path/boost"; then
-                        BOOST_CPPFLAGS="-I$ac_boost_path"
-                    fi
-                fi
-            fi
-        else
-            if test "$cross_compiling" != yes; then
-                for ac_boost_path in /usr /usr/local /opt /opt/local ; do
-                    if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
-                        for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
-                            _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
-                            V_CHECK=`expr $_version_tmp \> $_version`
-                            if test "$V_CHECK" = "1" ; then
-                                _version=$_version_tmp
-                                best_path=$ac_boost_path
-                            fi
-                        done
-                    fi
-                done
-
-                VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
-                BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
-                if test "$ac_boost_lib_path" = ""; then
-                    for libsubdir in $libsubdirs ; do
-                        if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-                    done
-                    BOOST_LDFLAGS="-L$best_path/$libsubdir"
-                fi
-            fi
-
-            if test "x$BOOST_ROOT" != "x"; then
-                for libsubdir in $libsubdirs ; do
-                    if ls "$BOOST_ROOT/stage/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-                done
-                if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/$libsubdir" && test -r "$BOOST_ROOT/stage/$libsubdir"; then
-                    version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`
-                    stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
-                        stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'`
-                    V_CHECK=`expr $stage_version_shorten \>\= $_version`
-                    if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then
-                        AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)
-                        BOOST_CPPFLAGS="-I$BOOST_ROOT"
-                        BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir"
-                    fi
-                fi
-            fi
-        fi
-
-        CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-        export CPPFLAGS
-        LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-        export LDFLAGS
-
-        AC_LANG_PUSH(C++)
-            AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-        @%:@include <boost/version.hpp>
-        ]], [[
-        #if BOOST_VERSION >= $WANT_BOOST_VERSION
-        // Everything is okay
-        #else
-        #  error Boost version is too old
-        #endif
-        ]])],[
-            AC_MSG_RESULT(yes)
-        succeeded=yes
-        found_system=yes
-            ],[
-            ])
-        AC_LANG_POP([C++])
-    fi
-
-    if test "$succeeded" != "yes" ; then
-        if test "$_version" = "0" ; then
-            AC_MSG_NOTICE([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option.  If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]])
-        else
-            AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).])
-        fi
-        # execute ACTION-IF-NOT-FOUND (if present):
-        ifelse([$3], , :, [$3])
-    else
-        AC_SUBST(BOOST_CPPFLAGS)
-        AC_SUBST(BOOST_LDFLAGS)
-        AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
-        # execute ACTION-IF-FOUND (if present):
-        ifelse([$2], , :, [$2])
-    fi
-
-    CPPFLAGS="$CPPFLAGS_SAVED"
-    LDFLAGS="$LDFLAGS_SAVED"
-fi
-
-])
--- a/m4/ax_check_compile_flag.m4
+++ b/m4/ax_check_compile_flag.m4
@@ -1,74 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
-#
-# DESCRIPTION
-#
-#   Check whether the given FLAG works with the current language's compiler
-#   or gives an error.  (Warnings, however, are ignored)
-#
-#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
-#   success/failure.
-#
-#   If EXTRA-FLAGS is defined, it is added to the current language's default
-#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
-#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
-#   force the compiler to issue an error when a bad flag is given.
-#
-#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
-#
-#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
-#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 4
-
-AC_DEFUN([AX_CHECK_COMPILE_FLAG],
-[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
-AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
-AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
-  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
-  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
-  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
-    [AS_VAR_SET(CACHEVAR,[yes])],
-    [AS_VAR_SET(CACHEVAR,[no])])
-  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
-AS_VAR_IF(CACHEVAR,yes,
-  [m4_default([$2], :)],
-  [m4_default([$3], :)])
-AS_VAR_POPDEF([CACHEVAR])dnl
-])dnl AX_CHECK_COMPILE_FLAGS
--- a/m4/ax_check_link_flag.m4
+++ b/m4/ax_check_link_flag.m4
@@ -1,74 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
-#
-# DESCRIPTION
-#
-#   Check whether the given FLAG works with the linker or gives an error.
-#   (Warnings, however, are ignored)
-#
-#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
-#   success/failure.
-#
-#   If EXTRA-FLAGS is defined, it is added to the linker's default flags
-#   when the check is done.  The check is thus made with the flags: "LDFLAGS
-#   EXTRA-FLAGS FLAG".  This can for example be used to force the linker to
-#   issue an error when a bad flag is given.
-#
-#   INPUT gives an alternative input source to AC_LINK_IFELSE.
-#
-#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
-#   macro in sync with AX_CHECK_{PREPROC,COMPILE}_FLAG.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 4
-
-AC_DEFUN([AX_CHECK_LINK_FLAG],
-[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
-AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl
-AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [
-  ax_check_save_flags=$LDFLAGS
-  LDFLAGS="$LDFLAGS $4 $1"
-  AC_LINK_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
-    [AS_VAR_SET(CACHEVAR,[yes])],
-    [AS_VAR_SET(CACHEVAR,[no])])
-  LDFLAGS=$ax_check_save_flags])
-AS_VAR_IF(CACHEVAR,yes,
-  [m4_default([$2], :)],
-  [m4_default([$3], :)])
-AS_VAR_POPDEF([CACHEVAR])dnl
-])dnl AX_CHECK_LINK_FLAGS
--- a/m4/ax_cxx_compile_stdcxx.m4
+++ b/m4/ax_cxx_compile_stdcxx.m4
@@ -1,564 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional])
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the specified
-#   version of the C++ standard.  If necessary, add switches to CXX and
-#   CXXCPP to enable support.  VERSION may be '11' (for the C++11 standard)
-#   or '14' (for the C++14 standard).
-#
-#   The second argument, if specified, indicates whether you insist on an
-#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
-#   -std=c++11).  If neither is specified, you get whatever works, with
-#   preference for an extended mode.
-#
-#   The third argument, if specified 'mandatory' or if left unspecified,
-#   indicates that baseline support for the specified C++ standard is
-#   required and that the macro should error out if no mode with that
-#   support is found.  If specified 'optional', then configuration proceeds
-#   regardless, after defining HAVE_CXX${VERSION} if and only if a
-#   supporting mode is found.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
-#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
-#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
-#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.  This file is offered as-is, without any
-#   warranty.
-
-#serial 4
-
-dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
-dnl  (serial version number 13).
-
-AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
-  m4_if([$1], [11], [],
-        [$1], [14], [],
-        [$1], [17], [m4_fatal([support for C++17 not yet implemented in AX_CXX_COMPILE_STDCXX])],
-        [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
-  m4_if([$2], [], [],
-        [$2], [ext], [],
-        [$2], [noext], [],
-        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl
-  m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true],
-        [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
-        [$3], [optional], [ax_cxx_compile_cxx$1_required=false],
-        [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
-  AC_LANG_PUSH([C++])dnl
-  ac_success=no
-  AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
-  ax_cv_cxx_compile_cxx$1,
-  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-    [ax_cv_cxx_compile_cxx$1=yes],
-    [ax_cv_cxx_compile_cxx$1=no])])
-  if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
-    ac_success=yes
-  fi
-
-  m4_if([$2], [noext], [], [dnl
-  if test x$ac_success = xno; then
-    for switch in -std=gnu++$1 -std=gnu++0x; do
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-                     $cachevar,
-        [ac_save_CXX="$CXX"
-         CXX="$CXX $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXX="$ac_save_CXX"])
-      if eval test x\$$cachevar = xyes; then
-        CXX="$CXX $switch"
-        if test -n "$CXXCPP" ; then
-          CXXCPP="$CXXCPP $switch"
-        fi
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-
-  m4_if([$2], [ext], [], [dnl
-  if test x$ac_success = xno; then
-    dnl HP's aCC needs +std=c++11 according to:
-    dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
-    dnl Cray's crayCC needs "-h std=c++11"
-    for switch in -std=c++$1 -std=c++0x +std=c++$1 "-h std=c++$1"; do
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-                     $cachevar,
-        [ac_save_CXX="$CXX"
-         CXX="$CXX $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXX="$ac_save_CXX"])
-      if eval test x\$$cachevar = xyes; then
-        CXX="$CXX $switch"
-        if test -n "$CXXCPP" ; then
-          CXXCPP="$CXXCPP $switch"
-        fi
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-  AC_LANG_POP([C++])
-  if test x$ax_cxx_compile_cxx$1_required = xtrue; then
-    if test x$ac_success = xno; then
-      AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.])
-    fi
-  fi
-  if test x$ac_success = xno; then
-    HAVE_CXX$1=0
-    AC_MSG_NOTICE([No compiler with C++$1 support was found])
-  else
-    HAVE_CXX$1=1
-    AC_DEFINE(HAVE_CXX$1,1,
-              [define if the compiler supports basic C++$1 syntax])
-  fi
-  AC_SUBST(HAVE_CXX$1)
-])
-
-
-dnl  Test body for checking C++11 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-)
-
-
-dnl  Test body for checking C++14 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-)
-
-
-dnl  Tests for new features in C++11
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
-
-// If the compiler admits that it is not ready for C++11, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201103L
-
-#error "This is not a C++11 compiler"
-
-#else
-
-namespace cxx11
-{
-
-  namespace test_static_assert
-  {
-
-    template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-  }
-
-  namespace test_final_override
-  {
-
-    struct Base
-    {
-      virtual void f() {}
-    };
-
-    struct Derived : public Base
-    {
-      virtual void f() override {}
-    };
-
-  }
-
-  namespace test_double_right_angle_brackets
-  {
-
-    template < typename T >
-    struct check {};
-
-    typedef check<void> single_type;
-    typedef check<check<void>> double_type;
-    typedef check<check<check<void>>> triple_type;
-    typedef check<check<check<check<void>>>> quadruple_type;
-
-  }
-
-  namespace test_decltype
-  {
-
-    int
-    f()
-    {
-      int a = 1;
-      decltype(a) b = 2;
-      return a + b;
-    }
-
-  }
-
-  namespace test_type_deduction
-  {
-
-    template < typename T1, typename T2 >
-    struct is_same
-    {
-      static const bool value = false;
-    };
-
-    template < typename T >
-    struct is_same<T, T>
-    {
-      static const bool value = true;
-    };
-
-    template < typename T1, typename T2 >
-    auto
-    add(T1 a1, T2 a2) -> decltype(a1 + a2)
-    {
-      return a1 + a2;
-    }
-
-    int
-    test(const int c, volatile int v)
-    {
-      static_assert(is_same<int, decltype(0)>::value == true, "");
-      static_assert(is_same<int, decltype(c)>::value == false, "");
-      static_assert(is_same<int, decltype(v)>::value == false, "");
-      auto ac = c;
-      auto av = v;
-      auto sumi = ac + av + 'x';
-      auto sumf = ac + av + 1.0;
-      static_assert(is_same<int, decltype(ac)>::value == true, "");
-      static_assert(is_same<int, decltype(av)>::value == true, "");
-      static_assert(is_same<int, decltype(sumi)>::value == true, "");
-      static_assert(is_same<int, decltype(sumf)>::value == false, "");
-      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
-      return (sumf > 0.0) ? sumi : add(c, v);
-    }
-
-  }
-
-  namespace test_noexcept
-  {
-
-    int f() { return 0; }
-    int g() noexcept { return 0; }
-
-    static_assert(noexcept(f()) == false, "");
-    static_assert(noexcept(g()) == true, "");
-
-  }
-
-  namespace test_constexpr
-  {
-
-    template < typename CharT >
-    unsigned long constexpr
-    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
-    {
-      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
-    }
-
-    template < typename CharT >
-    unsigned long constexpr
-    strlen_c(const CharT *const s) noexcept
-    {
-      return strlen_c_r(s, 0UL);
-    }
-
-    static_assert(strlen_c("") == 0UL, "");
-    static_assert(strlen_c("1") == 1UL, "");
-    static_assert(strlen_c("example") == 7UL, "");
-    static_assert(strlen_c("another\0example") == 7UL, "");
-
-  }
-
-  namespace test_rvalue_references
-  {
-
-    template < int N >
-    struct answer
-    {
-      static constexpr int value = N;
-    };
-
-    answer<1> f(int&)       { return answer<1>(); }
-    answer<2> f(const int&) { return answer<2>(); }
-    answer<3> f(int&&)      { return answer<3>(); }
-
-    void
-    test()
-    {
-      int i = 0;
-      const int c = 0;
-      static_assert(decltype(f(i))::value == 1, "");
-      static_assert(decltype(f(c))::value == 2, "");
-      static_assert(decltype(f(0))::value == 3, "");
-    }
-
-  }
-
-  namespace test_uniform_initialization
-  {
-
-    struct test
-    {
-      static const int zero {};
-      static const int one {1};
-    };
-
-    static_assert(test::zero == 0, "");
-    static_assert(test::one == 1, "");
-
-  }
-
-  namespace test_lambdas
-  {
-
-    void
-    test1()
-    {
-      auto lambda1 = [](){};
-      auto lambda2 = lambda1;
-      lambda1();
-      lambda2();
-    }
-
-    int
-    test2()
-    {
-      auto a = [](int i, int j){ return i + j; }(1, 2);
-      auto b = []() -> int { return '0'; }();
-      auto c = [=](){ return a + b; }();
-      auto d = [&](){ return c; }();
-      auto e = [a, &b](int x) mutable {
-        const auto identity = [](int y){ return y; };
-        for (auto i = 0; i < a; ++i)
-          a += b--;
-        return x + identity(a + b);
-      }(0);
-      return a + b + c + d + e;
-    }
-
-    int
-    test3()
-    {
-      const auto nullary = [](){ return 0; };
-      const auto unary = [](int x){ return x; };
-      using nullary_t = decltype(nullary);
-      using unary_t = decltype(unary);
-      const auto higher1st = [](nullary_t f){ return f(); };
-      const auto higher2nd = [unary](nullary_t f1){
-        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
-      };
-      return higher1st(nullary) + higher2nd(nullary)(unary);
-    }
-
-  }
-
-  namespace test_variadic_templates
-  {
-
-    template <int...>
-    struct sum;
-
-    template <int N0, int... N1toN>
-    struct sum<N0, N1toN...>
-    {
-      static constexpr auto value = N0 + sum<N1toN...>::value;
-    };
-
-    template <>
-    struct sum<>
-    {
-      static constexpr auto value = 0;
-    };
-
-    static_assert(sum<>::value == 0, "");
-    static_assert(sum<1>::value == 1, "");
-    static_assert(sum<23>::value == 23, "");
-    static_assert(sum<1, 2>::value == 3, "");
-    static_assert(sum<5, 5, 11>::value == 21, "");
-    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
-
-  }
-
-  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
-  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
-  // because of this.
-  namespace test_template_alias_sfinae
-  {
-
-    struct foo {};
-
-    template<typename T>
-    using member = typename T::member_type;
-
-    template<typename T>
-    void func(...) {}
-
-    template<typename T>
-    void func(member<T>*) {}
-
-    void test();
-
-    void test() { func<foo>(0); }
-
-  }
-
-}  // namespace cxx11
-
-#endif  // __cplusplus >= 201103L
-
-]])
-
-
-dnl  Tests for new features in C++14
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[
-
-// If the compiler admits that it is not ready for C++14, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201300L
-
-#error "This is not a C++14 compiler"
-
-#else
-
-namespace cxx14
-{
-
-  namespace test_polymorphic_lambdas
-  {
-
-    int
-    test()
-    {
-      const auto lambda = [](auto&&... args){
-        const auto istiny = [](auto x){
-          return (sizeof(x) == 1UL) ? 1 : 0;
-        };
-        const int aretiny[] = { istiny(args)... };
-        return aretiny[0];
-      };
-      return lambda(1, 1L, 1.0f, '1');
-    }
-
-  }
-
-  namespace test_binary_literals
-  {
-
-    constexpr auto ivii = 0b0000000000101010;
-    static_assert(ivii == 42, "wrong value");
-
-  }
-
-#ifdef DISALLOW_GCC48
-  namespace test_generalized_constexpr
-  {
-
-    template < typename CharT >
-    constexpr unsigned long
-    strlen_c(const CharT *const s) noexcept
-    {
-      auto length = 0UL;
-      for (auto p = s; *p; ++p)
-        ++length;
-      return length;
-    }
-
-    static_assert(strlen_c("") == 0UL, "");
-    static_assert(strlen_c("x") == 1UL, "");
-    static_assert(strlen_c("test") == 4UL, "");
-    static_assert(strlen_c("another\0test") == 7UL, "");
-
-  }
-#endif
-
-  namespace test_lambda_init_capture
-  {
-
-    int
-    test()
-    {
-      auto x = 0;
-      const auto lambda1 = [a = x](int b){ return a + b; };
-      const auto lambda2 = [a = lambda1(x)](){ return a; };
-      return lambda2();
-    }
-
-  }
-
-  namespace test_digit_seperators
-  {
-
-    constexpr auto ten_million = 100'000'000;
-    static_assert(ten_million == 100000000, "");
-
-  }
-
-  namespace test_return_type_deduction
-  {
-
-    auto f(int& x) { return x; }
-    decltype(auto) g(int& x) { return x; }
-
-    template < typename T1, typename T2 >
-    struct is_same
-    {
-      static constexpr auto value = false;
-    };
-
-    template < typename T >
-    struct is_same<T, T>
-    {
-      static constexpr auto value = true;
-    };
-
-    int
-    test()
-    {
-      auto x = 0;
-      static_assert(is_same<int, decltype(f(x))>::value, "");
-      static_assert(is_same<int&, decltype(g(x))>::value, "");
-      return x;
-    }
-
-  }
-
-}  // namespace cxx14
-
-#endif  // __cplusplus >= 201402L
-
-]])
--- a/m4/ax_cxx_compile_stdcxx_14.m4
+++ b/m4/ax_cxx_compile_stdcxx_14.m4
@@ -1,34 +0,0 @@
-# ============================================================================
-#  http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_14.html
-# ============================================================================
-#
-# SYNOPSIS
-#
-#   AX_CXX_COMPILE_STDCXX_14([ext|noext], [mandatory|optional])
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the C++14
-#   standard; if necessary, add switches to CXX and CXXCPP to enable
-#   support.
-#
-#   This macro is a convenience alias for calling the AX_CXX_COMPILE_STDCXX
-#   macro with the version set to C++14.  The two optional arguments are
-#   forwarded literally as the second and third argument respectively.
-#   Please see the documentation for the AX_CXX_COMPILE_STDCXX macro for
-#   more information.  If you want to use this macro, you also need to
-#   download the ax_cxx_compile_stdcxx.m4 file.
-#
-# LICENSE
-#
-#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 4
-
-AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])
-AC_DEFUN([AX_CXX_COMPILE_STDCXX_14], [AX_CXX_COMPILE_STDCXX([14], [$1], [$2])])
--- a/m4/ax_pthread.m4
+++ b/m4/ax_pthread.m4
@@ -1,485 +0,0 @@
-# ===========================================================================
-#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-#
-# DESCRIPTION
-#
-#   This macro figures out how to build C programs using POSIX threads. It
-#   sets the PTHREAD_LIBS output variable to the threads library and linker
-#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
-#   flags that are needed. (The user can also force certain compiler
-#   flags/libs to be tested by setting these environment variables.)
-#
-#   Also sets PTHREAD_CC to any special C compiler that is needed for
-#   multi-threaded programs (defaults to the value of CC otherwise). (This
-#   is necessary on AIX to use the special cc_r compiler alias.)
-#
-#   NOTE: You are assumed to not only compile your program with these flags,
-#   but also to link with them as well. For example, you might link with
-#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
-#
-#   If you are only building threaded programs, you may wish to use these
-#   variables in your default LIBS, CFLAGS, and CC:
-#
-#     LIBS="$PTHREAD_LIBS $LIBS"
-#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-#     CC="$PTHREAD_CC"
-#
-#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
-#   has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to
-#   that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-#
-#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
-#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
-#   PTHREAD_CFLAGS.
-#
-#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
-#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
-#   is not found. If ACTION-IF-FOUND is not specified, the default action
-#   will define HAVE_PTHREAD.
-#
-#   Please let the authors know if this macro fails on any platform, or if
-#   you have any other suggestions or comments. This macro was based on work
-#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
-#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
-#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
-#   grateful for the helpful feedback of numerous users.
-#
-#   Updated for Autoconf 2.68 by Daniel Richard G.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
-#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 23
-
-AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
-AC_DEFUN([AX_PTHREAD], [
-AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([AC_PROG_CC])
-AC_REQUIRE([AC_PROG_SED])
-AC_LANG_PUSH([C])
-ax_pthread_ok=no
-
-# We used to check for pthread.h first, but this fails if pthread.h
-# requires special compiler flags (e.g. on Tru64 or Sequent).
-# It gets checked for in the link test anyway.
-
-# First of all, check if the user has set any of the PTHREAD_LIBS,
-# etcetera environment variables, and if threads linking works using
-# them:
-if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
-        ax_pthread_save_CC="$CC"
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"])
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS])
-        AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes])
-        AC_MSG_RESULT([$ax_pthread_ok])
-        if test "x$ax_pthread_ok" = "xno"; then
-                PTHREAD_LIBS=""
-                PTHREAD_CFLAGS=""
-        fi
-        CC="$ax_pthread_save_CC"
-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
-fi
-
-# We must check for the threads library under a number of different
-# names; the ordering is very important because some systems
-# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-# libraries is broken (non-POSIX).
-
-# Create a list of thread flags to try.  Items starting with a "-" are
-# C compiler flags, and other items are library names, except for "none"
-# which indicates that we try without any flags at all, and "pthread-config"
-# which is a program returning the flags for the Pth emulation library.
-
-ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-
-# The ordering *is* (sometimes) important.  Some notes on the
-# individual items follow:
-
-# pthreads: AIX (must check this before -lpthread)
-# none: in case threads are in libc; should be tried before -Kthread and
-#       other compiler flags to prevent continual compiler warnings
-# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64
-#           (Note: HP C rejects this with "bad form for `-t' option")
-# -pthreads: Solaris/gcc (Note: HP C also rejects)
-# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-#      doesn't hurt to check since this sometimes defines pthreads and
-#      -D_REENTRANT too), HP C (must be checked before -lpthread, which
-#      is present but should not be used directly; and before -mthreads,
-#      because the compiler interprets this as "-mt" + "-hreads")
-# -mthreads: Mingw32/gcc, Lynx/gcc
-# pthread: Linux, etcetera
-# --thread-safe: KAI C++
-# pthread-config: use pthread-config program (for GNU Pth library)
-
-case $host_os in
-
-        freebsd*)
-
-        # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-        # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-
-        ax_pthread_flags="-kthread lthread $ax_pthread_flags"
-        ;;
-
-        hpux*)
-
-        # From the cc(1) man page: "[-mt] Sets various -D flags to enable
-        # multi-threading and also sets -lpthread."
-
-        ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
-        ;;
-
-        openedition*)
-
-        # IBM z/OS requires a feature-test macro to be defined in order to
-        # enable POSIX threads at all, so give the user a hint if this is
-        # not set. (We don't define these ourselves, as they can affect
-        # other portions of the system API in unpredictable ways.)
-
-        AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING],
-            [
-#            if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
-             AX_PTHREAD_ZOS_MISSING
-#            endif
-            ],
-            [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])])
-        ;;
-
-        solaris*)
-
-        # On Solaris (at least, for some versions), libc contains stubbed
-        # (non-functional) versions of the pthreads routines, so link-based
-        # tests will erroneously succeed. (N.B.: The stubs are missing
-        # pthread_cleanup_push, or rather a function called by this macro,
-        # so we could check for that, but who knows whether they'll stub
-        # that too in a future libc.)  So we'll check first for the
-        # standard Solaris way of linking pthreads (-mt -lpthread).
-
-        ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags"
-        ;;
-esac
-
-# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
-
-AS_IF([test "x$GCC" = "xyes"],
-      [ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"])
-
-# The presence of a feature test macro requesting re-entrant function
-# definitions is, on some systems, a strong hint that pthreads support is
-# correctly enabled
-
-case $host_os in
-        darwin* | hpux* | linux* | osf* | solaris*)
-        ax_pthread_check_macro="_REENTRANT"
-        ;;
-
-        aix*)
-        ax_pthread_check_macro="_THREAD_SAFE"
-        ;;
-
-        *)
-        ax_pthread_check_macro="--"
-        ;;
-esac
-AS_IF([test "x$ax_pthread_check_macro" = "x--"],
-      [ax_pthread_check_cond=0],
-      [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"])
-
-# Are we compiling with Clang?
-
-AC_CACHE_CHECK([whether $CC is Clang],
-    [ax_cv_PTHREAD_CLANG],
-    [ax_cv_PTHREAD_CLANG=no
-     # Note that Autoconf sets GCC=yes for Clang as well as GCC
-     if test "x$GCC" = "xyes"; then
-        AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
-            [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
-#            if defined(__clang__) && defined(__llvm__)
-             AX_PTHREAD_CC_IS_CLANG
-#            endif
-            ],
-            [ax_cv_PTHREAD_CLANG=yes])
-     fi
-    ])
-ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
-
-ax_pthread_clang_warning=no
-
-# Clang needs special handling, because older versions handle the -pthread
-# option in a rather... idiosyncratic way
-
-if test "x$ax_pthread_clang" = "xyes"; then
-
-        # Clang takes -pthread; it has never supported any other flag
-
-        # (Note 1: This will need to be revisited if a system that Clang
-        # supports has POSIX threads in a separate library.  This tends not
-        # to be the way of modern systems, but it's conceivable.)
-
-        # (Note 2: On some systems, notably Darwin, -pthread is not needed
-        # to get POSIX threads support; the API is always present and
-        # active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
-        # -pthread does define _REENTRANT, and while the Darwin headers
-        # ignore this macro, third-party headers might not.)
-
-        PTHREAD_CFLAGS="-pthread"
-        PTHREAD_LIBS=
-
-        ax_pthread_ok=yes
-
-        # However, older versions of Clang make a point of warning the user
-        # that, in an invocation where only linking and no compilation is
-        # taking place, the -pthread option has no effect ("argument unused
-        # during compilation").  They expect -pthread to be passed in only
-        # when source code is being compiled.
-        #
-        # Problem is, this is at odds with the way Automake and most other
-        # C build frameworks function, which is that the same flags used in
-        # compilation (CFLAGS) are also used in linking.  Many systems
-        # supported by AX_PTHREAD require exactly this for POSIX threads
-        # support, and in fact it is often not straightforward to specify a
-        # flag that is used only in the compilation phase and not in
-        # linking.  Such a scenario is extremely rare in practice.
-        #
-        # Even though use of the -pthread flag in linking would only print
-        # a warning, this can be a nuisance for well-run software projects
-        # that build with -Werror.  So if the active version of Clang has
-        # this misfeature, we search for an option to squash it.
-
-        AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread],
-            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG],
-            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
-             # Create an alternate version of $ac_link that compiles and
-             # links in two steps (.c -> .o, .o -> exe) instead of one
-             # (.c -> exe), because the warning occurs only in the second
-             # step
-             ax_pthread_save_ac_link="$ac_link"
-             ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
-             ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
-             ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
-             ax_pthread_save_CFLAGS="$CFLAGS"
-             for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
-                AS_IF([test "x$ax_pthread_try" = "xunknown"], [break])
-                CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
-                ac_link="$ax_pthread_save_ac_link"
-                AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
-                    [ac_link="$ax_pthread_2step_ac_link"
-                     AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
-                         [break])
-                    ])
-             done
-             ac_link="$ax_pthread_save_ac_link"
-             CFLAGS="$ax_pthread_save_CFLAGS"
-             AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no])
-             ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
-            ])
-
-        case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
-                no | unknown) ;;
-                *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
-        esac
-
-fi # $ax_pthread_clang = yes
-
-if test "x$ax_pthread_ok" = "xno"; then
-for ax_pthread_try_flag in $ax_pthread_flags; do
-
-        case $ax_pthread_try_flag in
-                none)
-                AC_MSG_CHECKING([whether pthreads work without any flags])
-                ;;
-
-                -mt,pthread)
-                AC_MSG_CHECKING([whether pthreads work with -mt -lpthread])
-                PTHREAD_CFLAGS="-mt"
-                PTHREAD_LIBS="-lpthread"
-                ;;
-
-                -*)
-                AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])
-                PTHREAD_CFLAGS="$ax_pthread_try_flag"
-                ;;
-
-                pthread-config)
-                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
-                AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
-                PTHREAD_CFLAGS="`pthread-config --cflags`"
-                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-                ;;
-
-                *)
-                AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])
-                PTHREAD_LIBS="-l$ax_pthread_try_flag"
-                ;;
-        esac
-
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-
-        # Check for various functions.  We must include pthread.h,
-        # since some functions may be macros.  (On the Sequent, we
-        # need a special flag -Kthread to make this header compile.)
-        # We check for pthread_join because it is in -lpthread on IRIX
-        # while pthread_create is in libc.  We check for pthread_attr_init
-        # due to DEC craziness with -lpthreads.  We check for
-        # pthread_cleanup_push because it is one of the few pthread
-        # functions on Solaris that doesn't have a non-functional libc stub.
-        # We try pthread_create on general principles.
-
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
-#                       if $ax_pthread_check_cond
-#                        error "$ax_pthread_check_macro must be defined"
-#                       endif
-                        static void routine(void *a) { a = 0; }
-                        static void *start_routine(void *a) { return a; }],
-                       [pthread_t th; pthread_attr_t attr;
-                        pthread_create(&th, 0, start_routine, 0);
-                        pthread_join(th, 0);
-                        pthread_attr_init(&attr);
-                        pthread_cleanup_push(routine, 0);
-                        pthread_cleanup_pop(0) /* ; */])],
-            [ax_pthread_ok=yes],
-            [])
-
-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
-
-        AC_MSG_RESULT([$ax_pthread_ok])
-        AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
-
-        PTHREAD_LIBS=""
-        PTHREAD_CFLAGS=""
-done
-fi
-
-# Various other checks:
-if test "x$ax_pthread_ok" = "xyes"; then
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-
-        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-        AC_CACHE_CHECK([for joinable pthread attribute],
-            [ax_cv_PTHREAD_JOINABLE_ATTR],
-            [ax_cv_PTHREAD_JOINABLE_ATTR=unknown
-             for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-                 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
-                                                 [int attr = $ax_pthread_attr; return attr /* ; */])],
-                                [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break],
-                                [])
-             done
-            ])
-        AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
-               test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
-               test "x$ax_pthread_joinable_attr_defined" != "xyes"],
-              [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE],
-                                  [$ax_cv_PTHREAD_JOINABLE_ATTR],
-                                  [Define to necessary symbol if this constant
-                                   uses a non-standard name on your system.])
-               ax_pthread_joinable_attr_defined=yes
-              ])
-
-        AC_CACHE_CHECK([whether more special flags are required for pthreads],
-            [ax_cv_PTHREAD_SPECIAL_FLAGS],
-            [ax_cv_PTHREAD_SPECIAL_FLAGS=no
-             case $host_os in
-             solaris*)
-             ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
-             ;;
-             esac
-            ])
-        AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
-               test "x$ax_pthread_special_flags_added" != "xyes"],
-              [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
-               ax_pthread_special_flags_added=yes])
-
-        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
-            [ax_cv_PTHREAD_PRIO_INHERIT],
-            [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
-                                             [[int i = PTHREAD_PRIO_INHERIT;]])],
-                            [ax_cv_PTHREAD_PRIO_INHERIT=yes],
-                            [ax_cv_PTHREAD_PRIO_INHERIT=no])
-            ])
-        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
-               test "x$ax_pthread_prio_inherit_defined" != "xyes"],
-              [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])
-               ax_pthread_prio_inherit_defined=yes
-              ])
-
-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
-
-        # More AIX lossage: compile with *_r variant
-        if test "x$GCC" != "xyes"; then
-            case $host_os in
-                aix*)
-                AS_CASE(["x/$CC"],
-                    [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
-                    [#handle absolute path differently from PATH based program lookup
-                     AS_CASE(["x$CC"],
-                         [x/*],
-                         [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
-                         [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
-                ;;
-            esac
-        fi
-fi
-
-test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
-
-AC_SUBST([PTHREAD_LIBS])
-AC_SUBST([PTHREAD_CFLAGS])
-AC_SUBST([PTHREAD_CC])
-
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test "x$ax_pthread_ok" = "xyes"; then
-        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
-        :
-else
-        ax_pthread_ok=no
-        $2
-fi
-AC_LANG_POP
-])dnl AX_PTHREAD
--- a/m4/ax_require_defined.m4
+++ b/m4/ax_require_defined.m4
@@ -1,37 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_require_defined.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_REQUIRE_DEFINED(MACRO)
-#
-# DESCRIPTION
-#
-#   AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
-#   been defined and thus are available for use.  This avoids random issues
-#   where a macro isn't expanded.  Instead the configure script emits a
-#   non-fatal:
-#
-#     ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
-#
-#   It's like AC_REQUIRE except it doesn't expand the required macro.
-#
-#   Here's an example:
-#
-#     AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
-#
-# LICENSE
-#
-#   Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 1
-
-AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
-  m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
-])dnl AX_REQUIRE_DEFINED
--- a/m4/libwrap.m4
+++ b/m4/libwrap.m4
@@ -1,14 +0,0 @@
-dnl
-dnl Usage:
-dnl AC_CHECK_LIBWRAP([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl
-
-AC_DEFUN([AC_CHECK_LIBWRAP],[
-	AC_CHECK_HEADERS([tcpd.h],
-		AC_CHECK_LIB([wrap], [request_init],
-			[LIBWRAP_CFLAGS=""
-			LIBWRAP_LDFLAGS="-lwrap"
-			$1],
-			$2),
-		$2)
-])
--- a/m4/mpd_auto.m4
+++ b/m4/mpd_auto.m4
@@ -1,185 +0,0 @@
-dnl Parameters: varname1, description
-AC_DEFUN([MPD_AUTO_ENABLED], [
-	if test x$[]enable_$1 = xauto; then
-		AC_MSG_NOTICE([auto-detected $2])
-		enable_$1=yes
-	fi
-])
-
-dnl Parameters: varname1, description, errmsg
-AC_DEFUN([MPD_AUTO_DISABLED], [
-	if test x$[]enable_$1 = xauto; then
-		AC_MSG_WARN([$3 -- disabling $2])
-		enable_$1=no
-	elif test x$[]enable_$1 = xyes; then
-		AC_MSG_ERROR([$2: $3])
-	fi
-])
-
-dnl Check whether a prerequisite for a feature was found.  This is
-dnl very similar to MPD_AUTO_RESULT, but does not finalize the
-dnl detection; it assumes that more checks will follow.
-AC_DEFUN([MPD_AUTO_PRE], [
-	if test x$[]enable_$1 != xno && test x$[]found_$1 = xno; then
-                MPD_AUTO_DISABLED([$1], [$2], [$3])
-	fi
-])
-
-dnl Evaluate a check's result.  Abort if the feature was requested
-dnl explicitly but is unavailable.
-dnl
-dnl Parameters: varname1, description, errmsg
-AC_DEFUN([MPD_AUTO_RESULT], [
-	if test x$[]enable_$1 = xno; then
-		found_$1=no
-	fi
-
-	if test x$[]found_$1 = xyes; then
-                MPD_AUTO_ENABLED([$1], [$2])
-	else
-                MPD_AUTO_DISABLED([$1], [$2], [$3])
-	fi
-])
-
-dnl Invoke a check if its configuration is "yes" or "auto" and call
-dnl MPD_AUTO_RESULT.
-dnl
-dnl Parameters: varname1, description, errmsg, check
-AC_DEFUN([MPD_AUTO], [
-	if test x$[]enable_$1 != xno; then
-		$4
-	fi
-	MPD_AUTO_RESULT([$1], [$2], [$3])
-])
-
-dnl Wrapper for MPD_AUTO and PKG_CHECK_MODULES.
-dnl
-dnl Parameters: varname1, varname2, pkgname, description, errmsg
-AC_DEFUN([MPD_AUTO_PKG], [
-	MPD_AUTO([$1], [$4], [$5],
-		[PKG_CHECK_MODULES([$2], [$3],
-			[found_$1=yes],
-			[found_$1=no])])
-])
-
-dnl Check with pkg-config first, fall back to AC_CHECK_LIB.
-dnl
-dnl Parameters: varname1, varname2, pkgname, libname, symname, libs, cflags, description, errmsg
-AC_DEFUN([MPD_AUTO_PKG_LIB], [
-	MPD_AUTO([$1], [$8], [$9],
-		[PKG_CHECK_MODULES([$2], [$3],
-			[found_$1=yes],
-			AC_CHECK_LIB($4, $5,
-				[found_$1=yes $2_LIBS='$6' $2_CFLAGS='$7'],
-				[found_$1=no],
-				[$6]))])
-])
-
-dnl Wrapper for AC_CHECK_LIB.
-dnl
-dnl Parameters: varname1, varname2, libname, symname, libs, cflags, description, errmsg
-AC_DEFUN([MPD_AUTO_LIB], [
-	AC_SUBST([$2_LIBS], [])
-	AC_SUBST([$2_CFLAGS], [])
-
-	MPD_AUTO([$1], [$7], [$8],
-		[AC_CHECK_LIB($3, $4,
-			[found_$1=yes $2_LIBS='$5' $2_CFLAGS='$6'],
-			[found_$1=no],
-			[$5])])
-])
-
-dnl Wrapper for AC_CHECK_HEADER.
-dnl
-dnl Parameters: varname1, varname2, header, libs, cflags, description, errmsg
-AC_DEFUN([MPD_AUTO_HEADER], [
-	AC_SUBST([$2_LIBS], [])
-	AC_SUBST([$2_CFLAGS], [])
-
-	MPD_AUTO([$1], [$6], [$7],
-		[AC_CHECK_HEADER([$3],
-			[found_$1=yes $2_LIBS='$4' $2_CFLAGS='$5'],
-			[found_$1=no])])
-])
-
-dnl Convert the given string into a string for the "default value" in
-dnl the help text.  If the string is a literal, then it is returned
-dnl as-is; if it contains a variable reference, just "auto" is
-dnl emitted.
-dnl
-dnl Parameters: varname1
-AC_DEFUN([MPD_FORMAT_DEFAULT],
-	[ifelse([$1], [], [auto],
-		index([$1], [$]), [-1], [$1],
-		[auto])])
-
-dnl Wrapper for AC_ARG_ENABLE, AC_DEFINE and AM_CONDITIONAL
-dnl
-dnl Parameters: varname1, varname2, description, default, check
-AC_DEFUN([MPD_ARG_ENABLE], [
-	AC_ARG_ENABLE(translit([$1], [_], [-]),
-		AS_HELP_STRING([--enable-]translit([$1], [_], [-]),
-			[enable $3 (default: ]MPD_FORMAT_DEFAULT([$4])[)]),,
-		[enable_$1=]ifelse([$4], [], [auto], [$4]))
-
-	$5
-
-	MPD_DEFINE_CONDITIONAL(enable_$1, ENABLE_$2, [$3])
-])
-
-dnl Wrapper for MPD_ARG_ENABLE and MPD_AUTO
-dnl
-dnl Parameters: varname1, varname2, description, errmsg, default, check
-AC_DEFUN([MPD_ENABLE_AUTO], [
-	MPD_ARG_ENABLE([$1], [$2], [$3], [$5], [
-		MPD_AUTO([$1], [$3], [$4], [$6])
-	])
-])
-
-dnl Wrapper for AC_ARG_ENABLE and MPD_AUTO_PKG
-dnl
-dnl Parameters: varname1, varname2, pkg, description, errmsg, default, pre
-AC_DEFUN([MPD_ENABLE_AUTO_PKG], [
-	MPD_ARG_ENABLE([$1], [$2], [$4], [$6], [
-		$7
-		MPD_AUTO_PKG($1, $2, $3, $4, $5)
-	])
-])
-
-dnl Wrapper for AC_ARG_ENABLE and MPD_AUTO_PKG_LIB
-dnl
-dnl Parameters: varname1, varname2, pkg, libname, symname, libs, cflags, description, errmsg, default, pre
-AC_DEFUN([MPD_ENABLE_AUTO_PKG_LIB], [
-	MPD_ARG_ENABLE([$1], [$2], [$8], [$10], [
-		$11
-		MPD_AUTO_PKG_LIB($1, $2, $3, $4, $5, $6, $7, $8, $9)
-	])
-])
-
-dnl Wrapper for AC_ARG_ENABLE and MPD_AUTO_LIB
-dnl
-dnl Parameters: varname1, varname2, libname, symname, libs, cflags, description, errmsg, default, pre
-AC_DEFUN([MPD_ENABLE_AUTO_LIB], [
-	MPD_ARG_ENABLE([$1], [$2], [$7], [$9], [
-		$10
-		MPD_AUTO_LIB($1, $2, $3, $4, $5, $6, $7, $8)
-	])
-])
-
-dnl Wrapper for AC_ARG_ENABLE and MPD_AUTO_HEADER
-dnl
-dnl Parameters: varname1, varname2, header, libs, cflags, description, errmsg, default, pre
-AC_DEFUN([MPD_ENABLE_AUTO_HEADER], [
-	MPD_ARG_ENABLE([$1], [$2], [$6], [$8], [
-		$9
-		MPD_AUTO_HEADER($1, $2, $3, $4, $5, $6, $7)
-	])
-])
-
-dnl Wrapper for MPD_ENABLE_AUTO_PKG and MPD_DEPENDS
-dnl
-dnl Parameters: varname1, varname2, pkg, description, errmsg, default, dep_variable, dep_errmsg
-AC_DEFUN([MPD_ENABLE_AUTO_PKG_DEPENDS], [
-	MPD_ENABLE_AUTO_PKG([$1], [$2], [$3], [$4], [$5], [$6],
-		[MPD_DEPENDS([enable_$1], [$7], [$8])])
-])
--- a/m4/mpd_define_conditional.m4
+++ b/m4/mpd_define_conditional.m4
@@ -1,8 +0,0 @@
-dnl Wrapper for AC_DEFINE and AM_CONDITIONAL
-dnl
-dnl Parameters: varname1, varname2, description
-AC_DEFUN([MPD_DEFINE_CONDITIONAL], [dnl
-	AM_CONDITIONAL($2, test x$[]$1 = xyes)
-	if test x$[]$1 = xyes; then
-		AC_DEFINE($2, 1, [Define to enable $3])
-	fi])
--- a/m4/mpd_depends.m4
+++ b/m4/mpd_depends.m4
@@ -1,9 +0,0 @@
-AC_DEFUN([MPD_DEPENDS], [
-	if test x$$2 = xno; then
-		if test x$$1 = xauto; then
-			$1=no
-		elif test x$$1 = xyes; then
-			AC_MSG_ERROR([$3])
-		fi
-	fi
-])
--- a/m4/mpd_func.m4
+++ b/m4/mpd_func.m4
@@ -1,25 +0,0 @@
-dnl MPD_OPTIONAL_FUNC(name, func, macro)
-dnl
-dnl Allow the user to enable or disable the use of a function.  If the
-dnl option is not specified, the function is auto-detected.
-AC_DEFUN([MPD_OPTIONAL_FUNC], [
-	AC_ARG_ENABLE([$1],
-		AS_HELP_STRING([--enable-$1],
-			[use the function "$1" (default: auto)]),
-		[test x$[]enable_$1 = xyes && AC_DEFINE([$3], 1, [Define to use $1])],
-		[AC_CHECK_FUNC([$2],
-			[AC_DEFINE([$3], 1, [Define to use $1])],)])
-])
-
-dnl MPD_OPTIONAL_FUNC_NODEF(name, func)
-dnl
-dnl Allow the user to enable or disable the use of a function.
-dnl Works similar to MPD_OPTIONAL_FUNC, however MPD_OPTIONAL_FUNC_NODEF
-dnl does not invoke AC_DEFINE when function is enabled. Shell variable
-dnl enable_$name is set to "yes" instead.
-AC_DEFUN([MPD_OPTIONAL_FUNC_NODEF], [
-	AC_ARG_ENABLE([$1],
-		AS_HELP_STRING([--enable-$1],
-			[use the function "$1" (default: auto)]),,
-		[AC_CHECK_FUNC([$2], [enable_$1=yes],)])
-])
--- a/m4/mpd_with_flags.m4
+++ b/m4/mpd_with_flags.m4
@@ -1,23 +0,0 @@
-dnl Run code with the specified CFLAGS/CXXFLAGS and LIBS appended.
-dnl Restores the old values afterwards.
-dnl
-dnl Parameters: cflags, libs, code
-AC_DEFUN([MPD_WITH_FLAGS], [
-	ac_save_CFLAGS="$[]CFLAGS"
-	ac_save_CXXFLAGS="$[]CXXFLAGS"
-	ac_save_LIBS="$[]LIBS"
-	CFLAGS="$[]CFLAGS $1"
-	CXXFLAGS="$[]CXXFLAGS $1"
-	LIBS="$[]LIBS $2"
-	$3
-	CFLAGS="$[]ac_save_CFLAGS"
-	CXXFLAGS="$[]ac_save_CXXFLAGS"
-	LIBS="$[]ac_save_LIBS"
-])
-
-dnl Run code with the specified library's CFLAGS/CXXFLAGS and LIBS
-dnl appended.  Restores the old values afterwards.
-dnl
-dnl Parameters: libname, code
-AC_DEFUN([MPD_WITH_LIBRARY],
-	[MPD_WITH_FLAGS([$[]$1_CFLAGS], [$[]$1_LIBS], [$2])])
--- a/m4/pkg.m4
+++ b/m4/pkg.m4
@@ -1,275 +0,0 @@
-dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-dnl serial 11 (pkg-config-0.29)
-dnl
-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])
-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 $1])
-
-_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/m4/pretty_print.m4
+++ b/m4/pretty_print.m4
@@ -1,9 +0,0 @@
-AC_DEFUN([results], [
-	printf '('
-	if test x$[]enable_$1 = xyes; then
-		printf '+'
-	else
-		printf '-'
-	fi
-	printf '%s) ' "$2"
-])
--- a/m4/ucred.m4
+++ b/m4/ucred.m4
@@ -1,18 +0,0 @@
-# Check if "struct ucred" is available.
-#
-# Author: Max Kellermann <max.kellermann@gmail.com>
-
-AC_DEFUN([STRUCT_UCRED],[
-	AC_MSG_CHECKING([for struct ucred])
-	AC_CACHE_VAL(mpd_cv_have_struct_ucred, [
-		AC_TRY_COMPILE([#include <sys/socket.h>],
-			[struct ucred cred;],
-			mpd_cv_have_struct_ucred=yes,
-			mpd_cv_have_struct_ucred=no)
-		])
-
-	AC_MSG_RESULT($mpd_cv_have_struct_ucred)
-	if test x$mpd_cv_have_struct_ucred = xyes; then
-		AC_DEFINE(HAVE_STRUCT_UCRED, 1, [Define if struct ucred is present from sys/socket.h])
-	fi
-])
--- a/meson.build
+++ b/meson.build
@@ -0,0 +1,489 @@
+project(
+  'mpd',
+  ['c', 'cpp'],
+  version: '0.21.11',
+  meson_version: '>= 0.49.0',
+  default_options: [
+    'c_std=c99',
+    'cpp_std=c++14'
+  ],
+  license: 'GPLv2+',
+)
+
+version_cxx = vcs_tag(input: 'src/GitVersion.cxx', output: 'GitVersion.cxx')
+
+compiler = meson.get_compiler('cpp')
+c_compiler = meson.get_compiler('c')
+
+conf = configuration_data()
+conf.set_quoted('PACKAGE', meson.project_name())
+conf.set_quoted('PACKAGE_NAME', meson.project_name())
+conf.set_quoted('PACKAGE_VERSION', meson.project_version())
+conf.set_quoted('VERSION', meson.project_version())
+conf.set_quoted('PROTOCOL_VERSION', '0.21.11')
+conf.set_quoted('SYSTEM_CONFIG_FILE_LOCATION', join_paths(get_option('prefix'), get_option('sysconfdir'), 'mpd.conf'))
+
+common_cppflags = [
+  '-D_GNU_SOURCE',
+]
+
+common_cflags = [
+]
+
+common_cxxflags = [
+]
+
+test_common_flags = [
+  '-Wall',
+  '-Wextra',
+
+  '-fvisibility=hidden',
+
+  '-ffast-math',
+  '-ftree-vectorize',
+]
+
+test_cxxflags = test_common_flags + [
+  '-fno-threadsafe-statics',
+  '-fmerge-all-constants',
+
+  '-Wmissing-declarations',
+  '-Wshadow',
+  '-Wpointer-arith',
+  '-Wcast-qual',
+  '-Wwrite-strings',
+  '-Wsign-compare',
+
+  '-Wno-non-virtual-dtor',
+
+  # work around bogus GCC7 warning "mangled name for ... will change
+  # in C++17 because the exception specification is part of a function
+  # type"
+  '-Wno-noexcept-type',
+]
+
+if compiler.get_id() == 'clang'
+  # Workaround for clang bug
+  # https://bugs.llvm.org/show_bug.cgi?id=32611
+  test_cxxflags += '-funwind-tables'
+endif
+
+test_cflags = test_common_flags + [
+  '-Wmissing-prototypes',
+  '-Wshadow',
+  '-Wpointer-arith',
+  '-Wstrict-prototypes',
+  '-Wcast-qual',
+  '-Wwrite-strings',
+  '-pedantic',
+]
+
+test_ldflags = [
+]
+
+if get_option('buildtype') != 'debug'
+  test_cflags += [
+    '-ffunction-sections',
+    '-fdata-sections',
+  ]
+  test_ldflags += [
+    '-Wl,--gc-sections',
+  ]
+endif
+
+add_global_arguments(common_cxxflags + compiler.get_supported_arguments(test_cxxflags), language: 'cpp')
+add_global_arguments(common_cflags + c_compiler.get_supported_arguments(test_cflags), language: 'c')
+add_global_link_arguments(compiler.get_supported_link_arguments(test_ldflags), language: 'cpp')
+
+is_linux = host_machine.system() == 'linux'
+is_android = get_option('android_ndk') != ''
+is_darwin = host_machine.system() == 'darwin'
+is_windows = host_machine.system() == 'windows'
+is_haiku = host_machine.system() == 'haiku'
+
+if is_android
+  common_cppflags += '-DANDROID'
+endif
+
+if is_windows
+  common_cppflags += [
+    '-DWIN32_LEAN_AND_MEAN',
+    '-DWINVER=0x0600', '-D_WIN32_WINNT=0x0600',
+    '-DSTRICT',
+    '-DUNICODE', '-D_UNICODE',
+  ]
+
+  subdir('win32')
+endif
+
+if is_android
+  subdir('android')
+endif
+
+add_global_arguments(common_cppflags, language: 'c')
+add_global_arguments(common_cppflags, language: 'cpp')
+
+enable_daemon = not is_windows and not is_android and get_option('daemon')
+conf.set('ENABLE_DAEMON', enable_daemon)
+
+conf.set('HAVE_LOCALE_H', compiler.has_header('locale.h'))
+
+conf.set('HAVE_GETPWNAM_R', compiler.has_function('getpwnam_r'))
+conf.set('HAVE_GETPWUID_R', compiler.has_function('getpwuid_r'))
+conf.set('HAVE_INITGROUPS', compiler.has_function('initgroups'))
+conf.set('HAVE_FNMATCH', compiler.has_function('fnmatch'))
+conf.set('HAVE_STRNDUP', compiler.has_function('strndup', prefix: '#define _GNU_SOURCE\n#include <string.h>'))
+conf.set('HAVE_STRCASESTR', compiler.has_function('strcasestr'))
+
+conf.set('HAVE_PRCTL', is_linux)
+
+conf.set('USE_EVENTFD', is_linux and get_option('eventfd'))
+conf.set('USE_SIGNALFD', is_linux and get_option('signalfd'))
+
+if is_windows
+  conf.set('USE_WINSELECT', true)
+elif is_linux and get_option('epoll')
+  conf.set('USE_EPOLL', true)
+else
+  conf.set('USE_POLL', true)
+endif
+
+if not get_option('syslog').disabled()
+  if compiler.has_function('syslog')
+    conf.set('HAVE_SYSLOG', true)
+  elif get_option('syslog').enabled()
+    error('syslog() not found')
+  endif
+endif
+
+enable_database = get_option('database')
+conf.set('ENABLE_DATABASE', enable_database)
+
+enable_inotify = get_option('inotify') and is_linux and enable_database
+conf.set('ENABLE_INOTIFY', enable_inotify)
+
+conf.set('ENABLE_DSD', get_option('dsd'))
+
+inc = include_directories(
+  'src',
+
+  # for the generated config.h
+  '.',
+)
+
+boost_dep = dependency('boost', version: '>= 1.58')
+if boost_dep.version() == '1.67'
+  # https://github.com/MusicPlayerDaemon/MPD/pull/384
+  # https://github.com/boostorg/lockfree/commit/12726cda009a855073b9bedbdce57b6ce7763da2
+  warning('Your Boost version 1.67 is known to be buggy, and the MPD build will fail. Please upgrade to Boost 1.68 or later.')
+endif
+
+sources = [
+  version_cxx,
+  'src/Main.cxx',
+  'src/protocol/Ack.cxx',
+  'src/protocol/ArgParser.cxx',
+  'src/protocol/Result.cxx',
+  'src/command/CommandError.cxx',
+  'src/command/AllCommands.cxx',
+  'src/command/QueueCommands.cxx',
+  'src/command/TagCommands.cxx',
+  'src/command/PlayerCommands.cxx',
+  'src/command/PlaylistCommands.cxx',
+  'src/command/FileCommands.cxx',
+  'src/command/OutputCommands.cxx',
+  'src/command/MessageCommands.cxx',
+  'src/command/ClientCommands.cxx',
+  'src/command/PartitionCommands.cxx',
+  'src/command/OtherCommands.cxx',
+  'src/command/CommandListBuilder.cxx',
+  'src/Idle.cxx',
+  'src/IdleFlags.cxx',
+  'src/decoder/Domain.cxx',
+  'src/decoder/Thread.cxx',
+  'src/decoder/Control.cxx',
+  'src/decoder/Bridge.cxx',
+  'src/decoder/DecoderPrint.cxx',
+  'src/client/Listener.cxx',
+  'src/client/Client.cxx',
+  'src/client/ClientEvent.cxx',
+  'src/client/ClientExpire.cxx',
+  'src/client/ClientGlobal.cxx',
+  'src/client/ClientIdle.cxx',
+  'src/client/ClientList.cxx',
+  'src/client/ClientNew.cxx',
+  'src/client/ClientProcess.cxx',
+  'src/client/ClientRead.cxx',
+  'src/client/ClientWrite.cxx',
+  'src/client/ClientMessage.cxx',
+  'src/client/ClientSubscribe.cxx',
+  'src/client/ClientFile.cxx',
+  'src/client/Response.cxx',
+  'src/Listen.cxx',
+  'src/LogInit.cxx',
+  'src/LogBackend.cxx',
+  'src/Log.cxx',
+  'src/ls.cxx',
+  'src/Instance.cxx',
+  'src/win32/Win32Main.cxx',
+  'src/MusicBuffer.cxx',
+  'src/MusicPipe.cxx',
+  'src/MusicChunk.cxx',
+  'src/MusicChunkPtr.cxx',
+  'src/Mapper.cxx',
+  'src/Partition.cxx',
+  'src/Permission.cxx',
+  'src/player/CrossFade.cxx',
+  'src/player/Thread.cxx',
+  'src/player/Control.cxx',
+  'src/PlaylistError.cxx',
+  'src/PlaylistPrint.cxx',
+  'src/PlaylistSave.cxx',
+  'src/playlist/PlaylistStream.cxx',
+  'src/playlist/PlaylistMapper.cxx',
+  'src/playlist/PlaylistAny.cxx',
+  'src/playlist/PlaylistSong.cxx',
+  'src/playlist/PlaylistQueue.cxx',
+  'src/playlist/Print.cxx',
+  'src/db/PlaylistVector.cxx',
+  'src/queue/Queue.cxx',
+  'src/queue/QueuePrint.cxx',
+  'src/queue/QueueSave.cxx',
+  'src/queue/Playlist.cxx',
+  'src/queue/PlaylistControl.cxx',
+  'src/queue/PlaylistEdit.cxx',
+  'src/queue/PlaylistTag.cxx',
+  'src/queue/PlaylistState.cxx',
+  'src/ReplayGainGlobal.cxx',
+  'src/LocateUri.cxx',
+  'src/SongUpdate.cxx',
+  'src/SongLoader.cxx',
+  'src/SongPrint.cxx',
+  'src/SongSave.cxx',
+  'src/StateFile.cxx',
+  'src/StateFileConfig.cxx',
+  'src/Stats.cxx',
+  'src/TagPrint.cxx',
+  'src/TagSave.cxx',
+  'src/TagFile.cxx',
+  'src/TagStream.cxx',
+  'src/TimePrint.cxx',
+  'src/mixer/Volume.cxx',
+  'src/PlaylistFile.cxx',
+]
+
+if not is_android
+  sources += [
+    'src/CommandLine.cxx',
+    'src/unix/SignalHandlers.cxx',
+  ]
+else
+  sources += [
+    'src/android/Context.cxx',
+    'src/android/Environment.cxx',
+    'src/android/LogListener.cxx',
+  ]
+endif
+
+if enable_daemon
+  sources += 'src/unix/Daemon.cxx'
+endif
+
+if enable_database
+  sources += [
+    'src/queue/PlaylistUpdate.cxx',
+    'src/command/StorageCommands.cxx',
+    'src/command/DatabaseCommands.cxx',
+  ]
+endif
+
+subdir('src/util')
+subdir('src/system')
+subdir('src/thread')
+subdir('src/event')
+
+subdir('src/lib/dbus')
+subdir('src/lib/icu')
+subdir('src/lib/smbclient')
+subdir('src/lib/zlib')
+
+subdir('src/lib/alsa')
+subdir('src/lib/curl')
+subdir('src/lib/expat')
+subdir('src/lib/ffmpeg')
+subdir('src/lib/gcrypt')
+subdir('src/lib/nfs')
+subdir('src/lib/oss')
+subdir('src/lib/pcre')
+subdir('src/lib/pulse')
+subdir('src/lib/sndio')
+subdir('src/lib/sqlite')
+subdir('src/lib/systemd')
+subdir('src/lib/upnp')
+subdir('src/lib/yajl')
+
+subdir('src/fs')
+subdir('src/config')
+subdir('src/net')
+subdir('src/tag')
+subdir('src/pcm')
+subdir('src/neighbor')
+subdir('src/input')
+subdir('src/archive')
+subdir('src/filter')
+subdir('src/mixer')
+subdir('src/output')
+subdir('src/lib/xiph')
+subdir('src/decoder')
+subdir('src/encoder')
+subdir('src/song')
+subdir('src/playlist')
+subdir('src/zeroconf')
+
+if curl_dep.found()
+  sources += 'src/RemoteTagCache.cxx'
+endif
+
+if sqlite_dep.found()
+  sources += [
+    'src/command/StickerCommands.cxx',
+    'src/sticker/StickerDatabase.cxx',
+    'src/sticker/StickerPrint.cxx',
+    'src/sticker/SongSticker.cxx',
+  ]
+endif
+
+basic = static_library(
+  'basic',
+  'src/ReplayGainInfo.cxx',
+  'src/ReplayGainMode.cxx',
+  'src/SingleMode.cxx',
+  include_directories: inc,
+)
+
+basic_dep = declare_dependency(
+  link_with: basic,
+)
+
+if enable_database
+  subdir('src/storage')
+else
+  storage_glue_dep = dependency('', required: false)
+endif
+subdir('src/db')
+
+if neighbor_glue_dep.found()
+  sources += 'src/command/NeighborCommands.cxx'
+endif
+
+if archive_glue_dep.found()
+  sources += [
+    'src/TagArchive.cxx',
+    'src/db/update/Archive.cxx',
+  ]
+endif
+
+if is_windows
+  sources += windows_resources
+endif
+
+link_args = []
+more_deps = []
+if is_android
+  subdir('src/java')
+  target_type = 'shared_library'
+  target_name = 'mpd'
+  link_args += [
+    '-Wl,--no-undefined,-shared,-Bsymbolic',
+    '-llog',
+    '-lz',
+  ]
+  more_deps += [
+    declare_dependency(sources: [classes_jar]),
+    java_dep,
+  ]
+elif is_haiku
+  target_type = 'executable'
+  target_name = 'mpd.nores'
+  link_args += [
+    '-lnetwork',
+    '-lbe',
+  ]
+else
+  target_type = 'executable'
+  target_name = 'mpd'
+endif
+
+mpd = build_target(
+  target_name,
+  sources,
+  target_type: target_type,
+  include_directories: inc,
+  dependencies: [
+    basic_dep,
+    config_dep,
+    dbus_dep,
+    fs_dep,
+    net_dep,
+    util_dep,
+    event_dep,
+    thread_dep,
+    neighbor_glue_dep,
+    input_glue_dep,
+    archive_glue_dep,
+    output_glue_dep,
+    mixer_glue_dep,
+    decoder_glue_dep,
+    encoder_glue_dep,
+    playlist_glue_dep,
+    db_glue_dep,
+    storage_glue_dep,
+    song_dep,
+    systemd_dep,
+    sqlite_dep,
+    zeroconf_dep,
+    more_deps,
+  ],
+  link_args: link_args,
+  install: not is_android and not is_haiku,
+)
+
+if is_android
+  subdir('android/apk')
+endif
+
+if is_haiku
+  subdir('src/haiku')
+  custom_target(
+    'mpd',
+    output: 'mpd',
+    input: [mpd, rsrc],
+    command: [addres, '@OUTPUT@', '@INPUT0@', '@INPUT1@'],
+    install: true,
+    install_dir: get_option('bindir'),
+  )
+endif
+
+configure_file(output: 'config.h', configuration: conf)
+
+if systemd_dep.found()
+  subdir('systemd')
+endif
+
+install_data(
+  'mpd.svg',
+  install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'scalable', 'apps'),
+)
+
+install_data(
+  'AUTHORS', 'COPYING', 'NEWS', 'README.md',
+  install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
+)
+
+if get_option('documentation')
+  subdir('doc')
+endif
+
+if get_option('test')
+  subdir('test')
+endif
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -0,0 +1,187 @@
+option('documentation', type: 'boolean', value: false, description: 'Build documentation')
+
+option('test', type: 'boolean', value: false, description: 'Build the unit tests and debug programs')
+
+option('syslog', type: 'feature', description: 'syslog support')
+option('inotify', type: 'boolean', value: true, description: 'inotify support (for automatic database update)')
+
+option('daemon', type: 'boolean', value: true, description: 'enable daemonization')
+option('systemd', type: 'feature', description: 'systemd support')
+
+option('systemd_system_unit_dir', type: 'string', description: 'systemd system service directory')
+option('systemd_user_unit_dir', type: 'string', description: 'systemd user service directory')
+
+#
+# Android
+#
+
+option('android_sdk', type: 'string', description: 'The path where Android SDK is installed')
+option('android_ndk', type: 'string', description: 'The path where Android NDK is installed')
+option('android_abi', type: 'string', value: 'armeabi-v7a', description: 'The Android ABI to be built')
+
+option('android_strip', type: 'string', value: 'strip', description: 'The "strip" tool from the NDK')
+
+option('android_debug_keystore', type: 'string', description: 'The keystore file used to sign debug APK files')
+
+option('android_keystore', type: 'string', description: 'The keystore file used to sign APK files')
+option('android_keyalias', type: 'string', description: 'The key alias used to sign APK files')
+option('android_keypass', type: 'string', description: 'The password of the keystore used to sign APK files')
+
+#
+# System call support
+#
+
+option('epoll', type: 'boolean', value: true, description: 'Use epoll on Linux')
+option('eventfd', type: 'boolean', value: true, description: 'Use eventfd() on Linux')
+option('signalfd', type: 'boolean', value: true, description: 'Use signalfd() on Linux')
+
+#
+# Network support
+#
+
+option('tcp', type: 'boolean', value: true, description: 'Support for clients connecting via TCP')
+option('ipv6', type: 'feature', description: 'Support for IPv6')
+option('local_socket', type: 'boolean', value: true, description: 'Support for clients connecting via local sockets')
+
+#
+# Audio formats
+#
+
+option('dsd', type: 'boolean', value: true, description: 'Support the DSD audio format')
+
+#
+# Database plugins
+#
+
+option('database', type: 'boolean', value: true, description: 'enable support for the music database')
+option('upnp', type: 'feature', description: 'UPnP client support')
+option('libmpdclient', type: 'feature', description: 'libmpdclient support (for the proxy database plugin)')
+
+#
+# Neighbor plugins
+#
+
+option('neighbor', type: 'boolean', value: true, description: 'enable support for neighbor discovery')
+
+#
+# Storage plugins
+#
+
+option('udisks', type: 'feature', description: 'Support for removable media using udisks2')
+option('webdav', type: 'feature', description: 'WebDAV support using CURL and Expat')
+
+#
+# Playlist plugins
+#
+
+option('cue', type: 'boolean', value: true, description: 'CUE sheet support')
+
+#
+# Input plugins
+#
+
+option('cdio_paranoia', type: 'feature', description: 'libcdio_paranoia input plugin')
+option('curl', type: 'feature', description: 'HTTP client using CURL')
+option('mms', type: 'feature', description: 'MMS protocol support using libmms')
+option('nfs', type: 'feature', description: 'NFS protocol support using libnfs')
+option('smbclient', type: 'feature', description: 'SMB support using libsmbclient')
+
+#
+# Commercial services
+#
+
+option('qobuz', type: 'feature', description: 'Qobuz client')
+option('soundcloud', type: 'feature', description: 'SoundCloud client')
+option('tidal', type: 'feature', description: 'Tidal client')
+
+#
+# Archive plugins
+#
+
+option('bzip2', type: 'feature', description: 'bzip2 support using libbz2')
+option('iso9660', type: 'feature', description: 'ISO9660 support using libiso9660')
+option('zzip', type: 'feature', description: 'ZIP support using zziplib')
+
+#
+# Tag plugins
+#
+
+option('id3tag', type: 'feature', description: 'ID3 support using libid3tag')
+option('chromaprint', type: 'feature', description: 'ChromaPrint / AcoustID support')
+
+#
+# Decoder plugins
+#
+
+option('adplug', type: 'feature', description: 'AdPlug decoder plugin')
+option('audiofile', type: 'feature', description: 'libaudiofile decoder plugin')
+option('faad', type: 'feature', description: 'AAC decoder using libfaad')
+option('ffmpeg', type: 'feature', description: 'FFmpeg codec support')
+option('flac', type: 'feature', description: 'FLAC decoder plugin')
+option('fluidsynth', type: 'feature', description: 'fluidsynth MIDI decoder plugin')
+option('gme', type: 'feature', description: 'Game Music Emulator decoder plugin')
+option('mad', type: 'feature', description: 'MP3 decoder using libmad')
+option('mikmod', type: 'feature', description: 'MikMod decoder plugin')
+option('modplug', type: 'feature', description: 'Modplug decoder plugin')
+option('mpcdec', type: 'feature', description: 'Musepack decoder plugin')
+option('mpg123', type: 'feature', description: 'MP3 decoder using libmpg123')
+option('opus', type: 'feature', description: 'Opus decoder plugin')
+option('sidplay', type: 'feature', description: 'C64 SID support via libsidplayfp or libsidplay2')
+option('sndfile', type: 'feature', description: 'libsndfile decoder plugin')
+option('tremor', type: 'feature', description: 'Fixed-point vorbis decoder plugin')
+option('vorbis', type: 'feature', description: 'Vorbis decoder plugin')
+option('wavpack', type: 'feature', description: 'WavPack decoder plugin')
+option('wildmidi', type: 'feature', description: 'WildMidi decoder plugin')
+
+#
+# Encoder plugins
+#
+
+option('vorbisenc', type: 'feature', description: 'Vorbis encoder plugin')
+option('lame', type: 'feature', description: 'LAME MP3 encoder plugin')
+option('twolame', type: 'feature', description: 'TwoLAME MP2 encoder plugin')
+option('shine', type: 'feature', description: 'shine MP3 encoder plugin')
+option('wave_encoder', type: 'boolean', value: true, description: 'PCM wave encoder encoder plugin')
+
+#
+# Filter plugins
+#
+
+option('libsamplerate', type: 'feature', description: 'libsamplerate resampler')
+option('soxr', type: 'feature', description: 'libsoxr resampler')
+
+#
+# Output plugins
+#
+
+option('alsa', type: 'feature', description: 'ALSA support')
+option('ao', type: 'feature', description: 'libao output plugin')
+option('fifo', type: 'boolean', value: true, description: 'FIFO output plugin')
+option('httpd', type: 'boolean', value: true, description: 'HTTP streaming output plugin')
+option('jack', type: 'feature', description: 'JACK output plugin')
+option('openal', type: 'feature', description: 'OpenAL output plugin')
+option('oss', type: 'feature', description: 'Open Sound System support')
+option('pipe', type: 'boolean', value: true, description: 'Pipe output plugin')
+option('pulse', type: 'feature', description: 'PulseAudio support')
+option('recorder', type: 'boolean', value: true, description: 'Recorder output plugin')
+option('shout', type: 'feature', description: 'Shoutcast streaming support using libshout')
+option('sndio', type: 'feature', description: 'sndio output plugin')
+option('solaris_output', type: 'feature', description: 'Solaris /dev/audio support')
+
+#
+# Misc libraries
+#
+
+option('dbus', type: 'feature', description: 'D-Bus support')
+option('expat', type: 'feature', description: 'Expat XML support')
+option('icu', type: 'feature', description: 'Use libicu for Unicode')
+option('iconv', type: 'feature', description: 'Use iconv() for character set conversion')
+option('pcre', type: 'feature', description: 'Enable regular expression support (using libpcre)')
+option('sqlite', type: 'feature', description: 'SQLite database support (for stickers)')
+option('yajl', type: 'feature', description: 'libyajl for YAML support')
+option('zlib', type: 'feature', description: 'zlib support (for database compression)')
+
+option('zeroconf', type: 'combo',
+       choices: ['auto', 'avahi', 'bonjour', 'disabled'],
+       value: 'auto',
+       description: 'Zeroconf support')
--- a/python/build/cmdline.py
+++ b/python/build/cmdline.py
@@ -1,29 +0,0 @@
-def concatenate_cmdline_variables(src, names):
-    """Find duplicate variable declarations on the given source list, and
-    concatenate the values of those in the 'names' list."""
-
-    # the result list being constructed
-    dest = []
-
-    # a map of variable name to destination list index
-    positions = {}
-
-    for item in src:
-        i = item.find('=')
-        if i > 0:
-            # it's a variable
-            name = item[:i]
-            if name in names:
-                # it's a known variable
-                if name in positions:
-                    # already specified: concatenate instead of
-                    # appending it
-                    dest[positions[name]] += ' ' + item[i + 1:]
-                    continue
-                else:
-                    # not yet seen: append it and remember the list
-                    # index
-                    positions[name] = len(dest)
-        dest.append(item)
-
-    return dest
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -112,8 +112,8 @@ liblame = AutotoolsProject(
 )

 ffmpeg = FfmpegProject(
-    'http://ffmpeg.org/releases/ffmpeg-4.0.2.tar.xz',
-    'a95c0cc9eb990e94031d2183f2e6e444cc61c99f6f182d1575c433d62afb2f97',
+    'http://ffmpeg.org/releases/ffmpeg-4.1.3.tar.xz',
+    '0c3020452880581a8face91595b239198078645e7d7184273b8bcc7758beb63d',
    'lib/libavcodec.a',
    [
        '--disable-shared', '--enable-static',
@@ -341,8 +341,8 @@ ffmpeg = FfmpegProject(
 )

 curl = AutotoolsProject(
-    'http://curl.haxx.se/download/curl-7.61.1.tar.xz',
-    '3d5913d6a39bd22e68e34dff697fd6e4c3c81563f580c76fca2009315cd81891',
+    'http://curl.haxx.se/download/curl-7.64.1.tar.xz',
+    '9252332a7f871ce37bfa7f78bdd0a0e3924d8187cc27cb57c76c9474a7168fb3',
    'lib/libcurl.a',
    [
        '--disable-shared', '--enable-static',
@@ -375,8 +375,8 @@ libexpat = AutotoolsProject(
 )

 libnfs = AutotoolsProject(
-    'https://github.com/sahlberg/libnfs/archive/libnfs-3.0.0.tar.gz',
-    '445d92c5fc55e4a5b115e358e60486cf8f87ee50e0103d46a02e7fb4618566a5',
+    'https://github.com/sahlberg/libnfs/archive/libnfs-4.0.0.tar.gz',
+    '6ee77e9fe220e2d3e3b1f53cfea04fb319828cc7dbb97dd9df09e46e901d797d',
    'lib/libnfs.a',
    [
        '--disable-shared', '--enable-static',
@@ -387,12 +387,12 @@ libnfs = AutotoolsProject(

        '--disable-utils', '--disable-examples',
    ],
-    base='libnfs-libnfs-3.0.0',
+    base='libnfs-libnfs-4.0.0',
    autoreconf=True,
 )

 boost = BoostProject(
-    'http://downloads.sourceforge.net/project/boost/boost/1.68.0/boost_1_68_0.tar.bz2',
-    '7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7',
+    'http://downloads.sourceforge.net/project/boost/boost/1.70.0/boost_1_70_0.tar.bz2',
+    '430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778',
    'include/boost/version.hpp',
 )
--- a/python/build/meson.py
+++ b/python/build/meson.py
@@ -2,48 +2,46 @@ import os.path, subprocess, sys

 from build.project import Project

-class MesonProject(Project):
-    def __init__(self, url, md5, installed, configure_args=[],
-                 **kwargs):
-        Project.__init__(self, url, md5, installed, **kwargs)
-        self.configure_args = configure_args
+def make_cross_file(toolchain):
+    if toolchain.is_windows:
+        system = 'windows'
+        windres = "windres = '%s'" % toolchain.windres
+    else:
+        system = 'linux'
+        windres = ''

-    def _make_cross_file(self, toolchain):
-        if toolchain.is_windows:
-            system = 'windows'
+    if toolchain.is_arm:
+        cpu_family = 'arm'
+        if toolchain.is_armv7:
+            cpu = 'armv7'
        else:
-            system = 'linux'
-
-        if toolchain.is_arm:
-            cpu_family = 'arm'
-            if toolchain.is_armv7:
-                cpu = 'armv7'
-            else:
-                cpu = 'armv6'
-        elif toolchain.is_aarch64:
-            cpu_family = 'aarch64'
-            cpu = 'arm64-v8a'
+            cpu = 'armv6'
+    elif toolchain.is_aarch64:
+        cpu_family = 'aarch64'
+        cpu = 'arm64-v8a'
+    else:
+        cpu_family = 'x86'
+        if 'x86_64' in toolchain.arch:
+            cpu = 'x86_64'
        else:
-            cpu_family = 'x86'
-            if 'x86_64' in toolchain.arch:
-                cpu = 'x86_64'
-            else:
-                cpu = 'i686'
+            cpu = 'i686'

-        # TODO: support more CPUs
-        endian = 'little'
+    # TODO: support more CPUs
+    endian = 'little'

-        # TODO: write pkg-config wrapper
+    # TODO: write pkg-config wrapper

-        path = os.path.join(toolchain.build_path, 'meson.cross')
-        os.makedirs(toolchain.build_path, exist_ok=True)
-        with open(path, 'w') as f:
-            f.write("""
+    path = os.path.join(toolchain.build_path, 'meson.cross')
+    os.makedirs(toolchain.build_path, exist_ok=True)
+    with open(path, 'w') as f:
+        f.write("""
 [binaries]
 c = '%s'
 cpp = '%s'
 ar = '%s'
 strip = '%s'
+pkgconfig = '%s'
+%s

 [properties]
 root = '%s'
@@ -63,37 +61,48 @@ cpu_family = '%s'
 cpu = '%s'
 endian = '%s'
            """ % (toolchain.cc, toolchain.cxx, toolchain.ar, toolchain.strip,
+                   toolchain.pkg_config,
+                   windres,
                   toolchain.install_prefix,
                   repr((toolchain.cppflags + ' ' + toolchain.cflags).split()),
-                   repr(toolchain.ldflags.split()),
+                   repr(toolchain.ldflags.split() + toolchain.libs.split()),
                   repr((toolchain.cppflags + ' ' + toolchain.cxxflags).split()),
-                   repr(toolchain.ldflags.split()),
+                   repr(toolchain.ldflags.split() + toolchain.libs.split()),
                   system, cpu_family, cpu, endian))
-        return path
+    return path
+
+def configure(toolchain, src, build, args=()):
+    cross_file = make_cross_file(toolchain)
+    configure = [
+        'meson',
+        src, build,
+
+        '--prefix', toolchain.install_prefix,
+
+        # this is necessary because Meson uses Debian's build machine
+        # MultiArch path (e.g. "lib/x86_64-linux-gnu") for cross
+        # builds, which is obviously wrong
+        '--libdir', 'lib',
+
+        '--buildtype', 'plain',
+
+        '--default-library=static',
+
+        '--cross-file', cross_file,
+    ] + args
+
+    subprocess.check_call(configure, env=toolchain.env)
+
+class MesonProject(Project):
+    def __init__(self, url, md5, installed, configure_args=[],
+                 **kwargs):
+        Project.__init__(self, url, md5, installed, **kwargs)
+        self.configure_args = configure_args

    def configure(self, toolchain):
        src = self.unpack(toolchain)
-        cross_file = self._make_cross_file(toolchain)
        build = self.make_build_path(toolchain)
-        configure = [
-            'meson',
-            src, build,
-
-            '--prefix', toolchain.install_prefix,
-
-            # this is necessary because Meson uses Debian's build machine
-            # MultiArch path (e.g. "lib/x86_64-linux-gnu") for cross
-            # builds, which is obviously wrong
-            '--libdir', 'lib',
-
-            '--buildtype', 'plain',
-
-            '--default-library=static',
-
-            '--cross-file', cross_file,
-        ] + self.configure_args
-
-        subprocess.check_call(configure, env=toolchain.env)
+        configure(toolchain, src, build, self.configure_args)
        return build

    def build(self, toolchain):
--- a/python/build/zlib.py
+++ b/python/build/zlib.py
@@ -18,5 +18,5 @@ class ZlibProject(Project):
            'INCLUDE_PATH='+ os.path.join(toolchain.install_prefix, 'include'),
            'LIBRARY_PATH=' + os.path.join(toolchain.install_prefix, 'lib'),
            'BINARY_PATH=' + os.path.join(toolchain.install_prefix, 'bin'),
-            'SHARED_MODE=1'],
+            ],
            cwd=src, env=toolchain.env)
--- a/scripts/check_config_h.rb
+++ b/scripts/check_config_h.rb
@@ -1,47 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This script verifies that every source includes config.h first.
-# This is very important for consistent Large File Support.
-#
-
-def check_file(file)
-    first = true
-    file.each_line do |line|
-        if line =~ /^\#include\s+(\S+)/ then
-            if $1 == '"config.h"'
-                unless first
-                    puts "#{file.path}: config.h included too late"
-                end
-            else
-                if first
-                    puts "#{file.path}: config.h missing"
-                end
-            end
-            first = false
-        end
-    end
-end
-
-def check_path(path)
-    File.open(path) do |file|
-        check_file(file)
-    end
-end
-
-if ARGV.empty?
-    Dir["src/*.c"].each do |path|
-        check_path(path)
-    end
-
-    Dir["src/*/*.c"].each do |path|
-        check_path(path)
-    end
-
-    Dir["test/*.c"].each do |path|
-        check_path(path)
-    end
-else
-    ARGV.each do |path|
-        check_path(path)
-    end
-end
--- a/src/AudioFormat.cxx
+++ b/src/AudioFormat.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -44,16 +44,32 @@ AudioFormat::ApplyMask(AudioFormat mask) noexcept
 StringBuffer<24>
 ToString(const AudioFormat af) noexcept
 {
+	StringBuffer<24> buffer;
+	char *p = buffer.data();
+
 	if (af.format == SampleFormat::DSD && af.sample_rate > 0 &&
 	    af.sample_rate % 44100 == 0) {
 		/* use shortcuts such as "dsd64" which implies the
 		   sample rate */
-		return StringFormat<24>("dsd%u:%u",
-					af.sample_rate * 8 / 44100,
-					af.channels);
+		p += sprintf(p, "dsd%u:", af.sample_rate * 8 / 44100);
+	} else {
+		const char *sample_format = af.format != SampleFormat::UNDEFINED
+			? sample_format_to_string(af.format)
+			: "*";
+
+		if (af.sample_rate > 0)
+			p += sprintf(p, "%u:%s:", af.sample_rate,
+				     sample_format);
+		else
+			p += sprintf(p, "*:%s:", sample_format);
 	}

-	return StringFormat<24>("%u:%s:%u",
-				af.sample_rate, sample_format_to_string(af.format),
-				af.channels);
+	if (af.channels > 0)
+		p += sprintf(p, "%u", af.channels);
+	else {
+		*p++ = '*';
+		*p = 0;
+	}
+
+	return buffer;
 }
--- a/src/AudioFormat.hxx
+++ b/src/AudioFormat.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,9 @@
 #define MPD_AUDIO_FORMAT_HXX

 #include "pcm/SampleFormat.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
+
+#include <chrono>

 #include <stdint.h>
 #include <stddef.h>
@@ -132,6 +134,11 @@ struct AudioFormat {
 		return result;
 	}

+	gcc_pure
+	bool MatchMask(AudioFormat mask) const noexcept {
+		return WithMask(mask) == *this;
+	}
+
 	/**
 	 * Returns the size of each (mono) sample in bytes.
 	 */
@@ -142,11 +149,28 @@ struct AudioFormat {
 	 */
 	unsigned GetFrameSize() const;

-	/**
-	 * Returns the floating point factor which converts a time
-	 * span to a storage size in bytes.
-	 */
-	double GetTimeToSize() const;
+	template<typename D>
+	constexpr auto TimeToFrames(D t) const noexcept {
+		using Period = typename D::period;
+		return ((t.count() * sample_rate) / Period::den) * Period::num;
+	}
+
+	template<typename D>
+	constexpr size_t TimeToSize(D t) const noexcept {
+		return size_t(size_t(TimeToFrames(t)) * GetFrameSize());
+	}
+
+	template<typename D>
+	constexpr D FramesToTime(std::uintmax_t size) const noexcept {
+		using Rep = typename D::rep;
+		using Period = typename D::period;
+		return D(((Rep(1) * size / Period::num) * Period::den) / sample_rate);
+	}
+
+	template<typename D>
+	constexpr D SizeToTime(std::uintmax_t size) const noexcept {
+		return FramesToTime<D>(size / GetFrameSize());
+	}
 };

 /**
@@ -207,12 +231,6 @@ AudioFormat::GetFrameSize() const
 	return GetSampleSize() * channels;
 }

-inline double
-AudioFormat::GetTimeToSize() const
-{
-	return sample_rate * GetFrameSize();
-}
-
 /**
 * Renders the #AudioFormat object into a string, e.g. for printing
 * it in a log file.
--- a/src/AudioParser.cxx
+++ b/src/AudioParser.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,6 @@
 *
 */

-#include "config.h"
 #include "AudioParser.hxx"
 #include "AudioFormat.hxx"
 #include "util/RuntimeError.hxx"
@@ -44,10 +43,9 @@ ParseSampleRate(const char *src, bool mask, const char **endptr_r)

 	value = strtoul(src, &endptr, 10);
 	if (endptr == src) {
-		throw std::runtime_error("Failed to parse the sample rate");
+		throw std::invalid_argument("Failed to parse the sample rate");
 	} else if (!audio_valid_sample_rate(value))
-		throw FormatRuntimeError("Invalid sample rate: %lu",
-					 value);
+		throw FormatInvalidArgument("Invalid sample rate: %lu", value);

 	*endptr_r = endptr;
 	return value;
@@ -77,7 +75,7 @@ ParseSampleFormat(const char *src, bool mask, const char **endptr_r)

 	value = strtoul(src, &endptr, 10);
 	if (endptr == src)
-		throw std::runtime_error("Failed to parse the sample format");
+		throw std::invalid_argument("Failed to parse the sample format");

 	switch (value) {
 	case 8:
@@ -101,7 +99,8 @@ ParseSampleFormat(const char *src, bool mask, const char **endptr_r)
 		break;

 	default:
-		throw FormatRuntimeError("Invalid sample format: %lu", value);
+		throw FormatInvalidArgument("Invalid sample format: %lu",
+					    value);
 	}

 	assert(audio_valid_sample_format(sample_format));
@@ -123,9 +122,10 @@ ParseChannelCount(const char *src, bool mask, const char **endptr_r)

 	value = strtoul(src, &endptr, 10);
 	if (endptr == src)
-		throw std::runtime_error("Failed to parse the channel count");
+		throw std::invalid_argument("Failed to parse the channel count");
 	else if (!audio_valid_channel_count(value))
-		throw FormatRuntimeError("Invalid channel count: %u", value);
+		throw FormatInvalidArgument("Invalid channel count: %u",
+					    value);

 	*endptr_r = endptr;
 	return value;
@@ -151,7 +151,8 @@ ParseAudioFormat(const char *src, bool mask)
 			src = endptr + 1;
 			dest.channels = ParseChannelCount(src, mask, &src);
 			if (*src != 0)
-				throw FormatRuntimeError("Extra data after channel count: %s", src);
+				throw FormatInvalidArgument("Extra data after channel count: %s",
+							    src);

 			return dest;
 		}
@@ -162,21 +163,22 @@ ParseAudioFormat(const char *src, bool mask)
 	dest.sample_rate = ParseSampleRate(src, mask, &src);

 	if (*src++ != ':')
-		throw std::runtime_error("Sample format missing");
+		throw std::invalid_argument("Sample format missing");

 	/* parse sample format */

 	dest.format = ParseSampleFormat(src, mask, &src);

 	if (*src++ != ':')
-		throw std::runtime_error("Channel count missing");
+		throw std::invalid_argument("Channel count missing");

 	/* parse channel count */

 	dest.channels = ParseChannelCount(src, mask, &src);

 	if (*src != 0)
-		throw FormatRuntimeError("Extra data after channel count: %s", src);
+		throw FormatInvalidArgument("Extra data after channel count: %s",
+					    src);

 	assert(mask
 	       ? dest.IsMaskValid()
--- a/src/AudioParser.hxx
+++ b/src/AudioParser.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
--- a/src/BulkEdit.hxx
+++ b/src/BulkEdit.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
--- a/src/CheckAudioFormat.cxx
+++ b/src/CheckAudioFormat.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "CheckAudioFormat.hxx"
 #include "AudioFormat.hxx"
 #include "util/RuntimeError.hxx"
--- a/src/CheckAudioFormat.hxx
+++ b/src/CheckAudioFormat.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
--- a/src/Chrono.hxx
+++ b/src/Chrono.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -24,13 +24,14 @@
 #include <utility>
 #include <cstdint>

+using FloatDuration = std::chrono::duration<double>;
+
 /**
 * A time stamp within a song.  Granularity is 1 millisecond and the
 * maximum value is about 49 days.
 */
 class SongTime : public std::chrono::duration<std::uint32_t, std::milli> {
 	typedef std::chrono::duration<std::uint32_t, std::milli> Base;
-	typedef Base::rep rep;

 public:
 	SongTime() = default;
@@ -42,6 +43,11 @@ public:
 		return SongTime(Base::zero());
 	}

+	template<typename D>
+	static constexpr SongTime Cast(D src) {
+		return SongTime(std::chrono::duration_cast<Base>(src));
+	}
+
 	static constexpr SongTime FromS(unsigned s) {
 		return SongTime(rep(s) * 1000);
 	}
@@ -114,7 +120,6 @@ public:
 */
 class SignedSongTime : public std::chrono::duration<std::int32_t, std::milli> {
 	typedef std::chrono::duration<std::int32_t, std::milli> Base;
-	typedef Base::rep rep;

 public:
 	SignedSongTime() = default;
@@ -138,6 +143,11 @@ public:
 		return SignedSongTime(-1);
 	}

+	template<typename D>
+	static constexpr SongTime Cast(D src) {
+		return SongTime(std::chrono::duration_cast<Base>(src));
+	}
+
 	static constexpr SignedSongTime FromS(int s) {
 		return SignedSongTime(rep(s) * 1000);
 	}
--- a/src/CommandLine.cxx
+++ b/src/CommandLine.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -19,10 +19,11 @@

 #include "config.h"
 #include "CommandLine.hxx"
+#include "GitVersion.hxx"
 #include "ls.hxx"
 #include "LogInit.hxx"
 #include "Log.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/File.hxx"
 #include "decoder/DecoderList.hxx"
 #include "decoder/DecoderPlugin.hxx"
 #include "output/Registry.hxx"
@@ -67,52 +68,56 @@
 #include <stdio.h>
 #include <stdlib.h>

+namespace {
 #ifdef _WIN32
-#define CONFIG_FILE_LOCATION PATH_LITERAL("mpd\\mpd.conf")
-#define APP_CONFIG_FILE_LOCATION PATH_LITERAL("conf\\mpd.conf")
+constexpr auto CONFIG_FILE_LOCATION = Path::FromFS(PATH_LITERAL("mpd\\mpd.conf"));
+constexpr auto APP_CONFIG_FILE_LOCATION = Path::FromFS(PATH_LITERAL("conf\\mpd.conf"));
 #else
-#define USER_CONFIG_FILE_LOCATION1 PATH_LITERAL(".mpdconf")
-#define USER_CONFIG_FILE_LOCATION2 PATH_LITERAL(".mpd/mpd.conf")
-#define USER_CONFIG_FILE_LOCATION_XDG PATH_LITERAL("mpd/mpd.conf")
+constexpr auto USER_CONFIG_FILE_LOCATION1 = Path::FromFS(PATH_LITERAL(".mpdconf"));
+constexpr auto USER_CONFIG_FILE_LOCATION2 = Path::FromFS(PATH_LITERAL(".mpd/mpd.conf"));
+constexpr auto USER_CONFIG_FILE_LOCATION_XDG = Path::FromFS(PATH_LITERAL("mpd/mpd.conf"));
 #endif
+}

-static constexpr OptionDef opt_kill(
-	"kill", "kill the currently running mpd session");
-static constexpr OptionDef opt_no_config(
-	"no-config", "don't read from config");
-static constexpr OptionDef opt_no_daemon(
-	"no-daemon", "don't detach from console");
-static constexpr OptionDef opt_stdout(
-	"stdout", nullptr); // hidden, compatibility with old versions
-static constexpr OptionDef opt_stderr(
-	"stderr", "print messages to stderr");
-static constexpr OptionDef opt_verbose(
-	"verbose", 'v', "verbose logging");
-static constexpr OptionDef opt_version(
-	"version", 'V', "print version number");
-static constexpr OptionDef opt_help(
-	"help", 'h', "show help options");
-static constexpr OptionDef opt_help_alt(
-	nullptr, '?', nullptr); // hidden, standard alias for --help
+enum Option {
+	OPTION_KILL,
+	OPTION_NO_CONFIG,
+	OPTION_NO_DAEMON,
+	OPTION_STDOUT,
+	OPTION_STDERR,
+	OPTION_VERBOSE,
+	OPTION_VERSION,
+	OPTION_HELP,
+	OPTION_HELP2,
+};
+
+static constexpr OptionDef option_defs[] = {
+	{"kill", "kill the currently running mpd session"},
+	{"no-config", "don't read from config"},
+	{"no-daemon", "don't detach from console"},
+	{"stdout", nullptr}, // hidden, compatibility with old versions
+	{"stderr", "print messages to stderr"},
+	{"verbose", 'v', "verbose logging"},
+	{"version", 'V', "print version number"},
+	{"help", 'h', "show help options"},
+	{nullptr, '?', nullptr}, // hidden, standard alias for --help
+};

 static constexpr Domain cmdline_domain("cmdline");

 gcc_noreturn
 static void version(void)
 {
-	printf("Music Player Daemon " VERSION
-#ifdef GIT_COMMIT
-	       " (" GIT_COMMIT ")"
-#endif
+	printf("Music Player Daemon " VERSION " (%s)"
 	       "\n"
-	       "\n"
-	       "Copyright (C) 2003-2007 Warren Dukes <warren.dukes@gmail.com>\n"
-	       "Copyright 2008-2017 Max Kellermann <max.kellermann@gmail.com>\n"
+	       "Copyright 2003-2007 Warren Dukes <warren.dukes@gmail.com>\n"
+	       "Copyright 2008-2018 Max Kellermann <max.kellermann@gmail.com>\n"
 	       "This is free software; see the source for copying conditions.  There is NO\n"
-	       "warranty; not even MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+	       "warranty; not even MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n",
+	       GIT_VERSION);

 #ifdef ENABLE_DATABASE
-	       "\n"
+	printf("\n"
 	       "Database plugins:\n");

 	for (auto i = database_plugins; *i != nullptr; ++i)
@@ -124,18 +129,18 @@ static void version(void)
 	for (auto i = storage_plugins; *i != nullptr; ++i)
 		printf(" %s", (*i)->name);

-	printf("\n"
+	printf("\n");
 #endif

 #ifdef ENABLE_NEIGHBOR_PLUGINS
-	       "\n"
+	printf("\n"
 	       "Neighbor plugins:\n");
 	for (auto i = neighbor_plugins; *i != nullptr; ++i)
 		printf(" %s", (*i)->name);

-	printf("\n"
 #endif

+	printf("\n"
 	       "\n"
 	       "Decoders plugins:\n");

@@ -195,7 +200,12 @@ static void version(void)
 #endif

 	       "\n"
-	       "Input plugins:\n");
+	       "Input plugins:\n"
+	       " file"
+#ifdef ENABLE_ARCHIVE
+	       " archive"
+#endif
+	       );
 	input_plugins_for_each(plugin)
 		printf(" %s", plugin->name);

@@ -213,6 +223,12 @@ static void version(void)
 #ifdef HAVE_AVAHI
 	       " avahi"
 #endif
+#ifdef ENABLE_DBUS
+	       " dbus"
+#endif
+#ifdef ENABLE_UDISKS
+	       " udisks"
+#endif
 #ifdef USE_EPOLL
 	       " epoll"
 #endif
@@ -265,89 +281,85 @@ static void help(void)
 	       "\n"
 	       "Options:\n");

-	PrintOption(opt_help);
-	PrintOption(opt_kill);
-	PrintOption(opt_no_config);
-	PrintOption(opt_no_daemon);
-	PrintOption(opt_stderr);
-	PrintOption(opt_verbose);
-	PrintOption(opt_version);
+	for (const auto &i : option_defs)
+		if(i.HasDescription() == true) // hide hidden options from help print
+			PrintOption(i);

 	exit(EXIT_SUCCESS);
 }

 class ConfigLoader
 {
+	ConfigData &config;
+
 public:
+	explicit ConfigLoader(ConfigData &_config) noexcept
+		:config(_config) {}
+
 	bool TryFile(const Path path);
-	bool TryFile(const AllocatedPath &base_path,
-		     PathTraitsFS::const_pointer_type path);
+	bool TryFile(const AllocatedPath &base_path, Path path);
 };

 bool ConfigLoader::TryFile(Path path)
 {
 	if (FileExists(path)) {
-		ReadConfigFile(path);
+		ReadConfigFile(config, path);
 		return true;
 	}
 	return false;
 }

-bool ConfigLoader::TryFile(const AllocatedPath &base_path,
-			   PathTraitsFS::const_pointer_type path)
+bool ConfigLoader::TryFile(const AllocatedPath &base_path, Path path)
 {
 	if (base_path.IsNull())
 		return false;
-	auto full_path = AllocatedPath::Build(base_path, path);
+	auto full_path = base_path / path;
 	return TryFile(full_path);
 }

 void
-ParseCommandLine(int argc, char **argv, struct options *options)
+ParseCommandLine(int argc, char **argv, struct options &options,
+		 ConfigData &config)
 {
 	bool use_config_file = true;
-	options->kill = false;
-	options->daemon = true;
-	options->log_stderr = false;
-	options->verbose = false;

 	// First pass: handle command line options
-	OptionParser parser(argc, argv);
-	while (parser.HasEntries()) {
-		if (!parser.ParseNext())
-			continue;
-		if (parser.CheckOption(opt_kill)) {
-			options->kill = true;
-			continue;
-		}
-		if (parser.CheckOption(opt_no_config)) {
-			use_config_file = false;
-			continue;
-		}
-		if (parser.CheckOption(opt_no_daemon)) {
-			options->daemon = false;
-			continue;
-		}
-		if (parser.CheckOption(opt_stderr, opt_stdout)) {
-			options->log_stderr = true;
-			continue;
-		}
-		if (parser.CheckOption(opt_verbose)) {
-			options->verbose = true;
-			continue;
-		}
-		if (parser.CheckOption(opt_version))
-			version();
-		if (parser.CheckOption(opt_help, opt_help_alt))
-			help();
+	OptionParser parser(option_defs, argc, argv);
+	while (auto o = parser.Next()) {
+		switch (Option(o.index)) {
+		case OPTION_KILL:
+			options.kill = true;
+			break;

-		throw FormatRuntimeError("invalid option: %s",
-					 parser.GetOption());
+		case OPTION_NO_CONFIG:
+			use_config_file = false;
+			break;
+
+		case OPTION_NO_DAEMON:
+			options.daemon = false;
+			break;
+
+		case OPTION_STDOUT:
+		case OPTION_STDERR:
+			options.log_stderr = true;
+			break;
+
+		case OPTION_VERBOSE:
+			options.verbose = true;
+			break;
+
+		case OPTION_VERSION:
+			version();
+
+		case OPTION_HELP:
+		case OPTION_HELP2:
+			help();
+		}
 	}

 	/* initialize the logging library, so the configuration file
 	   parser can use it already */
-	log_early_init(options->verbose);
+	log_early_init(options.verbose);

 	if (!use_config_file) {
 		LogDebug(cmdline_domain,
@@ -357,11 +369,9 @@ ParseCommandLine(int argc, char **argv, struct options *options)

 	// Second pass: find non-option parameters (i.e. config file)
 	const char *config_file = nullptr;
-	for (int i = 1; i < argc; ++i) {
-		if (OptionParser::IsOption(argv[i]))
-			continue;
+	for (const char *i : parser.GetRemaining()) {
 		if (config_file == nullptr) {
-			config_file = argv[i];
+			config_file = i;
 			continue;
 		}

@@ -377,16 +387,16 @@ ParseCommandLine(int argc, char **argv, struct options *options)
 		if (result <= 0)
 			throw MakeLastError("MultiByteToWideChar() failed");

-		ReadConfigFile(Path::FromFS(buffer));
+		ReadConfigFile(config, Path::FromFS(buffer));
 #else
-		ReadConfigFile(Path::FromFS(config_file));
+		ReadConfigFile(config, Path::FromFS(config_file));
 #endif
 		return;
 	}

 	/* use default configuration file path */

-	ConfigLoader loader;
+	ConfigLoader loader(config);

 	bool found =
 #ifdef _WIN32
--- a/src/CommandLine.hxx
+++ b/src/CommandLine.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -20,14 +20,17 @@
 #ifndef MPD_COMMAND_LINE_HXX
 #define MPD_COMMAND_LINE_HXX

+struct ConfigData;
+
 struct options {
-	bool kill;
-	bool daemon;
-	bool log_stderr;
-	bool verbose;
+	bool kill = false;
+	bool daemon = true;
+	bool log_stderr = false;
+	bool verbose = false;
 };

 void
-ParseCommandLine(int argc, char **argv, struct options *options);
+ParseCommandLine(int argc, char **argv, struct options &options,
+		 ConfigData &config);

 #endif
--- a/src/GitVersion.cxx
+++ b/src/GitVersion.cxx
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2003-2018 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "GitVersion.hxx"
+
+char GIT_VERSION[] = "@VCS_TAG@";
--- a/src/output/OutputControl.hxx
+++ b/src/output/OutputControl.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -17,9 +17,9 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#ifndef MPD_OUTPUT_CONTROL_HXX
-#define MPD_OUTPUT_CONTROL_HXX
+#ifndef MPD_GIT_VERSION_HXX
+#define MPD_GIT_VERSION_HXX

-struct AudioOutput;
+extern char GIT_VERSION[];

 #endif
--- a/src/IOThread.cxx
+++ b/src/IOThread.cxx
@@ -1,119 +0,0 @@
-/*
- * Copyright 2003-2017 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "IOThread.hxx"
-#include "thread/Mutex.hxx"
-#include "thread/Cond.hxx"
-#include "thread/Thread.hxx"
-#include "thread/Name.hxx"
-#include "event/Loop.hxx"
-
-#include <assert.h>
-
-static struct IOThread {
-	Mutex mutex;
-	Cond cond;
-
-	EventLoop *loop;
-	Thread thread;
-
-	IOThread():thread(BIND_THIS_METHOD(Run)) {}
-
-private:
-	void Run() noexcept;
-} io;
-
-void
-io_thread_run(void)
-{
-	assert(io_thread_inside());
-	assert(io.loop != nullptr);
-
-	io.loop->Run();
-}
-
-inline void
-IOThread::Run() noexcept
-{
-	SetThreadName("io");
-
-	/* lock+unlock to synchronize with io_thread_start(), to be
-	   sure that io.thread is set */
-	mutex.lock();
-	mutex.unlock();
-
-	io_thread_run();
-}
-
-void
-io_thread_init(void)
-{
-	assert(io.loop == nullptr);
-	assert(!io.thread.IsDefined());
-
-	io.loop = new EventLoop();
-}
-
-void
-io_thread_start()
-{
-	assert(io.loop != nullptr);
-	assert(!io.thread.IsDefined());
-
-	const std::lock_guard<Mutex> protect(io.mutex);
-	io.thread.Start();
-}
-
-void
-io_thread_quit(void)
-{
-	assert(io.loop != nullptr);
-
-	io.loop->Break();
-}
-
-void
-io_thread_deinit(void)
-{
-	if (io.thread.IsDefined()) {
-		io_thread_quit();
-		io.thread.Join();
-	}
-
-	delete io.loop;
-}
-
-EventLoop &
-io_thread_get() noexcept
-{
-	assert(io.loop != nullptr);
-
-	return *io.loop;
-}
-
-#ifndef NDEBUG
-
-bool
-io_thread_inside() noexcept
-{
-	return io.thread.IsInside();
-}
-
-#endif
--- a/src/IcyMetaDataParser.cxx
+++ b/src/IcyMetaDataParser.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -17,10 +17,9 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "IcyMetaDataParser.hxx"
 #include "tag/Tag.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "util/Domain.hxx"
 #include "util/StringView.hxx"
 #include "Log.hxx"
@@ -31,7 +30,7 @@
 static constexpr Domain icy_metadata_domain("icy_metadata");

 void
-IcyMetaDataParser::Reset()
+IcyMetaDataParser::Reset() noexcept
 {
 	if (!IsDefined())
 		return;
@@ -39,14 +38,14 @@ IcyMetaDataParser::Reset()
 	if (data_rest == 0 && meta_size > 0)
 		delete[] meta_data;

-	delete tag;
+	tag.reset();

 	data_rest = data_size;
 	meta_size = 0;
 }

 size_t
-IcyMetaDataParser::Data(size_t length)
+IcyMetaDataParser::Data(size_t length) noexcept
 {
 	assert(length > 0);

@@ -66,7 +65,7 @@ IcyMetaDataParser::Data(size_t length)
 }

 static void
-icy_add_item(TagBuilder &tag, TagType type, const char *value)
+icy_add_item(TagBuilder &tag, TagType type, const char *value) noexcept
 {
 	size_t length = strlen(value);

@@ -81,7 +80,8 @@ icy_add_item(TagBuilder &tag, TagType type, const char *value)
 }

 static void
-icy_parse_tag_item(TagBuilder &tag, const char *name, const char *value)
+icy_parse_tag_item(TagBuilder &tag,
+		   const char *name, const char *value) noexcept
 {
 	if (strcmp(name, "StreamTitle") == 0)
 		icy_add_item(tag, TAG_TITLE, value);
@@ -96,7 +96,7 @@ icy_parse_tag_item(TagBuilder &tag, const char *name, const char *value)
 * that also fails, return #end.
 */
 static char *
-find_end_quote(char *p, char *const end)
+find_end_quote(char *p, char *const end) noexcept
 {
 	char *fallback = std::find(p, end, '\'');
 	if (fallback >= end - 1 || fallback[1] == ';')
@@ -115,8 +115,8 @@ find_end_quote(char *p, char *const end)
 	}
 }

-static Tag *
-icy_parse_tag(char *p, char *const end)
+static std::unique_ptr<Tag>
+icy_parse_tag(char *p, char *const end) noexcept
 {
 	assert(p != nullptr);
 	assert(end != nullptr);
@@ -165,7 +165,7 @@ icy_parse_tag(char *p, char *const end)
 }

 size_t
-IcyMetaDataParser::Meta(const void *data, size_t length)
+IcyMetaDataParser::Meta(const void *data, size_t length) noexcept
 {
 	const unsigned char *p = (const unsigned char *)data;

@@ -208,8 +208,6 @@ IcyMetaDataParser::Meta(const void *data, size_t length)
 	if (meta_position == meta_size) {
 		/* parse */

-		delete tag;
-
 		tag = icy_parse_tag(meta_data, meta_data + meta_size);
 		delete[] meta_data;

@@ -223,7 +221,7 @@ IcyMetaDataParser::Meta(const void *data, size_t length)
 }

 size_t
-IcyMetaDataParser::ParseInPlace(void *data, size_t length)
+IcyMetaDataParser::ParseInPlace(void *data, size_t length) noexcept
 {
 	uint8_t *const dest0 = (uint8_t *)data;
 	uint8_t *dest = dest0;
--- a/src/IcyMetaDataParser.hxx
+++ b/src/IcyMetaDataParser.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -20,21 +20,22 @@
 #ifndef MPD_ICY_META_DATA_PARSER_HXX
 #define MPD_ICY_META_DATA_PARSER_HXX

+#include "tag/Tag.hxx"
+
+#include <memory>
+
 #include <stddef.h>

-struct Tag;
-
 class IcyMetaDataParser {
-	size_t data_size, data_rest;
+	size_t data_size = 0, data_rest;

 	size_t meta_size, meta_position;
 	char *meta_data;

-	Tag *tag;
+	std::unique_ptr<Tag> tag;

 public:
-	IcyMetaDataParser():data_size(0) {}
-	~IcyMetaDataParser() {
+	~IcyMetaDataParser() noexcept {
 		Reset();
 	}

@@ -42,7 +43,7 @@ public:
 	 * Initialize an enabled icy_metadata object with the specified
 	 * data_size (from the icy-metaint HTTP response header).
 	 */
-	void Start(size_t _data_size) {
+	void Start(size_t _data_size) noexcept {
 		data_size = data_rest = _data_size;
 		meta_size = 0;
 		tag = nullptr;
@@ -51,12 +52,12 @@ public:
 	/**
 	 * Resets the icy_metadata.  Call this after rewinding the stream.
 	 */
-	void Reset();
+	void Reset() noexcept;

 	/**
 	 * Checks whether the icy_metadata object is enabled.
 	 */
-	bool IsDefined() const {
+	bool IsDefined() const noexcept {
 		return data_size > 0;
 	}

@@ -66,26 +67,24 @@ public:
 	 * return value is smaller than "length", the caller should invoke
 	 * icy_meta().
 	 */
-	size_t Data(size_t length);
+	size_t Data(size_t length) noexcept;

 	/**
 	 * Reads metadata from the stream.  Returns the number of bytes
 	 * consumed.  If the return value is smaller than "length", the caller
 	 * should invoke icy_data().
 	 */
-	size_t Meta(const void *data, size_t length);
+	size_t Meta(const void *data, size_t length) noexcept;

 	/**
 	 * Parse data and eliminate metadata.
 	 *
 	 * @return the number of data bytes remaining in the buffer
 	 */
-	size_t ParseInPlace(void *data, size_t length);
+	size_t ParseInPlace(void *data, size_t length) noexcept;

-	Tag *ReadTag() {
-		Tag *result = tag;
-		tag = nullptr;
-		return result;
+	std::unique_ptr<Tag> ReadTag() noexcept {
+		return std::exchange(tag, nullptr);
 	}
 };

--- a/src/Idle.cxx
+++ b/src/Idle.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,6 @@
 *
 */

-#include "config.h"
 #include "Idle.hxx"
 #include "Main.hxx"
 #include "Instance.hxx"
--- a/src/Idle.hxx
+++ b/src/Idle.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
--- a/src/IdleFlags.cxx
+++ b/src/IdleFlags.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,6 @@
 *
 */

-#include "config.h"
 #include "IdleFlags.hxx"
 #include "util/ASCII.hxx"

@@ -42,6 +41,7 @@ static const char *const idle_names[] = {
 	"message",
 	"neighbor",
 	"mount",
+	"partition",
 	nullptr
 };

--- a/src/IdleFlags.hxx
+++ b/src/IdleFlags.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,7 @@
 #ifndef MPD_IDLE_FLAGS_HXX
 #define MPD_IDLE_FLAGS_HXX

-#include "Compiler.h"
+#include "util/Compiler.h"

 /** song database has been updated*/
 static constexpr unsigned IDLE_DATABASE = 0x1;
@@ -67,6 +67,9 @@ static constexpr unsigned IDLE_NEIGHBOR = 0x800;
 /** the mount list has changed */
 static constexpr unsigned IDLE_MOUNT = 0x1000;

+/** the partition list has changed */
+static constexpr unsigned IDLE_PARTITION = 0x2000;
+
 /**
 * Get idle names
 */
--- a/src/Instance.cxx
+++ b/src/Instance.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -23,8 +23,16 @@
 #include "Idle.hxx"
 #include "Stats.hxx"

+#ifdef ENABLE_CURL
+#include "RemoteTagCache.hxx"
+#include "util/UriUtil.hxx"
+#endif
+
 #ifdef ENABLE_DATABASE
 #include "db/DatabaseError.hxx"
+#include "db/Interface.hxx"
+#include "db/update/Service.hxx"
+#include "storage/StorageInterface.hxx"

 #ifdef ENABLE_SQLITE
 #include "sticker/StickerDatabase.hxx"
@@ -32,7 +40,40 @@
 #endif
 #endif

-#include <stdexcept>
+#include <exception>
+
+Instance::Instance()
+	:rtio_thread(true),
+#ifdef ENABLE_SYSTEMD_DAEMON
+	 systemd_watchdog(event_loop),
+#endif
+	 idle_monitor(event_loop, BIND_THIS_METHOD(OnIdle))
+{
+}
+
+Instance::~Instance() noexcept
+{
+#ifdef ENABLE_DATABASE
+	delete update;
+
+	if (database != nullptr) {
+		database->Close();
+		database.reset();
+	}
+
+	delete storage;
+#endif
+}
+
+Partition *
+Instance::FindPartition(const char *name) noexcept
+{
+	for (auto &partition : partitions)
+		if (partition.name == name)
+			return &partition;
+
+	return nullptr;
+}

 #ifdef ENABLE_DATABASE

@@ -54,7 +95,9 @@ Instance::OnDatabaseModified()
 	/* propagate the change to all subsystems */

 	stats_invalidate();
-	partition->DatabaseModified(*database);
+
+	for (auto &partition : partitions)
+		partition.DatabaseModified(*database);
 }

 void
@@ -67,12 +110,13 @@ Instance::OnDatabaseSongRemoved(const char *uri)
 	if (sticker_enabled()) {
 		try {
 			sticker_song_delete(uri);
-		} catch (const std::runtime_error &) {
+		} catch (...) {
 		}
 	}
 #endif

-	partition->StaleSong(uri);
+	for (auto &partition : partitions)
+		partition.StaleSong(uri);
 }

 #endif
@@ -80,15 +124,45 @@ Instance::OnDatabaseSongRemoved(const char *uri)
 #ifdef ENABLE_NEIGHBOR_PLUGINS

 void
-Instance::FoundNeighbor(gcc_unused const NeighborInfo &info)
+Instance::FoundNeighbor(gcc_unused const NeighborInfo &info) noexcept
 {
-	partition->EmitIdle(IDLE_NEIGHBOR);
+	for (auto &partition : partitions)
+		partition.EmitIdle(IDLE_NEIGHBOR);
 }

 void
-Instance::LostNeighbor(gcc_unused const NeighborInfo &info)
+Instance::LostNeighbor(gcc_unused const NeighborInfo &info) noexcept
 {
-	partition->EmitIdle(IDLE_NEIGHBOR);
+	for (auto &partition : partitions)
+		partition.EmitIdle(IDLE_NEIGHBOR);
+}
+
+#endif
+
+#ifdef ENABLE_CURL
+
+void
+Instance::LookupRemoteTag(const char *uri) noexcept
+{
+	if (!uri_has_scheme(uri))
+		return;
+
+	if (!remote_tag_cache)
+		remote_tag_cache = std::make_unique<RemoteTagCache>(event_loop,
+								    *this);
+
+	remote_tag_cache->Lookup(uri);
+}
+
+void
+Instance::OnRemoteTag(const char *uri, const Tag &tag) noexcept
+{
+	if (!tag.IsDefined())
+		/* boring */
+		return;
+
+	for (auto &partition : partitions)
+		partition.TagModified(uri, tag);
 }

 #endif
--- a/src/Instance.hxx
+++ b/src/Instance.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -20,10 +20,19 @@
 #ifndef MPD_INSTANCE_HXX
 #define MPD_INSTANCE_HXX

-#include "check.h"
+#include "config.h"
 #include "event/Loop.hxx"
+#include "event/Thread.hxx"
 #include "event/MaskMonitor.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"
+
+#ifdef ENABLE_SYSTEMD_DAEMON
+#include "lib/systemd/Watchdog.hxx"
+#endif
+
+#ifdef ENABLE_CURL
+#include "RemoteTagCacheHandler.hxx"
+#endif

 #ifdef ENABLE_NEIGHBOR_PLUGINS
 #include "neighbor/Listener.hxx"
@@ -32,14 +41,18 @@ class NeighborGlue;

 #ifdef ENABLE_DATABASE
 #include "db/DatabaseListener.hxx"
-class Database;
+#include "db/Ptr.hxx"
 class Storage;
 class UpdateService;
 #endif

+#include <memory>
+#include <list>
+
 class ClientList;
 struct Partition;
 class StateFile;
+class RemoteTagCache;

 /**
 * A utility class which, when used as the first base class, ensures
@@ -63,7 +76,27 @@ struct Instance final
 #ifdef ENABLE_NEIGHBOR_PLUGINS
 	public NeighborListener
 #endif
+#ifdef ENABLE_CURL
+	, public RemoteTagCacheHandler
+#endif
 {
+	/**
+	 * A thread running an #EventLoop for non-blocking (bulk) I/O.
+	 */
+	EventThread io_thread;
+
+	/**
+	 * Another thread running an #EventLoop for non-blocking
+	 * (real-time) I/O.  This is used instead of #io_thread for
+	 * events which require low latency, e.g. for filling hardware
+	 * ring buffers.
+	 */
+	EventThread rtio_thread;
+
+#ifdef ENABLE_SYSTEMD_DAEMON
+	Systemd::Watchdog systemd_watchdog;
+#endif
+
 	MaskMonitor idle_monitor;

 #ifdef ENABLE_NEIGHBOR_PLUGINS
@@ -71,7 +104,7 @@ struct Instance final
 #endif

 #ifdef ENABLE_DATABASE
-	Database *database;
+	DatabasePtr database;

 	/**
 	 * This is really a #CompositeStorage.  To avoid heavy include
@@ -82,19 +115,23 @@ struct Instance final
 	UpdateService *update = nullptr;
 #endif

+#ifdef ENABLE_CURL
+	std::unique_ptr<RemoteTagCache> remote_tag_cache;
+#endif
+
 	ClientList *client_list;

-	Partition *partition;
+	std::list<Partition> partitions;

-	StateFile *state_file;
+	StateFile *state_file = nullptr;

-	Instance()
-		:idle_monitor(event_loop, BIND_THIS_METHOD(OnIdle)), state_file(nullptr) {}
+	Instance();
+	~Instance() noexcept;

 	/**
-	 * Initiate shutdown.  Wrapper for EventLoop::Break().
+	 * Wrapper for EventLoop::Break().  Call to initiate shutdown.
 	 */
-	void Shutdown() {
+	void Break() {
 		event_loop.Break();
 	}

@@ -102,6 +139,15 @@ struct Instance final
 		idle_monitor.OrMask(mask);
 	}

+	/**
+	 * Find a #Partition with the given name.  Returns nullptr if
+	 * no such partition was found.
+	 */
+	gcc_pure
+	Partition *FindPartition(const char *name) noexcept;
+
+	void BeginShutdownPartitions() noexcept;
+
 #ifdef ENABLE_DATABASE
 	/**
 	 * Returns the global #Database instance.  May return nullptr
@@ -109,7 +155,7 @@ struct Instance final
 	 * music_directory was configured).
 	 */
 	Database *GetDatabase() {
-		return database;
+		return database.get();
 	}

 	/**
@@ -120,6 +166,16 @@ struct Instance final
 	const Database &GetDatabaseOrThrow() const;
 #endif

+	void BeginShutdownUpdate() noexcept;
+
+#ifdef ENABLE_CURL
+	void LookupRemoteTag(const char *uri) noexcept;
+#else
+	void LookupRemoteTag(const char *) noexcept {
+		/* no-op */
+	}
+#endif
+
 private:
 #ifdef ENABLE_DATABASE
 	void OnDatabaseModified() override;
@@ -128,8 +184,13 @@ private:

 #ifdef ENABLE_NEIGHBOR_PLUGINS
 	/* virtual methods from class NeighborListener */
-	void FoundNeighbor(const NeighborInfo &info) override;
-	void LostNeighbor(const NeighborInfo &info) override;
+	void FoundNeighbor(const NeighborInfo &info) noexcept override;
+	void LostNeighbor(const NeighborInfo &info) noexcept override;
+#endif
+
+#ifdef ENABLE_CURL
+	/* virtual methods from class RemoteTagCacheHandler */
+	void OnRemoteTag(const char *uri, const Tag &tag) noexcept override;
 #endif

 	/* callback for #idle_monitor */
--- a/src/Listen.cxx
+++ b/src/Listen.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -19,18 +19,21 @@

 #include "config.h"
 #include "Listen.hxx"
-#include "client/Client.hxx"
+#include "Log.hxx"
+#include "client/Listener.hxx"
 #include "config/Param.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
-#include "net/SocketAddress.hxx"
-#include "event/ServerSocket.hxx"
+#include "config/Data.hxx"
+#include "config/Option.hxx"
+#include "config/Net.hxx"
+#include "net/AllocatedSocketAddress.hxx"
+#include "net/UniqueSocketDescriptor.hxx"
+#include "net/SocketUtil.hxx"
 #include "system/Error.hxx"
 #include "util/RuntimeError.hxx"
-#include "util/Domain.hxx"
 #include "fs/AllocatedPath.hxx"
-#include "Log.hxx"
+#include "fs/XDG.hxx"

+#include <sys/stat.h>
 #include <string.h>
 #include <assert.h>

@@ -38,49 +41,14 @@
 #include <systemd/sd-daemon.h>
 #endif

-static constexpr Domain listen_domain("listen");
-
 #define DEFAULT_PORT	6600

-class ClientListener final : public ServerSocket {
-	Partition &partition;
-
-public:
-	ClientListener(EventLoop &_loop, Partition &_partition)
-		:ServerSocket(_loop), partition(_partition) {}
-
-private:
-	void OnAccept(int fd, SocketAddress address, int uid) override {
-		client_new(GetEventLoop(), partition,
-			   fd, address, uid);
-	}
-};
-
-static ClientListener *listen_socket;
 int listen_port;

-/**
- * Throws #std::runtime_error on error.
- */
-static void
-listen_add_config_param(unsigned int port,
-			const ConfigParam *param)
-{
-	assert(param != nullptr);
-
-	if (0 == strcmp(param->value.c_str(), "any")) {
-		listen_socket->AddPort(port);
-	} else if (param->value[0] == '/' || param->value[0] == '~') {
-		listen_socket->AddPath(param->GetPath());
-	} else {
-		listen_socket->AddHost(param->value.c_str(), port);
-	}
-}
-
 #ifdef ENABLE_SYSTEMD_DAEMON

 static bool
-listen_systemd_activation()
+listen_systemd_activation(ClientListener &listener)
 {
 	int n = sd_listen_fds(true);
 	if (n <= 0) {
@@ -91,67 +59,103 @@ listen_systemd_activation()

 	for (int i = SD_LISTEN_FDS_START, end = SD_LISTEN_FDS_START + n;
 	     i != end; ++i)
-		listen_socket->AddFD(i);
+		listener.AddFD(UniqueSocketDescriptor(i));

 	return true;
 }

 #endif

-void
-listen_global_init(EventLoop &loop, Partition &partition)
+/**
+ * Listen on "$XDG_RUNTIME_DIR/mpd/socket" (if applicable).
+ *
+ * @return true if a listener socket was added
+ */
+static bool
+ListenXdgRuntimeDir(ClientListener &listener) noexcept
 {
-	int port = config_get_positive(ConfigOption::PORT, DEFAULT_PORT);
-	const auto *param = config_get_param(ConfigOption::BIND_TO_ADDRESS);
+#if defined(USE_XDG) && defined(HAVE_UN)
+	if (geteuid() == 0)
+		/* this MPD instance is a system-wide daemon; don't
+		   use $XDG_RUNTIME_DIR */
+		return false;

-	listen_socket = new ClientListener(loop, partition);
+	Path xdg_runtime_dir = Path::FromFS(getenv("XDG_RUNTIME_DIR"));
+	if (xdg_runtime_dir.IsNull())
+		return false;
+
+	const auto mpd_runtime_dir = xdg_runtime_dir / Path::FromFS("mpd");
+	mkdir(mpd_runtime_dir.c_str(), 0700);
+
+	const auto socket_path = mpd_runtime_dir / Path::FromFS("socket");
+	unlink(socket_path.c_str());
+
+	AllocatedSocketAddress address;
+	address.SetLocal(socket_path.c_str());
+
+	try {
+		auto fd = socket_bind_listen(AF_LOCAL, SOCK_STREAM, 0,
+					     address, 5);
+		chmod(socket_path.c_str(), 0600);
+		listener.AddFD(std::move(fd), std::move(address));
+		return true;
+	} catch (...) {
+		FormatError(std::current_exception(),
+			    "Failed to listen on '%s' (not fatal)",
+			    socket_path.c_str());
+		return false;
+	}
+#else
+	(void)listener;
+	return false;
+#endif
+}
+
+void
+listen_global_init(const ConfigData &config, ClientListener &listener)
+{
+	int port = config.GetPositive(ConfigOption::PORT, DEFAULT_PORT);

 #ifdef ENABLE_SYSTEMD_DAEMON
-	if (listen_systemd_activation())
+	if (listen_systemd_activation(listener))
 		return;
 #endif

-	if (param != nullptr) {
-		/* "bind_to_address" is configured, create listeners
-		   for all values */
+	for (const auto &param : config.GetParamList(ConfigOption::BIND_TO_ADDRESS)) {
+		try {
+			ServerSocketAddGeneric(listener, param.value.c_str(),
+					       port);
+		} catch (...) {
+			std::throw_with_nested(FormatRuntimeError("Failed to listen on %s (line %i)",
+								  param.value.c_str(),
+								  param.line));
+		}
+	}

-		do {
-			try {
-				listen_add_config_param(port, param);
-			} catch (const std::runtime_error &e) {
-				delete listen_socket;
-				std::throw_with_nested(FormatRuntimeError("Failed to listen on %s (line %i)",
-									  param->value.c_str(),
-									  param->line));
-			}
-		} while ((param = param->next) != nullptr);
-	} else {
+	bool have_xdg_runtime_listener = false;
+
+	if (listener.IsEmpty()) {
 		/* no "bind_to_address" configured, bind the
 		   configured port on all interfaces */

+		have_xdg_runtime_listener = ListenXdgRuntimeDir(listener);
+
 		try {
-			listen_socket->AddPort(port);
-		} catch (const std::runtime_error &e) {
-			delete listen_socket;
+			listener.AddPort(port);
+		} catch (...) {
 			std::throw_with_nested(FormatRuntimeError("Failed to listen on *:%d: ", port));
 		}
 	}

 	try {
-		listen_socket->Open();
-	} catch (const std::runtime_error &e) {
-		delete listen_socket;
-		throw;
+		listener.Open();
+	} catch (...) {
+		if (have_xdg_runtime_listener)
+			LogError(std::current_exception(),
+				 "Default TCP listener setup failed, but this is okay because we have a $XDG_RUNTIME_DIR listener");
+		else
+			throw;
 	}

 	listen_port = port;
 }
-
-void listen_global_finish(void)
-{
-	LogDebug(listen_domain, "listen_global_finish called");
-
-	assert(listen_socket != nullptr);
-
-	delete listen_socket;
-}
--- a/src/Listen.hxx
+++ b/src/Listen.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -20,15 +20,12 @@
 #ifndef MPD_LISTEN_HXX
 #define MPD_LISTEN_HXX

-class EventLoop;
-struct Partition;
+struct ConfigData;
+class ClientListener;

 extern int listen_port;

 void
-listen_global_init(EventLoop &loop, Partition &partition);
-
-void
-listen_global_finish();
+listen_global_init(const ConfigData &config, ClientListener &listener);

 #endif
--- a/src/LocateUri.cxx
+++ b/src/LocateUri.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -55,14 +55,26 @@ LocateFileUri(const char *uri, const Client *client
 }

 static LocatedUri
-LocateAbsoluteUri(const char *uri
+LocateAbsoluteUri(UriPluginKind kind, const char *uri
 #ifdef ENABLE_DATABASE
 		  , const Storage *storage
 #endif
 		  )
 {
-	if (!uri_supported_scheme(uri))
-		throw std::runtime_error("Unsupported URI scheme");
+	switch (kind) {
+	case UriPluginKind::INPUT:
+	case UriPluginKind::STORAGE: // TODO: separate check for storage plugins
+		if (!uri_supported_scheme(uri))
+			throw std::runtime_error("Unsupported URI scheme");
+		break;
+
+	case UriPluginKind::PLAYLIST:
+		/* for now, no validation for playlist URIs; this is
+		   more complicated because there are three ways to
+		   identify which plugin to use: URI scheme, filename
+		   suffix and MIME type */
+		break;
+	}

 #ifdef ENABLE_DATABASE
 	if (storage != nullptr) {
@@ -76,7 +88,8 @@ LocateAbsoluteUri(const char *uri
 }

 LocatedUri
-LocateUri(const char *uri, const Client *client
+LocateUri(UriPluginKind kind,
+	  const char *uri, const Client *client
 #ifdef ENABLE_DATABASE
 	  , const Storage *storage
 #endif
@@ -100,7 +113,7 @@ LocateUri(const char *uri, const Client *client
 #endif
 				     );
 	else if (uri_has_scheme(uri))
-		return LocateAbsoluteUri(uri
+		return LocateAbsoluteUri(kind, uri
 #ifdef ENABLE_DATABASE
 					 , storage
 #endif
--- a/src/LocateUri.hxx
+++ b/src/LocateUri.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -20,8 +20,8 @@
 #ifndef MPD_LOCATE_URI_HXX
 #define MPD_LOCATE_URI_HXX

-#include "check.h"
-#include "Compiler.h"
+#include "config.h"
+#include "util/Compiler.h"
 #include "fs/AllocatedPath.hxx"

 #ifdef _WIN32
@@ -41,6 +41,12 @@ class Client;
 class Storage;
 #endif

+enum class UriPluginKind {
+	INPUT,
+	STORAGE,
+	PLAYLIST,
+};
+
 struct LocatedUri {
 	enum class Type {
 		/**
@@ -67,7 +73,7 @@ struct LocatedUri {
 	AllocatedPath path;

 	LocatedUri(Type _type, const char *_uri,
-		   AllocatedPath &&_path=AllocatedPath::Null())
+		   AllocatedPath &&_path=nullptr)
 		:type(_type), canonical_uri(_uri), path(std::move(_path)) {}
 };

@@ -84,7 +90,8 @@ struct LocatedUri {
 * that feature is disabled if this parameter is nullptr
 */
 LocatedUri
-LocateUri(const char *uri, const Client *client
+LocateUri(UriPluginKind kind,
+	  const char *uri, const Client *client
 #ifdef ENABLE_DATABASE
 	  , const Storage *storage
 #endif
--- a/src/Log.cxx
+++ b/src/Log.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "LogV.hxx"
 #include "util/Domain.hxx"

@@ -30,7 +29,8 @@
 static constexpr Domain exception_domain("exception");

 void
-LogFormatV(const Domain &domain, LogLevel level, const char *fmt, va_list ap)
+LogFormatV(const Domain &domain, LogLevel level,
+	   const char *fmt, va_list ap) noexcept
 {
 	char msg[1024];
 	vsnprintf(msg, sizeof(msg), fmt, ap);
@@ -38,7 +38,7 @@ LogFormatV(const Domain &domain, LogLevel level, const char *fmt, va_list ap)
 }

 void
-LogFormat(const Domain &domain, LogLevel level, const char *fmt, ...)
+LogFormat(const Domain &domain, LogLevel level, const char *fmt, ...) noexcept
 {
 	va_list ap;
 	va_start(ap, fmt);
@@ -47,7 +47,7 @@ LogFormat(const Domain &domain, LogLevel level, const char *fmt, ...)
 }

 void
-FormatDebug(const Domain &domain, const char *fmt, ...)
+FormatDebug(const Domain &domain, const char *fmt, ...) noexcept
 {
 	va_list ap;
 	va_start(ap, fmt);
@@ -56,7 +56,7 @@ FormatDebug(const Domain &domain, const char *fmt, ...)
 }

 void
-FormatInfo(const Domain &domain, const char *fmt, ...)
+FormatInfo(const Domain &domain, const char *fmt, ...) noexcept
 {
 	va_list ap;
 	va_start(ap, fmt);
@@ -65,7 +65,7 @@ FormatInfo(const Domain &domain, const char *fmt, ...)
 }

 void
-FormatDefault(const Domain &domain, const char *fmt, ...)
+FormatDefault(const Domain &domain, const char *fmt, ...) noexcept
 {
 	va_list ap;
 	va_start(ap, fmt);
@@ -74,7 +74,7 @@ FormatDefault(const Domain &domain, const char *fmt, ...)
 }

 void
-FormatWarning(const Domain &domain, const char *fmt, ...)
+FormatWarning(const Domain &domain, const char *fmt, ...) noexcept
 {
 	va_list ap;
 	va_start(ap, fmt);
@@ -83,7 +83,7 @@ FormatWarning(const Domain &domain, const char *fmt, ...)
 }

 void
-FormatError(const Domain &domain, const char *fmt, ...)
+FormatError(const Domain &domain, const char *fmt, ...) noexcept
 {
 	va_list ap;
 	va_start(ap, fmt);
@@ -92,7 +92,7 @@ FormatError(const Domain &domain, const char *fmt, ...)
 }

 void
-LogError(const std::exception &e)
+LogError(const std::exception &e) noexcept
 {
 	Log(exception_domain, LogLevel::ERROR, e.what());

@@ -107,7 +107,7 @@ LogError(const std::exception &e)
 }

 void
-LogError(const std::exception &e, const char *msg)
+LogError(const std::exception &e, const char *msg) noexcept
 {
 	FormatError(exception_domain, "%s: %s", msg, e.what());

@@ -122,7 +122,7 @@ LogError(const std::exception &e, const char *msg)
 }

 void
-FormatError(const std::exception &e, const char *fmt, ...)
+FormatError(const std::exception &e, const char *fmt, ...) noexcept
 {
 	char msg[1024];
 	va_list ap;
@@ -134,7 +134,7 @@ FormatError(const std::exception &e, const char *fmt, ...)
 }

 void
-LogError(const std::exception_ptr &ep)
+LogError(const std::exception_ptr &ep) noexcept
 {
 	try {
 		std::rethrow_exception(ep);
@@ -147,7 +147,7 @@ LogError(const std::exception_ptr &ep)
 }

 void
-LogError(const std::exception_ptr &ep, const char *msg)
+LogError(const std::exception_ptr &ep, const char *msg) noexcept
 {
 	try {
 		std::rethrow_exception(ep);
@@ -160,7 +160,7 @@ LogError(const std::exception_ptr &ep, const char *msg)
 }

 void
-FormatError(const std::exception_ptr &ep, const char *fmt, ...)
+FormatError(const std::exception_ptr &ep, const char *fmt, ...) noexcept
 {
 	char msg[1024];
 	va_list ap;
@@ -172,19 +172,19 @@ FormatError(const std::exception_ptr &ep, const char *fmt, ...)
 }

 void
-LogErrno(const Domain &domain, int e, const char *msg)
+LogErrno(const Domain &domain, int e, const char *msg) noexcept
 {
 	LogFormat(domain, LogLevel::ERROR, "%s: %s", msg, strerror(e));
 }

 void
-LogErrno(const Domain &domain, const char *msg)
+LogErrno(const Domain &domain, const char *msg) noexcept
 {
 	LogErrno(domain, errno, msg);
 }

 static void
-FormatErrnoV(const Domain &domain, int e, const char *fmt, va_list ap)
+FormatErrnoV(const Domain &domain, int e, const char *fmt, va_list ap) noexcept
 {
 	char msg[1024];
 	vsnprintf(msg, sizeof(msg), fmt, ap);
@@ -193,7 +193,7 @@ FormatErrnoV(const Domain &domain, int e, const char *fmt, va_list ap)
 }

 void
-FormatErrno(const Domain &domain, int e, const char *fmt, ...)
+FormatErrno(const Domain &domain, int e, const char *fmt, ...) noexcept
 {
 	va_list ap;
 	va_start(ap, fmt);
@@ -202,7 +202,7 @@ FormatErrno(const Domain &domain, int e, const char *fmt, ...)
 }

 void
-FormatErrno(const Domain &domain, const char *fmt, ...)
+FormatErrno(const Domain &domain, const char *fmt, ...) noexcept
 {
 	const int e = errno;

--- a/src/Log.hxx
+++ b/src/Log.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -21,101 +21,101 @@
 #define MPD_LOG_HXX

 #include "LogLevel.hxx"
-#include "Compiler.h"
+#include "util/Compiler.h"

 #include <exception>

 class Domain;

 void
-Log(const Domain &domain, LogLevel level, const char *msg);
+Log(const Domain &domain, LogLevel level, const char *msg) noexcept;

 gcc_printf(3,4)
 void
-LogFormat(const Domain &domain, LogLevel level, const char *fmt, ...);
+LogFormat(const Domain &domain, LogLevel level, const char *fmt, ...) noexcept;

 static inline void
-LogDebug(const Domain &domain, const char *msg)
+LogDebug(const Domain &domain, const char *msg) noexcept
 {
 	Log(domain, LogLevel::DEBUG, msg);
 }

 gcc_printf(2,3)
 void
-FormatDebug(const Domain &domain, const char *fmt, ...);
+FormatDebug(const Domain &domain, const char *fmt, ...) noexcept;

 static inline void
-LogInfo(const Domain &domain, const char *msg)
+LogInfo(const Domain &domain, const char *msg) noexcept
 {
 	Log(domain, LogLevel::INFO, msg);
 }

 gcc_printf(2,3)
 void
-FormatInfo(const Domain &domain, const char *fmt, ...);
+FormatInfo(const Domain &domain, const char *fmt, ...) noexcept;

 static inline void
-LogDefault(const Domain &domain, const char *msg)
+LogDefault(const Domain &domain, const char *msg) noexcept
 {
 	Log(domain, LogLevel::DEFAULT, msg);
 }

 gcc_printf(2,3)
 void
-FormatDefault(const Domain &domain, const char *fmt, ...);
+FormatDefault(const Domain &domain, const char *fmt, ...) noexcept;

 static inline void
-LogWarning(const Domain &domain, const char *msg)
+LogWarning(const Domain &domain, const char *msg) noexcept
 {
 	Log(domain, LogLevel::WARNING, msg);
 }

 gcc_printf(2,3)
 void
-FormatWarning(const Domain &domain, const char *fmt, ...);
+FormatWarning(const Domain &domain, const char *fmt, ...) noexcept;

 static inline void
-LogError(const Domain &domain, const char *msg)
+LogError(const Domain &domain, const char *msg) noexcept
 {
 	Log(domain, LogLevel::ERROR, msg);
 }

 void
-LogError(const std::exception &e);
+LogError(const std::exception &e) noexcept;

 void
-LogError(const std::exception &e, const char *msg);
+LogError(const std::exception &e, const char *msg) noexcept;

 gcc_printf(2,3)
 void
-FormatError(const std::exception &e, const char *fmt, ...);
+FormatError(const std::exception &e, const char *fmt, ...) noexcept;

 void
-LogError(const std::exception_ptr &ep);
+LogError(const std::exception_ptr &ep) noexcept;

 void
-LogError(const std::exception_ptr &ep, const char *msg);
+LogError(const std::exception_ptr &ep, const char *msg) noexcept;

 gcc_printf(2,3)
 void
-FormatError(const std::exception_ptr &ep, const char *fmt, ...);
+FormatError(const std::exception_ptr &ep, const char *fmt, ...) noexcept;

 gcc_printf(2,3)
 void
-FormatError(const Domain &domain, const char *fmt, ...);
+FormatError(const Domain &domain, const char *fmt, ...) noexcept;

 void
-LogErrno(const Domain &domain, int e, const char *msg);
+LogErrno(const Domain &domain, int e, const char *msg) noexcept;

 void
-LogErrno(const Domain &domain, const char *msg);
+LogErrno(const Domain &domain, const char *msg) noexcept;

 gcc_printf(3,4)
 void
-FormatErrno(const Domain &domain, int e, const char *fmt, ...);
+FormatErrno(const Domain &domain, int e, const char *fmt, ...) noexcept;

 gcc_printf(2,3)
 void
-FormatErrno(const Domain &domain, const char *fmt, ...);
+FormatErrno(const Domain &domain, const char *fmt, ...) noexcept;

 #endif /* LOG_H */
--- a/src/LogBackend.cxx
+++ b/src/LogBackend.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -17,11 +17,11 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "LogBackend.hxx"
 #include "Log.hxx"
 #include "util/Domain.hxx"
-#include "util/StringUtil.hxx"
+#include "util/StringStrip.hxx"
+#include "config.h"

 #include <assert.h>
 #include <stdio.h>
@@ -38,7 +38,7 @@
 #include "Main.hxx"

 static int
-ToAndroidLogLevel(LogLevel log_level)
+ToAndroidLogLevel(LogLevel log_level) noexcept
 {
 	switch (log_level) {
 	case LogLevel::DEBUG:
@@ -70,13 +70,13 @@ static bool enable_syslog;
 #endif

 void
-SetLogThreshold(LogLevel _threshold)
+SetLogThreshold(LogLevel _threshold) noexcept
 {
 	log_threshold = _threshold;
 }

 void
-EnableLogTimestamp()
+EnableLogTimestamp() noexcept
 {
 #ifdef HAVE_SYSLOG
 	assert(!enable_syslog);
@@ -86,7 +86,8 @@ EnableLogTimestamp()
 	enable_timestamp = true;
 }

-static const char *log_date(void)
+static const char *
+log_date() noexcept
 {
 	static constexpr size_t LOG_DATE_BUF_SIZE = 16;
 	static char buf[LOG_DATE_BUF_SIZE];
@@ -100,7 +101,7 @@ static const char *log_date(void)
 * characters.
 */
 static int
-chomp_length(const char *p)
+chomp_length(const char *p) noexcept
 {
 	size_t length = strlen(p);
 	return StripRight(p, length);
@@ -108,8 +109,9 @@ chomp_length(const char *p)

 #ifdef HAVE_SYSLOG

+gcc_const
 static int
-ToSysLogLevel(LogLevel log_level)
+ToSysLogLevel(LogLevel log_level) noexcept
 {
 	switch (log_level) {
 	case LogLevel::DEBUG:
@@ -133,7 +135,7 @@ ToSysLogLevel(LogLevel log_level)
 }

 static void
-SysLog(const Domain &domain, LogLevel log_level, const char *message)
+SysLog(const Domain &domain, LogLevel log_level, const char *message) noexcept
 {
 	syslog(ToSysLogLevel(log_level), "%s: %.*s",
 	       domain.GetName(),
@@ -141,14 +143,14 @@ SysLog(const Domain &domain, LogLevel log_level, const char *message)
 }

 void
-LogInitSysLog()
+LogInitSysLog() noexcept
 {
 	openlog(PACKAGE, 0, LOG_DAEMON);
 	enable_syslog = true;
 }

 void
-LogFinishSysLog()
+LogFinishSysLog() noexcept
 {
 	if (enable_syslog)
 		closelog();
@@ -157,7 +159,7 @@ LogFinishSysLog()
 #endif

 static void
-FileLog(const Domain &domain, const char *message)
+FileLog(const Domain &domain, const char *message) noexcept
 {
 	fprintf(stderr, "%s%s: %.*s\n",
 		enable_timestamp ? log_date() : "",
@@ -174,7 +176,7 @@ FileLog(const Domain &domain, const char *message)
 #endif /* !ANDROID */

 void
-Log(const Domain &domain, LogLevel level, const char *msg)
+Log(const Domain &domain, LogLevel level, const char *msg) noexcept
 {
 #ifdef ANDROID
 	__android_log_print(ToAndroidLogLevel(level), "MPD",
--- a/src/LogBackend.hxx
+++ b/src/LogBackend.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -20,19 +20,18 @@
 #ifndef MPD_LOG_BACKEND_HXX
 #define MPD_LOG_BACKEND_HXX

-#include "check.h"
 #include "LogLevel.hxx"

 void
-SetLogThreshold(LogLevel _threshold);
+SetLogThreshold(LogLevel _threshold) noexcept;

 void
-EnableLogTimestamp();
+EnableLogTimestamp() noexcept;

 void
-LogInitSysLog();
+LogInitSysLog() noexcept;

 void
-LogFinishSysLog();
+LogFinishSysLog() noexcept;

 #endif /* LOG_H */
--- a/src/LogInit.cxx
+++ b/src/LogInit.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -22,14 +22,18 @@
 #include "LogBackend.hxx"
 #include "Log.hxx"
 #include "config/Param.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
+#include "config/Data.hxx"
+#include "config/Option.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/FileSystem.hxx"
 #include "util/Domain.hxx"
 #include "util/RuntimeError.hxx"
 #include "system/Error.hxx"

+#ifdef ENABLE_SYSTEMD_DAEMON
+#include <systemd/sd-daemon.h>
+#endif
+
 #include <assert.h>
 #include <string.h>
 #include <fcntl.h>
@@ -41,12 +45,13 @@
 #define LOG_DATE_BUF_SIZE 16
 #define LOG_DATE_LEN (LOG_DATE_BUF_SIZE - 1)

+gcc_unused
 static constexpr Domain log_domain("log");

 #ifndef ANDROID

 static int out_fd = -1;
-static AllocatedPath out_path = AllocatedPath::Null();
+static AllocatedPath out_path = nullptr;

 static void redirect_logs(int fd)
 {
@@ -62,7 +67,7 @@ open_log_file(void)
 {
 	assert(!out_path.IsNull());

-	return OpenFile(out_path, O_CREAT | O_WRONLY | O_APPEND, 0666);
+	return OpenFile(out_path, O_CREAT | O_WRONLY | O_APPEND, 0666).Steal();
 }

 static void
@@ -104,7 +109,7 @@ parse_log_level(const char *value, int line)
 #endif

 void
-log_early_init(bool verbose)
+log_early_init(bool verbose) noexcept
 {
 #ifdef ANDROID
 	(void)verbose;
@@ -118,25 +123,36 @@ log_early_init(bool verbose)
 }

 void
-log_init(bool verbose, bool use_stdout)
+log_init(const ConfigData &config, bool verbose, bool use_stdout)
 {
 #ifdef ANDROID
+	(void)config;
 	(void)verbose;
 	(void)use_stdout;
 #else
 	if (verbose)
 		SetLogThreshold(LogLevel::DEBUG);
-	else if (const auto &param = config_get_param(ConfigOption::LOG_LEVEL))
+	else if (const auto &param = config.GetParam(ConfigOption::LOG_LEVEL))
 		SetLogThreshold(parse_log_level(param->value.c_str(),
 						param->line));

 	if (use_stdout) {
 		out_fd = STDOUT_FILENO;
 	} else {
-		const auto *param = config_get_param(ConfigOption::LOG_FILE);
+		const auto *param = config.GetParam(ConfigOption::LOG_FILE);
 		if (param == nullptr) {
 			/* no configuration: default to syslog (if
 			   available) */
+#ifdef ENABLE_SYSTEMD_DAEMON
+			if (sd_booted() &&
+			    getenv("NOTIFY_SOCKET") != nullptr) {
+				/* if MPD was started as a systemd
+				   service, default to journal (which
+				   is connected to fd=2) */
+				out_fd = STDOUT_FILENO;
+				return;
+			}
+#endif
 #ifndef HAVE_SYSLOG
 			throw std::runtime_error("config parameter 'log_file' not found");
 #endif
@@ -155,7 +171,7 @@ log_init(bool verbose, bool use_stdout)
 #ifndef ANDROID

 static void
-close_log_files(void)
+close_log_files() noexcept
 {
 #ifdef HAVE_SYSLOG
 	LogFinishSysLog();
@@ -165,11 +181,11 @@ close_log_files(void)
 #endif

 void
-log_deinit(void)
+log_deinit() noexcept
 {
 #ifndef ANDROID
 	close_log_files();
-	out_path = AllocatedPath::Null();
+	out_path = nullptr;
 #endif
 }

@@ -197,7 +213,8 @@ void setup_log_output()
 #endif
 }

-int cycle_log_files(void)
+int
+cycle_log_files() noexcept
 {
 #ifdef ANDROID
 	return 0;
--- a/src/LogInit.hxx
+++ b/src/LogInit.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -20,6 +20,8 @@
 #ifndef MPD_LOG_INIT_HXX
 #define MPD_LOG_INIT_HXX

+struct ConfigData;
+
 /**
 * Configure a logging destination for daemon startup, before the
 * configuration file is read.  This allows the daemon to use the
@@ -29,21 +31,21 @@
 * @param verbose true when the program is started with --verbose
 */
 void
-log_early_init(bool verbose);
+log_early_init(bool verbose) noexcept;

 /**
 * Throws #std::runtime_error on error.
 */
 void
-log_init(bool verbose, bool use_stdout);
+log_init(const ConfigData &config, bool verbose, bool use_stdout);

 void
-log_deinit();
+log_deinit() noexcept;

 void
 setup_log_output();

 int
-cycle_log_files();
+cycle_log_files() noexcept;

 #endif /* LOG_H */
--- a/src/LogLevel.hxx
+++ b/src/LogLevel.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
--- a/src/LogV.hxx
+++ b/src/LogV.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -25,6 +25,7 @@
 #include <stdarg.h>

 void
-LogFormatV(const Domain &domain, LogLevel level, const char *fmt, va_list ap);
+LogFormatV(const Domain &domain, LogLevel level,
+	   const char *fmt, va_list ap) noexcept;

 #endif /* LOG_H */
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -24,22 +24,21 @@
 #include "PlaylistFile.hxx"
 #include "MusicChunk.hxx"
 #include "StateFile.hxx"
-#include "player/Thread.hxx"
 #include "Mapper.hxx"
 #include "Permission.hxx"
 #include "Listen.hxx"
+#include "client/Listener.hxx"
 #include "client/Client.hxx"
 #include "client/ClientList.hxx"
 #include "command/AllCommands.hxx"
 #include "Partition.hxx"
-#include "tag/TagConfig.hxx"
+#include "tag/Config.hxx"
 #include "ReplayGainGlobal.hxx"
 #include "Idle.hxx"
 #include "Log.hxx"
 #include "LogInit.hxx"
 #include "input/Init.hxx"
 #include "event/Loop.hxx"
-#include "IOThread.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/Config.hxx"
 #include "playlist/PlaylistRegistry.hxx"
@@ -48,16 +47,19 @@
 #include "AudioParser.hxx"
 #include "pcm/PcmConvert.hxx"
 #include "unix/SignalHandlers.hxx"
-#include "system/FatalError.hxx"
 #include "thread/Slack.hxx"
 #include "net/Init.hxx"
 #include "lib/icu/Init.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/File.hxx"
+#include "config/Check.hxx"
+#include "config/Data.hxx"
 #include "config/Param.hxx"
-#include "config/ConfigDefaults.hxx"
-#include "config/ConfigOption.hxx"
-#include "config/ConfigError.hxx"
+#include "config/Path.hxx"
+#include "config/Defaults.hxx"
+#include "config/Option.hxx"
+#include "config/Domain.hxx"
 #include "util/RuntimeError.hxx"
+#include "util/ScopeExit.hxx"

 #ifdef ENABLE_DAEMON
 #include "unix/Daemon.hxx"
@@ -93,11 +95,14 @@
 #include "android/Environment.hxx"
 #include "android/Context.hxx"
 #include "android/LogListener.hxx"
-#include "fs/StandardDirectory.hxx"
 #include "fs/FileSystem.hxx"
 #include "org_musicpd_Bridge.h"
 #endif

+#ifdef ENABLE_DBUS
+#include "lib/dbus/Init.hxx"
+#endif
+
 #ifdef ENABLE_SYSTEMD_DAEMON
 #include <systemd/sd-daemon.h>
 #endif
@@ -115,18 +120,10 @@ static constexpr size_t MEGABYTE = 1024 * KILOBYTE;

 static constexpr size_t DEFAULT_BUFFER_SIZE = 4 * MEGABYTE;

-static
-#if GCC_OLDER_THAN(5,0)
-/* gcc 4.x has no "constexpr" for std::max() */
-const
-#else
-constexpr
-#endif
+static constexpr
 size_t MIN_BUFFER_SIZE = std::max(CHUNK_SIZE * 32,
 				  64 * KILOBYTE);

-static constexpr unsigned DEFAULT_BUFFER_BEFORE_PLAY = 10;
-
 #ifdef ANDROID
 Context *context;
 LogListener *logListener;
@@ -139,19 +136,20 @@ struct Config {
 };

 static Config
-LoadConfig()
+LoadConfig(const ConfigData &config)
 {
-	return {LoadReplayGainConfig()};
+	return {LoadReplayGainConfig(config)};
 }

 #ifdef ENABLE_DAEMON

 static void
-glue_daemonize_init(const struct options *options)
+glue_daemonize_init(const struct options *options,
+		    const ConfigData &config)
 {
-	daemonize_init(config_get_string(ConfigOption::USER, nullptr),
-		       config_get_string(ConfigOption::GROUP, nullptr),
-		       config_get_path(ConfigOption::PID_FILE));
+	daemonize_init(config.GetString(ConfigOption::USER),
+		       config.GetString(ConfigOption::GROUP),
+		       config.GetPath(ConfigOption::PID_FILE));

 	if (options->kill)
 		daemonize_kill();
@@ -160,23 +158,23 @@ glue_daemonize_init(const struct options *options)
 #endif

 static void
-glue_mapper_init()
+glue_mapper_init(const ConfigData &config)
 {
-	mapper_init(config_get_path(ConfigOption::PLAYLIST_DIR));
+	mapper_init(config.GetPath(ConfigOption::PLAYLIST_DIR));
 }

 #ifdef ENABLE_DATABASE

 static void
-InitStorage()
+InitStorage(const ConfigData &config, EventLoop &event_loop)
 {
-	Storage *storage = CreateConfiguredStorage(io_thread_get());
+	auto storage = CreateConfiguredStorage(config, event_loop);
 	if (storage == nullptr)
 		return;

 	CompositeStorage *composite = new CompositeStorage();
 	instance->storage = composite;
-	composite->Mount("", storage);
+	composite->Mount("", std::move(storage));
 }

 /**
@@ -185,53 +183,55 @@ InitStorage()
 * process has been daemonized.
 */
 static bool
-glue_db_init_and_load(void)
+glue_db_init_and_load(const ConfigData &config)
 {
-	instance->database =
-		CreateConfiguredDatabase(instance->event_loop, *instance);
-	if (instance->database == nullptr)
+	auto db = CreateConfiguredDatabase(config, instance->event_loop,
+					   instance->io_thread.GetEventLoop(),
+					   *instance);
+	if (!db)
 		return true;

-	if (instance->database->GetPlugin().flags & DatabasePlugin::FLAG_REQUIRE_STORAGE) {
-		InitStorage();
+	if (db->GetPlugin().RequireStorage()) {
+		InitStorage(config, instance->io_thread.GetEventLoop());

 		if (instance->storage == nullptr) {
-			delete instance->database;
-			instance->database = nullptr;
 			LogDefault(config_domain,
 				   "Found database setting without "
 				   "music_directory - disabling database");
 			return true;
 		}
 	} else {
-		if (IsStorageConfigured())
+		if (IsStorageConfigured(config))
 			LogDefault(config_domain,
 				   "Ignoring the storage configuration "
 				   "because the database does not need it");
 	}

 	try {
-		instance->database->Open();
+		db->Open();
 	} catch (...) {
 		std::throw_with_nested(std::runtime_error("Failed to open database plugin"));
 	}

-	if (!instance->database->IsPlugin(simple_db_plugin))
+	instance->database = std::move(db);
+
+	auto *sdb = dynamic_cast<SimpleDatabase *>(instance->database.get());
+	if (sdb == nullptr)
 		return true;

-	SimpleDatabase &db = *(SimpleDatabase *)instance->database;
-	instance->update = new UpdateService(instance->event_loop, db,
+	instance->update = new UpdateService(config,
+					     instance->event_loop, *sdb,
 					     static_cast<CompositeStorage &>(*instance->storage),
 					     *instance);

 	/* run database update after daemonization? */
-	return db.FileExists();
+	return sdb->FileExists();
 }

 static bool
-InitDatabaseAndStorage()
+InitDatabaseAndStorage(const ConfigData &config)
 {
-	const bool create_db = !glue_db_init_and_load();
+	const bool create_db = !glue_db_init_and_load(config);
 	return create_db;
 }

@@ -241,39 +241,28 @@ InitDatabaseAndStorage()
 * Configure and initialize the sticker subsystem.
 */
 static void
-glue_sticker_init()
+glue_sticker_init(const ConfigData &config)
 {
 #ifdef ENABLE_SQLITE
-	auto sticker_file = config_get_path(ConfigOption::STICKER_FILE);
+	auto sticker_file = config.GetPath(ConfigOption::STICKER_FILE);
 	if (sticker_file.IsNull())
 		return;

 	sticker_global_init(std::move(sticker_file));
+#else
+	(void)config;
 #endif
 }

 static void
-glue_state_file_init()
+glue_state_file_init(const ConfigData &raw_config)
 {
-	auto path_fs = config_get_path(ConfigOption::STATE_FILE);
-	if (path_fs.IsNull()) {
-#ifdef ANDROID
-		const auto cache_dir = GetUserCacheDir();
-		if (cache_dir.IsNull())
-			return;
-
-		path_fs = AllocatedPath::Build(cache_dir, "state");
-#else
+	StateFileConfig config(raw_config);
+	if (!config.IsEnabled())
 		return;
-#endif
-	}

-	const auto interval =
-		config_get_unsigned(ConfigOption::STATE_FILE_INTERVAL,
-				    StateFile::DEFAULT_INTERVAL);
-
-	instance->state_file = new StateFile(std::move(path_fs), interval,
-					     *instance->partition,
+	instance->state_file = new StateFile(std::move(config),
+					     instance->partitions.front(),
 					     instance->event_loop);
 	instance->state_file->Read();
 }
@@ -282,19 +271,20 @@ glue_state_file_init()
 * Initialize the decoder and player core, including the music pipe.
 */
 static void
-initialize_decoder_and_player(const ReplayGainConfig &replay_gain_config)
+initialize_decoder_and_player(const ConfigData &config,
+			      const ReplayGainConfig &replay_gain_config)
 {
 	const ConfigParam *param;

 	size_t buffer_size;
-	param = config_get_param(ConfigOption::AUDIO_BUFFER_SIZE);
+	param = config.GetParam(ConfigOption::AUDIO_BUFFER_SIZE);
 	if (param != nullptr) {
 		char *test;
 		long tmp = strtol(param->value.c_str(), &test, 10);
 		if (*test != '\0' || tmp <= 0 || tmp == LONG_MAX)
-			FormatFatalError("buffer size \"%s\" is not a "
-					 "positive integer, line %i",
-					 param->value.c_str(), param->line);
+			throw FormatRuntimeError("buffer size \"%s\" is not a "
+						 "positive integer, line %i",
+						 param->value.c_str(), param->line);
 		buffer_size = tmp * KILOBYTE;

 		if (buffer_size < MIN_BUFFER_SIZE) {
@@ -309,67 +299,37 @@ initialize_decoder_and_player(const ReplayGainConfig &replay_gain_config)
 	const unsigned buffered_chunks = buffer_size / CHUNK_SIZE;

 	if (buffered_chunks >= 1 << 15)
-		FormatFatalError("buffer size \"%lu\" is too big",
-				 (unsigned long)buffer_size);
-
-	float perc;
-	param = config_get_param(ConfigOption::BUFFER_BEFORE_PLAY);
-	if (param != nullptr) {
-		char *test;
-		perc = strtod(param->value.c_str(), &test);
-		if (*test != '%' || perc < 0 || perc > 100) {
-			FormatFatalError("buffered before play \"%s\" is not "
-					 "a positive percentage and less "
-					 "than 100 percent, line %i",
-					 param->value.c_str(), param->line);
-		}
-
-		if (perc > 80) {
-			/* this upper limit should avoid deadlocks
-			   which can occur because the DecoderThread
-			   cannot ever fill the music buffer to
-			   exactly 100%; a few chunks always need to
-			   be available to generate silence in
-			   Player::SendSilence() */
-			FormatError(config_domain,
-				    "buffer_before_play is too large (%f%%), capping at 80%%; please fix your configuration",
-				    perc);
-			perc = 80;
-		}
-	} else
-		perc = DEFAULT_BUFFER_BEFORE_PLAY;
-
-	unsigned buffered_before_play = (perc / 100) * buffered_chunks;
-	if (buffered_before_play > buffered_chunks)
-		buffered_before_play = buffered_chunks;
+		throw FormatRuntimeError("buffer size \"%lu\" is too big",
+					 (unsigned long)buffer_size);

 	const unsigned max_length =
-		config_get_positive(ConfigOption::MAX_PLAYLIST_LENGTH,
-				    DEFAULT_PLAYLIST_MAX_LENGTH);
+		config.GetPositive(ConfigOption::MAX_PLAYLIST_LENGTH,
+				   DEFAULT_PLAYLIST_MAX_LENGTH);

 	AudioFormat configured_audio_format = AudioFormat::Undefined();
-	param = config_get_param(ConfigOption::AUDIO_OUTPUT_FORMAT);
+	param = config.GetParam(ConfigOption::AUDIO_OUTPUT_FORMAT);
 	if (param != nullptr) {
 		try {
 			configured_audio_format = ParseAudioFormat(param->value.c_str(),
 								   true);
-		} catch (const std::runtime_error &) {
+		} catch (...) {
 			std::throw_with_nested(FormatRuntimeError("error parsing line %i",
 								  param->line));
 		}
 	}

-	instance->partition = new Partition(*instance,
-					    max_length,
-					    buffered_chunks,
-					    buffered_before_play,
-					    configured_audio_format,
-					    replay_gain_config);
+	instance->partitions.emplace_back(*instance,
+					  "default",
+					  max_length,
+					  buffered_chunks,
+					  configured_audio_format,
+					  replay_gain_config);
+	auto &partition = instance->partitions.back();

 	try {
-		param = config_get_param(ConfigOption::REPLAYGAIN);
+		param = config.GetParam(ConfigOption::REPLAYGAIN);
 		if (param != nullptr)
-			instance->partition->replay_gain_mode =
+			partition.replay_gain_mode =
 				FromString(param->value.c_str());
 	} catch (...) {
 		std::throw_with_nested(FormatRuntimeError("Failed to parse line %i",
@@ -377,6 +337,28 @@ initialize_decoder_and_player(const ReplayGainConfig &replay_gain_config)
 	}
 }

+inline void
+Instance::BeginShutdownUpdate() noexcept
+{
+#ifdef ENABLE_DATABASE
+#ifdef ENABLE_INOTIFY
+	mpd_inotify_finish();
+#endif
+
+	if (update != nullptr)
+		update->CancelAllAsync();
+#endif
+}
+
+inline void
+Instance::BeginShutdownPartitions() noexcept
+{
+	for (auto &partition : partitions) {
+		partition.pc.Kill();
+		partition.listener.reset();
+	}
+}
+
 void
 Instance::OnIdle(unsigned flags)
 {
@@ -391,7 +373,8 @@ Instance::OnIdle(unsigned flags)

 #ifndef ANDROID

-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[]) noexcept
 {
 #ifdef _WIN32
 	return win32_main(argc, argv);
@@ -403,13 +386,12 @@ int main(int argc, char *argv[])
 #endif

 static int
-mpd_main_after_fork(const Config &config);
+mpd_main_after_fork(const ConfigData &raw_config,
+		    const Config &config);

-#ifdef ANDROID
-static inline
-#endif
-int mpd_main(int argc, char *argv[])
-try {
+static inline int
+MainOrThrow(int argc, char *argv[])
+{
 	struct options options;

 #ifdef ENABLE_DAEMON
@@ -424,12 +406,14 @@ try {
 #endif
 #endif

-	IcuInit();
-
+	const ScopeIcuInit icu_init;
 	const ScopeNetInit net_init;

-	io_thread_init();
-	config_global_init();
+#ifdef ENABLE_DBUS
+	const ODBus::ScopeInit dbus_init;
+#endif
+
+	ConfigData raw_config;

 #ifdef ANDROID
 	(void)argc;
@@ -438,29 +422,36 @@ try {
 	const auto sdcard = Environment::getExternalStorageDirectory();
 	if (!sdcard.IsNull()) {
 		const auto config_path =
-			AllocatedPath::Build(sdcard, "mpd.conf");
+			sdcard / Path::FromFS("mpd.conf");
 		if (FileExists(config_path))
-			ReadConfigFile(config_path);
+			ReadConfigFile(raw_config, config_path);
 	}
 #else
-	ParseCommandLine(argc, argv, &options);
+	ParseCommandLine(argc, argv, options, raw_config);
 #endif

-	const auto config = LoadConfig();
+	InitPathParser(raw_config);
+	const auto config = LoadConfig(raw_config);

 #ifdef ENABLE_DAEMON
-	glue_daemonize_init(&options);
+	glue_daemonize_init(&options, raw_config);
 #endif

-	TagLoadConfig();
+	TagLoadConfig(raw_config);

-	log_init(options.verbose, options.log_stderr);
+	log_init(raw_config, options.verbose, options.log_stderr);

 	instance = new Instance();
+	AtScopeExit() {
+		delete instance;
+		instance = nullptr;
+	};

 #ifdef ENABLE_NEIGHBOR_PLUGINS
 	instance->neighbors = new NeighborGlue();
-	instance->neighbors->Init(io_thread_get(), *instance);
+	instance->neighbors->Init(raw_config,
+				  instance->io_thread.GetEventLoop(),
+				  *instance);

 	if (instance->neighbors->IsEmpty()) {
 		delete instance->neighbors;
@@ -469,58 +460,75 @@ try {
 #endif

 	const unsigned max_clients =
-		config_get_positive(ConfigOption::MAX_CONN, 10);
+		raw_config.GetPositive(ConfigOption::MAX_CONN, 10);
 	instance->client_list = new ClientList(max_clients);

-	initialize_decoder_and_player(config.replay_gain);
+	initialize_decoder_and_player(raw_config, config.replay_gain);

-	listen_global_init(instance->event_loop, *instance->partition);
+	listen_global_init(raw_config, *instance->partitions.front().listener);

 #ifdef ENABLE_DAEMON
 	daemonize_set_user();
 	daemonize_begin(options.daemon);
+	AtScopeExit() { daemonize_finish(); };
 #endif

-	return mpd_main_after_fork(config);
+	return mpd_main_after_fork(raw_config, config);
+}

-} catch (const std::exception &e) {
-	LogError(e);
-	return EXIT_FAILURE;
+#ifdef ANDROID
+static inline
+#endif
+int mpd_main(int argc, char *argv[]) noexcept
+{
+	AtScopeExit() { log_deinit(); };
+
+	try {
+		return MainOrThrow(argc, argv);
+	} catch (...) {
+		LogError(std::current_exception());
+		return EXIT_FAILURE;
+	}
 }

 static int
-mpd_main_after_fork(const Config &config)
-try {
-	ConfigureFS();
+mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
+{
+	ConfigureFS(raw_config);
+	AtScopeExit() { DeinitFS(); };

-	glue_mapper_init();
+	glue_mapper_init(raw_config);

-	initPermissions();
-	spl_global_init();
+	initPermissions(raw_config);
+	spl_global_init(raw_config);
 #ifdef ENABLE_ARCHIVE
-	archive_plugin_init_all();
+	const ScopeArchivePluginsInit archive_plugins_init;
 #endif

-	pcm_convert_global_init();
+	pcm_convert_global_init(raw_config);

-	decoder_plugin_init_all();
+	const ScopeDecoderPluginsInit decoder_plugins_init(raw_config);

 #ifdef ENABLE_DATABASE
-	const bool create_db = InitDatabaseAndStorage();
+	const bool create_db = InitDatabaseAndStorage(raw_config);
 #endif

-	glue_sticker_init();
+	glue_sticker_init(raw_config);

 	command_init();

-	instance->partition->outputs.Configure(instance->event_loop,
-					       config.replay_gain,
-					       instance->partition->pc);
-	instance->partition->UpdateEffectiveReplayGainMode();
+	for (auto &partition : instance->partitions) {
+		partition.outputs.Configure(instance->rtio_thread.GetEventLoop(),
+					    raw_config,
+					    config.replay_gain,
+					    partition.pc);
+		partition.UpdateEffectiveReplayGainMode();
+	}

-	client_manager_init();
-	input_stream_global_init();
-	playlist_list_global_init();
+	client_manager_init(raw_config);
+	const ScopeInputPluginsInit input_plugins_init(raw_config,
+						       instance->io_thread.GetEventLoop());
+	const ScopePlaylistPluginsInit playlist_plugins_init(raw_config);

 #ifdef ENABLE_DAEMON
 	daemonize_commit();
@@ -529,42 +537,39 @@ try {
 #ifndef ANDROID
 	setup_log_output();

-	SignalHandlersInit(instance->event_loop);
+	const ScopeSignalHandlersInit signal_handlers_init(instance->event_loop);
 #endif

-	io_thread_start();
+	instance->io_thread.Start();
+	instance->rtio_thread.Start();

 #ifdef ENABLE_NEIGHBOR_PLUGINS
 	if (instance->neighbors != nullptr)
 		instance->neighbors->Open();
 #endif

-	ZeroconfInit(instance->event_loop);
-
-	StartPlayerThread(instance->partition->pc);
+	ZeroconfInit(raw_config, instance->event_loop);

 #ifdef ENABLE_DATABASE
 	if (create_db) {
 		/* the database failed to load: recreate the
 		   database */
-		unsigned job = instance->update->Enqueue("", true);
-		if (job == 0)
-			FatalError("directory update failed");
+		instance->update->Enqueue("", true);
 	}
 #endif

-	glue_state_file_init();
+	glue_state_file_init(raw_config);

 #ifdef ENABLE_DATABASE
-	if (config_get_bool(ConfigOption::AUTO_UPDATE, false)) {
+	if (raw_config.GetBool(ConfigOption::AUTO_UPDATE, false)) {
 #ifdef ENABLE_INOTIFY
 		if (instance->storage != nullptr &&
 		    instance->update != nullptr)
 			mpd_inotify_init(instance->event_loop,
 					 *instance->storage,
 					 *instance->update,
-					 config_get_unsigned(ConfigOption::AUTO_UPDATE_DEPTH,
-							     INT_MAX));
+					 raw_config.GetUnsigned(ConfigOption::AUTO_UPDATE_DEPTH,
+								INT_MAX));
 #else
 		FormatWarning(config_domain,
 			      "inotify: auto_update was disabled. enable during compilation phase");
@@ -572,11 +577,12 @@ try {
 	}
 #endif

-	config_global_check();
+	Check(raw_config);

 	/* enable all audio outputs (if not already done by
 	   playlist_state_restore() */
-	instance->partition->pc.LockUpdateAudio();
+	for (auto &partition : instance->partitions)
+		partition.pc.LockUpdateAudio();

 #ifdef _WIN32
 	win32_app_started();
@@ -599,21 +605,17 @@ try {

 	/* cleanup */

-#if defined(ENABLE_DATABASE) && defined(ENABLE_INOTIFY)
-	mpd_inotify_finish();
-
-	if (instance->update != nullptr)
-		instance->update->CancelAllAsync();
-#endif
+	instance->BeginShutdownUpdate();

 	if (instance->state_file != nullptr) {
 		instance->state_file->Write();
 		delete instance->state_file;
 	}

-	instance->partition->pc.Kill();
 	ZeroconfDeinit();
-	listen_global_finish();
+
+	instance->BeginShutdownPartitions();
+
 	delete instance->client_list;

 #ifdef ENABLE_NEIGHBOR_PLUGINS
@@ -623,55 +625,11 @@ try {
 	}
 #endif

-#ifdef ENABLE_DATABASE
-	delete instance->update;
-
-	if (instance->database != nullptr) {
-		instance->database->Close();
-		delete instance->database;
-	}
-
-	delete instance->storage;
-#endif
-
 #ifdef ENABLE_SQLITE
 	sticker_global_finish();
 #endif

-	playlist_list_global_finish();
-	input_stream_global_finish();
-
-#ifdef ENABLE_DATABASE
-	mapper_finish();
-#endif
-
-	DeinitFS();
-
-	delete instance->partition;
-	command_finish();
-	decoder_plugin_deinit_all();
-#ifdef ENABLE_ARCHIVE
-	archive_plugin_deinit_all();
-#endif
-	config_global_finish();
-	io_thread_deinit();
-#ifndef ANDROID
-	SignalHandlersFinish();
-#endif
-	delete instance;
-	instance = nullptr;
-
-#ifdef ENABLE_DAEMON
-	daemonize_finish();
-#endif
-
-	IcuFinish();
-
-	log_deinit();
 	return EXIT_SUCCESS;
-} catch (const std::exception &e) {
-	LogError(e);
-	return EXIT_FAILURE;
 }

 #ifdef ANDROID
@@ -700,7 +658,7 @@ JNIEXPORT void JNICALL
 Java_org_musicpd_Bridge_shutdown(JNIEnv *, jclass)
 {
 	if (instance != nullptr)
-		instance->Shutdown();
+		instance->Break();
 }

 #endif
--- a/src/Main.hxx
+++ b/src/Main.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -41,7 +41,8 @@ extern Instance *instance;
 * On Windows platform this is called from win32_main()
 * after doing some initialization.
 */
-int mpd_main(int argc, char *argv[]);
+int
+mpd_main(int argc, char *argv[]) noexcept;

 #endif

--- a/src/Mapper.cxx
+++ b/src/Mapper.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -39,7 +39,7 @@
 * The absolute path of the playlist directory encoded in the
 * filesystem character set.
 */
-static AllocatedPath playlist_dir_fs = AllocatedPath::Null();
+static AllocatedPath playlist_dir_fs = nullptr;

 static void
 mapper_set_playlist_dir(AllocatedPath &&path)
@@ -58,11 +58,6 @@ mapper_init(AllocatedPath &&_playlist_dir)
 		mapper_set_playlist_dir(std::move(_playlist_dir));
 }

-void
-mapper_finish() noexcept
-{
-}
-
 #ifdef ENABLE_DATABASE

 AllocatedPath
@@ -72,17 +67,17 @@ map_uri_fs(const char *uri) noexcept
 	assert(*uri != '/');

 	if (instance->storage == nullptr)
-		return AllocatedPath::Null();
+		return nullptr;

 	const auto music_dir_fs = instance->storage->MapFS("");
 	if (music_dir_fs.IsNull())
-		return AllocatedPath::Null();
+		return nullptr;

 	const auto uri_fs = AllocatedPath::FromUTF8(uri);
 	if (uri_fs.IsNull())
-		return AllocatedPath::Null();
+		return nullptr;

-	return AllocatedPath::Build(music_dir_fs, uri_fs);
+	return music_dir_fs / uri_fs;
 }

 std::string
@@ -118,7 +113,7 @@ AllocatedPath
 map_spl_utf8_to_fs(const char *name) noexcept
 {
 	if (playlist_dir_fs.IsNull())
-		return AllocatedPath::Null();
+		return nullptr;

 	std::string filename_utf8 = name;
 	filename_utf8.append(PLAYLIST_FILE_SUFFIX);
@@ -126,7 +121,7 @@ map_spl_utf8_to_fs(const char *name) noexcept
 	const auto filename_fs =
 		AllocatedPath::FromUTF8(filename_utf8.c_str());
 	if (filename_fs.IsNull())
-		return AllocatedPath::Null();
+		return nullptr;

-	return AllocatedPath::Build(playlist_dir_fs, filename_fs);
+	return playlist_dir_fs / filename_fs;
 }
--- a/src/Mapper.hxx
+++ b/src/Mapper.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -24,9 +24,10 @@
 #ifndef MPD_MAPPER_HXX
 #define MPD_MAPPER_HXX

-#include <string>
+#include "util/Compiler.h"
+#include "config.h"

-#include "Compiler.h"
+#include <string>

 #define PLAYLIST_FILE_SUFFIX ".m3u"

@@ -36,9 +37,6 @@ class AllocatedPath;
 void
 mapper_init(AllocatedPath &&playlist_dir);

-void
-mapper_finish() noexcept;
-
 #ifdef ENABLE_DATABASE

 /**
--- a/src/MixRampInfo.hxx
+++ b/src/MixRampInfo.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -20,8 +20,7 @@
 #ifndef MPD_MIX_RAMP_INFO_HXX
 #define MPD_MIX_RAMP_INFO_HXX

-#include "check.h"
-#include "Compiler.h"
+#include "util/Compiler.h"

 #include <string>

--- a/src/MusicBuffer.cxx
+++ b/src/MusicBuffer.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -17,21 +17,20 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "config.h"
 #include "MusicBuffer.hxx"
 #include "MusicChunk.hxx"

 #include <assert.h>

-MusicBuffer::MusicBuffer(unsigned num_chunks) noexcept
+MusicBuffer::MusicBuffer(unsigned num_chunks)
 	:buffer(num_chunks) {
 }

-MusicChunk *
+MusicChunkPtr
 MusicBuffer::Allocate() noexcept
 {
 	const std::lock_guard<Mutex> protect(mutex);
-	return buffer.Allocate();
+	return MusicChunkPtr(buffer.Allocate(), MusicChunkDeleter(*this));
 }

 void
@@ -39,12 +38,15 @@ MusicBuffer::Return(MusicChunk *chunk) noexcept
 {
 	assert(chunk != nullptr);

+	/* these attributes need to be cleared before locking the
+	   mutex, because they might recursively call this method,
+	   causing a deadlock */
+	chunk->next.reset();
+	chunk->other.reset();
+
 	const std::lock_guard<Mutex> protect(mutex);

-	if (chunk->other != nullptr) {
-		assert(chunk->other->other == nullptr);
-		buffer.Free(chunk->other);
-	}
+	assert(!chunk->other || !chunk->other->other);

 	buffer.Free(chunk);
 }
--- a/src/MusicBuffer.hxx
+++ b/src/MusicBuffer.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2017 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -20,17 +20,16 @@
 #ifndef MPD_MUSIC_BUFFER_HXX
 #define MPD_MUSIC_BUFFER_HXX

+#include "MusicChunkPtr.hxx"
 #include "util/SliceBuffer.hxx"
 #include "thread/Mutex.hxx"

-struct MusicChunk;
-
 /**
 * An allocator for #MusicChunk objects.
 */
 class MusicBuffer {
 	/** a mutex which protects #buffer */
-	Mutex mutex;
+	mutable Mutex mutex;

 	SliceBuffer<MusicChunk> buffer;

@@ -41,7 +40,7 @@ public:
 	 * @param num_chunks the number of #MusicChunk reserved in
 	 * this buffer
 	 */
-	MusicBuffer(unsigned num_chunks) noexcept;
+	explicit MusicBuffer(unsigned num_chunks);

 #ifndef NDEBUG
 	/**
@@ -50,10 +49,15 @@ public:
 	 * object is inaccessible to other threads.
 	 */
 	bool IsEmptyUnsafe() const {
-		return buffer.IsEmpty();
+		return buffer.empty();
 	}
 #endif

+	bool IsFull() const noexcept {
+		const std::lock_guard<Mutex> protect(mutex);
+		return buffer.IsFull();
+	}
+
 	/**
 	 * Returns the total number of reserved chunks in this buffer.  This
 	 * is the same value which was passed to the constructor
@@ -71,7 +75,7 @@ public:
 	 * @return an empty chunk or nullptr if there are no chunks
 	 * available
 	 */
-	MusicChunk *Allocate() noexcept;
+	MusicChunkPtr Allocate() noexcept;

 	/**
 	 * Returns a chunk to the buffer.  It can be reused by
--- a/Show More
+++ b/Show More