diff options
| author | Paul Mackerras <paulus@ozlabs.org> | 2022-10-08 14:19:08 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-08 14:19:08 +1100 |
| commit | c42bade9f55544e30ec9d369c557742d36b7881e (patch) | |
| tree | c3e286e8746f7acfe45ed120cfb7d81abcf8677a | |
| parent | 35198adc7f3c1f0c1e3437f983e7f3ac96477997 (diff) | |
| parent | eb8d28195cf4fbbb06c9fd983a03ece671e96c54 (diff) | |
| download | ppp-c42bade9f55544e30ec9d369c557742d36b7881e.tar.gz | |
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>
| -rw-r--r-- | .github/workflows/ubuntu.yaml | 8 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/.github/workflows/ubuntu.yaml b/.github/workflows/ubuntu.yaml index 028193b..536aaf3 100644 --- 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 7b4c842..184213e 100644 --- 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 |