Merge pull request #2971 from rubenk/gpsd-fix-build