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 407f5321e04e2c0845a62d119393764731257213..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.4.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
@@ -77,28 +92,54 @@ 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, [
+       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" != "xno"; then
+    PKG_CHECK_MODULES(LIBLIGHTDM_QT4, [
         QtCore
         QtDBus
         QtGui
-    ], compile_liblightdm_qt=yes, compile_liblightdm_qt=no)
-    QT4_BINDIR=`$PKG_CONFIG Qt --variable bindir`
-    AC_CHECK_TOOLS(MOC, [moc-qt4 moc],, [$QT4_BINDIR:$PATH])
-elif test x"$enable_liblightdm_qt" = "xyes"; then
-    PKG_CHECK_MODULES(LIBLIGHTDM_QT, [
-        QtCore
-        QtDBus
+    ],
+    [compile_liblightdm_qt4=yes
+     AC_CHECK_TOOLS(MOC4, [moc-qt4 moc])
+     if test x"$(readlink $(which $MOC4))" = xqtchooser; then
+         MOC4="$MOC4 --qt=qt4"
+     fi
+    ],
+    [if test "x$enable_liblightdm_qt4" != xauto; then
+        AC_MSG_FAILURE(
+          [--enable-liblightdm-qt was given, but test for Qt4 failed])
+      fi
     ])
-    QT4_BINDIR=`$PKG_CONFIG Qt --variable bindir`
-    AC_CHECK_TOOLS(MOC, [moc-qt4 moc],, [$QT4_BINDIR:$PATH])
-    compile_liblightdm_qt=yes
 fi
-AM_CONDITIONAL(COMPILE_LIBLIGHTDM_QT, test x"$compile_liblightdm_qt" != "xno")
+AM_CONDITIONAL(COMPILE_LIBLIGHTDM_QT4, test x"$compile_liblightdm_qt4" != "xno")
+
+AC_ARG_ENABLE(liblightdm-qt5,
+       AS_HELP_STRING([--enable-liblightdm-qt5],[Enable LightDM client Qt5 libraries [[default=auto]]]),
+       [enable_liblightdm_qt5=$enableval],
+       [enable_liblightdm_qt5="auto"])
+compile_liblightdm_qt5=no
+if test x"$enable_liblightdm_qt5" != "xno"; then
+    PKG_CHECK_MODULES(LIBLIGHTDM_QT5, [
+        Qt5Core
+        Qt5DBus
+        Qt5Gui
+    ],
+    [compile_liblightdm_qt5=yes
+     AC_CHECK_TOOLS(MOC5, [moc])
+     if test x"$(readlink $(which $MOC5))" = xqtchooser; then
+         MOC5="$MOC5 --qt=qt5"
+     fi
+    ],
+    [if test "x$enable_liblightdm_qt5" != xauto; then
+        AC_MSG_FAILURE(
+          [--enable-liblightdm-qt5 was given, but test for Qt5 failed])
+      fi
+    ])
+fi
+AM_CONDITIONAL(COMPILE_LIBLIGHTDM_QT5, test x"$compile_liblightdm_qt5" != "xno")
 
 AC_MSG_CHECKING(whether to build tests)
 AC_ARG_ENABLE(tests,
@@ -106,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 ###########################################################################
@@ -167,13 +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-qt-3.pc
+liblightdm-qt/liblightdm-qt5-3.pc
 po/Makefile.in
 src/Makefile
 tests/Makefile
@@ -196,6 +235,7 @@ echo "
         User session:             $USER_SESSION
         liblightdm-gobject:       $compile_liblightdm_gobject
         GObject introspection:    $found_introspection
-        liblightdm-qt:            $compile_liblightdm_qt
+        liblightdm-qt:            $compile_liblightdm_qt4
+        liblightdm-qt5:           $compile_liblightdm_qt5
         Enable tests:             $enable_tests
 "