From 3e25e2167beb3936de3986fad9b6c9bdec82b81f Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Thu, 1 Oct 2015 20:37:28 -0400
Subject: Address  Savannah bug #46082 - Can't explicitly build with NMEA
 drivers.

---
 drivers.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'drivers.c')

diff --git a/drivers.c b/drivers.c
index edd6a7dc..de5ce78c 100644
--- a/drivers.c
+++ b/drivers.c
@@ -27,7 +27,7 @@ gps_mask_t generic_parse_input(struct gps_device_t *session)
     else if (session->lexer.type == COMMENT_PACKET) {
 	gpsd_set_century(session);
 	return 0;
-#ifdef NMEA_ENABLE
+#ifdef NMEA0183_ENABLE
     } else if (session->lexer.type == NMEA_PACKET) {
 	const struct gps_type_t **dp;
 	gps_mask_t st = 0;
@@ -61,7 +61,7 @@ gps_mask_t generic_parse_input(struct gps_device_t *session)
 	    }
 	}
 	return st;
-#endif /* NMEA_ENABLE */
+#endif /* NMEA0183_ENABLE */
     } else {
 	gpsd_log(&session->context->errout, LOG_SHOUT,
 		 "packet type %d fell through (should never happen): %s.\n",
@@ -104,7 +104,7 @@ const struct gps_type_t driver_unknown = {
 };
 /* *INDENT-ON* */
 
-#ifdef NMEA_ENABLE
+#ifdef NMEA0183_ENABLE
 /**************************************************************************
  *
  * NMEA 0183
@@ -144,14 +144,14 @@ static void nmea_event_hook(struct gps_device_t *session, event_t event)
 	 * unless there is actual following data.
 	 */
 	switch (session->lexer.counter) {
-#ifdef NMEA_ENABLE
+#ifdef NMEA0183_ENABLE
 	case 0:
 	    /* probe for Garmin serial GPS -- expect $PGRMC followed by data */
 	    gpsd_log(&session->context->errout, LOG_PROG,
 		     "=> Probing for Garmin NMEA\n");
 	    (void)nmea_send(session, "$PGRMCE");
 	    break;
-#endif /* NMEA_ENABLE */
+#endif /* NMEA0183_ENABLE */
 #ifdef SIRF_ENABLE
 	case 1:
 	    /*
@@ -181,7 +181,7 @@ static void nmea_event_hook(struct gps_device_t *session, event_t event)
 	    session->back_to_nmea = true;
 	    break;
 #endif /* SIRF_ENABLE */
-#ifdef NMEA_ENABLE
+#ifdef NMEA0183_ENABLE
 	case 2:
 	    /* probe for the FV-18 -- expect $PFEC,GPint followed by data */
 	    gpsd_log(&session->context->errout, LOG_PROG,
@@ -194,7 +194,7 @@ static void nmea_event_hook(struct gps_device_t *session, event_t event)
 		     "=> Probing for Trimble Copernicus\n");
 	    (void)nmea_send(session, "$PTNLSNM,0139,01");
 	    break;
-#endif /* NMEA_ENABLE */
+#endif /* NMEA0183_ENABLE */
 #ifdef EVERMORE_ENABLE
 	case 4:
 	    gpsd_log(&session->context->errout, LOG_PROG,
@@ -276,7 +276,7 @@ const struct gps_type_t driver_nmea0183 = {
 };
 /* *INDENT-ON* */
 
-#if defined(GARMIN_ENABLE) && defined(NMEA_ENABLE)
+#if defined(GARMIN_ENABLE) && defined(NMEA0183_ENABLE)
 /**************************************************************************
  *
  * Garmin NMEA
@@ -377,7 +377,7 @@ const struct gps_type_t driver_garmin = {
 #endif /* TIMEHINT_ENABLE */
 };
 /* *INDENT-ON* */
-#endif /* GARMIN_ENABLE && NMEA_ENABLE */
+#endif /* GARMIN_ENABLE && NMEA0183_ENABLE */
 
 #ifdef ASHTECH_ENABLE
 /**************************************************************************
@@ -641,7 +641,7 @@ static const struct gps_type_t driver_earthmate = {
 /* *INDENT-ON* */
 #endif /* EARTHMATE_ENABLE */
 
-#endif /* NMEA_ENABLE */
+#endif /* NMEA0183_ENABLE */
 
 #ifdef TNT_ENABLE
 /**************************************************************************
@@ -1351,10 +1351,10 @@ static gps_mask_t aivdm_analyze(struct gps_device_t *session)
 	    return ONLINE_SET | AIS_SET;
 	} else
 	    return ONLINE_SET;
-#ifdef NMEA_ENABLE
+#ifdef NMEA0183_ENABLE
     } else if (session->lexer.type == NMEA_PACKET) {
 	return nmea_parse((char *)session->lexer.outbuffer, session);
-#endif /* NMEA_ENABLE */
+#endif /* NMEA0183_ENABLE */
     } else
 	return 0;
 }
@@ -1548,7 +1548,7 @@ extern const struct gps_type_t driver_zodiac;
 /* the point of this rigamarole is to not have to export a table size */
 static const struct gps_type_t *gpsd_driver_array[] = {
     &driver_unknown,
-#ifdef NMEA_ENABLE
+#ifdef NMEA0183_ENABLE
     &driver_nmea0183,
 #ifdef ASHTECH_ENABLE
     &driver_ashtech,
@@ -1583,7 +1583,7 @@ static const struct gps_type_t *gpsd_driver_array[] = {
 #ifdef AIVDM_ENABLE
     &driver_aivdm,
 #endif /* AIVDM_ENABLE */
-#endif /* NMEA_ENABLE */
+#endif /* NMEA0183_ENABLE */
 
 #ifdef EVERMORE_ENABLE
     &driver_evermore,
-- 
cgit v1.2.1