build, doc: extricate `--enable-systemd`

Ouch, that is a *lot* of places to update...

Signed-off-by: David Lamparter <equinox@diac24.net>

14 files changed, 21 insertions, 39 deletions

diff --git a/doc/developer/building-frr-for-archlinux.rst b/doc/developer/building-frr-for-archlinux.rst
index e589a9f72..af1677e89 100644
--- a/doc/developer/building-frr-for-archlinux.rst
+++ b/doc/developer/building-frr-for-archlinux.rst
@@ -10,8 +10,8 @@ Installing Dependencies
    sudo pacman -S \
       git autoconf automake libtool make cmake pcre readline texinfo \
       pkg-config pam json-c bison flex python-pytest \
-      c-ares python systemd python2-ipaddress python-sphinx \
-      systemd-libs net-snmp perl libcap libelf
+      c-ares python python2-ipaddress python-sphinx \
+      net-snmp perl libcap libelf
 
 .. include:: building-libyang.rst
 
diff --git a/doc/developer/building-frr-for-centos7.rst b/doc/developer/building-frr-for-centos7.rst
index 93b9993a3..ce11126f7 100644
--- a/doc/developer/building-frr-for-centos7.rst
+++ b/doc/developer/building-frr-for-centos7.rst
@@ -21,7 +21,7 @@ Add packages:
     sudo yum install git autoconf automake libtool make \
       readline-devel texinfo net-snmp-devel groff pkgconfig \
       json-c-devel pam-devel bison flex pytest c-ares-devel \
-      python-devel systemd-devel python-sphinx libcap-devel \
+      python-devel python-sphinx libcap-devel \
       elfutils-libelf-devel
 
 .. include:: building-libyang.rst
@@ -66,7 +66,6 @@ an example.)
         --enable-user=frr \
         --enable-group=frr \
         --enable-vty-group=frrvty \
-	--enable-systemd=yes \
         --disable-ldpd \
         --enable-fpm \
         --with-pkg-git-version \
diff --git a/doc/developer/building-frr-for-centos8.rst b/doc/developer/building-frr-for-centos8.rst
index 65c93286b..109a7866d 100644
--- a/doc/developer/building-frr-for-centos8.rst
+++ b/doc/developer/building-frr-for-centos8.rst
@@ -14,7 +14,7 @@ Add packages:
     sudo dnf install --enablerepo=PowerTools git autoconf pcre-devel \
       automake libtool make readline-devel texinfo net-snmp-devel pkgconfig \
       groff pkgconfig json-c-devel pam-devel bison flex python2-pytest \
-      c-ares-devel python2-devel systemd-devel libcap-devel \
+      c-ares-devel python2-devel libcap-devel \
       elfutils-libelf-devel
 
 .. include:: building-libyang.rst
@@ -59,7 +59,6 @@ an example.)
         --enable-user=frr \
         --enable-group=frr \
         --enable-vty-group=frrvty \
-	--enable-systemd=yes \
         --disable-ldpd \
         --enable-fpm \
         --with-pkg-git-version \
diff --git a/doc/developer/building-frr-for-debian8.rst b/doc/developer/building-frr-for-debian8.rst
index 475e0303f..5e58854ed 100644
--- a/doc/developer/building-frr-for-debian8.rst
+++ b/doc/developer/building-frr-for-debian8.rst
@@ -17,7 +17,7 @@ Add packages:
 
    sudo apt-get install git autoconf automake libtool make \
       libreadline-dev texinfo libjson-c-dev pkg-config bison flex python3-pip \
-      libc-ares-dev python3-dev python3-sphinx build-essential libsystemd-dev \
+      libc-ares-dev python3-dev python3-sphinx build-essential \
       libsnmp-dev libcap-dev libelf-dev
 
 Install newer pytest (>3.0) from pip
diff --git a/doc/developer/building-frr-for-debian9.rst b/doc/developer/building-frr-for-debian9.rst
index 1981127b3..f8d8025f6 100644
--- a/doc/developer/building-frr-for-debian9.rst
+++ b/doc/developer/building-frr-for-debian9.rst
@@ -11,7 +11,7 @@ Add packages:
    sudo apt-get install git autoconf automake libtool make \
      libreadline-dev texinfo libjson-c-dev pkg-config bison flex \
      libc-ares-dev python3-dev python3-pytest python3-sphinx build-essential \
