diff options
| author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2015-05-29 09:23:26 +0000 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2015-05-29 09:24:28 +0000 |
| commit | 2d968aed5381041d53d2f85037dcc3daf2377217 (patch) | |
| tree | fb9c4a0642c343a5b80c2cd8c1831990c3822022 | |
| parent | 3013a7c5cbd728dd9bc5516ffb4bd4f505888bd4 (diff) | |
| download | efl-baserock/jonathanmaw/tizen.tar.gz | |
Fix systemd dependenciesbaserock/jonathanmaw/tizen
One dependency statement has been expaneded to work with newer systemd.
The others were removed as I couldn't see a way to make it accept both
schemes for systemd.
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index eac6f65b7f..7a29acea16 100644 --- a/configure.ac +++ b/configure.ac @@ -675,8 +675,10 @@ AC_SUBST([USER_SESSION_DIR]) if test "x${have_systemd_pkg}" = "xauto" -o "x${have_systemd_pkg}" = "xyes"; then PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon >= 192 libsystemd-journal >= 192], - [have_systemd_pkg="yes"], - [have_systemd_pkg="no"]) + [have_systemd_pkg="yes"], + [PKG_CHECK_MODULES([SYSTEMD], [libsystemd], + [have_systemd_pkg="yes"], + [have_systemd_pkg="no"])]) fi # check for systemd library if requested @@ -888,8 +890,6 @@ AC_DEFINE_IF([EINA_COW_MAGIC_ON], [test "x${want_cow_magic}" = "xyes" ], [1], [Turn on Eina_Magic in Eina_Cow]) -EFL_OPTIONAL_DEPEND_PKG([EINA], [${want_systemd}], [SYSTEMD], [libsystemd-journal]) - EFL_EVAL_PKGS([EINA]) ## Examples @@ -2244,8 +2244,6 @@ if test "x${have_glib}" = "xno"; then want_g_main_loop="no" fi -EFL_OPTIONAL_DEPEND_PKG([ECORE], [${want_systemd}], [SYSTEMD], [libsystemd-daemon]) - EFL_ADD_FEATURE([ECORE], [systemd-daemon], [${want_systemd}]) EFL_ADD_FEATURE([ECORE], [glib]) EFL_ADD_FEATURE([ECORE], [g-main-loop]) @@ -2477,8 +2475,6 @@ else ecore_con_resolver="fork" fi -EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_systemd}], [SYSTEMD], [libsystemd-daemon]) - EFL_ADD_FEATURE([ECORE_CON], [cares]) EFL_ADD_FEATURE([ECORE_CON], [local-sockets], [${want_ecore_con_local_sockets}]) EFL_ADD_FEATURE([ECORE_CON], [abstract-sockets], [${want_ecore_con_abstract_sockets}]) @@ -3049,7 +3045,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [eeze]) EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [eo]) EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [eina]) -EFL_DEPEND_PKG([ECORE_DRM], [DRM], [libdrm >= 2.4 xkbcommon >= 0.3.0 libsystemd-login >= 192 gbm]) +EFL_DEPEND_PKG([ECORE_DRM], [DRM], [libdrm >= 2.4 xkbcommon >= 0.3.0 gbm]) EFL_EVAL_PKGS([ECORE_DRM]) |