Don't allow liblightdm-gobject to be disabled. It is required for liblightdm-qt and the tests so it's not worth supporting builds without it

2 files changed, 11 insertions, 42 deletions

diff --git a/Makefile.am b/Makefile.am
index 106e891e..f9c4ebfe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,4 @@
-SUBDIRS = common
-if COMPILE_LIBLIGHTDM_GOBJECT
-SUBDIRS += liblightdm-gobject
-endif
-SUBDIRS += liblightdm-qt
+SUBDIRS = common liblightdm-gobject liblightdm-qt
 if COMPILE_TESTS
 SUBDIRS += tests
 endif
diff --git a/configure.ac b/configure.ac
index 4b757713..6c83b1e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,39 +68,21 @@ PKG_CHECK_MODULES(XCB, [
     xcb
 ])    
 
-AC_ARG_ENABLE(liblightdm-gobject,
-	AS_HELP_STRING([--enable-liblightdm-gobject],[Enable LightDM client gobject libraries [[default=auto]]]),
-	[enable_liblightdm_gobject=$enableval],
-	[enable_liblightdm_gobject="auto"])
-compile_liblightdm_gobject=no
-if test x"$enable_liblightdm_gobject" = "xauto"; then
-    PKG_CHECK_MODULES(LIBLIGHTDM_GOBJECT, [
-        glib-2.0
-        gio-2.0 >= 2.26
-        gio-unix-2.0
-        gobject-2.0
-        libxklavier
-        x11
-    ], compile_liblightdm_gobject=yes, compile_liblightdm_gobject=no)
-elif test x"$enable_liblightdm_gobject" = "xyes"; then
-    PKG_CHECK_MODULES(LIBLIGHTDM_GOBJECT, [
-        glib-2.0
-        gio-2.0 >= 2.26
-        gio-unix-2.0
-        gobject-2.0
-        libxklavier
-        x11
-    ])
-    compile_liblightdm_gobject=yes
-fi
-AM_CONDITIONAL(COMPILE_LIBLIGHTDM_GOBJECT, test x"$compile_liblightdm_gobject" != "xno")
+PKG_CHECK_MODULES(LIBLIGHTDM_GOBJECT, [
+    glib-2.0
+    gio-2.0 >= 2.26
+    gio-unix-2.0
+    gobject-2.0
+    libxklavier
+    x11
+])
 
 AC_ARG_ENABLE(liblightdm-qt,
 	AS_HELP_STRING([--enable-liblightdm-qt],[Enable LightDM client Qt4 libraries [[default=auto]]]),
 	[enable_liblightdm_qt4=$enableval],
 	[enable_liblightdm_qt4="auto"])
 compile_liblightdm_qt4=no
-if test x"$enable_liblightdm_qt4" = "xyes" -o \( x"$enable_liblightdm_qt4" = "xauto" -a x$compile_liblightdm_gobject = xyes \) ; then
+if test x"$enable_liblightdm_qt4" != "xno" ; then
     PKG_CHECK_MODULES(LIBLIGHTDM_QT4, [
         QtCore
         QtDBus
@@ -111,10 +93,6 @@ if test x"$enable_liblightdm_qt4" = "xyes" -o \( x"$enable_liblightdm_qt4" = "xa
      if test x"$(readlink $(which $MOC4))" = xqtchooser; then
          MOC4="$MOC4 --qt=qt4"
      fi
-     if test "x$compile_liblightdm_gobject" != xyes; then
-         AC_MSG_FAILURE(
-           [liblightdm-gobject is required to compile liblightdm-qt])
-     fi
     ],
     [if test "x$enable_liblightdm_qt4" != xauto; then
         AC_MSG_FAILURE(
@@ -129,7 +107,7 @@ AC_ARG_ENABLE(liblightdm-qt5,
 	[enable_liblightdm_qt5=$enableval],
 	[enable_liblightdm_qt5="auto"])
 compile_liblightdm_qt5=no
-if test x"$enable_liblightdm_qt5" = "xyes" -o \( x"$enable_liblightdm_qt5" = "xauto" -a x$compile_liblightdm_gobject = xyes \); then
+if test x"$enable_liblightdm_qt5" != "xno"; then
     PKG_CHECK_MODULES(LIBLIGHTDM_QT5, [
         Qt5Core
         Qt5DBus
@@ -140,10 +118,6 @@ if test x"$enable_liblightdm_qt5" = "xyes" -o \( x"$enable_liblightdm_qt5" = "xa
      if test x"$(readlink $(which $MOC5))" = xqtchooser; then
          MOC5="$MOC5 --qt=qt5"
      fi
-     if test "x$compile_liblightdm_gobject" != xyes; then
-         AC_MSG_FAILURE(
-           [liblightdm-gobject is required to compile liblightdm-qt5])
-     fi
     ],
     [if test "x$enable_liblightdm_qt5" != xauto; then
         AC_MSG_FAILURE(
@@ -245,7 +219,6 @@ echo "
         Greeter session:          $GREETER_SESSION
         Greeter user:             $GREETER_USER
         User session:             $USER_SESSION
-        liblightdm-gobject:       $compile_liblightdm_gobject
         GObject introspection:    $found_introspection
         liblightdm-qt:            $compile_liblightdm_qt4
         liblightdm-qt5:           $compile_liblightdm_qt5