26 lines
975 B
Plaintext
26 lines
975 B
Plaintext
$NetBSD: patch-configure,v 1.1 2015/09/07 18:57:47 gdt Exp $
|
|
|
|
--- configure.orig 2015-09-01 16:32:13.000000000 +0000
|
|
+++ configure
|
|
@@ -4816,19 +4816,7 @@ rm -f core conftest.err conftest.$ac_obj
|
|
$as_echo "#define HAVE_LIBUSB 1" >>confdefs.h
|
|
|
|
|
|
- # On Mac, use frameworks for includes and library files.
|
|
- # 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_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_FRAMEWORKS)
|
|
- if test $QT_FW_OR_LIBS = "**Unknown**" ; then
|
|
- QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_LIBS)
|
|
- fi
|
|
- QT_LIBS="-F$QT_FW_OR_LIBS -framework QtCore"
|
|
- QT_INC="$QT_FW_OR_LIBS"
|
|
- QT_INC_OPT="-F"
|
|
- QT_SYSINC_OPT="-iframework"
|
|
+ # In pkgsrc, we use the installed qt, not the framework.
|
|
;;
|
|
*-*-freebsd*)
|
|
GBSER=gbser_posix.o
|