chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix service file to match installed elogind binary location
[elogind.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 7bb67b71e4bc4bf8c8c6ee8e625c3b33b3207c9b..9ec3390ff43042cd69e2bbcbfc9a99c4af651270 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-20,7
+20,7
@@
AC_PREREQ([2.64])
AC_INIT([elogind],
AC_PREREQ([2.64])
AC_INIT([elogind],
- [234],
+ [234
.4
],
[https://github.com/elogind/elogind/issues],
[elogind],
[https://github.com/elogind/elogind])
[https://github.com/elogind/elogind/issues],
[elogind],
[https://github.com/elogind/elogind])
@@
-358,6
+358,7
@@
AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = "xyes"])
# ------------------------------------------------------------------------------
AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers not found])])
# ------------------------------------------------------------------------------
AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers not found])])
+AC_CHECK_HEADERS([sys/mman.h], [], [])
AC_CHECK_HEADERS([linux/memfd.h], [], [])
AC_CHECK_HEADERS([linux/vm_sockets.h], [], [], [#include <sys/socket.h>])
AC_CHECK_HEADERS([linux/memfd.h], [], [])
AC_CHECK_HEADERS([linux/vm_sockets.h], [], [], [#include <sys/socket.h>])
@@
-399,6
+400,9
@@
AC_CHECK_DECLS([
#include <sched.h>
#include <string.h>
#include <linux/loop.h>
#include <sched.h>
#include <string.h>
#include <linux/loop.h>
+#ifdef HAVE_SYS_MMAN_H
+#include <sys/mman.h>
+#endif
]])
AC_CHECK_DECLS([getrandom],
]])
AC_CHECK_DECLS([getrandom],
@@
-768,7
+772,7
@@
AX_NORMALIZE_PATH([with_rootlibdir])
AC_ARG_WITH([rootlibexecdir],
AS_HELP_STRING([--with-rootlibexecdir=DIR], [Root directory for executables necessary for boot]),
[],
AC_ARG_WITH([rootlibexecdir],
AS_HELP_STRING([--with-rootlibexecdir=DIR], [Root directory for executables necessary for boot]),
[],
- [with_rootlibexecdir=${
libdir}/libexec
])
+ [with_rootlibexecdir=${
with_rootprefix}/lib/elogind
])
AX_NORMALIZE_PATH([with_rootlibexecdir])
AC_ARG_WITH([pamlibdir],
AX_NORMALIZE_PATH([with_rootlibexecdir])
AC_ARG_WITH([pamlibdir],