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 /configure.ac | |
| 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 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 930d3ca459..7bbc089284 100644 --- a/configure.ac +++ b/configure.ac @@ -110,6 +110,10 @@ if test ! -z "$CXX"; then AC_LANG_POP([C++]) fi +# Qt 5.7 or later requires C++11 +AS_IF([test -n "$CXX"], + [AX_CXX_COMPILE_STDCXX([11], [noext], [optional])]) + # Set CC_FOR_BUILD (the *local* gcc to use for building e.g. lemon) if test "x$cross_compiling" = xno -a -z "$CC_FOR_BUILD"; then CC_FOR_BUILD="$CC" @@ -1321,17 +1325,13 @@ if test "x$enable_wireshark" = "xyes"; then if test -z "${MOC_OPTIONS+1}" then - if test $qt_version -eq 5 + # Squelch moc verbose "nothing to do" output + if test $QT_VERSION_MAJOR -eq 5 then - # Squelch moc verbose "nothing to do" output MOC_OPTIONS="-nn" - elif test $qt_version -eq 4 + elif test $QT_VERSION_MAJOR -eq 4 -a $QT_VERSION_MINOR -ge 8 then - qt_minor_version=`echo "$QT_VERSION" | cut -f2 -d.` - if test $qt_minor_version -ge 8 - then - MOC_OPTIONS="-nn" - fi + MOC_OPTIONS="-nn" fi fi AC_SUBST(MOC_OPTIONS) |