1 files changed, 24 insertions, 5 deletions

diff --git a/configure.ac b/configure.ac
index bad5c53c..a294b00f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -328,6 +328,25 @@ AS_IF([test "x$with_ldap" != "xno"], [
   LIBS="$_SAVEDLIBS"
 ])
 
+
+AC_ARG_WITH([systemd], [AS_HELP_STRING([--without-systemd], [Skips systemd support])])
+
+dnl Check for libsystemd
+AS_IF([test "x$with_systemd" != "xno"], [
+  _SAVEDLIBS="$LIBS"
+  AC_CHECK_LIB(systemd,sd_get_sessions,,,-lsystemd)
+  if test "$ac_cv_lib_systemd_sd_get_sessions" = "yes"; then
+    SYSTEMDLIBS="-lsystemd"
+    SYSTEMDINCLUDE=""
+    AC_SUBST(SYSTEMDLIBS)
+    AC_SUBST(SYSTEMDINCLUDE)
+  else
+    AC_MSG_WARN([Skipping systemd support])
+  fi
+  LIBS="$_SAVEDLIBS"
+])
+
+
 dnl Check for headers used by check_ide_smart
 case $host in
   *linux*)
@@ -1592,13 +1611,13 @@ then
                 grep -E -i "^lswap +path +pri +swaplo +blocks +free +maxswap" \
                 >/dev/null]
         then
-                ac_cv_swap_format=[" %*d %*s %*d,%*d %*d %*d %f %f"]
+                ac_cv_swap_format=[" %*d %*s %*d,%*d %*d %*d %lu %lu"]
                 ac_cv_swap_conv=2048
                 AC_MSG_RESULT([using IRIX format swap])
 
         elif [$PATH_TO_SWAP -l 2>/dev/null | grep -E -i "^path +dev +swaplo +blocks +free" >/dev/null]
         then
-                ac_cv_swap_format=["%*s %*[0-9,-] %*d %f %f"]
+                ac_cv_swap_format=["%*s %*[0-9,-] %*d %lu %lu"]
                 ac_cv_swap_conv=2048
                 AC_MSG_RESULT([using Unixware format swap])
         else
@@ -1622,7 +1641,7 @@ then
 
         if [$PATH_TO_SWAPINFO -k 2>/dev/null | grep -E -i "^Device +1K-blocks +Used +Avail" >/dev/null]
         then
-                ac_cv_swap_format=["%*s %f %*d %f"]
+                ac_cv_swap_format=["%*s %lu %*d %lu"]
                 ac_cv_swap_conv=1024
                 AC_MSG_RESULT([using FreeBSD format swapinfo])
         fi
@@ -1631,7 +1650,7 @@ elif [$PATH_TO_SWAPINFO -dfM 2>/dev/null | grep -E -i "^TYPE +AVAIL +USED +FREE"
 then
         ac_cv_have_swap=yes
         ac_cv_swap_command="$PATH_TO_SWAPINFO -dfM"
-        ac_cv_swap_format=["%*s %f %*d %f"]
+        ac_cv_swap_format=["%*s %lu %*d %lu"]
         ac_cv_swap_conv=1024
         AC_MSG_RESULT([using HP-UX format swapinfo])
 fi
@@ -1646,7 +1665,7 @@ if [$PATH_TO_LSPS -a 2>/dev/null | grep -E -i "^Page Space" > /dev/null]
 then
         ac_cv_have_swap=yes
         ac_cv_swap_command="$PATH_TO_LSPS -a"
-        ac_cv_swap_format=["%*s %*s %*s %f%*s %f %*s"]
+        ac_cv_swap_format=["%*s %*s %*s %lu%*s %lu %*s"]
         ac_cv_swap_conv=1
         AC_MSG_RESULT([using AIX lsps])
 fi