summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Pasch <fpasch@googlemail.com>2010-11-15 18:32:03 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-11-24 21:41:46 (GMT)
commit5a8f4d7828903b6a97da3ad17f138c6b24c23128 (patch)
tree81dea2fecefd7d5ffdb817ffc03f46232e5e663e
parent9c69033480b52d9fd93ab35172e23e78e19d683a (diff)
downloadbuildroot-5a8f4d7828903b6a97da3ad17f138c6b24c23128.tar.gz
buildroot-5a8f4d7828903b6a97da3ad17f138c6b24c23128.tar.bz2
gpsd: Only build qt support if qt-network is enabled
Signed-off-by: Frederik Pasch <fpasch@googlemail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-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 05c9554..e533219 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 ab7e921..6c24991 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