added geos, sterea and supporting gauss code from libproj4

git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1230 4e78687f-474d-0410-85f9-8d5e500ac6b2

4 files changed, 390 insertions, 284 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 3edd823b..d15f550a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,7 @@ libproj_la_LDFLAGS = -version-info 4:2:4
 libproj_la_SOURCES = \
 	projects.h pj_list.h \
 	PJ_aeqd.c PJ_gnom.c PJ_laea.c PJ_mod_ster.c \
-	PJ_nsper.c PJ_nzmg.c PJ_ortho.c PJ_stere.c \
+	PJ_nsper.c PJ_nzmg.c PJ_ortho.c PJ_stere.c PJ_sterea.c \
 	PJ_aea.c PJ_bipc.c PJ_bonne.c PJ_eqdc.c \
 	PJ_imw_p.c PJ_krovak.c PJ_lcc.c PJ_mpoly.c PJ_poly.c \
 	PJ_rpoly.c PJ_sconics.c \
@@ -37,7 +37,7 @@ libproj_la_SOURCES = \
 	PJ_chamb.c PJ_hammer.c PJ_lagrng.c PJ_larr.c \
 	PJ_lask.c PJ_nocol.c PJ_ob_tran.c PJ_oea.c \
 	PJ_tpeqd.c PJ_vandg.c PJ_vandg2.c PJ_vandg4.c \
-	PJ_wag7.c PJ_lcca.c \
+	PJ_wag7.c PJ_lcca.c PJ_geos.c \
 	PJ_boggs.c PJ_collg.c PJ_crast.c PJ_denoy.c \
 	PJ_eck1.c PJ_eck2.c PJ_eck3.c PJ_eck4.c \
 	PJ_eck5.c PJ_fahey.c PJ_fouc_s.c PJ_gins8.c \
@@ -54,7 +54,7 @@ libproj_la_SOURCES = \
 	pj_list.c pj_malloc.c pj_mlfn.c pj_msfn.c \
 	pj_open_lib.c pj_param.c pj_phi2.c pj_pr_list.c \
 	pj_qsfn.c pj_strerrno.c pj_tsfn.c pj_units.c \
-	pj_zpoly1.c rtodms.c vector1.c pj_release.c \
+	pj_zpoly1.c rtodms.c vector1.c pj_release.c pj_gauss.c \
 	\
 	nad_cvt.c nad_init.c nad_intr.c emess.c emess.h \
 	pj_apply_gridshift.c pj_datums.c pj_datum_set.c pj_transform.c \
