From: robertlipe Date: Tue, 5 Feb 2013 20:00:45 +0000 (+0000) Subject: Add workaround for MacPorts' mutant build/install of Qt frameworks. X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~11^2~681 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7de9bc7bc4c148e12f900afbaac99ad9f3673594;p=gpsbabel.git Add workaround for MacPorts' mutant build/install of Qt frameworks. --- diff --git a/gpsbabel/configure.in b/gpsbabel/configure.in index e602cb6ef..f1986aad6 100644 --- a/gpsbabel/configure.in +++ b/gpsbabel/configure.in @@ -189,7 +189,16 @@ case "$target" in USB_LIBS="-framework IOKit -framework CoreFoundation" AC_DEFINE(HAVE_LIBUSB, 1) CFLAGS="$CFLAGS -Imac/libusb/" - QT_LIBS="-F$(qmake -query QT_INSTALL_LIBS) -framework QtCore" + + # Macports uses a non-standard build of Qt with an added + # QT_INSTALL_FRAMEWORKS flag, so look for thier custom + # version first. That will fail on 'normal' Qt so fall + # back to QT_INSTALL_LIBS. + QT_LIBS=$(qmake -query QT_INSTALL_FRAMEWORKS) + if test $QT_LIBS = "**Unknown**" ; then + QT_LIBS=$(qmake -query QT_INSTALL_LIBS) + fi + QT_LIBS="-F$QT_LIBS -framework QtCore" ;; *) GBSER=gbser_posix.o