Drop libmirclient dependency, we don't need it for using Unity

4 files changed, 3 insertions, 36 deletions

diff --git a/configure.ac b/configure.ac
index 17b7ad64..a4f7aa80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,23 +49,6 @@ PKG_CHECK_MODULES(XCB, [
     xcb
 ])
 
-AC_ARG_ENABLE(unity,
-	AS_HELP_STRING([--enable-unity],[Enable Unity support [[default=auto]]]),
-	[enable_unity=$enableval],
-	[enable_unity="auto"])
-compile_unity=no
-if test x"$enable_unity" = "xauto"; then
-    PKG_CHECK_MODULES(UNITY, [
-        mirclient
-    ], compile_unity=yes, compile_unity=no)
-elif test x"$enable_unity" = "xyes"; then
-    PKG_CHECK_MODULES(UNITY, [
-        mirclient
-    ])
-    compile_unity=yes
-fi
-AM_CONDITIONAL(COMPILE_UNITY, test x"$compile_unity" != "xno")
-
 AC_ARG_ENABLE(liblightdm-gobject,
 	AS_HELP_STRING([--enable-liblightdm-gobject],[Enable LightDM client gobject libraries [[default=auto]]]),
 	[enable_liblightdm_gobject=$enableval],
@@ -237,7 +220,6 @@ echo "
         Greeter session:          $GREETER_SESSION
         Greeter user:             $GREETER_USER
         User session:             $USER_SESSION
-        Unity support:            $compile_unity
         liblightdm-gobject:       $compile_liblightdm_gobject
         GObject introspection:    $found_introspection
         liblightdm-qt:            $compile_liblightdm_qt4
diff --git a/debian/control b/debian/control
index d32fd8f7..1ae86459 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Build-Depends: debhelper (>= 7.0.50~),
                quilt,
                libgcrypt11-dev,
                libglib2.0-dev,
-               libmirclient-dev,
                libpam0g-dev,
                libxdmcp-dev,
                libxcb1-dev,
diff --git a/src/Makefile.am b/src/Makefile.am
index aefba613..1b7fe284 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,6 +38,8 @@ lightdm_SOURCES = \
 	process.h \
 	seat.c \
 	seat.h \
+	seat-unity.c \
+	seat-unity.h \
 	seat-xdmcp-session.c \
 	seat-xdmcp-session.h \
 	seat-xlocal.c \
@@ -96,17 +98,6 @@ lightdm_LDADD = \
 	-lgcrypt \
 	-lpam
 
-if COMPILE_UNITY
-lightdm_SOURCES += \
-	seat-unity.c \
-	seat-unity.h
-lightdm_CFLAGS += \
-	-DHAVE_UNITY \
-	$(UNITY_CFLAGS)
-lightdm_LDADD += \
-	$(UNITY_LIBS)
-endif
-
 pkglibexec_PROGRAMS = lightdm-guest-session-wrapper
 
 lightdm_guest_session_wrapper_SOURCES = lightdm-guest-session-wrapper.c
diff --git a/src/display-manager.c b/src/display-manager.c
index 043e50fe..465023e3 100644
--- a/src/display-manager.c
+++ b/src/display-manager.c
@@ -20,11 +20,8 @@
 #include "display.h"
 #include "seat-xlocal.h"
 #include "seat-xremote.h"
-#include "plymouth.h"
-
-#ifdef HAVE_UNITY
 #include "seat-unity.h"
-#endif
+#include "plymouth.h"
 
 enum {
     SEAT_ADDED,
@@ -152,9 +149,7 @@ display_manager_init (DisplayManager *manager)
     /* Load the seat modules */
     seat_register_module ("xlocal", SEAT_XLOCAL_TYPE);
     seat_register_module ("xremote", SEAT_XREMOTE_TYPE);
-#ifdef HAVE_UNITY
     seat_register_module ("unity", SEAT_UNITY_TYPE);
-#endif
 }
 
 static void