diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index c0e1cd0d..22630de7 100644 --- a/configure.ac +++ b/configure.ac @@ -69,7 +69,7 @@ AC_SUBST(SCREENSAVER_LIBS) GLIB_REQUIRED=2.64.0 SYSTEMD_REQUIRED=248 GTK_REQUIRED=3.22.0 -MARCO_REQUIRED=1.17.0 +MARCO_REQUIRED=1.29.0 MATEKBD_REQUIRED=1.17.0 MATE_DESKTOP_REQUIRED=1.27.1 APPINDICATOR_REQUIRED=0.0.13 @@ -179,16 +179,11 @@ AS_IF([test "x$enable_appindicator" = xyes], have_systemd=no AC_ARG_ENABLE(systemd, AS_HELP_STRING([--disable-systemd], [disable systemd support]),enable_systemd="$enableval",enable_systemd=auto) -if test "x$enable_systemd" != "xno"; then - PKG_CHECK_MODULES(SYSTEMD, [libsystemd], [have_systemd=yes], - [PKG_CHECK_MODULES(SYSTEMD, [libsystemd >= $SYSTEMD_REQUIRED], - [have_systemd=yes])]) - if test "x$have_systemd" = xno && test "x$enable_systemd" = xyes; then - AC_MSG_ERROR([*** systemd support requested but libraries not found]) - elif test "x$have_systemd" = xyes; then - AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is available]) - fi -fi +AS_CASE(["$enable_systemd"], + [yes], [PKG_CHECK_MODULES(SYSTEMD, [libsystemd >= $SYSTEMD_REQUIRED], [have_systemd=yes])], + [auto], [PKG_CHECK_MODULES(SYSTEMD, [libsystemd >= $SYSTEMD_REQUIRED], [have_systemd=yes], [have_systemd=no])], + [have_systemd=no]) +AS_IF([test "x$have_systemd" = xyes], [AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is available])]) AM_CONDITIONAL(HAVE_SYSTEMD, [test "$have_systemd" = "yes"]) |