X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=fb62a571b069318eb9ac731351c8c48089fe2fa4;hp=cfe7c8c61f6db8faf99be0e2c219b3b5a1a3be97;hb=99a720797c7779625c23de456c85ed0b3056bca6;hpb=b1d35da9e405abaab2ff540baf2e54087f92e881

diff --git a/configure.ac b/configure.ac
index cfe7c8c61..fb62a571b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,12 +19,11 @@
 
 AC_PREREQ([2.64])
 
-# FIXME: Update to proper web page
 AC_INIT([elogind],
-        [219.5],
-        [http://bugs.freedesktop.org/enter_bug.cgi?product=elogind],
+        [219.14],
+        [https://github.com/wingo/elogind/issues],
         [elogind],
-        [http://www.freedesktop.org/wiki/Software/elogind])
+        [https://github.com/wingo/elogind])
 
 AC_CONFIG_SRCDIR([src/login/logind.c])
 AC_CONFIG_MACRO_DIR([m4])
@@ -87,6 +86,8 @@ AC_PROG_CC_C99
 AC_PATH_PROG([M4], [m4])
 AC_PATH_PROG([XSLTPROC], [xsltproc])
 
+AC_PATH_PROG([HALT], [halt], [halt])
+AC_PATH_PROG([REBOOT], [reboot], [reboot])
 AC_PATH_PROG([KEXEC], [kexec], [/usr/sbin/kexec], [$PATH:/usr/sbin:/sbin])
 
 AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])])
@@ -231,12 +232,22 @@ AC_CHECK_HEADERS([linux/memfd.h], [], [])
 
 # unconditionally pull-in librt with old glibc versions
 AC_SEARCH_LIBS([clock_gettime], [rt], [], [])
+AC_SEARCH_LIBS([mq_unlink], [rt], [], [])
 
+AC_ARG_WITH([libcap],
+            AS_HELP_STRING([--with-libcap=DIR], [Prefix for libcap]),
+            [CAP_LDFLAGS="-L$with_libcap/lib"],
+            [CAP_LDFLAGS=""])
 save_LIBS="$LIBS"
+save_LDFLAGS="$LDFLAGS"
 LIBS=
+LDFLAGS="$LDFLAGS $CAP_LDFLAGS"
 AC_SEARCH_LIBS([cap_init], [cap], [], [AC_MSG_ERROR([*** POSIX caps library not found])])
 CAP_LIBS="$LIBS"
 AC_SUBST(CAP_LIBS)
+AC_SUBST(CAP_LDFLAGS)
+LIBS="$save_LIBS"
+LDFLAGS="$save_LDFLAGS"
 
 AC_CHECK_FUNCS([memfd_create])
 AC_CHECK_FUNCS([__secure_getenv secure_getenv])