[PATCH] configure.ac: enable systemd socket activation in libxtrans

[Łukasz Stelmach]

It was <2013-12-02 pon 20:47>, when Hans de Goede wrote:
> From: Łukasz Stelmach <l.stelmach at samsung.com>
>
> Signed-off-by: Łukasz Stelmach <l.stelmach at samsung.com>
> Signed-off-by: Hans de Goede <hdegoede at redhat.com>
> ---
>  configure.ac | 22 +++++++++++++++++++++-
>  1 file changed, 21 insertions(+), 1 deletion(-)
>

I've just found in my repo a bit that is missing from this patch
which was a part of v4[1].

--8<---------------cut here---------------start------------->8---
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index a643dfc..841d4ed 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -196,6 +196,9 @@
 /* Define to 1 if you have the `strndup' function. */
 #undef HAVE_STRNDUP
 
+/* Define if libsystemd-daemon is available */
+#undef HAVE_SYSTEMD
+
 /* Define to 1 if SYSV IPC is available */
 #undef HAVE_SYSV_IPC
--8<---------------cut here---------------end--------------->8---

>
> 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] http://thread.gmane.org/gmane.comp.freedesktop.xorg.devel/36092/focus=37696

-- 
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 489 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20131211/2fa477f7/attachment.pgp>