colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: drop HAVE_SYSTEMD define

Browse Source 
It's unused.

https://github.com/NetworkManager/NetworkManager/pull/346
This commit is contained in:
Lubomir Rintel
2019-04-15 16:02:57 +02:00
parent 7bd06ce4c6
commit 9865b484fa
3 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config.h.meson
View File

@@ -49,9 +49,6 @@
/* Define to 1 if you have the <sys/auxv.h> header file. */ /* Define to 1 if you have the <sys/auxv.h> header file. */
#mesondefine HAVE_SYS_AUXV_H #mesondefine HAVE_SYS_AUXV_H
/* Define if systemd support is available */
#mesondefine HAVE_SYSTEMD
/* Define if you have Linux Wireless Extensions support */ /* Define if you have Linux Wireless Extensions support */
#mesondefine HAVE_WEXT #mesondefine HAVE_WEXT

3
configure.ac
View File

@@ -299,9 +299,6 @@ AS_IF([test -z "$with_systemdsystemunitdir"], with_systemdsystemunitdir=no)
AM_CONDITIONAL(HAVE_SYSTEMD, [test "$with_systemdsystemunitdir" != no]) AM_CONDITIONAL(HAVE_SYSTEMD, [test "$with_systemdsystemunitdir" != no])
if test "$with_systemdsystemunitdir" != no; then if test "$with_systemdsystemunitdir" != no; then
AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) 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 fi
PKG_CHECK_MODULES(SYSTEMD_200, [systemd >= 200], [have_systemd_200=yes], [have_systemd_200=no]) PKG_CHECK_MODULES(SYSTEMD_200, [systemd >= 200], [have_systemd_200=yes], [have_systemd_200=no])

1
meson.build
View File

@@ -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') 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') systemd_system_unit_dir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
endif endif
config_h.set10('HAVE_SYSTEMD', install_systemd_unit_dir)
enable_systemd_journal = get_option('systemd_journal') enable_systemd_journal = get_option('systemd_journal')
if enable_systemd_journal if enable_systemd_journal