[gnome-control-center] power: Fix build on non-Linux systems



commit e39ef0eea78876bcbe1a6d0735e9d39fdd7a54ef
Author: Bastien Nocera <hadess hadess net>
Date:   Sat May 28 21:50:53 2016 +0200

    power: Fix build on non-Linux systems
    
    In 8400d3e, we ported the power panel to libnm 1.2, but at the same
    time, made libnm a hard requirement. This is a problem on non-Linux
    systems.
    
    See https://bugzilla.gnome.org/show_bug.cgi?id=765910#c31

 configure.ac |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5f21e82..3f10fb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,9 +141,6 @@ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0
                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
 PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES)
 PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
-PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0
-                  libnm >= $NETWORK_MANAGER_REQUIRED_VERSION
-                  gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
 PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
                   colord >= $COLORD_REQUIRED_VERSION
                   colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
@@ -212,6 +209,16 @@ if test x${have_networkmanager} = xyes; then
   AC_SUBST(NM_VPN_MODULE_DIR)
 fi
 
+# Check for power panel
+if test x${have_networkmanager} = xyes; then
+  PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0
+                    libnm >= $NETWORK_MANAGER_REQUIRED_VERSION
+                    gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
+else
+  PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0
+                    gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
+fi
+
 # Check for gnome-bluetooth
 PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2,
                  [have_bluetooth=yes], have_bluetooth=no)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]