Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 667592
Collapse All | Expand All

(-)a/configure.ac (-1 / +29 lines)
Lines 1235-1240 AC_ARG_ENABLE([systemd-login], Link Here
1235
AC_ARG_ENABLE([systemd-journal],
1235
AC_ARG_ENABLE([systemd-journal],
1236
    AS_HELP_STRING([--disable-systemd-journal],[Disable optional systemd journal support]))
1236
    AS_HELP_STRING([--disable-systemd-journal],[Disable optional systemd journal support]))
1237
1237
1238
#### elogind support (optional) ####
1239
1240
AC_ARG_ENABLE([elogind-login],
1241
    AS_HELP_STRING([--disable-elogind-login],[Disable optional elogind login support]))
1242
1238
# Newer systemd's combine their subcomponent libraries into one
1243
# Newer systemd's combine their subcomponent libraries into one
1239
# If it exists, we should use it for the further checks
1244
# If it exists, we should use it for the further checks
1240
1245
Lines 1282-1287 AC_SUBST(HAVE_SYSTEMD_LOGIN) Link Here
1282
AM_CONDITIONAL([HAVE_SYSTEMD_LOGIN], [test "x$HAVE_SYSTEMD_LOGIN" = x1])
1287
AM_CONDITIONAL([HAVE_SYSTEMD_LOGIN], [test "x$HAVE_SYSTEMD_LOGIN" = x1])
1283
AS_IF([test "x$HAVE_SYSTEMD_LOGIN" = "x1"], AC_DEFINE([HAVE_SYSTEMD_LOGIN], 1, [Have SYSTEMDLOGIN?]))
1288
AS_IF([test "x$HAVE_SYSTEMD_LOGIN" = "x1"], AC_DEFINE([HAVE_SYSTEMD_LOGIN], 1, [Have SYSTEMDLOGIN?]))
1284
1289
1290
#### elogind login support (optional) ####
1291
1292
AS_IF([test "x$enable_systemd_login" = "xyes" && test "x$enable_elogind_login" != "xno"],
1293
    [AC_MSG_ERROR([*** Can't enable systemd-logind and elogind at the same time])])
1294
1295
# Because elogind is a drop-in replacement for systemd's logind we just pretend that
1296
# we have logind here, so that we don't have to modify any source files
1297
if test "x$enable_elogind_login" != "xno"; then
1298
    PKG_CHECK_MODULES(LIBELOGIND, [ libelogind ], HAVE_ELOGIND_LOGIN=1, HAVE_ELOGIND_LOGIN=0)
1299
    SYSTEMDLOGIN_CFLAGS="$LIBELOGIND_CFLAGS"
1300
    SYSTEMDLOGIN_LIBS="$LIBELOGIND_LIBS"
1301
    AC_SUBST(HAVE_ELOGIND_LOGIN)
1302
    AC_SUBST(SYSTEMDLOGIN_CFLAGS)
1303
    AC_SUBST(SYSTEMDLOGIN_LIBS)
1304
fi
1305
1306
AS_IF([test "x$enable_elogind_login" = "xyes" && test "x$HAVE_ELOGIND_LOGIN" = "x0"],
1307
    [AC_MSG_ERROR([*** Needed elogind login support not found])])
1308
1309
AM_CONDITIONAL([HAVE_ELOGIND_LOGIN], [test "x$HAVE_ELOGIND_LOGIN" = x1])
1310
AS_IF([test "x$HAVE_ELOGIND_LOGIN" = "x1"], AC_DEFINE([HAVE_SYSTEMD_LOGIN], 1, [Have SYSTEMDLOGIN?]))
1311
1285
#### systemd journal support (optional) ####
1312
#### systemd journal support (optional) ####
1286
1313
1287
AS_IF([test "x$enable_systemd_journal" != "xno"],
1314
AS_IF([test "x$enable_systemd_journal" != "xno"],
Lines 1607-1612 AS_IF([test "x$HAVE_ESOUND" = "x1" -a "x$USE_PER_USER_ESOUND_SOCKET" = "x1"], EN Link Here
1607
AS_IF([test "x$HAVE_GCOV" = "x1"], ENABLE_GCOV=yes, ENABLE_GCOV=no)
1634
AS_IF([test "x$HAVE_GCOV" = "x1"], ENABLE_GCOV=yes, ENABLE_GCOV=no)
1608
AS_IF([test "x$HAVE_LIBCHECK" = "x1"], ENABLE_TESTS=yes, ENABLE_TESTS=no)
1635
AS_IF([test "x$HAVE_LIBCHECK" = "x1"], ENABLE_TESTS=yes, ENABLE_TESTS=no)
1609
AS_IF([test "x$enable_legacy_database_entry_format" != "xno"], ENABLE_LEGACY_DATABASE_ENTRY_FORMAT=yes, ENABLE_LEGACY_DATABASE_ENTRY_FORMAT=no)
1636
AS_IF([test "x$enable_legacy_database_entry_format" != "xno"], ENABLE_LEGACY_DATABASE_ENTRY_FORMAT=yes, ENABLE_LEGACY_DATABASE_ENTRY_FORMAT=no)
1637
AS_IF([test "x$HAVE_ELOGIND_LOGIN" = "x1"], ENABLE_ELOGIND_LOGIN=yes, ENABLE_ELOGIND_LOGIN=no)
1610
1638
1611
echo "
1639
echo "
1612
 ---{ $PACKAGE_NAME $VERSION }---
1640
 ---{ $PACKAGE_NAME $VERSION }---
Lines 1675-1680 echo " Link Here
1675
    Enable per-user EsounD socket: ${ENABLE_PER_USER_ESOUND_SOCKET}
1703
    Enable per-user EsounD socket: ${ENABLE_PER_USER_ESOUND_SOCKET}
1676
    Force preopen:                 ${FORCE_PREOPEN}
1704
    Force preopen:                 ${FORCE_PREOPEN}
1677
    Preopened modules:             ${PREOPEN_MODS}
1705
    Preopened modules:             ${PREOPEN_MODS}
1706
    Enable elogind:                ${ENABLE_ELOGIND_LOGIN}
1678
1707
1679
    Legacy Database Entry Support: ${ENABLE_LEGACY_DATABASE_ENTRY_FORMAT}
1708
    Legacy Database Entry Support: ${ENABLE_LEGACY_DATABASE_ENTRY_FORMAT}
1680
"
1709
"
1681
- 

Return to bug 667592