Attachment #453040 for bug #599494

Lines 32-37 Link Here

(-)a/dbus/dbus-userdb-util.c (-1 / +4 lines)
32	#if HAVE_SYSTEMD	32	#if HAVE_SYSTEMD
33	#include <systemd/sd-login.h>	33	#include <systemd/sd-login.h>
34	#endif	34	#endif
		35	#if HAVE_ELOGIND
		36	#include <elogind/sd-login.h>
		37	#endif
35		38
36	/**	39	/**
37	* @addtogroup DBusInternalsUtils	40	* @addtogroup DBusInternalsUtils
Lines 54-60 Link Here
54	const DBusUserInfo *info;	57	const DBusUserInfo *info;
55	dbus_bool_t result = FALSE;	58	dbus_bool_t result = FALSE;
56		59
57	#ifdef HAVE_SYSTEMD	60	#if defined(HAVE_SYSTEMD) \|\| defined(HAVE_ELOGIND)
58	/* check if we have logind */	61	/* check if we have logind */
59	if (access ("/run/systemd/seats/", F_OK) >= 0)	62	if (access ("/run/systemd/seats/", F_OK) >= 0)
60	{	63	{




AC_ARG_ENABLE(kqueue, AS_HELP_STRING([--enable-kqueue],[build with kqueue support]),enable_kqueue=$enableval,enable_kqueue=auto)
AC_ARG_ENABLE(console-owner-file, AS_HELP_STRING([--enable-console-owner-file],[enable console owner file]),enable_console_owner_file=$enableval,enable_console_owner_file=auto)
AC_ARG_ENABLE(launchd, AS_HELP_STRING([--enable-launchd],[build with launchd auto-launch support]),enable_launchd=$enableval,enable_launchd=auto)
AC_ARG_ENABLE(elogind, AS_HELP_STRING([--enable-elogind],[build with elogind user seat support]),enable_elogind=$enableval,enable_elogind=auto)
AC_ARG_ENABLE(systemd, AS_HELP_STRING([--enable-systemd],[build with systemd at_console support]),enable_systemd=$enableval,enable_systemd=auto)

AC_ARG_WITH(init-scripts, AS_HELP_STRING([--with-init-scripts=[redhat]],[Style of init scripts to install]))


AM_CONDITIONAL(HAVE_CONSOLE_OWNER_FILE, test x$have_console_owner_file = xyes)

dnl elogind detection
if test x$enable_elogind = xno ; then
    have_elogind=no;
else
    PKG_CHECK_MODULES([ELOGIND],
        [libelogind >= 209],
        [have_elogind=yes],
        [have_elogind=no])
fi

if test x$have_elogind = xyes; then
    AC_DEFINE(HAVE_ELOGIND,1,[Have elogind])
fi

if test x$enable_elogind = xyes -a x$have_elogind != xyes ; then
    AC_MSG_ERROR([Explicitly requested elogind support, but libelogind not found])
fi

dnl systemd detection
if test x$enable_systemd = xno ; then
    have_systemd=no;

fi

#### Set up final flags
LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs $SYSTEMD_LIBS $ELOGIND_LIBS"
AC_SUBST([LIBDBUS_LIBS])

### X11 detection

        Building AppArmor support: ${have_apparmor}
        Building inotify support: ${have_inotify}
        Building kqueue support:  ${have_kqueue}
        Building elogind support: ${have_elogind}
        Building systemd support: ${have_systemd}
        Building X11 code:        ${have_x11}
        Building Doxygen docs:    ${enable_doxygen_docs}

Return to bug 599494

Lines 185-190 Link Here

(-)a/configure.ac (-1 / +21 lines)
185	AC_ARG_ENABLE(kqueue, AS_HELP_STRING([--enable-kqueue],[build with kqueue support]),enable_kqueue=$enableval,enable_kqueue=auto)	185	AC_ARG_ENABLE(kqueue, AS_HELP_STRING([--enable-kqueue],[build with kqueue support]),enable_kqueue=$enableval,enable_kqueue=auto)
186	AC_ARG_ENABLE(console-owner-file, AS_HELP_STRING([--enable-console-owner-file],[enable console owner file]),enable_console_owner_file=$enableval,enable_console_owner_file=auto)	186	AC_ARG_ENABLE(console-owner-file, AS_HELP_STRING([--enable-console-owner-file],[enable console owner file]),enable_console_owner_file=$enableval,enable_console_owner_file=auto)
187	AC_ARG_ENABLE(launchd, AS_HELP_STRING([--enable-launchd],[build with launchd auto-launch support]),enable_launchd=$enableval,enable_launchd=auto)	187	AC_ARG_ENABLE(launchd, AS_HELP_STRING([--enable-launchd],[build with launchd auto-launch support]),enable_launchd=$enableval,enable_launchd=auto)
		188	AC_ARG_ENABLE(elogind, AS_HELP_STRING([--enable-elogind],[build with elogind user seat support]),enable_elogind=$enableval,enable_elogind=auto)
188	AC_ARG_ENABLE(systemd, AS_HELP_STRING([--enable-systemd],[build with systemd at_console support]),enable_systemd=$enableval,enable_systemd=auto)	189	AC_ARG_ENABLE(systemd, AS_HELP_STRING([--enable-systemd],[build with systemd at_console support]),enable_systemd=$enableval,enable_systemd=auto)
189		190
190	AC_ARG_WITH(init-scripts, AS_HELP_STRING([--with-init-scripts=[redhat]],[Style of init scripts to install]))	191	AC_ARG_WITH(init-scripts, AS_HELP_STRING([--with-init-scripts=[redhat]],[Style of init scripts to install]))
Lines 1184-1189 Link Here
1184		1185
1185	AM_CONDITIONAL(HAVE_CONSOLE_OWNER_FILE, test x$have_console_owner_file = xyes)	1186	AM_CONDITIONAL(HAVE_CONSOLE_OWNER_FILE, test x$have_console_owner_file = xyes)
1186		1187
		1188	dnl elogind detection
		1189	if test x$enable_elogind = xno ; then
		1190	have_elogind=no;
		1191	else
		1192	PKG_CHECK_MODULES([ELOGIND],
		1193	[libelogind >= 209],
		1194	[have_elogind=yes],
		1195	[have_elogind=no])
		1196	fi
		1197
		1198	if test x$have_elogind = xyes; then
		1199	AC_DEFINE(HAVE_ELOGIND,1,[Have elogind])
		1200	fi
		1201
		1202	if test x$enable_elogind = xyes -a x$have_elogind != xyes ; then
		1203	AC_MSG_ERROR([Explicitly requested elogind support, but libelogind not found])
		1204	fi
		1205
1187	dnl systemd detection	1206	dnl systemd detection
1188	if test x$enable_systemd = xno ; then	1207	if test x$enable_systemd = xno ; then
1189	have_systemd=no;	1208	have_systemd=no;
Lines 1290-1296 Link Here
1290	fi	1309	fi
1291		1310
1292	#### Set up final flags	1311	#### Set up final flags
1293	LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs $SYSTEMD_LIBS"	1312	LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs $SYSTEMD_LIBS $ELOGIND_LIBS"
1294	AC_SUBST([LIBDBUS_LIBS])	1313	AC_SUBST([LIBDBUS_LIBS])
1295		1314
1296	### X11 detection	1315	### X11 detection
Lines 1949-1954 Link Here
1949	Building AppArmor support: ${have_apparmor}	1968	Building AppArmor support: ${have_apparmor}
1950	Building inotify support: ${have_inotify}	1969	Building inotify support: ${have_inotify}
1951	Building kqueue support: ${have_kqueue}	1970	Building kqueue support: ${have_kqueue}
		1971	Building elogind support: ${have_elogind}
1952	Building systemd support: ${have_systemd}	1972	Building systemd support: ${have_systemd}
1953	Building X11 code: ${have_x11}	1973	Building X11 code: ${have_x11}
1954	Building Doxygen docs: ${enable_doxygen_docs}	1974	Building Doxygen docs: ${enable_doxygen_docs}