diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-04-09 09:52:04 +0800 |
|---|---|---|
| committer | Roland Knall <rknall@gmail.com> | 2018-04-09 04:09:28 +0000 |
| commit | 8b93e6d6a2475b2e8072acaf8b7f63f6b5bff98d (patch) | |
| tree | 44691b93d46e271506c831bfa534a97709db3fba /configure.ac | |
| parent | f0fed342165145461ed88358d2fc8985d15f3745 (diff) | |
Autotools: More Qt4 removal.
Change-Id: I6609160530d2e2f0ca47c324de48aa659c253bcf
Reviewed-on: https://code.wireshark.org/review/26812
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index c445aeeab3..cbc71e6483 100644 --- a/configure.ac +++ b/configure.ac @@ -249,9 +249,9 @@ AX_LIB_SOCKET_NSL # GUI toolkit options # AC_ARG_WITH([qt], - AC_HELP_STRING( [--with-qt=@<:@yes/no/4/5@:>@], + AC_HELP_STRING( [--with-qt=@<:@yes/no@:>@], [use Qt @<:@default=yes, if available@:>@]), - with_qt="$withval", with_qt="unspecified") + with_qt="$withval", with_qt="yes") # GnuTLS # Version 3.0 switched from LGPLv2.1+ to LGPLv3+, then switched back to @@ -1200,12 +1200,7 @@ if test "x$enable_wireshark" = "xyes"; then # case "$host_os" in darwin*) - if test $qt_version -le 4 - then - AC_MSG_ERROR([macOS builds should use Qt5]) - else - Qt_LDFLAGS="-Wl,-rpath,"`$PKG_CONFIG --libs Qt${qt_version}Core | sed -e 's/-F//' -e 's/ -framework.*//'` - fi + Qt_LDFLAGS="-Wl,-rpath,"`$PKG_CONFIG --libs Qt${qt_version}Core | sed -e 's/-F//' -e 's/ -framework.*//'` ;; esac AC_SUBST(Qt_LDFLAGS) @@ -1213,13 +1208,7 @@ if test "x$enable_wireshark" = "xyes"; then if test -z "${MOC_OPTIONS+1}" then # Squelch moc verbose "nothing to do" output - if test $QT_VERSION_MAJOR -eq 5 - then - MOC_OPTIONS="-nn" - elif test $QT_VERSION_MAJOR -eq 4 -a $QT_VERSION_MINOR -ge 8 - then - MOC_OPTIONS="-nn" - fi + MOC_OPTIONS="-nn" fi AC_SUBST(MOC_OPTIONS) ], @@ -1493,7 +1482,6 @@ AC_SUBST(wireshark_bin) AC_SUBST(wireshark_man) AC_SUBST(wireshark_SUBDIRS) AM_CONDITIONAL(HAVE_Qt, test "$have_qt" = "yes") -AM_CONDITIONAL(HAVE_QT_VERSION_4, [test $qt_version -eq 4]) AM_CONDITIONAL(HAVE_GTK, test "$have_gtk" = "yes") # Enable/disable tshark @@ -2635,11 +2623,7 @@ else RPMBUILD_WITH_ARGS="--without gtk2 --without gtk3" fi if test "x$have_qt" = "xyes" ; then - if test "$qt_version" -eq "5"; then - RPMBUILD_WITH_ARGS="$RPMBUILD_WITH_ARGS --with qt5" - else - RPMBUILD_WITH_ARGS="$RPMBUILD_WITH_ARGS --with qt" - fi + RPMBUILD_WITH_ARGS="$RPMBUILD_WITH_ARGS --with qt5" else RPMBUILD_WITH_ARGS="$RPMBUILD_WITH_ARGS --without qt --without qt5" fi |