[gpsd-dev] [PATCH] Fixes dbusflags for some platforms.

[Fred Wright]

The simple '-ldbus-1' isn't adequate for platforms where the dbus
library isn't located in a "usual" place, and where additional include
paths and/or additional library paths may be needed.  Obtaining the
flags via pkg-config (as is already done in some other cases) takes
care of this.

It appears that dbusflags is used in enough places that the
questionable LIBPATH overrides no longer break dbus linking with this
fix.

TESTED:
Verified that build-all with dbus_export=yes builds on OSX, Linux,
FreeBSD, and OpenBSD.
---
 SConstruct | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SConstruct b/SConstruct
index edad986..dec9ea1 100644
--- a/SConstruct
+++ b/SConstruct
@@ -602,8 +602,8 @@ else:
 
     if env['dbus_export'] and config.CheckPKG('dbus-1'):
         confdefs.append("#define HAVE_DBUS 1\n")
-        dbusflags = ["-ldbus-1"]
-        env.MergeFlags(pkg_config("dbus-1"))
+        dbusflags = pkg_config("dbus-1")
+        env.MergeFlags(dbusflags)
     else:
         confdefs.append("/* #undef HAVE_DBUS */\n")
         dbusflags = []
-- 
2.7.2