From 5e73c832623cc99442a5d5bc2100b4d7ad323eb8 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Thu, 9 Jul 2015 23:11:40 +1000 Subject: [PATCH] build-sys: Clean up libsystemd in configure The previous commit got rid of some but not all the library. The format of it was a little odd with the library being explicitly defined instead of letting autoconf do it for you. --- configure.ac | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 48d4a594..675e2184 100644 --- a/configure.ac +++ b/configure.ac @@ -149,19 +149,11 @@ AC_ARG_WITH([systemd], [AS_HELP_STRING([--with-systemd], [enable systemd support])], [], [with_systemd=no] ) -if test "x$with_systemd" != xno; then - PKG_CHECK_MODULES([SYSTEMD], [libsystemd], [], [ - AC_CHECK_LIB(systemd, sd_pid_get_slice, [have_systemd=yes], [have_systemd=no]) - if test "x$have_systemd" = xno; then - AC_MSG_ERROR([systemd support missing/incomplete (requires >= 209)]) - fi - SYSTEMD_LIBS="-lsystemd-login" - ]) - AM_CONDITIONAL(WITH_SYSTEMD, true) +AS_IF([test "x$with_systemd" != "xno"], [ + PKG_CHECK_MODULES([SYSTEMD], [libsystemd]) AC_DEFINE(WITH_SYSTEMD, 1, [enable systemd support]) -else - AM_CONDITIONAL(WITH_SYSTEMD, false) -fi +]) +AM_CONDITIONAL([WITH_SYSTEMD], [test x$with_systemd != xno]) # AC_ARG_ENABLEs AC_ARG_ENABLE([pidof],