Attachment #568086 for bug #646896

View | Details | Raw Unified | Return to bug 646896
Collapse All | Expand All




    fi
fi
AM_CONDITIONAL(HAVE_SYSTEMD, test "x$use_systemd" = "xyes")

dnl ====================================================================
dnl Check for elogind
dnl ====================================================================

AC_ARG_WITH(elogind,
	    AS_HELP_STRING([--with-elogind],
	    [Use libelogind instead of libsystemd-login]),,
	    with_elogind=auto)

use_elogind=no
ELOGIND_REQUIRED=239
if test "x$with_elogind" != "xno"; then
    PKG_CHECK_MODULES(LIBELOGIND,[libelogind], [use_elogind=yes],
                        [PKG_CHECK_MODULES([LIBELOGIND],[libelogind >= $LIBELOGIND_REQUIRED],
			[use_elogind=yes], [use_elogind=no])])

    if test "x$use_elogind" = "xyes"; then
        AC_DEFINE([HAVE_LOGIND], 1, [Define to 1 if libelogind is available])
        AC_DEFINE([HAVE_SYSTEMD], 1, [Define to 1 to reduce ifdefs])
        AC_SUBST(LIBELOGIND_CFLAGS)
        AC_SUBST(LIBELOGIND_LIBS)
    fi
fi
AM_CONDITIONAL(HAVE_LOGIND, [test "x$use_elogind" = "xyes"])

AC_SUBST(HAVE_SYSTEMD)
AC_SUBST(HAVE_LOGIND)

dnl ====================================================================
dnl Check for XSync extension


        Default WM:               ${with_default_wm}
        Systemd support:          ${use_systemd}
        Elogind support:          ${use_elogind}
        IPv6 support:             ${have_full_ipv6}
        Backtrace support:        ${have_backtrace}
        XRender support:          ${have_xrender}

Lines 7-12 noinst_PROGRAMS = \ Link Here

(-)a/mate-session/Makefile.am (-1 / +2 lines)
7	AM_CPPFLAGS = \	7	AM_CPPFLAGS = \
8	$(MATE_SESSION_CFLAGS) \	8	$(MATE_SESSION_CFLAGS) \
9	$(SYSTEMD_CFLAGS) \	9	$(SYSTEMD_CFLAGS) \
		10	$(LIBELOGIND_CFLAGS) \
10	$(DISABLE_DEPRECATED_CFLAGS)	11	$(DISABLE_DEPRECATED_CFLAGS)
11		12
12	AM_CFLAGS = $(WARN_CFLAGS)	13	AM_CFLAGS = $(WARN_CFLAGS)
Lines 80-85 mate_session_LDADD = \ Link Here
80	$(XEXT_LIBS) \	81	$(XEXT_LIBS) \
81	$(MATE_SESSION_LIBS) \	82	$(MATE_SESSION_LIBS) \
82	$(SYSTEMD_LIBS) \	83	$(SYSTEMD_LIBS) \
		84	$(LIBELOGIND_LIBS) \
83	$(EXECINFO_LIBS)	85	$(EXECINFO_LIBS)
84		86
85	libgsmutil_la_SOURCES = \	87	libgsmutil_la_SOURCES = \
86	-

Return to bug 646896

Lines 107-113 if test "x$with_systemd" != "xno" ; then Link Here

(-)a/configure.ac (+28 lines)
107	fi	107	fi
108	fi	108	fi
109	AM_CONDITIONAL(HAVE_SYSTEMD, test "x$use_systemd" = "xyes")	109	AM_CONDITIONAL(HAVE_SYSTEMD, test "x$use_systemd" = "xyes")
		110
		111	dnl ====================================================================
		112	dnl Check for elogind
		113	dnl ====================================================================
		114
		115	AC_ARG_WITH(elogind,
		116	AS_HELP_STRING([--with-elogind],
		117	[Use libelogind instead of libsystemd-login]),,
		118	with_elogind=auto)
		119
		120	use_elogind=no
		121	ELOGIND_REQUIRED=239
		122	if test "x$with_elogind" != "xno"; then
		123	PKG_CHECK_MODULES(LIBELOGIND,[libelogind], [use_elogind=yes],
		124	[PKG_CHECK_MODULES([LIBELOGIND],[libelogind >= $LIBELOGIND_REQUIRED],
		125	[use_elogind=yes], [use_elogind=no])])
		126
		127	if test "x$use_elogind" = "xyes"; then
		128	AC_DEFINE([HAVE_LOGIND], 1, [Define to 1 if libelogind is available])
		129	AC_DEFINE([HAVE_SYSTEMD], 1, [Define to 1 to reduce ifdefs])
		130	AC_SUBST(LIBELOGIND_CFLAGS)
		131	AC_SUBST(LIBELOGIND_LIBS)
		132	fi
		133	fi
		134	AM_CONDITIONAL(HAVE_LOGIND, [test "x$use_elogind" = "xyes"])
		135
110	AC_SUBST(HAVE_SYSTEMD)	136	AC_SUBST(HAVE_SYSTEMD)
		137	AC_SUBST(HAVE_LOGIND)
111		138
112	dnl ====================================================================	139	dnl ====================================================================
113	dnl Check for XSync extension	140	dnl Check for XSync extension
Lines 333-338 echo " Link Here
333		360
334	Default WM: ${with_default_wm}	361	Default WM: ${with_default_wm}
335	Systemd support: ${use_systemd}	362	Systemd support: ${use_systemd}
		363	Elogind support: ${use_elogind}
336	IPv6 support: ${have_full_ipv6}	364	IPv6 support: ${have_full_ipv6}
337	Backtrace support: ${have_backtrace}	365	Backtrace support: ${have_backtrace}
338	XRender support: ${have_xrender}	366	XRender support: ${have_xrender}