diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2011-03-31 06:15:51 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2011-03-31 06:15:51 -0400 |
| commit | 1bf4c6392865dae7977e9eb6d237f0cc9261cd48 (patch) | |
| tree | b83f8cd010ec3ad35c25c86bccebb0ff56899bc0 /gpsd.h-tail | |
| parent | 339cebbc2478cd889f8ddd17089b20d7cee74f79 (diff) | |
| download | gpsd-1bf4c6392865dae7977e9eb6d237f0cc9261cd48.tar.gz | |
More extraction of autoconf tentacles.
Get rid of several obsolete AM_CONDITIONALs. Move NMEA-variants-to-NMEA
dependencies into the C code so they're build-system-independent. We're
no longer using timezone anywhere, so that doesn't need to be configured.
Reorder configure.ac to separate out boilerplate. The nsl and socket
libraries are obsolete, so don't search for those either.
All regression tests pass.
Diffstat (limited to 'gpsd.h-tail')
| -rw-r--r-- | gpsd.h-tail | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gpsd.h-tail b/gpsd.h-tail index 2f75ad76..c33cc2be 100644 --- a/gpsd.h-tail +++ b/gpsd.h-tail @@ -28,6 +28,9 @@ typedef unsigned int speed_t; #define JSON_DATE_MAX 24 /* ISO8601 timestamp with 2 decimal places */ /* Some internal capabilities depend on which drivers we're compiling. */ +#if !defined(NMEA_ENABLE) && (defined(FV18_ENABLE) || defined(MTK3301_ENABLE) || defined(TNT_ENABLE) || defined(OCEANSERVER_ENABLE) || defined(GPSCLOCK_ENABLE)) +#define NMEA_ENABLE +#endif #ifdef EARTHMATE_ENABLE #define ZODIAC_ENABLE #endif @@ -35,7 +38,7 @@ typedef unsigned int speed_t; #define BINARY_ENABLE #endif #if defined(TRIPMATE_ENABLE) || defined(BINARY_ENABLE) -#define NON_NMEA_ENABLE +#define NON_NMEA_ENABLE #endif #if defined(TNT_ENABLE) || defined(OCEANSERVER_ENABLE) #define COMPASS_ENABLE |