Load all users only when really needed

[sojka/lightdm.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1cbc7669dd17bab3f8fbc03a7959304261842db3..e9013c321089d98c5106f1ecd6f877e92cfdb1b7 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.16.0)
+AC_INIT(lightdm, 1.20.0)
 AC_CONFIG_MACRO_DIR(m4)
 AC_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
@@ -43,7 +43,7 @@ AC_CHECK_HEADERS(gcrypt.h, [], AC_MSG_ERROR(libgcrypt not found))
 AC_CHECK_FUNCS(setresgid setresuid clearenv)
 
 PKG_CHECK_MODULES(LIGHTDM, [
-    glib-2.0 >= 2.30
+    glib-2.0 >= 2.40
     gio-2.0 >= 2.26
     gio-unix-2.0
     xdmcp
@@ -129,21 +129,21 @@ if test x"$enable_liblightdm_qt5" != "xno"; then
 fi
 AM_CONDITIONAL(COMPILE_LIBLIGHTDM_QT5, test x"$compile_liblightdm_qt5" != "xno")
 
-AC_ARG_ENABLE([audit],
-    AS_HELP_STRING([--enable-audit],
-                   [Enable audit logging of login and logout events [[default=auto]]]),
-    [enable_audit=$enableval],
-    [enable_audit=auto])
+AC_ARG_ENABLE([libaudit],
+    AS_HELP_STRING([--enable-libaudit],
+                   [Enable libaudit logging of login and logout events [[default=auto]]]),
+    [enable_libaudit=$enableval],
+    [enable_libaudit=auto])
 use_libaudit=no    
-if test x"$enable_audit" != "xno"; then
+if test x"$enable_libaudit" != "xno"; then
     AC_CHECK_LIB([audit], [audit_log_user_message],
                  [use_libaudit=yes
                   AC_DEFINE(HAVE_LIBAUDIT, 1, [libaudit support])
                   LIGHTDM_LIBS="${LIGHTDM_LIBS} -laudit"
                  ],
-                 [if test "x$enable_audit" != xauto; then
+                 [if test "x$enable_libaudit" != xauto; then
                     AC_MSG_FAILURE(
-                      [--enable-audit was given, but test for libaudit failed])
+                      [--enable-libaudit was given, but test for libaudit failed])
                   fi
                  ])
 fi
@@ -158,27 +158,27 @@ dnl ###########################################################################
 dnl Configurable values
 dnl ###########################################################################
 
-USER_SESSION=default
+DEFAULT_USER_SESSION=default
 AC_ARG_WITH(user-session,
             AS_HELP_STRING(--with-user-session=<name>,
                            Session to use for user accounts),
     if test x$withval != x; then
-        USER_SESSION="$withval"
+        DEFAULT_USER_SESSION="$withval"
     fi
 )
-AC_SUBST(USER_SESSION)
-AC_DEFINE_UNQUOTED(USER_SESSION, "$USER_SESSION", User session)
+AC_SUBST(DEFAULT_USER_SESSION)
+AC_DEFINE_UNQUOTED(DEFAULT_USER_SESSION, "$DEFAULT_USER_SESSION", User session)
 
-GREETER_SESSION=default
+DEFAULT_GREETER_SESSION=default
 AC_ARG_WITH(greeter-session,
             AS_HELP_STRING(--with-greeter-session=<session>,
                            Greeter session),
     if test x$withval != x; then
-        GREETER_SESSION="$withval"
+        DEFAULT_GREETER_SESSION="$withval"
     fi
 )
-AC_SUBST(GREETER_SESSION)
-AC_DEFINE_UNQUOTED(GREETER_SESSION, "$GREETER_SESSION", Greeter session)
+AC_SUBST(DEFAULT_GREETER_SESSION)
+AC_DEFINE_UNQUOTED(DEFAULT_GREETER_SESSION, "$DEFAULT_GREETER_SESSION", Greeter session)
 
 GREETER_USER=lightdm
 AC_ARG_WITH(greeter-user,
@@ -237,9 +237,9 @@ echo "
                     ===========================
 
         prefix:                   $prefix
-        Greeter session:          $GREETER_SESSION
+        Greeter session:          $DEFAULT_GREETER_SESSION
         Greeter user:             $GREETER_USER
-        User session:             $USER_SESSION
+        User session:             $DEFAULT_USER_SESSION
         GObject introspection:    $found_introspection
         Vala bindings:            $enable_vala
         liblightdm-qt:            $compile_liblightdm_qt4