Launchpad automatic translations update.

[sojka/lightdm.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index fc2c7f83676cf72083dbe20b40b5112bcea578b1..dd8df49dec44fd650e4d38bb51e0254e933f31ae 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.7.6)
+AC_INIT(lightdm, 1.9.12)
 AC_CONFIG_MACRO_DIR(m4)
 AC_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
@@ -11,9 +11,22 @@ AC_PROG_CXX
 AC_PROG_LIBTOOL
 AM_MAINTAINER_MODE
 
-dnl Enable compile warnings
-WARN_CFLAGS=-Wall
+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"
+    WARN_CXXFLAGS="-Wall"
+fi
 AC_SUBST(WARN_CFLAGS)
+AC_SUBST(WARN_CXXFLAGS)
 
 GOBJECT_INTROSPECTION_CHECK(0.9.5)
 
@@ -85,7 +98,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
@@ -96,6 +109,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(
@@ -194,6 +211,7 @@ dnl ###########################################################################
 
 AC_CONFIG_FILES([
 Makefile
+common/Makefile
 data/Makefile
 doc/Makefile
 help/Makefile
@@ -206,7 +224,6 @@ po/Makefile.in
 src/Makefile
 tests/Makefile
 tests/src/Makefile
-utils/Makefile
 ])
 AC_OUTPUT