forked from enlightenment/efl
Fix systemd detection
The EFL_OPTIONAL_DEPEND_PKG sets have_systemd=no before checking, so we need to pass the want variable instead or it will always be disabled.
This commit is contained in:
parent
23264ae09c
commit
bdbf74f882
|
@ -292,10 +292,8 @@ AM_CONDITIONAL([HAVE_CRYPTO_OPENSSL], [test "${build_crypto}" = "openssl"])
|
||||||
# check for systemd library if requested
|
# check for systemd library if requested
|
||||||
if test "x{want_systemd}" = "xyes"; then
|
if test "x{want_systemd}" = "xyes"; then
|
||||||
PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon],
|
PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon],
|
||||||
[have_systemd="yes"],
|
[want_systemd="yes"],
|
||||||
[have_systemd="no"])
|
[want_systemd="no"])
|
||||||
else
|
|
||||||
have_systemd="no"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#### Checks for header files
|
#### Checks for header files
|
||||||
|
@ -1747,7 +1745,7 @@ if test "x${have_glib}" = "xno"; then
|
||||||
want_g_main_loop="no"
|
want_g_main_loop="no"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
EFL_OPTIONAL_DEPEND_PKG([ECORE], [${have_systemd}], [SYSTEMD], [libsystemd-daemon])
|
EFL_OPTIONAL_DEPEND_PKG([ECORE], [${want_systemd}], [SYSTEMD], [libsystemd-daemon])
|
||||||
|
|
||||||
EFL_ADD_FEATURE([ECORE], [systemd-daemon], [${have_systemd}])
|
EFL_ADD_FEATURE([ECORE], [systemd-daemon], [${have_systemd}])
|
||||||
EFL_ADD_FEATURE([ECORE], [glib])
|
EFL_ADD_FEATURE([ECORE], [glib])
|
||||||
|
|
Loading…
Reference in New Issue