[DebianGIS-dev] r663 - in packages: . proj proj/branches
proj/branches/upstream proj/branches/upstream/current
proj/branches/upstream/current/jniwrap
proj/branches/upstream/current/jniwrap/org
proj/branches/upstream/current/jniwrap/org/proj4
proj/branches/upstream/current/man
proj/branches/upstream/current/man/man1
proj/branches/upstream/current/man/man3
proj/branches/upstream/current/nad
proj/branches/upstream/current/src
Francesco Lovergine
frankie at alioth.debian.org
Tue Mar 27 22:53:50 CET 2007
Author: frankie
Date: 2007-03-27 21:53:44 +0000 (Tue, 27 Mar 2007)
New Revision: 663
Added:
packages/proj/
packages/proj/branches/
packages/proj/branches/upstream/
packages/proj/branches/upstream/current/
packages/proj/branches/upstream/current/AUTHORS
packages/proj/branches/upstream/current/COPYING
packages/proj/branches/upstream/current/ChangeLog
packages/proj/branches/upstream/current/INSTALL
packages/proj/branches/upstream/current/Makefile.am
packages/proj/branches/upstream/current/Makefile.in
packages/proj/branches/upstream/current/NEWS
packages/proj/branches/upstream/current/README
packages/proj/branches/upstream/current/aclocal.m4
packages/proj/branches/upstream/current/config.guess
packages/proj/branches/upstream/current/config.sub
packages/proj/branches/upstream/current/configure
packages/proj/branches/upstream/current/configure.in
packages/proj/branches/upstream/current/depcomp
packages/proj/branches/upstream/current/install-sh
packages/proj/branches/upstream/current/jniwrap/
packages/proj/branches/upstream/current/jniwrap/Makefile.am
packages/proj/branches/upstream/current/jniwrap/Makefile.in
packages/proj/branches/upstream/current/jniwrap/README
packages/proj/branches/upstream/current/jniwrap/build.xml
packages/proj/branches/upstream/current/jniwrap/doxygen.cfg
packages/proj/branches/upstream/current/jniwrap/org/
packages/proj/branches/upstream/current/jniwrap/org/Makefile.am
packages/proj/branches/upstream/current/jniwrap/org/Makefile.in
packages/proj/branches/upstream/current/jniwrap/org/proj4/
packages/proj/branches/upstream/current/jniwrap/org/proj4/LatLong.java
packages/proj/branches/upstream/current/jniwrap/org/proj4/Makefile.am
packages/proj/branches/upstream/current/jniwrap/org/proj4/Makefile.in
packages/proj/branches/upstream/current/jniwrap/org/proj4/Others.java
packages/proj/branches/upstream/current/jniwrap/org/proj4/Proj4.java
packages/proj/branches/upstream/current/jniwrap/org/proj4/Proj4Factory.java
packages/proj/branches/upstream/current/jniwrap/org/proj4/ProjectionData.java
packages/proj/branches/upstream/current/jniwrap/org/proj4/Projections.java
packages/proj/branches/upstream/current/ltconfig
packages/proj/branches/upstream/current/ltmain.sh
packages/proj/branches/upstream/current/man/
packages/proj/branches/upstream/current/man/Makefile.am
packages/proj/branches/upstream/current/man/Makefile.in
packages/proj/branches/upstream/current/man/man1/
packages/proj/branches/upstream/current/man/man1/Makefile.am
packages/proj/branches/upstream/current/man/man1/Makefile.in
packages/proj/branches/upstream/current/man/man1/cs2cs.1
packages/proj/branches/upstream/current/man/man1/geod.1
packages/proj/branches/upstream/current/man/man1/nad2nad.1
packages/proj/branches/upstream/current/man/man1/proj.1
packages/proj/branches/upstream/current/man/man3/
packages/proj/branches/upstream/current/man/man3/Makefile.am
packages/proj/branches/upstream/current/man/man3/Makefile.in
packages/proj/branches/upstream/current/man/man3/pj_init.3
packages/proj/branches/upstream/current/missing
packages/proj/branches/upstream/current/mkinstalldirs
packages/proj/branches/upstream/current/nad/
packages/proj/branches/upstream/current/nad/FL.lla
packages/proj/branches/upstream/current/nad/GL27
packages/proj/branches/upstream/current/nad/MD.lla
packages/proj/branches/upstream/current/nad/Makefile.am
packages/proj/branches/upstream/current/nad/Makefile.in
packages/proj/branches/upstream/current/nad/README
packages/proj/branches/upstream/current/nad/README.NADUS
packages/proj/branches/upstream/current/nad/TN.lla
packages/proj/branches/upstream/current/nad/WI.lla
packages/proj/branches/upstream/current/nad/WO.lla
packages/proj/branches/upstream/current/nad/alaska.lla
packages/proj/branches/upstream/current/nad/conus.lla
packages/proj/branches/upstream/current/nad/epsg
packages/proj/branches/upstream/current/nad/esri
packages/proj/branches/upstream/current/nad/hawaii.lla
packages/proj/branches/upstream/current/nad/nad.lst
packages/proj/branches/upstream/current/nad/nad27
packages/proj/branches/upstream/current/nad/nad83
packages/proj/branches/upstream/current/nad/ntv1_can.dat
packages/proj/branches/upstream/current/nad/null.lla
packages/proj/branches/upstream/current/nad/nzgd2kgrid0005.gsb
packages/proj/branches/upstream/current/nad/pj_out27.dist
packages/proj/branches/upstream/current/nad/pj_out83.dist
packages/proj/branches/upstream/current/nad/proj_def.dat
packages/proj/branches/upstream/current/nad/prvi.lla
packages/proj/branches/upstream/current/nad/stgeorge.lla
packages/proj/branches/upstream/current/nad/stlrnc.lla
packages/proj/branches/upstream/current/nad/stpaul.lla
packages/proj/branches/upstream/current/nad/td_out.dist
packages/proj/branches/upstream/current/nad/test27
packages/proj/branches/upstream/current/nad/test83
packages/proj/branches/upstream/current/nad/testntv2
packages/proj/branches/upstream/current/nad/testvarious
packages/proj/branches/upstream/current/nad/world
packages/proj/branches/upstream/current/src/
packages/proj/branches/upstream/current/src/Makefile.am
packages/proj/branches/upstream/current/src/Makefile.in
packages/proj/branches/upstream/current/src/PJ_aea.c
packages/proj/branches/upstream/current/src/PJ_aeqd.c
packages/proj/branches/upstream/current/src/PJ_airy.c
packages/proj/branches/upstream/current/src/PJ_aitoff.c
packages/proj/branches/upstream/current/src/PJ_august.c
packages/proj/branches/upstream/current/src/PJ_bacon.c
packages/proj/branches/upstream/current/src/PJ_bipc.c
packages/proj/branches/upstream/current/src/PJ_boggs.c
packages/proj/branches/upstream/current/src/PJ_bonne.c
packages/proj/branches/upstream/current/src/PJ_cass.c
packages/proj/branches/upstream/current/src/PJ_cc.c
packages/proj/branches/upstream/current/src/PJ_cea.c
packages/proj/branches/upstream/current/src/PJ_chamb.c
packages/proj/branches/upstream/current/src/PJ_collg.c
packages/proj/branches/upstream/current/src/PJ_crast.c
packages/proj/branches/upstream/current/src/PJ_denoy.c
packages/proj/branches/upstream/current/src/PJ_eck1.c
packages/proj/branches/upstream/current/src/PJ_eck2.c
packages/proj/branches/upstream/current/src/PJ_eck3.c
packages/proj/branches/upstream/current/src/PJ_eck4.c
packages/proj/branches/upstream/current/src/PJ_eck5.c
packages/proj/branches/upstream/current/src/PJ_eqc.c
packages/proj/branches/upstream/current/src/PJ_eqdc.c
packages/proj/branches/upstream/current/src/PJ_fahey.c
packages/proj/branches/upstream/current/src/PJ_fouc_s.c
packages/proj/branches/upstream/current/src/PJ_gall.c
packages/proj/branches/upstream/current/src/PJ_geos.c
packages/proj/branches/upstream/current/src/PJ_gins8.c
packages/proj/branches/upstream/current/src/PJ_gn_sinu.c
packages/proj/branches/upstream/current/src/PJ_gnom.c
packages/proj/branches/upstream/current/src/PJ_goode.c
packages/proj/branches/upstream/current/src/PJ_hammer.c
packages/proj/branches/upstream/current/src/PJ_hatano.c
packages/proj/branches/upstream/current/src/PJ_imw_p.c
packages/proj/branches/upstream/current/src/PJ_krovak.c
packages/proj/branches/upstream/current/src/PJ_labrd.c
packages/proj/branches/upstream/current/src/PJ_laea.c
packages/proj/branches/upstream/current/src/PJ_lagrng.c
packages/proj/branches/upstream/current/src/PJ_larr.c
packages/proj/branches/upstream/current/src/PJ_lask.c
packages/proj/branches/upstream/current/src/PJ_lcc.c
packages/proj/branches/upstream/current/src/PJ_lcca.c
packages/proj/branches/upstream/current/src/PJ_loxim.c
packages/proj/branches/upstream/current/src/PJ_lsat.c
packages/proj/branches/upstream/current/src/PJ_mbt_fps.c
packages/proj/branches/upstream/current/src/PJ_mbtfpp.c
packages/proj/branches/upstream/current/src/PJ_mbtfpq.c
packages/proj/branches/upstream/current/src/PJ_merc.c
packages/proj/branches/upstream/current/src/PJ_mill.c
packages/proj/branches/upstream/current/src/PJ_mod_ster.c
packages/proj/branches/upstream/current/src/PJ_moll.c
packages/proj/branches/upstream/current/src/PJ_mpoly.c
packages/proj/branches/upstream/current/src/PJ_nell.c
packages/proj/branches/upstream/current/src/PJ_nell_h.c
packages/proj/branches/upstream/current/src/PJ_nocol.c
packages/proj/branches/upstream/current/src/PJ_nsper.c
packages/proj/branches/upstream/current/src/PJ_nzmg.c
packages/proj/branches/upstream/current/src/PJ_ob_tran.c
packages/proj/branches/upstream/current/src/PJ_ocea.c
packages/proj/branches/upstream/current/src/PJ_oea.c
packages/proj/branches/upstream/current/src/PJ_omerc.c
packages/proj/branches/upstream/current/src/PJ_ortho.c
packages/proj/branches/upstream/current/src/PJ_poly.c
packages/proj/branches/upstream/current/src/PJ_putp2.c
packages/proj/branches/upstream/current/src/PJ_putp3.c
packages/proj/branches/upstream/current/src/PJ_putp4p.c
packages/proj/branches/upstream/current/src/PJ_putp5.c
packages/proj/branches/upstream/current/src/PJ_putp6.c
packages/proj/branches/upstream/current/src/PJ_robin.c
packages/proj/branches/upstream/current/src/PJ_rpoly.c
packages/proj/branches/upstream/current/src/PJ_sconics.c
packages/proj/branches/upstream/current/src/PJ_somerc.c
packages/proj/branches/upstream/current/src/PJ_stere.c
packages/proj/branches/upstream/current/src/PJ_sterea.c
packages/proj/branches/upstream/current/src/PJ_sts.c
packages/proj/branches/upstream/current/src/PJ_tcc.c
packages/proj/branches/upstream/current/src/PJ_tcea.c
packages/proj/branches/upstream/current/src/PJ_tmerc.c
packages/proj/branches/upstream/current/src/PJ_tpeqd.c
packages/proj/branches/upstream/current/src/PJ_urm5.c
packages/proj/branches/upstream/current/src/PJ_urmfps.c
packages/proj/branches/upstream/current/src/PJ_vandg.c
packages/proj/branches/upstream/current/src/PJ_vandg2.c
packages/proj/branches/upstream/current/src/PJ_vandg4.c
packages/proj/branches/upstream/current/src/PJ_wag2.c
packages/proj/branches/upstream/current/src/PJ_wag3.c
packages/proj/branches/upstream/current/src/PJ_wag7.c
packages/proj/branches/upstream/current/src/PJ_wink1.c
packages/proj/branches/upstream/current/src/PJ_wink2.c
packages/proj/branches/upstream/current/src/aasincos.c
packages/proj/branches/upstream/current/src/adjlon.c
packages/proj/branches/upstream/current/src/bch2bps.c
packages/proj/branches/upstream/current/src/bchgen.c
packages/proj/branches/upstream/current/src/biveval.c
packages/proj/branches/upstream/current/src/cs2cs.c
packages/proj/branches/upstream/current/src/dmstor.c
packages/proj/branches/upstream/current/src/emess.c
packages/proj/branches/upstream/current/src/emess.h
packages/proj/branches/upstream/current/src/gen_cheb.c
packages/proj/branches/upstream/current/src/geocent.c
packages/proj/branches/upstream/current/src/geocent.h
packages/proj/branches/upstream/current/src/geod.c
packages/proj/branches/upstream/current/src/geod_for.c
packages/proj/branches/upstream/current/src/geod_inv.c
packages/proj/branches/upstream/current/src/geod_set.c
packages/proj/branches/upstream/current/src/geodesic.h
packages/proj/branches/upstream/current/src/jniproj.c
packages/proj/branches/upstream/current/src/makefile.vc
packages/proj/branches/upstream/current/src/mk_cheby.c
packages/proj/branches/upstream/current/src/nad2bin.c
packages/proj/branches/upstream/current/src/nad2nad.c
packages/proj/branches/upstream/current/src/nad_cvt.c
packages/proj/branches/upstream/current/src/nad_init.c
packages/proj/branches/upstream/current/src/nad_intr.c
packages/proj/branches/upstream/current/src/nad_list.h
packages/proj/branches/upstream/current/src/org_proj4_Projections.h
packages/proj/branches/upstream/current/src/p_series.c
packages/proj/branches/upstream/current/src/pj_apply_gridshift.c
packages/proj/branches/upstream/current/src/pj_auth.c
packages/proj/branches/upstream/current/src/pj_datum_set.c
packages/proj/branches/upstream/current/src/pj_datums.c
packages/proj/branches/upstream/current/src/pj_deriv.c
packages/proj/branches/upstream/current/src/pj_ell_set.c
packages/proj/branches/upstream/current/src/pj_ellps.c
packages/proj/branches/upstream/current/src/pj_errno.c
packages/proj/branches/upstream/current/src/pj_factors.c
packages/proj/branches/upstream/current/src/pj_fwd.c
packages/proj/branches/upstream/current/src/pj_gauss.c
packages/proj/branches/upstream/current/src/pj_geocent.c
packages/proj/branches/upstream/current/src/pj_gridinfo.c
packages/proj/branches/upstream/current/src/pj_gridlist.c
packages/proj/branches/upstream/current/src/pj_init.c
packages/proj/branches/upstream/current/src/pj_inv.c
packages/proj/branches/upstream/current/src/pj_latlong.c
packages/proj/branches/upstream/current/src/pj_list.c
packages/proj/branches/upstream/current/src/pj_list.h
packages/proj/branches/upstream/current/src/pj_malloc.c
packages/proj/branches/upstream/current/src/pj_mlfn.c
packages/proj/branches/upstream/current/src/pj_msfn.c
packages/proj/branches/upstream/current/src/pj_open_lib.c
packages/proj/branches/upstream/current/src/pj_param.c
packages/proj/branches/upstream/current/src/pj_phi2.c
packages/proj/branches/upstream/current/src/pj_pr_list.c
packages/proj/branches/upstream/current/src/pj_qsfn.c
packages/proj/branches/upstream/current/src/pj_release.c
packages/proj/branches/upstream/current/src/pj_strerrno.c
packages/proj/branches/upstream/current/src/pj_transform.c
packages/proj/branches/upstream/current/src/pj_tsfn.c
packages/proj/branches/upstream/current/src/pj_units.c
packages/proj/branches/upstream/current/src/pj_utils.c
packages/proj/branches/upstream/current/src/pj_zpoly1.c
packages/proj/branches/upstream/current/src/proj.c
packages/proj/branches/upstream/current/src/proj.def
packages/proj/branches/upstream/current/src/proj_api.h
packages/proj/branches/upstream/current/src/proj_config.h.in
packages/proj/branches/upstream/current/src/projects.h
packages/proj/branches/upstream/current/src/rtodms.c
packages/proj/branches/upstream/current/src/vector1.c
packages/proj/tags/
Log:
[svn-inject] Installing original source of proj
Added: packages/proj/branches/upstream/current/AUTHORS
===================================================================
--- packages/proj/branches/upstream/current/AUTHORS 2007-03-27 21:43:04 UTC (rev 662)
+++ packages/proj/branches/upstream/current/AUTHORS 2007-03-27 21:53:44 UTC (rev 663)
@@ -0,0 +1,11 @@
+Original Author:
+Gerald Evenden
+
+Maintainer(s):
+Frank Warmerdam <warmerdam at pobox.com>
+
+Contributors:
+Brent Fraser <bfraser at geoanalytic.com>
+Chris Stuber <imap at chesapeake.net>
+Craig Bruce <cbruce at cubewerx.com>
+Victor Osipkov <vctos at email.com>
Added: packages/proj/branches/upstream/current/COPYING
===================================================================
--- packages/proj/branches/upstream/current/COPYING 2007-03-27 21:43:04 UTC (rev 662)
+++ packages/proj/branches/upstream/current/COPYING 2007-03-27 21:53:44 UTC (rev 663)
@@ -0,0 +1,34 @@
+
+All source, data files and other contents of the PROJ.4 package are
+available under the following terms. Note that the PROJ 4.3 and earlier
+was "public domain" as is common with US government work, but apparently
+this is not a well defined legal term in many countries. I am placing
+everything under the following MIT style license because I believe it is
+effectively the same as public domain, allowing anyone to use the code as
+they wish, including making proprietary derivatives.
+
+Though I have put my own name as copyright holder, I don't mean to imply
+I did the work. Essentially all work was done by Gerald Evenden.
+
+ --------------
+
+ Copyright (c) 2000, Frank Warmerdam
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
Added: packages/proj/branches/upstream/current/ChangeLog
===================================================================
--- packages/proj/branches/upstream/current/ChangeLog 2007-03-27 21:43:04 UTC (rev 662)
+++ packages/proj/branches/upstream/current/ChangeLog 2007-03-27 21:53:44 UTC (rev 663)
@@ -0,0 +1,860 @@
+Rel. 4.4.9 2004-10-29
+-------------------------------------------------------------------------
+
+2004-10-29 Frank Warmerdam <warmerdam at pobox.com>
+
+ * Preparing 4.4.9 release.
+
+ * src/pj_gridinfo.c: Fixed reported information in ctable debug msg.
+
+ * src/nad_cvt.c: Fixed problem with domai of tb.lam that caused
+ failure of eastern hemisphere locations to transform with null
+ grid (which is world sized).
+
+2004-10-28 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/makefile.vc: Changed to build executables against a proj.dll
+ by default.
+
+ * proj.def: added lots of methods, including some private ones used
+ only by proj.c, and geod.c.
+
+ * Added pj_get_*_ref() accessors for all the definition lists.
+
+ * Makefile.am: added jniwrap make support.
+
+ * configure.in: various updates, including use of AC_MAINTAINER_MODE,
+ and setting version to 4.4.9. Fixes annoying .so problem.
+
+ * updated to latest libtoolish stuff.
+
+2004-10-25 Frank Warmerdam <warmerdam at pobox.com>
+
+ * fixtimes.sh: Run this after a CVS checkout to setup times of
+ various build files to avoid re-running automake and friends.
+
+ * src/geocent.c,geocent.h,pj_transform.c: Added pj_ prefix to
+ all Geotrans functions to avoid name conflict if both linked in.
+
+ * configure.in: added --with-jni option.
+
+ * Added src/jniproj.c, src/org_proj4_Projections.h.
+
+ * Added jniwrap subtree (actually Andrea Antonello).
+
+2004-10-21 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/makefile.vc: added support for new files.
+
+2004-10-19 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/pj_gauss.c, src/PJ_geos.c, src/PJ_sterea.c: Incorporated
+ geos and sterea projections from Gerald's libproj4.
+
+2004-09-16 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/pj_open_lib.c: added pj_set_searchpath() provided by Eric Miller.
+
+2004-09-14 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/pj_pr_list.c: Ensure unused parameters are not included
+ in the returned string (provided by Eric Miller).
+
+2004-05-17 Frank Warmerdam <warmerdam at pobox.com>
+
+ * proj.spec: Change PACKAGE_NAME from "PROJ" to "proj".
+
+2004-05-12 Frank Warmerdam <warmerdam at pobox.com>
+
+ * nad/epsg: update translation for potsdam datum.
+
+ http://bugzilla.remotesensing.org/show_bug.cgi?id=566
+
+2004-05-04 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/pj_init.c: Made sword[] larger in get_opt() so long +towgs84
+ parameters or long +nadgrids parameters aren't truncated.
+
+Rel. 4.4.8 2004-05-04
+-------------------------------------------------------------------------
+
+2004-05-04 Frank Warmerdam <warmerdam at pobox.com>
+
+ * 4.4.8 release re-issued.
+
+ * nad/epsg: regenerated with prime meridian problems corrected.
+
+ http://bugzilla.remotesensing.org/show_bug.cgi?id=510
+
+2004-05-03 Frank Warmerdam <warmerdam at pobox.com>
+
+ * Preparing 4.4.8 release.
+
+ * src/pj_datums.c: added nzgd49 datum definition
+
+ http://bugzilla.remotesensing.org/show_bug.cgi?id=339
+
+ * nad/epsg: updated to EPSG 6.5.
+
+ * src/pj_transform.c: fixed so that raw ellipsoids are handled
+ in datum shifting as if they had a +towgs84=0,0,0.
+
+ * src/pj_transform.c: Fixed so that prime meridian offsets are
+ applied even if the coordinate system is not lat/long.
+
+ http://bugzilla.remotesensing.org/show_bug.cgi?id=510
+
+ * src/geocent.c: Updated Geocentric_To_Geodetic computation to be
+ iterative to reduce error as per Wenzel, H.-G.(1985): Hochauflösende
+ Kugelfunktionsmodelle für das Gravitationspotential der Erde. Wiss.
+ Arb. Univ. Hannover Nr. 137, p. 130-131. Fix adapted to geocent.c and
+ submitted by Lothar Gorling.
+
+ http://bugzilla.remotesensing.org/show_bug.cgi?id=563
+
+2004-04-15 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/makefile.vc: Define HAVE_STRERROR.
+
+ * src/projects.h: PJD_ERR_GEOCENTRIC now -45, and added to
+ pj_strerrno.c.
+
+ * src/pj_release.c: added pj_get_release() function.
+
+2004-02-19 Frank Warmerdam <warmerdam at pobox.com>
+
+ * nad/other.extra: updated from some WKT definition Daniel got from
+ CubeWerx.
+
+2004-01-24 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/pj_transform.c: Ensure pj_transform() will try to transform all
+ points in provided list if even some might transform properly.
+
+2003-08-18 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/PJ_aea.c: fixed initialization of en variable.
+
+ http://bugzilla.remotesensing.org/show_bug.cgi?id=380
+
+2003-06-27 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/pj_init.c: changed tokenizing in pj_init_plus() so that if
+ a value has an exponent with a plus sign this won't trigger a brand
+ new token. See bug 355 in bugzilla.
+
+2003-06-09 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/pj_init.c: ensure start is initialized at the very beginning
+ of the function to avoid crashes in case where the input arg list
+ is empty.
+
+2003-04-24 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/geod.c: Don't emit an error message after listing ellipsoids
+ or units, as per request from Dan Jacobson.
+
+2003-04-09 Frank Warmerdam <warmerdam at pobox.com>
+
+ * man/man1/{proj,cs2cs}.1: moved -m option from cs2cs.1 to
+ proj.1 since it is only supported by proj.
+
+ * nad/Makefile.am: added DESTDIR in three missing places as per
+ bug report from Peter Galbraith - proj debian package manager.
+
+Rel. 4.4.7 2003-03-31
+-------------------------------------------------------------------------
+
+2003-03-31 Frank Warmerdam <warmerdam at pobox.com>
+
+ * Prepare 4.4.7 Release.
+
+ * nad/esri: incorporated Paul Ramsey's update. ESRI specific
+ coordinate systems in nad/esri.extra.
+
+ * nad/epsg: Regenerated with towgs84 parameters properly generated
+ for non-greenwich prime meridians.
+
+ http://bugzilla.remotesensing.org/show_bug.cgi?id=304
+
+2003-03-28 Frank Warmerdam <warmerdam at pobox.com>
+
+ * config.guess, config.sub: updated from
+ ftp://ftp.gnu.org/pub/gnu/config/ in order to resolve Debian build
+ problems on MIPS architecture.
+
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=186586
+
+ * src/pj_datums.c: fixed ire65 definition to refer to mod_airy, not
+ modif_airy as per:
+ http://bugzilla.remotesensing.org/show_bug.cgi?id=312
+
+2003-03-26 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/pj_transform.c: Added check that srcdefn->inv actually exists!
+
+ Per http://mapserver.gis.umn.edu/bugs/show_bug.cgi?id=301
+
+2003-03-25 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/cs2cs.c: modified so that -f formats are used for Z as well as
+ x and y values.
+ As per http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=169056
+
+ * src/man/man1/cs2cs.1: removed -V flag ... it is not supported.
+ As per http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=162331
+
+2003-03-17 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/pj_datums.c: changed NAD27 definition to make everything
+ optional, and to include alaska, and ntv2_0.gsb.
+
+ nadgrids=@conus, at alaska, at ntv2_0.gsb, at ntv1_can.dat
+
+ * src/pj_grid*, src/pj_apply_gridshift.c, src/nad_init.c: Lots of
+ changes introducing the PJ_GRIDINFO structure, support for skippable
+ grids ('@' prefix), delayed grid data loading and support for NTv2
+ grids.
+
+2003-03-16 Frank Warmerdam <warmerdam at pobox.com>
+
+ * Modified get_opt() to terminate reading the definition when a new
+ definition (a word starting with '<') is encountered, in addition
+ to when the definition terminator '<>' is encountered, so that
+ unterminated definitions like those in the distributed esri file
+ will work properly. Patch provided by Carl Anderson.
+
+ http://bugzilla.remotesensing.org/show_bug.cgi?id=302
+
+2003-03-03 Frank Warmerdam <warmerdam at pobox.com>
+
+ * Prepare 4.4.6 Release.
+
+ * nad/epsg: updated to EPSG 6.2.2.
+
+ * src/Makefile.am, nad/Makefile.am: a few fixes for Cygwin
+ compatibility, ensure /usr/local/share/proj get pre-created.
+
+ * Incorporate src/PJ_lcca.c, the new "alternate" LCC implementation
+ provided by Gerald for some old maps. See his site for details.
+
+ * Rebuild dependent files with automake 1.6.3, libtool 1.4.2 and
+ autoconf 2.53.
+
+2003-01-15 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/pj_datums.c: added some datums as suggested by the GRASS team.
+
+2002-12-14 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/projects.h, various others: updated header style in some files.
+
+ * src/pj_geocent.c, src/pj_transform.c, src/pj_list.h, src/projects.h:
+ added support for geocentric coordinates in pj_transform() api.
+
+ * src/pj_utils.c: Fixed pj_get_def() to return info on prime meridian.
+
+2002-12-08 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/cs2cs.c: added support for the -lm switch to report all
+ prime meridians.
+
+ * src/pj_init.c, pj_transform.c, pj_datum.c: added preliminary
+ support for the +pm switch to set the prime meridian.
+
+2002-12-01 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/pj_transform.c: Applied fix for 7 parameter shifts in
+ pj_geocentric_from_wgs84() as per suggestion from Harald Lernbeiss in:
+
+ http://bugzilla.remotesensing.org/show_bug.cgi?id=194
+
+2002-11-19 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/cs2cs.c: cleanup memory at end to facility memory leak testing.
+
+2002-07-29 Frank Warmerdam <warmerdam at pobox.com>
+
+ * nad/esri: applied gradian related patches as per bug 184:
+
+ http://bugzilla.remotesensing.org/show_bug.cgi?id=184
+
+2002-07-25 Frank Warmerdam <warmerdam at pobox.com>
+
+ * nad/esri: added new ESRI translation file. Includes EPSG values
+ plus various ESRI extensions.
+
+2002-07-07 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/*.c, src/*.h, src/makefile.vc: *Many* changes to support
+ compiling all of the PROJ.4 source as C++ source. Add /TP to CFLAGS
+ in makefile.vc to test this on Windows. projects.h, and proj_api.h
+ attempt to export all externally visible functions with C linkage but
+ all code should now compile as C++. Currently only tested with VC++ 6.
+
+2002-06-11 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/pj_pr_list.c, proj.def, proj_api.h: Added the pj_get_def()
+ function to return an expanded definition from a projPJ handle,
+ including having the +init= section expanded.
+
+2002-05-30 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/geod/{geod.c,geod_for.c,geod_inv.c,geod_set.c,geodesic.h}:
+ Renamed a, S and f to geod_a, geod_S and geod_f to slightly reduce
+ the horrible naming conflict situations with geodesic.h.
+ http://bugzilla.remotesensing.org/show_bug.cgi?id=148
+
+2002-04-30 Frank Warmerdam <warmerdam at pobox.com>
+
+ * html/faq.html: new
+
+ * src/pj_apply_gridshift.c,pj_open_lib.c,nad_init.c: try to improve
+ debug output when datum shifting fails.
+
+2002-04-16 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/pj_list.c,src/PJ_krovak.c: Incorporated support for Krovak
+ projection as per submission by Thomas Fleming and Markus Neteler.
+
+2002-03-01 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/geod.c: Moved ctype.h up to avoid compile failure on MacOS X.
+
+2002-02-15 Frank Warmerdam <warmerdam at pobox.com>
+
+ * pj_transform.c: Provide zerod Z array in pj_datum_transform() if
+ none passed in.
+
+2002-01-23 Frank Warmerdam <warmerdam at pobox.com>
+
+ * Added proj.spec file provided by Intevation (FreeGIS CD).
+
+Rel. 4.4.5 2002/01/09
+-------------------------------------------------------------------------
+
+2002-01-09 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/geocent.c: Fixed serious bug in Convert_Geodetic_To_Geocentric()
+ that essentially ruins all datum shifting (except NAD tables). This
+ bug was introduced just in time for the PROJ 4.4.4 release.
+
+
+2001-11-05 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/proj.def: added pj_strerrno and pj_errno as per request from
+ Bernhard Herzog.
+
+
+Rel. 4.4.4 2001/09/15
+-------------------------------------------------------------------------
+
+2001-09-15 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/geocent.c: I have modified the Convert_Geodetic_To_Geocentric()
+ function to clamp Latitudes just a little out of the range
+ -PI/2 to PI/2 and to no longer do error checks on Longitudes since
+ they will be auto-wrapped by sin() and cos().
+
+ See http://bugzilla.remotesensing.org/show_bug.cgi?id=17
+
+ * nad/epsg: commited new updates with fixed units for us state plane
+ zones in feet, as reported by Marc-Andre.
+
+2001-08-23 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/makefile.vc: improved the setting of PROJ_LIB defaults.
+
+ * src/pj_open_lib.c: added the pj_set_finder() entry point.
+
+ * nad/epsg: fixed all LCC projections. The parameters were badly
+ mixed up.
+
+2001-08-11 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/proj.c: Generate an error message if +proj=latlong is used with
+ this program. As per bugzilla bug 70.
+
+2001-06-01 Frank Warmerdam <warmerdam at pobox.com>
+
+ * makefile.vc: emess.c directly linked into mainline programs.
+
+ * pj_errno.c: added pj_get_errno_ref().
+
+2001-05-14 Frank Warmerdam <warmerdam at pobox.com>
+
+ * upraded config.sub and config.guess as per debian bug report 97374.
+
+Rel. 4.4.3 2001/04/20
+-------------------------------------------------------------------------
+
+2001-04-20 Frank Warmerdam <warmerdam at pobox.com>
+
+ * Don't install test files in /usr/local/share/proj.
+
+ * Made WGS84 the default in proj_def.dat
+
+ * nad/test27,test83: Use -b flag for diff to avoid differences on
+ Windows due to CR/LF issues.
+
+ * src/makefile.vc: default to building "all".
+
+ * src/pj_init.c: call pj_open_lib() with mode of "rt" to ensure
+ correct handling of def files on DOS based systems.
+
+ * Updated for 4.4.3 release (pj_release.c, Makefile.am, etc).
+
+2001-04-05 Frank Warmerdam <warmerdam at pobox.com>
+
+ * Introduce proj_api.h as a public include file with projects.h
+ now intended to be private.
+
+ * pj_datums.c: added ntv1_can.dat to list for NAD27 datum.
+
+ * nad_init(): added support for loading NTv1 style datum shift files.
+
+ * cs2cs.c: use pj_latlong_from_proj()
+
+ * pj_init.c: added pj_init_plus().
+
+ * pj_utils.c: new with pj_is_latlong(), and pj_latlong_from_proj()
+ functions.
+
+ * pj_strerror.c: added error -43.
+
+2001-04-04 Frank Warmerdam <warmerdam at pobox.com>
+
+ * rewrote 7 param datum shift to match EPSG:9606, now works with
+ example.
+
+2001-03-20 Frank Warmerdam <warmerdam at pobox.com>
+
+ * Added -DPROJ_LIB=\"C:/PROJ/\" in src/makefile.vc to provide for
+ a default proj data file search directory.
+
+ * Added HOWTO-RELEASE document in CVS.
+
+2001-03-15 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/pj_apply_gridshift.c: fixed bug in pj_load_nadgrids() which
+ would sometimes result in the load function failing because of a
+ buffer overrun in the grid list string.
+
+2001-03-14 Frank Warmerdam <warmerdam at pobox.com>
+
+ * added nad/epsg database of translations between EPSG PCS/GCS
+ codes and PROJ.4 definitions.
+
+2001-02-24 Frank Warmerdam <warmerdam at pobox.com>
+
+ * Include +ellps in proj example as per suggestion from Michael
+ DeChaine.
+
+2001-02-07 Frank Warmerdam <warmerdam at pobox.com>
+
+ * Cleaned up various warnings when compiled with -Wall.
+
+2001-02-03 Frank Warmerdam <warmerdam at pobox.com>
+
+ * Added cs2cs.1 man page, and minor updates to nad2nad.1 and proj.1.
+
+ * Added pj_transform docs to pj_init.3.
+
+2001-01-25 Frank Warmerdam <warmerdam at pobox.com>
+
+ * Fixed pj_init() check for WGS84 match as per Bart Adriaanse bug rep.
+
+2000-12-15 Frank Warmerdam <warmerdam at pobox.com>
+
+ * src/makefile.vc: only delete proj.lib if it exists.
+
+2000-12-01 Frank Warmerdam <warmerdam at pobox.com>
+
+ * Added proj.def to extra_dist in src/Makefile.am.
+
+2000-11-29 Frank Warmerdam <warmerdam at pobox.com>
+
+ * Changed strtod() to proj_strtod() in strtod.c, and make use
+ of it in dmstor() to avoid having stuff like "5d10" interpreted
+ as exponential notation on MSVC.
+
+2000-11-18 Frank Warmerdam <warmerda at cs46980-c>
+
+ * Patch from Craig Bruce to adjlon.c to avoid wrong results,
+ and near-hangs when adjusting very large numbers.
+ http://bugzilla.remotesensing.org/show_bug.cgi?id=27
+
+Rel. 4.4.2 2000/09/22
+-------------------------------------------------------------------------
+
+2000-09-22 Frank Warmerdam <warmerda at cs46980-c>
+
+ * Fixed src/Makefile.am install-exec-local target, and added
+ geocent.h, and emess.h. Reissued 4.4.2 distribution files.
+
+ * Update version to 4.4.2, in preparation for 4.4.2 release.
+
+ * Ensure makefile.vc is distributed, and mention windows building
+ in README.
+
+ * Cast args to freev2() in bch2bps.c, and mk_cheby.c to avoid errors
+ on the Cray.
+
+2000-09-21 Frank Warmerdam <warmerda at cs46980-c>
+
+ * Added "sphere" to pj_ellps.c.
+
+2000-07-06 Frank Warmerdam <warmerda at cs46980-c>
+
+ * Fixed bug in nad_init() with path for datum shifting files.
+
+ * Implemented cs2cs program for transforming between coordinate systems
+ including datum shifts.
+
+ * Implemented proj=latlong pseudo-projection.
+
+ * Implemented pj_transform() to transform from one coordinate system
+ to another, including applying geocentric datum shifts, and NAD27
+ grid shifts.
+
+ * Implemented 3/7 parameter geocentric datum shift support.
+
+ * Added support for +datum, +towgs84, and +nadgrids parameters
+ when defining PJ's (for pj_init()). Added datum_type, and datum_params
+ to PJ structure.
+
+2000-07-04 Frank Warmerdam <warmerda at cs46980-c>
+
+ * Patched proj.c to handle binary io properly on Windows and DOS.
+ Patch submitted by Thomas Knudsen <thk at kms.dk>.
+
+2000-04-26 Frank Warmerdam <warmerda at cs46980-c>
+
+ * Added #define USE_PROJUV to projects.h to allow apps to
+ work properly against old and new version.
+
+2000-04-04 Frank Warmerdam <warmerda at rommel.atlsci.com>
+
+ * Patch from Craig Bruce (cbruce at cubewerx.com) for PJ_ortho.c
+ to make INVERSE() work well for points near zero.
+
+2000-03-29 Frank Warmerdam <warmerda at cs46980-c>
+
+ * Added hard links for invproj->proj and invgeod->geod in
+ src/Makefile.{am,in}.
+
+Rel. 4.4.1 2000/03/27
+-------------------------------------------------------------------------
+
+2000-03-27 Frank Warmerdam <warmerda at cs46980-c>
+
+ * Issued V4.4.1 Release.
+
+ * Re-added install target for NADCON data files when available.
+
+ * At the suggestion of John Evans, I have rolled the nad conversion
+ functions into the core library.
+
+ * Updated COPYING file to MIT style license. Added man_proj.html
+ in html directory.
+
+ * Add rules to install nad data files in $(prefix)/share/proj.
+
+2000-03-21 Frank Warmerdam <warmerda at rommel.atlsci.com>
+
+ * Converted to use libtool.
+
+ * Wrote new configure.in, and use automake to generate makefiles.
+
+ * Renamed UV to projUV to avoid conflicts on windows.
+
+ * Reorganize ChangeLog, and start work on 4.4.
+
+Rel. 4.3.2 94/10/30 Base-line
+-------------------------------------------------------------------------
+
+95/4/27
+ Corrected rf factor for GRS67.
+ Thanks to: Peter Shih tyshih at cc.nctu.edu.tw
+
+95/6/3
+ Gave an initializing value for pj_errno. Someone's compiler ignored
+ the whole module because nothing happened(!!!).
+ Thanks to: Mark Crispin <MRC at Panda.COM>.
+
+95/7/6
+ Corrected function pj_inv_mlfn for improper derivative code.
+ Previous computations not in error but convergence was slower.
+ Thanks to: Tony Fisher fisher at minster.york.ac.uk.
+
+95/8/8
+ Added Swiss Oblique Mercator projection. CH1903 Swiss grid system
+ parameters added to nad/world. <CH1903> added to nad/world file
+ and N-somerc.ps.Z added to documentation notes.
+ Thanks to: Daniel Ebneter, ebneter at iap.unibe.ch.
+
+95/9/5
+ Changed declaration of "char c" to "int c" to more properly monitor
+ error return value in pj_init.c.
+ Thanks to: Alejo Hausner (ah at cs.princeton.edu)
+
+95/9/10
+ Some minor file/internal name changes to facilitate xport to primative
+ systems. Documented entries unchanged.
+
+Rel. 4.3.1 94/2/16 Base-line
+-------------------------------------------------------------------------
+
+94/6/2
+ Transverse Mercator, spherical inverse fixed. Misplaced parenthsis.
+
+94/10/5
+ Dropped dependency on FILENAME_MAX---too poorly defined in both
+ POSIX and ANSI standards. Adopted MAX_PATH_FILENAME which is
+ set to 1024 (should be enough for most cases). This should solve
+ problem with HP installations.
+
+94/10/29
+ Problems with ellipsoidal for of azimuthal equidistant (PJ_aeqd.c).
+ Some discrepancies remain on comparison with Snyder's examples
+ but felt due to his use of TI calculator. Procedure should be
+ replaced with better geodesic routine.
+
+94/10/29
+ Corrected and added examples to geod.1 documentation.
+
+94/10/30
+ Added mkdir in nad/install otherwise nad2783 install may fail.
+
+Rel. 4.3 94/2/16 Base-line
+-------------------------------------------------------------------------
+
+94/3/13
+ Equidistant Conic forced es to 0, thus previous ellipsoid usage flawed.
+
+ Correction to sign of convergence angle and other details in
+ pj_factors.c.
+
+ Lambert Conf. conic corrected for +lat_0=90.
+
+ Convergence sign in pj_factors.c corrected to conform to Bomford's
+ definition. Also procedure corrected for usage when projection
+ returns some of its own factors.
+
+94/3/17
+ Added procedure pj_phi12 to support library. It gets and checks
+ standard parallels for some of the conics.
+
+ Added SPECIAL entry to conics Lambert, Albers and Equidistant.
+
+ Corrected nad/install.in test so as to only look for conus.lla.Z
+ as test for installation of NADCON datum matricies.
+
+94/3/19
+ Problems with MAPGEN's mapdef choking on call to proj. Fixed
+ with PROJ.4.3-patch-01.
+
+94/3/22
+ Bumb mode of handling memory allocation for 2D arrays, so that
+ execution of -L may not work on some systems. Interim corrections
+ distributed with PROJ.4.3-patch-02.
+
+ Patched Make.2 to properly use $(LIBS). Not in patch.
+
+ Apple's Unix libc has problems---no strerror and no %n in ?format.
+
+94/5/22
+ Added several simple conics but not totally verified.
+
+ Corrected proj.c so that resultant earth figure comments in -V
+ are prefixed with # and do not blow *mapdef*.
+
+ Releasing current code without documentation on new conics pending
+ communications with Snyder on their veracity. Release mainly to
+ clean up patches.
+
+Rel. 4.2.2 93/9/30 Base-line
+-------------------------------------------------------------------------
+
+93/11/14
+ 1. Minor change to projects.h to correct prototype.
+ 2. Changes to pj_init.c regarding ignoring failure to open
+ proj_def.dat.
+ 3. Alternate method of initializing automatic array.
+
+93/11/16
+ DOS distribution.
+
+93/11/28
+ Added "Final" figure line to begining of -V option ouput. Allows
+ user to see results of +ellps and +R_V, etc. arguments. "Feature,"
+ not an error. Mod to proj.c.
+
+93/12/03
+ Removed non-ANSI usage of errno from PJ_laea.
+ Added test for previous definition of NULL in strtod.c.
+
+93/12/12
+ Made aatan2 (compensates for 0,0 args) global.
+
+93/12/30
+ Removed proj "error" message at end of -l option list.
+
+94/1
+ Major revision to projection structure to facilitate maintenance.
+ Introduced PROJ_HEAD macro that is defined in several ways
+ dependent upon use. Allows generation of pj_list table from
+ `grep'ed projection files. Structure PJ now contains pointer
+ to const string giving ascii description of projection. Limited
+ application projection list much easier to generate with this system.
+
+ Many new pseudocylindrical projections added as well as a few new
+ miscellaneous projections. Total projection count now 110.
+
+Rel. 4.2.1 93/9/30 Base-line
+-------------------------------------------------------------------------
+
+93/10/3
+ Geod incorrectly computed some forward values when geodesic on the
+ merdian.
+
+93/11/2
+ Projection stere fails for polar cases because of 0 lat_ts. Fixed
+ by testing for lat_ts specification and setting to 90 degrees when
+ lat_ts not specified. UPS not affected.
+
+93/11/5
+ Inverse polar stereographic also failed on 0 x xor y. Corrected.
+
+93/11/10
+ Changed "install" to include "plain" system type for systems that
+ do not require special consideration.
+
+Rel. 4.2 93/8/25 Base-line
+-------------------------------------------------------------------------
+
+93/9/13
+ Improved bch2bps.c code. Old code not in error.
+ Still problems with DEC native C compiler.
+
+93/9/28
+ Modified install script for DEC entry, forcing gcc for compilation.
+
+93/9/29
+ Problem with due South forward in geod. Current version will not
+ be fixed as it is to be replaced with Vincente algorithm.
+
+93/9/30
+ Two corrections in src/Makefile.
+
+Rel. 4.1.3 93/4/15 Base-line
+-------------------------------------------------------------------------
+
+93/5/22
+ Extensively revised Chebychev approximation procedures and added
+ conversion to power series.
+
+93/6/8
+ Changed type of pj_param, plus mods to some other internal procedures.
+
+93/6/13
+ Modified pj_factors. Principle mod was that calling program must
+ provide base for structure FACTORS. Additional mods reflect
+ optional analytic input from projection modules (see next entry).
+
+ Modified base of PJ structure for projections to supply analytic
+ values of partial derivatives, scale factors and/or convergence
+ when formulary available.
+
+ Added -V option for proj so as to provide more complete, verbose
+ analysis of projection characteristics at selected geographic or
+ cartesian point.
+
+93/6/14
+ Pj_errno given its own module and projects.h declares it external.
+ To cover ANSI standards related to global variable. SG linker should
+ stop complaining.
+
+93/7/15
+ Several additions and a couple of minor corrections to elliptical
+ tables.
+
+93/8/4
+ PJ_ocea.c error in applying k0.
+
+93/8/19
+ Minor general corrections.
+ Added nadcon conversion procedures and nad2nad program.
+ Projects.h modified to reflect nadcon prototypes and stuctures.
+ pj_open_lib extracted from pj_init and made global for use in nad_init.
+
+93/8/25
+ Corrected pj_open_lib open for both binary and text modes. Mostly
+ for brain damaged DOS. Also affected calls in pj_init.c and nad_init.c
+
+ Installs and other scripts updated.
+
+Rel. 4.1.2 93/4/4 Base-line
+-------------------------------------------------------------------------
+
+93/4/8
+ Corrected pj_inv so that errno and pj_errno are reset on entry.
+
+93/4/14
+ Added elliptical forms to Azimuthal Equidistant (aeqd).
+
+93/4/15
+ Corrected positive error return to negative in PJ_lcc.c .
+
+ Added Indian units conversions to pj_units.
+
+Rel. 4.1.1 93/3/26 Base-line
+-------------------------------------------------------------------------
+
+93/4/2
+ gen_cheby.c - added <stdio.h> header.
+
+93/4/3-4
+ gen_cheby.c, projects.h - corrected gen_cheby argument declarations
+ related to 'proj' argument and prototype. Often signalled
+ warnings, but still managed to execute OK.
+
+ pj_init.c - local function get_init had insufficient storage
+ defined for copy of file name and id. Added id define.
+ Strncat replaced with correct strncpy (amazingly did not
+ cause problems except of one system).
+
+ Proj now compiles on DOS Microsoft 5.0 C compiler. MS suffers
+ same brain-damage as DEC, so requires local strtod function.
+
+ pj_strerrno prototype added to projects.h
+
+ DOS option in strtod.c for MS C's lack of standard macros in neaders.
+
+Rel. 4.1 93/3/8 Base-line --- @(#)CHANGE-LOG 4.14 95/09/23 GIE REL
+-------------------------------------------------------------------------
+93/3/20
+ pj_init -- added +k_0 as alternative to +k so as to match documentation.
+
+93/3/21
+ Laborde projection added. Primarily for Madagascar grid.
+ Considered BETA at moment until info obtained to give adequate
+ documentation.
+
+93/3/26
+ Oblique Mercator modified to allow processing of Malasian Grid.
+ +no_uoff and +rot_conv options added.
+
+93/3/26
+ Corrected text in Interim Report:
+ p. 12 - +phi's changed to +lat's
+ p. 12 - added updated Oblique Mercator documentation
+
+Unresolved:
+
+Reports of errno 25 persist. Do not know what platform. Reviewed
+ code and can't see problem.
+Unknown platform has problem with pj_errno global and linker storage
+ allocation. Seems similar to SG problem that was over come with
+ -common switch.
+
Added: packages/proj/branches/upstream/current/INSTALL
===================================================================
--- packages/proj/branches/upstream/current/INSTALL 2007-03-27 21:43:04 UTC (rev 662)
+++ packages/proj/branches/upstream/current/INSTALL 2007-03-27 21:53:44 UTC (rev 663)
@@ -0,0 +1,182 @@
+Basic Installation
+==================
+
+ These are generic installation instructions.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, a file
+`config.cache' that saves the results of its tests to speed up
+reconfiguring, and a file `config.log' containing compiler output
+(useful mainly for debugging `configure').
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If at some point `config.cache'
+contains results you don't want to keep, you may remove or edit it.
+
+ The file `configure.in' is used to create `configure' by a program
+called `autoconf'. You only need `configure.in' if you want to change
+it or regenerate `configure' using a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system. If you're
+ using `csh' on an old version of System V, you might need to type
+ `sh ./configure' instead to prevent `csh' from trying to execute
+ `configure' itself.
+
+ Running `configure' takes awhile. While running, it prints some
+ messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. You can give `configure'
+initial values for variables by setting them in the environment. Using
+a Bourne-compatible shell, you can do that on the command line like
+this:
+ CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
+
+Or on systems that have the `env' program, you can do it like this:
+ env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ If you have to use a `make' that does not supports the `VPATH'
+variable, you have to compile the package for one architecture at a time
+in the source code directory. After you have installed the package for
+one architecture, use `make distclean' before reconfiguring for another
+architecture.
+
+Installation Names
+==================
+
+ By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc. You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=PATH' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' can not figure out
+automatically, but needs to determine by the type of host the package
+will run on. Usually `configure' can figure that out, but if it prints
+a message saying it can not guess the host type, give it the
+`--host=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name with three fields:
+ CPU-COMPANY-SYSTEM
+
+See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the host type.
+
+ If you are building compiler tools for cross-compiling, you can also
+use the `--target=TYPE' option to select the type of system they will
+produce code for and the `--build=TYPE' option to select the type of
+system on which you are compiling the package.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Operation Controls
+==================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--cache-file=FILE'
+ Use and save the results of the tests in FILE instead of
+ `./config.cache'. Set FILE to `/dev/null' to disable caching, for
+ debugging `configure'.
+
+`--help'
+ Print a summary of the options to `configure', and exit.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`--version'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`configure' also accepts some other, not widely useful, options.
Added: packages/proj/branches/upstream/current/Makefile.am
===================================================================
--- packages/proj/branches/upstream/current/Makefile.am 2007-03-27 21:43:04 UTC (rev 662)
+++ packages/proj/branches/upstream/current/Makefile.am 2007-03-27 21:53:44 UTC (rev 663)
@@ -0,0 +1,3 @@
+SUBDIRS = src man nad jniwrap
+
+AUTOMAKE_OPTIONS = dist-zip
Added: packages/proj/branches/upstream/current/Makefile.in
===================================================================
--- packages/proj/branches/upstream/current/Makefile.in 2007-03-27 21:43:04 UTC (rev 662)
+++ packages/proj/branches/upstream/current/Makefile.in 2007-03-27 21:53:44 UTC (rev 663)
@@ -0,0 +1,573 @@
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = .
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
+ ChangeLog INSTALL NEWS config.guess config.sub depcomp \
+ install-sh ltconfig ltmain.sh missing mkinstalldirs
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno configure.status.lineno
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/src/proj_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-exec-recursive install-info-recursive \
+ install-recursive installcheck-recursive installdirs-recursive \
+ pdf-recursive ps-recursive uninstall-info-recursive \
+ uninstall-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+ { test ! -d $(distdir) \
+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr $(distdir); }; }
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).zip
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+SUBDIRS = src man nad jniwrap
+AUTOMAKE_OPTIONS = dist-zip
+all: all-recursive
+
+.SUFFIXES:
+am--refresh:
+ @:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+ cd $(srcdir) && $(AUTOMAKE) --gnu \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ echo ' $(SHELL) ./config.status'; \
+ $(SHELL) ./config.status;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ if (etags --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ else \
+ include_option=--include; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -f $$subdir/TAGS && \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ $(am__remove_distdir)
+ mkdir $(distdir)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+ if test -d $$d/$$file; then \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="../$(top_distdir)" \
+ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
+ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ || chmod -R a+r $(distdir)
+dist-gzip: distdir
+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+
+dist-bzip2: distdir
+ $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
+dist-tarZ: distdir
+ $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
+ $(am__remove_distdir)
+
+dist-shar: distdir
+ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ $(am__remove_distdir)
+dist-zip: distdir
+ -rm -f $(distdir).zip
+ zip -rq $(distdir).zip $(distdir)
+ $(am__remove_distdir)
+
+dist dist-all: distdir
+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ -rm -f $(distdir).zip
+ zip -rq $(distdir).zip $(distdir)
+ $(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration. Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
+ *.tar.bz2*) \
+ bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
+ *.shar.gz*) \
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
+ chmod -R a-w $(distdir); chmod a+w $(distdir)
+ mkdir $(distdir)/_build
+ mkdir $(distdir)/_inst
+ chmod a-w $(distdir)
+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+ && cd $(distdir)/_build \
+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
+ && $(MAKE) $(AM_MAKEFLAGS) check \
+ && $(MAKE) $(AM_MAKEFLAGS) install \
+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+ && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+ distuninstallcheck \
+ && chmod -R a-w "$$dc_install_base" \
+ && ({ \
+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+ } || { rm -rf "$$dc_destdir"; exit 1; }) \
+ && rm -rf "$$dc_destdir" \
+ && $(MAKE) $(AM_MAKEFLAGS) dist \
+ && rm -rf $(DIST_ARCHIVES) \
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+ $(am__remove_distdir)
+ @(echo "$(distdir) archives ready for distribution: "; \
+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+ sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+distuninstallcheck:
+ @cd $(distuninstallcheck_dir) \
+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+ || { echo "ERROR: files left after uninstall:" ; \
+ if test -n "$(DESTDIR)"; then \
+ echo " (check DESTDIR support)"; \
+ fi ; \
+ $(distuninstallcheck_listfiles) ; \
+ exit 1; } >&2
+distcleancheck: distclean
+ @if test '$(srcdir)' = . ; then \
+ echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+ exit 1 ; \
+ fi
+ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+ || { echo "ERROR: files left in build directory after distclean:" ; \
+ $(distcleancheck_listfiles) ; \
+ exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ -rm -rf $(top_srcdir)/autom4te.cache
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+ check-am clean clean-generic clean-libtool clean-recursive \
+ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+ dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-generic distclean-libtool distclean-recursive \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-man install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-generic \
+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Added: packages/proj/branches/upstream/current/NEWS
===================================================================
--- packages/proj/branches/upstream/current/NEWS 2007-03-27 21:43:04 UTC (rev 662)
+++ packages/proj/branches/upstream/current/NEWS 2007-03-27 21:53:44 UTC (rev 663)
@@ -0,0 +1,79 @@
+4.4.9 Release Notes
+-------------------
+
+ o Win32 build uses proj.dll by default now.
+
+ o Added accessor functions for the datums, ellps, prime_meridians, units and
+ main projection definition lists so they can be used on windows where
+ data objects exported from the DLL don't work easily.
+
+ o Added JNI (Java Native Interface) support within the jniwrap directory,
+ and some supporting entry points directly in the proj dll/so. See
+ --with-jni configure switch, and jniwrap/README.
+
+ o Added the proj=stereoa and proj=geos projections, incorporated from
+ Gerald's libproj4.
+
+ o A few other bug fixes.
+
+
+4.4.8 Release Notes
+-------------------
+
+ o Updated epsg file to EPSG 6.5, added other.extra pseudo-EPSG WMS definitions
+
+ o Made significant fixes to prime meridian support.
+
+ o Substantially change pj_datum_transform(), so it and pj_transform() will
+ work between coordinate systems with different ellipsoids but no datum
+ shift information (assume +towgs84=0,0,0).
+
+ o Added pj_get_release() function.
+
+ o Ensure pj_transform() will try to transform all points in provided list if
+ even some might transform properly.
+
+ o Improved the accuracy of Geocentric_To_Geodetic() via an iterative
+ solution.
+
+ o Various other bug fixes.
+
+
+4.4.7 Release Notes
+-------------------
+
+ o Added NTv2 (.gsb) grid shift file support.
+
+ o Modified datum shift support so that data file data is only loaded if
+ needed. Also added 'null' grid as a fallback option, and support for
+ making grids optional (prefix with '@' in +nadgrids).
+
+ o Regenerated nad/epsg file with towgs84 parameters for non-greenwich prime
+ meridians.
+
+ o Updated nad/esri file with better generated form from Paul Ramsey.
+
+ o Various bug fixes.
+
+
+4.4.6 Release Notes
+-------------------
+
+ o Incorporated new lcca (Lambert Conformal Conic Alternate) projection from
+ Gerald.
+
+ o Updated 'espg' translation file for EPSG 6.2.2 with better support for
+ prime meridians.
+
+ o Added Prime Meridians via +pm command switch to cs2cs (and pj_transform).
+
+ o Fixed bug with 7 parameter transforms.
+
+ o Added 'esri' pseudo-epsg coordinate system file.
+
+ o Cleanup so that PROJ.4 compiles clean as C++ code.
+
+ o Added pj_get_def() to expand definitions of stuff like +init clauses.
+
+ o Added a Krovak implementation (proj=krov). Note this may change again
+ in the next release.
Added: packages/proj/branches/upstream/current/README
===================================================================
--- packages/proj/branches/upstream/current/README 2007-03-27 21:43:04 UTC (rev 662)
+++ packages/proj/branches/upstream/current/README 2007-03-27 21:53:44 UTC (rev 663)
@@ -0,0 +1,126 @@
+ -------------------- P R O J . 4 --------------------
+
+This is Release 4.4 of cartographic projection software.
+
+PLEASE read the following information as well as READMEs in the src
+and nad directories.
+
+For more information on PROJ.4 maintenance please see the web page at:
+
+ http://www.remotesensing.org/proj
+
+ ---------------------------------------------------
+
+Installation:
+-------------
+
+FSF's configuration procedure is used to ease installation of the
+PROJ.4 system.
+
+The default destination path prefix for installed files is /usr/local.
+Results from the installation script will be placed into subdirectories
+bin, include, lib, man/man1 and man/man3. If this default path prefix
+is proper, then execute:
+
+ ./configure
+
+If another path prefix is required, then execute:
+
+ ./configure --prefix=/my/path
+
+In either case, the directory of the prefix path must exist and be
+writable by the installer.
+
+After executing configure, execute:
+
+ make
+ make install
+
+The install target will create, if necessary, all required sub-directories.
+
+Windows Build
+-------------
+
+PROJ.4 can be built with Microsoft Visual C/C++ using the makefile.vc
+in the src directory. First edit the PROJ\SRC\makefile.vc and modify
+the PROJ_LIB_DIR value at the top to point to the NAD subdirectory
+of wherever you put the PROJ tree. If you unpacked it as C:\PROJ it
+can remain unchanged. The use the makefile.vc to build the software:
+
+eg.
+C:\> cd proj\src
+C>\PROJ\SRC> nmake /f makefile.vc all
+
+Note that you have to have the VC++ environment variables, and path
+setup properly. This may involve running the VCVARS32.BAT script out
+of the Visual C++ tree.
+
+The makefile.vc builds proj.exe, proj.dll and proj.lib.
+
+It should also be possible to build using the Unix instructions
+and Cygwin32, but this hasn't been tested recently.
+
+
+ ---------------------------------------------------
+
+Distribution files and format.
+------------------------------
+
+Sources are distributed in one or more files. The principle elements
+of the system are in a compress tar file named `PROJ.4.x.tar.gz' where
+"x" will indicate level.sub-level of the release. For U.S. users
+interested in NADCON datum shifting procedures, additional files
+containing conversion matricies are distributed with the name
+`PROJ.4.x.y.tar' where y is an uppercase letter starting with "A."
+These supplementary files will contain compressed files and thus
+the tar file is not compressed.
+
+Interim reports on Rel. 4 proj are available in PostScript form as
+*.ps.gz . New and old users are strongly recommended to carefully read
+these manuals. They are supplements and NOT a replacement for the full
+manual OF 90-284 (which new users should also obtain).
+
+ ---------------------------------------------------
+
+Principle new aspects of system:
+--------------------------------
+
+ANSI X3.159-1989 C code. Site must have ANSI C compiler and header files.
+
+Several method of determining radius from specified ellipsoid.
+
+Use of initialization files through +init=file:key. Default projection
+specifications also may be defined in an ASCII file.
+
++inv option REMOVED and -I may be used in its place. Use of invproj
+alias of proj still functions as per Rel.3.
+
++ellps=list and +proj=list REMOVED. Use respective -le and -lp.
+
++units= to specify cartesian coordinate system units. To get list
+use -lu.
+
+-v added to dump final cartographic parameters employed.
+
+Addition of computing scale factors and angular distortion added through
+-S option. Valuable for designing new projection parameter details.
+
+-V option which verbosely lists projected point characteristics.
+
+Programmers may use projection library with calls to pj_init,
+pj_fwd, pj_inv and pj_transform.
+
+Program nad2nad for conversion of data to and from NAD27 and NAD83
+datums.
+
+Program cs2cs for converting between coordinate systems, with optional
+datum translation.
+
+-------------------------------------------------------------
+
+Things currently left undone:
+----------------------------
+
+proj_def.dat NOT fully in place. Needs additional settings for
+many of the projections. Probably will not be completed until main
+manual rewritten.
Added: packages/proj/branches/upstream/current/aclocal.m4
===================================================================
--- packages/proj/branches/upstream/current/aclocal.m4 2007-03-27 21:43:04 UTC (rev 662)
+++ packages/proj/branches/upstream/current/aclocal.m4 2007-03-27 21:53:44 UTC (rev 663)
@@ -0,0 +1,6892 @@
+# generated automatically by aclocal 1.8.3 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+# Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+# serial 47 AC_PROG_LIBTOOL
+
+
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+ [],
+ [m4_define([AC_PROVIDE_IFELSE],
+ [m4_ifdef([AC_PROVIDE_$1],
+ [$2], [$3])])])
+
+
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+ AC_PROVIDE_IFELSE([AC_PROG_CXX],
+ [AC_LIBTOOL_CXX],
+ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+ ])])
+dnl And a similar setup for Fortran 77 support
+ AC_PROVIDE_IFELSE([AC_PROG_F77],
+ [AC_LIBTOOL_F77],
+ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
+
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+ [AC_LIBTOOL_GCJ],
+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+ [AC_LIBTOOL_GCJ],
+ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+ [AC_LIBTOOL_GCJ],
+ [ifdef([AC_PROG_GCJ],
+ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+ ifdef([A][M_PROG_GCJ],
+ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+ ifdef([LT_AC_PROG_GCJ],
+ [define([LT_AC_PROG_GCJ],
+ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
+
+
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
+
+
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+
+AC_REQUIRE([AC_PROG_LN_S])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+dnl
+
+AC_LIBTOOL_SYS_MAX_CMD_LEN
+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+AC_LIBTOOL_OBJDIR
+
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+ # AIX sometimes has problems with the GCC collect2 program. For some
+ # reason, if we set the COLLECT_NAMES environment variable, the problems
+ # vanish in a puff of smoke.
+ if test "X${COLLECT_NAMES+set}" != Xset; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+ fi
+ ;;
+esac
+
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e s/^X//'
+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+# Same as above, but do not quote variable references.
+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except M$VC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+AC_CHECK_TOOL(AR, ar, false)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(STRIP, strip, :)
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$SED" && SED=sed
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+ case $host_os in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ ;;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ ;;
+ esac
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+# Only perform the check for file, if the check method requires it
+case $deplibs_check_method in
+file_magic*)
+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+ AC_PATH_MAGIC
+ fi
+ ;;
+esac
+
+AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+enable_win32_dll=yes, enable_win32_dll=no)
+
+AC_ARG_ENABLE([libtool-lock],
+ [AC_HELP_STRING([--disable-libtool-lock],
+ [avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+AC_ARG_WITH([pic],
+ [AC_HELP_STRING([--with-pic],
+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+ [pic_mode="$withval"],
+ [pic_mode=default])
+test -z "$pic_mode" && pic_mode=default
+
+# Use C for the default configuration in the libtool script
+tagname=
+AC_LIBTOOL_LANG_C_CONFIG
+_LT_AC_TAGCONFIG
+])# AC_LIBTOOL_SETUP
+
+
+# _LT_AC_SYS_COMPILER
+# -------------------
+AC_DEFUN([_LT_AC_SYS_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_AC_SYS_COMPILER
+
+
+# _LT_AC_SYS_LIBPATH_AIX
+# ----------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+}'`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+}'`; fi],[])
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+])# _LT_AC_SYS_LIBPATH_AIX
+
+
+# _LT_AC_SHELL_INIT(ARG)
+# ----------------------
+AC_DEFUN([_LT_AC_SHELL_INIT],
+[ifdef([AC_DIVERSION_NOTICE],
+ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+ [AC_DIVERT_PUSH(NOTICE)])
+$1
+AC_DIVERT_POP
+])# _LT_AC_SHELL_INIT
+
+
+# _LT_AC_PROG_ECHO_BACKSLASH
+# --------------------------
+# Add some code to the start of the generated configure script which
+# will find an echo command which doesn't interpret backslashes.
+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
+[_LT_AC_SHELL_INIT([
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$ECHO in
+X*--fallback-echo)
+ # Remove one level of quotation (which was required for Make).
+ ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+ ;;
+esac
+
+echo=${ECHO-echo}
+if test "X[$]1" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+ shift
+elif test "X[$]1" = X--fallback-echo; then
+ # Avoid inline document here, it may be left over
+ :
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+ # Yippee, $echo works!
+ :
+else
+ # Restart under the correct shell.
+ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+fi
+
+if test "X[$]1" = X--fallback-echo; then
+ # used as fallback echo
+ shift
+ cat <<EOF
+[$]*
+EOF
+ exit 0
+fi
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+
+if test -z "$ECHO"; then
+if test "X${echo_test_string+set}" != Xset; then
+# find a string as large as possible, as long as the shell can cope with it
+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+ if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+ echo_test_string="`eval $cmd`" &&
+ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+ then
+ break
+ fi
+ done
+fi
+
+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ :
+else
+ # The Solaris, AIX, and Digital Unix default echo programs unquote
+ # backslashes. This makes it impossible to quote backslashes using
+ # echo "$something" | sed 's/\\/\\\\/g'
+ #
+ # So, first we look for a working echo in the user's PATH.
+
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for dir in $PATH /usr/ucb; do
+ IFS="$lt_save_ifs"
+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ echo="$dir/echo"
+ break
+ fi
+ done
+ IFS="$lt_save_ifs"
+
+ if test "X$echo" = Xecho; then
+ # We didn't find a better echo, so look for alternatives.
+ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ # This shell has a builtin print -r that does the trick.
+ echo='print -r'
+ elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+ test "X$CONFIG_SHELL" != X/bin/ksh; then
+ # If we have ksh, try running configure again with it.
+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+ export ORIGINAL_CONFIG_SHELL
+ CONFIG_SHELL=/bin/ksh
+ export CONFIG_SHELL
+ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+ else
+ # Try using printf.
+ echo='printf %s\n'
+ if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ # Cool, printf works
+ :
+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+ test "X$echo_testing_string" = 'X\t' &&
+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+ export CONFIG_SHELL
+ SHELL="$CONFIG_SHELL"
+ export SHELL
+ echo="$CONFIG_SHELL [$]0 --fallback-echo"
+ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+ test "X$echo_testing_string" = 'X\t' &&
+ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ echo="$CONFIG_SHELL [$]0 --fallback-echo"
+ else
+ # maybe with a smaller string...
+ prev=:
+
+ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+ if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+ then
+ break
+ fi
+ prev="$cmd"
+ done
+
+ if test "$prev" != 'sed 50q "[$]0"'; then
+ echo_test_string=`eval $prev`
+ export echo_test_string
+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+ else
+ # Oops. We lost completely, so just stick with echo.
+ echo=echo
+ fi
+ fi
+ fi
+ fi
+fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+ECHO=$echo
+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+ ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+fi
+
+AC_SUBST(ECHO)
+])])# _LT_AC_PROG_ECHO_BACKSLASH
+
+
+# _LT_AC_LOCK
+# -----------
+AC_DEFUN([_LT_AC_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+ [AC_HELP_STRING([--disable-libtool-lock],
+ [avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *ELF-32*)
+ HPUX_IA64_MODE="32"
+ ;;
+ *ELF-64*)
+ HPUX_IA64_MODE="64"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+*-*-irix6*)
+ # Find out which ABI we are using.
+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ LD="${LD-ld} -melf32bsmip"
+ ;;
+ *N32*)
+ LD="${LD-ld} -melf32bmipn32"
+ ;;
+ *64-bit*)
+ LD="${LD-ld} -melf64bmip"
+ ;;
+ esac
+ else
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ LD="${LD-ld} -32"
+ ;;
+ *N32*)
+ LD="${LD-ld} -n32"
+ ;;
+ *64-bit*)
+ LD="${LD-ld} -64"
+ ;;
+ esac
+ fi
+ fi
+ rm -rf conftest*
+ ;;
+
+x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case "`/usr/bin/file conftest.o`" in
+ *32-bit*)
+ case $host in
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ ppc64-*linux*|powerpc64-*linux*)
+ LD="${LD-ld} -m elf32ppclinux"
+ ;;
+ s390x-*linux*)
+ LD="${LD-ld} -m elf_s390"
+ ;;
+ sparc64-*linux*)
+ LD="${LD-ld} -m elf32_sparc"
+ ;;
+ esac
+ ;;
+ *64-bit*)
+ case $host in
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+ ppc*-*linux*|powerpc*-*linux*)
+ LD="${LD-ld} -m elf64ppc"
+ ;;
+ s390*-*linux*)
+ LD="${LD-ld} -m elf64_s390"
+ ;;
+ sparc*-*linux*)
+ LD="${LD-ld} -m elf64_sparc"
+ ;;
+ esac
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+
+*-*-sco3.2v5*)
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -belf"
+ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+ [AC_LANG_PUSH(C)
+ AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+ AC_LANG_POP])
+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+ AC_CHECK_TOOL(AS, as, false)
+ AC_CHECK_TOOL(OBJDUMP, objdump, false)
+ ;;
+ ])
+esac
+
+need_locks="$enable_libtool_lock"
+
+])# _LT_AC_LOCK
+
+
+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+[AC_REQUIRE([LT_AC_PROG_SED])
+AC_CACHE_CHECK([$1], [$2],
+ [$2=no
+ ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$3"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test ! -s conftest.err; then
+ $2=yes
+ fi
+ fi
+ $rm conftest*
+])
+
+if test x"[$]$2" = xyes; then
+ ifelse([$5], , :, [$5])
+else
+ ifelse([$6], , :, [$6])
+fi
+])# AC_LIBTOOL_COMPILER_OPTION
+
+
+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+# [ACTION-SUCCESS], [ACTION-FAILURE])
+# ------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+[AC_CACHE_CHECK([$1], [$2],
+ [$2=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $3"
+ printf "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&AS_MESSAGE_LOG_FD
+ else
+ $2=yes
+ fi
+ fi
+ $rm conftest*
+ LDFLAGS="$save_LDFLAGS"
+])
+
+if test x"[$]$2" = xyes; then
+ ifelse([$4], , :, [$4])
+else
+ ifelse([$5], , :, [$5])
+fi
+])# AC_LIBTOOL_LINKER_OPTION
+
+
+# AC_LIBTOOL_SYS_MAX_CMD_LEN
+# --------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
+[# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+ i=0
+ teststring="ABCD"
+
+ case $build_os in
+ msdosdjgpp*)
+ # On DJGPP, this test can blow up pretty badly due to problems in libc
+ # (any single argument exceeding 2000 bytes causes a buffer overrun
+ # during glob expansion). Even if it were fixed, the result of this
+ # check would be larger than it should be.
+ lt_cv_sys_max_cmd_len=12288; # 12K is about right
+ ;;
+
+ gnu*)
+ # Under GNU Hurd, this test is not required because there is
+ # no limit to the length of command line arguments.
+ # Libtool will interpret -1 as no limit whatsoever
+ lt_cv_sys_max_cmd_len=-1;
+ ;;
+
+ cygwin* | mingw*)
+ # On Win9x/ME, this test blows up -- it succeeds, but takes
+ # about 5 minutes as the teststring grows exponentially.
+ # Worse, since 9x/ME are not pre-emptively multitasking,
+ # you end up with a "frozen" computer, even though with patience
+ # the test eventually succeeds (with a max line length of 256k).
+ # Instead, let's just punt: use the minimum linelength reported by
+ # all of the supported platforms: 8192 (on NT/2K/XP).
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+ amigaos*)
+ # On AmigaOS with pdksh, this test takes hours, literally.
+ # So we just punt and use a minimum line length of 8192.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+ *)
+ # If test is not a shell built-in, we'll probably end up computing a
+ # maximum length that is only half of the actual maximum length, but
+ # we can't tell.
+ while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+ = "XX$teststring") >/dev/null 2>&1 &&
+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
+ lt_cv_sys_max_cmd_len=$new_result &&
+ test $i != 17 # 1/2 MB should be enough
+ do
+ i=`expr $i + 1`
+ teststring=$teststring$teststring
+ done
+ teststring=
+ # Add a significant safety factor because C++ compilers can tack on massive
+ # amounts of additional arguments before passing them to the linker.
+ # It appears as though 1/2 is a usable value.
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ ;;
+ esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+ AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+ AC_MSG_RESULT(none)
+fi
+])# AC_LIBTOOL_SYS_MAX_CMD_LEN
+
+
+# _LT_AC_CHECK_DLFCN
+# --------------------
+AC_DEFUN([_LT_AC_CHECK_DLFCN],
+[AC_CHECK_HEADERS(dlfcn.h)dnl
+])# _LT_AC_CHECK_DLFCN
+
+
+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ------------------------------------------------------------------
+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+ [$4]
+else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+[#line __oline__ "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+# define LT_DLGLOBAL RTLD_GLOBAL
+#else
+# ifdef DL_GLOBAL
+# define LT_DLGLOBAL DL_GLOBAL
+# else
+# define LT_DLGLOBAL 0
+# endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+ find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+# ifdef RTLD_LAZY
+# define LT_DLLAZY_OR_NOW RTLD_LAZY
+# else
+# ifdef DL_LAZY
+# define LT_DLLAZY_OR_NOW DL_LAZY
+# else
+# ifdef RTLD_NOW
+# define LT_DLLAZY_OR_NOW RTLD_NOW
+# else
+# ifdef DL_NOW
+# define LT_DLLAZY_OR_NOW DL_NOW
+# else
+# define LT_DLLAZY_OR_NOW 0
+# endif
+# endif
+# endif
+# endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+ int status = $lt_dlunknown;
+
+ if (self)
+ {
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ /* dlclose (self); */
+ }
+
+ exit (status);
+}]
+EOF
+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+ (./conftest; exit; ) 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) $1 ;;
+ x$lt_dlneed_uscore) $2 ;;
+ x$lt_unknown|x*) $3 ;;
+ esac
+ else :
+ # compilation failed
+ $3
+ fi
+fi
+rm -fr conftest*
+])# _LT_AC_TRY_DLOPEN_SELF
+
+
+# AC_LIBTOOL_DLOPEN_SELF
+# -------------------
+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+ enable_dlopen=unknown
+ enable_dlopen_self=unknown
+ enable_dlopen_self_static=unknown
+else
+ lt_cv_dlopen=no
+ lt_cv_dlopen_libs=
+
+ case $host_os in
+ beos*)
+ lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
+ ;;
+
+ mingw* | pw32*)
+ lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen_libs=
+ ;;
+
+ cygwin*)
+ lt_cv_dlopen="dlopen"
+ lt_cv_dlopen_libs=
+ ;;
+
+ darwin*)
+ # if libdl is installed we need to link against it
+ AC_CHECK_LIB([dl], [dlopen],
+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+ lt_cv_dlopen="dyld"
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
+ ])
+ ;;
+
+ *)
+ AC_CHECK_FUNC([shl_load],
+ [lt_cv_dlopen="shl_load"],
+ [AC_CHECK_LIB([dld], [shl_load],
+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+ [AC_CHECK_FUNC([dlopen],
+ [lt_cv_dlopen="dlopen"],
+ [AC_CHECK_LIB([dl], [dlopen],
+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+ [AC_CHECK_LIB([svld], [dlopen],
+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ [AC_CHECK_LIB([dld], [dld_link],
+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+ ])
+ ])
+ ])
+ ])
+ ])
+ ;;
+ esac
+
+ if test "x$lt_cv_dlopen" != xno; then
+ enable_dlopen=yes
+ else
+ enable_dlopen=no
+ fi
+
+ case $lt_cv_dlopen in
+ dlopen)
+ save_CPPFLAGS="$CPPFLAGS"
+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+ save_LDFLAGS="$LDFLAGS"
+ eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+ save_LIBS="$LIBS"
+ LIBS="$lt_cv_dlopen_libs $LIBS"
+
+ AC_CACHE_CHECK([whether a program can dlopen itself],
+ lt_cv_dlopen_self, [dnl
+ _LT_AC_TRY_DLOPEN_SELF(
+ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+ ])
+
+ if test "x$lt_cv_dlopen_self" = xyes; then
+ LDFLAGS="$LDFLAGS $link_static_flag"
+ AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+ lt_cv_dlopen_self_static, [dnl
+ _LT_AC_TRY_DLOPEN_SELF(
+ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
+ ])
+ fi
+
+ CPPFLAGS="$save_CPPFLAGS"
+ LDFLAGS="$save_LDFLAGS"
+ LIBS="$save_LIBS"
+ ;;
+ esac
+
+ case $lt_cv_dlopen_self in
+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+ *) enable_dlopen_self=unknown ;;
+ esac
+
+ case $lt_cv_dlopen_self_static in
+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+ *) enable_dlopen_self_static=unknown ;;
+ esac
+fi
+])# AC_LIBTOOL_DLOPEN_SELF
+
+
+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
+# ---------------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler
+AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+ $rm -r conftest 2>/dev/null
+ mkdir conftest
+ cd conftest
+ mkdir out
+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&AS_MESSAGE_LOG_FD
+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test ! -s out/conftest.err; then
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ fi
+ fi
+ chmod u+w .
+ $rm conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+ $rm out/* && rmdir out
+ cd ..
+ rmdir conftest
+ $rm conftest*
+])
+])# AC_LIBTOOL_PROG_CC_C_O
+
+
+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
+# -----------------------------------------
+# Check to see if we can do hard links to lock some files if needed
+AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
+[AC_REQUIRE([_LT_AC_LOCK])dnl
+
+hard_links="nottested"
+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+ AC_MSG_CHECKING([if we can lock with hard links])
+ hard_links=yes
+ $rm conftest*
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ touch conftest.a
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ AC_MSG_RESULT([$hard_links])
+ if test "$hard_links" = no; then
+ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+ need_locks=warn
+ fi
+else
+ need_locks=no
+fi
+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
+
+
+# AC_LIBTOOL_OBJDIR
+# -----------------
+AC_DEFUN([AC_LIBTOOL_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+ lt_cv_objdir=.libs
+else
+ # MS-DOS does not allow filenames that begin with a dot.
+ lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+])# AC_LIBTOOL_OBJDIR
+
+
+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
+# ----------------------------------------------
+# Check hardcoding attributes.
+AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_AC_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+ test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
+ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+ test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
+ # Linking always hardcodes the temporary library directory.
+ _LT_AC_TAGVAR(hardcode_action, $1)=relink
+ else
+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
+ _LT_AC_TAGVAR(hardcode_action, $1)=immediate
+ fi
+else
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
+ # Fast installation is not supported
+ enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+fi
+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
+
+
+# AC_LIBTOOL_SYS_LIB_STRIP
+# ------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
+[striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"