diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-06-25 19:23:58 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-06-27 06:56:51 +0000 |
| commit | ff9e62a30b43b1dbe940d623ab8c6b39283bf4b1 (patch) | |
| tree | acde4604c6d375716032a2ab6c54830d5e72a69c /acinclude.m4 | |
| parent | fbb23e27dddbc2f05a749df2cd07e5d8dd8335ee (diff) | |
autotools: Qt 5.7 requires C++11
Change-Id: Icad622a052a84862ace98a7000f10ccf677f54a5
Reviewed-on: https://code.wireshark.org/review/16138
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 42ce8d5fc4..8881203f23 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1757,6 +1757,14 @@ AC_DEFUN([AC_WIRESHARK_QT_CHECK], [ qt_version_to_check=$qt_version QT_VERSION=$mod_version + QT_VERSION_MAJOR=`echo "$QT_VERSION" | cut -f1 -d.` + QT_VERSION_MINOR=`echo "$QT_VERSION" | cut -f2 -d.` + QT_VERSION_MICRO=`echo "$QT_VERSION" | cut -f3 -d.` + + # Qt 5.7 and later requires C++11 + AS_IF([test $QT_VERSION_MAJOR -eq 5 -a $QT_VERSION_MINOR -ge 7], + [AS_IF([test "$HAVE_CXX11" -eq 0], [AC_MSG_ERROR([Qt 5.7 and later requires C++11])])]) + ], [no_qt=yes]) |