debian/0000775000000000000000000000000012312161115007161 5ustar debian/copyright0000664000000000000000000001003211326372744011130 0ustar This is the Debian GNU/Linux package of Xastir. Xastir was written by Frank Giannandrea, KC2GJS . The Debian package was initially created by Hamish Moffatt from sources obtained at: http://home.earthlink.net/~fgiannan/xastir/files/ The current source location is http://www.sourceforge.net/projects/xastir/ A copy of the GNU General Public License is available as /usr/share/common-licenses/GPL in the Debian GNU/Linux distribution. From the LICENSE file in the source package: 1) The majority of the Xastir source code is under the GPL license. See the file named "COPYING" for details. 2) Some of the programs in the scripts directory may contain other licensing information. See the individual files for details. 3) datum.h and datum.c were derived from public domain source code. The name and copyright are listed in that file. 4) rotated.h and rotated.c are available under the following license: /* xvertext 5.0, Copyright (c) 1993 Alan Richardson (mppa3@uk.ac.sussex.syma) * * Permission to use, copy, modify, and distribute this software and its * documentation for any purpose and without fee is hereby granted, provided * that the above copyright notice appear in all copies and that both the * copyright notice and this permission notice appear in supporting * documentation. All work developed as a consequence of the use of * this program should duly acknowledge such use. No representations are * made about the suitability of this software for any purpose. It is * provided "as is" without express or implied warranty. */ 5) festival.h and festival.c are available under the following license: /*************************************************************************/ /* */ /* Centre for Speech Technology Research */ /* University of Edinburgh, UK */ /* Copyright (c) 1999 */ /* All Rights Reserved. */ /* */ /* Permission is hereby granted, free of charge, to use and distribute */ /* this software and its documentation without restriction, including */ /* without limitation the rights to use, copy, modify, merge, publish, */ /* distribute, sublicense, and/or sell copies of this work, and to */ /* permit persons to whom this work is furnished to do so, subject to */ /* the following conditions: */ /* 1. The code must retain the above copyright notice, this list of */ /* conditions and the following disclaimer. */ /* 2. Any modifications must be clearly marked as such. */ /* 3. Original authors' names are not deleted. */ /* 4. The authors' names are not used to endorse or promote products */ /* derived from this software without specific prior written */ /* permission. */ /* */ /* THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK */ /* DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING */ /* ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT */ /* SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE */ /* FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES */ /* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN */ /* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, */ /* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF */ /* THIS SOFTWARE. */ /* */ /*************************************************************************/ debian/xastir.dirs0000664000000000000000000000007311326372744011376 0ustar usr/bin usr/share/menu usr/share/doc/xastir usr/lib/xastir debian/README.source0000664000000000000000000000036311326372744011362 0ustar This package uses quilt to manage all modifications to the upstream source. Changes are stored in the source package as diffs in debian/patches and applied during the build. See /usr/share/doc/quilt/README.source for a detailed explanation. debian/xastir.menu0000664000000000000000000000111211326372744011374 0ustar ?package(xastir):needs="X11" section="Applications/Amateur Radio" \ title="xastir" longtitle="Xastir" \ description="APRS client for X11" \ command="/usr/bin/xastir" ?package(xastir):needs="text" section="Applications/Amateur Radio" \ title="xastir_udp_client" longtitle="Xastir_UDP_Client" \ description="Client to send data to APRS network" \ command="/usr/bin/xastir_udp_client" ?package(xastir):needs="text" section="Applications/Amateur Radio" \ title="testdbfawk" longtitle="testdbfawk" \ description="Utility to check dbfawk translation" \ command="/usr/bin/testdbfawk" debian/changelog0000664000000000000000000003264212312161112011037 0ustar xastir (2.0.0-2.1ubuntu1) trusty; urgency=low * Use autotools-dev helper for newer arches, resolving FTBFS. * Ensure that CFLAGS contains -fPIC. -- Daniel T Chen Tue, 18 Mar 2014 20:12:58 -0400 xastir (2.0.0-2.1build2) trusty; urgency=low * No-change rebuild for libgdal1 -> libgdal1h transition. -- Logan Rosen Thu, 12 Dec 2013 01:49:34 -0500 xastir (2.0.0-2.1build1) trusty; urgency=low * No change rebuild against db 5.3. -- Dmitrijs Ledkovs Sat, 02 Nov 2013 00:40:03 +0000 xastir (2.0.0-2.1) unstable; urgency=low * Non-maintainer upload. * Drop lesstif2-dev alternative dependency (Closes: #714672). -- Luk Claes Sat, 14 Sep 2013 18:45:01 +0200 xastir (2.0.0-2) unstable; urgency=low * Upgrade to 3.9.2 packaging standard. * Remove direct dependency on libxp-dev package. (Closes: #623653) * Added patch file to support CVS since release for NWS updates. -- Jerry Stueve Tue, 21 Jun 2011 19:25:00 +0000 xastir (2.0.0-1) unstable; urgency=low * Move db entry to front of list. (Closes: #621450) * Quiet some warnings in clean build. * Clean up build dependencies & suggests entries. * Suffer the misfortune of autoconf version changes. * Move to extra instead of optional to match priority doctrine. * Added patch files to support CVS upgrades since release. * Update to current upstream release. -- Jerry Stueve Tue, 26 Apr 2011 13:15:00 +0000 xastir (1.9.9-2010-08-16-1) unstable; urgency=low * Improve OSM support with tiling. * Incorporate CVS changes for topOSM tiling. * move manual link hook to dh support to get it right. * reapply setlocale to remove character set warning. * Improved config file processing (closes LP: #425475) * Added ID to uploaders list to support package. -- Jerry Stueve Mon, 16 Aug 2010 23:43:42 +0000 xastir (1.9.9-2010-08-01-0.1) unstable; urgency=low * NMU Improve OSM support with tiling. -- Jerry Stueve Wed, 04 Aug 2010 14:43:42 +0000 xastir (1.9.9-0.1) unstable; urgency=low * NMU Update to include OSM files since TigerMaps are off-line. * Fix X11 window lock-down with right mouse click (close LP: #572620) -- Jerry Stueve Wed, 14 Jul 2010 04:49:11 +0000 xastir (1.9.8-0.1) unstable; urgency=low * NMU to add new upstream release (closes: #551578) -- Jerry Stueve Mon, 01 Feb 2010 11:55:41 -0500 xastir (1.9.6-0.1) unstable; urgency=low * NMU to add new upstream release (closes: #551578) * Added fix from CVS for QuantumDepth problem with graphics files * changed build-dep for updated libproj-dev packaging (closes: #521820) * scripts are now based on installation prefix (closes: #561173, LP: #492867) * Add testdbfawk to installed set (closes: #397144) * Use command-line option -t to get internal SIGSEGV handler (closes: #159281) * Use mktemp to create temporary files in scripts (closes: CVE-2008-4987) * Added updated man pages from CVS to quiet lintian warnings * Switch to quilt format for patches -- Jerry Stueve Fri, 22 Jan 2010 10:30:41 -0500 xastir (1.9.4-3.1) unstable; urgency=low * Retiring - remove myself from the uploaders list -- Joop Stakenborg Wed, 18 Nov 2009 20:27:08 +0000 xastir (1.9.4-3) unstable; urgency=low * Make sure to delete the files created by mktemp. -- Joop Stakenborg Mon, 24 Nov 2008 13:04:17 +0100 xastir (1.9.4-2) unstable; urgency=low * Depend on xfontsel binary (x11-utils package), both for building and running. * Add patch from CVS to work around unavailable xfontsel binary. -- Joop Stakenborg Mon, 17 Nov 2008 19:22:12 +0100 xastir (1.9.4-1) unstable; urgency=low * New upstream. * Suggests python because we ditribute a python script in /usr/lib/xastir. * Lintian fixes. -- Joop Stakenborg Mon, 17 Nov 2008 15:22:47 +0100 xastir (1.9.2-2.1) unstable; urgency=low * NMU to fix security bug: Actually use backticks instead of quotes for the mktemp call (closes: #496383) -- Gerfried Fuchs Sun, 31 Aug 2008 17:55:56 +0200 xastir (1.9.2-2) unstable; urgency=low * Remove spaces in "TMPFILE = 'mktemp -t'", sorry about that. -- Joop Stakenborg Thu, 28 Aug 2008 18:44:52 +0200 xastir (1.9.2-1.1) unstable; urgency=low * Non-maintainer upload. * Fix attack with the help of symlinks. scripts/get-maptools.sh and scripts/get_shapelib.sh now use mktemp -t. Closes: #496383. * Add myself to the uploaders field. -- Joop Stakenborg Tue, 26 Aug 2008 15:48:02 +0200 xastir (1.9.2-1) unstable; urgency=low * New upstream release. * Bumped standards-revision to 3.7.2. * Switched build-dependency on ImageMagick to GraphicsMagick (libgraphicsmagick1-dev) which is preferred by xastir at configure time. * Added build-dependency on libdb-dev to enable map caching. * Added build-dependency on libgeotiff-dev which can be optionally used by xastir. * Fixed configure-time detection of libgdal1 due to Debian's unusual "libgdal1.4.0.so" naming. * Removed exclusion of festival build-dep on hppa. -- Hamish Moffatt Sun, 27 Jan 2008 13:50:56 +1100 xastir (1.9.0-1) unstable; urgency=low * New upstream release * Build-depend on libgdal1-dev instead of obselete libgdal1-1.3.2-dev (closes: #423539) * Build-depend on libcurl4-gnutls-dev instead of libcurl3-... * Change maintainer to debian-hams -- Hamish Moffatt Sun, 13 May 2007 22:54:44 +1000 xastir (1.8.4-2) unstable; urgency=low * Fix build-dep libgdal1-1.3.1-dev -> 1.3.2-dev again (closes: #398247) -- Hamish Moffatt Mon, 13 Nov 2006 08:27:02 +1100 xastir (1.8.4-1) unstable; urgency=low * New upstream release 1.8.4 * Provided testawk tool in /usr/lib/xastir * Updated standards-revision to 3.7.2 * Put watch file in correct directory this time :-| -- Hamish Moffatt Sat, 11 Nov 2006 17:34:37 +1100 xastir (1.8.2-2) unstable; urgency=medium * Update build-dep on libgdal1-1.3.1-dev to -1.3.2-dev -- Hamish Moffatt Tue, 24 Oct 2006 10:41:08 +1000 xastir (1.8.2-1) unstable; urgency=low * New upstream release * Added watch file to check for new upstream versions at sf.net * Acknowledge fixes in NMU: * Update build-deps: use libgdal-1.3.1-dev | libgdal-dev, replacing old libgdal1-dev (closes: #352371) -- Hamish Moffatt Sun, 2 Jul 2006 00:01:08 +1000 xastir (1.8.0-1.1) unstable; urgency=medium * NMU. * Update GDAL build dependency to libgdal1-1.3.1-dev. Closes: #352371. -- Matej Vela Sat, 18 Feb 2006 23:23:40 +0100 xastir (1.8.0-1) unstable; urgency=low * New upstream release -- Hamish Moffatt Tue, 17 Jan 2006 23:31:33 +1100 xastir (1.7.0-2) unstable; urgency=low * Changed build-dep on xlibs-dev to individual X libraries * Fixed XASTIR path in fcc-get and get-gnis scripts (closes: #338853) -- Hamish Moffatt Sat, 7 Jan 2006 01:00:30 +0000 xastir (1.7.0-1) unstable; urgency=low * New upstream release * Update build depends for libcurl3-gnutls-dev | libcurl-ssl-dev -- Hamish Moffatt Mon, 24 Oct 2005 08:42:35 +1000 xastir (1.6.0-2) unstable; urgency=low * Add build-dep for libgdal1-dev back * Updated libmagick build-dep to libmagick9-dev (closes: #332458) with minimum version 6:6.2.4.5-0.2 to work around bugs -- Hamish Moffatt Sat, 8 Oct 2005 13:45:03 +1000 xastir (1.6.0-1) unstable; urgency=low * New upstream release (closes: #317837) * Fix FTBFS with gcc-4.0 (closes: #288697); thanks to Andreas Jochens for the patch * Added additional README files to the binary package (closes: #134452) * Temporarily removed build-dep on libgdal1-dev, which is stuck waiting on Qt to be migrated to the new C++ ABI -- Hamish Moffatt Sun, 7 Aug 2005 18:08:09 +1000 xastir (1.4.1-2) unstable; urgency=low * Recompile with libcurl3 (closes: #279455) -- Hamish Moffatt Sun, 12 Dec 2004 23:15:44 +1100 xastir (1.4.1-1) unstable; urgency=medium * New upstream release to fix a potientially nasty bug where recorded log files may be injected back into the internet APRS network automatically (closes: #279885) -- Hamish Moffatt Sun, 7 Nov 2004 23:47:09 +1100 xastir (1.4.0-1) unstable; urgency=low * New upstream release * Added build-dep for libcurl-dev (closes: #272027) -- Hamish Moffatt Sat, 2 Oct 2004 23:51:53 +1000 xastir (1.3.2-2) unstable; urgency=low * Compile with libtiff4, though we don't depend on it directly * Build-depend on new imagemagick 5:6.0.3.5-2 to ensure we get libtiff4 (or better) -- Hamish Moffatt Fri, 30 Jul 2004 00:06:47 +1000 xastir (1.3.2-1) unstable; urgency=low * New upstream release (closes: #233120) * Use libmagick6 since 5.5.7 no longer available (closes: #250087) * Add build-depends for proj, libgdal1-dev and libpcre3-dev to enable additional XASTIR features -- Hamish Moffatt Sun, 4 Jul 2004 16:48:24 +1000 xastir (1.2.0-1) unstable; urgency=low * New upstream release -- Hamish Moffatt Sun, 15 Jun 2003 23:03:08 +1000 xastir (1.1.5.20030515-1) unstable; urgency=low * New upstream snapshot * Build with latest libmagick5.5.7 -- Hamish Moffatt Tue, 27 May 2003 23:47:49 +1000 xastir (1.1.4.20030503-1) unstable; urgency=low * New upstream snapshot -- Hamish Moffatt Sun, 4 May 2003 12:36:51 +1000 xastir (1.1.4.20030415-1) unstable; urgency=low * New upstream snapshot -- Hamish Moffatt Sat, 26 Apr 2003 14:45:48 +1000 xastir (1.1.4.20030314-1) unstable; urgency=low * New upstreamrelease * Build with libmagick5.5.5 * Build with gpsman support -- Hamish Moffatt Wed, 19 Mar 2003 21:29:31 +1100 xastir (1.1.4.20030303-1) unstable; urgency=low * New upstream release * Upgrade debhelper compatibility level from 1 to 4 -- Hamish Moffatt Wed, 5 Mar 2003 23:34:21 +1100 xastir (1.1.4.20030219-1) unstable; urgency=low * New upstream release -- Hamish Moffatt Tue, 25 Feb 2003 22:20:33 +1100 xastir (1.1.3.20030202-2) unstable; urgency=low * Recompile with libmagick5.5.4 (closes: #182049) -- Hamish Moffatt Sun, 23 Feb 2003 08:39:48 +1100 xastir (1.1.3.20030202-1) unstable; urgency=low * New upstream release * Built with ShapeLib support -- Hamish Moffatt Wed, 19 Feb 2003 08:46:09 +1100 xastir (1.1.3.20030117-1) unstable; urgency=low * New upstream release * Compile with newer libmagick -- Hamish Moffatt Wed, 29 Jan 2003 23:32:05 +1100 xastir (1.1.3.20021206-1) unstable; urgency=low * New upstream snapshot. -- Hamish Moffatt Sat, 14 Dec 2002 20:42:13 +1100 xastir (1.1.3.20021001-1) unstable; urgency=low * New upstream release. This is a development snapshot, packaged as recommended by one of the upstream authors. -- Hamish Moffatt Tue, 8 Oct 2002 21:08:36 +1000 xastir (1.1.0-3) unstable; urgency=low * Recompiled for newer libraries (closes: #163411) * Removed build-dependency on festival-dev on hppa as it is not available on that platform -- Hamish Moffatt Mon, 7 Oct 2002 23:01:46 +1000 xastir (1.1.0-2) unstable; urgency=low * Rebuild for new liblcms library -- Hamish Moffatt Sun, 21 Jul 2002 21:35:52 +1000 xastir (1.1.0-1) unstable; urgency=low * New upstream version; thanks for John Laur for the patch from 1.0.0 to 1.1.0 * xastir is now compiled with lots of optional libraries which allow more map formats to be read and other features. -- Hamish Moffatt Sun, 24 Feb 2002 22:17:57 +1100 xastir (1.0.0-2) unstable; urgency=low * Fixed includes in src/interfaces.c due to changes in libax25-dev -- Hamish Moffatt Wed, 19 Sep 2001 00:13:10 +1000 xastir (1.0.0-1) unstable; urgency=low * New upstream release -- Hamish Moffatt Tue, 8 May 2001 23:43:07 +1000 xastir (0.3.6a-3) unstable; urgency=low * Added build-dep for xutils, to pick up makedepends (closes: #90236) -- Hamish Moffatt Sun, 1 Apr 2001 17:10:43 +1000 xastir (0.3.6a-2) unstable; urgency=low * Fixed missing include files (closes: #87110) * Updated build-deps for xlibs-dev and lesstif-dev -- Hamish Moffatt Fri, 23 Feb 2001 23:30:36 +1100 xastir (0.3.6a-1) unstable; urgency=low * New upstream release * Compiled with libax25 0.0.7 (closes: #74207) -- Hamish Moffatt Sat, 7 Oct 2000 12:21:04 +1100 xastir (0.3.3-1) unstable; urgency=low * New upstream alpha release -- Hamish Moffatt Sun, 25 Jun 2000 13:48:42 +1000 xastir (0.3.0-2) unstable; urgency=low * Updated copyright file to include upstream author info -- Hamish Moffatt Sun, 16 Apr 2000 22:10:06 +1000 xastir (0.3.0-1) unstable; urgency=low * Initial release -- Hamish Moffatt Sun, 26 Mar 2000 19:52:27 +1000 debian/patches/0000775000000000000000000000000011600152656010621 5ustar debian/patches/NWSdata-2.patch0000664000000000000000000002434111600152627013304 0ustar Update from upstrem CVS to support latest shapefiles from NWS. --- xastir-2.0.0.orig/config/Makefile.am +++ xastir-2.0.0/config/Makefile.am @@ -36,17 +36,21 @@ EXTRA_DIST = \ nwsc_ddmmyy_09.dbfawk \ nwsc_ddmmyy_09b.dbfawk \ nwsc_ddmmyy_10.dbfawk \ + nwsc_ddmmyy_10a.dbfawk \ nwsmzddmmyy.dbfawk \ nwsmzddmmyy_09.dbfawk \ + nwsmzddmmyy_11.dbfawk \ nwsmzoddmmyy.dbfawk \ nwsozddmmyy.dbfawk \ nwsozddmmyy_09.dbfawk \ nwsw_ddmmyy.dbfawk \ nwsw_ddmmyy_09.dbfawk \ + nwsw_ddmmyy_10.dbfawk \ nwsz_ddmmyy.dbfawk \ nwsz_ddmmyy_09.dbfawk \ nwsz_ddmmyy_10.dbfawk \ nwsz_ddmmyy_10b.dbfawk \ + nwsz_ddmmyy_10c.dbfawk \ nwsz1ddmmyy.dbfawk \ nwszoddmmyy.dbfawk \ nwshzddmmyy.dbfawk \ --- a/config/Makefile.in +++ b/config/Makefile.in @@ -236,17 +236,21 @@ nwsc_ddmmyy_09.dbfawk \ nwsc_ddmmyy_09b.dbfawk \ nwsc_ddmmyy_10.dbfawk \ + nwsc_ddmmyy_10a.dbfawk \ nwsmzddmmyy.dbfawk \ nwsmzddmmyy_09.dbfawk \ + nwsmzddmmyy_11.dbfawk \ nwsmzoddmmyy.dbfawk \ nwsozddmmyy.dbfawk \ nwsozddmmyy_09.dbfawk \ nwsw_ddmmyy.dbfawk \ nwsw_ddmmyy_09.dbfawk \ + nwsw_ddmmyy_10.dbfawk \ nwsz_ddmmyy.dbfawk \ nwsz_ddmmyy_09.dbfawk \ nwsz_ddmmyy_10.dbfawk \ nwsz_ddmmyy_10b.dbfawk \ + nwsz_ddmmyy_10c.dbfawk \ nwsz1ddmmyy.dbfawk \ nwszoddmmyy.dbfawk \ nwshzddmmyy.dbfawk \ --- /dev/null +++ b/config/nwsc_ddmmyy_10a.dbfawk @@ -0,0 +1,59 @@ +# $Id$ +# +# Copyright (C) 2003-2010 The Xastir Group +# +# This dbfawk file is used to map arbitrary dbf data that accompanies +# a shapefile into Xastir canoncical values of: +# key - search key +# lanes - width of feature (usually a road but applies to rivers, etc. too) +# color - color to draw the road +# name - name of the road for labels +# filled - whether a polygon is drawn filled or not +# fill_color - color to fill polygon with +# label_color - color for label +# pattern - line pattern for road, river, etc. +# display_level - highest zoom level at which to display the feature +# label_level - highest zoom level at which to display the label +# symbol - 3 char 'TIO': table, ID, overlay +# +# NOTE: This file format is modeled after awk but is nowhere near awk +# compatible. +# +# This file is used to map NWS county polygon shapefiles +# which are named c_ddmmyy.dbf. These are used for WX alerts but can also +# be used as a map of all US counties. For the WX alert feature, the +# key is set to the concatentation of the STATE and FIPS county code +# in the same format as the alert->title (e.g. WI_C037). +# +# This DBFAWK file matches the set of county shapefiles that was published +# by NOAA in 2009, and differs from the earlier format. Shapefiles from 2008 +# are matched by the file "nwsc_ddmmyy.dbfawk" instead. +# + +# BEGIN is called once per dbf file which contains multiple records. +BEGIN { +# dbfinfo is the "signature" of the dbf file listing the column names in order. +# dbfinfo should match the dbf file that we say this dbfawk file goes with. +dbfinfo="OBJECTID:ID:WFO:GL_WFO:SHAPE_LENG:SHAPE_AREA:MZ:AJOIN0:AJOIN1:STATE:CWA:COUNTYNAME:FIPS:TIME_ZONE:FE_AREA:LON:LAT"; +# dbffields is which of the above fields we actually want to look at. +# Note that the order we list these is important since we are appending the +# word County or Parish depending on what state the county is in. +dbffields="STATE"; +} + +# BEGIN_RECORD is called once per dbf record which contains multiple fields. +# Use this rule to re-initialize variables between records. +BEGIN_RECORD {key="BOGUS"; lanes=1; fill_color=7; color=8; name=""; filled=1; fill_style=0; pattern=0; display_level=65536; label_level=512; label_color=20; font_size=2; symbol=""} + +# name: name is just the county name. +#/^COUNTYNAME=(.*)$/ {name="$1"; font_size=4; next} +# also append "County" to the name except for Louisiana, use Parish +# (is this the only state that calls them something other than county?): +# XXX check this whole LA thing. I think they call them parishes. +#/^STATE=(LA)$/ {name="$name Parish"; key="$1"; next} +#/^STATE=(..)$/ {name="$name County"; key="$1"; next} +#/^FIPS=..(...)$/ {key="$(key)_C$1"; next} + +# don't need special end case handling... +#END_RECORD {name="$name ($key)";} +#END {} --- /dev/null +++ b/config/nwsmzddmmyy_11.dbfawk @@ -0,0 +1,41 @@ +# $Id$ +# +# Copyright (C) 2003-2010 The Xastir Group +# +# This dbfawk file is used to map arbitrary dbf data that accompanies +# a shapefile into Xastir canoncical values of: +# key - search key +# lanes - width of feature (usually a road but applies to rivers, etc. too) +# color - color to draw the road +# name - name of the road for labels +# filled - whether a polygon is drawn filled or not +# fill_color - color to fill polygon with +# pattern - line pattern for road, river, etc. +# display_level - highest zoom level at which to display the feature +# label_level - highest zoom level at which to display the label +# symbol - 3 char 'TIO': table, ID, overlay +# +# NOTE: This file format is modeled after awk but is nowhere near awk +# compatible. +# +# This file is used to map NWS offshore marine zone area polygon shapefiles +# which are named ozddmmyy.dbf. These are used for WX alerts. +# For the WX alert feature, the key is set to the ID code. + +# BEGIN is called once per dbf file which contains multiple records. +BEGIN { +# dbfinfo is the "signature" of the dbf file listing the column names in order. +# dbfinfo should match the dbf file that we say this dbfawk file goes with. +dbfinfo="ID:WFO:GL_WFO:LON:LAT:NAME:AJOIN0:AJOIN1"; +# dbffields is which of the above fields we actually want to look at. +# Note that the order we list these is important since we are appending the +# word County or Parish depending on what state the county is in. +dbffields="ID:NAME"; +} + +# BEGIN_RECORD is called once per dbf record which contains multiple fields. +# Use this rule to re-initialize variables between records. +BEGIN_RECORD {key="BOGUS"; lanes=2; fill_color=7; color=8; name=""; filled=0; fill_style=0; pattern=0; display_level=65536; label_level=512; label_color=20; font_size=2; symbol=""} + +/^ID=(..)(.*)$/ {key="$1_$2"; next} +/^NAME=(.*)$/ {name="$1"; next} --- /dev/null +++ b/config/nwsw_ddmmyy_10.dbfawk @@ -0,0 +1,41 @@ +# $Id$ +# +# Copyright (C) 2003-2010 The Xastir Group +# +# This dbfawk file is used to map arbitrary dbf data that accompanies +# a shapefile into Xastir canoncical values of: +# key - search key +# lanes - width of feature (usually a road but applies to rivers, etc. too) +# color - color to draw the road +# name - name of the road for labels +# filled - whether a polygon is drawn filled or not +# fill_color - color to fill polygon with +# pattern - line pattern for road, river, etc. +# display_level - highest zoom level at which to display the feature +# label_level - highest zoom level at which to display the label +# symbol - 3 char 'TIO': table, ID, overlay +# +# NOTE: This file format is modeled after awk but is nowhere near awk +# compatible. +# +# This file is used to map NWS county warning area polygon shapefiles +# which are named w_ddmmyy.dbf. These are used for WX alerts. +# For the WX alert feature, the key is set to the CWA code +# reformated to match alert->title. For example: CW_ATAE for CWA TAE. + +# BEGIN is called once per dbf file which contains multiple records. +BEGIN { +# dbfinfo is the "signature" of the dbf file listing the column names in order. +# dbfinfo should match the dbf file that we say this dbfawk file goes with. +dbfinfo="AJOIN0:AJOIN1:WFO:CWA:LON:LAT"; +# dbffields is which of the above fields we actually want to look at. +# Note that the order we list these is important since we are appending the +# word County or Parish depending on what state the county is in. +dbffields="WFO"; +} + +# BEGIN_RECORD is called once per dbf record which contains multiple fields. +# Use this rule to re-initialize variables between records. +BEGIN_RECORD {key="BOGUS"; lanes=2; fill_color=7; color=8; name=""; filled=0; fill_style=0; pattern=0; display_level=65536; label_level=512; label_color=20; font_size=2; symbol=""} + +/^WFO=(.*)$/ {name="$1"; key="CW_A$1"; next} --- /dev/null +++ b/config/nwsz_ddmmyy_10c.dbfawk @@ -0,0 +1,42 @@ +# $Id$ +# +# Copyright (C) 2003-2010 The Xastir Group +# +# This dbfawk file is used to map arbitrary dbf data that accompanies +# a shapefile into Xastir canoncical values of: +# key - search key +# lanes - width of feature (usually a road but applies to rivers, etc. too) +# color - color to draw the road +# name - name of the road for labels +# filled - whether a polygon is drawn filled or not +# fill_color - color to fill polygon with +# pattern - line pattern for road, river, etc. +# display_level - highest zoom level at which to display the feature +# label_level - highest zoom level at which to display the label +# symbol - 3 char 'TIO': table, ID, overlay +# +# NOTE: This file format is modeled after awk but is nowhere near awk +# compatible. +# +# This file is used to map NWS state zone area polygon shapefiles +# which are named z_ddmmyy.dbf. These are used for WX alerts. +# For the WX alert feature, the key is set to the STATE_ZONE code, +# reformatted to match alert->title (e.g. KS033 is KS_Z033). + +# BEGIN is called once per dbf file which contains multiple records. +BEGIN { +# dbfinfo is the "signature" of the dbf file listing the column names in order. +# dbfinfo should match the dbf file that we say this dbfawk file goes with. +dbfinfo="STATE:CWA:TIME_ZONE:FE_AREA:ZONE:NAME:STATE_ZONE:LON:LAT:SHORTNAME"; +# dbffields is which of the above fields we actually want to look at. +# Note that the order we list these is important since we are appending the +# word County or Parish depending on what state the county is in. +dbffields="STATE_ZONE:NAME"; +} + +# BEGIN_RECORD is called once per dbf record which contains multiple fields. +# Use this rule to re-initialize variables between records. +BEGIN_RECORD {key="BOGUS"; lanes=2; fill_color=7; color=8; name=""; filled=0; fill_style=0; pattern=0; display_level=65536; label_level=512; label_color=20; font_size=2; symbol=""} + +/^STATE_ZONE=(..)(.*)$/ {key="$1_Z$2"; next} +/^NAME=(.*)$/ {name="$1"; next} debian/patches/geotiff_directory.patch0000664000000000000000000000136511461560222015353 0ustar Debian put geotiff headers into subdirectory --- a/acinclude.m4 +++ b/acinclude.m4 @@ -37,6 +37,8 @@ [ AC_MSG_CHECKING([for search paths]) +test -d /usr/include/geotiff && CPPFLAGS="-I/usr/include/geotiff $CPPFLAGS" + test -d /usr/local/include && CPPFLAGS="-I/usr/local/include $CPPFLAGS" test -d /usr/local/lib && LDFLAGS="-L/usr/local/lib $LDFLAGS" --- a/configure +++ b/configure @@ -5434,6 +5434,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for search paths" >&5 $as_echo_n "checking for search paths... " >&6; } +test -d /usr/include/geotiff && CPPFLAGS="-I/usr/include/geotiff $CPPFLAGS" + test -d /usr/local/include && CPPFLAGS="-I/usr/local/include $CPPFLAGS" test -d /usr/local/lib && LDFLAGS="-L/usr/local/lib $LDFLAGS" debian/patches/README.patch0000664000000000000000000000252211547443231012602 0ustar README update from CVS diff -r e1802d3823fa README --- a/README Wed Nov 17 21:40:32 2010 -0500 +++ b/README Thu Apr 07 19:16:57 2011 -0400 @@ -356,6 +356,7 @@ http://download.opensuse.org/repositories/hamradio/openSUSE_11.0/ http://download.opensuse.org/repositories/hamradio/openSUSE_11.1/ http://download.opensuse.org/repositories/hamradio/openSUSE_11.2/ + http://download.opensuse.org/repositories/hamradio/openSUSE_11.3/ Adding these sites will allow you to find and install the ax25 libraries/devel headers, the OpenMotif development headers, and the @@ -372,6 +373,22 @@ You may safely ignore this warning. + I've found that I need to do this when configuring for OpenSUSE in + order to pick up the libgeotiff include files: + + ./configure CPPFLAGS="-I/usr/include/libgeotiff" + + I just put it into a script called "configure.suse" so that I don't + have to remember it each time. Here are the complete contents of + the script: + + #!/bin/sh + ./configure CPPFLAGS="-I/usr/include/libgeotiff" + + then do "chmod 755 configure.suse", and run it like this: + + ./configure.suse + You'll may also see these when compiling the code: map_tif.c: In function `my_GTIFProj4FromLatLong': debian/patches/help-en.patch0000664000000000000000000000576711547444346013223 0ustar Clean up help message descriptions from CVS diff -r e1802d3823fa help/help-English.dat --- a/help/help-English.dat Wed Nov 17 21:40:32 2010 -0500 +++ b/help/help-English.dat Thu Apr 07 19:23:04 2011 -0400 @@ -1641,11 +1641,17 @@ screens of other APRS(tm) users. Clear All Tactical Calls -Clears all assigned tactical calls. This will take effect the next redraw. +Clears all assigned tactical calls. This will take effect the next +redraw. Note that this will NOT clear tactical calls on other +people's screens if you've published them via a message to +"TACTICAL" (see the help text for "Send Message"). Clear Tactical Call History This removes the tactical call history file, meaning that tactical calls -assigned will not remain permanent between Xastir restarts. +assigned will not remain permanent between Xastir restarts. Note +that this will NOT clear tactical calls on other people's screens if +you've published them via a message to "TACTICAL" (see the help text +for "Send Message". Clear All Trails This will wipe all the line tracking data from the station database and @@ -1712,6 +1718,21 @@ station. If it times out or if you cancel the pending messages, those messages will remain highlighted unless you clear the message history. +To publish TACTICAL calls to other Xastir and APRS+SA stations as +well as assign those tactical calls locally: Send a message to +"TACTICAL" with the body of the message containing lines something +like: + + callsign-1=TAC1;callsign-2=TAC2;callsign-3=TAC3 + +To remove these tactical calls later from local AND remote screens, +assure that the original message(s) assigning them has timed-out or +been cancelled, then send a message like this and let it retry until +it times out (assigns blank tactical calls to the original +callsigns, thereby removing the assignment): + + callsign-1=;callsign-2=;callsign-3= + Clear all outgoing messages This will clear all un-ack'ed messages you have sent. @@ -1819,10 +1840,17 @@ Station Info will display any data decoded by Xastir. -You can assign tactical calls to stations from here, by clicking the "Assign -Tactical Call" button. This will cause the station on screen to display as -the tactical call instead of its callsign. Assigning blank clears this -feature, and it can also be cleared for all stations in the Stations menu. +You can assign (local only) tactical calls to stations from here, by +clicking the "Assign Tactical Call" button. This will cause the +station on screen to display as the tactical call instead of its +callsign. Assigning a blank tactical call clears this feature, and +it can also be cleared for all stations in the Stations menu. This +feature assigns tactical calls to the local Xastir station only, but +see below to publish them to others. + +To publish tactical calls across the air to other Xastir and APRS+SA +stations (as well as assign them locally), see the "Send Message" help +section. "Enable Automatic Updates" will cause the window to refresh frequently with the latest information. debian/patches/FAQ.patch0000664000000000000000000000330611547443123012255 0ustar FAQ update from CVS diff -r e1802d3823fa FAQ --- a/FAQ Wed Nov 17 21:40:32 2010 -0500 +++ b/FAQ Thu Apr 07 19:16:57 2011 -0400 @@ -862,9 +862,32 @@ 4.24 Can I run multiple copies of Xastir at once? - Yes. But not as the same user. Do this to allow more than one - user to access your X display and to create additional users, - each capable of running one Xastir session: + Yes, but you must keep the configuration directories separate for + each copy by using a command-line flag. Xastir will create the new + config directory and fill it with defaults if it doesn't already + exist. Here's the method. Substitute your user name where it says + "": + + xastir & # starts up first Xastir copy against ".xastir" directory + xastir -c /home//.xastir2 & # starts up 2nd Xastir copy against ".xastir2" directory + xastir -c /home//.xastir3 & # starts up 3rd Xastir copy against ".xastir3" directory + + To make the process easier if you use this method a lot, create + aliases by editing your .profile (This assumes you're running BASH + or Bourne shells): + + alias xastir2='xastir -c /home//.xastir2 &' + alias xastir3='xastir -c /home//.xastir3 &' + + After sourcing your new .profile (The command is ". .profile" from + your home directory) or logging out and back in again, you can type + "xastir2" or "xastir3" as a command to start up the additional + copies of Xastir. + + Older methods, may still be useful at times: + + Do this to allow more than one user to access your X display and to + create additional users, each capable of running one Xastir session: xhost localhost debian/patches/nws_dbfawk.patch0000664000000000000000000001775111547443451014010 0ustar Add parsing for additional map descriptors from CVS diff -r e1802d3823fa config/Makefile.am --- a/config/Makefile.am Wed Nov 17 21:40:32 2010 -0500 +++ b/config/Makefile.am Thu Apr 07 19:16:57 2011 -0400 @@ -35,6 +35,7 @@ nwsc_ddmmyy.dbfawk \ nwsc_ddmmyy_09.dbfawk \ nwsc_ddmmyy_09b.dbfawk \ + nwsc_ddmmyy_10.dbfawk \ nwsmzddmmyy.dbfawk \ nwsmzddmmyy_09.dbfawk \ nwsmzoddmmyy.dbfawk \ @@ -45,8 +46,10 @@ nwsz_ddmmyy.dbfawk \ nwsz_ddmmyy_09.dbfawk \ nwsz_ddmmyy_10.dbfawk \ + nwsz_ddmmyy_10b.dbfawk \ nwsz1ddmmyy.dbfawk \ nwszoddmmyy.dbfawk \ + nwshzddmmyy.dbfawk \ OSM_Cloudmade_administrative.dbfawk \ OSM_Cloudmade_highway.dbfawk \ OSM_Cloudmade_natural.dbfawk \ diff -r e1802d3823fa config/nwsc_ddmmyy_10.dbfawk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config/nwsc_ddmmyy_10.dbfawk Thu Apr 07 19:16:57 2011 -0400 @@ -0,0 +1,59 @@ +# $Id$ +# +# Copyright (C) 2003-2010 The Xastir Group +# +# This dbfawk file is used to map arbitrary dbf data that accompanies +# a shapefile into Xastir canoncical values of: +# key - search key +# lanes - width of feature (usually a road but applies to rivers, etc. too) +# color - color to draw the road +# name - name of the road for labels +# filled - whether a polygon is drawn filled or not +# fill_color - color to fill polygon with +# label_color - color for label +# pattern - line pattern for road, river, etc. +# display_level - highest zoom level at which to display the feature +# label_level - highest zoom level at which to display the label +# symbol - 3 char 'TIO': table, ID, overlay +# +# NOTE: This file format is modeled after awk but is nowhere near awk +# compatible. +# +# This file is used to map NWS county polygon shapefiles +# which are named c_ddmmyy.dbf. These are used for WX alerts but can also +# be used as a map of all US counties. For the WX alert feature, the +# key is set to the concatentation of the STATE and FIPS county code +# in the same format as the alert->title (e.g. WI_C037). +# +# This DBFAWK file matches the set of county shapefiles that was published +# by NOAA in 2009, and differs from the earlier format. Shapefiles from 2008 +# are matched by the file "nwsc_ddmmyy.dbfawk" instead. +# + +# BEGIN is called once per dbf file which contains multiple records. +BEGIN { +# dbfinfo is the "signature" of the dbf file listing the column names in order. +# dbfinfo should match the dbf file that we say this dbfawk file goes with. +dbfinfo="OBJECTID_1:OBJECTID_2:OBJECTID:STATE:ZONE:CWA:NAME:STATE_ZONE:TIME_ZONE:FE_AREA:LON:LAT:SHAPE_LENG:SHAPE_LE_1:Shape_Le_2:Shape_Area"; +# dbffields is which of the above fields we actually want to look at. +# Note that the order we list these is important since we are appending the +# word County or Parish depending on what state the county is in. +dbffields="STATE"; +} + +# BEGIN_RECORD is called once per dbf record which contains multiple fields. +# Use this rule to re-initialize variables between records. +BEGIN_RECORD {key="BOGUS"; lanes=1; fill_color=7; color=8; name=""; filled=1; fill_style=0; pattern=0; display_level=65536; label_level=512; label_color=20; font_size=2; symbol=""} + +# name: name is just the county name. +#/^COUNTYNAME=(.*)$/ {name="$1"; font_size=4; next} +# also append "County" to the name except for Louisiana, use Parish +# (is this the only state that calls them something other than county?): +# XXX check this whole LA thing. I think they call them parishes. +#/^STATE=(LA)$/ {name="$name Parish"; key="$1"; next} +#/^STATE=(..)$/ {name="$name County"; key="$1"; next} +#/^FIPS=..(...)$/ {key="$(key)_C$1"; next} + +# don't need special end case handling... +#END_RECORD {name="$name ($key)";} +#END {} diff -r e1802d3823fa config/nwshzddmmyy.dbfawk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config/nwshzddmmyy.dbfawk Thu Apr 07 19:16:57 2011 -0400 @@ -0,0 +1,42 @@ +# $Id$ +# +# Copyright (C) 2003-2010 The Xastir Group +# +# This dbfawk file is used to map arbitrary dbf data that accompanies +# a shapefile into Xastir canoncical values of: +# key - search key +# lanes - width of feature (usually a road but applies to rivers, etc. too) +# color - color to draw the road +# name - name of the road for labels +# filled - whether a polygon is drawn filled or not +# fill_color - color to fill polygon with +# pattern - line pattern for road, river, etc. +# display_level - highest zoom level at which to display the feature +# label_level - highest zoom level at which to display the label +# symbol - 3 char 'TIO': table, ID, overlay +# +# NOTE: This file format is modeled after awk but is nowhere near awk +# compatible. +# +# This file is used to map NWS offshore marine zone area polygon shapefiles +# which are named ozddmmyy.dbf. These are used for WX alerts. +# For the WX alert feature, the key is set to the ID code reformated +# to match the alert->title. For example AN_Z081. + +# BEGIN is called once per dbf file which contains multiple records. +BEGIN { +# dbfinfo is the "signature" of the dbf file listing the column names in order. +# dbfinfo should match the dbf file that we say this dbfawk file goes with. +dbfinfo="WFO:NAME:LAT:LON"; +# dbffields is which of the above fields we actually want to look at. +# Note that the order we list these is important since we are appending the +# word County or Parish depending on what state the county is in. +dbffields="NAME"; +} + +# BEGIN_RECORD is called once per dbf record which contains multiple fields. +# Use this rule to re-initialize variables between records. +BEGIN_RECORD {key="BOGUS"; lanes=2; fill_color=7; color=8; name=""; filled=0; fill_style=0; pattern=0; display_level=65536; label_level=512; label_color=20; font_size=2; symbol=""} + +#/^ID=(..)(.*)$/ {key="$1_$2"; next} +#/^NAME=(.*)$/ {name="$1"; next} diff -r e1802d3823fa config/nwsz_ddmmyy_10b.dbfawk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config/nwsz_ddmmyy_10b.dbfawk Thu Apr 07 19:16:57 2011 -0400 @@ -0,0 +1,42 @@ +# $Id$ +# +# Copyright (C) 2003-2010 The Xastir Group +# +# This dbfawk file is used to map arbitrary dbf data that accompanies +# a shapefile into Xastir canoncical values of: +# key - search key +# lanes - width of feature (usually a road but applies to rivers, etc. too) +# color - color to draw the road +# name - name of the road for labels +# filled - whether a polygon is drawn filled or not +# fill_color - color to fill polygon with +# pattern - line pattern for road, river, etc. +# display_level - highest zoom level at which to display the feature +# label_level - highest zoom level at which to display the label +# symbol - 3 char 'TIO': table, ID, overlay +# +# NOTE: This file format is modeled after awk but is nowhere near awk +# compatible. +# +# This file is used to map NWS state zone area polygon shapefiles +# which are named z_ddmmyy.dbf. These are used for WX alerts. +# For the WX alert feature, the key is set to the STATE_ZONE code, +# reformatted to match alert->title (e.g. KS033 is KS_Z033). + +# BEGIN is called once per dbf file which contains multiple records. +BEGIN { +# dbfinfo is the "signature" of the dbf file listing the column names in order. +# dbfinfo should match the dbf file that we say this dbfawk file goes with. +dbfinfo="OBJECTID:STATE:CWA:TIME_ZONE:FE_AREA:ZONE:NAME:STATE_ZONE:AJOIN0:AJOIN1:LON:LAT:SHORTNAME"; +# dbffields is which of the above fields we actually want to look at. +# Note that the order we list these is important since we are appending the +# word County or Parish depending on what state the county is in. +dbffields="STATE_ZONE:NAME"; +} + +# BEGIN_RECORD is called once per dbf record which contains multiple fields. +# Use this rule to re-initialize variables between records. +BEGIN_RECORD {key="BOGUS"; lanes=2; fill_color=7; color=8; name=""; filled=0; fill_style=0; pattern=0; display_level=65536; label_level=512; label_color=20; font_size=2; symbol=""} + +/^STATE_ZONE=(..)(.*)$/ {key="$1_Z$2"; next} +/^NAME=(.*)$/ {name="$1"; next} debian/patches/NWSdata.patch0000664000000000000000000000273211547444606013160 0ustar Update file descriptors for current time period from CVS diff -r e1802d3823fa scripts/get-NWSdata --- a/scripts/get-NWSdata Wed Nov 17 21:40:32 2010 -0500 +++ b/scripts/get-NWSdata Thu Apr 07 19:23:04 2011 -0400 @@ -32,18 +32,19 @@ # +# Please only have ONE of each variable listed here! Note that the "Valid +# Date" listed on the NWS web pages is the date at which the Shapefile +# should START to be used. Don't just blindly put the newest filename +# here if that start-date hasn't arrived yet! +# FILE1="z_01de10" # NWSM Libraries: Public Zone Boundaries -FILE1="z_15nv10" # NWSM Libraries: Public Zone Boundaries -FILE1="z_15oc10" # NWSM Libraries: Public Zone Boundaries -FILE1="z_11my10" # NWSM Libraries: Public Zone Boundaries -FILE2="w_15jl09" # NWSM Libraries: County Warning Area Boundaries +FILE2="w_01de10" # NWSM Libraries: County Warning Area Boundaries FILE3="mz01jn10" # NWSM Libraries: Coastal and Offshore Marine Zones FILE4="oz02jn09" # NWSM Libraries: Coastal and Offshore Marine Zones FILE5="hz30mr09" # NWSM Libraries: Coastal and Offshore Marine Zones FILE6="fz01de10" # NWSM Libraries: Fire Weather Zone Boundaries -FILE6="fz15nv10" # NWSM Libraries: Fire Weather Zone Boundaries -FILE6="fz01my10" # NWSM Libraries: Fire Weather Zone Boundaries -FILE7="c_15jl09" # County Libraries: AWIPS Counties +FILE7="c_01de10" # AWIPS County Libraries (under States, Provinces & Counties) + x=`dirname $0` . $x/values debian/patches/shapelib.patch0000664000000000000000000000321311547444101013427 0ustar Internal shapelib build if not installed from CVS diff -r e1802d3823fa configure.ac --- a/configure.ac Wed Nov 17 21:40:32 2010 -0500 +++ b/configure.ac Thu Apr 07 19:23:04 2011 -0400 @@ -342,6 +342,9 @@ shapelib_desired=yes LIBSHP="" SUBSHP="" +# This symbol will be blank if the proj library hasn't been found, and will +# have the three programs that need proj if it has +CONTSHP="" AC_ARG_WITH(internal-shapelib,[ --with-internal-shapelib Force use of internal shapelib library.],force_internal_shapelib=$withval) AC_ARG_WITH(shapelib,[ --without-shapelib Disable shapelib features.],shapelib_desired=$withval) if test "${shapelib_desired}" = "no"; then @@ -378,8 +381,14 @@ AC_DEFINE(HAVE_DBFGETFIELDINDEX, , Define to 1 if your `shp' library has DBFGetFieldIndex. ) AC_DEFINE(HAVE_LIBSHP, , Define to 1 if you have the `shp' library (-lshp). ) AC_DEFINE(HAVE_SHAPEFIL_H, , Define to 1 if you have the `shapefil.h' header. ) + + if [ $use_proj = "yes" ] + then + CONTSHP="shpcentrd shpproj shpdata shpwkb" + fi fi AC_SUBST(SUBSHP) +AC_SUBST(CONTSHP) AC_SUBST(LIBSHP) diff -r e1802d3823fa src/shapelib/contrib/Makefile.am --- a/src/shapelib/contrib/Makefile.am Wed Nov 17 21:40:32 2010 -0500 +++ b/src/shapelib/contrib/Makefile.am Thu Apr 07 19:23:04 2011 -0400 @@ -11,14 +11,11 @@ noinst_PROGRAMS=dbfcat \ dbfinfo \ shpcat \ - shpcentrd \ - shpdata \ shpdxf \ shpfix \ - shpinfo \ - shpproj \ - shpwkb + shpinfo @CONTSHP@ +EXTRA_PROGRAMS = shpcentrd shpproj shpdata shpwkb libshape_a_SOURCES=../shpopen.c \ ../shptree.c \ ../dbfopen.c \ debian/patches/simple_db.patch0000664000000000000000000000143511552236410013600 0ustar Description: Move simple db entry to front of list to use as default. --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1014,7 +1014,7 @@ # to specify the function call with the full prototype for it to be found. BDB_LIB_FOUND="none" AC_MSG_CHECKING([for a library containing db_create]) - for dbname in db-4.9 db4.9 db49 db-4.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db + for dbname in db db-4.9 db4.9 db49 db-4.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 do LIBS="$saved_LIBS -l$dbname" AC_TRY_LINK( debian/patches/series0000664000000000000000000000032311600152656012034 0ustar geotiff_directory.patch link.patch FAQ.patch README.patch nws_dbfawk.patch shapelib.patch help-en.patch NWSdata.patch mapOSM.patch OSM_config.patch simple_db.patch auto_generated-changes-2.0.0-1 NWSdata-2.patch debian/patches/auto_generated-changes-2.0.0-10000664000000000000000000020407711555543217015751 0ustar Description: This patch is just autogenerated config files; drop this patch before the next upstream release. Author: Jerry Stueve Origin: other, Remove for next release --- xastir-2.0.0.orig/configure +++ xastir-2.0.0/configure @@ -1,13 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for xastir 2.0.0. +# Generated by GNU Autoconf 2.67 for xastir 2.0.0. # # Report bugs to . # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -319,7 +319,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -359,19 +359,19 @@ else fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -533,7 +533,7 @@ test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -610,6 +610,7 @@ MYSQL_CONFIG LWPOSTGIS PG_CONFIG LIBSHP +CONTSHP SUBSHP POW_LIB LIBOBJS @@ -827,8 +828,9 @@ do fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -873,7 +875,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -899,7 +901,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1103,7 +1105,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1119,7 +1121,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1149,8 +1151,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1158,7 +1160,7 @@ Try \`$0 --help' for more information." # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1176,13 +1178,13 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1205,7 +1207,7 @@ do [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1219,8 +1221,8 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1235,9 +1237,9 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1276,11 +1278,11 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1320,7 +1322,7 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1500,9 +1502,9 @@ test -n "$ac_init_help" && exit $ac_stat if $ac_init_version; then cat <<\_ACEOF xastir configure 2.0.0 -generated by GNU Autoconf 2.65 +generated by GNU Autoconf 2.67 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1572,7 +1574,7 @@ $as_echo "$ac_try_echo"; } >&5 mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { + test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : @@ -1596,10 +1598,10 @@ fi ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + if eval "test \"\${$3+set}\"" = set; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1635,7 +1637,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : else ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -1658,17 +1660,15 @@ $as_echo "$as_me: WARNING: $2: see the A $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( cat <<\_ASBOX -## -------------------------------- ## +( $as_echo "## -------------------------------- ## ## Report this to xastir@xastir.org ## -## -------------------------------- ## -_ASBOX +## -------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1732,7 +1732,7 @@ ac_fn_c_check_header_compile () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1808,7 +1808,7 @@ ac_fn_c_check_func () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1876,7 +1876,7 @@ ac_fn_c_check_type () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=no" @@ -1930,7 +1930,7 @@ ac_fn_c_check_member () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 $as_echo_n "checking for $2.$3... " >&6; } -if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$4+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1978,15 +1978,18 @@ $as_echo "$ac_res" >&6; } } # ac_fn_c_check_member -# ac_fn_c_check_decl LINENO SYMBOL VAR -# ------------------------------------ -# Tests whether SYMBOL is declared, setting cache variable VAR accordingly. +# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES +# --------------------------------------------- +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +# accordingly. ac_fn_c_check_decl () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 -$as_echo_n "checking whether $2 is declared... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + as_decl_name=`echo $2|sed 's/ *(.*//'` + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1995,8 +1998,12 @@ $4 int main () { -#ifndef $2 - (void) $2; +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif #endif ; @@ -2021,7 +2028,7 @@ This file contains any messages produced running configure, to aid debugging if configure makes a mistake. It was created by xastir $as_me 2.0.0, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2131,11 +2138,9 @@ trap 'exit_status=$? { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -2169,11 +2174,9 @@ $as_echo "$as_me: WARNING: cache variabl ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -2186,11 +2189,9 @@ _ASBOX echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -2204,11 +2205,9 @@ _ASBOX fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -2263,7 +2262,12 @@ _ACEOF ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2278,7 +2282,11 @@ do { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5 ; } fi done @@ -2359,7 +2367,7 @@ if $ac_cache_corrupted; then $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2376,16 +2384,22 @@ am__api_version='1.11' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2501,11 +2515,11 @@ am_lf=' ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2527,7 +2541,7 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - as_fn_error "ls -t appears to fail. Make sure there is not a broken + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken alias in your environment" "$LINENO" 5 fi @@ -2537,7 +2551,7 @@ then # Ok. : else - as_fn_error "newly created file is older than distributed files! + as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -2775,7 +2789,7 @@ done $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2783,7 +2797,7 @@ SHELL = /bin/sh all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2817,7 +2831,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`" am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2896,7 +2910,7 @@ _ACEOF # Check for host type # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } @@ -2907,16 +2921,16 @@ else test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -2941,7 +2955,7 @@ else ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi @@ -2949,7 +2963,7 @@ fi $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -3330,8 +3344,8 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3445,9 +3459,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5 ; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3489,8 +3502,8 @@ done else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3547,9 +3560,9 @@ $as_echo "$ac_try_echo"; } >&5 else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi fi fi @@ -3600,8 +3613,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3991,7 +4004,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4007,11 +4020,11 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -4050,7 +4063,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4066,18 +4079,18 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5 ; } fi ac_ext=c @@ -4138,7 +4151,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -4204,7 +4217,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -4336,8 +4349,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -4711,8 +4723,8 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -5120,7 +5132,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -5136,11 +5148,11 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -5179,7 +5191,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -5195,18 +5207,18 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5 ; } fi ac_ext=c @@ -5231,7 +5243,7 @@ fi $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -5239,7 +5251,7 @@ SHELL = /bin/sh all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -6000,7 +6012,7 @@ if test "${ac_cv_file__usr_bin_gm_exe+se $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "/usr/bin/gm.exe"; then ac_cv_file__usr_bin_gm_exe=yes else @@ -6072,7 +6084,7 @@ if test "${ac_cv_file__usr_bin_convert_e $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "/usr/bin/convert.exe"; then ac_cv_file__usr_bin_convert_exe=yes else @@ -6430,7 +6442,7 @@ if test "x$with_x" = xno; then have_x=disabled else case $x_includes,$x_libraries in #( - *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #( + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -6448,7 +6460,7 @@ libdir: @echo libdir='${LIBDIR}' _ACEOF if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. + # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. for ac_var in incroot usrlibdir libdir; do eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" done @@ -6534,7 +6546,7 @@ else fi done fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext fi # $ac_x_includes = no if test "$ac_x_libraries" = no; then @@ -7099,7 +7111,7 @@ fi fi if test "$no_x" = "yes"; then - as_fn_error "*** No X11! Install X-Windows development headers/libraries! ***" "$LINENO" 5 + as_fn_error $? "*** No X11! Install X-Windows development headers/libraries! ***" "$LINENO" 5 fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" @@ -8001,8 +8013,8 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUI ;; #( *) - as_fn_error "unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + as_fn_error $? "unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac @@ -8111,11 +8123,11 @@ $as_echo "in $xm_includes" >&6; } fi done if test "x$xm_includes" = "x"; then - as_fn_error "**** NO MOTIF HEADERS FOUND **** install Motif development headers or use --with-motif-includes to specify location of Xm/Xm.h " "$LINENO" 5 + as_fn_error $? "**** NO MOTIF HEADERS FOUND **** install Motif development headers or use --with-motif-includes to specify location of Xm/Xm.h " "$LINENO" 5 fi fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # Check for the libraries. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Motif libraries" >&5 @@ -8199,7 +8211,7 @@ $as_echo "in $xm_libraries" >&6; } done done if test "x$xm_libraries" = "x"; then - as_fn_error "**** MOTIF LIBRARIES NOT FOUND **** Install Motif development headers/libraries or use --with-motif-libraries to specify path to libXm.a " "$LINENO" 5 + as_fn_error $? "**** MOTIF LIBRARIES NOT FOUND **** Install Motif development headers/libraries or use --with-motif-libraries to specify path to libXm.a " "$LINENO" 5 fi fi @@ -8346,8 +8358,7 @@ if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define CRAY_STACKSEG_END $ac_func @@ -8414,7 +8425,7 @@ for ac_hdr in dirent.h sys/ndir.h sys/di as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Header+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8441,8 +8452,7 @@ fi eval ac_res=\$$as_ac_Header { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 _ACEOF @@ -8725,8 +8735,7 @@ for ac_header in argz.h arpa/inet.h fcnt do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -8739,8 +8748,7 @@ for ac_header in netinet/in.h nl_types.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -8753,8 +8761,7 @@ for ac_header in sys/file.h sys/ioctl.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -8767,8 +8774,7 @@ for ac_header in termios.h unistd.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -9229,8 +9235,7 @@ for ac_func in fork vfork do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -9577,8 +9582,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -9598,8 +9602,7 @@ done do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -9651,8 +9654,8 @@ static time_t time_t_max; static time_t time_t_min; /* Values we'll use to set the TZ environment variable. */ -static char *tz_strings[] = { - (char *) 0, "TZ=GMT0", "TZ=JST-9", +static const char *tz_strings[] = { + (const char *) 0, "TZ=GMT0", "TZ=JST-9", "TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00" }; #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) @@ -9669,7 +9672,7 @@ spring_forward_gap () instead of "TZ=America/Vancouver" in order to detect the bug even on systems that don't support the Olson extension, or don't have the full zoneinfo tables installed. */ - putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); + putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0"); tm.tm_year = 98; tm.tm_mon = 3; @@ -9682,16 +9685,14 @@ spring_forward_gap () } static int -mktime_test1 (now) - time_t now; +mktime_test1 (time_t now) { struct tm *lt; return ! (lt = localtime (&now)) || mktime (lt) == now; } static int -mktime_test (now) - time_t now; +mktime_test (time_t now) { return (mktime_test1 (now) && mktime_test1 ((time_t) (time_t_max - now)) @@ -9715,8 +9716,7 @@ irix_6_4_bug () } static int -bigtime_test (j) - int j; +bigtime_test (int j) { struct tm tm; time_t now; @@ -9760,7 +9760,7 @@ year_2050_test () instead of "TZ=America/Vancouver" in order to detect the bug even on systems that don't support the Olson extension, or don't have the full zoneinfo tables installed. */ - putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); + putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0"); t = mktime (&tm); @@ -9795,7 +9795,7 @@ main () for (i = 0; i < N_STRINGS; i++) { if (tz_strings[i]) - putenv (tz_strings[i]); + putenv ((char*) tz_strings[i]); for (t = 0; t <= time_t_max - delta; t += delta) if (! mktime_test (t)) @@ -9932,6 +9932,7 @@ int main () { char *data, *data2, *data3; + const char *cdata2; int i, pagesize; int fd, fd2; @@ -9956,10 +9957,10 @@ main () fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); if (fd2 < 0) return 4; - data2 = ""; - if (write (fd2, data2, 1) != 1) + cdata2 = ""; + if (write (fd2, cdata2, 1) != 1) return 5; - data2 = mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); + data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); if (data2 == MAP_FAILED) return 6; for (i = 0; i < pagesize; ++i) @@ -10298,8 +10299,7 @@ for ac_func in __argz_count __argz_next do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -10311,8 +10311,7 @@ for ac_func in getcwd getpgrp gethostbyn do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -10324,8 +10323,7 @@ for ac_func in getwd inet_ntoa memmove m do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -10337,8 +10335,7 @@ for ac_func in putenv select setenv setl do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -10350,8 +10347,7 @@ for ac_func in snprintf socket sqrt stpc do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -10363,8 +10359,7 @@ for ac_func in strerror strncasecmp strp do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -10376,8 +10371,7 @@ for ac_func in strtof strtol strtoul tzs do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -10391,8 +10385,7 @@ for ac_func in pthread_mutexattr_setkind do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -10477,6 +10470,9 @@ force_internal_shapelib=no shapelib_desired=yes LIBSHP="" SUBSHP="" +# This symbol will be blank if the proj library hasn't been found, and will +# have the three programs that need proj if it has +CONTSHP="" # Check whether --with-internal-shapelib was given. if test "${with_internal_shapelib+set}" = set; then : @@ -10509,8 +10505,7 @@ if test "${shapelib_desired}" = "yes" -a do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -10631,11 +10626,17 @@ $as_echo "#define HAVE_LIBSHP /**/" >>co $as_echo "#define HAVE_SHAPEFIL_H /**/" >>confdefs.h + + if $use_proj = "yes" + then + CONTSHP="shpcentrd shpproj shpdata shpwkb" + fi fi + # Check for pcre use_pcre=yes @@ -10650,8 +10651,7 @@ if test "${use_pcre}" = "yes"; then do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -11759,7 +11759,7 @@ if test "${enable_davis+set}" = set; the enableval=$enable_davis; case "${enableval}" in yes) davis=true ;; no) davis=false ;; - *) as_fn_error "bad value ${enableval} for --enable-davis" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-davis" "$LINENO" 5 ;; esac else davis=false @@ -12067,7 +12067,7 @@ $as_echo "yes" >&6; } BDB_LIB_FOUND="none" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a library containing db_create" >&5 $as_echo_n "checking for a library containing db_create... " >&6; } - for dbname in db-4.9 db4.9 db49 db-4.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db + for dbname in db db-4.9 db4.9 db49 db-4.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 do LIBS="$saved_LIBS -l$dbname" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12877,6 +12877,7 @@ DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -12900,20 +12901,20 @@ else fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error "conditional \"AMDEP\" was never defined. + as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DAVIS_TRUE}" && test -z "${DAVIS_FALSE}"; then - as_fn_error "conditional \"DAVIS\" was never defined. + as_fn_error $? "conditional \"DAVIS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -13063,19 +13064,19 @@ export LANGUAGE (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -13271,7 +13272,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -13325,7 +13326,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri # values after options handling. ac_log=" This file was extended by xastir $as_me 2.0.0, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -13391,10 +13392,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ xastir config.status 2.0.0 -configured by $0, generated by GNU Autoconf 2.65, +configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -13412,11 +13413,16 @@ ac_need_defaults=: while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -13438,6 +13444,7 @@ do $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -13450,7 +13457,7 @@ do ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error "ambiguous option: \`$1' + as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -13459,7 +13466,7 @@ Try \`$0 --help' for more information."; ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -13532,7 +13539,7 @@ do "xastir-min.spec") CONFIG_FILES="$CONFIG_FILES xastir-min.spec" ;; "xastir-lsb.spec") CONFIG_FILES="$CONFIG_FILES xastir-lsb.spec" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -13570,7 +13577,7 @@ $debug || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -13587,7 +13594,7 @@ if test "x$ac_cr" = x; then fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi @@ -13601,18 +13608,18 @@ _ACEOF echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -13701,20 +13708,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -13742,7 +13757,7 @@ for ac_last_try in false false :; do if test -z "$ac_t"; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -13827,7 +13842,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error "could not setup config headers machinery" "$LINENO" 5 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -13840,7 +13855,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -13868,7 +13883,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -13895,7 +13910,7 @@ $as_echo "$as_me: creating $ac_file" >&6 case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -14032,22 +14047,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -14058,19 +14073,19 @@ which seems to be undefined. Please mak $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$tmp/config.h" "$ac_file" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error "could not create -" "$LINENO" 5 + || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -14220,7 +14235,7 @@ _ACEOF ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -14241,7 +14256,7 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 --- xastir-2.0.0.orig/Makefile.in +++ xastir-2.0.0/Makefile.in @@ -45,7 +45,7 @@ DIST_COMMON = README $(am__configure_dep $(srcdir)/xastir-lsb.spec.in $(srcdir)/xastir-min.spec.in \ $(srcdir)/xastir.spec.in $(top_srcdir)/configure ABOUT-NLS \ AUTHORS COPYING ChangeLog INSTALL NEWS config.guess config.sub \ - depcomp install-sh missing + depcomp install-sh missing mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac @@ -53,7 +53,7 @@ am__configure_deps = $(am__aclocal_m4_de $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = xastir.spec xastir-min.spec xastir-lsb.spec CONFIG_CLEAN_VPATH_FILES = @@ -151,6 +151,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CONTSHP = @CONTSHP@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ --- xastir-2.0.0.orig/aclocal.m4 +++ xastir-2.0.0/aclocal.m4 @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, +[m4_warning([this file was generated for autoconf 2.67. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) --- xastir-2.0.0.orig/help/Makefile.in +++ xastir-2.0.0/help/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -81,6 +81,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CONTSHP = @CONTSHP@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ --- xastir-2.0.0.orig/symbols/Makefile.in +++ xastir-2.0.0/symbols/Makefile.in @@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -86,6 +86,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CONTSHP = @CONTSHP@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ --- xastir-2.0.0.orig/scripts/Makefile.in +++ xastir-2.0.0/scripts/Makefile.in @@ -47,7 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = values values.pl CONFIG_CLEAN_VPATH_FILES = @@ -87,6 +87,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CONTSHP = @CONTSHP@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ --- xastir-2.0.0.orig/callpass/Makefile.in +++ xastir-2.0.0/callpass/Makefile.in @@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,6 +78,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CONTSHP = @CONTSHP@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ --- xastir-2.0.0.orig/src/Makefile.in +++ xastir-2.0.0/src/Makefile.in @@ -48,7 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -146,6 +146,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CONTSHP = @CONTSHP@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ --- xastir-2.0.0.orig/src/rtree/Makefile.in +++ xastir-2.0.0/src/rtree/Makefile.in @@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -79,6 +79,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CONTSHP = @CONTSHP@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ --- xastir-2.0.0.orig/src/shapelib/Makefile.in +++ xastir-2.0.0/src/shapelib/Makefile.in @@ -50,7 +50,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -157,6 +157,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CONTSHP = @CONTSHP@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ --- xastir-2.0.0.orig/src/shapelib/contrib/Makefile.in +++ xastir-2.0.0/src/shapelib/contrib/Makefile.in @@ -39,8 +39,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ noinst_PROGRAMS = dbfcat$(EXEEXT) dbfinfo$(EXEEXT) shpcat$(EXEEXT) \ - shpcentrd$(EXEEXT) shpdata$(EXEEXT) shpdxf$(EXEEXT) \ - shpfix$(EXEEXT) shpinfo$(EXEEXT) shpproj$(EXEEXT) \ + shpdxf$(EXEEXT) shpfix$(EXEEXT) shpinfo$(EXEEXT) @CONTSHP@ +EXTRA_PROGRAMS = shpcentrd$(EXEEXT) shpproj$(EXEEXT) shpdata$(EXEEXT) \ shpwkb$(EXEEXT) subdir = src/shapelib/contrib DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in @@ -49,7 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -119,6 +119,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CONTSHP = @CONTSHP@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ --- xastir-2.0.0.orig/config/Makefile.in +++ xastir-2.0.0/config/Makefile.in @@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -86,6 +86,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CONTSHP = @CONTSHP@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -234,6 +235,7 @@ EXTRA_DIST = \ nwsc_ddmmyy.dbfawk \ nwsc_ddmmyy_09.dbfawk \ nwsc_ddmmyy_09b.dbfawk \ + nwsc_ddmmyy_10.dbfawk \ nwsmzddmmyy.dbfawk \ nwsmzddmmyy_09.dbfawk \ nwsmzoddmmyy.dbfawk \ @@ -244,8 +246,10 @@ EXTRA_DIST = \ nwsz_ddmmyy.dbfawk \ nwsz_ddmmyy_09.dbfawk \ nwsz_ddmmyy_10.dbfawk \ + nwsz_ddmmyy_10b.dbfawk \ nwsz1ddmmyy.dbfawk \ nwszoddmmyy.dbfawk \ + nwshzddmmyy.dbfawk \ OSM_Cloudmade_administrative.dbfawk \ OSM_Cloudmade_highway.dbfawk \ OSM_Cloudmade_natural.dbfawk \ --- xastir-2.0.0.orig/m4/Makefile.in +++ xastir-2.0.0/m4/Makefile.in @@ -40,7 +40,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -57,6 +57,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CONTSHP = @CONTSHP@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ debian/patches/link.patch0000664000000000000000000000166511461560211012602 0ustar Remove manual linking to allow dh_link for debian packaging. --- a/Makefile.am +++ b/Makefile.am @@ -75,9 +75,9 @@ -rm -rf ${pkgdatadir}/doc install-data-hook: - cd $(mapdir) && \ - rm -f CC_OpenStreetMap.png && \ - $(LN_S) CC_OpenStreetMap_logo.png CC_OpenStreetMap.png + echo cd $(mapdir) && \ + echo rm -f CC_OpenStreetMap.png && \ + echo $(LN_S) CC_OpenStreetMap_logo.png CC_OpenStreetMap.png mandir=${prefix}/share/man man_MANS=xastir.1 callpass.1 xastir_udp_client.1 testdbfawk.1 --- a/Makefile.in +++ b/Makefile.in @@ -1051,9 +1051,9 @@ -rm -rf ${pkgdatadir}/doc install-data-hook: - cd $(mapdir) && \ - rm -f CC_OpenStreetMap.png && \ - $(LN_S) CC_OpenStreetMap_logo.png CC_OpenStreetMap.png + echo cd $(mapdir) && \ + echo rm -f CC_OpenStreetMap.png && \ + echo $(LN_S) CC_OpenStreetMap_logo.png CC_OpenStreetMap.png # Tiles from cloudmade require an access code, so use the static map. OSM_cloudmade_1.geo: OSM_template debian/patches/OSM_config.patch0000664000000000000000000004740511552231647013643 0ustar Description: Upstream changes introduced in version 2.0.0-1 Update entries to support additional OSM map types. Origin: upstream --- /dev/null +++ xastir-2.0.0/OSM_tiled_osmarender.geo @@ -0,0 +1,51 @@ +# +# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $ +# +# +# Map data Copyright OpenStreetMap Contributors, CC-BY-SA +# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/ +# +# The string following OSMSTATICMAP-, is appended to the URL +# The string is typically expected to select a layer, and possibly style +# options. If not set it defaults to: +# layer=osmarander +# +# The string following OSM_TILED_MAP-, is the name of a sub-directory in +# the tile cache. It can be empty (delete the '-' too), though that is a +# bad idea if multiple map styles are using the same TILE_DIR. +# +# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP +# +# +#OSMSTATICMAP-osmarender +# or +OSM_TILED_MAP-osmarender +# +# The url for tiled maps defaults to http://tile.openstreetmap.org/. For +# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/ +URL http://tah.openstreetmap.org/Tiles/tile/ + +# Tile extension defaults to png +#TILE_EXT png + +#ZOOM_LEVEL_MIN 0 +#ZOOM_LEVEL_MAX 18 + +# The tile cache can be changed from the default (~/.xastir/OSMtiles) by +# setting the following variable. If path does not begin with a '/' then +# it will be relative to ~/.xastir/. +# +#TILE_DIR OSMtiles + + +# When defined: +# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level. +# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y, +# and OSM zoom level, but only for debug level 512 (-v 512) +# +# The values are X KeySym values. +# 65473 = F4 +# 65474 = F5 +OSM_OPTIMIZE_KEY 65473 +OSM_REPORT_SCALE_KEY 65474 + --- /dev/null +++ xastir-2.0.0/OSM_tiled_topOSM_0_relief.geo @@ -0,0 +1,51 @@ +# +# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $ +# +# +# Map data Copyright OpenStreetMap Contributors, CC-BY-SA +# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/ +# +# The string following OSMSTATICMAP-, is appended to the URL +# The string is typically expected to select a layer, and possibly style +# options. If not set it defaults to: +# layer=osmarander +# +# The string following OSM_TILED_MAP-, is the name of a sub-directory in +# the tile cache. It can be empty (delete the '-' too), though that is a +# bad idea if multiple map styles are using the same TILE_DIR. +# +# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP +# +# +#OSMSTATICMAP-topOSMr +# or +OSM_TILED_MAP-topOSMr +# +# The url for tiled maps defaults to http://tile.openstreetmap.org/. For +# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/ +URL http://tile1.toposm.com/usw/color-relief/ + +# Tile extension defaults to png +TILE_EXT jpg + +ZOOM_LEVEL_MIN 5 +ZOOM_LEVEL_MAX 15 + +# The tile cache can be changed from the default (~/.xastir/OSMtiles) by +# setting the following variable. If path does not begin with a '/' then +# it will be relative to ~/.xastir/. +# +#TILE_DIR OSMtiles + + +# When defined: +# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level. +# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y, +# and OSM zoom level, but only for debug level 512 (-v 512) +# +# The values are X KeySym values. +# 65473 = F4 +# 65474 = F5 +OSM_OPTIMIZE_KEY 65473 +OSM_REPORT_SCALE_KEY 65474 + --- /dev/null +++ xastir-2.0.0/OSM_tiled_topOSM_2_features.geo @@ -0,0 +1,51 @@ +# +# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $ +# +# +# Map data Copyright OpenStreetMap Contributors, CC-BY-SA +# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/ +# +# The string following OSMSTATICMAP-, is appended to the URL +# The string is typically expected to select a layer, and possibly style +# options. If not set it defaults to: +# layer=osmarander +# +# The string following OSM_TILED_MAP-, is the name of a sub-directory in +# the tile cache. It can be empty (delete the '-' too), though that is a +# bad idea if multiple map styles are using the same TILE_DIR. +# +# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP +# +# +#OSMSTATICMAP-topOSMf +# or +OSM_TILED_MAP-topOSMf +# +# The url for tiled maps defaults to http://tile.openstreetmap.org/. For +# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/ +URL http://tile1.toposm.com/usw/features/ + +# Tile extension defaults to png +#TILE_EXT png + +ZOOM_LEVEL_MIN 5 +ZOOM_LEVEL_MAX 15 + +# The tile cache can be changed from the default (~/.xastir/OSMtiles) by +# setting the following variable. If path does not begin with a '/' then +# it will be relative to ~/.xastir/. +# +#TILE_DIR OSMtiles + + +# When defined: +# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level. +# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y, +# and OSM zoom level, but only for debug level 512 (-v 512) +# +# The values are X KeySym values. +# 65473 = F4 +# 65474 = F5 +OSM_OPTIMIZE_KEY 65473 +OSM_REPORT_SCALE_KEY 65474 + --- /dev/null +++ xastir-2.0.0/OSM_cloudmade_1.geo @@ -0,0 +1,51 @@ +# +# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $ +# +# +# Map data Copyright OpenStreetMap Contributors, CC-BY-SA +# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/ +# +# The string following OSMSTATICMAP-, is appended to the URL +# The string is typically expected to select a layer, and possibly style +# options. If not set it defaults to: +# layer=osmarander +# +# The string following OSM_TILED_MAP-, is the name of a sub-directory in +# the tile cache. It can be empty (delete the '-' too), though that is a +# bad idea if multiple map styles are using the same TILE_DIR. +# +# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP +# +# +OSMSTATICMAP-layer=cloudmade_1 +# or +#OSM_TILED_MAP-layer=cloudmade_1 +# +# The url for tiled maps defaults to http://tile.openstreetmap.org/. For +# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/ +#URL tileURL + +# Tile extension defaults to png +#TILE_EXT png + +#ZOOM_LEVEL_MIN 0 +#ZOOM_LEVEL_MAX 18 + +# The tile cache can be changed from the default (~/.xastir/OSMtiles) by +# setting the following variable. If path does not begin with a '/' then +# it will be relative to ~/.xastir/. +# +#TILE_DIR OSMtiles + + +# When defined: +# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level. +# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y, +# and OSM zoom level, but only for debug level 512 (-v 512) +# +# The values are X KeySym values. +# 65473 = F4 +# 65474 = F5 +OSM_OPTIMIZE_KEY 65473 +OSM_REPORT_SCALE_KEY 65474 + --- /dev/null +++ xastir-2.0.0/OSM_cloudmade_5.geo @@ -0,0 +1,51 @@ +# +# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $ +# +# +# Map data Copyright OpenStreetMap Contributors, CC-BY-SA +# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/ +# +# The string following OSMSTATICMAP-, is appended to the URL +# The string is typically expected to select a layer, and possibly style +# options. If not set it defaults to: +# layer=osmarander +# +# The string following OSM_TILED_MAP-, is the name of a sub-directory in +# the tile cache. It can be empty (delete the '-' too), though that is a +# bad idea if multiple map styles are using the same TILE_DIR. +# +# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP +# +# +OSMSTATICMAP-layer=cloudmade_5 +# or +#OSM_TILED_MAP-layer=cloudmade_5 +# +# The url for tiled maps defaults to http://tile.openstreetmap.org/. For +# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/ +#URL tileURL + +# Tile extension defaults to png +#TILE_EXT png + +#ZOOM_LEVEL_MIN 0 +#ZOOM_LEVEL_MAX 18 + +# The tile cache can be changed from the default (~/.xastir/OSMtiles) by +# setting the following variable. If path does not begin with a '/' then +# it will be relative to ~/.xastir/. +# +#TILE_DIR OSMtiles + + +# When defined: +# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level. +# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y, +# and OSM zoom level, but only for debug level 512 (-v 512) +# +# The values are X KeySym values. +# 65473 = F4 +# 65474 = F5 +OSM_OPTIMIZE_KEY 65473 +OSM_REPORT_SCALE_KEY 65474 + --- /dev/null +++ xastir-2.0.0/OSM_cloudmade_998.geo @@ -0,0 +1,51 @@ +# +# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $ +# +# +# Map data Copyright OpenStreetMap Contributors, CC-BY-SA +# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/ +# +# The string following OSMSTATICMAP-, is appended to the URL +# The string is typically expected to select a layer, and possibly style +# options. If not set it defaults to: +# layer=osmarander +# +# The string following OSM_TILED_MAP-, is the name of a sub-directory in +# the tile cache. It can be empty (delete the '-' too), though that is a +# bad idea if multiple map styles are using the same TILE_DIR. +# +# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP +# +# +OSMSTATICMAP-layer=cloudmade_998 +# or +#OSM_TILED_MAP-layer=cloudmade_998 +# +# The url for tiled maps defaults to http://tile.openstreetmap.org/. For +# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/ +#URL tileURL + +# Tile extension defaults to png +#TILE_EXT png + +#ZOOM_LEVEL_MIN 0 +#ZOOM_LEVEL_MAX 18 + +# The tile cache can be changed from the default (~/.xastir/OSMtiles) by +# setting the following variable. If path does not begin with a '/' then +# it will be relative to ~/.xastir/. +# +#TILE_DIR OSMtiles + + +# When defined: +# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level. +# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y, +# and OSM zoom level, but only for debug level 512 (-v 512) +# +# The values are X KeySym values. +# 65473 = F4 +# 65474 = F5 +OSM_OPTIMIZE_KEY 65473 +OSM_REPORT_SCALE_KEY 65474 + --- /dev/null +++ xastir-2.0.0/OSM_tiled_mapnik.geo @@ -0,0 +1,51 @@ +# +# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $ +# +# +# Map data Copyright OpenStreetMap Contributors, CC-BY-SA +# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/ +# +# The string following OSMSTATICMAP-, is appended to the URL +# The string is typically expected to select a layer, and possibly style +# options. If not set it defaults to: +# layer=osmarander +# +# The string following OSM_TILED_MAP-, is the name of a sub-directory in +# the tile cache. It can be empty (delete the '-' too), though that is a +# bad idea if multiple map styles are using the same TILE_DIR. +# +# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP +# +# +#OSMSTATICMAP-mapnik +# or +OSM_TILED_MAP-mapnik +# +# The url for tiled maps defaults to http://tile.openstreetmap.org/. For +# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/ +URL http://tile.openstreetmap.org/ + +# Tile extension defaults to png +#TILE_EXT png + +#ZOOM_LEVEL_MIN 0 +#ZOOM_LEVEL_MAX 18 + +# The tile cache can be changed from the default (~/.xastir/OSMtiles) by +# setting the following variable. If path does not begin with a '/' then +# it will be relative to ~/.xastir/. +# +#TILE_DIR OSMtiles + + +# When defined: +# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level. +# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y, +# and OSM zoom level, but only for debug level 512 (-v 512) +# +# The values are X KeySym values. +# 65473 = F4 +# 65474 = F5 +OSM_OPTIMIZE_KEY 65473 +OSM_REPORT_SCALE_KEY 65474 + --- /dev/null +++ xastir-2.0.0/OSM_tiled_topOSM_1_contour.geo @@ -0,0 +1,51 @@ +# +# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $ +# +# +# Map data Copyright OpenStreetMap Contributors, CC-BY-SA +# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/ +# +# The string following OSMSTATICMAP-, is appended to the URL +# The string is typically expected to select a layer, and possibly style +# options. If not set it defaults to: +# layer=osmarander +# +# The string following OSM_TILED_MAP-, is the name of a sub-directory in +# the tile cache. It can be empty (delete the '-' too), though that is a +# bad idea if multiple map styles are using the same TILE_DIR. +# +# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP +# +# +#OSMSTATICMAP-topOSMc +# or +OSM_TILED_MAP-topOSMc +# +# The url for tiled maps defaults to http://tile.openstreetmap.org/. For +# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/ +URL http://tile1.toposm.com/usw/contours/ + +# Tile extension defaults to png +#TILE_EXT png + +ZOOM_LEVEL_MIN 5 +ZOOM_LEVEL_MAX 15 + +# The tile cache can be changed from the default (~/.xastir/OSMtiles) by +# setting the following variable. If path does not begin with a '/' then +# it will be relative to ~/.xastir/. +# +#TILE_DIR OSMtiles + + +# When defined: +# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level. +# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y, +# and OSM zoom level, but only for debug level 512 (-v 512) +# +# The values are X KeySym values. +# 65473 = F4 +# 65474 = F5 +OSM_OPTIMIZE_KEY 65473 +OSM_REPORT_SCALE_KEY 65474 + --- /dev/null +++ xastir-2.0.0/OSM_tiled_skiing.geo @@ -0,0 +1,51 @@ +# +# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $ +# +# +# Map data Copyright OpenStreetMap Contributors, CC-BY-SA +# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/ +# +# The string following OSMSTATICMAP-, is appended to the URL +# The string is typically expected to select a layer, and possibly style +# options. If not set it defaults to: +# layer=osmarander +# +# The string following OSM_TILED_MAP-, is the name of a sub-directory in +# the tile cache. It can be empty (delete the '-' too), though that is a +# bad idea if multiple map styles are using the same TILE_DIR. +# +# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP +# +# +#OSMSTATICMAP-skiing +# or +OSM_TILED_MAP-skiing +# +# The url for tiled maps defaults to http://tile.openstreetmap.org/. For +# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/ +URL http://tiles.openpistemap.org/contours/ + +# Tile extension defaults to png +#TILE_EXT png + +#ZOOM_LEVEL_MIN 0 +#ZOOM_LEVEL_MAX 18 + +# The tile cache can be changed from the default (~/.xastir/OSMtiles) by +# setting the following variable. If path does not begin with a '/' then +# it will be relative to ~/.xastir/. +# +#TILE_DIR OSMtiles + + +# When defined: +# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level. +# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y, +# and OSM zoom level, but only for debug level 512 (-v 512) +# +# The values are X KeySym values. +# 65473 = F4 +# 65474 = F5 +OSM_OPTIMIZE_KEY 65473 +OSM_REPORT_SCALE_KEY 65474 + --- /dev/null +++ xastir-2.0.0/OSM_cloudmade_999.geo @@ -0,0 +1,51 @@ +# +# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $ +# +# +# Map data Copyright OpenStreetMap Contributors, CC-BY-SA +# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/ +# +# The string following OSMSTATICMAP-, is appended to the URL +# The string is typically expected to select a layer, and possibly style +# options. If not set it defaults to: +# layer=osmarander +# +# The string following OSM_TILED_MAP-, is the name of a sub-directory in +# the tile cache. It can be empty (delete the '-' too), though that is a +# bad idea if multiple map styles are using the same TILE_DIR. +# +# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP +# +# +#OSMSTATICMAP-layer=cloudmade_999 +# or +#OSM_TILED_MAP-layer=cloudmade_999 +# +# The url for tiled maps defaults to http://tile.openstreetmap.org/. For +# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/ +#URL tileURL + +# Tile extension defaults to png +#TILE_EXT png + +#ZOOM_LEVEL_MIN 0 +#ZOOM_LEVEL_MAX 18 + +# The tile cache can be changed from the default (~/.xastir/OSMtiles) by +# setting the following variable. If path does not begin with a '/' then +# it will be relative to ~/.xastir/. +# +#TILE_DIR OSMtiles + + +# When defined: +# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level. +# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y, +# and OSM zoom level, but only for debug level 512 (-v 512) +# +# The values are X KeySym values. +# 65473 = F4 +# 65474 = F5 +OSM_OPTIMIZE_KEY 65473 +OSM_REPORT_SCALE_KEY 65474 + --- /dev/null +++ xastir-2.0.0/OSM_cloudmade_2.geo @@ -0,0 +1,51 @@ +# +# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $ +# +# +# Map data Copyright OpenStreetMap Contributors, CC-BY-SA +# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/ +# +# The string following OSMSTATICMAP-, is appended to the URL +# The string is typically expected to select a layer, and possibly style +# options. If not set it defaults to: +# layer=osmarander +# +# The string following OSM_TILED_MAP-, is the name of a sub-directory in +# the tile cache. It can be empty (delete the '-' too), though that is a +# bad idea if multiple map styles are using the same TILE_DIR. +# +# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP +# +# +OSMSTATICMAP-layer=cloudmade_2 +# or +#OSM_TILED_MAP-layer=cloudmade_2 +# +# The url for tiled maps defaults to http://tile.openstreetmap.org/. For +# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/ +#URL tileURL + +# Tile extension defaults to png +#TILE_EXT png + +#ZOOM_LEVEL_MIN 0 +#ZOOM_LEVEL_MAX 18 + +# The tile cache can be changed from the default (~/.xastir/OSMtiles) by +# setting the following variable. If path does not begin with a '/' then +# it will be relative to ~/.xastir/. +# +#TILE_DIR OSMtiles + + +# When defined: +# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level. +# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y, +# and OSM zoom level, but only for debug level 512 (-v 512) +# +# The values are X KeySym values. +# 65473 = F4 +# 65474 = F5 +OSM_OPTIMIZE_KEY 65473 +OSM_REPORT_SCALE_KEY 65474 + --- /dev/null +++ xastir-2.0.0/OSM_tiled_cycle.geo @@ -0,0 +1,51 @@ +# +# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $ +# +# +# Map data Copyright OpenStreetMap Contributors, CC-BY-SA +# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/ +# +# The string following OSMSTATICMAP-, is appended to the URL +# The string is typically expected to select a layer, and possibly style +# options. If not set it defaults to: +# layer=osmarander +# +# The string following OSM_TILED_MAP-, is the name of a sub-directory in +# the tile cache. It can be empty (delete the '-' too), though that is a +# bad idea if multiple map styles are using the same TILE_DIR. +# +# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP +# +# +#OSMSTATICMAP-cycle +# or +OSM_TILED_MAP-cycle +# +# The url for tiled maps defaults to http://tile.openstreetmap.org/. For +# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/ +URL http://andy.sandbox.cloudmade.com/tiles/cycle/ + +# Tile extension defaults to png +#TILE_EXT png + +#ZOOM_LEVEL_MIN 0 +#ZOOM_LEVEL_MAX 18 + +# The tile cache can be changed from the default (~/.xastir/OSMtiles) by +# setting the following variable. If path does not begin with a '/' then +# it will be relative to ~/.xastir/. +# +#TILE_DIR OSMtiles + + +# When defined: +# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level. +# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y, +# and OSM zoom level, but only for debug level 512 (-v 512) +# +# The values are X KeySym values. +# 65473 = F4 +# 65474 = F5 +OSM_OPTIMIZE_KEY 65473 +OSM_REPORT_SCALE_KEY 65474 + debian/patches/mapOSM.patch0000664000000000000000000000271711547444701013012 0ustar Update off by one bug fix from CVS diff -r e1802d3823fa src/map_OSM.c --- a/src/map_OSM.c Wed Nov 17 21:40:32 2010 -0500 +++ b/src/map_OSM.c Thu Apr 07 19:23:04 2011 -0400 @@ -135,13 +135,6 @@ #undef PACKAGE_VERSION #define PACKAGE_VERSION XASTIR_PACKAGE_VERSION #undef XASTIR_PACKAGE_VERSION -#endif // HAVE_MAGICK - -// Must be last include file -#include "leak_detection.h" - -#define xastirColorsMatch(p,q) (((p).red == (q).red) && ((p).blue == (q).blue) \ - && ((p).green == (q).green)) // This matte color was chosen emphirically to work well with the // contours from topOSM. @@ -165,6 +158,14 @@ #error "QuantumDepth != 16 or 8" #endif // QuantumDepth +#endif // HAVE_MAGICK + +// Must be last include file +#include "leak_detection.h" + +#define xastirColorsMatch(p,q) (((p).red == (q).red) && ((p).blue == (q).blue) \ + && ((p).green == (q).green)) + // osm_scale_x - map Xastir scale_x value to an OSM binned value // // Note that the terms 'higher' and 'lower' are confusing because a @@ -1091,7 +1092,7 @@ tileCnt = 1; for (tilex = tiles.startx; tilex <= tiles.endx; tilex++) { for (tiley = tiles.starty; tiley <= tiles.endy; tiley++) { - if (numTiles > 0) { + if ((numTiles > 0) & (tileCnt <= numTiles)) { xastir_snprintf(map_it, sizeof(map_it), langcode("BBARSTA051"), tileCnt, numTiles); // Downloading tile %ls of %ls statusline(map_it,0); debian/watch0000664000000000000000000000006411326372744010232 0ustar version=3 http://sf.net/xastir/xastir-(.*)\.tar\.gz debian/control0000664000000000000000000000227712312160313010573 0ustar Source: xastir Section: hamradio Priority: extra Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Hams group Uploaders: Jerry Stueve , Kamal Mostafa , Hamish Moffatt Standards-Version: 3.9.2 Build-Depends: debhelper (>= 7), libax25-dev, libmotif-dev, libxext-dev, libxt-dev, festival-dev, libgraphicsmagick1-dev | libgraphicsmagick-dev, libshp-dev, libproj-dev, libpcre3-dev, libcurl4-gnutls-dev | libcurl-ssl-dev, libgdal1-dev (>= 1.5.0), libdb-dev, libgeotiff-dev, autotools-dev Homepage: http://www.xastir.org/ Vcs-Browser: http://xastir.cvs.sourceforge.net/viewvc/xastir/xastir/ Vcs-Cvs: :pserver:anonymous@xastir.cvs.sourceforge.net/cvsroot/xastir Package: xastir Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: wget, python, festival, gpsman, gpsmanshp, x11-utils Description: X Amateur Station Tracking and Information Reporting Xastir is an APRS client for X. APRS is the Automatic Position Reporting System, a system where objects report their position (usually obtained from GPS) on the air; Xastir displays this information graphically. debian/source/0000775000000000000000000000000011326372743010500 5ustar debian/source/format0000664000000000000000000000001311326372743011705 0ustar 3.0 (quilt)debian/compat0000664000000000000000000000000211326372744010377 0ustar 7 debian/xastir.links0000664000000000000000000000013311432543542011544 0ustar usr/share/xastir/maps/CC_OpenStreetMap_logo.png usr/share/xastir/maps/CC_OpenStreetMap.png debian/rules0000775000000000000000000000227312312161063010247 0ustar #!/usr/bin/make -f build: dh_testdir touch aclocal.m4 touch Makefile.in */Makefile.in */*/Makefile.in touch config.h.in touch configure dh_autotools-dev_updateconfig CFLAGS="$(CFLAGS) -I/usr/include/geotiff -fPIC" ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man $(MAKE) touch build clean: dh_testdir -rm -f build [ ! -f Makefile ] || $(MAKE) distclean -rm -f src/callpass/Makefile -rm -f config.log config.cache summary.log dh_autotools-dev_restoreconfig dh_clean binary-indep: build # nothing else to do binary-arch: build dh_clean dh_installdirs CFLAGS="$(CFLAGS) -I/usr/include/geotiff -fPIC" $(MAKE) install DESTDIR=`pwd`/debian/xastir cp src/testdbfawk debian/xastir/usr/lib/xastir rm -f debian/xastir/usr/share/doc/xastir/* dh_installdocs AUTHORS README README.MAPS README.Contributing README.CVS README.Getting-Started FAQ NEWS UPGRADE dh_installmenu dh_installchangelogs ChangeLog dh_installman dh_strip dh_link dh_compress dh_fixperms dh_makeshlibs dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch checkroot: dh_testdir dh_testroot .PHONY: binary binary-arch binary-indep clean checkroot