Jens Oberender's configuration fixes.

4 files changed, 74 insertions, 250 deletions

diff --git a/configure.in b/configure.in
index 9a0595aa..f4d6dfdc 100644
--- a/configure.in
+++ b/configure.in
@@ -68,12 +68,69 @@ AC_SUBST(XP_LIBS)
 AC_SUBST(XM_LIBS)
 AM_CONDITIONAL([HAVE_MOTIF], [test "$XM_LIBS" != ""])
 
-AC_DEFINE(FV18_ENABLE,      1, [San Jose Navigation FV-18 support])
-AC_DEFINE(TRIPMATE_ENABLE,  1, [DeLorme TripMate support])
-AC_DEFINE(EARTHMATE_ENABLE, 1, [DeLorme EarthMate Zodiac support])
-AC_DEFINE(LOGFILE_ENABLE,   1, [Logfile driver support])
- 
+dnl check for FV-18 support
+AC_ARG_ENABLE(fv18,
+  AC_HELP_STRING([--disable-fv18],
+                 [disable San Jose Navigation FV-18 support]),
+  [ac_fv18=$enableval], [ac_fv18=yes])
+AC_MSG_CHECKING([for FV-18 support])
+if test x"$ac_fv18" = "xyes"; then
+    AC_MSG_RESULT([yes])
+	AC_DEFINE([FV18_ENABLE], 1, [San Jose Navigation FV-18 support])
+else
+  AC_MSG_RESULT([no])
+fi
+
+dnl check for Tripmate support
+AC_ARG_ENABLE(tripmate,
+  AC_HELP_STRING([--disable-tripmate],
+                 [disable DeLorme TripMate support]),
+  [ac_tripmate=$enableval], [ac_tripmate=yes])
+AC_MSG_CHECKING([for Tripmate support])
+if test x"$ac_tripmate" = "xyes"; then
+    AC_MSG_RESULT([yes])
+	AC_DEFINE([TRIPMATE_ENABLE], 1, [DeLorme TripMate support])
+else
+  AC_MSG_RESULT([no])
+fi
+
+dnl check for EarthMate support
+AC_ARG_ENABLE(earthmate,
+  AC_HELP_STRING([--disable-earthmate],
+                 [disable DeLorme EarthMate Zodiac support]),
+  [ac_earthmate=$enableval], [ac_earthmate=yes])
+AC_MSG_CHECKING([for EarthMate support])
+if test x"$ac_earthmate" = "xyes"; then
+    AC_MSG_RESULT([yes])
+	AC_DEFINE([EARTHMATE_ENABLE], 1, [DeLorme EarthMate Zodiac support])
+else
+  AC_MSG_RESULT([no])
+fi
+
+dnl check for Logfile support
+AC_ARG_ENABLE(logfile,
+  AC_HELP_STRING([--disable-logfile],
+                 [disable Logfile driver support]),
+  [ac_logfile=$enableval], [ac_logfile=yes])
+AC_MSG_CHECKING([for Logfile support])
+if test x"$ac_logfile" = "xyes"; then
+    AC_MSG_RESULT([yes])
+	AC_DEFINE([LOGFILE_ENABLE], 1, [Logfile driver support])
+else
+  AC_MSG_RESULT([no])
+fi
+
 AC_OUTPUT(Makefile gpsd.spec)
 
-(echo "# Generated from gpsd.spec.in, do not handhack!"; cat gpsd.spec) >gpsd.tmp.$$
-mv gpsd.tmp.$$ gpsd.spec
+dnl Output the configuration summary
+echo ""
+echo "=========================================="
+echo "$PACKAGE $VERSION"
+echo "------------------------------------------"
+echo "FV-18       : $ac_fv18"
+echo "Tripmate    : $ac_tripmate"
+echo "Earthmate   : $ac_earthmate"
+echo "Logfile     : $ac_logfile"
+echo "------------------------------------------"
+echo "Configure finished, type 'make' to build."
+
diff --git a/gpsd.spec.in b/gpsd.spec.in
index dc194b72..0c2156a4 100644
--- a/gpsd.spec.in
+++ b/gpsd.spec.in
@@ -119,7 +119,10 @@ cp xgpsspeed.ad "$RPM_BUILD_ROOT"%{_libdir}/X11/app-defaults/xgpsspeed
 %changelog
 * Mon Sep 20 2004 Eric S. Raymond <esr@snark.thyrsus.com> - 2.1-1
 - Various internal cleanups, including fossil removal in the 
-  configuration machinery.
+  configuration machinery.  FV-18, Tripmate, Earthmate and are now enabled 
+  but can be disable with --disable-$NAME at configure time.  When you call 
+  configure with --disable-shared=libgps is linked statically
+  to the binaries (native libs are still linked shared).
 
 * Thu Sep 16 2004 Eric S. Raymond <esr@snark.thyrsus.com> - 2.0-1
 - Packaging fixes for 2.0 release.
diff --git a/install-sh b/install-sh
deleted file mode 100755
index 58719246..00000000
--- a/install-sh
+++ /dev/null
@@ -1,238 +0,0 @@
-#! /bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-#
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0
diff --git a/www/index.html b/www/index.html
index 68d3a97b..504cf105 100644
--- a/www/index.html
+++ b/www/index.html
@@ -135,11 +135,13 @@ href='http://www.mgix.com/gps3d/'>gps3d</a> that ships a gpsd with
 similar goals to ours, but which appears to be an independent

 development. There haven't been any releases since early 2002.</p>

 

-<p>There appears also to be some sort of <code>gpsd</code>-like

-hack hosted under <a

+<p>There is a <code>gpsd</code>-like hack hosted under <a

 href='http://www2.musatcha.com/musatcha/computers/software/gpsd/'>Microsoft

-Windows</a>. Source code is not available, so we can't tell whether

-it's a derivative of <code>gpsd</code>.</p>

+Windows</a>. It orivides gpsd service from data in netstumbler under

+win32.  This way programs such as <a

+href='http://www.wigle.net'>JiGLE</a> can still get gps data from

+netstumbler. This program is not genetically related to

+<code>gpsd</code>.</p>

 

 <p>We aren't the Greenville Public School District or the Greater

 Peoria Sanitary District, nor do we have anything to do with the