Merge pull request #370 from Chocobo1/systemd

Fix libsystemd detection

Merged despite bogus signoff in the commits being merged, since the changes are trivial.

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>

diff --git a/.github/workflows/ubuntu.yaml b/.github/workflows/ubuntu.yaml
index 028193b794170cfd3a9215977cdae146026d7fb4..536aaf3282d908b664db4e70c724c19cd63a0628 100644 (file)
--- a/.github/workflows/ubuntu.yaml
+++ b/.github/workflows/ubuntu.yaml
@@ -5,13 +5,17 @@ jobs:
   build_and_test:
     runs-on: ubuntu-latest
     env:
-      configure_flags: --enable-ipxcp --enable-multilink
+      configure_flags: --enable-ipxcp --enable-multilink --enable-systemd
 
     steps:
     - uses: actions/checkout@v2
 
     - name: install required packages
-      run: sudo DEBIAN_FRONTEND=noninteractive apt-get -y -qq install build-essential autoconf automake pkg-config libtool m4 autoconf-archive libssl-dev libatm1-dev libpcap-dev
+      run: |
+        sudo DEBIAN_FRONTEND=noninteractive apt-get -y -qq update
+        sudo DEBIAN_FRONTEND=noninteractive apt-get -y -qq install \
+          build-essential autoconf automake pkg-config libtool m4 autoconf-archive \
+          libssl-dev libatm1-dev libpcap-dev libsystemd-dev
 
     - name: configure
       run: ./autogen.sh ${{ env.configure_flags }}

diff --git a/configure.ac b/configure.ac
index 7b4c84295cf086c081b54ada7062c6347b6672f2..184213e09607d79de4781bae9c3b6f127863ac29 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -106,7 +106,7 @@ AM_CONDITIONAL(WITH_SYSTEMD, test "x${enable_systemd}" = "xyes")
 AM_COND_IF([WITH_SYSTEMD],
     AC_DEFINE([SYSTEMD], 1, [Enable support for systemd notifications]))
 AS_IF([test "x${enable_systemd}" = "xyes"], [
-       PKG_CHECK_MODULES([systemd], [systemd])])
+       PKG_CHECK_MODULES([SYSTEMD], [libsystemd])])
 
 #
 # Enable Callback Protocol Support, disabled by default