Changeset 14733 for trunk/configure.ac


Ignore:
Timestamp:
Apr 23, 2016, 4:13:25 PM (6 years ago)
Author:
mikedld
Message:

#5921: Use libsystemd instead of libsystemd-daemon (original patches by Sandro Tosi and Mike Gilbert)

In systemd v209, released over two years ago, the various libsystemd-*
libraries (libsystemd-journal.so, libsystemd-login.so, libsystem-daemon.so,
libsystemd-id128.so) were merged into a single libsystemd.so library to
reduce code duplication and avoid cyclic dependencies.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r14715 r14733  
    241241
    242242# Check whether to enable systemd startup notification.
    243 # This requires libsystemd-daemon.
    244 AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon],
     243# This requires libsystemd.
     244AC_ARG_WITH([systemd], AS_HELP_STRING([--with-systemd],
    245245            [Add support for systemd startup notification (default is autodetected)]),
    246             [USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto])
    247 AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [
    248     PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
    249         [AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])],
    250         [AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"],
    251             [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])]
     246            [USE_SYSTEMD=$withval], [USE_SYSTEMD=auto])
     247AS_IF([test "x$USE_SYSTEMD" != "xno"], [
     248    PKG_CHECK_MODULES([SYSTEMD], [libsystemd],
     249        [AC_DEFINE(USE_SYSTEMD,1,[Use systemd startup notification])],
     250        [AS_IF([test "x$USE_SYSTEMD" = "xyes"],
     251            [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd not found.])]
    252252        )]
    253253    )
Note: See TracChangeset for help on using the changeset viewer.