summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIván Briano <sachieru@gmail.com>2013-03-11 20:32:42 -0300
committerIván Briano <sachieru@gmail.com>2013-03-11 20:32:42 -0300
commitbdbf74f882a3c14fe852c8da91ae899eac1472a0 (patch)
tree3cec68243b2051a102044c1af8c11a3f7330e5b6
parent23264ae09cf6b0bfc09c3858df0cfc3539766c88 (diff)
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.
-rw-r--r--configure.ac8
1 files changed, 3 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 943bab540a..9b8f419b5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -292,10 +292,8 @@ AM_CONDITIONAL([HAVE_CRYPTO_OPENSSL], [test "${build_crypto}" = "openssl"])
292# check for systemd library if requested 292# check for systemd library if requested
293if test "x{want_systemd}" = "xyes"; then 293if test "x{want_systemd}" = "xyes"; then
294 PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon], 294 PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon],
295 [have_systemd="yes"], 295 [want_systemd="yes"],
296 [have_systemd="no"]) 296 [want_systemd="no"])
297else
298 have_systemd="no"
299fi 297fi
300 298
301#### Checks for header files 299#### Checks for header files
@@ -1747,7 +1745,7 @@ if test "x${have_glib}" = "xno"; then
1747 want_g_main_loop="no" 1745 want_g_main_loop="no"
1748fi 1746fi
1749 1747
1750EFL_OPTIONAL_DEPEND_PKG([ECORE], [${have_systemd}], [SYSTEMD], [libsystemd-daemon]) 1748EFL_OPTIONAL_DEPEND_PKG([ECORE], [${want_systemd}], [SYSTEMD], [libsystemd-daemon])
1751 1749
1752EFL_ADD_FEATURE([ECORE], [systemd-daemon], [${have_systemd}]) 1750EFL_ADD_FEATURE([ECORE], [systemd-daemon], [${have_systemd}])
1753EFL_ADD_FEATURE([ECORE], [glib]) 1751EFL_ADD_FEATURE([ECORE], [glib])