]> granicus.if.org Git - procps-ng/commitdiff
build-sys: Clean up libsystemd in configure
authorCraig Small <csmall@enc.com.au>
Thu, 9 Jul 2015 13:11:40 +0000 (23:11 +1000)
committerCraig Small <csmall@enc.com.au>
Thu, 9 Jul 2015 13:11:40 +0000 (23:11 +1000)
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

index 48d4a594e432ee8caa5a773a2ef8985a38236a80..675e218403c15e43cbbe2c0c9129af71e57c37d0 100644 (file)
@@ -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],