summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel-hollerbach@t-online.de>2015-08-25 10:52:47 +0200
committerStefan Schmidt <stefan@osg.samsung.com>2015-08-25 10:52:47 +0200
commit46e9eed2c4d7cf100959dc5b9b747335a980cebe (patch)
tree5c5e6cc07368fbfe1ead814aa1fd30c74bdba3ac /configure.ac
parent1f1542f82404fa2262526cc3eed7b2edc622c5ce (diff)
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
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac16
1 files changed, 5 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac
index 88c54fb..01c7850 100644
--- a/configure.ac
+++ b/configure.ac
@@ -696,24 +696,18 @@ AM_CONDITIONAL([HAVE_SYSTEMD_USER_SESSION], [test "x${have_systemd_user_session}
696AC_SUBST([USER_SESSION_DIR]) 696AC_SUBST([USER_SESSION_DIR])
697 697
698if test "x${have_systemd_pkg}" = "xauto" -o "x${have_systemd_pkg}" = "xyes"; then 698if test "x${have_systemd_pkg}" = "xauto" -o "x${have_systemd_pkg}" = "xyes"; then
699 PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon >= 192 libsystemd-journal >= 192], 699 PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209],
700 [have_systemd_pkg="yes"], 700 [have_systemd_pkg="yes"],
701 [have_systemd_pkg="no"]) 701 [have_systemd_pkg="no"])
702fi 702fi
703 703
704PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login >= 198],
705 [have_systemd_login=yes], [have_systemd_login=no])
706AS_IF([test "x$have_systemd_login" = "xyes"],
707 [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])])
708AM_CONDITIONAL(HAVE_SYSTEMD_LOGIN, test "x$have_systemd_login" = "xyes")
709
710# check for systemd library if requested 704# check for systemd library if requested
711if test "x${want_systemd}" = "xyes" -a "x${have_systemd_pkg}" = "xno"; then 705if test "x${want_systemd}" = "xyes" -a "x${have_systemd_pkg}" = "xno"; then
712 AC_MSG_ERROR([Systemd dependency requested but not found]) 706 AC_MSG_ERROR([Systemd dependency requested but not found])
713fi 707fi
714 708
715AM_CONDITIONAL([WANT_SYSTEMD], [test "${want_systemd}" = "yes"]) 709AM_CONDITIONAL([WANT_SYSTEMD], [test "${want_systemd}" = "yes"])
716 710AM_CONDITIONAL([HAVE_SYSTEMD], [test "${want_systemd}" = "yes" -a "${have_systemd_pkg}" = "yes"])
717#### Platform-dependent 711#### Platform-dependent
718DL_LIBS="" 712DL_LIBS=""
719DL_INTERNAL_LIBS="" 713DL_INTERNAL_LIBS=""
@@ -925,7 +919,7 @@ AC_DEFINE_IF([EINA_COW_MAGIC_ON],
925 [test "x${want_cow_magic}" = "xyes" ], 919 [test "x${want_cow_magic}" = "xyes" ],
926 [1], [Turn on Eina_Magic in Eina_Cow]) 920 [1], [Turn on Eina_Magic in Eina_Cow])
927 921
928EFL_OPTIONAL_DEPEND_PKG([EINA], [${want_systemd}], [SYSTEMD], [libsystemd-journal]) 922EFL_OPTIONAL_DEPEND_PKG([EINA], [${want_systemd}], [SYSTEMD], [libsystemd])
929 923
930EFL_EVAL_PKGS([EINA]) 924EFL_EVAL_PKGS([EINA])
931 925
@@ -2357,7 +2351,7 @@ if test "x${have_glib}" = "xno"; then
2357 want_g_main_loop="no" 2351 want_g_main_loop="no"
2358fi 2352fi
2359 2353
2360EFL_OPTIONAL_DEPEND_PKG([ECORE], [${want_systemd}], [SYSTEMD], [libsystemd-daemon]) 2354EFL_OPTIONAL_DEPEND_PKG([ECORE], [${want_systemd}], [SYSTEMD], [libsystemd])
2361 2355
2362EFL_ADD_FEATURE([ECORE], [systemd-daemon], [${want_systemd}]) 2356EFL_ADD_FEATURE([ECORE], [systemd-daemon], [${want_systemd}])
2363EFL_ADD_FEATURE([ECORE], [glib]) 2357EFL_ADD_FEATURE([ECORE], [glib])
@@ -2591,7 +2585,7 @@ else
2591 ecore_con_resolver="fork" 2585 ecore_con_resolver="fork"
2592fi 2586fi
2593 2587
2594EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_systemd}], [SYSTEMD], [libsystemd-daemon]) 2588EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_systemd}], [SYSTEMD], [libsystemd])
2595 2589
2596EFL_ADD_FEATURE([ECORE_CON], [cares]) 2590EFL_ADD_FEATURE([ECORE_CON], [cares])
2597EFL_ADD_FEATURE([ECORE_CON], [local-sockets], [${want_ecore_con_local_sockets}]) 2591EFL_ADD_FEATURE([ECORE_CON], [local-sockets], [${want_ecore_con_local_sockets}])