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 e67cbdd607c6e2d8321fe4fb5444adb858c8f1e4..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],
@@
-765,6
+769,12
@@
AC_ARG_WITH([rootlibdir],
[with_rootlibdir=${libdir}])
AX_NORMALIZE_PATH([with_rootlibdir])
[with_rootlibdir=${libdir}])
AX_NORMALIZE_PATH([with_rootlibdir])
+AC_ARG_WITH([rootlibexecdir],
+ AS_HELP_STRING([--with-rootlibexecdir=DIR], [Root directory for executables necessary for boot]),
+ [],
+ [with_rootlibexecdir=${with_rootprefix}/lib/elogind])
+AX_NORMALIZE_PATH([with_rootlibexecdir])
+
AC_ARG_WITH([pamlibdir],
AS_HELP_STRING([--with-pamlibdir=DIR], [directory for PAM modules]),
[],
AC_ARG_WITH([pamlibdir],
AS_HELP_STRING([--with-pamlibdir=DIR], [directory for PAM modules]),
[],
@@
-848,6
+858,7
@@
AC_SUBST([pamlibdir], [$with_pamlibdir])
AC_SUBST([pamconfdir], [$with_pamconfdir])
AC_SUBST([rootprefix], [$with_rootprefix])
AC_SUBST([rootlibdir], [$with_rootlibdir])
AC_SUBST([pamconfdir], [$with_pamconfdir])
AC_SUBST([rootprefix], [$with_rootprefix])
AC_SUBST([rootlibdir], [$with_rootlibdir])
+AC_SUBST([rootlibexecdir], [$with_rootlibexecdir])
AC_SUBST([cgroup_controller], [$with_cgroupctrl])
AC_CONFIG_FILES([
AC_SUBST([cgroup_controller], [$with_cgroupctrl])
AC_CONFIG_FILES([
@@
-883,6
+894,7
@@
AC_MSG_RESULT([
includedir: . . . . . . . . . . . ${includedir}
lib dir: . . . . . . . . . . . . . ${libdir}
rootlib dir: . . . . . . . . . . . ${with_rootlibdir}
includedir: . . . . . . . . . . . ${includedir}
lib dir: . . . . . . . . . . . . . ${libdir}
rootlib dir: . . . . . . . . . . . ${with_rootlibdir}
+ rootlibexec dir: . . . . . . . . . ${with_rootlibexecdir}
PAM modules dir: . . . . . . . . . ${with_pamlibdir}
PAM configuration dir: . . . . . . ${with_pamconfdir}
D-Bus policy dir: . . . . . . . . ${with_dbuspolicydir}
PAM modules dir: . . . . . . . . . ${with_pamlibdir}
PAM configuration dir: . . . . . . ${with_pamconfdir}
D-Bus policy dir: . . . . . . . . ${with_dbuspolicydir}