X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sojka/lightdm.git/blobdiff_plain/38efa884cae5987b1e972f37958179ae83e247f0..HEAD:/configure.ac

diff --git a/configure.ac b/configure.ac
index 306dd2bd..e9013c32 100644
--- 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.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])
@@ -30,16 +30,20 @@ AC_SUBST(WARN_CXXFLAGS)
 
 GOBJECT_INTROSPECTION_CHECK(0.9.5)
 
+VAPIGEN_CHECK([0.16])
+
 dnl ###########################################################################
 dnl Dependencies
 dnl ###########################################################################
 
 AC_CHECK_HEADERS(security/pam_appl.h, [], AC_MSG_ERROR(PAM not found))
 
+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
@@ -66,39 +70,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
@@ -109,10 +95,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(
@@ -147,6 +129,25 @@ if test x"$enable_liblightdm_qt5" != "xno"; then
 fi
 AM_CONDITIONAL(COMPILE_LIBLIGHTDM_QT5, test x"$compile_liblightdm_qt5" != "xno")
 
+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_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_libaudit" != xauto; then
+                    AC_MSG_FAILURE(
+                      [--enable-libaudit was given, but test for libaudit failed])
+                  fi
+                 ])
+fi
+
 AC_MSG_CHECKING(whether to build tests)
 AC_ARG_ENABLE(tests,
         AS_HELP_STRING([--disable-tests], [Disable tests building]),
@@ -157,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,
@@ -236,12 +237,13 @@ echo "
                     ===========================
 
         prefix:                   $prefix
-        Greeter session:          $GREETER_SESSION
+        Greeter session:          $DEFAULT_GREETER_SESSION
         Greeter user:             $GREETER_USER
-        User session:             $USER_SESSION
-        liblightdm-gobject:       $compile_liblightdm_gobject
+        User session:             $DEFAULT_USER_SESSION
         GObject introspection:    $found_introspection
+        Vala bindings:            $enable_vala
         liblightdm-qt:            $compile_liblightdm_qt4
         liblightdm-qt5:           $compile_liblightdm_qt5
+        libaudit support:         $use_libaudit
         Enable tests:             $enable_tests
 "