From eeafb47a126c1417f5b9810454b8d2206859fd40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= <joao.valverde@tecnico.ulisboa.pt>
Date: Tue, 2 Feb 2016 19:00:37 +0000
Subject: Fix Qt4 moc option argument and add build parametrization
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ib758f0eabaf96f9c6010201e7e16147fcfa0daa2
Reviewed-on: https://code.wireshark.org/review/13671
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
---
 acinclude.m4 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'acinclude.m4')

diff --git a/acinclude.m4 b/acinclude.m4
index c4d2b40e6b..38555a03fc 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2055,7 +2055,10 @@ AC_DEFUN([AC_WIRESHARK_QT_CHECK],
 	# other modules.
 	#
 	AC_WIRESHARK_QT_MODULE_CHECK(Core, $1, $qt_version_to_check,
-	    [qt_version_to_check=$qt_version],
+	    [
+	      qt_version_to_check=$qt_version
+	      QT_VERSION=$mod_version
+	    ],
 	    [no_qt=yes])
 
 	if test x"$no_qt" = x ; then
-- 
cgit v1.2.1