-     libsnmp-dev libsystemd-dev libcap-dev libelf-dev
+     libsnmp-dev libcap-dev libelf-dev
 
 .. include:: building-libyang.rst
 
diff --git a/doc/developer/building-frr-for-fedora.rst b/doc/developer/building-frr-for-fedora.rst
index 5fecd8a82..6ce76ba15 100644
--- a/doc/developer/building-frr-for-fedora.rst
+++ b/doc/developer/building-frr-for-fedora.rst
@@ -14,7 +14,7 @@ Installing Dependencies
    sudo dnf install git autoconf automake libtool make \
      readline-devel texinfo net-snmp-devel groff pkgconfig json-c-devel \
      pam-devel python3-pytest bison flex c-ares-devel python3-devel \
-     python3-sphinx perl-core patch systemd-devel libcap-devel \
+     python3-sphinx perl-core patch libcap-devel \
      elfutils-libelf-devel
 
 .. include:: building-libyang.rst
diff --git a/doc/developer/building-frr-for-opensuse.rst b/doc/developer/building-frr-for-opensuse.rst
index 4e886e9c2..ee6a36a14 100644
--- a/doc/developer/building-frr-for-opensuse.rst
+++ b/doc/developer/building-frr-for-opensuse.rst
@@ -13,7 +13,7 @@ Installing Dependencies
    zypper in  git autoconf automake libtool make   \
      readline-devel texinfo net-snmp-devel groff pkgconfig libjson-c-devel\
      pam-devel python3-pytest bison flex c-ares-devel python3-devel\
-     python3-Sphinx perl patch systemd-devel libcap-devel libyang-devel \
+     python3-Sphinx perl patch libcap-devel libyang-devel \
      libelf-devel
 
 Building & Installing FRR
diff --git a/doc/developer/building-frr-for-ubuntu1604.rst b/doc/developer/building-frr-for-ubuntu1604.rst
index 2cb9536f9..d79545c85 100644
--- a/doc/developer/building-frr-for-ubuntu1604.rst
+++ b/doc/developer/building-frr-for-ubuntu1604.rst
@@ -13,8 +13,8 @@ Installing Dependencies
    apt-get install \
       git autoconf automake libtool make libreadline-dev texinfo \
       pkg-config libpam0g-dev libjson-c-dev bison flex python3-pytest \
-      libc-ares-dev python3-dev libsystemd-dev python-ipaddress python3-sphinx \
-      install-info build-essential libsystemd-dev libsnmp-dev perl libcap-dev \
+      libc-ares-dev python3-dev python-ipaddress python3-sphinx \
+      install-info build-essential libsnmp-dev perl libcap-dev \
       libelf-dev
 
 .. include:: building-libyang.rst
diff --git a/doc/developer/building-frr-for-ubuntu1804.rst b/doc/developer/building-frr-for-ubuntu1804.rst
index eb3991c13..39a17fc01 100644
--- a/doc/developer/building-frr-for-ubuntu1804.rst
+++ b/doc/developer/building-frr-for-ubuntu1804.rst
@@ -13,8 +13,8 @@ Installing Dependencies
    sudo apt-get install \
       git autoconf automake libtool make libreadline-dev texinfo \
       pkg-config libpam0g-dev libjson-c-dev bison flex python3-pytest \
-      libc-ares-dev python3-dev libsystemd-dev python-ipaddress python3-sphinx \
-      install-info build-essential libsystemd-dev libsnmp-dev perl libcap-dev \
+      libc-ares-dev python3-dev python-ipaddress python3-sphinx \
+      install-info build-essential libsnmp-dev perl libcap-dev \
       libelf-dev
 
 .. include:: building-libyang.rst
diff --git a/doc/developer/building-frr-for-ubuntu2004.rst b/doc/developer/building-frr-for-ubuntu2004.rst
index 58d72e289..92ddead4a 100644
--- a/doc/developer/building-frr-for-ubuntu2004.rst
+++ b/doc/developer/building-frr-for-ubuntu2004.rst
@@ -13,8 +13,8 @@ Installing Dependencies
    sudo apt-get install \
       git autoconf automake libtool make libreadline-dev texinfo \
       pkg-config libpam0g-dev libjson-c-dev bison flex python3-pytest \
