From: Łukasz Stelmach <[email protected]>
Signed-off-by: Łukasz Stelmach <[email protected]>
Signed-off-by: Hans de Goede <[email protected]>
---
configure.ac | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 6c4a609..65d8e91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -801,7 +801,7 @@ FIXESPROTO="fixesproto >= 5.0"
DAMAGEPROTO="damageproto >= 1.1"
XCMISCPROTO="xcmiscproto >= 1.2.0"
BIGREQSPROTO="bigreqsproto >= 1.1.0"
-XTRANS="xtrans >= 1.3.2"
+XTRANS="xtrans >= 1.3.3"
PRESENTPROTO="presentproto >= 1.0"
dnl List of libraries that require a specific version
@@ -832,6 +832,26 @@ AC_SUBST(SDK_REQUIRED_MODULES)
REQUIRED_MODULES="$FIXESPROTO $DAMAGEPROTO $XCMISCPROTO $XTRANS $BIGREQSPROTO
$SDK_REQUIRED_MODULES"
+dnl systemd socket activation
+dnl activate the code in libxtrans that grabs systemd's socket fds
+AC_ARG_WITH([systemd],
+ AS_HELP_STRING([--with-systemd],
+ [support systemd socket activation (default: auto)]),
+ [WITH_SYSTEMD=$withval], [WITH_SYSTEMD=auto])
+PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon], [HAVE_SYSTEMD=yes],
+ [HAVE_SYSTEMD=no])
+if test "x$WITH_SYSTEMD" = xauto; then
+ WITH_SYSTEMD="$HAVE_SYSTEMD"
+fi
+if test "x$WITH_SYSTEMD" = xyes; then
+ if "x$HAVE_SYSTEMD" = xno; then
+ AC_MSG_ERROR([systemd support requested but no library has been
found])
+ fi
+ AC_DEFINE(HAVE_SYSTEMD, 1, [Define if libsystemd-daemon is available])
+ REQUIRED_LIBS="$REQUIRED_LIBS libsystemd-daemon"
+fi
+AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$HAVE_SYSTEMD" = "xyes"])
+
if test "x$CONFIG_UDEV" = xyes &&
{ test "x$CONFIG_DBUS_API" = xyes || test "x$CONFIG_HAL" = xyes; }; then
AC_MSG_ERROR([Hotplugging through both libudev and dbus/hal not
allowed])
--
1.8.4.2
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
