diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-02-02 19:00:37 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-02-03 09:10:20 +0000 |
| commit | eeafb47a126c1417f5b9810454b8d2206859fd40 (patch) | |
| tree | 22aa45885873691a036520855b070b82f7b90442 /acinclude.m4 | |
| parent | 640209215ebfb0541678cddf59304ea395937402 (diff) | |
Fix Qt4 moc option argument and add build parametrization
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>
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 5 |
1 files changed, 4 insertions, 1 deletions
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 |