summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@samsung.com>2013-12-11 11:39:09 +0900
committerCedric BAIL <cedric.bail@samsung.com>2013-12-11 11:39:09 +0900
commit94b4e53b7f795a63ae4cfd5e01d2fa546582210b (patch)
tree479c8b64b80dbdf927b09a411d82434529ba8b6f /configure.ac
parent770dc9a805194c6759617ddac27d7a7fa467f626 (diff)
autotools: make systemd dependency detection automatic.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac18
1 files changed, 9 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index 6409fb2a1f..540bcb4f23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -351,13 +351,6 @@ esac
351AM_CONDITIONAL([HAVE_CRYPTO_GNUTLS], [test "${build_crypto}" = "gnutls"]) 351AM_CONDITIONAL([HAVE_CRYPTO_GNUTLS], [test "${build_crypto}" = "gnutls"])
352AM_CONDITIONAL([HAVE_CRYPTO_OPENSSL], [test "${build_crypto}" = "openssl"]) 352AM_CONDITIONAL([HAVE_CRYPTO_OPENSSL], [test "${build_crypto}" = "openssl"])
353 353
354# check for systemd library if requested
355if test "x{want_systemd}" = "xyes"; then
356 PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon >= 192 libsystemd-journal >= 192],
357 [want_systemd="yes"],
358 [want_systemd="no"])
359fi
360
361#### Checks for header files 354#### Checks for header files
362 355
363# Common Checks (keep names sorted for ease of use): 356# Common Checks (keep names sorted for ease of use):
@@ -575,9 +568,16 @@ AC_ARG_ENABLE([systemd],
575 want_systemd="no" 568 want_systemd="no"
576 fi 569 fi
577 ], 570 ],
578 [want_systemd="no"]) 571 [want_systemd="auto"])
579AM_CONDITIONAL([WANT_SYSTEMD], [test "${want_systemd}" = "yes"])
580 572
573# check for systemd library if requested
574if test "x${want_systemd}" = "xyes" -o "x${want_systemd}" = "xauto"; then
575 PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon >= 192 libsystemd-journal >= 192],
576 [want_systemd="yes"],
577 [want_systemd="no"])
578fi
579
580AM_CONDITIONAL([WANT_SYSTEMD], [test "${want_systemd}" = "yes"])
581 581
582#### Platform-dependent 582#### Platform-dependent
583DL_LIBS="" 583DL_LIBS=""