osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Autotools: Disable Qt4 on macOS. 

Add a check for macOS+Qt4 to configure.ac in order to roughly match the
CMake behavior in ge858829.

Change-Id: I37de95d5db515d28dd88f13d818531bf6e94d07e
Reviewed-on: https://code.wireshark.org/review/19036
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
This commit is contained in:
Gerald Combs 2016-12-02 11:36:45 -08:00 committed by Peter Wu
parent c334297654
commit d8cdb55044
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure.ac
View File

@ -1293,18 +1293,19 @@ if test "x$enable_wireshark" = "xyes"; then
AC_SUBST(LRELEASE)
#
# On Darwin, find where the Qt frameworks are
# located, and add that to the rpath, just in
# case this is Qt 5.5 or later and the frameworks
# have an install name that begins with @rpath
# and aren't installed in a frameworks directory
# that's searched by default.
# On Darwin, make sure we're using Qt5 or later.
# If so, find where the Qt frameworks are located
# and add that to the rpath, just in case this is
# Qt 5.5 or later and the frameworks have an
# install name that begins with @rpath and aren't
# installed in a frameworks directory that's
# searched by default.
#
case "$host_os" in
darwin*)
if test $qt_version -le 4
then
Qt_LDFLAGS="-Wl,-rpath,"`$PKG_CONFIG --libs QtCore | sed -e 's/-F//' -e 's/ -framework.*//'`
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