Enable eveything to build when RTCM104 is configured out.

5 files changed, 19 insertions, 3 deletions

diff --git a/Makefile.am b/Makefile.am
index 7c748ba7..51df9df2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,12 @@ DBUSPAGES = gpxlogger.1
 gpxlogger_LDADD = $(DBUS_GLIB_LIBS)
 endif
 
-bin_PROGRAMS = $(DBUSPROGS) $(MOTIF_PROGS) sirfmon rtcmdecode gpspipe gpsflash cgps cgpxlogger
+if HAVE_RTCM104
+RTCM104PROGS = rtcmdecode
+RTCM104PAGES = rtcmdecode.1
+endif
+
+bin_PROGRAMS = $(DBUSPROGS) $(MOTIF_PROGS) $(RTCM104PROGS) sirfmon gpspipe gpsflash cgps cgpxlogger
 dist_bin_SCRIPTS = gpsprof gpsfake 
 sbin_PROGRAMS = gpsd
 check_PROGRAMS = bits_test gpsmm_test packet_test
@@ -159,8 +164,8 @@ man_MANS = \
 	gpsfake.1 \
 	sirfmon.1 \
 	$(DBUSPAGES) \
+	$(RTCM104PAGES) \
 	gpspipe.1 \
-	rtcmdecode.1 \
 	gpsflash.1 \
 	rtcm-104.5 \
 	srec.5
diff --git a/configure.ac b/configure.ac
index bbd34ebe..ce4b44fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -257,7 +257,7 @@ dnl check for Evermore support
 AC_ARG_ENABLE(evermore,
   AC_HELP_STRING([--disable-evermore],
                  [disable Evermore binary support]),
-  [ac_fv18=$enableval], [ac_evermore=yes])
+  [ac_evermore=$enableval], [ac_evermore=yes])
 AC_MSG_CHECKING([for Evermore support])
 if test x"$ac_evermore" = "xyes"; then
     AC_MSG_RESULT([yes])
@@ -279,6 +279,8 @@ else
   AC_MSG_RESULT([no])
 fi
 
+AM_CONDITIONAL([HAVE_RTCM104], [test "$ac_rtcm104" = "yes"])
+
 dnl check for profiling support
 AC_ARG_ENABLE(profiling,
   AC_HELP_STRING([--enable-profiling],
diff --git a/isgps.c b/isgps.c
index b0e39ef9..dd46f393 100644
--- a/isgps.c
+++ b/isgps.c
@@ -61,6 +61,8 @@ necessary) reassembled into a struct rtcm_t.
 
 #include "gpsd.h"
 
+#ifdef BINARY_ENABLE
+
 #define MAG_SHIFT 6u
 #define MAG_TAG_DATA (1 << MAG_SHIFT)
 #define MAG_TAG_MASK (3 << MAG_SHIFT)
@@ -308,3 +310,4 @@ enum isgpsstat_t isgps_decode(struct gps_device_t *session,
 }
 /*@ +usereleased +compdef @*/
 
+#endif /* BINARY_ENABLE */
diff --git a/packet.c b/packet.c
index abcaa6b8..18696495 100644
--- a/packet.c
+++ b/packet.c
@@ -814,7 +814,9 @@ void packet_reset(struct gps_device_t *session)
     session->packet_state = GROUND_STATE;
     session->inbuflen = 0;
     session->inbufptr = session->inbuffer;
+#ifdef BINARY_ENABLE
     isgps_init(session);
+#endif /* BINARY_ENABLE */
 }
 
 
diff --git a/rtcm.c b/rtcm.c
index f650c8ac..4bd79172 100644
--- a/rtcm.c
+++ b/rtcm.c
@@ -56,6 +56,8 @@ Starlink's website.
 
 #include "gpsd.h"
 
+#ifdef RTCM104_ENABLE
+
 /*
  * Structures for interpreting words in an RTCM-104 message (after
  * parity checking and removing inversion).
@@ -1179,3 +1181,5 @@ void rtcm_output_mag(isgps30bits_t * ip)
     }
 }
 #endif /* UNUSED */
+
+#endif /* RTCM104_ENABLE */