Launchpad automatic translations update.

[sojka/lightdm.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 103fc09a168e2e4107dad29a8d4cd71a67f02b6a..e2be838f3720fa1d5e13c0f64ed3e66992dac3c5 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.9.1)
+AC_INIT(lightdm, 1.11.8)
 AC_CONFIG_MACRO_DIR(m4)
 AC_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
@@ -23,8 +23,10 @@ if test "x$GCC" == xyes; then
                  -Werror=format-security \
                  -Werror=format=2 \
                  -Werror=missing-include-dirs"
+    WARN_CXXFLAGS="-Wall"
 fi
 AC_SUBST(WARN_CFLAGS)
+AC_SUBST(WARN_CXXFLAGS)
 
 GOBJECT_INTROSPECTION_CHECK(0.9.5)
 
@@ -34,6 +36,8 @@ 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, [
@@ -96,7 +100,7 @@ AC_ARG_ENABLE(liblightdm-qt,
        [enable_liblightdm_qt4=$enableval],
        [enable_liblightdm_qt4="auto"])
 compile_liblightdm_qt4=no
-if test x"$enable_liblightdm_qt4" != "xno"; then
+if test x"$enable_liblightdm_qt4" = "xyes" -o \( x"$enable_liblightdm_qt4" = "xauto" -a x$compile_liblightdm_gobject = xyes \) ; then
     PKG_CHECK_MODULES(LIBLIGHTDM_QT4, [
         QtCore
         QtDBus
@@ -107,6 +111,10 @@ if test x"$enable_liblightdm_qt4" != "xno"; then
      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(
@@ -205,6 +213,7 @@ dnl ###########################################################################
 
 AC_CONFIG_FILES([
 Makefile
+common/Makefile
 data/Makefile
 doc/Makefile
 help/Makefile
@@ -217,7 +226,6 @@ po/Makefile.in
 src/Makefile
 tests/Makefile
 tests/src/Makefile
-utils/Makefile
 ])
 AC_OUTPUT