Name greeter mir sessions with a 'greeter' prefix, so the compositor can know

[sojka/lightdm.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index bcb3d590ff55eb5a52b7a49ab238ae136019216b..f5edbf8541ec63fa0f0d9941fcb4179600710206 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.6.0)
+AC_INIT(lightdm, 1.7.9)
 AC_CONFIG_MACRO_DIR(m4)
 AC_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
@@ -11,6 +11,21 @@ AC_PROG_CXX
 AC_PROG_LIBTOOL
 AM_MAINTAINER_MODE
 
+dnl Enable compile warnings (only supporting GCC)
+if test "x$GCC" == xyes; then
+    WARN_CFLAGS="-Wall \
+                 -Wstrict-prototypes \
+                 -Wnested-externs \
+                 -Werror=missing-prototypes \
+                 -Werror=implicit-function-declaration \
+                 -Werror=pointer-arith \
+                 -Werror=init-self \
+                 -Werror=format-security \
+                 -Werror=format=2 \
+                 -Werror=missing-include-dirs"
+fi
+AC_SUBST(WARN_CFLAGS)
+
 GOBJECT_INTROSPECTION_CHECK(0.9.5)
 
 dnl ###########################################################################
@@ -22,7 +37,7 @@ AC_CHECK_HEADERS(security/pam_appl.h, [], AC_MSG_ERROR(PAM not found))
 AC_CHECK_FUNCS(setresgid setresuid clearenv)
 
 PKG_CHECK_MODULES(LIGHTDM, [
-    glib-2.0 >= 2.24
+    glib-2.0 >= 2.30
     gio-2.0 >= 2.26
     gio-unix-2.0
     xdmcp
@@ -132,8 +147,6 @@ AC_ARG_ENABLE(tests,
         [], [enable_tests="yes"])
 AM_CONDITIONAL(COMPILE_TESTS, test x"$enable_tests" != "xno")
 
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-
 dnl ###########################################################################
 dnl Configurable values
 dnl ###########################################################################
@@ -171,26 +184,6 @@ AC_ARG_WITH(greeter-user,
 AC_SUBST(GREETER_USER)
 AC_DEFINE_UNQUOTED(GREETER_USER, "$GREETER_USER", User to run greeter as)
 
-AC_ARG_ENABLE(consolekit,
-              AS_HELP_STRING([--enable-consolekit],
-                                [Build with ConsoleKit support @<:@default=yes@:>@]),,
-                 enable_consolekit=yes)
-AM_CONDITIONAL(ENABLE_CONSOLEKIT, test x$enable_consolekit = xyes)
-
-if test x$enable_consolekit = xyes; then
-  AC_DEFINE(WITH_CONSOLEKIT, 1, [Define if ConsoleKit support is enabled])
-fi
-
-AC_ARG_ENABLE(logind,
-              AS_HELP_STRING([--enable-logind],
-                                [Build with systemd logind support @<:@default=no@:>@]),,
-                 enable_logind=no)
-AM_CONDITIONAL(ENABLE_LOGIND, test x$enable_logind = xyes)
-
-if test x$enable_logind != xyes; then
-  AC_DEFINE(WITH_LOGIND, 1, [Define if systemd logind support is enabled])
-fi
-
 dnl ###########################################################################
 dnl Documentation
 dnl ###########################################################################
@@ -213,14 +206,13 @@ dnl ###########################################################################
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
-data/init/Makefile
 doc/Makefile
 help/Makefile
 liblightdm-gobject/liblightdm-gobject-1.pc
 liblightdm-gobject/Makefile
 liblightdm-qt/Makefile
-liblightdm-qt/liblightdm-qt-2.pc
-liblightdm-qt/liblightdm-qt5-2.pc
+liblightdm-qt/liblightdm-qt-3.pc
+liblightdm-qt/liblightdm-qt5-3.pc
 po/Makefile.in
 src/Makefile
 tests/Makefile
@@ -246,6 +238,4 @@ echo "
         liblightdm-qt:            $compile_liblightdm_qt4
         liblightdm-qt5:           $compile_liblightdm_qt5
         Enable tests:             $enable_tests
-       ConsoleKit support:       $enable_consolekit
-       logind support:           $enable_logind        
 "