[weston v2] configure.ac: Add support for new versions of systemd

Javier Jardón jjardon at gnome.org
Thu Mar 12 17:56:10 PDT 2015


... that only provide a unique libsystemd.pc file
---
 configure.ac | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index d9d8d8f..5f2cbc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -341,14 +341,21 @@ AC_ARG_ENABLE(resize-optimization,
 AS_IF([test "x$enable_resize_optimization" = "xyes"],
       [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
 
-PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login >= 198],
-                  [have_systemd_login=yes], [have_systemd_login=no])
+PKG_CHECK_MODULES([SYSTEMD_LOGIN],
+                  [libsystemd >= 198],
+                  [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")
 
-PKG_CHECK_MODULES(SYSTEMD_LOGIN_209, [libsystemd-login >= 209],
-                  [have_systemd_login_209=yes], [have_systemd_login_209=no])
+PKG_CHECK_MODULES([SYSTEMD_LOGIN_209],
+                  [libsystemd >= 209],
+                  [have_systemd_login_209=yes],
+                  [PKG_CHECK_MODULES([SYSTEMD_LOGIN_209],
+                                     [libsystemd-login >= 209],
+                                     [have_systemd_login_209=yes], [have_systemd_login_209=no])])
 AS_IF([test "x$have_systemd_login_209" = "xyes"],
       [AC_DEFINE([HAVE_SYSTEMD_LOGIN_209], [1], [Have systemd-login >= 209])])
 
-- 
2.3.2



More information about the wayland-devel mailing list