From 9865b484faca239686c424afc769e3cd19a76db9 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 15 Apr 2019 16:02:57 +0200 Subject: [PATCH] build: drop HAVE_SYSTEMD define It's unused. https://github.com/NetworkManager/NetworkManager/pull/346 --- config.h.meson | 3 --- configure.ac | 3 --- meson.build | 1 - 3 files changed, 7 deletions(-) diff --git a/config.h.meson b/config.h.meson index d63f48338..d4efd49f5 100644 --- a/config.h.meson +++ b/config.h.meson @@ -49,9 +49,6 @@ /* Define to 1 if you have the header file. */ #mesondefine HAVE_SYS_AUXV_H -/* Define if systemd support is available */ -#mesondefine HAVE_SYSTEMD - /* Define if you have Linux Wireless Extensions support */ #mesondefine HAVE_WEXT diff --git a/configure.ac b/configure.ac index 31b13e8f5..d080ef760 100644 --- a/configure.ac +++ b/configure.ac @@ -299,9 +299,6 @@ AS_IF([test -z "$with_systemdsystemunitdir"], with_systemdsystemunitdir=no) AM_CONDITIONAL(HAVE_SYSTEMD, [test "$with_systemdsystemunitdir" != no]) if test "$with_systemdsystemunitdir" != no; then AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) - AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd support is available]) -else - AC_DEFINE(HAVE_SYSTEMD, 0, [Define if systemd support is available]) fi PKG_CHECK_MODULES(SYSTEMD_200, [systemd >= 200], [have_systemd_200=yes], [have_systemd_200=no]) diff --git a/meson.build b/meson.build index 9676f319e..ed8c3568b 100644 --- a/meson.build +++ b/meson.build @@ -311,7 +311,6 @@ if install_systemd_unit_dir and systemd_system_unit_dir == '' assert(systemd_dep.found(), 'systemd required but not found, please provide a valid systemd user unit dir or disable it') systemd_system_unit_dir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir') endif -config_h.set10('HAVE_SYSTEMD', install_systemd_unit_dir) enable_systemd_journal = get_option('systemd_journal') if enable_systemd_journal