aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac26
-rw-r--r--debian/control7
-rw-r--r--src/config.vapi2
-rw-r--r--src/settings-daemon.vala2
4 files changed, 27 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index 86ddaef..cf784de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,11 +37,29 @@ AC_DEFINE_UNQUOTED([INDICATOR_FILE_DIR], ["${prefix}/share/unity/indicators"], [
INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
AC_SUBST(INDICATORDIR)
-MSD_BINARY=`$PKG_CONFIG --variable=binary mate-settings-daemon`
-if test -z "$MSD_BINARY"; then
- AC_MSG_ERROR([Could not find path to mate-settings-daemon binary])
+if $PKG_CONFIG --exists unity-settings-daemon; then
+ USD_BINARY=`$PKG_CONFIG --variable=binary unity-settings-daemon`
+ if test -z "$USD_BINARY"; then
+ AC_MSG_NOTICE([Could not find path to unity-settings-daemon binary])
+ else
+ SD_BINARY="$USD_BINARY"
+ fi
+
+elif $PKG_CONFIG --exists mate-settings-daemon; then
+ MSD_BINARY=`$PKG_CONFIG --variable=binary mate-settings-daemon`
+ if test -z "$MSD_BINARY"; then
+ AC_MSG_NOTICE([Could not find path to mate-settings-daemon binary])
+ else
+ SD_BINARY="$MSD_BINARY"
+ fi
+
+fi
+
+if test -z "$SD_BINARY"; then
+ AC_MSG_ERROR([Could not find any of the supported X11 settings daemons])
+else
+ AC_DEFINE_UNQUOTED([SD_BINARY], ["$MSD_BINARY"], [Path to m-s-d])
fi
-AC_DEFINE_UNQUOTED([MSD_BINARY], ["$MSD_BINARY"], [Path to m-s-d])
dnl ###########################################################################
dnl Internationalization
diff --git a/debian/control b/debian/control
index 4e757d6..866329d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,14 +8,13 @@ Build-Depends: at-spi2-core,
debhelper (>= 9),
dh-autoreconf,
gnome-common,
- gnome-icon-theme,
- mate-settings-daemon-dev,
+ unity-settings-daemon-dev | mate-settings-daemon-dev,
libcanberra-dev,
libgnome-desktop-3-dev,
libgtk-3-dev,
libindicator3-dev,
- liblightdm-gobject-dev (>= 1.4.0),
- lightdm-vala,
+ liblightdm-gobject-dev (>= 1.4.0) | liblightdm-gobject-1-dev (>= 1.4.0),
+ lightdm-vala | liblightdm-gobject-1-dev,
libpixman-1-dev,
valac (>= 0.20.0),
xvfb,
diff --git a/src/config.vapi b/src/config.vapi
index c1bcac2..f840834 100644
--- a/src/config.vapi
+++ b/src/config.vapi
@@ -8,5 +8,5 @@ namespace Config
public const string INDICATOR_FILE_DIR;
public const string PKGDATADIR;
public const string INDICATORDIR;
- public const string MSD_BINARY;
+ public const string SD_BINARY;
}
diff --git a/src/settings-daemon.vala b/src/settings-daemon.vala
index 6166b25..6839df2 100644
--- a/src/settings-daemon.vala
+++ b/src/settings-daemon.vala
@@ -160,7 +160,7 @@ public class SettingsDaemon : Object
try
{
- Process.spawn_command_line_async (Config.MSD_BINARY);
+ Process.spawn_command_line_async (Config.SD_BINARY);
}
catch (SpawnError e)
{