diff --git a/src/Makefile.in b/src/Makefile.in
index 67ce6858..5b7f33e7 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# 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.
@@ -13,205 +13,98 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
+
+
+
+SOURCES = $(libproj_la_SOURCES) $(cs2cs_SOURCES) $(geod_SOURCES) $(nad2bin_SOURCES) $(nad2nad_SOURCES) $(proj_SOURCES)
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-AMTAR = @AMTAR@
-AS = @AS@
-AWK = @AWK@
-CC = @CC@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-ECHO = @ECHO@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-OBJDUMP = @OBJDUMP@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-VERSION = @VERSION@
-am__include = @am__include@
-am__quote = @am__quote@
-install_sh = @install_sh@
-bin_PROGRAMS = proj nad2nad nad2bin geod cs2cs
-
-INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\"
-
-include_HEADERS = projects.h nad_list.h proj_api.h
-
-EXTRA_DIST = makefile.vc proj.def
-
-proj_SOURCES = proj.c gen_cheb.c p_series.c
-cs2cs_SOURCES = cs2cs.c gen_cheb.c p_series.c
-nad2nad_SOURCES = nad2nad.c 
-nad2bin_SOURCES = nad2bin.c
-geod_SOURCES = geod.c geod_set.c geod_for.c geod_inv.c geodesic.h
-
-proj_LDADD = libproj.la
-cs2cs_LDADD = libproj.la
-nad2nad_LDADD = libproj.la
-nad2bin_LDADD = libproj.la
-geod_LDADD = libproj.la
-
-lib_LTLIBRARIES = libproj.la
-
-libproj_la_LDFLAGS = -version-info 4:2:4
-
-libproj_la_SOURCES = \
-	projects.h pj_list.h \
-	PJ_aeqd.c PJ_gnom.c PJ_laea.c PJ_mod_ster.c \
-	PJ_nsper.c PJ_nzmg.c PJ_ortho.c PJ_stere.c \
-	PJ_aea.c PJ_bipc.c PJ_bonne.c PJ_eqdc.c \
-	PJ_imw_p.c PJ_krovak.c PJ_lcc.c PJ_mpoly.c PJ_poly.c \
-	PJ_rpoly.c PJ_sconics.c \
-	PJ_cass.c PJ_cc.c PJ_cea.c PJ_eqc.c \
-	PJ_gall.c PJ_labrd.c PJ_lsat.c PJ_merc.c \
-	PJ_mill.c PJ_ocea.c PJ_omerc.c PJ_somerc.c \
-	PJ_tcc.c PJ_tcea.c PJ_tmerc.c \
-	PJ_airy.c PJ_aitoff.c PJ_august.c PJ_bacon.c \
-	PJ_chamb.c PJ_hammer.c PJ_lagrng.c PJ_larr.c \
-	PJ_lask.c PJ_nocol.c PJ_ob_tran.c PJ_oea.c \
-	PJ_tpeqd.c PJ_vandg.c PJ_vandg2.c PJ_vandg4.c \
-	PJ_wag7.c PJ_lcca.c \
-	PJ_boggs.c PJ_collg.c PJ_crast.c PJ_denoy.c \
-	PJ_eck1.c PJ_eck2.c PJ_eck3.c PJ_eck4.c \
-	PJ_eck5.c PJ_fahey.c PJ_fouc_s.c PJ_gins8.c \
-	PJ_gn_sinu.c PJ_goode.c PJ_hatano.c PJ_loxim.c \
-	PJ_mbt_fps.c PJ_mbtfpp.c PJ_mbtfpq.c PJ_moll.c \
-	PJ_nell.c PJ_nell_h.c PJ_putp2.c PJ_putp3.c \
-	PJ_putp4p.c PJ_putp5.c PJ_putp6.c PJ_robin.c \
-	PJ_sts.c PJ_urm5.c PJ_urmfps.c PJ_wag2.c \
-	PJ_wag3.c PJ_wink1.c PJ_wink2.c pj_latlong.c pj_geocent.c \
-	aasincos.c adjlon.c bch2bps.c bchgen.c \
-	biveval.c dmstor.c mk_cheby.c pj_auth.c \
-	pj_deriv.c pj_ell_set.c pj_ellps.c pj_errno.c \
-	pj_factors.c pj_fwd.c pj_init.c pj_inv.c \
-	pj_list.c pj_malloc.c pj_mlfn.c pj_msfn.c \
-	pj_open_lib.c pj_param.c pj_phi2.c pj_pr_list.c \
-	pj_qsfn.c pj_strerrno.c pj_tsfn.c pj_units.c \
-	pj_zpoly1.c rtodms.c vector1.c pj_release.c \
-	\
-	nad_cvt.c nad_init.c nad_intr.c emess.c emess.h \
-	pj_apply_gridshift.c pj_datums.c pj_datum_set.c pj_transform.c \
-	geocent.c geocent.h pj_utils.c pj_gridinfo.c pj_gridlist.c
-
+bin_PROGRAMS = proj$(EXEEXT) nad2nad$(EXEEXT) nad2bin$(EXEEXT) \
+	geod$(EXEEXT) cs2cs$(EXEEXT)
 subdir = src
+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/proj_config.h.in
+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)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = proj_config.h
 CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
-
 libproj_la_LIBADD =
