Add --enable-liblightdm-gobject configure option

diff --git a/Makefile.am b/Makefile.am
index 1042c493cc3c6d7cf6d00350781442873b45396e..863a0c83f7e9e17727e2e3500e08112a49bcf542 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,8 @@
-SUBDIRS = liblightdm-gobject
-if HAVE_QT
+SUBDIRS =
+if COMPILE_LIBLIGHTDM_GOBJECT
+SUBDIRS += liblightdm-gobject
+endif
+if COMPILE_LIBLIGHTDM_QT
 SUBDIRS += liblightdm-qt
 endif
 SUBDIRS += data greeters po src themes doc

diff --git a/NEWS b/NEWS
index 1a8ca0bc078e514cce888a7c9b84aae467cc9bab..2cf74d0b1ef8c0bb06ee61fd0013c7af82737c1c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Overview of changes in lightdm 0.2.2
     * Set permissions on xauthority file so it can only be read by the owning
       user (Yves-Alexis Perez)
     * Set correct permissions on ~/.dmrc (Yves-Alexis Perez)
-    * Add --enable-qt configure option
+    * Add --enable-liblightdm-gobject, --enable-liblightdm-qt configure option
     * Set environment variables from PAM (Yves-Alexis Perez)
 
 Overview of changes in lightdm 0.2.1

diff --git a/configure.ac b/configure.ac
index 43d59ddd11acd46b38c0af17bd8377cdc17766e1..6af104175bb6b152493a9fcf20182f053b315876 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,33 +33,51 @@ PKG_CHECK_MODULES(LIGHTDM, [
     xdmcp
 ])
 
-PKG_CHECK_MODULES(LIBLIGHTDM_GOBJECT, [
-    glib-2.0
-    gio-unix-2.0
-    gobject-2.0
-    dbus-glib-1
-    libxklavier
-    x11
-])
-
-AC_ARG_ENABLE(qt,
-       AS_HELP_STRING([--enable-qt],[Enable QT libraries [[default=auto]]]),
-       [enable_qt=$enableval],
-       [enable_qt="auto"])
-have_qt=no    
-if test x"$enable_qt" = "xauto"; then
+AC_ARG_ENABLE(liblightdm-gobject,
+       AS_HELP_STRING([--enable-liblightdm-gobject],[Enable LightDM client gobject libraries [[default=yes]]]),
+       [enable_liblightdm_gobject=$enableval],
+       [enable_liblightdm_gobject="yes"])
+compile_liblightdm_gobject=no
+if test x"$enable_liblightdm_gobject" = "xauto"; then
+    PKG_CHECK_MODULES(LIBLIGHTDM_GOBJECT, [
+        glib-2.0
+        gio-unix-2.0
+        gobject-2.0
+        dbus-glib-1
+        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-unix-2.0
+        gobject-2.0
+        dbus-glib-1
+        libxklavier
+        x11
+    ])
+    compile_liblightdm_gobject=yes
+fi
+AM_CONDITIONAL(COMPILE_LIBLIGHTDM_GOBJECT, test x"$compile_liblightdm_gobject" != "xno")
+
+AC_ARG_ENABLE(liblightdm-qt,
+       AS_HELP_STRING([--enable-liblightdm-qt],[Enable LightDM client QT libraries [[default=auto]]]),
+       [enable_liblightdm_qt=$enableval],
+       [enable_liblightdm_qt="auto"])
+compile_liblightdm_qt=no
+if test x"$enable_liblightdm_qt" = "xauto"; then
     PKG_CHECK_MODULES(LIBLIGHTDM_QT, [
         QtCore
         QtGui
-    ], have_qt=yes, have_qt=no)
-elif text x"$enable_qt" = "xyes"; then
+    ], compile_liblightdm_qt=yes, compile_liblightdm_qt=no)
+elif test x"$enable_liblightdm_qt" = "xyes"; then
     PKG_CHECK_MODULES(LIBLIGHTDM_QT, [
         QtCore
         QtGui
     ])
-    have_qt=yes
+    compile_liblightdm_qt=yes
 fi
-AM_CONDITIONAL(HAVE_QT, test x"$have_qt" != "xno")
+AM_CONDITIONAL(COMPILE_LIBLIGHTDM_QT, test x"$compile_liblightdm_qt" != "xno")
 
 PKG_CHECK_MODULES(LIGHTDM_GTK_GREETER, [
     gtk+-2.0
@@ -266,9 +284,9 @@ echo "
         Theme:                    $GREETER_THEME
 
         Greeters:
-        liblightdm-gobject:       yes
+        liblightdm-gobject:       $compile_liblightdm_gobject
         GObject introspection:    $found_introspection
-        liblightdm-qt:            $have_qt
+        liblightdm-qt:            $compile_liblightdm_qt
         GTK+:                     $have_gtk
         Webkit:                   $have_webkit
 "