--- Makefile.in.orig	2004-03-03 12:47:25.000000000 -0800
+++ Makefile.in	2005-05-28 16:48:36.000000000 -0700
@@ -56,12 +56,14 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" -DLIBDIR=\"${libdir}\" -DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" ${NOGARMIN} ${NOPLUGINS} ${USETELEATLAS}
+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" -DLIBDIR=\"${libdir}\" -DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" ${NOGARMIN} ${NOPLUGINS} ${USETELEATLAS} ${NOGPSD}
 DEPDIR = @DEPDIR@
 DISABLEGARMIN_FALSE = @DISABLEGARMIN_FALSE@
 DISABLEGARMIN_TRUE = @DISABLEGARMIN_TRUE@
 DISABLEPLUGINS_FALSE = @DISABLEPLUGINS_FALSE@
 DISABLEPLUGINS_TRUE = @DISABLEPLUGINS_TRUE@
+DISABLEGPSD_FALSE = @DISABLEGPSD_FALSE@
+DISABLEGPSD_TRUE = @DISABLEGPSD_TRUE@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -93,6 +95,7 @@
 MSGMERGE = @MSGMERGE@
 NOGARMIN = @NOGARMIN@
 NOPLUGINS = @NOPLUGINS@
+NOGPSD = @NOGPSD@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -143,7 +146,7 @@
 host_vendor = @host_vendor@
 
 
-# DEFS=@DEFS@ -I. -I$(srcdir) -I.. -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" -DLIBDIR=\"${libdir}\" -DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" ${NOGARMIN} ${NOPLUGINS} -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED 
+# DEFS=@DEFS@ -I. -I$(srcdir) -I.. -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" -DLIBDIR=\"${libdir}\" -DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" ${NOGARMIN} ${NOPLUGINS} ${NOGPSD} -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED 
 includedir = mysql
 infodir = @infodir@
 install_sh = @install_sh@
@@ -160,9 +163,10 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 @DISABLEGARMIN_FALSE@PRG1 = garble
-
 @DISABLEGARMIN_TRUE@PRG1 = 
-bin_PROGRAMS = $(PRG1) gpsdrive gpsd  friendsd2 
+@DISABLEGPSD_FALSE@GPSD = gpsd
+@DISABLEGPSD_TRUE@GPSD = 
+bin_PROGRAMS = $(PRG1) gpsdrive $(GPSD)  friendsd2 
 @ENABLETELEATLAS_FALSE@GPSNAVLIB = 
 
 @ENABLETELEATLAS_TRUE@GPSNAVLIB = -lgpsnavlib
@@ -192,6 +196,7 @@
 @DISABLEGARMIN_FALSE@PRGS = gpsdrive.c splash.c navigation.c speech_out.c friends.c battery.c track.c settings.c  power.h battery.h track.h gpsdrive.h garmin_data.cpp garmin_serial_unix.cpp garmin_application.cpp garmin_link.cpp garmin_util.cpp gpsdrivegarble.cpp garmin_legacy.cpp garmin_link.h    garmin_serial_unix.h garmin_application.h garmin_packet.h  garmin_types.h garmin_command.h garmin_phys.h garmin_util.h garmin_error.h garmin_serial.h gpssql.c gpskismet.c ../config.h icons.h garmin_legacy.h garmin_data.h gettext.h LatLong-UTMconversion.c LatLong-UTMconversion.h compass.h gpsserial.c gpsnasamap.c gpsmisc.c gpsproto.h talogo.h
 
 @DISABLEGARMIN_TRUE@PRGS = gpsdrive.c splash.c navigation.c speech_out.c friends.c battery.c track.c settings.c  power.h battery.h track.h gpsdrive.h gpssql.c gpskismet.c ../config.h icons.h gettext.h LatLong-UTMconversion.c LatLong-UTMconversion.h compass.h gpsserial.c gpsnasamap.c gpsmisc.c gpsproto.h talogo.h
+@DISABLEGPSD_TRUE@PRGS = gpsdrive.c splash.c navigation.c speech_out.c friends.c battery.c track.c settings.c  power.h battery.h track.h gpsdrive.h gpssql.c gpskismet.c ../config.h icons.h gettext.h LatLong-UTMconversion.c LatLong-UTMconversion.h compass.h gpsserial.c gpsnasamap.c gpsmisc.c gpsproto.h talogo.h
 gpsdrive_SOURCES = $(PRGS)
 
 @DISABLEGARMIN_FALSE@garble_SOURCES = garble.cpp garmin_legacy.cpp garmin_data.cpp garmin_serial_unix.cpp garmin_application.cpp garmin_link.cpp garmin_util.cpp
@@ -228,6 +233,8 @@
 libnautic_la_OBJECTS = $(am_libnautic_la_OBJECTS)
 @DISABLEGARMIN_TRUE@bin_PROGRAMS = gpsdrive$(EXEEXT) gpsd$(EXEEXT) \
 @DISABLEGARMIN_TRUE@	friendsd2$(EXEEXT)
+@DISABLEGPSD_TRUE@bin_PROGRAMS = gpsdrive$(EXEEXT) \
+@DISABLEGPSD_TRUE@	friendsd2$(EXEEXT)
 @DISABLEGARMIN_FALSE@bin_PROGRAMS = garble$(EXEEXT) gpsdrive$(EXEEXT) \
 @DISABLEGARMIN_FALSE@	gpsd$(EXEEXT) friendsd2$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
--- Makefile.am.orig	2005-05-28 16:32:26.000000000 -0700
+++ Makefile.am	2005-05-28 16:34:37.000000000 -0700
@@ -9,7 +9,12 @@
 else 
 PRG1=garble
 endif
-bin_PROGRAMS = $(PRG1) gpsdrive gpsd  friendsd2 
+if DISABLEGPSD
+GPSD=
+else 
+GPSD=gpsd
+endif
+bin_PROGRAMS = $(PRG1) gpsdrive $(GPSD)  friendsd2 
 LIBS=
 
 if ENABLETELEATLAS