[patch] nm-upower-fix.patch

nm-upower-fix.patch (text/plain), 2.04 KB, created by Ben Kohler on 2016-08-04 15:01:17 UTC

From e4b2c989dc51818e52906b5120ea6a0659274631 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <[e-mail]>
Date: Thu, 4 Aug 2016 16:25:30 +0200
Subject: [PATCH] build: fix build with '--with-suspend-resume=upower'

Now we have a single file for all suspend APIs and the selection is
done through the preprocessor: remove stale AM_CONDITIONALs and define
SUSPEND_RESUME_UPOWER when needed.

Fixes: c76eb3e8f7a80b69c570b513ee3eb16bea1b34bd
---
 configure.ac | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index a38b033..d82248e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -476,32 +476,31 @@ if test "z$with_suspend_resume" = "z"; then
         else
                 # Fall back to upower
                 with_suspend_resume="upower"
         fi
     fi
 fi
 
 case $with_suspend_resume in
-    upower) ;;
+    upower)
+        AC_DEFINE([SUSPEND_RESUME_UPOWER], 1, [Define to 1 to use UPower suspend api])
+	;;
     systemd)
         PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd >= 209],,
                           [PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd-login >= 183])])
         AC_DEFINE([SUSPEND_RESUME_SYSTEMD], 1, [Define to 1 to use systemd suspend api])
         ;;
     consolekit)
         AC_DEFINE([SUSPEND_RESUME_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit2 suspend api])
         ;;
     *)
         AC_MSG_ERROR(--with-suspend-resume must be one of [upower, systemd, consolekit])
         ;;
 esac
-AM_CONDITIONAL(SUSPEND_RESUME_UPOWER, test "x$with_suspend_resume" = "xupower")
-AM_CONDITIONAL(SUSPEND_RESUME_SYSTEMD, test "x$with_suspend_resume" = "xsystemd")
-AM_CONDITIONAL(SUSPEND_RESUME_CONSOLEKIT, test "x$with_suspend_resume" = "xconsolekit")
 
 # SELinux support
 AC_ARG_WITH(selinux, AS_HELP_STRING([--with-selinux=yes|no|auto], [Build with SELinux (default: auto)]),,[with_selinux=auto])
 if test "$with_selinux" = "yes" -o "$with_selinux" = "auto"; then
     PKG_CHECK_MODULES(SELINUX, libselinux, [have_selinux=yes], [have_selinux=no])
 else
     have_selinux=no
 fi
-- 
2.5.5