1 files changed, 29 insertions, 10 deletions

diff --git a/configure.ac b/configure.ac
index 0c7169e..a294b00 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*)
@@ -932,7 +951,7 @@ elif ps -Ao 's comm vsz rss uid user pid ppid args' 2>/dev/null | \
 then
         ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
         ac_cv_ps_command="$PATH_TO_PS -Ao 's uid pid ppid vsz rss pcpu comm args'"
-        # There must be no space between the %s and %n due to a wierd problem in sscanf where
+        # There must be no space between the %s and %n due to a weird problem in sscanf where
         # it will return %n as longer than the line length
         ac_cv_ps_format="%s %d %d %d %d %d %f %s%n"
         ac_cv_ps_cols=9
@@ -1552,7 +1571,7 @@ if test -n "$PATH_TO_SUDO"
 then
         AC_DEFINE_UNQUOTED(PATH_TO_SUDO,"$PATH_TO_SUDO",[path to sudo])
 else
-        AC_MSG_WARN([Could not find sudo or eqivalent])
+        AC_MSG_WARN([Could not find sudo or equivalent])
 fi
 
 AC_PATH_PROG(PATH_TO_MAILQ,mailq)
@@ -1563,7 +1582,7 @@ if test -n "$PATH_TO_MAILQ"
 then
         AC_DEFINE_UNQUOTED(PATH_TO_MAILQ,"$PATH_TO_MAILQ",[path to mailq])
 else
-        AC_MSG_WARN([Could not find mailq or eqivalent])
+        AC_MSG_WARN([Could not find mailq or equivalent])
 fi
 
 AC_PATH_PROG(PATH_TO_QMAIL_QSTAT,qmail-qstat)
@@ -1574,7 +1593,7 @@ if test -n "$PATH_TO_QMAIL_QSTAT"
 then
         AC_DEFINE_UNQUOTED(PATH_TO_QMAIL_QSTAT,"$PATH_TO_QMAIL_QSTAT",[path to qmail-qstat])
 else
-        AC_MSG_WARN([Could not find qmail-qstat or eqivalent])
+        AC_MSG_WARN([Could not find qmail-qstat or equivalent])
 fi
 
 dnl SWAP info required is amount allocated/available and amount free
@@ -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
@@ -1832,7 +1851,7 @@ AM_GNU_GETTEXT([external], [need-ngettext])
 AM_GNU_GETTEXT_VERSION(0.15)
 
 dnl Check for Redhat spopen problem
-dnl Wierd problem where ECHILD is returned from a wait call in error
+dnl Weird problem where ECHILD is returned from a wait call in error
 dnl Only appears to affect nslookup and dig calls. Only affects redhat around
 dnl 2.6.9-11 (okay in 2.6.9-5). Redhat investigating root cause
 dnl We patch plugins/popen.c