Launchpad automatic translations update.

[sojka/lightdm.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c675fa6a2f00c7b45fe0df0031ca3e24b1633c90..9a7b0be9d52b3170155e8d77e3a2fb5b7c65017f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(lightdm, 1.11.6)
+AC_INIT(lightdm, 1.15.0)
 AC_CONFIG_MACRO_DIR(m4)
 AC_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
@@ -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(
@@ -241,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