-am_libproj_la_OBJECTS = PJ_aeqd.lo PJ_gnom.lo PJ_laea.lo PJ_mod_ster.lo \
-	PJ_nsper.lo PJ_nzmg.lo PJ_ortho.lo PJ_stere.lo PJ_aea.lo \
-	PJ_bipc.lo PJ_bonne.lo PJ_eqdc.lo PJ_imw_p.lo PJ_krovak.lo \
-	PJ_lcc.lo PJ_mpoly.lo PJ_poly.lo PJ_rpoly.lo PJ_sconics.lo \
-	PJ_cass.lo PJ_cc.lo PJ_cea.lo PJ_eqc.lo PJ_gall.lo PJ_labrd.lo \
-	PJ_lsat.lo PJ_merc.lo PJ_mill.lo PJ_ocea.lo PJ_omerc.lo \
-	PJ_somerc.lo PJ_tcc.lo PJ_tcea.lo PJ_tmerc.lo PJ_airy.lo \
-	PJ_aitoff.lo PJ_august.lo PJ_bacon.lo PJ_chamb.lo PJ_hammer.lo \
-	PJ_lagrng.lo PJ_larr.lo PJ_lask.lo PJ_nocol.lo PJ_ob_tran.lo \
-	PJ_oea.lo PJ_tpeqd.lo PJ_vandg.lo PJ_vandg2.lo PJ_vandg4.lo \
-	PJ_wag7.lo PJ_lcca.lo PJ_boggs.lo PJ_collg.lo PJ_crast.lo \
-	PJ_denoy.lo PJ_eck1.lo PJ_eck2.lo PJ_eck3.lo PJ_eck4.lo \
-	PJ_eck5.lo PJ_fahey.lo PJ_fouc_s.lo PJ_gins8.lo PJ_gn_sinu.lo \
-	PJ_goode.lo PJ_hatano.lo PJ_loxim.lo PJ_mbt_fps.lo PJ_mbtfpp.lo \
+am_libproj_la_OBJECTS = PJ_aeqd.lo PJ_gnom.lo PJ_laea.lo \
+	PJ_mod_ster.lo PJ_nsper.lo PJ_nzmg.lo PJ_ortho.lo PJ_stere.lo \
+	PJ_sterea.lo PJ_aea.lo PJ_bipc.lo PJ_bonne.lo PJ_eqdc.lo \
+	PJ_imw_p.lo PJ_krovak.lo PJ_lcc.lo PJ_mpoly.lo PJ_poly.lo \
+	PJ_rpoly.lo PJ_sconics.lo PJ_cass.lo PJ_cc.lo PJ_cea.lo \
+	PJ_eqc.lo PJ_gall.lo PJ_labrd.lo PJ_lsat.lo PJ_merc.lo \
+	PJ_mill.lo PJ_ocea.lo PJ_omerc.lo PJ_somerc.lo PJ_tcc.lo \
+	PJ_tcea.lo PJ_tmerc.lo PJ_airy.lo PJ_aitoff.lo PJ_august.lo \
+	PJ_bacon.lo PJ_chamb.lo PJ_hammer.lo PJ_lagrng.lo PJ_larr.lo \
+	PJ_lask.lo PJ_nocol.lo PJ_ob_tran.lo PJ_oea.lo PJ_tpeqd.lo \
+	PJ_vandg.lo PJ_vandg2.lo PJ_vandg4.lo PJ_wag7.lo PJ_lcca.lo \
+	PJ_geos.lo PJ_boggs.lo PJ_collg.lo PJ_crast.lo PJ_denoy.lo \
+	PJ_eck1.lo PJ_eck2.lo PJ_eck3.lo PJ_eck4.lo PJ_eck5.lo \
+	PJ_fahey.lo PJ_fouc_s.lo PJ_gins8.lo PJ_gn_sinu.lo PJ_goode.lo \
+	PJ_hatano.lo PJ_loxim.lo PJ_mbt_fps.lo PJ_mbtfpp.lo \
 	PJ_mbtfpq.lo PJ_moll.lo PJ_nell.lo PJ_nell_h.lo PJ_putp2.lo \
 	PJ_putp3.lo PJ_putp4p.lo PJ_putp5.lo PJ_putp6.lo PJ_robin.lo \
 	PJ_sts.lo PJ_urm5.lo PJ_urmfps.lo PJ_wag2.lo PJ_wag3.lo \
