From 63f6f9826f0ef6c32568725afa41b142dfd45ccb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Thu, 18 Jan 2018 16:44:53 +0100
Subject: [PATCH 1/3] configure: Fix arguments passed to qtchooser
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 711db441..f836a842 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,7 +107,7 @@ if test x"$enable_liblightdm_qt4" != "xno" ; then
fi
if test x"$MOC4" = xmoc; then
if test x"$(readlink $(which $MOC4))" = xqtchooser; then
- MOC4="$MOC4 --qt=qt4"
+ MOC4="$MOC4 --qt=4"
fi
fi
fi
@@ -141,7 +141,7 @@ if test x"$enable_liblightdm_qt5" != "xno"; then
fi
if test x"$MOC5" = xmoc; then
if test x"$(readlink $(which $MOC5))" = xqtchooser; then
- MOC5="$MOC5 --qt=qt5"
+ MOC5="$MOC5 --qt=5"
fi
fi
fi
From 216c5c7bdc3f7fc321da3e576814768df5e25ad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Thu, 18 Jan 2018 16:46:19 +0100
Subject: [PATCH 2/3] Makefile: Add ACLOCAL_AMFLAGS properly
---
Makefile.am | 1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile.am b/Makefile.am
index 9706d600..fd252aa8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS = -I m4
SUBDIRS = common liblightdm-gobject liblightdm-qt
if COMPILE_TESTS
SUBDIRS += tests
From 301023e08790cc0ace49ef15159e3dd4746b9238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Thu, 18 Jan 2018 18:11:16 +0100
Subject: [PATCH 3/3] configure: Activate needed C99 mode of compiler
---
configure.ac | 1 +
1 file changed, 1 insertion(+)
diff --git a/configure.ac b/configure.ac
index f836a842..29d84327 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
AM_SILENT_RULES(yes)
LT_INIT
+AC_PROG_CC_STDC
AM_PROG_CC_C_O
AC_PROG_CXX
AC_PROG_LIBTOOL