summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES2
-rw-r--r--package/gpsd/gpsd.mk9
2 files changed, 10 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 05c955413..e53321951 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@
Fixes all over the tree.
- Updated/fixed packages: bash, bind, busybox, libglib2,
+ Updated/fixed packages: bash, bind, busybox, gpsd, libglib2,
libcurl, libmad, lrzsz, midori, module-init-tools, mtd-utils,
openssh, openssl, pciutils, qt, sqlite, sysstat, webkit, zlib
diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index ab7e921c1..6c249911b 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -18,6 +18,15 @@ else
GPSD_CONF_OPT += --disable-libgpsmm
endif
+# Enable or disable Qt binding
+ifeq ($(BR2_PACKAGE_QT_NETWORK),y)
+ GPSD_CONF_ENV += QMAKE="$(QT_QMAKE)"
+ GPSD_CONF_OPT += --enable-libQgpsmm
+ GPSD_DEPENDENCIES += qt
+else
+ GPSD_CONF_OPT += --disable-libQgpsmm
+endif
+
# If libusb is available build it before so the package can use it
ifeq ($(BR2_PACKAGE_LIBUSB),y)
GPSD_DEPENDENCIES += libusb