-	PJ_wink1.lo PJ_wink2.lo pj_latlong.lo pj_geocent.lo aasincos.lo \
-	adjlon.lo bch2bps.lo bchgen.lo biveval.lo dmstor.lo mk_cheby.lo \
-	pj_auth.lo pj_deriv.lo pj_ell_set.lo pj_ellps.lo pj_errno.lo \
-	pj_factors.lo pj_fwd.lo pj_init.lo pj_inv.lo pj_list.lo \
-	pj_malloc.lo pj_mlfn.lo pj_msfn.lo pj_open_lib.lo pj_param.lo \
-	pj_phi2.lo pj_pr_list.lo pj_qsfn.lo pj_strerrno.lo pj_tsfn.lo \
-	pj_units.lo pj_zpoly1.lo rtodms.lo vector1.lo pj_release.lo \
-	nad_cvt.lo nad_init.lo nad_intr.lo emess.lo \
-	pj_apply_gridshift.lo pj_datums.lo pj_datum_set.lo \
-	pj_transform.lo geocent.lo pj_utils.lo pj_gridinfo.lo \
-	pj_gridlist.lo
+	PJ_wink1.lo PJ_wink2.lo pj_latlong.lo pj_geocent.lo \
+	aasincos.lo adjlon.lo bch2bps.lo bchgen.lo biveval.lo \
+	dmstor.lo mk_cheby.lo pj_auth.lo pj_deriv.lo pj_ell_set.lo \
+	pj_ellps.lo pj_errno.lo pj_factors.lo pj_fwd.lo pj_init.lo \
+	pj_inv.lo pj_list.lo pj_malloc.lo pj_mlfn.lo pj_msfn.lo \
+	pj_open_lib.lo pj_param.lo pj_phi2.lo pj_pr_list.lo pj_qsfn.lo \
+	pj_strerrno.lo pj_tsfn.lo pj_units.lo pj_zpoly1.lo rtodms.lo \
+	vector1.lo pj_release.lo pj_gauss.lo nad_cvt.lo nad_init.lo \
+	nad_intr.lo emess.lo pj_apply_gridshift.lo pj_datums.lo \
+	pj_datum_set.lo pj_transform.lo geocent.lo pj_utils.lo \
+	pj_gridinfo.lo pj_gridlist.lo
 libproj_la_OBJECTS = $(am_libproj_la_OBJECTS)
-bin_PROGRAMS = proj$(EXEEXT) nad2nad$(EXEEXT) nad2bin$(EXEEXT) \
-	geod$(EXEEXT) cs2cs$(EXEEXT)
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-
-am_cs2cs_OBJECTS = cs2cs.$(OBJEXT) gen_cheb.$(OBJEXT) p_series.$(OBJEXT)
+am_cs2cs_OBJECTS = cs2cs.$(OBJEXT) gen_cheb.$(OBJEXT) \
+	p_series.$(OBJEXT)
 cs2cs_OBJECTS = $(am_cs2cs_OBJECTS)
 cs2cs_DEPENDENCIES = libproj.la
-cs2cs_LDFLAGS =
 am_geod_OBJECTS = geod.$(OBJEXT) geod_set.$(OBJEXT) geod_for.$(OBJEXT) \
 	geod_inv.$(OBJEXT)
 geod_OBJECTS = $(am_geod_OBJECTS)
 geod_DEPENDENCIES = libproj.la
-geod_LDFLAGS =
 am_nad2bin_OBJECTS = nad2bin.$(OBJEXT)
 nad2bin_OBJECTS = $(am_nad2bin_OBJECTS)
 nad2bin_DEPENDENCIES = libproj.la
-nad2bin_LDFLAGS =
 am_nad2nad_OBJECTS = nad2nad.$(OBJEXT)
 nad2nad_OBJECTS = $(am_nad2nad_OBJECTS)
 nad2nad_DEPENDENCIES = libproj.la
-nad2nad_LDFLAGS =
 am_proj_OBJECTS = proj.$(OBJEXT) gen_cheb.$(OBJEXT) p_series.$(OBJEXT)
 proj_OBJECTS = $(am_proj_OBJECTS)
 proj_DEPENDENCIES = libproj.la
