diff options
| author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-11-25 20:25:31 +0000 |
|---|---|---|
| committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-11-25 20:25:31 +0000 |
| commit | 7aff72d1cb06932f76a9c2b870440b580cbe6fc7 (patch) | |
| tree | 69a9efb9d0c5b7b44fac98f239a5230c6d7b8470 /configure.in | |
| parent | 208957c6e038df6768a28eb06a3101173619f1fa (diff) | |
| download | navit-svn-7aff72d1cb06932f76a9c2b870440b580cbe6fc7.tar.gz | |
Fix:vehicle_gpsd:Mostly revert rev.5642 to allow N810 to use old libgps. Warn in CMake build.|Fixes #1179.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5719 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 24690191..1ba2f879 100644 --- a/configure.in +++ b/configure.in @@ -1056,10 +1056,20 @@ AM_CONDITIONAL(VEHICLE_DEMO, test "x${vehicle_demo}" = "xyes") AC_ARG_ENABLE(vehicle-file, [ --disable-vehicle-file disable vehicle type file], vehicle_file=$enableval;vehicle_file_reason="configure parameter") AM_CONDITIONAL(VEHICLE_FILE, test "x${vehicle_file}" = "xyes") # gpsd +# We accept even old, buggy versions of libgps, because N810 uses an old version (see #1179). AC_ARG_ENABLE(vehicle-gpsd, [ --disable-vehicle-gpsd disable vehicle type gpsd], vehicle_gpsd=$enableval;vehicle_gpsd_reason="configure parameter") if test "x${vehicle_gpsd}" = xyes then - PKG_CHECK_MODULES([GPSD], [libgps >= 3.10], ,vehicle_gpsd="no";vehicle_gpsd_reason="package libgps >=V3.1 missing") + PKG_CHECK_MODULES([GPSD], [libgps], have_libgps="yes", have_libgps="no") + if test "x$have_libgps" = "xyes"; then + AC_DEFINE([HAVE_LIBGPS],[],Define to 1 if you have libgps.) + PKG_CHECK_MODULES([LIBGPS19], [libgps >= 2.90], have_libgps19="yes", have_libgps19="no") + if test "x$have_libgps19" = "xyes"; then + AC_DEFINE([HAVE_LIBGPS19],[],Define to 1 if you have libgps19.) + fi + else + AC_CHECK_HEADER(gps.h, AC_DEFINE([HAVE_LIBGPS],[],Define to 1 if you have the <gps.h> header file.) GPSD_LIBS="-lgps", vehicle_gpsd=no; vehicle_gpsd_reason="no gps.h and no gpsd pkgconfig" ) + fi fi AC_SUBST(GPSD_CFLAGS) AC_SUBST(GPSD_LIBS) |