Include config.h where it's needed
authorGilles Filippini <pini@debian.org>
Thu, 7 Jan 2010 20:35:25 +0000 (21:35 +0100)
committerGilles Filippini <pini@debian.org>
Thu, 7 Jan 2010 21:04:40 +0000 (22:04 +0100)
debian/patches/libgps-2.90-fix-1

index 7e8fe8f..c3f40fd 100644 (file)
@@ -1,8 +1,8 @@
 To cope both with libgps18 and libgps19
 Index: navit/configure.in
 ===================================================================
---- navit.orig/configure.in    2009-12-20 00:33:10.000000000 +0100
-+++ navit/configure.in 2009-12-20 00:33:10.000000000 +0100
+--- navit.orig/configure.in    2010-01-06 00:08:44.000000000 +0100
++++ navit/configure.in 2010-01-06 00:08:44.000000000 +0100
 @@ -773,7 +773,17 @@
  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
@@ -24,8 +24,8 @@ Index: navit/configure.in
  AC_SUBST(GPSD_LIBS)
 Index: navit/navit/attr_def.h
 ===================================================================
---- navit.orig/navit/attr_def.h        2009-12-20 00:33:02.000000000 +0100
-+++ navit/navit/attr_def.h     2009-12-20 00:33:10.000000000 +0100
+--- navit.orig/navit/attr_def.h        2010-01-06 00:06:16.000000000 +0100
++++ navit/navit/attr_def.h     2010-01-06 00:08:44.000000000 +0100
 @@ -226,7 +226,9 @@
  ATTR(gc_type)
  ATTR(layout)
@@ -38,8 +38,8 @@ Index: navit/navit/attr_def.h
  ATTR(src)
 Index: navit/navit/vehicle/gpsd/vehicle_gpsd.c
 ===================================================================
---- navit.orig/navit/vehicle/gpsd/vehicle_gpsd.c       2009-12-20 00:33:02.000000000 +0100
-+++ navit/navit/vehicle/gpsd/vehicle_gpsd.c    2009-12-20 00:33:10.000000000 +0100
+--- navit.orig/navit/vehicle/gpsd/vehicle_gpsd.c       2010-01-06 00:06:16.000000000 +0100
++++ navit/navit/vehicle/gpsd/vehicle_gpsd.c    2010-01-06 00:08:44.000000000 +0100
 @@ -36,7 +36,9 @@
  
  static struct vehicle_priv {
@@ -163,3 +163,28 @@ Index: navit/navit/vehicle/gpsd/vehicle_gpsd.c
        retry_int = attr_search(attrs, NULL, attr_retry_interval);
        if (retry_int) {
                ret->retry_interval = retry_int->u.num;
+Index: navit/navit/attr.h
+===================================================================
+--- navit.orig/navit/attr.h    2010-01-06 00:06:16.000000000 +0100
++++ navit/navit/attr.h 2010-01-06 00:08:44.000000000 +0100
+@@ -25,6 +25,7 @@
+ #endif
+ #include "projection.h"
++#include "config.h"
+ enum item_type;
+Index: navit/navit/map/garmin/Makefile.am
+===================================================================
+--- navit.orig/navit/map/garmin/Makefile.am    2010-01-06 00:09:00.000000000 +0100
++++ navit/navit/map/garmin/Makefile.am 2010-01-06 00:09:09.000000000 +0100
+@@ -20,7 +20,7 @@
+ gentypes_SOURCES=gentypes.c
+ gentypes.$(OBJEXT): gentypes.c
+-      $(CC_FOR_BUILD) -I$(top_srcdir)/navit -c -o $@ $<
++      $(CC_FOR_BUILD) -I$(top_srcdir)/navit -I$(top_srcdir) -c -o $@ $<
+ gentypes$(EXEEXT): $(gentypes_OBJECTS) $(gentypes_DEPENDENCIES) 
+       @rm -f gentypes$(EXEEXT)