summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@samsung.com>2013-03-11 10:22:48 +0900
committerCedric BAIL <cedric.bail@samsung.com>2013-03-11 10:22:48 +0900
commit9550f95d14a5b42151cdfec2fbaf5bc687baa8fa (patch)
treee305bc4c7264229ecac9d8767ce955857aaa6860 /configure.ac
parent8d5e33077e9317fdd0ace25901457084413c5f54 (diff)
systemd: so now want means optional and not required.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac19
1 files changed, 14 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 78b429b783..b50957c6c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,7 +159,7 @@ case "$host_os" in
159 ;; 159 ;;
160 linux*) 160 linux*)
161 have_linux="yes" 161 have_linux="yes"
162 want_systemd="no" 162 want_systemd="yes"
163 ;; 163 ;;
164esac 164esac
165 165
@@ -289,6 +289,15 @@ esac
289AM_CONDITIONAL([HAVE_CRYPTO_GNUTLS], [test "${build_crypto}" = "gnutls"]) 289AM_CONDITIONAL([HAVE_CRYPTO_GNUTLS], [test "${build_crypto}" = "gnutls"])
290AM_CONDITIONAL([HAVE_CRYPTO_OPENSSL], [test "${build_crypto}" = "openssl"]) 290AM_CONDITIONAL([HAVE_CRYPTO_OPENSSL], [test "${build_crypto}" = "openssl"])
291 291
292# check for systemd library if requested
293if test "x{want_systemd}" = "xyes"; then
294 PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon],
295 [have_systemd="yes"],
296 [have_systemd="no"])
297else
298 have_systemd="no"
299fi
300
292#### Checks for header files 301#### Checks for header files
293 302
294# Common Checks (keep names sorted for ease of use): 303# Common Checks (keep names sorted for ease of use):
@@ -1738,9 +1747,9 @@ if test "x${have_glib}" = "xno"; then
1738 want_g_main_loop="no" 1747 want_g_main_loop="no"
1739fi 1748fi
1740 1749
1741EFL_OPTIONAL_DEPEND_PKG([ECORE], [${want_systemd}], [SYSTEMD], [libsystemd-daemon]) 1750EFL_OPTIONAL_DEPEND_PKG([ECORE], [${have_systemd}], [SYSTEMD], [libsystemd-daemon])
1742 1751
1743EFL_ADD_FEATURE([ECORE], [systemd-daemon], [${want_systemd}]) 1752EFL_ADD_FEATURE([ECORE], [systemd-daemon], [${have_systemd}])
1744EFL_ADD_FEATURE([ECORE], [glib]) 1753EFL_ADD_FEATURE([ECORE], [glib])
1745EFL_ADD_FEATURE([ECORE], [g-main-loop]) 1754EFL_ADD_FEATURE([ECORE], [g-main-loop])
1746 1755
@@ -1942,14 +1951,14 @@ else
1942 ecore_con_resolver="fork" 1951 ecore_con_resolver="fork"
1943fi 1952fi
1944 1953
1945EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_systemd}], [SYSTEMD], [libsystemd-daemon]) 1954EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${have_systemd}], [SYSTEMD], [libsystemd-daemon])
1946 1955
1947EFL_ADD_FEATURE([ECORE_CON], [curl]) 1956EFL_ADD_FEATURE([ECORE_CON], [curl])
1948EFL_ADD_FEATURE([ECORE_CON], [cares]) 1957EFL_ADD_FEATURE([ECORE_CON], [cares])
1949EFL_ADD_FEATURE([ECORE_CON], [local-sockets], [${want_ecore_con_local_sockets}]) 1958EFL_ADD_FEATURE([ECORE_CON], [local-sockets], [${want_ecore_con_local_sockets}])
1950EFL_ADD_FEATURE([ECORE_CON], [abstract-sockets], [${want_ecore_con_abstract_sockets}]) 1959EFL_ADD_FEATURE([ECORE_CON], [abstract-sockets], [${want_ecore_con_abstract_sockets}])
1951EFL_ADD_FEATURE([ECORE_CON], [resolver], [${ecore_con_resolver}]) 1960EFL_ADD_FEATURE([ECORE_CON], [resolver], [${ecore_con_resolver}])
1952EFL_ADD_FEATURE([ECORE_CON], [systemd-daemon], [${want_systemd}]) 1961EFL_ADD_FEATURE([ECORE_CON], [systemd-daemon], [${have_systemd}])
1953 1962
1954EFL_EVAL_PKGS([ECORE_CON]) 1963EFL_EVAL_PKGS([ECORE_CON])
1955 1964