[gpsd-dev] [PATCH] Navcom needs binary support

[Peter Korsgaard]

Enable binary support when navcom driver is enabled, otherwise the build
errors out with:

./libgpsd.so: undefined reference to `navcom_binary'

If no other drivers needing binary support are enabled.

Signed-off-by: Peter Korsgaard <address@hidden>
---
 driver_navcom.c |    4 ++--
 gpsd.h-tail     |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/driver_navcom.c b/driver_navcom.c
index 770a5e4..accc8ef 100644
--- a/driver_navcom.c
+++ b/driver_navcom.c
@@ -41,7 +41,7 @@
 #include <math.h>
 #include "gpsd.h"
 
-#if defined(NAVCOM_ENABLE) && defined(BINARY_ENABLE)
+#if defined(NAVCOM_ENABLE)
 #include "bits.h"
 
 /* Have data which is 24 bits long */
@@ -1306,4 +1306,4 @@ const struct gps_type_t navcom_binary =
 };
 /* *INDENT-ON* */
 
-#endif /* defined(NAVCOM_ENABLE) && defined(BINARY_ENABLE) */
+#endif /* defined(NAVCOM_ENABLE) */
diff --git a/gpsd.h-tail b/gpsd.h-tail
index 4b61126..090095c 100644
--- a/gpsd.h-tail
+++ b/gpsd.h-tail
@@ -39,7 +39,7 @@ typedef unsigned int speed_t;
 #ifdef EARTHMATE_ENABLE
 #define ZODIAC_ENABLE
 #endif
-#if defined(ZODIAC_ENABLE) || defined(SIRF_ENABLE) || defined(GARMIN_ENABLE) 
|| defined(TSIP_ENABLE) || defined(EVERMORE_ENABLE) || defined(ITRAX_ENABLE) || 
defined(UBX_ENABLE) || defined(SUPERSTAR2_ENABLE) || defined(ONCORE_ENABLE) || 
defined(GEOSTAR_ENABLE)
+#if defined(ZODIAC_ENABLE) || defined(SIRF_ENABLE) || defined(GARMIN_ENABLE) 
|| defined(TSIP_ENABLE) || defined(EVERMORE_ENABLE) || defined(ITRAX_ENABLE) || 
defined(UBX_ENABLE) || defined(SUPERSTAR2_ENABLE) || defined(ONCORE_ENABLE) || 
defined(GEOSTAR_ENABLE) || defined(NAVCOM_ENABLE)
 #define BINARY_ENABLE
 #endif
 #if defined(TRIPMATE_ENABLE) || defined(BINARY_ENABLE)
-- 
1.7.6.3