-proj_LDFLAGS =
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/PJ_aea.Plo ./$(DEPDIR)/PJ_aeqd.Plo \
@@ -227,59 +120,66 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@	./$(DEPDIR)/PJ_eck5.Plo ./$(DEPDIR)/PJ_eqc.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/PJ_eqdc.Plo ./$(DEPDIR)/PJ_fahey.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/PJ_fouc_s.Plo ./$(DEPDIR)/PJ_gall.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_gins8.Plo ./$(DEPDIR)/PJ_gn_sinu.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_gnom.Plo ./$(DEPDIR)/PJ_goode.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_hammer.Plo ./$(DEPDIR)/PJ_hatano.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_imw_p.Plo ./$(DEPDIR)/PJ_krovak.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_labrd.Plo ./$(DEPDIR)/PJ_laea.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_lagrng.Plo ./$(DEPDIR)/PJ_larr.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_lask.Plo ./$(DEPDIR)/PJ_lcc.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_lcca.Plo ./$(DEPDIR)/PJ_loxim.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_lsat.Plo ./$(DEPDIR)/PJ_mbt_fps.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_mbtfpp.Plo ./$(DEPDIR)/PJ_mbtfpq.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_merc.Plo ./$(DEPDIR)/PJ_mill.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_mod_ster.Plo ./$(DEPDIR)/PJ_moll.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_mpoly.Plo ./$(DEPDIR)/PJ_nell.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_nell_h.Plo ./$(DEPDIR)/PJ_nocol.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_nsper.Plo ./$(DEPDIR)/PJ_nzmg.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_ob_tran.Plo ./$(DEPDIR)/PJ_ocea.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_oea.Plo ./$(DEPDIR)/PJ_omerc.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_ortho.Plo ./$(DEPDIR)/PJ_poly.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_putp2.Plo ./$(DEPDIR)/PJ_putp3.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_putp4p.Plo ./$(DEPDIR)/PJ_putp5.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_putp6.Plo ./$(DEPDIR)/PJ_robin.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_rpoly.Plo ./$(DEPDIR)/PJ_sconics.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_geos.Plo ./$(DEPDIR)/PJ_gins8.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_gn_sinu.Plo ./$(DEPDIR)/PJ_gnom.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_goode.Plo ./$(DEPDIR)/PJ_hammer.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_hatano.Plo ./$(DEPDIR)/PJ_imw_p.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_krovak.Plo ./$(DEPDIR)/PJ_labrd.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_laea.Plo ./$(DEPDIR)/PJ_lagrng.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_larr.Plo ./$(DEPDIR)/PJ_lask.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_lcc.Plo ./$(DEPDIR)/PJ_lcca.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_loxim.Plo ./$(DEPDIR)/PJ_lsat.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_mbt_fps.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_mbtfpp.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_mbtfpq.Plo ./$(DEPDIR)/PJ_merc.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_mill.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_mod_ster.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_moll.Plo ./$(DEPDIR)/PJ_mpoly.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_nell.Plo ./$(DEPDIR)/PJ_nell_h.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_nocol.Plo ./$(DEPDIR)/PJ_nsper.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_nzmg.Plo ./$(DEPDIR)/PJ_ob_tran.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_ocea.Plo ./$(DEPDIR)/PJ_oea.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_omerc.Plo ./$(DEPDIR)/PJ_ortho.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_poly.Plo ./$(DEPDIR)/PJ_putp2.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_putp3.Plo ./$(DEPDIR)/PJ_putp4p.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_putp5.Plo ./$(DEPDIR)/PJ_putp6.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_robin.Plo ./$(DEPDIR)/PJ_rpoly.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_sconics.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/PJ_somerc.Plo ./$(DEPDIR)/PJ_stere.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_sts.Plo ./$(DEPDIR)/PJ_tcc.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_tcea.Plo ./$(DEPDIR)/PJ_tmerc.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_tpeqd.Plo ./$(DEPDIR)/PJ_urm5.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_urmfps.Plo ./$(DEPDIR)/PJ_vandg.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_vandg2.Plo ./$(DEPDIR)/PJ_vandg4.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_wag2.Plo ./$(DEPDIR)/PJ_wag3.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_wag7.Plo ./$(DEPDIR)/PJ_wink1.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/PJ_wink2.Plo ./$(DEPDIR)/aasincos.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/adjlon.Plo ./$(DEPDIR)/bch2bps.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/bchgen.Plo ./$(DEPDIR)/biveval.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/cs2cs.Po ./$(DEPDIR)/dmstor.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/emess.Plo ./$(DEPDIR)/gen_cheb.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/geocent.Plo ./$(DEPDIR)/geod.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/geod_for.Po ./$(DEPDIR)/geod_inv.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/geod_set.Po ./$(DEPDIR)/mk_cheby.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/nad2bin.Po ./$(DEPDIR)/nad2nad.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/nad_cvt.Plo ./$(DEPDIR)/nad_init.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/nad_intr.Plo ./$(DEPDIR)/p_series.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_sterea.Plo ./$(DEPDIR)/PJ_sts.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_tcc.Plo ./$(DEPDIR)/PJ_tcea.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_tmerc.Plo ./$(DEPDIR)/PJ_tpeqd.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_urm5.Plo ./$(DEPDIR)/PJ_urmfps.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_vandg.Plo ./$(DEPDIR)/PJ_vandg2.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_vandg4.Plo ./$(DEPDIR)/PJ_wag2.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_wag3.Plo ./$(DEPDIR)/PJ_wag7.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/PJ_wink1.Plo ./$(DEPDIR)/PJ_wink2.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/aasincos.Plo ./$(DEPDIR)/adjlon.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/bch2bps.Plo ./$(DEPDIR)/bchgen.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/biveval.Plo ./$(DEPDIR)/cs2cs.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/dmstor.Plo ./$(DEPDIR)/emess.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/gen_cheb.Po ./$(DEPDIR)/geocent.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/geod.Po ./$(DEPDIR)/geod_for.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/geod_inv.Po ./$(DEPDIR)/geod_set.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/mk_cheby.Plo ./$(DEPDIR)/nad2bin.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/nad2nad.Po ./$(DEPDIR)/nad_cvt.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/nad_init.Plo ./$(DEPDIR)/nad_intr.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/p_series.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/pj_apply_gridshift.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/pj_auth.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/pj_datum_set.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/pj_datums.Plo ./$(DEPDIR)/pj_deriv.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/pj_ell_set.Plo ./$(DEPDIR)/pj_ellps.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/pj_errno.Plo ./$(DEPDIR)/pj_factors.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/pj_fwd.Plo ./$(DEPDIR)/pj_geocent.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/pj_ell_set.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/pj_ellps.Plo ./$(DEPDIR)/pj_errno.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/pj_factors.Plo ./$(DEPDIR)/pj_fwd.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/pj_gauss.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/pj_geocent.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/pj_gridinfo.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/pj_gridlist.Plo ./$(DEPDIR)/pj_init.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/pj_inv.Plo ./$(DEPDIR)/pj_latlong.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/pj_list.Plo ./$(DEPDIR)/pj_malloc.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/pj_mlfn.Plo ./$(DEPDIR)/pj_msfn.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/pj_gridlist.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/pj_init.Plo ./$(DEPDIR)/pj_inv.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/pj_latlong.Plo ./$(DEPDIR)/pj_list.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/pj_malloc.Plo ./$(DEPDIR)/pj_mlfn.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/pj_msfn.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/pj_open_lib.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/pj_param.Plo ./$(DEPDIR)/pj_phi2.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/pj_pr_list.Plo ./$(DEPDIR)/pj_qsfn.Plo \
@@ -292,30 +192,202 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@	./$(DEPDIR)/vector1.Plo
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
+SOURCES = $(libproj_la_SOURCES) $(cs2cs_SOURCES) $(geod_SOURCES) \
+	$(nad2bin_SOURCES) $(nad2nad_SOURCES) $(proj_SOURCES)
 DIST_SOURCES = $(libproj_la_SOURCES) $(cs2cs_SOURCES) $(geod_SOURCES) \
 	$(nad2bin_SOURCES) $(nad2nad_SOURCES) $(proj_SOURCES)
+includeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(include_HEADERS)
-
-DIST_COMMON = $(include_HEADERS) Makefile.am Makefile.in \
-	proj_config.h.in
-SOURCES = $(libproj_la_SOURCES) $(cs2cs_SOURCES) $(geod_SOURCES) $(nad2bin_SOURCES) $(nad2nad_SOURCES) $(proj_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+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@
+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@
+INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\"
+include_HEADERS = projects.h nad_list.h proj_api.h
+EXTRA_DIST = makefile.vc proj.def
+proj_SOURCES = proj.c gen_cheb.c p_series.c
+cs2cs_SOURCES = cs2cs.c gen_cheb.c p_series.c
+nad2nad_SOURCES = nad2nad.c 
+nad2bin_SOURCES = nad2bin.c
+geod_SOURCES = geod.c geod_set.c geod_for.c geod_inv.c geodesic.h
+proj_LDADD = libproj.la
+cs2cs_LDADD = libproj.la
+nad2nad_LDADD = libproj.la
+nad2bin_LDADD = libproj.la
+geod_LDADD = libproj.la
+lib_LTLIBRARIES = libproj.la
+libproj_la_LDFLAGS = -version-info 4:2:4
+libproj_la_SOURCES = \
+	projects.h pj_list.h \
+	PJ_aeqd.c PJ_gnom.c PJ_laea.c PJ_mod_ster.c \
+	PJ_nsper.c PJ_nzmg.c PJ_ortho.c PJ_stere.c PJ_sterea.c \
+	PJ_aea.c PJ_bipc.c PJ_bonne.c PJ_eqdc.c \
+	PJ_imw_p.c PJ_krovak.c PJ_lcc.c PJ_mpoly.c PJ_poly.c \
+	PJ_rpoly.c PJ_sconics.c \
+	PJ_cass.c PJ_cc.c PJ_cea.c PJ_eqc.c \
+	PJ_gall.c PJ_labrd.c PJ_lsat.c PJ_merc.c \
+	PJ_mill.c PJ_ocea.c PJ_omerc.c PJ_somerc.c \
+	PJ_tcc.c PJ_tcea.c PJ_tmerc.c \
+	PJ_airy.c PJ_aitoff.c PJ_august.c PJ_bacon.c \
+	PJ_chamb.c PJ_hammer.c PJ_lagrng.c PJ_larr.c \
+	PJ_lask.c PJ_nocol.c PJ_ob_tran.c PJ_oea.c \
+	PJ_tpeqd.c PJ_vandg.c PJ_vandg2.c PJ_vandg4.c \
+	PJ_wag7.c PJ_lcca.c PJ_geos.c \
+	PJ_boggs.c PJ_collg.c PJ_crast.c PJ_denoy.c \
+	PJ_eck1.c PJ_eck2.c PJ_eck3.c PJ_eck4.c \
+	PJ_eck5.c PJ_fahey.c PJ_fouc_s.c PJ_gins8.c \
+	PJ_gn_sinu.c PJ_goode.c PJ_hatano.c PJ_loxim.c \
+	PJ_mbt_fps.c PJ_mbtfpp.c PJ_mbtfpq.c PJ_moll.c \
+	PJ_nell.c PJ_nell_h.c PJ_putp2.c PJ_putp3.c \
+	PJ_putp4p.c PJ_putp5.c PJ_putp6.c PJ_robin.c \
+	PJ_sts.c PJ_urm5.c PJ_urmfps.c PJ_wag2.c \
+	PJ_wag3.c PJ_wink1.c PJ_wink2.c pj_latlong.c pj_geocent.c \
+	aasincos.c adjlon.c bch2bps.c bchgen.c \
+	biveval.c dmstor.c mk_cheby.c pj_auth.c \
+	pj_deriv.c pj_ell_set.c pj_ellps.c pj_errno.c \
+	pj_factors.c pj_fwd.c pj_init.c pj_inv.c \
+	pj_list.c pj_malloc.c pj_mlfn.c pj_msfn.c \
+	pj_open_lib.c pj_param.c pj_phi2.c pj_pr_list.c \
+	pj_qsfn.c pj_strerrno.c pj_tsfn.c pj_units.c \
+	pj_zpoly1.c rtodms.c vector1.c pj_release.c pj_gauss.c \
+	\
+	nad_cvt.c nad_init.c nad_intr.c emess.c emess.h \
+	pj_apply_gridshift.c pj_datums.c pj_datum_set.c pj_transform.c \
+	geocent.c geocent.h pj_utils.c pj_gridinfo.c pj_gridlist.c
 
 all: proj_config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  src/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 proj_config.h: stamp-h1
 	@if test ! -f $@; then \
@@ -326,22 +398,21 @@ proj_config.h: stamp-h1
 stamp-h1: $(srcdir)/proj_config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status src/proj_config.h
-
-$(srcdir)/proj_config.h.in:  $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/proj_config.h.in:  $(am__configure_deps) 
 	cd $(top_srcdir) && $(AUTOHEADER)
-	touch $(srcdir)/proj_config.h.in
+	rm -f stamp-h1
+	touch $@
 
 distclean-hdr:
 	-rm -f proj_config.h stamp-h1
-libLTLIBRARIES_INSTALL = $(INSTALL)
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -349,32 +420,31 @@ uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test -z "$dir" && dir=.; \
+	  test "$$dir" = "$$p" && dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libproj.la: $(libproj_la_OBJECTS) $(libproj_la_DEPENDENCIES) 
 	$(LINK) -rpath $(libdir) $(libproj_la_LDFLAGS) $(libproj_la_OBJECTS) $(libproj_la_LIBADD) $(LIBS)
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -382,8 +452,8 @@ uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
-	  rm -f $(DESTDIR)$(bindir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 	done
 
 clean-binPROGRAMS:
@@ -409,7 +479,7 @@ proj$(EXEEXT): $(proj_OBJECTS) $(proj_DEPENDENCIES)
 	$(LINK) $(proj_LDFLAGS) $(proj_OBJECTS) $(proj_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -440,6 +510,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_fahey.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_fouc_s.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_gall.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_geos.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_gins8.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_gn_sinu.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_gnom.Plo@am__quote@
@@ -486,6 +557,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_sconics.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_somerc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_stere.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_sterea.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_sts.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_tcc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_tcea.Plo@am__quote@
@@ -532,6 +604,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pj_errno.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pj_factors.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pj_fwd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pj_gauss.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pj_geocent.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pj_gridinfo.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pj_gridlist.Plo@am__quote@
@@ -558,27 +631,29 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtodms.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector1.Plo@am__quote@
 
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
 .c.o:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c `cygpath -w $<`
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-CCDEPMODE = @CCDEPMODE@
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -589,30 +664,24 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
-	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
 uninstall-includeHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
-	  rm -f $(DESTDIR)$(includedir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -621,6 +690,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES) proj_config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -635,6 +705,20 @@ TAGS:  $(HEADERS) $(SOURCES) proj_config.h.in $(TAGS_DEPENDENCIES) \
 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	     $$tags $$unique
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES) proj_config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) proj_config.h.in $(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` \
@@ -642,19 +726,21 @@ GTAGS:
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@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"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -674,10 +760,10 @@ check: check-am
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) proj_config.h
 install-binPROGRAMS: install-libLTLIBRARIES
 
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
-
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -689,7 +775,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -697,7 +783,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -708,15 +794,17 @@ clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
 	clean-libtool mostlyclean-am
 
 distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-hdr distclean-libtool \
-	distclean-tags
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-hdr distclean-libtool distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -733,7 +821,8 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
@@ -741,23 +830,31 @@ mostlyclean: mostlyclean-am
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
 	uninstall-info-am uninstall-libLTLIBRARIES
 
-.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libLTLIBRARIES clean-libtool distclean \
-	distclean-compile distclean-depend distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags distdir dvi \
-	dvi-am info info-am install install-am install-binPROGRAMS \
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libLTLIBRARIES clean-libtool ctags \
+	distclean distclean-compile distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
 	install-data install-data-am install-exec install-exec-am \
 	install-exec-local install-includeHEADERS install-info \
 	install-info-am install-libLTLIBRARIES install-man \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-includeHEADERS uninstall-info-am \
-	uninstall-libLTLIBRARIES
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-includeHEADERS \
+	uninstall-info-am uninstall-libLTLIBRARIES
 
 
 install-exec-local:
diff --git a/src/pj_list.h b/src/pj_list.h
index 6f026886..3f12ffd6 100644
--- a/src/pj_list.h
+++ b/src/pj_list.h
@@ -37,6 +37,7 @@ PROJ_HEAD(fouc, "Foucaut")
 PROJ_HEAD(fouc_s, "Foucaut Sinusoidal")
 PROJ_HEAD(gall, "Gall (Gall Stereographic)")
 PROJ_HEAD(geocent, "Geocentric")
+PROJ_HEAD(geos, "Geostationary Satellite View")
 PROJ_HEAD(gins8, "Ginsburg VIII (TsNIIGAiK)")
 PROJ_HEAD(gn_sinu, "General Sinusoidal Series")
 PROJ_HEAD(gnom, "Gnomonic")
@@ -103,6 +104,7 @@ PROJ_HEAD(rpoly, "Rectangular Polyconic")
 PROJ_HEAD(sinu, "Sinusoidal (Sanson-Flamsteed)")
 PROJ_HEAD(somerc, "Swiss. Obl. Mercator")
 PROJ_HEAD(stere, "Stereographic")
+PROJ_HEAD(sterea, "Oblique Stereographic Alternative")
 PROJ_HEAD(tcc, "Transverse Central Cylindrical")
 PROJ_HEAD(tcea, "Transverse Cylindrical Equal Area")
 PROJ_HEAD(tissot, "Tissot Conic")
diff --git a/src/projects.h b/src/projects.h
index c3a640de..bf5aba23 100644
--- a/src/projects.h
+++ b/src/projects.h
@@ -28,6 +28,9 @@
  ******************************************************************************
  *
  * $Log$
+ * Revision 1.20  2004/10/20 17:04:29  fwarmerdam
+ * added geos, sterea and supporting gauss code from libproj4
+ *
  * Revision 1.19  2004/08/31 22:57:11  warmerda
  * Don't re-declare hypot() on win32 as it will conflict with math.h as per
  * http://bugzilla.remotesensing.org/show_bug.cgi?id=495
@@ -417,6 +420,10 @@ PJ_GRIDINFO *pj_gridinfo_init( const char * );
 int pj_gridinfo_load( PJ_GRIDINFO * );
 void pj_gridinfo_free( PJ_GRIDINFO * );
 
+void *pj_gauss_ini(double, double, double *,double *);
+LP pj_gauss(LP, const void *);
+LP pj_inv_gauss(LP, const void *);
+
 extern char const pj_release[];
 
 #ifndef DISABLE_CVSID