-      libc-ares-dev python3-dev libsystemd-dev python-ipaddress python3-sphinx \
-      install-info build-essential libsystemd-dev libsnmp-dev perl \
+      libc-ares-dev python3-dev python-ipaddress python3-sphinx \
+      install-info build-essential libsnmp-dev perl \
       libcap-dev python2 libelf-dev
 
 Note that Ubuntu 20 no longer installs python 2.x, so it must be
diff --git a/doc/developer/include-compile.rst b/doc/developer/include-compile.rst
index d9fa26022..513cac617 100644
--- a/doc/developer/include-compile.rst
+++ b/doc/developer/include-compile.rst
@@ -2,11 +2,6 @@ Clone the FRR git repo and use the included ``configure`` script to configure
 FRR's build time options to your liking. The full option listing can be
 obtained by running ``./configure -h``. The options shown below are examples.
 
-.. note::
-
-   If your platform uses ``systemd``, please make sure to add
-   ``--enable-systemd=yes`` to your configure options.
-
 .. code-block:: console
 
    git clone https://github.com/frrouting/frr.git frr
diff --git a/doc/developer/packaging-debian.rst b/doc/developer/packaging-debian.rst
index b57286d5a..be05d599e 100644
--- a/doc/developer/packaging-debian.rst
+++ b/doc/developer/packaging-debian.rst
@@ -56,7 +56,7 @@ buster.)
    Where `$options` may contain any or all of the following items:
 
    * build profiles specified with ``-P``, e.g.
-     ``-Ppkg.frr.nortrlib,pkg.frr.nosystemd``.
+     ``-Ppkg.frr.nortrlib,pkg.frr.rtrlib``.
      Multiple values are separated by commas and there must not be a space
      after the ``-P``.
 
@@ -67,14 +67,6 @@ buster.)
      +================+===================+=========================================+
      | pkg.frr.rtrlib | pkg.frr.nortrlib  | builds frr-rpki-rtrlib package (or not) |
      +----------------+-------------------+-----------------------------------------+
-     | n/a            | pkg.frr.nosystemd | removes libsystemd dependency and       |
-     |                |                   | disables unit file installation         |
-     +----------------+-------------------+-----------------------------------------+
-
-     .. note::
-
-        The ``pkg.frr.nosystemd`` option is only intended to support Ubuntu
-        14.04 (and should be enabled when building for that.)
 
    * the ``-uc -us`` options to disable signing the packages with your GPG key
 
diff --git a/doc/developer/packaging-redhat.rst b/doc/developer/packaging-redhat.rst
index 458cfa0ad..9e64b912f 100644
--- a/doc/developer/packaging-redhat.rst
+++ b/doc/developer/packaging-redhat.rst
@@ -18,10 +18,6 @@ Tested on CentOS 6, CentOS 7, CentOS 8 and Fedora 24.
 
       yum install rpm-build net-snmp-devel pam-devel libcap-devel
 
-   If your platform uses systemd::
-
-      yum install systemd-devel
-
    For CentOS 7 and CentOS 8, the package will be built using python3
    and requires additional python3 packages::
 
diff --git a/doc/user/installation.rst b/doc/user/installation.rst
index 63254555d..fdf5bab9c 100644
--- a/doc/user/installation.rst
+++ b/doc/user/installation.rst
@@ -146,11 +146,6 @@ options from the list below.
    software available on your machine.  This is needed for systemd integration, if you
    disable watchfrr you cannot have any systemd integration.
 
-.. option:: --enable-systemd
-
-   Build watchfrr with systemd integration, this will allow FRR to communicate with
-   systemd to tell systemd if FRR has come up properly.
-
 .. option:: --enable-werror
 
    Build with all warnings converted to errors as a compile option.  This
@@ -404,6 +399,12 @@ options to the configuration script.
 
    Set StrongSWAN vici interface socket path [/var/run/charon.vici].
 
+.. note::
+
+   The former ``--enable-systemd`` option does not exist anymore.  Support for
+   systemd is now always available through built-in functions, without
+   depending on libsystemd.
+
 Python dependency, documentation and tests
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^