diff options
| author | Marcel Hollerbach <marcel-hollerbach@t-online.de> | 2015-08-25 10:52:47 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@osg.samsung.com> | 2015-08-25 10:52:47 +0200 |
| commit | 46e9eed2c4d7cf100959dc5b9b747335a980cebe (patch) | |
| tree | 5c5e6cc07368fbfe1ead814aa1fd30c74bdba3ac | |
| parent | 1f1542f82404fa2262526cc3eed7b2edc622c5ce (diff) | |
| download | efl-46e9eed2c4d7cf100959dc5b9b747335a980cebe.tar.gz | |
build: replace libsystemd-{daemon, journal} with libsystemd
Summary:
since all the libs got merged into libsystemd in 209, we can just check
for libsystemd
Reviewers: cedric
Subscribers: stefan_schmidt, morlenxus
Differential Revision: https://phab.enlightenment.org/D2984
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | src/Makefile_Ecore_Drm.am | 4 | ||||
| -rw-r--r-- | src/lib/ecore_drm/ecore_drm_private.h | 2 |
3 files changed, 8 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 88c54fbe44..01c7850290 100644 --- a/configure.ac +++ b/configure.ac @@ -696,24 +696,18 @@ AM_CONDITIONAL([HAVE_SYSTEMD_USER_SESSION], [test "x${have_systemd_user_session} 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], + PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209], [have_systemd_pkg="yes"], [have_systemd_pkg="no"]) fi -PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login >= 198], - [have_systemd_login=yes], [have_systemd_login=no]) -AS_IF([test "x$have_systemd_login" = "xyes"], - [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])]) -AM_CONDITIONAL(HAVE_SYSTEMD_LOGIN, test "x$have_systemd_login" = "xyes") - # check for systemd library if requested if test "x${want_systemd}" = "xyes" -a "x${have_systemd_pkg}" = "xno"; then AC_MSG_ERROR([Systemd dependency requested but not found]) fi AM_CONDITIONAL([WANT_SYSTEMD], [test "${want_systemd}" = "yes"]) - +AM_CONDITIONAL([HAVE_SYSTEMD], [test "${want_systemd}" = "yes" -a "${have_systemd_pkg}" = "yes"]) #### Platform-dependent DL_LIBS="" DL_INTERNAL_LIBS="" @@ -925,7 +919,7 @@ 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_OPTIONAL_DEPEND_PKG([EINA], [${want_systemd}], [SYSTEMD], [libsystemd]) EFL_EVAL_PKGS([EINA]) @@ -2357,7 +2351,7 @@ if test "x${have_glib}" = "xno"; then want_g_main_loop="no" fi -EFL_OPTIONAL_DEPEND_PKG([ECORE], [${want_systemd}], [SYSTEMD], [libsystemd-daemon]) +EFL_OPTIONAL_DEPEND_PKG([ECORE], [${want_systemd}], [SYSTEMD], [libsystemd]) EFL_ADD_FEATURE([ECORE], [systemd-daemon], [${want_systemd}]) EFL_ADD_FEATURE([ECORE], [glib]) @@ -2591,7 +2585,7 @@ else ecore_con_resolver="fork" fi -EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_systemd}], [SYSTEMD], [libsystemd-daemon]) +EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_systemd}], [SYSTEMD], [libsystemd]) EFL_ADD_FEATURE([ECORE_CON], [cares]) EFL_ADD_FEATURE([ECORE_CON], [local-sockets], [${want_ecore_con_local_sockets}]) diff --git a/src/Makefile_Ecore_Drm.am b/src/Makefile_Ecore_Drm.am index e331e7aeea..3d5f645350 100644 --- a/src/Makefile_Ecore_Drm.am +++ b/src/Makefile_Ecore_Drm.am @@ -30,8 +30,8 @@ lib_ecore_drm_libecore_drm_la_CPPFLAGS = \ -DMODULE_ARCH=\"$(MODULE_ARCH)\" lib_ecore_drm_libecore_drm_la_LIBADD = @ECORE_DRM_LIBS@ -if HAVE_SYSTEMD_LOGIN -lib_ecore_drm_libecore_drm_la_LIBADD += @SYSTEMD_LOGIN_LIBS@ +if HAVE_SYSTEMD +lib_ecore_drm_libecore_drm_la_LIBADD += @SYSTEMD_LIBS@ endif lib_ecore_drm_libecore_drm_la_DEPENDENCIES = @ECORE_DRM_INTERNAL_LIBS@ lib_ecore_drm_libecore_drm_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ diff --git a/src/lib/ecore_drm/ecore_drm_private.h b/src/lib/ecore_drm/ecore_drm_private.h index 7932ca4416..0153fb37c9 100644 --- a/src/lib/ecore_drm/ecore_drm_private.h +++ b/src/lib/ecore_drm/ecore_drm_private.h @@ -26,7 +26,7 @@ # include <libinput.h> # include <xkbcommon/xkbcommon.h> -# ifdef HAVE_SYSTEMD_LOGIN +# ifdef HAVE_SYSTEMD # include <systemd/sd-login.h> # endif |