diff options
| author | Lukas Slebodnik <lslebodn@redhat.com> | 2016-06-28 11:28:24 +0200 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2016-06-29 21:45:20 +0200 |
| commit | 7b308bfdac1f6cdc08502d69d49682a1f9aefe06 (patch) | |
| tree | 4a976323d7ca24df5dc5c5c58e0c0e9b8b9f5502 | |
| parent | b54cd7caf6b73b36b68fcefc0cad39a626690398 (diff) | |
| download | sssd-7b308bfdac1f6cdc08502d69d49682a1f9aefe06.tar.gz sssd-7b308bfdac1f6cdc08502d69d49682a1f9aefe06.tar.xz sssd-7b308bfdac1f6cdc08502d69d49682a1f9aefe06.zip | |
BUILD: Fix detection of systemd
The macro AM_COND_IF must be called after AM_CONDITIONAL
Otherwise it will consider that condition is true.
As a result of this the header file config.h had defined
macro HAVE_SYSTEMD on all platforms
Our macro AM_CHECK_SYSTEMD was removed becuase it was needed
in src/external/systemd.m4 and should not be invoked later
in configure.ac
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/external/systemd.m4 | 39 |
2 files changed, 19 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index 0d3573c84..dbfdeb40f 100644 --- a/configure.ac +++ b/configure.ac @@ -350,10 +350,6 @@ if test x$HAVE_SEMANAGE != x -a x$HAVE_SELINUX != x; then AM_CHECK_SEMANAGE fi -if test x$HAVE_SYSTEMD_UNIT != x; then - AM_CHECK_SYSTEMD -fi - dnl If journald was selected for logging, configure journald if test x$syslog = xjournald; then AM_CHECK_JOURNALD diff --git a/src/external/systemd.m4 b/src/external/systemd.m4 index 87c93f508..f2aeda116 100644 --- a/src/external/systemd.m4 +++ b/src/external/systemd.m4 @@ -1,32 +1,31 @@ -dnl There are no module libsystemd-journal and libsystem-login -dnl up systemd version 209 +dnl A macro to check presence of systemd on the system +PKG_CHECK_EXISTS([systemd], + [HAVE_SYSTEMD=yes], + [HAVE_SYSTEMD=no]) + +dnl Libraries libsystemd-journal and libsystem-login are deprecarted +dnl since systemd 209 and are removed in systemd 230. The library libsystemd +dnl is replacement of libsystemd-{login,journal,daemon,id128} libraries PKG_CHECK_EXISTS([libsystemd], [HAVE_LIBSYSTEMD=yes], [HAVE_LIBSYSTEMD=no]) -dnl A macro to check presence of systemd on the system -AC_DEFUN([AM_CHECK_SYSTEMD], -[ - PKG_CHECK_EXISTS(systemd, - [ HAVE_SYSTEMD=1, AC_SUBST(HAVE_SYSTEMD) ], - [AC_MSG_ERROR([Could not detect systemd presence])]) -]) - AS_IF([test x$HAVE_LIBSYSTEMD = xyes], [login_lib_name=libsystemd], [login_lib_name=libsystemd-login]) -AM_COND_IF([HAVE_SYSTEMD], - [AC_DEFINE_UNQUOTED([HAVE_SYSTEMD], 1, [Build with libsystemd support])], - [AC_MSG_NOTICE([Build without libsystemd support])]) +AS_IF([test x$HAVE_SYSTEMD = xyes], + [AC_DEFINE_UNQUOTED([HAVE_SYSTEMD], 1, [Build with systemd support])], + [AC_MSG_NOTICE([Build without systemd support])]) -AM_COND_IF([HAVE_SYSTEMD], - [PKG_CHECK_MODULES([SYSTEMD_LOGIN], - [$login_lib_name], - [AC_DEFINE_UNQUOTED([HAVE_SYSTEMD_LOGIN], 1, - [Build with libsystemdlogin support]) - ], - [AC_MSG_NOTICE([Build without libsystemd-login support])])]) +AS_IF([test x$HAVE_SYSTEMD = xyes], + [PKG_CHECK_MODULES( + [SYSTEMD_LOGIN], + [$login_lib_name], + [AC_DEFINE_UNQUOTED([HAVE_SYSTEMD_LOGIN], 1, + [Build with $login_lib_name support])], + [AC_MSG_NOTICE([Build without $login_lib_name support])])], + [AC_MSG_NOTICE([Build without $login_lib_name support])]) dnl A macro to check presence of journald on the system AC_DEFUN([AM_CHECK_JOURNALD], |