[geographiclib] 02/10: Imported Upstream version 1.46
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Feb 19 12:32:37 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository geographiclib.
commit a124bb2b836f5e772f56e3a7cecaf0fd5f8c3d75
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Feb 19 11:49:22 2016 +0100
Imported Upstream version 1.46
---
AUTHORS | 2 +
CMakeLists.txt | 48 +-
LICENSE.txt | 5 +-
Makefile.am | 8 +-
Makefile.in | 55 +-
NEWS | 99 +-
aclocal.m4 | 67 +-
cmake/CMakeLists.txt | 2 +-
cmake/Makefile.in | 23 +-
cmake/project-config.cmake.in | 2 +-
compile | 2 +-
config.guess | 15 +-
config.sub | 19 +-
configure | 3183 ++++++-----
configure.ac | 12 +-
depcomp | 2 +-
doc/CMakeLists.txt | 110 +-
doc/GeographicLib.dox.in | 784 ++-
doc/Makefile.in | 23 +-
doc/NETGeographicLib.dox | 12 +-
doc/geodesic-c.dox | 113 +-
doc/geodesic-for.dox | 105 +-
doc/geodseries30.html | 5 +-
doc/tmseries30.html | 5 +-
dotnet/NETGeographicLib/CMakeLists.txt | 2 +-
dotnet/NETGeographicLib/Geodesic.cpp | 33 +
dotnet/NETGeographicLib/Geodesic.h | 99 +-
dotnet/NETGeographicLib/GeodesicExact.cpp | 33 +
dotnet/NETGeographicLib/GeodesicExact.h | 96 +-
dotnet/NETGeographicLib/GeodesicLine.cpp | 55 +
dotnet/NETGeographicLib/GeodesicLine.h | 101 +-
dotnet/NETGeographicLib/GeodesicLineExact.cpp | 56 +
dotnet/NETGeographicLib/GeodesicLineExact.h | 102 +-
dotnet/NETGeographicLib/Geoid.cpp | 19 -
dotnet/NETGeographicLib/Geoid.h | 31 -
dotnet/NETGeographicLib/Gnomonic.h | 2 +-
dotnet/NETGeographicLib/NETGeographicLib.h | 2 +-
dotnet/NETGeographicLib/PolygonArea.h | 2 +-
dotnet/NETGeographicLib/Rhumb.h | 8 +-
dotnet/Projections/GeodesicPanel.cs | 6 +
dotnet/Projections/GeoidPanel.cs | 4 -
examples/Makefile.in | 23 +-
examples/example-GeodesicLine.cpp | 13 +-
examples/example-GeodesicLineExact.cpp | 13 +-
include/GeographicLib/AlbersEqualArea.hpp | 8 -
include/GeographicLib/AzimuthalEquidistant.hpp | 8 -
include/GeographicLib/CassiniSoldner.hpp | 8 -
include/GeographicLib/CircularEngine.hpp | 34 +-
include/GeographicLib/Config-ac.h.in | 3 +-
include/GeographicLib/Config.h | 4 +-
include/GeographicLib/Constants.hpp | 13 -
include/GeographicLib/DMS.hpp | 25 -
include/GeographicLib/EllipticFunction.hpp | 16 -
include/GeographicLib/GeoCoords.hpp | 8 -
include/GeographicLib/Geocentric.hpp | 9 -
include/GeographicLib/Geodesic.hpp | 125 +-
include/GeographicLib/GeodesicExact.hpp | 120 +-
include/GeographicLib/GeodesicLine.hpp | 148 +-
include/GeographicLib/GeodesicLineExact.hpp | 131 +-
include/GeographicLib/Geoid.hpp | 43 +-
include/GeographicLib/Gnomonic.hpp | 10 +-
include/GeographicLib/GravityCircle.hpp | 22 +-
include/GeographicLib/LambertConformalConic.hpp | 8 -
include/GeographicLib/LocalCartesian.hpp | 8 -
include/GeographicLib/MGRS.hpp | 8 -
include/GeographicLib/Math.hpp | 147 +-
include/GeographicLib/OSGB.hpp | 8 -
include/GeographicLib/PolarStereographic.hpp | 8 -
include/GeographicLib/PolygonArea.hpp | 20 +-
include/GeographicLib/Rhumb.hpp | 12 +-
include/GeographicLib/SphericalEngine.hpp | 5 -
include/GeographicLib/SphericalHarmonic.hpp | 5 -
include/GeographicLib/SphericalHarmonic1.hpp | 5 -
include/GeographicLib/SphericalHarmonic2.hpp | 5 -
include/GeographicLib/TransverseMercator.hpp | 8 -
include/GeographicLib/TransverseMercatorExact.hpp | 8 -
include/GeographicLib/UTMUPS.hpp | 8 -
include/GeographicLib/Utility.hpp | 2 +-
include/Makefile.in | 25 +-
install-sh | 366 +-
java/README.txt | 2 +-
java/direct/pom.xml | 4 +-
java/inverse/pom.xml | 4 +-
java/planimeter/pom.xml | 4 +-
java/pom.xml | 9 +-
.../main/java/net/sf/geographiclib/GeoMath.java | 65 +-
.../main/java/net/sf/geographiclib/Geodesic.java | 465 +-
.../java/net/sf/geographiclib/GeodesicLine.java | 260 +-
.../java/net/sf/geographiclib/GeodesicMask.java | 4 -
.../main/java/net/sf/geographiclib/Gnomonic.java | 11 +-
.../java/net/sf/geographiclib/GnomonicData.java | 8 +-
.../java/net/sf/geographiclib/PolygonArea.java | 6 +-
.../java/net/sf/geographiclib/package-info.java | 145 +-
.../java/net/sf/geographiclib/GeodesicTest.java | 103 +
js/CMakeLists.txt | 28 +-
js/GeographicLib.md | 74 +-
js/HEADER.js | 6 +-
js/Makefile.in | 23 +-
js/README.md | 7 +-
js/doc/1-geodesics.md | 16 +-
js/doc/2-interface.md | 20 +-
js/doc/3-examples.md | 26 +-
js/package.json | 6 +-
js/samples/geod-calc.html | 19 +-
js/samples/geod-google-instructions.html | 11 +-
js/samples/geod-google.html | 8 +-
js/src/DMS.js | 11 +-
js/src/Geodesic.js | 288 +-
js/src/GeodesicLine.js | 110 +-
js/src/Math.js | 37 +-
js/src/PolygonArea.js | 19 +-
js/test/geodesictest.js | 111 +-
legacy/C/00README.txt | 2 +-
legacy/C/CMakeLists.txt | 8 +-
legacy/C/geodesic.c | 249 +-
legacy/C/geodesic.h | 433 +-
legacy/C/geodtest.c | 137 +-
legacy/Fortran/00README.txt | 2 +-
legacy/Fortran/CMakeLists.txt | 4 +-
legacy/Fortran/geodesic.for | 147 +-
legacy/Fortran/geodtest.for | 93 +-
ltmain.sh | 5528 +++++++++++++-------
m4/libtool.m4 | 2550 +++++----
m4/ltoptions.m4 | 127 +-
m4/ltsugar.m4 | 7 +-
m4/ltversion.m4 | 12 +-
m4/lt~obsolete.m4 | 7 +-
man/CMakeLists.txt | 2 +-
man/CartConvert.1 | 45 +-
man/CartConvert.1.html | 26 +-
man/CartConvert.pod | 25 +-
man/CartConvert.usage | 35 +-
man/ConicProj.1 | 55 +-
man/ConicProj.1.html | 30 +-
man/ConicProj.pod | 29 +-
man/ConicProj.usage | 43 +-
man/GeoConvert.1 | 51 +-
man/GeoConvert.1.html | 30 +-
man/GeoConvert.pod | 34 +-
man/GeoConvert.usage | 58 +-
man/GeodSolve.1 | 125 +-
man/GeodSolve.1.html | 80 +-
man/GeodSolve.pod | 112 +-
man/GeodSolve.usage | 131 +-
man/GeodesicProj.1 | 53 +-
man/GeodesicProj.1.html | 30 +-
man/GeodesicProj.pod | 29 +-
man/GeodesicProj.usage | 43 +-
man/GeoidEval.1 | 45 +-
man/GeoidEval.1.html | 26 +-
man/GeoidEval.pod | 23 +-
man/GeoidEval.usage | 36 +-
man/Gravity.1 | 47 +-
man/Gravity.1.html | 26 +-
man/Gravity.pod | 25 +-
man/Gravity.usage | 37 +-
man/MagneticField.1 | 59 +-
man/MagneticField.1.html | 32 +-
man/MagneticField.pod | 31 +-
man/MagneticField.usage | 44 +-
man/Makefile.in | 23 +-
man/Planimeter.1 | 41 +-
man/Planimeter.1.html | 24 +-
man/Planimeter.pod | 23 +-
man/Planimeter.usage | 32 +-
man/RhumbSolve.1 | 63 +-
man/RhumbSolve.1.html | 34 +-
man/RhumbSolve.pod | 47 +-
man/RhumbSolve.usage | 50 +-
man/TransverseMercatorProj.1 | 46 +-
man/TransverseMercatorProj.1.html | 24 +-
man/TransverseMercatorProj.pod | 24 +-
man/TransverseMercatorProj.usage | 32 +-
man/dummy.1.in | 4 +-
man/dummy.usage.in | 2 +-
man/makeusage.sh | 2 +-
man/script.8.in | 6 +-
matlab/CMakeLists.txt | 3 +-
matlab/Makefile.am | 178 +-
matlab/Makefile.in | 201 +-
matlab/Makefile.mk | 3 +-
matlab/geographiclib-legacy/Contents.m | 3 -
matlab/geographiclib-legacy/geocentricforward.cpp | 92 -
matlab/geographiclib-legacy/geocentricreverse.cpp | 86 -
matlab/geographiclib-legacy/geodesicdirect.cpp | 117 -
matlab/geographiclib-legacy/geodesicline.cpp | 124 -
.../geographiclib-legacy/geographiclibinterface.m | 83 -
matlab/geographiclib-legacy/geoidheight.cpp | 108 -
matlab/geographiclib-legacy/geoidheight.m | 6 +-
.../geographiclib-legacy/localcartesianforward.cpp | 107 -
.../geographiclib-legacy/localcartesianreverse.cpp | 101 -
matlab/geographiclib-legacy/mgrsforward.cpp | 82 -
matlab/geographiclib-legacy/mgrsreverse.cpp | 76 -
matlab/geographiclib-legacy/polygonarea.cpp | 88 -
matlab/geographiclib-legacy/utmupsforward.cpp | 94 -
matlab/geographiclib-legacy/utmupsreverse.cpp | 77 -
matlab/geographiclib/Contents.m | 6 +-
matlab/geographiclib/ecc2flat.m | 2 +-
matlab/geographiclib/eqdazim_fwd.m | 2 +-
matlab/geographiclib/eqdazim_inv.m | 2 +-
matlab/geographiclib/gedistance.m | 2 +-
matlab/geographiclib/gedoc.m | 6 +-
matlab/geographiclib/geocent_fwd.m | 2 +-
matlab/geographiclib/geocent_inv.m | 2 +-
matlab/geographiclib/geodarea.m | 4 +-
matlab/geographiclib/geoddistance.m | 73 +-
matlab/geographiclib/geoddoc.m | 4 +-
matlab/geographiclib/geodreckon.m | 10 +-
matlab/geographiclib/geographiclib_test.m | 32 +
matlab/geographiclib/geoid_height.m | 2 +-
matlab/geographiclib/geoid_load.m | 2 +-
matlab/geographiclib/gereckon.m | 2 +-
matlab/geographiclib/gnomonic_fwd.m | 2 +-
matlab/geographiclib/gnomonic_inv.m | 2 +-
matlab/geographiclib/polarst_fwd.m | 2 +-
matlab/geographiclib/polarst_inv.m | 2 +-
matlab/geographiclib/private/AngDiff.m | 9 +-
matlab/geographiclib/private/AngRound.m | 3 +-
matlab/geographiclib/private/cbrtx.m | 12 +-
matlab/geographiclib/private/copysignx.m | 18 +
matlab/geographiclib/projdoc.m | 2 +-
matlab/geographiclib/tranmerc_fwd.m | 6 +-
matlab/geographiclib/tranmerc_inv.m | 6 +-
matlab/geographiclib/utmups_fwd.m | 4 +-
matlab/geographiclib/utmups_inv.m | 4 +-
maxima/geod.mac | 2 +-
maxima/geodesic.mac | 169 +-
maxima/tm.mac | 2 +-
maxima/tmseries.mac | 2 +-
missing | 2 +-
pom.xml | 48 -
python/Makefile.am | 18 +-
python/Makefile.in | 43 +-
python/Makefile.mk | 4 +-
python/README.rst | 7 +
python/README.txt | 12 -
python/doc/code.rst | 30 +
python/doc/conf.py | 270 +
python/doc/examples.rst | 142 +
python/doc/geodesics.rst | 204 +
python/doc/index.rst | 116 +
python/doc/interface.rst | 130 +
python/geographiclib/CMakeLists.txt | 3 +
python/geographiclib/__init__.py | 7 +-
python/geographiclib/accumulator.py | 1 +
python/geographiclib/constants.py | 12 +-
python/geographiclib/geodesic.py | 804 +--
python/geographiclib/geodesiccapability.py | 1 -
python/geographiclib/geodesicline.py | 330 +-
python/geographiclib/geomath.py | 21 +-
python/geographiclib/polygonarea.py | 315 +-
python/{ => geographiclib}/test/__init__.py | 4 +-
python/geographiclib/test/test_geodesic.py | 514 ++
python/setup.py | 57 +-
python/test/test_geodesic.py | 432 --
src/AlbersEqualArea.cpp | 6 +-
src/CMakeLists.txt | 2 +-
src/CircularEngine.cpp | 2 +-
src/Ellipsoid.cpp | 2 +-
src/GeoCoords.cpp | 2 +-
src/Geocentric.cpp | 2 +-
src/Geodesic.cpp | 156 +-
src/GeodesicExact.cpp | 162 +-
src/GeodesicLine.cpp | 97 +-
src/GeodesicLineExact.cpp | 101 +-
src/GeographicLib.pro | 88 -
src/Geoid.cpp | 34 +-
src/GravityCircle.cpp | 32 +-
src/LambertConformalConic.cpp | 6 +-
src/MagneticCircle.cpp | 8 +-
src/Makefile.am | 2 +-
src/Makefile.in | 26 +-
src/Math.cpp | 4 +-
src/PolarStereographic.cpp | 2 +-
src/TransverseMercator.cpp | 2 +-
src/TransverseMercatorExact.cpp | 2 +-
tools/CMakeLists.txt | 3 -
tools/CartConvert.cpp | 5 +-
tools/ConicProj.cpp | 7 +-
tools/GeoConvert.cpp | 25 +-
tools/GeodSolve.cpp | 94 +-
tools/GeodesicProj.cpp | 6 +-
tools/GeoidEval.cpp | 18 +-
tools/Gravity.cpp | 2 +-
tools/MagneticField.cpp | 6 +-
tools/Makefile.in | 24 +-
tools/Planimeter.cpp | 6 +-
tools/RhumbSolve.cpp | 9 +-
tools/TransverseMercatorProj.cpp | 7 +-
tools/tests.cmake | 129 +-
windows/CartConvert-vc8.vcproj | 340 --
windows/ConicProj-vc8.vcproj | 340 --
windows/GeoConvert-vc8.vcproj | 340 --
windows/GeodSolve-vc8.vcproj | 340 --
windows/GeodesicProj-vc8.vcproj | 340 --
windows/Geographic-vc8.vcproj | 583 ---
windows/GeographicLib-vc8.sln | 178 -
windows/GeoidEval-vc8.vcproj | 340 --
windows/Gravity-vc8.vcproj | 340 --
windows/MagneticField-vc8.vcproj | 340 --
windows/Planimeter-vc8.vcproj | 340 --
windows/RhumbSolve-vc8.vcproj | 340 --
windows/TransverseMercatorProj-vc8.vcproj | 340 --
wrapper/C/00README.txt | 48 +
wrapper/C/CMakeLists.txt | 41 +
wrapper/C/cgeoid.cpp | 14 +
wrapper/C/cgeoid.h | 9 +
wrapper/C/geoidtest.c | 13 +
wrapper/matlab/00README.txt | 48 +
.../matlab}/geodesicinverse.cpp | 0
wrapper/matlab/geodesicinverse.m | 33 +
wrapper/matlab/geographiclibinterface.m | 63 +
wrapper/python/00README.txt | 69 +
wrapper/python/CMakeLists.txt | 59 +
wrapper/python/PyGeographicLib.cpp | 21 +
315 files changed, 16293 insertions(+), 15243 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 01395c2..8a9c048 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -7,3 +7,5 @@ Scott Heiman <mrmtdew2 at outlook.com> (.NET wrappers + C# examples)
Chris Bennight <chris at bennight.com> (deploying Java library)
Sebastian Mattheis <Sebastian.Mattheis at bmw.de> (gnomonic projection in Java)
Yurij Mikhalevich <0 at 39.yt> (node.js port)
+Phil Miller <phillip.miller at sri.com> (putting tests into python/setup.py)
+Jonathan Takahashi <jtakahashi at gmail.com> (boost-python sample)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09d18a0..6f48625 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ project (GeographicLib)
# Version information
set (PROJECT_VERSION_MAJOR 1)
-set (PROJECT_VERSION_MINOR 45)
+set (PROJECT_VERSION_MINOR 46)
set (PROJECT_VERSION_PATCH 0)
set (PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
if (PROJECT_VERSION_PATCH GREATER 0)
@@ -42,8 +42,8 @@ endif ()
# The library version tracks the numbering given by libtool in the
# autoconf set up.
-set (LIBVERSION_API 14)
-set (LIBVERSION_BUILD 14.2.1)
+set (LIBVERSION_API 17)
+set (LIBVERSION_BUILD 17.0.0)
string (TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
string (TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER)
@@ -247,8 +247,7 @@ else ()
# the client code is being compiled (and the GeographicLib headers
# being included), work-alike substitutions are used.
include (CheckCXXCompilerFlag)
- # Not yet ready for C++14 (problem with MPFR C++)
- foreach (_F 11 0x)
+ foreach (_F 1z 14 1y 11 0x)
set (CXX11_FLAG "-std=c++${_F}")
set (_T CXX11TEST${_F})
check_cxx_compiler_flag (${CXX11_FLAG} ${_T})
@@ -277,7 +276,7 @@ int main() {
std::log1p(2.0) + std::asinh(10.0) +
std::atanh(0.8) + std::cbrt(8.0) +
std::fma(1.0, 2.0, 3.0) + std::remquo(100.0, 90.0, &q) +
- std::remainder(100.0, 90.0)) +
+ std::remainder(100.0, 90.0) + std::copysign(1.0, -0.0)) +
std::isfinite(4.0) + std::isnan(0.0);
}\n" CXX11_MATH)
if (CXX11_MATH)
@@ -328,6 +327,10 @@ elseif (GEOGRAPHICLIB_PRECISION EQUAL 4)
# Enable Q suffix for quad precision in g++ 4.8 and later
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fext-numeric-literals")
endif ()
+ # Boost uses std::auto_ptr which is deprecated in C++11. Suppress
+ # ensuing warnings. See also
+ # https://svn.boost.org/trac/boost/ticket/11411
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
# Suppress the warnings that boost can spew out, e.g.,
# "typedef 'boost_concept_check905' locally defined but not used"
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedefs")
@@ -403,14 +406,17 @@ endif ()
configure_file (
include/GeographicLib/Config.h.in
include/GeographicLib/Config.h
- @ONLY )
+ @ONLY)
# The documentation depends on doxygen.
if (GEOGRAPHICLIB_DOCUMENTATION)
set (DOXYGEN_SKIP_DOT ON)
# Version 1.8.7 or later needed for …
find_package (Doxygen 1.8.7)
+ # For JavaScript documentation
find_program (JSDOC jsdoc)
+ # For Python documentation
+ find_program (SPHINX sphinx-build)
endif ()
# The man pages are written as pod files and converted to nroff format,
@@ -517,10 +523,10 @@ set (CPACK_SOURCE_IGNORE_FILES
"${PROJECT_SOURCE_DIR}/BUILD"
"${PROJECT_SOURCE_DIR}/(tests|testdata|cgi-bin|.*\\\\.cache)/"
"${PROJECT_SOURCE_DIR}/(distrib|.*-distrib|.*-installer|geodesic-papers)/"
- "${PROJECT_SOURCE_DIR}/[^/]*\\\\.(html|kmz|pdf)\$"
+ "${PROJECT_SOURCE_DIR}/[^/]*\\\\.(xml|html|css|kmz|pdf)\$"
"${PROJECT_SOURCE_DIR}/(autogen|biblio)\\\\.sh\$"
- "${PROJECT_SOURCE_DIR}/(geodesic-biblio.txt|makefile-admin|[^/]*\\\\.png)\$"
- "${PROJECT_SOURCE_DIR}/matlab/.*blurb.txt\$" )
+ "${PROJECT_SOURCE_DIR}/(robots.txt|geodesic-biblio.txt|makefile-admin|[^/]*\\\\.png)\$"
+ "${PROJECT_SOURCE_DIR}/matlab/.*blurb.txt\$")
set (CPACK_SOURCE_GENERATOR TGZ)
set (CPACK_RESOURCE_FILE_LICENSE ${PROJECT_SOURCE_DIR}/LICENSE.txt)
@@ -531,18 +537,18 @@ if (WIN32)
# The Windows binary packager is NSIS. Set the necessary variables
# for this.
set (CPACK_NSIS_CONTACT "charles at karney.com")
- set (CPACK_NSIS_URL_INFO_ABOUT "http://geographiclib.sf.net")
+ set (CPACK_NSIS_URL_INFO_ABOUT "http://geographiclib.sourceforge.net")
set (CPACK_NSIS_HELP_LINK "mailto:charles at karney.com")
if (CMAKE_SIZEOF_VOID_P EQUAL 8)
- # Hardcode the prefix for Visual Studio 11
- set (CPACK_NSIS_INSTALL_ROOT "C:\\\\pkg-vc11-x64")
+ # Hardcode the prefix for Visual Studio 12
+ set (CPACK_NSIS_INSTALL_ROOT "C:\\\\pkg-vc12-x64")
set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}-win64")
set (CPACK_NSIS_PACKAGE_NAME "${PROJECT_NAME} x64 ${PROJECT_VERSION}")
set (CPACK_PACKAGE_INSTALL_REGISTRY_KEY
"${PROJECT_NAME}-x64-${PROJECT_VERSION}")
else ()
- # Hardcode the prefix for Visual Studio 11
- set (CPACK_NSIS_INSTALL_ROOT "C:\\\\pkg-vc11")
+ # Hardcode the prefix for Visual Studio 12
+ set (CPACK_NSIS_INSTALL_ROOT "C:\\\\pkg-vc12")
set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}-win32")
set (CPACK_NSIS_PACKAGE_NAME "${PROJECT_NAME} ${PROJECT_VERSION}")
set (CPACK_PACKAGE_INSTALL_REGISTRY_KEY
@@ -550,12 +556,12 @@ if (WIN32)
endif ()
set (CPACK_NSIS_DISPLAY_NAME ${CPACK_NSIS_PACKAGE_NAME})
set (CPACK_NSIS_MENU_LINKS
- "http://geographiclib.sf.net/${PROJECT_VERSION}/index.html"
+ "http://geographiclib.sourceforge.net/${PROJECT_VERSION}/index.html"
"Library documentation"
- "http://geographiclib.sf.net/${PROJECT_VERSION}/utilities.html"
+ "http://geographiclib.sourceforge.net/${PROJECT_VERSION}/utilities.html"
"Utilities documentation"
- "http://geographiclib.sf.net" "GeographicLib home page"
- "https://sf.net/projects/geographiclib/" "Main project page")
+ "http://geographiclib.sourceforge.net" "GeographicLib home page"
+ "https://sourceforge.net/projects/geographiclib/" "Main project page")
set (CPACK_NSIS_MODIFY_PATH ON)
elseif (APPLE)
# Not tested
@@ -614,5 +620,5 @@ if (MAINTAINER)
add_dependencies (dist distrib-all)
endif ()
-# Add a test target; the tests are in tools.
-enable_testing ()
+# The test suite -- split into a separate file because it's rather large.
+include (tools/tests.cmake)
diff --git a/LICENSE.txt b/LICENSE.txt
index 1b2387d..7fef94d 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,7 @@
-This license applies to GeographicLib, versions 1.12 and later.
+The MIT License (MIT); this license applies to GeographicLib,
+versions 1.12 and later.
-Copyright (c) 2008-2015, Charles Karney
+Copyright (c) 2008-2016, Charles Karney
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
diff --git a/Makefile.am b/Makefile.am
index 25ba129..d7fb57f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,8 +9,9 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src man tools doc js include matlab python cmake examples
-EXTRA_DIST = AUTHORS 00README.txt LICENSE.txt NEWS INSTALL README.md pom.xml \
- Makefile.mk CMakeLists.txt windows maxima doc legacy java js dotnet
+EXTRA_DIST = AUTHORS 00README.txt LICENSE.txt NEWS INSTALL README.md \
+ Makefile.mk CMakeLists.txt windows maxima doc legacy java js dotnet \
+ wrapper
dist-hook:
rm -rf $(distdir)/doc/html $(distdir)/doc/manpages \
@@ -18,6 +19,9 @@ dist-hook:
find $(distdir)/maxima -type f -name '*.lsp' | xargs rm -rf
rm -rf $(distdir)/java/targets
find $(distdir)/java -type f -name '*.class' | xargs rm -rf
+ find $(distdir)/wrapper -mindepth 2 -type d | xargs rm -rf
+ find $(distdir)/wrapper -type f -name '*.o' -o -name '*.mex*' | \
+ xargs rm -f
find $(distdir)/windows -mindepth 1 -type d | xargs rm -rf
find $(distdir)/windows -type f \
! \( -name '*.sln' -o -name '*.vc*proj' -o -name '*.mk' \)| \
diff --git a/Makefile.in b/Makefile.in
index a2879a6..ff9de06 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -19,7 +19,17 @@
#
# Copyright (C) 2009, Francesco P. Lovergine <frankie at debian.org>
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -84,11 +94,6 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/configure $(am__configure_deps) \
- $(top_srcdir)/include/GeographicLib/Config-ac.h.in AUTHORS \
- INSTALL NEWS compile config.guess config.sub depcomp \
- install-sh missing ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -96,6 +101,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -158,6 +165,10 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/include/GeographicLib/Config-ac.h.in AUTHORS \
+ INSTALL NEWS compile config.guess config.sub depcomp \
+ install-sh ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -251,6 +262,7 @@ LTLIBOBJS = @LTLIBOBJS@
LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@
LT_REVISION = @LT_REVISION@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -337,8 +349,9 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src man tools doc js include matlab python cmake examples
-EXTRA_DIST = AUTHORS 00README.txt LICENSE.txt NEWS INSTALL README.md pom.xml \
- Makefile.mk CMakeLists.txt windows maxima doc legacy java js dotnet
+EXTRA_DIST = AUTHORS 00README.txt LICENSE.txt NEWS INSTALL README.md \
+ Makefile.mk CMakeLists.txt windows maxima doc legacy java js dotnet \
+ wrapper
all: all-recursive
@@ -358,7 +371,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -592,15 +604,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -636,17 +648,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -823,6 +835,8 @@ uninstall-am:
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
ps ps-am tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
dist-hook:
rm -rf $(distdir)/doc/html $(distdir)/doc/manpages \
@@ -830,6 +844,9 @@ dist-hook:
find $(distdir)/maxima -type f -name '*.lsp' | xargs rm -rf
rm -rf $(distdir)/java/targets
find $(distdir)/java -type f -name '*.class' | xargs rm -rf
+ find $(distdir)/wrapper -mindepth 2 -type d | xargs rm -rf
+ find $(distdir)/wrapper -type f -name '*.o' -o -name '*.mex*' | \
+ xargs rm -f
find $(distdir)/windows -mindepth 1 -type d | xargs rm -rf
find $(distdir)/windows -type f \
! \( -name '*.sln' -o -name '*.vc*proj' -o -name '*.mk' \)| \
diff --git a/NEWS b/NEWS
index b44ca10..c29b951 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,104 @@ For more information, see
http://geographiclib.sourceforge.net/
-The current version of the library is 1.45.
+The current version of the library is 1.46.
+
+Changes between 1.46 (released 2016-02-15) and 1.45 versions:
+
+ * The following BUGS have been fixed:
+ + the -w flag to Planimeter(1) was being ignored;
+ + in the Java package, the wrong longitude was being returned with
+ direct geodesic calculation with a negative distance when starting
+ point was at a pole (this bug was introduced in version 1.44);
+ + in the JavaScript package, PolygonArea.TestEdge contained a
+ misspelling of a variable name and other typos (problem found by
+ threepointone).
+
+ * INCOMPATIBLE CHANGES:
+ + make the -w flag (to swap the default order of latitude and
+ longitude) a toggle for all utility programs;
+ + the -a option to GeodSolve(1) now toggles (instead of sets) arc
+ mode;
+ + swap order coslon and sinlon arguments in CircularEngine class.
+
+ * Remove deprecated functionality:
+ + remove gradient calculation from the Geoid class and GeoidEval(1)
+ (this was inaccurate and of dubious utility);
+ + remove reciprocal flattening functions, InverseFlattening in many
+ classes and Constants::WGS84_r(); stop treating flattening > 1 as
+ the reciprocal flattening in constructors;
+ + remove DMS::Decode(string), DMS::DecodeFraction,
+ EllipticFunction:m, EllipticFunction:m1, Math::extradigits,
+ Math::AngNormalize2, PolygonArea::TestCompute;
+ + stop treating LONG_NOWRAP as an alias for LONG_UNROLL in Geodesic
+ (and related classes) and Rhumb;
+ + stop treating full/schmidt as aliases for FULL/SCHMIDT in
+ SphericalEngine (and related classes);
+ + remove qmake project file src/GeographicLib.pro because QtCreator
+ can handle cmake projects now;
+ + remove deprecated Visual Studio 2005 project and solution files.
+
+ * Changes to GeodesicLine and GeodesicLineExact classes; these changes
+ (1) simplify the process of computing waypoints on a geodesic given
+ two endpoints and (2) allow a GeodesicLine to be defined which is
+ consistent with the solution of the inverse problem (in particular
+ Geodesic::InverseLine the specification of south-going lines which
+ pass the poles in a westerly direction by setting sin alpha_1 = -0):
+ + the class stores the distance s13 and arc length a13 to a
+ reference point 3; by default these quantities are NaNs;
+ + GeodesicLine::SetDistance (and GeodesicLine::SetArc) specify the
+ distance (and arc length) to point 3;
+ + GeodesicLine::Distance (and GeodesicLine::Arc) return the distance
+ (and arc length) to point 3;
+ + new methods Geodesic::InverseLine and Geodesic::DirectLine return
+ a GeodesicLine with the reference point 3 defined as point 2 of
+ the corresponding geodesic calculation;
+ + these changes are also included in the C, Java, JavaScript, and
+ Python packages.
+
+ * Other changes to the geodesic routines:
+ + more accurate solution of the inverse problem when longitude
+ difference is close to 180deg (also in C, Fortran, Java,
+ JavaScript, Python, MATLAB, and Maxima packages);
+ + more accurate calculation of lon2 in the inverse calculation with
+ LONG_UNROLL (also in Java, JavaScript, Python packages).
+
+ * Changes to GeodSolve(1) utility:
+ + the -I and -D options now specify geodesic line calculation via
+ the standard inverse or direct geodesic problems;
+ + rename -l flag to -L to parallel the new -I and -D flags (-l is is
+ retained for backward compatibility but is deprecated), and
+ similarly for RhumbSolve(1);
+ + the -F flag (in conjunction with the -I or -D flags) specifies
+ that distances read on standard input are fractions of s13 or a13;
+ + the -a option now toggles arc mode (noted above);
+ + the -w option now toggles longitude first mode (noted above).
+
+ * Changes to Math class:
+ + Math::copysign added;
+ + add overloaded version of Math::AngDiff which returns the error in
+ the difference. This allows a more accurate treatment of inverse
+ geodesic problem when lon12 is close to 180deg;
+ + Math::AngRound now converts tiny negative numbers to -0 (instead
+ of +0), however -0 is still converted to +0.
+
+ * Add -S and -T options to GeoConvert(1).
+
+ * Add Sphinx documentation for Python package.
+
+ * Samples of wrapping the C++ library, so it's accessible in other
+ languages, are given in wrapper/C, wrapper/python, and
+ wrapper/matlab.
+
+ * Binary installers for Windows now use Visual Studio 12 2013.
+
+ * Remove top-level pom.xml from release (it was specific to SRI).
+
+ * A reminder: because of the JavaScript changes introduced in version
+ 1.45, you should remove the following installation directories from
+ your system:
+ + Windows: ${CMAKE_INSTALL_PREFIX}/doc/scripts
+ + Others: ${CMAKE_INSTALL_PREFIX}/share/doc/GeographicLib/scripts
Changes between 1.45 (released 2015-09-30) and 1.44 versions:
diff --git a/aclocal.m4 b/aclocal.m4
index 574d513..06268bb 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -95,7 +95,7 @@ AS_VAR_IF(CACHEVAR,yes,
AS_VAR_POPDEF([CACHEVAR])dnl
])dnl AX_CHECK_COMPILE_FLAGS
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -107,10 +107,10 @@ AS_VAR_POPDEF([CACHEVAR])dnl
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -126,14 +126,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -178,15 +178,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -217,7 +216,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -408,7 +407,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -484,7 +483,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -574,8 +573,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -648,7 +647,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -677,7 +680,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -688,7 +691,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -698,7 +701,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -720,7 +723,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -755,7 +758,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -805,7 +808,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -844,7 +847,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -873,7 +876,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -920,7 +923,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -939,7 +942,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1020,7 +1023,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1080,7 +1083,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1108,7 +1111,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1127,7 +1130,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 976de1e..3e57f37 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -8,7 +8,7 @@
# geographiclib-config.cmake for the build tree
set (PROJECT_ROOT_DIR "${PROJECT_BINARY_DIR}")
set (PROJECT_INCLUDE_DIRS
- "${PROJECT_BINARY_DIR}/include" "${PROJECT_SOURCE_DIR}/include" )
+ "${PROJECT_BINARY_DIR}/include" "${PROJECT_SOURCE_DIR}/include")
configure_file (project-config.cmake.in
"${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config.cmake" @ONLY)
configure_file (project-config-version.cmake.in
diff --git a/cmake/Makefile.in b/cmake/Makefile.in
index 67a8f11..eb7cb93 100644
--- a/cmake/Makefile.in
+++ b/cmake/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -19,7 +19,17 @@
#
# Copyright (C) 2011, Charles Karney <charles at karney.com>
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -84,7 +94,6 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
subdir = cmake
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -92,6 +101,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/include/GeographicLib/Config-ac.h
CONFIG_CLEAN_FILES =
@@ -116,6 +126,7 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -168,6 +179,7 @@ LTLIBOBJS = @LTLIBOBJS@
LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@
LT_REVISION = @LT_REVISION@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -270,7 +282,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu cmake/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu cmake/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -444,6 +455,8 @@ uninstall-am:
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
install:
$(INSTALL) -d $(DESTDIR)$(cmakedir)
diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in
index 92bee82..8041bb8 100644
--- a/cmake/project-config.cmake.in
+++ b/cmake/project-config.cmake.in
@@ -40,7 +40,7 @@ else ()
# current directory.
get_filename_component (_ROOT "${_DIR}/@PROJECT_ROOT_DIR@" ABSOLUTE)
set (@PROJECT_NAME at _INCLUDE_DIRS "${_ROOT}/include")
- set (@PROJECT_NAME at _LIBRARY_DIRS "${_ROOT}/lib")
+ set (@PROJECT_NAME at _LIBRARY_DIRS "${_ROOT}/lib at LIB_SUFFIX@")
set (@PROJECT_NAME at _BINARY_DIRS "${_ROOT}/bin")
endif ()
diff --git a/compile b/compile
index 531136b..a85b723 100755
--- a/compile
+++ b/compile
@@ -3,7 +3,7 @@
scriptversion=2012-10-14.11; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey at cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/config.guess b/config.guess
index 1f5c50c..dbfb978 100755
--- a/config.guess
+++ b/config.guess
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2014 Free Software Foundation, Inc.
+# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2014-03-23'
+timestamp='2015-01-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -24,12 +24,12 @@ timestamp='2014-03-23'
# program. This Exception is an additional permission under section 7
# of the GNU General Public License, version 3 ("GPLv3").
#
-# Originally written by Per Bothner.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
#
-# Please send patches with a ChangeLog entry to config-patches at gnu.org.
+# Please send patches to <config-patches at gnu.org>.
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -579,8 +579,9 @@ EOF
else
IBM_ARCH=powerpc
fi
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
+ if [ -x /usr/bin/lslpp ] ; then
+ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
else
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
diff --git a/config.sub b/config.sub
index 66c5074..6467c95 100755
--- a/config.sub
+++ b/config.sub
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2014 Free Software Foundation, Inc.
+# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2014-07-28'
+timestamp='2015-01-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ timestamp='2014-07-28'
# of the GNU General Public License, version 3 ("GPLv3").
-# Please send patches with a ChangeLog entry to config-patches at gnu.org.
+# Please send patches to <config-patches at gnu.org>.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches at gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -260,7 +260,7 @@ case $basic_machine in
| c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \
| epiphany \
- | fido | fr30 | frv \
+ | fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
| i370 | i860 | i960 | ia64 \
@@ -302,6 +302,7 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
+ | riscv32 | riscv64 \
| rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
@@ -312,6 +313,7 @@ case $basic_machine in
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+ | visium \
| we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
@@ -326,6 +328,9 @@ case $basic_machine in
c6x)
basic_machine=tic6x-unknown
;;
+ leon|leon[3-9])
+ basic_machine=sparc-$basic_machine
+ ;;
m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
basic_machine=$basic_machine-unknown
os=-none
@@ -436,6 +441,7 @@ case $basic_machine in
| ubicom32-* \
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
| vax-* \
+ | visium-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
@@ -773,6 +779,9 @@ case $basic_machine in
basic_machine=m68k-isi
os=-sysv
;;
+ leon-*|leon[3-9]-*)
+ basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+ ;;
m68knommu)
basic_machine=m68k-unknown
os=-linux
diff --git a/configure b/configure
index 5815a26..c2f7db3 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GeographicLib 1.45.
+# Generated by GNU Autoconf 2.69 for GeographicLib 1.46.
#
# Report bugs to <charles at karney.com>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='GeographicLib'
PACKAGE_TARNAME='geographiclib'
-PACKAGE_VERSION='1.45'
-PACKAGE_STRING='GeographicLib 1.45'
+PACKAGE_VERSION='1.46'
+PACKAGE_STRING='GeographicLib 1.46'
PACKAGE_BUGREPORT='charles at karney.com'
PACKAGE_URL=''
@@ -645,6 +645,7 @@ HAVE_DOXYGEN_FALSE
HAVE_DOXYGEN_TRUE
DOXYGEN
CXXCPP
+LT_SYS_LIBRARY_PATH
OTOOL64
OTOOL
LIPO
@@ -786,6 +787,7 @@ enable_shared
enable_static
with_pic
enable_fast_install
+with_aix_soname
with_gnu_ld
with_sysroot
enable_libtool_lock
@@ -802,6 +804,7 @@ CPP
CXX
CXXFLAGS
CCC
+LT_SYS_LIBRARY_PATH
CXXCPP'
@@ -1343,7 +1346,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures GeographicLib 1.45 to adapt to many kinds of systems.
+\`configure' configures GeographicLib 1.46 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1414,7 +1417,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GeographicLib 1.45:";;
+ short | recursive ) echo "Configuration of GeographicLib 1.46:";;
esac
cat <<\_ACEOF
@@ -1442,9 +1445,12 @@ Optional Packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
both]
+ --with-aix-soname=aix|svr4|both
+ shared library versioning (aka "SONAME") variant to
+ provide on AIX, [default=aix].
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
- --with-sysroot=DIR Search for dependent libraries within DIR
- (or the compiler's sysroot if not specified).
+ --with-sysroot[=DIR] Search for dependent libraries within DIR (or the
+ compiler's sysroot if not specified).
Some influential environment variables:
CC C compiler command
@@ -1457,6 +1463,8 @@ Some influential environment variables:
CPP C preprocessor
CXX C++ compiler command
CXXFLAGS C++ compiler flags
+ LT_SYS_LIBRARY_PATH
+ User-defined run-time library search path.
CXXCPP C++ preprocessor
Use these variables to override the choices made by `configure' or to help
@@ -1525,7 +1533,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GeographicLib configure 1.45
+GeographicLib configure 1.46
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1966,7 +1974,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GeographicLib $as_me 1.45, which was
+It was created by GeographicLib $as_me 1.46, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2457,7 +2465,7 @@ test -n "$target_alias" &&
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2629,8 +2637,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -2649,7 +2657,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -2943,7 +2951,7 @@ fi
# Define the identity of the package.
PACKAGE='geographiclib'
- VERSION='1.45'
+ VERSION='1.46'
cat >>confdefs.h <<_ACEOF
@@ -2977,8 +2985,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -3036,8 +3044,9 @@ END
fi
fi
+
GEOGRAPHICLIB_VERSION_MAJOR=1
-GEOGRAPHICLIB_VERSION_MINOR=45
+GEOGRAPHICLIB_VERSION_MINOR=46
GEOGRAPHICLIB_VERSION_PATCH=0
cat >>confdefs.h <<_ACEOF
@@ -3085,9 +3094,9 @@ fi
ac_config_headers="$ac_config_headers include/GeographicLib/Config-ac.h"
-LT_CURRENT=16
-LT_REVISION=1
-LT_AGE=2
+LT_CURRENT=17
+LT_REVISION=0
+LT_AGE=0
@@ -4694,8 +4703,8 @@ esac
-macro_version='2.4.2'
-macro_revision='1.3337'
+macro_version='2.4.6'
+macro_revision='2.4.6'
@@ -4709,7 +4718,7 @@ macro_revision='1.3337'
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
# Backslashify metacharacters that are still active within
# double-quoted strings.
@@ -4758,7 +4767,7 @@ func_echo_all ()
$ECHO ""
}
-case "$ECHO" in
+case $ECHO in
printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
$as_echo "printf" >&6; } ;;
print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
@@ -5081,19 +5090,19 @@ test -z "$GREP" && GREP=grep
# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then :
- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
else
with_gnu_ld=no
fi
ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
# Check if gcc -print-prog-name=ld gives a path.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
+ # gcc leaves a trailing carriage return, which upsets mingw
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
*)
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -5107,7 +5116,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
done
- test -z "$LD" && LD="$ac_prog"
+ test -z "$LD" && LD=$ac_prog
;;
"")
# If it fails, then pretend we aren't using GCC.
@@ -5118,7 +5127,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
with_gnu_ld=unknown
;;
esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
$as_echo_n "checking for GNU ld... " >&6; }
else
@@ -5129,32 +5138,32 @@ if ${lt_cv_path_LD+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
+ lt_cv_path_LD=$ac_dir/$ac_prog
# Check to see if the program is GNU ld. I'd rather use --version,
# but apparently some variants of GNU ld only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
+ test no != "$with_gnu_ld" && break
;;
*)
- test "$with_gnu_ld" != yes && break
+ test yes != "$with_gnu_ld" && break
;;
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ lt_cv_path_LD=$LD # Let the user override the test with a path.
fi
fi
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
if test -n "$LD"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
$as_echo "$LD" >&6; }
@@ -5197,33 +5206,38 @@ if ${lt_cv_path_NM+:} false; then :
else
if test -n "$NM"; then
# Let the user override the test.
- lt_cv_path_NM="$NM"
+ lt_cv_path_NM=$NM
else
- lt_nm_to_check="${ac_tool_prefix}nm"
+ lt_nm_to_check=${ac_tool_prefix}nm
if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
lt_nm_to_check="$lt_nm_to_check nm"
fi
for lt_tmp_nm in $lt_nm_to_check; do
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/$lt_tmp_nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+ tmp_nm=$ac_dir/$lt_tmp_nm
+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
# Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # Adding the 'sed 1q' prevents false positives on HP-UX, which says:
# nm: unknown option "B" ignored
# Tru64's nm complains that /dev/null is an invalid object file
- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
- */dev/null* | *'Invalid file or object type'*)
+ # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+ case $build_os in
+ mingw*) lt_bad_file=conftest.nm/nofile ;;
+ *) lt_bad_file=/dev/null ;;
+ esac
+ case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+ *$lt_bad_file* | *'Invalid file or object type'*)
lt_cv_path_NM="$tmp_nm -B"
- break
+ break 2
;;
*)
case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
*/dev/null*)
lt_cv_path_NM="$tmp_nm -p"
- break
+ break 2
;;
*)
lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -5234,15 +5248,15 @@ else
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
done
: ${lt_cv_path_NM=no}
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
$as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
- NM="$lt_cv_path_NM"
+if test no != "$lt_cv_path_NM"; then
+ NM=$lt_cv_path_NM
else
# Didn't find any BSD compatible name lister, look for dumpbin.
if test -n "$DUMPBIN"; then :
@@ -5348,9 +5362,9 @@ esac
fi
fi
- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
*COFF*)
- DUMPBIN="$DUMPBIN -symbols"
+ DUMPBIN="$DUMPBIN -symbols -headers"
;;
*)
DUMPBIN=:
@@ -5358,8 +5372,8 @@ fi
esac
fi
- if test "$DUMPBIN" != ":"; then
- NM="$DUMPBIN"
+ if test : != "$DUMPBIN"; then
+ NM=$DUMPBIN
fi
fi
test -z "$NM" && NM=nm
@@ -5410,7 +5424,7 @@ if ${lt_cv_sys_max_cmd_len+:} false; then :
$as_echo_n "(cached) " >&6
else
i=0
- teststring="ABCD"
+ teststring=ABCD
case $build_os in
msdosdjgpp*)
@@ -5450,7 +5464,7 @@ else
lt_cv_sys_max_cmd_len=8192;
;;
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
# This has been around since 386BSD, at least. Likely further.
if test -x /sbin/sysctl; then
lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -5500,22 +5514,23 @@ else
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len" && \
+ test undefined != "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
# Make teststring a little bigger before we do anything with it.
# a 1K string should be a reasonable start.
- for i in 1 2 3 4 5 6 7 8 ; do
+ for i in 1 2 3 4 5 6 7 8; do
teststring=$teststring$teststring
done
SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
# 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"`env echo "$teststring$teststring" 2>/dev/null` \
+ while { test X`env echo "$teststring$teststring" 2>/dev/null` \
= "X$teststring$teststring"; } >/dev/null 2>&1 &&
- test $i != 17 # 1/2 MB should be enough
+ test 17 != "$i" # 1/2 MB should be enough
do
i=`expr $i + 1`
teststring=$teststring$teststring
@@ -5533,7 +5548,7 @@ else
fi
-if test -n $lt_cv_sys_max_cmd_len ; then
+if test -n "$lt_cv_sys_max_cmd_len"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
else
@@ -5551,30 +5566,6 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
: ${MV="mv -f"}
: ${RM="rm -f"}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,b/c, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
- >/dev/null 2>&1 \
- && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
lt_unset=unset
else
@@ -5697,13 +5688,13 @@ esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
reload_cmds=false
fi
;;
darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ if test yes = "$GCC"; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
else
reload_cmds='$LD$reload_flag -o $output$reload_objs'
fi
@@ -5831,13 +5822,13 @@ lt_cv_deplibs_check_method='unknown'
# Need to set the preceding variable on all platforms that support
# interlibrary dependencies.
# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
+# 'unknown' -- same as none, but documents that we really don't know.
# 'pass_all' -- all dependencies passed with no checks.
# 'test_compile' -- check by making test program.
# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
case $host_os in
aix[4-9]*)
@@ -5864,8 +5855,7 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+ if ( file / ) >/dev/null 2>&1; then
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
@@ -5901,10 +5891,6 @@ freebsd* | dragonfly*)
fi
;;
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -5943,7 +5929,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -5965,8 +5951,8 @@ newos6*)
lt_cv_deplibs_check_method=pass_all
;;
-openbsd*)
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+openbsd* | bitrig*)
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
else
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
@@ -6019,6 +6005,9 @@ sysv4 | sysv4.3*)
tpf*)
lt_cv_deplibs_check_method=pass_all
;;
+os2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
fi
@@ -6176,8 +6165,8 @@ else
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- # two different shell functions defined in ltmain.sh
- # decide which to use based on capabilities of $DLLTOOL
+ # two different shell functions defined in ltmain.sh;
+ # decide which one to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in
*--identify-strict*)
lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
@@ -6189,7 +6178,7 @@ cygwin* | mingw* | pw32* | cegcc*)
;;
*)
# fallback: assume linklib IS sharedlib
- lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ lt_cv_sharedlib_from_linklib_cmd=$ECHO
;;
esac
@@ -6344,7 +6333,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- if test "$ac_status" -eq 0; then
+ if test 0 -eq "$ac_status"; then
# Ensure the archiver fails upon bogus file names.
rm -f conftest.$ac_objext libconftest.a
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
@@ -6352,7 +6341,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- if test "$ac_status" -ne 0; then
+ if test 0 -ne "$ac_status"; then
lt_cv_ar_at_file=@
fi
fi
@@ -6365,7 +6354,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
$as_echo "$lt_cv_ar_at_file" >&6; }
-if test "x$lt_cv_ar_at_file" = xno; then
+if test no = "$lt_cv_ar_at_file"; then
archiver_list_spec=
else
archiver_list_spec=$lt_cv_ar_at_file
@@ -6582,7 +6571,7 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
case $host_os in
- openbsd*)
+ bitrig* | openbsd*)
old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
;;
*)
@@ -6672,7 +6661,7 @@ cygwin* | mingw* | pw32* | cegcc*)
symcode='[ABCDGISTW]'
;;
hpux*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
symcode='[ABCDEGRST]'
fi
;;
@@ -6705,14 +6694,44 @@ case `$NM -V 2>&1` in
symcode='[ABCDGIRSTW]' ;;
esac
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ # Gets list of data symbols to import.
+ lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+ # Adjust the below global symbol transforms to fixup imported variables.
+ lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+ lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'"
+ lt_c_name_lib_hook="\
+ -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\
+ -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'"
+else
+ # Disable hooks by default.
+ lt_cv_sys_global_symbol_to_import=
+ lt_cdecl_hook=
+ lt_c_name_hook=
+ lt_c_name_lib_hook=
+fi
+
# Transform an extracted symbol line into a proper C declaration.
# Some systems (esp. on ia64) link data and code symbols differently,
# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'"
# Handle CRLF in mingw tool chain
opt_cr=
@@ -6730,21 +6749,24 @@ for ac_symprfx in "" "_"; do
# Write the raw and C identifiers.
if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- # Fake it for dumpbin and say T for any non-static function
- # and D for any global variable.
+ # Fake it for dumpbin and say T for any non-static function,
+ # D for any global variable and I for any imported variable.
# Also find C++ and __fastcall symbols from MSVC++,
# which start with @ or ?.
lt_cv_sys_global_symbol_pipe="$AWK '"\
" {last_section=section; section=\$ 3};"\
" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
" \$ 0!~/External *\|/{next};"\
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
" {if(hide[section]) next};"\
-" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-" s[1]~/^[@?]/{print s[1], s[1]; next};"\
-" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
" ' prfx=^$ac_symprfx"
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
@@ -6792,11 +6814,11 @@ _LT_EOF
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
relocations are performed -- see ld's documentation on pseudo-relocs. */
# define LT_DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
/* This system does not cope well with relocations in const data. */
# define LT_DLSYM_CONST
#else
@@ -6822,7 +6844,7 @@ lt__PROGRAM__LTX_preloaded_symbols[] =
{
{ "@PROGRAM@", (void *) 0 },
_LT_EOF
- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+ $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
cat <<\_LT_EOF >> conftest.$ac_ext
{0, (void *) 0}
};
@@ -6842,13 +6864,13 @@ _LT_EOF
mv conftest.$ac_objext conftstm.$ac_objext
lt_globsym_save_LIBS=$LIBS
lt_globsym_save_CFLAGS=$CFLAGS
- LIBS="conftstm.$ac_objext"
+ LIBS=conftstm.$ac_objext
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
(eval $ac_link) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+ test $ac_status = 0; } && test -s conftest$ac_exeext; then
pipe_works=yes
fi
LIBS=$lt_globsym_save_LIBS
@@ -6869,7 +6891,7 @@ _LT_EOF
rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
+ if test yes = "$pipe_works"; then
break
else
lt_cv_sys_global_symbol_pipe=
@@ -6922,6 +6944,16 @@ fi
+
+
+
+
+
+
+
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
$as_echo_n "checking for sysroot... " >&6; }
@@ -6934,9 +6966,9 @@ fi
lt_sysroot=
-case ${with_sysroot} in #(
+case $with_sysroot in #(
yes)
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
fi
;; #(
@@ -6946,8 +6978,8 @@ case ${with_sysroot} in #(
no|'')
;; #(
*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
-$as_echo "${with_sysroot}" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+$as_echo "$with_sysroot" >&6; }
as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
;;
esac
@@ -6959,18 +6991,99 @@ $as_echo "${lt_sysroot:-no}" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+$as_echo_n "checking for a working dd... " >&6; }
+if ${ac_cv_path_lt_DD+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+if test -z "$lt_DD"; then
+ ac_path_lt_DD_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in dd; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_lt_DD" || continue
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi
+ $ac_path_lt_DD_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_lt_DD"; then
+ :
+ fi
+else
+ ac_cv_path_lt_DD=$lt_DD
+fi
+
+rm -f conftest.i conftest2.i conftest.out
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+$as_echo "$ac_cv_path_lt_DD" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+$as_echo_n "checking how to truncate binary pipes... " >&6; }
+if ${lt_cv_truncate_bin+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+$as_echo "$lt_cv_truncate_bin" >&6; }
+
+
+
+
+
+
+
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+ for cc_temp in $*""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+ done
+ func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
# Check whether --enable-libtool-lock was given.
if test "${enable_libtool_lock+set}" = set; then :
enableval=$enable_libtool_lock;
fi
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+test no = "$enable_libtool_lock" || 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.
+ # Find out what ABI is being produced by ac_compile, and set mode
+ # options accordingly.
echo 'int i;' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
@@ -6979,24 +7092,25 @@ ia64-*-hpux*)
test $ac_status = 0; }; then
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
- HPUX_IA64_MODE="32"
+ HPUX_IA64_MODE=32
;;
*ELF-64*)
- HPUX_IA64_MODE="64"
+ HPUX_IA64_MODE=64
;;
esac
fi
rm -rf conftest*
;;
*-*-irix6*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo '#line '$LINENO' "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
LD="${LD-ld} -melf32bsmip"
@@ -7025,9 +7139,50 @@ ia64-*-hpux*)
rm -rf conftest*
;;
+mips64*-*linux*)
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ emul=elf
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ emul="${emul}32"
+ ;;
+ *64-bit*)
+ emul="${emul}64"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *MSB*)
+ emul="${emul}btsmip"
+ ;;
+ *LSB*)
+ emul="${emul}ltsmip"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *N32*)
+ emul="${emul}n32"
+ ;;
+ esac
+ LD="${LD-ld} -m $emul"
+ fi
+ rm -rf conftest*
+ ;;
+
x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly. Note that the listed cases only cover the
+ # situations where additional linker options are needed (such as when
+ # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+ # vice versa); the common cases where no linker options are needed do
+ # not appear in the list.
echo 'int i;' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
@@ -7041,7 +7196,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
+ case `/usr/bin/file conftest.o` in
+ *x86-64*)
+ LD="${LD-ld} -m elf32_x86_64"
+ ;;
+ *)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ esac
;;
powerpc64le-*linux*)
LD="${LD-ld} -m elf32lppclinux"
@@ -7086,7 +7248,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
*-*-sco3.2v5*)
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
+ SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -belf"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
@@ -7126,13 +7288,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
$as_echo "$lt_cv_cc_needs_belf" >&6; }
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ if test yes != "$lt_cv_cc_needs_belf"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
+ CFLAGS=$SAVE_CFLAGS
fi
;;
*-*solaris*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo 'int i;' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
@@ -7144,7 +7307,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
case $lt_cv_prog_gnu_ld in
yes*)
case $host in
- i?86-*-solaris*)
+ i?86-*-solaris*|x86_64-*-solaris*)
LD="${LD-ld} -m elf_x86_64"
;;
sparc*-*-solaris*)
@@ -7153,7 +7316,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
esac
# GNU ld 2.21 introduced _sol2 emulations. Use them if available.
if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
- LD="${LD-ld}_sol2"
+ LD=${LD-ld}_sol2
fi
;;
*)
@@ -7169,7 +7332,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
;;
esac
-need_locks="$enable_libtool_lock"
+need_locks=$enable_libtool_lock
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
@@ -7280,7 +7443,7 @@ else
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
$as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
+if test yes != "$lt_cv_path_mainfest_tool"; then
MANIFEST_TOOL=:
fi
@@ -7783,7 +7946,7 @@ if ${lt_cv_apple_cc_single_mod+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
+ if test -z "$LT_MULTI_MODULE"; then
# By default we will add the -single_module flag. You can override
# by either setting the environment variable LT_MULTI_MODULE
# non-empty at configure time, or by adding -multi_module to the
@@ -7801,7 +7964,7 @@ else
cat conftest.err >&5
# Otherwise, if the output was created with a 0 exit code from
# the compiler, it worked.
- elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+ elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
lt_cv_apple_cc_single_mod=yes
else
cat conftest.err >&5
@@ -7840,7 +8003,7 @@ else
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
@@ -7869,7 +8032,7 @@ _LT_EOF
_lt_result=$?
if test -s conftest.err && $GREP force_load conftest.err; then
cat conftest.err >&5
- elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+ elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
lt_cv_ld_force_load=yes
else
cat conftest.err >&5
@@ -7882,32 +8045,32 @@ fi
$as_echo "$lt_cv_ld_force_load" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
darwin*) # darwin 5.x on
# if running on 10.5 or later, the deployment target defaults
# to the OS version, if on x86, and 10.4, the deployment
# target defaults to 10.4. Don't you love it?
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- 10.[012]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+ 10.[012][,.]*)
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
esac
;;
esac
- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ if test yes = "$lt_cv_apple_cc_single_mod"; then
_lt_dar_single_mod='$single_module'
fi
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ if test yes = "$lt_cv_ld_exported_symbols_list"; then
+ _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
else
- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
fi
- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+ if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -7915,6 +8078,41 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
;;
esac
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+# string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+# string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+# "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+# VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+ case x$2 in
+ x)
+ ;;
+ *:)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+ ;;
+ x:*)
+ eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ *::*)
+ eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+ eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+ ;;
+ *)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ esac
+}
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
@@ -8063,9 +8261,9 @@ done
func_stripname_cnf ()
{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+ case $2 in
+ .*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;;
+ *) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;;
esac
} # func_stripname_cnf
@@ -8092,14 +8290,14 @@ if test "${enable_shared+set}" = set; then :
*)
enable_shared=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_shared=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac
else
@@ -8123,14 +8321,14 @@ if test "${enable_static+set}" = set; then :
*)
enable_static=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_static=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac
else
@@ -8154,14 +8352,14 @@ if test "${with_pic+set}" = set; then :
*)
pic_mode=default
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for lt_pkg in $withval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$lt_pkg" = "X$lt_p"; then
pic_mode=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac
else
@@ -8169,8 +8367,6 @@ else
fi
-test -z "$pic_mode" && pic_mode=default
-
@@ -8186,14 +8382,14 @@ if test "${enable_fast_install+set}" = set; then :
*)
enable_fast_install=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_fast_install=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac
else
@@ -8207,11 +8403,63 @@ fi
+ shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+ withval=$with_aix_soname; case $withval in
+ aix|svr4|both)
+ ;;
+ *)
+ as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+ ;;
+ esac
+ lt_cv_with_aix_soname=$with_aix_soname
+else
+ if ${lt_cv_with_aix_soname+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_with_aix_soname=aix
+fi
+
+ with_aix_soname=$lt_cv_with_aix_soname
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+ if test aix != "$with_aix_soname"; then
+ # For the AIX way of multilib, we name the shared archive member
+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+ # the AIX toolchain works better with OBJECT_MODE set (default 32).
+ if test 64 = "${OBJECT_MODE-32}"; then
+ shared_archive_member_spec=shr_64
+ else
+ shared_archive_member_spec=shr
+ fi
+ fi
+ ;;
+*)
+ with_aix_soname=aix
+ ;;
+esac
+
+
+
+
+
+
+
# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS=$ltmain
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -8260,7 +8508,7 @@ test -z "$LN_S" && LN_S="ln -s"
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
@@ -8299,7 +8547,7 @@ 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
+ if test set != "${COLLECT_NAMES+set}"; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -8310,14 +8558,14 @@ esac
ofile=libtool
can_build_shared=yes
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
# which needs '.lib').
libext=a
-with_gnu_ld="$lt_cv_prog_gnu_ld"
+with_gnu_ld=$lt_cv_prog_gnu_ld
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
+old_CC=$CC
+old_CFLAGS=$CFLAGS
# Set sane defaults for various variables
test -z "$CC" && CC=cc
@@ -8326,15 +8574,8 @@ test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
test -z "$LD" && LD=ld
test -z "$ac_objext" && ac_objext=o
-for cc_temp in $compiler""; do
- case $cc_temp in
- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
# Only perform the check for file, if the check method requires it
@@ -8349,22 +8590,22 @@ if ${lt_cv_path_MAGIC_CMD+:} false; then :
else
case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
;;
*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_MAGIC_CMD=$MAGIC_CMD
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/${ac_tool_prefix}file; then
- lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+ if test -f "$ac_dir/${ac_tool_prefix}file"; then
+ lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
:
@@ -8387,13 +8628,13 @@ _LT_EOF
break
fi
done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
+ IFS=$lt_save_ifs
+ MAGIC_CMD=$lt_save_MAGIC_CMD
;;
esac
fi
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if test -n "$MAGIC_CMD"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
$as_echo "$MAGIC_CMD" >&6; }
@@ -8415,22 +8656,22 @@ if ${lt_cv_path_MAGIC_CMD+:} false; then :
else
case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
;;
*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_MAGIC_CMD=$MAGIC_CMD
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/file; then
- lt_cv_path_MAGIC_CMD="$ac_dir/file"
+ if test -f "$ac_dir/file"; then
+ lt_cv_path_MAGIC_CMD=$ac_dir/"file"
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
:
@@ -8453,13 +8694,13 @@ _LT_EOF
break
fi
done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
+ IFS=$lt_save_ifs
+ MAGIC_CMD=$lt_save_MAGIC_CMD
;;
esac
fi
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if test -n "$MAGIC_CMD"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
$as_echo "$MAGIC_CMD" >&6; }
@@ -8480,7 +8721,7 @@ esac
# Use C for the default configuration in the libtool script
-lt_save_CC="$CC"
+lt_save_CC=$CC
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -8542,7 +8783,7 @@ if test -n "$compiler"; then
lt_prog_compiler_no_builtin_flag=
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $cc_basename in
nvcc*)
lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
@@ -8558,7 +8799,7 @@ else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="-fno-rtti -fno-exceptions"
+ lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment
# 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
@@ -8588,7 +8829,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
else
:
@@ -8606,17 +8847,18 @@ lt_prog_compiler_pic=
lt_prog_compiler_static=
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_static='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
lt_prog_compiler_static='-Bstatic'
fi
+ lt_prog_compiler_pic='-fPIC'
;;
amigaos*)
@@ -8627,8 +8869,8 @@ lt_prog_compiler_static=
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
;;
esac
@@ -8644,6 +8886,11 @@ lt_prog_compiler_static=
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
@@ -8714,7 +8961,7 @@ lt_prog_compiler_static=
case $host_os in
aix*)
lt_prog_compiler_wl='-Wl,'
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
lt_prog_compiler_static='-Bstatic'
else
@@ -8722,10 +8969,29 @@ lt_prog_compiler_static=
fi
;;
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ lt_prog_compiler_pic='-fno-common'
+ case $cc_basename in
+ nagfor*)
+ # NAG Fortran compiler
+ lt_prog_compiler_wl='-Wl,-Wl,,'
+ lt_prog_compiler_pic='-PIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+ esac
+ ;;
+
mingw* | cygwin* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static='$wl-static'
+ ;;
+ esac
;;
hpux9* | hpux10* | hpux11*)
@@ -8741,7 +9007,7 @@ lt_prog_compiler_static=
;;
esac
# Is there a better lt_prog_compiler_static that works with the bundled CC?
- lt_prog_compiler_static='${wl}-a ${wl}archive'
+ lt_prog_compiler_static='$wl-a ${wl}archive'
;;
irix5* | irix6* | nonstopux*)
@@ -8750,9 +9016,9 @@ lt_prog_compiler_static=
lt_prog_compiler_static='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
+ # old Intel for x86_64, which still supported -KPIC.
ecc*)
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
@@ -8777,6 +9043,12 @@ lt_prog_compiler_static=
lt_prog_compiler_pic='-PIC'
lt_prog_compiler_static='-Bstatic'
;;
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fPIC'
+ lt_prog_compiler_static='-static'
+ ;;
pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
@@ -8874,7 +9146,7 @@ lt_prog_compiler_static=
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
lt_prog_compiler_pic='-Kconform_pic'
lt_prog_compiler_static='-Bstatic'
fi
@@ -8903,7 +9175,7 @@ lt_prog_compiler_static=
fi
case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
+ # For platforms that do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
;;
@@ -8935,7 +9207,7 @@ else
lt_cv_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+ lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment
# 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
@@ -8965,7 +9237,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+if test yes = "$lt_cv_prog_compiler_pic_works"; then
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -8997,7 +9269,7 @@ if ${lt_cv_prog_compiler_static_works+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -9016,13 +9288,13 @@ else
fi
fi
$RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+if test yes = "$lt_cv_prog_compiler_static_works"; then
:
else
lt_prog_compiler_static=
@@ -9142,8 +9414,8 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
# do not overwrite the value of need_locks provided by the user
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
$as_echo_n "checking if we can lock with hard links... " >&6; }
@@ -9155,9 +9427,9 @@ $as_echo_n "checking if we can lock with hard links... " >&6; }
ln conftest.a conftest.b 2>/dev/null && hard_links=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
$as_echo "$hard_links" >&6; }
- if test "$hard_links" = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ if test no = "$hard_links"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
need_locks=warn
fi
else
@@ -9200,9 +9472,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# included in the symbol list
include_expsyms=
# exclude_expsyms can be an extended regexp of symbols to exclude
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
+ # it will be wrapped by ' (' and ')$', so one must not match beginning or
+ # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+ # as well as any symbol that contains 'd'.
exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
@@ -9217,7 +9489,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
with_gnu_ld=no
fi
;;
@@ -9225,7 +9497,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# we just hope/assume this is gcc and not c89 (= MSVC++)
with_gnu_ld=yes
;;
- openbsd*)
+ openbsd* | bitrig*)
with_gnu_ld=no
;;
esac
@@ -9235,7 +9507,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# On some targets, GNU ld is compatible enough with the native linker
# that we're better off using the native interface for both.
lt_use_gnu_ld_interface=no
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
case $host_os in
aix*)
# The AIX port of GNU ld has always aspired to compatibility
@@ -9257,24 +9529,24 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
esac
fi
- if test "$lt_use_gnu_ld_interface" = yes; then
+ if test yes = "$lt_use_gnu_ld_interface"; then
# If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
+ wlarc='$wl'
# Set some defaults for GNU ld with shared library support. These
# are reset later if shared libraries are not supported. Putting them
# here allows them to be overridden if necessary.
runpath_var=LD_RUN_PATH
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- export_dynamic_flag_spec='${wl}--export-dynamic'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+ export_dynamic_flag_spec='$wl--export-dynamic'
# ancient GNU ld didn't support --whole-archive et. al.
if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
whole_archive_flag_spec=
fi
supports_anon_versioning=no
- case `$LD -v 2>&1` in
+ case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
*GNU\ gold*) supports_anon_versioning=yes ;;
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -9287,7 +9559,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
case $host_os in
aix[3-9]*)
# On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
+ if test ia64 != "$host_cpu"; then
ld_shlibs=no
cat <<_LT_EOF 1>&2
@@ -9306,7 +9578,7 @@ _LT_EOF
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
archive_expsym_cmds=''
;;
m68k)
@@ -9322,7 +9594,7 @@ _LT_EOF
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
else
ld_shlibs=no
fi
@@ -9332,7 +9604,7 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
- export_dynamic_flag_spec='${wl}--export-all-symbols'
+ export_dynamic_flag_spec='$wl--export-all-symbols'
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@ -9340,61 +9612,89 @@ _LT_EOF
exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file, use it as
+ # is; otherwise, prepend EXPORTS...
+ archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
ld_shlibs=no
fi
;;
haiku*)
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
link_all_deplibs=yes
;;
+ os2*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ allow_undefined_flag=unsupported
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
+ ;;
+
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- export_dynamic_flag_spec='${wl}-E'
+ hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+ export_dynamic_flag_spec='$wl-E'
# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
# Instead, shared libraries are loaded at an image base (0x10000000 by
# default) and relocated if they conflict, which is a slow very memory
# consuming and fragmenting process. To avoid this, we pick a random,
# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
# time. Moving up from 0x10000000 also allows more sbrk(2) space.
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
+ if test linux-dietlibc = "$host_os"; then
case $cc_basename in
diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
esac
fi
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
- && test "$tmp_diet" = no
+ && test no = "$tmp_diet"
then
tmp_addflag=' $pic_flag'
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group f77 and f90 compilers
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -9405,42 +9705,47 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
whole_archive_flag_spec=
tmp_sharedflag='--shared' ;;
+ nagfor*) # NAGFOR 5.3
+ tmp_sharedflag='-Wl,-shared' ;;
xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
nvcc*) # Cuda Compiler Driver 2.2
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
compiler_needs_object=yes
;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
compiler_needs_object=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
tmp_sharedflag='-G' ;;
esac
- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; then
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
case $cc_basename in
+ tcc*)
+ export_dynamic_flag_spec='-rdynamic'
+ ;;
xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; then
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@ -9454,8 +9759,8 @@ _LT_EOF
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
fi
;;
@@ -9473,8 +9778,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs=no
fi
@@ -9486,7 +9791,7 @@ _LT_EOF
ld_shlibs=no
cat <<_LT_EOF 1>&2
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
*** reliably create shared libraries on SCO systems. Therefore, libtool
*** is disabling shared libraries support. We urge you to upgrade GNU
*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
@@ -9501,9 +9806,9 @@ _LT_EOF
# DT_RUNPATH tag from executables and libraries. But doing so
# requires that you compile everything twice, which is a pain.
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs=no
fi
@@ -9520,15 +9825,15 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs=no
fi
;;
esac
- if test "$ld_shlibs" = no; then
+ if test no = "$ld_shlibs"; then
runpath_var=
hardcode_libdir_flag_spec=
export_dynamic_flag_spec=
@@ -9544,7 +9849,7 @@ _LT_EOF
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
@@ -9552,34 +9857,57 @@ _LT_EOF
;;
aix[4-9]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
else
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global
- # defined symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
aix_use_runtimelinking=yes
break
fi
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -9598,13 +9926,21 @@ _LT_EOF
hardcode_direct_absolute=yes
hardcode_libdir_separator=':'
link_all_deplibs=yes
- file_list_spec='${wl}-f,'
+ file_list_spec='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # traditional, no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ hardcode_direct=no
+ hardcode_direct_absolute=no
+ ;;
+ esac
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
case $host_os in aix4.[012]|aix4.[012].*)
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -9623,35 +9959,42 @@ _LT_EOF
;;
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag="$shared_flag "'$wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
- export_dynamic_flag_spec='${wl}-bexpall'
+ export_dynamic_flag_spec='$wl-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to export.
always_export_symbols=yes
- if test "$aix_use_runtimelinking" = yes; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
- if test "${lt_cv_aix_libpath+set}" = set; then
+ if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
if ${lt_cv_aix_libpath_+:} false; then :
@@ -9686,7 +10029,7 @@ fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$lt_cv_aix_libpath_"; then
- lt_cv_aix_libpath_="/usr/lib:/lib"
+ lt_cv_aix_libpath_=/usr/lib:/lib
fi
fi
@@ -9694,17 +10037,17 @@ fi
aix_libpath=$lt_cv_aix_libpath_
fi
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
else
- if test "$host_cpu" = ia64; then
- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+ if test ia64 = "$host_cpu"; then
+ hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
allow_undefined_flag="-z nodefs"
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an
# empty executable.
- if test "${lt_cv_aix_libpath+set}" = set; then
+ if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
if ${lt_cv_aix_libpath_+:} false; then :
@@ -9739,7 +10082,7 @@ fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$lt_cv_aix_libpath_"; then
- lt_cv_aix_libpath_="/usr/lib:/lib"
+ lt_cv_aix_libpath_=/usr/lib:/lib
fi
fi
@@ -9747,21 +10090,33 @@ fi
aix_libpath=$lt_cv_aix_libpath_
fi
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+ hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
- no_undefined_flag=' ${wl}-bernotok'
- allow_undefined_flag=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
+ no_undefined_flag=' $wl-bernotok'
+ allow_undefined_flag=' $wl-berok'
+ if test yes = "$with_gnu_ld"; then
# We only use this code for GNU lds that support --whole-archive.
- whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
else
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec='$convenience'
fi
archive_cmds_need_lc=yes
- # This is similar to how AIX traditionally builds its shared libraries.
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > [...]
+ else
+ # used by -dlpreopen to get the symbols
+ archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -9770,7 +10125,7 @@ fi
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
archive_expsym_cmds=''
;;
m68k)
@@ -9800,16 +10155,17 @@ fi
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
- archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
enable_shared_with_static_runtimes=yes
@@ -9818,18 +10174,18 @@ fi
# Don't use ranlib
old_postinstall_cmds='chmod 644 $oldlib'
postlink_cmds='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
+ ;;
+ esac~
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
;;
*)
# Assume MSVC wrapper
@@ -9838,7 +10194,7 @@ fi
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
@@ -9857,24 +10213,24 @@ fi
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
- if test "$lt_cv_ld_force_load" = "yes"; then
- whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ if test yes = "$lt_cv_ld_force_load"; then
+ whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
else
whole_archive_flag_spec=''
fi
link_all_deplibs=yes
- allow_undefined_flag="$_lt_dar_allow_undefined"
+ allow_undefined_flag=$_lt_dar_allow_undefined
case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
+ ifort*|nagfor*) _lt_dar_can_shared=yes ;;
*) _lt_dar_can_shared=$GCC ;;
esac
- if test "$_lt_dar_can_shared" = "yes"; then
+ if test yes = "$_lt_dar_can_shared"; then
output_verbose_link_cmd=func_echo_all
- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+ archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+ module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
else
ld_shlibs=no
@@ -9916,33 +10272,33 @@ fi
;;
hpux9*)
- if test "$GCC" = yes; then
- archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ if test yes = "$GCC"; then
+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
else
- archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
fi
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl+b $wl$libdir'
hardcode_libdir_separator=:
hardcode_direct=yes
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
hardcode_minus_L=yes
- export_dynamic_flag_spec='${wl}-E'
+ export_dynamic_flag_spec='$wl-E'
;;
hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes,no = "$GCC,$with_gnu_ld"; then
+ archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
- if test "$with_gnu_ld" = no; then
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ hardcode_libdir_flag_spec='$wl+b $wl$libdir'
hardcode_libdir_separator=:
hardcode_direct=yes
hardcode_direct_absolute=yes
- export_dynamic_flag_spec='${wl}-E'
+ export_dynamic_flag_spec='$wl-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
hardcode_minus_L=yes
@@ -9950,25 +10306,25 @@ fi
;;
hpux11*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ if test yes,no = "$GCC,$with_gnu_ld"; then
case $host_cpu in
hppa*64*)
- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
case $host_cpu in
hppa*64*)
- archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
@@ -9980,7 +10336,7 @@ if ${lt_cv_prog_compiler__b+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler__b=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -b"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -9999,14 +10355,14 @@ else
fi
fi
$RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
$as_echo "$lt_cv_prog_compiler__b" >&6; }
-if test x"$lt_cv_prog_compiler__b" = xyes; then
- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+if test yes = "$lt_cv_prog_compiler__b"; then
+ archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
@@ -10014,8 +10370,8 @@ fi
;;
esac
fi
- if test "$with_gnu_ld" = no; then
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ hardcode_libdir_flag_spec='$wl+b $wl$libdir'
hardcode_libdir_separator=:
case $host_cpu in
@@ -10026,7 +10382,7 @@ fi
*)
hardcode_direct=yes
hardcode_direct_absolute=yes
- export_dynamic_flag_spec='${wl}-E'
+ export_dynamic_flag_spec='$wl-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
@@ -10037,8 +10393,8 @@ fi
;;
irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GCC"; then
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
@@ -10048,8 +10404,8 @@ $as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >
if ${lt_cv_irix_exported_symbol+:} false; then :
$as_echo_n "(cached) " >&6
else
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int foo (void) { return 0; }
@@ -10061,24 +10417,34 @@ else
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
$as_echo "$lt_cv_irix_exported_symbol" >&6; }
- if test "$lt_cv_irix_exported_symbol" = yes; then
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ if test yes = "$lt_cv_irix_exported_symbol"; then
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
fi
else
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
fi
archive_cmds_need_lc='no'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
hardcode_libdir_separator=:
inherit_rpath=yes
link_all_deplibs=yes
;;
+ linux*)
+ case $cc_basename in
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ ld_shlibs=yes
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
@@ -10093,7 +10459,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
newsos6)
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=yes
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
hardcode_libdir_separator=:
hardcode_shlibpath_var=no
;;
@@ -10101,27 +10467,19 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
*nto* | *qnx*)
;;
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
hardcode_direct=yes
hardcode_shlibpath_var=no
hardcode_direct_absolute=yes
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- export_dynamic_flag_spec='${wl}-E'
+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+ hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+ export_dynamic_flag_spec='$wl-E'
else
- case $host_os in
- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- ;;
- *)
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- ;;
- esac
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='$wl-rpath,$libdir'
fi
else
ld_shlibs=no
@@ -10132,33 +10490,53 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
;;
osf3*)
- if test "$GCC" = yes; then
- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GCC"; then
+ allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
fi
archive_cmds_need_lc='no'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
hardcode_libdir_separator=:
;;
osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ if test yes = "$GCC"; then
+ allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+ archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
@@ -10169,24 +10547,24 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
solaris*)
no_undefined_flag=' -z defs'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ wlarc='$wl'
+ archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
wlarc=''
- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
;;
*)
- wlarc='${wl}'
- archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ wlarc='$wl'
+ archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
;;
esac
fi
@@ -10196,11 +10574,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
# The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but understands '-z linker_flag'. GCC discards it without '$wl',
# but is careful enough not to reorder.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- if test "$GCC" = yes; then
- whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ if test yes = "$GCC"; then
+ whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
else
whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
fi
@@ -10210,10 +10588,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
;;
sunos4*)
- if test "x$host_vendor" = xsequent; then
+ if test sequent = "$host_vendor"; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
- archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
@@ -10262,43 +10640,43 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag='${wl}-z,text'
+ no_undefined_flag='$wl-z,text'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
+ # Note: We CANNOT use -z defs as we might desire, because we do not
# link with -lc, and that would cause any symbols used from libc to
# always be unresolved, which means just about no library would
# ever link correctly. If we're not using GNU ld we use -z text
# though, which does catch some bad symbols but isn't as heavy-handed
# as -z defs.
- no_undefined_flag='${wl}-z,text'
- allow_undefined_flag='${wl}-z,nodefs'
+ no_undefined_flag='$wl-z,text'
+ allow_undefined_flag='$wl-z,nodefs'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
- hardcode_libdir_flag_spec='${wl}-R,$libdir'
+ hardcode_libdir_flag_spec='$wl-R,$libdir'
hardcode_libdir_separator=':'
link_all_deplibs=yes
- export_dynamic_flag_spec='${wl}-Bexport'
+ export_dynamic_flag_spec='$wl-Bexport'
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
@@ -10313,10 +10691,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
;;
esac
- if test x$host_vendor = xsni; then
+ if test sni = "$host_vendor"; then
case $host in
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- export_dynamic_flag_spec='${wl}-Blargedynsym'
+ export_dynamic_flag_spec='$wl-Blargedynsym'
;;
esac
fi
@@ -10324,7 +10702,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
$as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
+test no = "$ld_shlibs" && can_build_shared=no
with_gnu_ld=$with_gnu_ld
@@ -10350,7 +10728,7 @@ x|xyes)
# Assume -lc should be added
archive_cmds_need_lc=yes
- if test "$enable_shared" = yes && test "$GCC" = yes; then
+ if test yes,yes = "$GCC,$enable_shared"; then
case $archive_cmds in
*'~'*)
# FIXME: we may have to deal with multi-command sequences.
@@ -10565,14 +10943,14 @@ esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
$as_echo_n "checking dynamic linker characteristics... " >&6; }
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $host_os in
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
- *) lt_awk_arg="/^libraries:/" ;;
+ darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+ *) lt_awk_arg='/^libraries:/' ;;
esac
case $host_os in
- mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
- *) lt_sed_strip_eq="s,=/,/,g" ;;
+ mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
+ *) lt_sed_strip_eq='s|=/|/|g' ;;
esac
lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
case $lt_search_path_spec in
@@ -10588,28 +10966,35 @@ if test "$GCC" = yes; then
;;
esac
# Ok, now we have the path, separated by spaces, we can step through it
- # and add multilib dir if necessary.
+ # and add multilib dir if necessary...
lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ # ...but if some path component already ends with the multilib dir we assume
+ # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+ case "$lt_multi_os_dir; $lt_search_path_spec " in
+ "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+ lt_multi_os_dir=
+ ;;
+ esac
for lt_sys_path in $lt_search_path_spec; do
- if test -d "$lt_sys_path/$lt_multi_os_dir"; then
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
- else
+ if test -d "$lt_sys_path$lt_multi_os_dir"; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+ elif test -n "$lt_multi_os_dir"; then
test -d "$lt_sys_path" && \
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
- lt_foo="";
- lt_count=0;
+BEGIN {RS = " "; FS = "/|\n";} {
+ lt_foo = "";
+ lt_count = 0;
for (lt_i = NF; lt_i > 0; lt_i--) {
if ($lt_i != "" && $lt_i != ".") {
if ($lt_i == "..") {
lt_count++;
} else {
if (lt_count == 0) {
- lt_foo="/" $lt_i lt_foo;
+ lt_foo = "/" $lt_i lt_foo;
} else {
lt_count--;
}
@@ -10623,7 +11008,7 @@ BEGIN {RS=" "; FS="/|\n";} {
# for these hosts.
case $host_os in
mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
- $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+ $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
esac
sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
else
@@ -10632,7 +11017,7 @@ fi
library_names_spec=
libname_spec='lib$name'
soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
@@ -10649,14 +11034,16 @@ hardcode_into_libs=no
# flags to be left without arguments
need_version=unknown
+
+
case $host_os in
aix3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
shlibpath_var=LIBPATH
# AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
+ soname_spec='$libname$release$shared_ext$major'
;;
aix[4-9]*)
@@ -10664,41 +11051,91 @@ aix[4-9]*)
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
else
# With GCC up to 2.95.x, collect2 would create an import file
# for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
+ # the line '#! .'. This would cause the generated library to
+ # depend on '.', always an invalid library. This was fixed in
# development snapshots of GCC prior to 3.0.
case $host_os in
aix4 | aix4.[01] | aix4.[01].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
:
else
can_build_shared=no
fi
;;
esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
+ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a(lib.so.V)'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -10708,18 +11145,18 @@ amigaos*)
powerpc)
# Since July 2007 AmigaOS4 officially supports .so libraries.
# When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
;;
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
;;
esac
;;
beos*)
- library_names_spec='${libname}${shared_ext}'
+ library_names_spec='$libname$shared_ext'
dynamic_linker="$host_os ld.so"
shlibpath_var=LIBRARY_PATH
;;
@@ -10727,8 +11164,8 @@ beos*)
bsdi[45]*)
version_type=linux # correct to gnu/linux during the next big refactor
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -10740,7 +11177,7 @@ bsdi[45]*)
cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
- shrext_cmds=".dll"
+ shrext_cmds=.dll
need_version=no
need_lib_prefix=no
@@ -10749,8 +11186,8 @@ cygwin* | mingw* | pw32* | cegcc*)
# gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname~
@@ -10766,17 +11203,17 @@ cygwin* | mingw* | pw32* | cegcc*)
case $host_os in
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
esac
dynamic_linker='Win32 ld.exe'
@@ -10785,8 +11222,8 @@ cygwin* | mingw* | pw32* | cegcc*)
*,cl*)
# Native MSVC
libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
+ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+ library_names_spec='$libname.dll.lib'
case $build_os in
mingw*)
@@ -10813,7 +11250,7 @@ cygwin* | mingw* | pw32* | cegcc*)
sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
;;
*)
- sys_lib_search_path_spec="$LIB"
+ sys_lib_search_path_spec=$LIB
if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
# It is most probably a Windows format PATH.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -10826,8 +11263,8 @@ cygwin* | mingw* | pw32* | cegcc*)
esac
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname'
@@ -10840,7 +11277,7 @@ cygwin* | mingw* | pw32* | cegcc*)
*)
# Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
dynamic_linker='Win32 ld.exe'
;;
esac
@@ -10853,8 +11290,8 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$major$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -10867,8 +11304,8 @@ dgux*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -10886,12 +11323,13 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
need_version=no
need_lib_prefix=no
;;
freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
need_version=yes
;;
esac
@@ -10916,26 +11354,15 @@ freebsd* | dragonfly*)
esac
;;
-gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
dynamic_linker="$host_os runtime_loader"
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
+ shlibpath_overrides_runpath=no
sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
hardcode_into_libs=yes
;;
@@ -10953,14 +11380,15 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ if test 32 = "$HPUX_IA64_MODE"; then
sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux32
else
sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux64
fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
shrext_cmds='.sl'
@@ -10968,8 +11396,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
@@ -10978,8 +11406,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
;;
esac
# HP-UX runs *really* slowly unless shared libraries are mode 555, ...
@@ -10992,8 +11420,8 @@ interix[3-9]*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -11004,7 +11432,7 @@ irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
*)
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
version_type=linux # correct to gnu/linux during the next big refactor
else
version_type=irix
@@ -11012,8 +11440,8 @@ irix5* | irix6* | nonstopux*)
esac
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
case $host_os in
irix5* | nonstopux*)
libsuff= shlibsuff=
@@ -11032,8 +11460,8 @@ irix5* | irix6* | nonstopux*)
esac
shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+ sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
hardcode_into_libs=yes
;;
@@ -11042,13 +11470,33 @@ linux*oldld* | linux*aout* | linux*coff*)
dynamic_linker=no
;;
+linux*android*)
+ version_type=none # Android doesn't support versioned libraries.
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext'
+ soname_spec='$libname$release$shared_ext'
+ finish_cmds=
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+ dynamic_linker='Android linker'
+ # Don't embed -rpath directories since the linker doesn't support them.
+ hardcode_libdir_flag_spec='-L$libdir'
+ ;;
+
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -11095,11 +11543,15 @@ fi
# Add ABI-specific directories to the system library path.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
- # Append ld.so.conf contents to the search path
+ # Ideally, we could use ldconfig to report *all* directores which are
+ # searched for libraries, however this is still not possible. Aside from not
+ # being certain /sbin/ldconfig is available, command
+ # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+ # even though it is searched at run-time. Try to do the best guess by
+ # appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -11116,12 +11568,12 @@ netbsd*)
need_lib_prefix=no
need_version=no
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='NetBSD ld.elf_so'
fi
shlibpath_var=LD_LIBRARY_PATH
@@ -11131,7 +11583,7 @@ netbsd*)
newsos6)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
;;
@@ -11140,58 +11592,68 @@ newsos6)
version_type=qnx
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='ldqnx.so'
;;
-openbsd*)
+openbsd* | bitrig*)
version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib
need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[89] | openbsd2.[89].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ need_version=no
else
- shlibpath_overrides_runpath=yes
+ need_version=yes
fi
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
;;
os2*)
libname_spec='$name'
- shrext_cmds=".dll"
+ version_type=windows
+ shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
osf3* | osf4* | osf5*)
version_type=osf
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
rdos*)
@@ -11202,8 +11664,8 @@ solaris*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
@@ -11213,11 +11675,11 @@ solaris*)
sunos4*)
version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
need_lib_prefix=no
fi
need_version=yes
@@ -11225,8 +11687,8 @@ sunos4*)
sysv4 | sysv4.3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
case $host_vendor in
sni)
@@ -11247,24 +11709,24 @@ sysv4 | sysv4.3*)
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
+ library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+ soname_spec='$libname$shared_ext.$major'
shlibpath_var=LD_LIBRARY_PATH
fi
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
else
sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -11282,7 +11744,7 @@ tpf*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -11290,8 +11752,8 @@ tpf*)
uts4*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -11301,20 +11763,35 @@ uts4*)
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
@@ -11411,15 +11888,15 @@ $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
test -n "$runpath_var" ||
- test "X$hardcode_automatic" = "Xyes" ; then
+ test yes = "$hardcode_automatic"; then
# We can hardcode non-existent directories.
- if test "$hardcode_direct" != no &&
+ if test no != "$hardcode_direct" &&
# 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_TAGVAR(hardcode_shlibpath_var, )" != no &&
- test "$hardcode_minus_L" != no; then
+ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+ test no != "$hardcode_minus_L"; then
# Linking always hardcodes the temporary library directory.
hardcode_action=relink
else
@@ -11434,12 +11911,12 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
$as_echo "$hardcode_action" >&6; }
-if test "$hardcode_action" = relink ||
- test "$inherit_rpath" = yes; then
+if test relink = "$hardcode_action" ||
+ test yes = "$inherit_rpath"; then
# Fast installation is not supported
enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+ test no = "$enable_shared"; then
# Fast installation is not necessary
enable_fast_install=needless
fi
@@ -11449,7 +11926,7 @@ fi
- if test "x$enable_dlopen" != xyes; then
+ if test yes != "$enable_dlopen"; then
enable_dlopen=unknown
enable_dlopen_self=unknown
enable_dlopen_self_static=unknown
@@ -11459,23 +11936,23 @@ else
case $host_os in
beos*)
- lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen=load_add_on
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
;;
mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen=LoadLibrary
lt_cv_dlopen_libs=
;;
cygwin*)
- lt_cv_dlopen="dlopen"
+ lt_cv_dlopen=dlopen
lt_cv_dlopen_libs=
;;
darwin*)
- # if libdl is installed we need to link against it
+ # if libdl is installed we need to link against it
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
if ${ac_cv_lib_dl_dlopen+:} false; then :
@@ -11513,10 +11990,10 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
else
- lt_cv_dlopen="dyld"
+ lt_cv_dlopen=dyld
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
@@ -11524,10 +12001,18 @@ fi
;;
+ tpf*)
+ # Don't try to run any link tests for TPF. We know it's impossible
+ # because TPF is a cross-compiler, and we know how we open DSOs.
+ lt_cv_dlopen=dlopen
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=no
+ ;;
+
*)
ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
if test "x$ac_cv_func_shl_load" = xyes; then :
- lt_cv_dlopen="shl_load"
+ lt_cv_dlopen=shl_load
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
$as_echo_n "checking for shl_load in -ldld... " >&6; }
@@ -11566,11 +12051,11 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
else
ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
if test "x$ac_cv_func_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen"
+ lt_cv_dlopen=dlopen
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
@@ -11609,7 +12094,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
$as_echo_n "checking for dlopen in -lsvld... " >&6; }
@@ -11648,7 +12133,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
$as_echo_n "checking for dld_link in -ldld... " >&6; }
@@ -11687,7 +12172,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
fi
@@ -11708,21 +12193,21 @@ fi
;;
esac
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
+ if test no = "$lt_cv_dlopen"; then
enable_dlopen=no
+ else
+ enable_dlopen=yes
fi
case $lt_cv_dlopen in
dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ save_CPPFLAGS=$CPPFLAGS
+ test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
- save_LIBS="$LIBS"
+ save_LIBS=$LIBS
LIBS="$lt_cv_dlopen_libs $LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
@@ -11730,7 +12215,7 @@ $as_echo_n "checking whether a program can dlopen itself... " >&6; }
if ${lt_cv_dlopen_self+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then :
+ if test yes = "$cross_compiling"; then :
lt_cv_dlopen_self=cross
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -11777,9 +12262,9 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
#endif
@@ -11809,7 +12294,7 @@ _LT_EOF
(eval $ac_link) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -11829,14 +12314,14 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
$as_echo "$lt_cv_dlopen_self" >&6; }
- if test "x$lt_cv_dlopen_self" = xyes; then
+ if test yes = "$lt_cv_dlopen_self"; then
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
if ${lt_cv_dlopen_self_static+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then :
+ if test yes = "$cross_compiling"; then :
lt_cv_dlopen_self_static=cross
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -11883,9 +12368,9 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
#endif
@@ -11915,7 +12400,7 @@ _LT_EOF
(eval $ac_link) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -11936,9 +12421,9 @@ fi
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
+ CPPFLAGS=$save_CPPFLAGS
+ LDFLAGS=$save_LDFLAGS
+ LIBS=$save_LIBS
;;
esac
@@ -11982,7 +12467,7 @@ else
# FIXME - insert some real tests, host_os isn't really good enough
case $host_os in
darwin*)
- if test -n "$STRIP" ; then
+ if test -n "$STRIP"; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -12010,7 +12495,7 @@ fi
- # Report which library types will actually be built
+ # Report what library types will actually be built
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
$as_echo_n "checking if libtool supports shared libraries... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
@@ -12018,13 +12503,13 @@ $as_echo "$can_build_shared" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
$as_echo_n "checking whether to build shared libraries... " >&6; }
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
@@ -12032,8 +12517,12 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
;;
aix[4-9]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -12043,7 +12532,7 @@ $as_echo "$enable_shared" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
$as_echo_n "checking whether to build static libraries... " >&6; }
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
$as_echo "$enable_static" >&6; }
@@ -12057,11 +12546,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-CC="$lt_save_CC"
+CC=$lt_save_CC
- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
+ if test -n "$CXX" && ( test no != "$CXX" &&
+ ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+ (test g++ != "$CXX"))); then
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -12240,7 +12729,7 @@ objext_CXX=$objext
# the CXX compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
+if test yes != "$_lt_caught_CXX_error"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="int some_variable = 0;"
@@ -12301,46 +12790,39 @@ $RM -r conftest*
CFLAGS=$CXXFLAGS
compiler=$CC
compiler_CXX=$CC
- for cc_temp in $compiler""; do
- case $cc_temp in
- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+ func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
if test -n "$compiler"; then
# We don't want -fno-exception when compiling C++ code, so set the
# no_builtin_flag separately
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
else
lt_prog_compiler_no_builtin_flag_CXX=
fi
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
# Set up default GNU C++ configuration
# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then :
- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
else
with_gnu_ld=no
fi
ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
# Check if gcc -print-prog-name=ld gives a path.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
+ # gcc leaves a trailing carriage return, which upsets mingw
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
*)
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -12354,7 +12836,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
done
- test -z "$LD" && LD="$ac_prog"
+ test -z "$LD" && LD=$ac_prog
;;
"")
# If it fails, then pretend we aren't using GCC.
@@ -12365,7 +12847,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
with_gnu_ld=unknown
;;
esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
$as_echo_n "checking for GNU ld... " >&6; }
else
@@ -12376,32 +12858,32 @@ if ${lt_cv_path_LD+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
+ lt_cv_path_LD=$ac_dir/$ac_prog
# Check to see if the program is GNU ld. I'd rather use --version,
# but apparently some variants of GNU ld only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
+ test no != "$with_gnu_ld" && break
;;
*)
- test "$with_gnu_ld" != yes && break
+ test yes != "$with_gnu_ld" && break
;;
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ lt_cv_path_LD=$LD # Let the user override the test with a path.
fi
fi
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
if test -n "$LD"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
$as_echo "$LD" >&6; }
@@ -12437,22 +12919,22 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
- if test "$with_gnu_ld" = yes; then
- archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ if test yes = "$with_gnu_ld"; then
+ archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+ export_dynamic_flag_spec_CXX='$wl--export-dynamic'
# If archive_cmds runs LD, not CC, wlarc should be empty
# XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
# investigate it a little bit more. (MM)
- wlarc='${wl}'
+ wlarc='$wl'
# ancient GNU ld didn't support --whole-archive et. al.
if eval "`$CC -print-prog-name=ld` --help 2>&1" |
$GREP 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
whole_archive_flag_spec_CXX=
fi
@@ -12489,18 +12971,30 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
ld_shlibs_CXX=no
;;
aix[4-9]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
else
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
@@ -12510,6 +13004,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
;;
esac
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -12528,13 +13029,21 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
hardcode_direct_absolute_CXX=yes
hardcode_libdir_separator_CXX=':'
link_all_deplibs_CXX=yes
- file_list_spec_CXX='${wl}-f,'
+ file_list_spec_CXX='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ hardcode_direct_CXX=no
+ hardcode_direct_absolute_CXX=no
+ ;;
+ esac
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
case $host_os in aix4.[012]|aix4.[012].*)
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -12552,36 +13061,44 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
fi
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag=$shared_flag' $wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
- export_dynamic_flag_spec_CXX='${wl}-bexpall'
+ export_dynamic_flag_spec_CXX='$wl-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to
# export.
always_export_symbols_CXX=yes
- if test "$aix_use_runtimelinking" = yes; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
- allow_undefined_flag_CXX='-berok'
+ # The "-G" linker flag allows undefined symbols.
+ no_undefined_flag_CXX='-bernotok'
# Determine the default libpath from the value encoded in an empty
# executable.
- if test "${lt_cv_aix_libpath+set}" = set; then
+ if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
if ${lt_cv_aix_libpath__CXX+:} false; then :
@@ -12616,7 +13133,7 @@ fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$lt_cv_aix_libpath__CXX"; then
- lt_cv_aix_libpath__CXX="/usr/lib:/lib"
+ lt_cv_aix_libpath__CXX=/usr/lib:/lib
fi
fi
@@ -12624,18 +13141,18 @@ fi
aix_libpath=$lt_cv_aix_libpath__CXX
fi
- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+ hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
else
- if test "$host_cpu" = ia64; then
- hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+ if test ia64 = "$host_cpu"; then
+ hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib'
allow_undefined_flag_CXX="-z nodefs"
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an
# empty executable.
- if test "${lt_cv_aix_libpath+set}" = set; then
+ if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
if ${lt_cv_aix_libpath__CXX+:} false; then :
@@ -12670,7 +13187,7 @@ fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$lt_cv_aix_libpath__CXX"; then
- lt_cv_aix_libpath__CXX="/usr/lib:/lib"
+ lt_cv_aix_libpath__CXX=/usr/lib:/lib
fi
fi
@@ -12678,22 +13195,34 @@ fi
aix_libpath=$lt_cv_aix_libpath__CXX
fi
- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+ hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
- no_undefined_flag_CXX=' ${wl}-bernotok'
- allow_undefined_flag_CXX=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
+ no_undefined_flag_CXX=' $wl-bernotok'
+ allow_undefined_flag_CXX=' $wl-berok'
+ if test yes = "$with_gnu_ld"; then
# We only use this code for GNU lds that support --whole-archive.
- whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
else
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_CXX='$convenience'
fi
archive_cmds_need_lc_CXX=yes
- # This is similar to how AIX traditionally builds its shared
- # libraries.
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ archive_expsym_cmds_CXX='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared
+ # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_sy [...]
+ else
+ # used by -dlpreopen to get the symbols
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -12703,7 +13232,7 @@ fi
allow_undefined_flag_CXX=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
else
ld_shlibs_CXX=no
fi
@@ -12731,57 +13260,58 @@ fi
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
- archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
enable_shared_with_static_runtimes_CXX=yes
# Don't use ranlib
old_postinstall_cmds_CXX='chmod 644 $oldlib'
postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- func_to_tool_file "$lt_outputfile"~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
+ ;;
+ esac~
+ func_to_tool_file "$lt_outputfile"~
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
;;
*)
# g++
# _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_CXX='-L$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
+ export_dynamic_flag_spec_CXX='$wl--export-all-symbols'
allow_undefined_flag_CXX=unsupported
always_export_symbols_CXX=no
enable_shared_with_static_runtimes_CXX=yes
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file, use it as
+ # is; otherwise, prepend EXPORTS...
+ archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
ld_shlibs_CXX=no
fi
@@ -12795,27 +13325,27 @@ fi
hardcode_direct_CXX=no
hardcode_automatic_CXX=yes
hardcode_shlibpath_var_CXX=unsupported
- if test "$lt_cv_ld_force_load" = "yes"; then
- whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ if test yes = "$lt_cv_ld_force_load"; then
+ whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
else
whole_archive_flag_spec_CXX=''
fi
link_all_deplibs_CXX=yes
- allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+ allow_undefined_flag_CXX=$_lt_dar_allow_undefined
case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
+ ifort*|nagfor*) _lt_dar_can_shared=yes ;;
*) _lt_dar_can_shared=$GCC ;;
esac
- if test "$_lt_dar_can_shared" = "yes"; then
+ if test yes = "$_lt_dar_can_shared"; then
output_verbose_link_cmd=func_echo_all
- archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- if test "$lt_cv_apple_cc_single_mod" != "yes"; then
- archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+ archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+ module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+ if test yes != "$lt_cv_apple_cc_single_mod"; then
+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+ archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
fi
else
@@ -12824,6 +13354,34 @@ fi
;;
+ os2*)
+ hardcode_libdir_flag_spec_CXX='-L$libdir'
+ hardcode_minus_L_CXX=yes
+ allow_undefined_flag_CXX=unsupported
+ shrext_cmds=.dll
+ archive_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes_CXX=yes
+ ;;
+
dgux*)
case $cc_basename in
ec++*)
@@ -12858,18 +13416,15 @@ fi
ld_shlibs_CXX=yes
;;
- gnu*)
- ;;
-
haiku*)
- archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
link_all_deplibs_CXX=yes
;;
hpux9*)
- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
hardcode_libdir_separator_CXX=:
- export_dynamic_flag_spec_CXX='${wl}-E'
+ export_dynamic_flag_spec_CXX='$wl-E'
hardcode_direct_CXX=yes
hardcode_minus_L_CXX=yes # Not in the search PATH,
# but as the default
@@ -12881,7 +13436,7 @@ fi
ld_shlibs_CXX=no
;;
aCC*)
- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -12890,11 +13445,11 @@ fi
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes; then
- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ if test yes = "$GXX"; then
+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
@@ -12904,15 +13459,15 @@ fi
;;
hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
hardcode_libdir_separator_CXX=:
case $host_cpu in
hppa*64*|ia64*)
;;
*)
- export_dynamic_flag_spec_CXX='${wl}-E'
+ export_dynamic_flag_spec_CXX='$wl-E'
;;
esac
fi
@@ -12938,13 +13493,13 @@ fi
aCC*)
case $host_cpu in
hppa*64*)
- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
# Commands to make compiler produce verbose output that lists
@@ -12955,20 +13510,20 @@ fi
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes; then
- if test $with_gnu_ld = no; then
+ if test yes = "$GXX"; then
+ if test no = "$with_gnu_ld"; then
case $host_cpu in
hppa*64*)
- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
- archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
fi
@@ -12983,22 +13538,22 @@ fi
interix[3-9]*)
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- export_dynamic_flag_spec_CXX='${wl}-E'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+ export_dynamic_flag_spec_CXX='$wl-E'
# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
# Instead, shared libraries are loaded at an image base (0x10000000 by
# default) and relocated if they conflict, which is a slow very memory
# consuming and fragmenting process. To avoid this, we pick a random,
# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
# time. Moving up from 0x10000000 also allows more sbrk(2) space.
- archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
irix5* | irix6*)
case $cc_basename in
CC*)
# SGI C++
- archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
@@ -13007,22 +13562,22 @@ fi
old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
;;
*)
- if test "$GXX" = yes; then
- if test "$with_gnu_ld" = no; then
- archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GXX"; then
+ if test no = "$with_gnu_ld"; then
+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
else
- archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
fi
fi
link_all_deplibs_CXX=yes
;;
esac
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
hardcode_libdir_separator_CXX=:
inherit_rpath_CXX=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -13030,8 +13585,8 @@ fi
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -13040,10 +13595,10 @@ fi
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+ export_dynamic_flag_spec_CXX='$wl--export-dynamic'
# Archives containing C++ object files must be created using
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
@@ -13057,59 +13612,59 @@ fi
# earlier do not add the objects themselves.
case `$CC -V 2>&1` in
*"Version 7."*)
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
*) # Version 8.0 or newer
tmp_idyn=
case $host_cpu in
ia64*) tmp_idyn=' -i_dynamic';;
esac
- archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
esac
archive_cmds_need_lc_CXX=no
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+ export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+ whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
;;
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
*pgCC\ [1-5].* | *pgcpp\ [1-5].*)
prelink_cmds_CXX='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
- compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
old_archive_cmds_CXX='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
- $RANLIB $oldlib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+ $RANLIB $oldlib'
archive_cmds_CXX='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
archive_expsym_cmds_CXX='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
*) # Version 6 and above use weak symbols
- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
esac
- hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ hardcode_libdir_flag_spec_CXX='$wl--rpath $wl$libdir'
+ export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+ whole_archive_flag_spec_CXX='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
;;
cxx*)
# Compaq C++
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols'
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
@@ -13123,18 +13678,18 @@ fi
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
;;
xl* | mpixl* | bgxl*)
# IBM XL 8.0 on PPC, with GNU ld
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+ export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+ archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ if test yes = "$supports_anon_versioning"; then
archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
;;
*)
@@ -13142,10 +13697,10 @@ fi
*Sun\ C*)
# Sun C++ 5.9
no_undefined_flag_CXX=' -zdefs'
- archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
hardcode_libdir_flag_spec_CXX='-R$libdir'
- whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
compiler_needs_object_CXX=yes
# Not sure whether something based on
@@ -13203,22 +13758,17 @@ fi
ld_shlibs_CXX=yes
;;
- openbsd2*)
- # C++ shared libraries are fairly broken
- ld_shlibs_CXX=no
- ;;
-
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
hardcode_direct_CXX=yes
hardcode_shlibpath_var_CXX=no
hardcode_direct_absolute_CXX=yes
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
- export_dynamic_flag_spec_CXX='${wl}-E'
- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+ export_dynamic_flag_spec_CXX='$wl-E'
+ whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
fi
output_verbose_link_cmd=func_echo_all
else
@@ -13234,9 +13784,9 @@ fi
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
hardcode_libdir_separator_CXX=:
# Archives containing C++ object files must be created using
@@ -13254,17 +13804,17 @@ fi
cxx*)
case $host in
osf3*)
- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
+ archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
;;
*)
allow_undefined_flag_CXX=' -expect_unresolved \*'
- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
- $RM $lib.exp'
+ echo "-hidden">> $lib.exp~
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+ $RM $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
;;
esac
@@ -13279,21 +13829,21 @@ fi
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+ if test yes,no = "$GXX,$with_gnu_ld"; then
+ allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
case $host in
osf3*)
- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
;;
*)
- archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
;;
esac
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
hardcode_libdir_separator_CXX=:
# Commands to make compiler produce verbose output that lists
@@ -13339,9 +13889,9 @@ fi
# Sun C++ 4.2, 5.x and Centerline C++
archive_cmds_need_lc_CXX=yes
no_undefined_flag_CXX=' -zdefs'
- archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
hardcode_libdir_flag_spec_CXX='-R$libdir'
hardcode_shlibpath_var_CXX=no
@@ -13349,7 +13899,7 @@ fi
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
# The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'.
+ # but understands '-z linker_flag'.
# Supported since Solaris 2.6 (maybe 2.5.1?)
whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
;;
@@ -13366,30 +13916,30 @@ fi
;;
gcx*)
# Green Hills C++ Compiler
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
;;
*)
# GNU C++ compiler with Solaris linker
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+ if test yes,no = "$GXX,$with_gnu_ld"; then
+ no_undefined_flag_CXX=' $wl-z ${wl}defs'
if $CC --version | $GREP -v '^2\.7' > /dev/null; then
- archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
- # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # g++ 2.7 appears to require '-G' NOT '-shared' on this
# platform.
- archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
@@ -13397,11 +13947,11 @@ fi
output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
fi
- hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir'
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ whole_archive_flag_spec_CXX='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
;;
esac
fi
@@ -13410,52 +13960,52 @@ fi
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag_CXX='${wl}-z,text'
+ no_undefined_flag_CXX='$wl-z,text'
archive_cmds_need_lc_CXX=no
hardcode_shlibpath_var_CXX=no
runpath_var='LD_RUN_PATH'
case $cc_basename in
CC*)
- archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
;;
sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
+ # Note: We CANNOT use -z defs as we might desire, because we do not
# link with -lc, and that would cause any symbols used from libc to
# always be unresolved, which means just about no library would
# ever link correctly. If we're not using GNU ld we use -z text
# though, which does catch some bad symbols but isn't as heavy-handed
# as -z defs.
- no_undefined_flag_CXX='${wl}-z,text'
- allow_undefined_flag_CXX='${wl}-z,nodefs'
+ no_undefined_flag_CXX='$wl-z,text'
+ allow_undefined_flag_CXX='$wl-z,nodefs'
archive_cmds_need_lc_CXX=no
hardcode_shlibpath_var_CXX=no
- hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-R,$libdir'
hardcode_libdir_separator_CXX=':'
link_all_deplibs_CXX=yes
- export_dynamic_flag_spec_CXX='${wl}-Bexport'
+ export_dynamic_flag_spec_CXX='$wl-Bexport'
runpath_var='LD_RUN_PATH'
case $cc_basename in
CC*)
- archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
- '"$old_archive_cmds_CXX"
+ '"$old_archive_cmds_CXX"
reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
- '"$reload_cmds_CXX"
+ '"$reload_cmds_CXX"
;;
*)
- archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
;;
@@ -13487,10 +14037,10 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
$as_echo "$ld_shlibs_CXX" >&6; }
- test "$ld_shlibs_CXX" = no && can_build_shared=no
+ test no = "$ld_shlibs_CXX" && can_build_shared=no
- GCC_CXX="$GXX"
- LD_CXX="$LD"
+ GCC_CXX=$GXX
+ LD_CXX=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -13534,13 +14084,13 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
pre_test_object_deps_done=no
for p in `eval "$output_verbose_link_cmd"`; do
- case ${prev}${p} in
+ case $prev$p in
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
# Remove the space.
- if test $p = "-L" ||
- test $p = "-R"; then
+ if test x-L = "$p" ||
+ test x-R = "$p"; then
prev=$p
continue
fi
@@ -13556,16 +14106,16 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
case $p in
=*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
esac
- if test "$pre_test_object_deps_done" = no; then
- case ${prev} in
+ if test no = "$pre_test_object_deps_done"; then
+ case $prev in
-L | -R)
# Internal compiler library paths should come after those
# provided the user. The postdeps already come after the
# user supplied libs so there is no need to process them.
if test -z "$compiler_lib_search_path_CXX"; then
- compiler_lib_search_path_CXX="${prev}${p}"
+ compiler_lib_search_path_CXX=$prev$p
else
- compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
+ compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} $prev$p"
fi
;;
# The "-l" case would never come before the object being
@@ -13573,9 +14123,9 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
esac
else
if test -z "$postdeps_CXX"; then
- postdeps_CXX="${prev}${p}"
+ postdeps_CXX=$prev$p
else
- postdeps_CXX="${postdeps_CXX} ${prev}${p}"
+ postdeps_CXX="${postdeps_CXX} $prev$p"
fi
fi
prev=
@@ -13590,15 +14140,15 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
continue
fi
- if test "$pre_test_object_deps_done" = no; then
+ if test no = "$pre_test_object_deps_done"; then
if test -z "$predep_objects_CXX"; then
- predep_objects_CXX="$p"
+ predep_objects_CXX=$p
else
predep_objects_CXX="$predep_objects_CXX $p"
fi
else
if test -z "$postdep_objects_CXX"; then
- postdep_objects_CXX="$p"
+ postdep_objects_CXX=$p
else
postdep_objects_CXX="$postdep_objects_CXX $p"
fi
@@ -13628,51 +14178,6 @@ interix[3-9]*)
postdep_objects_CXX=
postdeps_CXX=
;;
-
-linux*)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
-
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- if test "$solaris_use_stlport4" != yes; then
- postdeps_CXX='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
-
-solaris*)
- case $cc_basename in
- CC* | sunCC*)
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- # Adding this requires a known-good setup of shared libraries for
- # Sun compiler versions before 5.6, else PIC objects from an old
- # archive will be linked into the output, leading to subtle bugs.
- if test "$solaris_use_stlport4" != yes; then
- postdeps_CXX='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
esac
@@ -13681,7 +14186,7 @@ case " $postdeps_CXX " in
esac
compiler_lib_search_dirs_CXX=
if test -n "${compiler_lib_search_path_CXX}"; then
- compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | $SED -e 's! -L! !g' -e 's!^ !!'`
fi
@@ -13720,17 +14225,18 @@ lt_prog_compiler_static_CXX=
# C++ specific cases for pic, static, wl, etc.
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
lt_prog_compiler_static_CXX='-Bstatic'
fi
+ lt_prog_compiler_pic_CXX='-fPIC'
;;
amigaos*)
@@ -13741,8 +14247,8 @@ lt_prog_compiler_static_CXX=
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
;;
esac
@@ -13757,6 +14263,11 @@ lt_prog_compiler_static_CXX=
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static_CXX='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
# PIC is the default on this platform
@@ -13806,7 +14317,7 @@ lt_prog_compiler_static_CXX=
case $host_os in
aix[4-9]*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
lt_prog_compiler_static_CXX='-Bstatic'
else
@@ -13846,14 +14357,14 @@ lt_prog_compiler_static_CXX=
case $cc_basename in
CC*)
lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
- if test "$host_cpu" != ia64; then
+ lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
+ if test ia64 != "$host_cpu"; then
lt_prog_compiler_pic_CXX='+Z'
fi
;;
aCC*)
lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+ lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
case $host_cpu in
hppa*64*|ia64*)
# +Z the default
@@ -13882,7 +14393,7 @@ lt_prog_compiler_static_CXX=
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -13890,7 +14401,7 @@ lt_prog_compiler_static_CXX=
lt_prog_compiler_pic_CXX='-fPIC'
;;
ecpc* )
- # old Intel C++ for x86_64 which still supported -KPIC.
+ # old Intel C++ for x86_64, which still supported -KPIC.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
@@ -14035,7 +14546,7 @@ lt_prog_compiler_static_CXX=
fi
case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
+ # For platforms that do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
;;
@@ -14067,7 +14578,7 @@ else
lt_cv_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+ lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" ## exclude from sc_useless_quotes_in_assignment
# 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
@@ -14097,7 +14608,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then
case $lt_prog_compiler_pic_CXX in
"" | " "*) ;;
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
@@ -14123,7 +14634,7 @@ if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works_CXX=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -14142,13 +14653,13 @@ else
fi
fi
$RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
-if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then
:
else
lt_prog_compiler_static_CXX=
@@ -14262,8 +14773,8 @@ $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then
# do not overwrite the value of need_locks provided by the user
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
$as_echo_n "checking if we can lock with hard links... " >&6; }
@@ -14275,9 +14786,9 @@ $as_echo_n "checking if we can lock with hard links... " >&6; }
ln conftest.a conftest.b 2>/dev/null && hard_links=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
$as_echo "$hard_links" >&6; }
- if test "$hard_links" = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ if test no = "$hard_links"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
need_locks=warn
fi
else
@@ -14294,17 +14805,21 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
case $host_os in
aix[4-9]*)
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global defined
- # symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
;;
pw32*)
- export_symbols_cmds_CXX="$ltdll_cmds"
+ export_symbols_cmds_CXX=$ltdll_cmds
;;
cygwin* | mingw* | cegcc*)
case $cc_basename in
@@ -14324,7 +14839,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
$as_echo "$ld_shlibs_CXX" >&6; }
-test "$ld_shlibs_CXX" = no && can_build_shared=no
+test no = "$ld_shlibs_CXX" && can_build_shared=no
with_gnu_ld_CXX=$with_gnu_ld
@@ -14341,7 +14856,7 @@ x|xyes)
# Assume -lc should be added
archive_cmds_need_lc_CXX=yes
- if test "$enable_shared" = yes && test "$GCC" = yes; then
+ if test yes,yes = "$GCC,$enable_shared"; then
case $archive_cmds_CXX in
*'~'*)
# FIXME: we may have to deal with multi-command sequences.
@@ -14469,7 +14984,7 @@ $as_echo_n "checking dynamic linker characteristics... " >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
@@ -14486,14 +15001,16 @@ hardcode_into_libs=no
# flags to be left without arguments
need_version=unknown
+
+
case $host_os in
aix3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
shlibpath_var=LIBPATH
# AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
+ soname_spec='$libname$release$shared_ext$major'
;;
aix[4-9]*)
@@ -14501,41 +15018,91 @@ aix[4-9]*)
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
else
# With GCC up to 2.95.x, collect2 would create an import file
# for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
+ # the line '#! .'. This would cause the generated library to
+ # depend on '.', always an invalid library. This was fixed in
# development snapshots of GCC prior to 3.0.
case $host_os in
aix4 | aix4.[01] | aix4.[01].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
:
else
can_build_shared=no
fi
;;
esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
+ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a(lib.so.V)'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -14545,18 +15112,18 @@ amigaos*)
powerpc)
# Since July 2007 AmigaOS4 officially supports .so libraries.
# When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
;;
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
;;
esac
;;
beos*)
- library_names_spec='${libname}${shared_ext}'
+ library_names_spec='$libname$shared_ext'
dynamic_linker="$host_os ld.so"
shlibpath_var=LIBRARY_PATH
;;
@@ -14564,8 +15131,8 @@ beos*)
bsdi[45]*)
version_type=linux # correct to gnu/linux during the next big refactor
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -14577,7 +15144,7 @@ bsdi[45]*)
cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
- shrext_cmds=".dll"
+ shrext_cmds=.dll
need_version=no
need_lib_prefix=no
@@ -14586,8 +15153,8 @@ cygwin* | mingw* | pw32* | cegcc*)
# gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname~
@@ -14603,16 +15170,16 @@ cygwin* | mingw* | pw32* | cegcc*)
case $host_os in
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
esac
dynamic_linker='Win32 ld.exe'
@@ -14621,8 +15188,8 @@ cygwin* | mingw* | pw32* | cegcc*)
*,cl*)
# Native MSVC
libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
+ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+ library_names_spec='$libname.dll.lib'
case $build_os in
mingw*)
@@ -14649,7 +15216,7 @@ cygwin* | mingw* | pw32* | cegcc*)
sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
;;
*)
- sys_lib_search_path_spec="$LIB"
+ sys_lib_search_path_spec=$LIB
if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
# It is most probably a Windows format PATH.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -14662,8 +15229,8 @@ cygwin* | mingw* | pw32* | cegcc*)
esac
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname'
@@ -14676,7 +15243,7 @@ cygwin* | mingw* | pw32* | cegcc*)
*)
# Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
dynamic_linker='Win32 ld.exe'
;;
esac
@@ -14689,8 +15256,8 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$major$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -14702,8 +15269,8 @@ dgux*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -14721,12 +15288,13 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
need_version=no
need_lib_prefix=no
;;
freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
need_version=yes
;;
esac
@@ -14751,26 +15319,15 @@ freebsd* | dragonfly*)
esac
;;
-gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
dynamic_linker="$host_os runtime_loader"
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
+ shlibpath_overrides_runpath=no
sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
hardcode_into_libs=yes
;;
@@ -14788,14 +15345,15 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ if test 32 = "$HPUX_IA64_MODE"; then
sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux32
else
sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux64
fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
shrext_cmds='.sl'
@@ -14803,8 +15361,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
@@ -14813,8 +15371,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
;;
esac
# HP-UX runs *really* slowly unless shared libraries are mode 555, ...
@@ -14827,8 +15385,8 @@ interix[3-9]*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -14839,7 +15397,7 @@ irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
*)
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
version_type=linux # correct to gnu/linux during the next big refactor
else
version_type=irix
@@ -14847,8 +15405,8 @@ irix5* | irix6* | nonstopux*)
esac
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
case $host_os in
irix5* | nonstopux*)
libsuff= shlibsuff=
@@ -14867,8 +15425,8 @@ irix5* | irix6* | nonstopux*)
esac
shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+ sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
hardcode_into_libs=yes
;;
@@ -14877,13 +15435,33 @@ linux*oldld* | linux*aout* | linux*coff*)
dynamic_linker=no
;;
+linux*android*)
+ version_type=none # Android doesn't support versioned libraries.
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext'
+ soname_spec='$libname$release$shared_ext'
+ finish_cmds=
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+ dynamic_linker='Android linker'
+ # Don't embed -rpath directories since the linker doesn't support them.
+ hardcode_libdir_flag_spec_CXX='-L$libdir'
+ ;;
+
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -14930,11 +15508,15 @@ fi
# Add ABI-specific directories to the system library path.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
- # Append ld.so.conf contents to the search path
+ # Ideally, we could use ldconfig to report *all* directores which are
+ # searched for libraries, however this is still not possible. Aside from not
+ # being certain /sbin/ldconfig is available, command
+ # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+ # even though it is searched at run-time. Try to do the best guess by
+ # appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -14951,12 +15533,12 @@ netbsd*)
need_lib_prefix=no
need_version=no
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='NetBSD ld.elf_so'
fi
shlibpath_var=LD_LIBRARY_PATH
@@ -14966,7 +15548,7 @@ netbsd*)
newsos6)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
;;
@@ -14975,58 +15557,68 @@ newsos6)
version_type=qnx
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='ldqnx.so'
;;
-openbsd*)
+openbsd* | bitrig*)
version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib
need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[89] | openbsd2.[89].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ need_version=no
else
- shlibpath_overrides_runpath=yes
+ need_version=yes
fi
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
;;
os2*)
libname_spec='$name'
- shrext_cmds=".dll"
+ version_type=windows
+ shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
osf3* | osf4* | osf5*)
version_type=osf
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
rdos*)
@@ -15037,8 +15629,8 @@ solaris*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
@@ -15048,11 +15640,11 @@ solaris*)
sunos4*)
version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
need_lib_prefix=no
fi
need_version=yes
@@ -15060,8 +15652,8 @@ sunos4*)
sysv4 | sysv4.3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
case $host_vendor in
sni)
@@ -15082,24 +15674,24 @@ sysv4 | sysv4.3*)
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
+ library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+ soname_spec='$libname$shared_ext.$major'
shlibpath_var=LD_LIBRARY_PATH
fi
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
else
sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -15117,7 +15709,7 @@ tpf*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -15125,8 +15717,8 @@ tpf*)
uts4*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -15136,20 +15728,32 @@ uts4*)
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
@@ -15192,15 +15796,15 @@ $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" ||
test -n "$runpath_var_CXX" ||
- test "X$hardcode_automatic_CXX" = "Xyes" ; then
+ test yes = "$hardcode_automatic_CXX"; then
# We can hardcode non-existent directories.
- if test "$hardcode_direct_CXX" != no &&
+ if test no != "$hardcode_direct_CXX" &&
# 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_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
- test "$hardcode_minus_L_CXX" != no; then
+ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" &&
+ test no != "$hardcode_minus_L_CXX"; then
# Linking always hardcodes the temporary library directory.
hardcode_action_CXX=relink
else
@@ -15215,12 +15819,12 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
$as_echo "$hardcode_action_CXX" >&6; }
-if test "$hardcode_action_CXX" = relink ||
- test "$inherit_rpath_CXX" = yes; then
+if test relink = "$hardcode_action_CXX" ||
+ test yes = "$inherit_rpath_CXX"; then
# Fast installation is not supported
enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+ test no = "$enable_shared"; then
# Fast installation is not necessary
enable_fast_install=needless
fi
@@ -15243,7 +15847,7 @@ fi
lt_cv_path_LD=$lt_save_path_LD
lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
+fi # test yes != "$_lt_caught_CXX_error"
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -15632,7 +16236,7 @@ int q;
std::log1p(2.0) + std::asinh(10.0) +
std::atanh(0.8) + std::cbrt(8.0) +
std::fma(1.0, 2.0, 3.0) + std::remquo(100.0, 90.0, &q) +
- std::remainder(100.0, 90.0)) +
+ std::remainder(100.0, 90.0) + std::copysign(1.0, -0.0)) +
std::isfinite(4.0) + std::isnan(0.0);
;
return 0;
@@ -16382,7 +16986,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GeographicLib $as_me 1.45, which was
+This file was extended by GeographicLib $as_me 1.46, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16448,7 +17052,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-GeographicLib config.status 1.45
+GeographicLib config.status 1.46
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -16583,6 +17187,7 @@ enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
@@ -16632,10 +17237,13 @@ compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
@@ -16700,7 +17308,8 @@ finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
@@ -16805,9 +17414,12 @@ CFLAGS \
compiler \
lt_cv_sys_global_symbol_pipe \
lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_import \
lt_cv_sys_global_symbol_to_c_name_address \
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+lt_cv_nm_interface \
nm_file_list_spec \
+lt_cv_truncate_bin \
lt_prog_compiler_no_builtin_flag \
lt_prog_compiler_pic \
lt_prog_compiler_wl \
@@ -16873,7 +17485,7 @@ postdeps_CXX \
compiler_lib_search_path_CXX; do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -16900,7 +17512,8 @@ postinstall_cmds \
postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec \
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path \
reload_cmds_CXX \
old_archive_cmds_CXX \
old_archive_from_new_cmds_CXX \
@@ -16914,7 +17527,7 @@ prelink_cmds_CXX \
postlink_cmds_CXX; do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -16923,19 +17536,16 @@ postlink_cmds_CXX; do
done
ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
-# See if we are running on zsh, and set the options which allow our
+# See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
+if test -n "\${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
PACKAGE='$PACKAGE'
VERSION='$VERSION'
- TIMESTAMP='$TIMESTAMP'
RM='$RM'
ofile='$ofile'
@@ -17656,55 +18266,53 @@ $as_echo X"$file" |
;;
"libtool":C)
- # See if we are running on zsh, and set the options which allow our
+ # See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
+ if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
- cfgfile="${ofile}T"
+ cfgfile=${ofile}T
trap "$RM \"$cfgfile\"; exit 1" 1 2 15
$RM "$cfgfile"
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Generated automatically by $as_me ($PACKAGE) $VERSION
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the same
+# distribution terms that you use for the rest of that program.
#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# The names of the tagged configurations supported by this script.
-available_tags="CXX "
+available_tags='CXX '
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
# ### BEGIN LIBTOOL CONFIG
@@ -17724,6 +18332,9 @@ pic_mode=$pic_mode
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
# Shell to use when invoking shell scripts.
SHELL=$lt_SHELL
@@ -17841,18 +18452,27 @@ global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
# Transform the output of nm in a proper C declaration.
global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+# Transform the output of nm into a list of symbols to manually relocate.
+global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+
# Transform the output of nm in a C name address pair.
global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
# Transform the output of nm in a C name address pair when lib prefix is needed.
global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+# The name lister interface.
+nm_interface=$lt_lt_cv_nm_interface
+
# Specify filename containing input files for \$NM.
nm_file_list_spec=$lt_nm_file_list_spec
-# The root where to search for dependent libraries,and in which our libraries should be installed.
+# The root where to search for dependent libraries,and where our libraries should be installed.
lt_sysroot=$lt_sysroot
+# Command to truncate a binary pipe.
+lt_truncate_bin=$lt_lt_cv_truncate_bin
+
# The name of the directory that contains temporary libtool files.
objdir=$objdir
@@ -17943,8 +18563,11 @@ hardcode_into_libs=$hardcode_into_libs
# Compile-time system search path for libraries.
sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
# Whether dlopen is supported.
dlopen_support=$enable_dlopen
@@ -18037,13 +18660,13 @@ hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
# Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator=$lt_hardcode_libdir_separator
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
# DIR into the resulting binary.
hardcode_direct=$hardcode_direct
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
# library is relocated.
hardcode_direct_absolute=$hardcode_direct_absolute
@@ -18109,13 +18732,72 @@ compiler_lib_search_path=$lt_compiler_lib_search_path
_LT_EOF
+ cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+# string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+# string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+# "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+# VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+ case x$2 in
+ x)
+ ;;
+ *:)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+ ;;
+ x:*)
+ eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ *::*)
+ eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+ eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+ ;;
+ *)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ esac
+}
+
+
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+ for cc_temp in $*""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+ done
+ func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
case $host_os in
aix3*)
cat <<\_LT_EOF >> "$cfgfile"
# 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
+if test set != "${COLLECT_NAMES+set}"; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -18124,7 +18806,7 @@ _LT_EOF
esac
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
# We use sed instead of cat because bash on DJGPP gets confused if
@@ -18134,165 +18816,6 @@ ltmain="$ac_aux_dir/ltmain.sh"
sed '$q' "$ltmain" >> "$cfgfile" \
|| (rm -f "$cfgfile"; exit 1)
- if test x"$xsi_shell" = xyes; then
- sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
-func_dirname ()\
-{\
-\ case ${1} in\
-\ */*) func_dirname_result="${1%/*}${2}" ;;\
-\ * ) func_dirname_result="${3}" ;;\
-\ esac\
-} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_basename ()$/,/^} # func_basename /c\
-func_basename ()\
-{\
-\ func_basename_result="${1##*/}"\
-} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
-func_dirname_and_basename ()\
-{\
-\ case ${1} in\
-\ */*) func_dirname_result="${1%/*}${2}" ;;\
-\ * ) func_dirname_result="${3}" ;;\
-\ esac\
-\ func_basename_result="${1##*/}"\
-} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
-func_stripname ()\
-{\
-\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
-\ # positional parameters, so assign one to ordinary parameter first.\
-\ func_stripname_result=${3}\
-\ func_stripname_result=${func_stripname_result#"${1}"}\
-\ func_stripname_result=${func_stripname_result%"${2}"}\
-} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
-func_split_long_opt ()\
-{\
-\ func_split_long_opt_name=${1%%=*}\
-\ func_split_long_opt_arg=${1#*=}\
-} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
-func_split_short_opt ()\
-{\
-\ func_split_short_opt_arg=${1#??}\
-\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
-} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
-func_lo2o ()\
-{\
-\ case ${1} in\
-\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
-\ *) func_lo2o_result=${1} ;;\
-\ esac\
-} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_xform ()$/,/^} # func_xform /c\
-func_xform ()\
-{\
- func_xform_result=${1%.*}.lo\
-} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_arith ()$/,/^} # func_arith /c\
-func_arith ()\
-{\
- func_arith_result=$(( $* ))\
-} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_len ()$/,/^} # func_len /c\
-func_len ()\
-{\
- func_len_result=${#1}\
-} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-fi
-
-if test x"$lt_shell_append" = xyes; then
- sed -e '/^func_append ()$/,/^} # func_append /c\
-func_append ()\
-{\
- eval "${1}+=\\${2}"\
-} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
-func_append_quoted ()\
-{\
-\ func_quote_for_eval "${2}"\
-\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
-} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- # Save a `func_append' function call where possible by direct use of '+='
- sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-else
- # Save a `func_append' function call even when '+=' is not available
- sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
-fi
-
-
mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
@@ -18379,13 +18902,13 @@ hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
# Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
# DIR into the resulting binary.
hardcode_direct=$hardcode_direct_CXX
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
# library is relocated.
hardcode_direct_absolute=$hardcode_direct_absolute_CXX
diff --git a/configure.ac b/configure.ac
index 13b13d1..fbbd49c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
dnl
dnl Copyright (C) 2009, Francesco P. Lovergine <frankie at debian.org>
-AC_INIT([GeographicLib],[1.45],[charles at karney.com])
+AC_INIT([GeographicLib],[1.46],[charles at karney.com])
AC_CANONICAL_SYSTEM
AC_PREREQ(2.61)
AC_CONFIG_SRCDIR(src/Geodesic.cpp)
@@ -9,7 +9,7 @@ AC_CONFIG_MACRO_DIR(m4)
AM_INIT_AUTOMAKE
GEOGRAPHICLIB_VERSION_MAJOR=1
-GEOGRAPHICLIB_VERSION_MINOR=45
+GEOGRAPHICLIB_VERSION_MINOR=46
GEOGRAPHICLIB_VERSION_PATCH=0
AC_DEFINE_UNQUOTED([GEOGRAPHICLIB_VERSION_MAJOR],
[$GEOGRAPHICLIB_VERSION_MAJOR],[major version number])
@@ -34,9 +34,9 @@ dnl Library code modified: REVISION++
dnl Interfaces changed/added/removed: CURRENT++ REVISION=0
dnl Interfaces added: AGE++
dnl Interfaces removed: AGE=0
-LT_CURRENT=16
-LT_REVISION=1
-LT_AGE=2
+LT_CURRENT=17
+LT_REVISION=0
+LT_AGE=0
AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
@@ -67,7 +67,7 @@ AC_TRY_COMPILE([#include <cmath>],
std::log1p(2.0) + std::asinh(10.0) +
std::atanh(0.8) + std::cbrt(8.0) +
std::fma(1.0, 2.0, 3.0) + std::remquo(100.0, 90.0, &q) +
- std::remainder(100.0, 90.0)) +
+ std::remainder(100.0, 90.0) + std::copysign(1.0, -0.0)) +
std::isfinite(4.0) + std::isnan(0.0);],
[CXXFLAGS="$CXXFLAGS -DGEOGRAPHICLIB_CXX11_MATH=1"],
[CXXFLAGS="$CXXFLAGS -DGEOGRAPHICLIB_CXX11_MATH=0"])
diff --git a/depcomp b/depcomp
index 4ebd5b3..fc98710 100755
--- a/depcomp
+++ b/depcomp
@@ -3,7 +3,7 @@
scriptversion=2013-05-30.07; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 760e1af..a4a4b18 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -29,54 +29,104 @@ endif ()
file (MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html-stage)
if (DOXYGEN_FOUND)
+ set (DOCTARGETS)
+
configure_file (GeographicLib.dox.in GeographicLib.dox @ONLY)
configure_file (doxyfile.in doxyfile @ONLY)
- configure_file (doxyfile-c.in doxyfile-c @ONLY)
- configure_file (doxyfile-for.in doxyfile-for @ONLY)
- configure_file (doxyfile-net.in doxyfile-net @ONLY)
- file (GLOB SOURCES
+ file (GLOB CXXSOURCES
../src/[A-Za-z]*.cpp ../include/GeographicLib/[A-Za-z]*.hpp
../tools/[A-Za-z]*.cpp ../examples/[A-Za-z]*.cpp
- ../examples/[A-Za-z]*.hpp
- ../legacy/C/*.[ch] ../legacy/Fortran/*.for ../legacy/Fortran/*.inc
- ../dotnet/NETGeographicLib/*.cpp ../dotnet/NETGeographicLib/*.h
- ../dotnet/examples/CS/*.cs ../dotnet/examples/ManagedCPP/*.cpp
- ../dotnet/examples/VB/*.vb)
- file (GLOB JSSOURCES ../js/src/*.js)
- file (GLOB JSTUTORIALS ../js/GeographicLib.md ../js/doc/*.md)
+ ../examples/[A-Za-z]*.hpp)
file (GLOB EXTRA_FILES ../maxima/[A-Za-z]*.mac
tmseries30.html geodseries30.html ../LICENSE.txt)
file (GLOB FIGURES *.png)
file (COPY ${EXTRA_FILES} DESTINATION html-stage)
- add_custom_target (doc ALL
+ add_custom_target (cxxdoc ALL
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/html/index.html)
- add_dependencies (doc htmlman)
- if (JSDOC)
- set (JSDOC_CMD "${JSDOC}")
- else ()
- set (JSDOC_CMD "echo")
- endif ()
+ add_dependencies (cxxdoc htmlman)
add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/html/index.html
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/doxyfile
- ${CMAKE_CURRENT_BINARY_DIR}/doxyfile-c
- ${CMAKE_CURRENT_BINARY_DIR}/doxyfile-for
- ${CMAKE_CURRENT_BINARY_DIR}/doxyfile-net
${CMAKE_CURRENT_BINARY_DIR}/GeographicLib.dox
- geodesic-c.dox geodesic-for.dox NETGeographicLib.dox
- ${SOURCES} ${JSSOURCES} ${EXTRA_FILES} ${JSTUTORIALS}
- ${FIGURES} ${HTMLMAN}
+ ${CXXSOURCES} ${EXTRA_FILES} ${FIGURES} ${HTMLMAN}
COMMAND ${CMAKE_COMMAND} -E remove_directory html
COMMAND ${CMAKE_COMMAND} -E copy_directory html-stage html
COMMAND ${DOXYGEN_EXECUTABLE} doxyfile > doxygen.log
+ COMMENT "Generating C++ documentation tree")
+ set (DOCTARGETS ${DOCTARGETS} cxxdoc)
+
+ configure_file (doxyfile-c.in doxyfile-c @ONLY)
+ file (GLOB CSOURCES ../legacy/C/*.[ch])
+ add_custom_target (cdoc ALL
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/html/C/index.html)
+ add_dependencies (cdoc cxxdoc)
+ add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/html/C/index.html
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/doxyfile-c geodesic-c.dox ${CSOURCES}
COMMAND ${DOXYGEN_EXECUTABLE} doxyfile-c > doxygen-c.log
+ COMMENT "Generating C documentation tree")
+ set (DOCTARGETS ${DOCTARGETS} cdoc)
+
+ configure_file (doxyfile-for.in doxyfile-for @ONLY)
+ file (GLOB FORTRANSOURCES ../legacy/Fortran/*.for ../legacy/Fortran/*.inc)
+ add_custom_target (fortrandoc ALL
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/html/Fortran/index.html)
+ add_dependencies (fortrandoc cxxdoc)
+ add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/html/Fortran/index.html
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/doxyfile-for
+ geodesic-for.dox ${FORTRANSOURCES}
COMMAND ${DOXYGEN_EXECUTABLE} doxyfile-for > doxygen-for.log
+ COMMENT "Generating Fortran documentation tree")
+ set (DOCTARGETS ${DOCTARGETS} fortrandoc)
+
+ configure_file (doxyfile-net.in doxyfile-net @ONLY)
+ file (GLOB DOTNETSOURCES
+ ../dotnet/NETGeographicLib/*.cpp ../dotnet/NETGeographicLib/*.h
+ ../dotnet/examples/CS/*.cs ../dotnet/examples/ManagedCPP/*.cpp
+ ../dotnet/examples/VB/*.vb)
+ add_custom_target (dotnetdoc ALL
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/html/NET/index.html)
+ add_dependencies (dotnetdoc cxxdoc)
+ add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/html/NET/index.html
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/doxyfile-net
+ NETGeographicLib.dox ${DOTNETSOURCES}
COMMAND ${DOXYGEN_EXECUTABLE} doxyfile-net > doxygen-net.log
- COMMAND ${JSDOC_CMD} --verbose -d html/js
- -u ${PROJECT_SOURCE_DIR}/js/doc
- -c ${PROJECT_SOURCE_DIR}/js/conf.json
- -R ${PROJECT_SOURCE_DIR}/js/GeographicLib.md
- ${PROJECT_SOURCE_DIR}/js/src > jsdoc.log
- COMMENT "Generating html documentation tree")
+ COMMENT "Generating .NET documentation tree")
+ set (DOCTARGETS ${DOCTARGETS} dotnetdoc)
+
+ if (JSDOC)
+ file (GLOB JSSOURCES
+ ../js/src/*.js ../js/GeographicLib.md ../js/doc/*.md)
+ add_custom_target (jsdoc ALL
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/html/js/index.html)
+ add_dependencies (jsdoc cxxdoc)
+ add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/html/js/index.html
+ DEPENDS ${JSSOURCES}
+ COMMAND ${JSDOC} --verbose -d html/js
+ -u ${PROJECT_SOURCE_DIR}/js/doc
+ -c ${PROJECT_SOURCE_DIR}/js/conf.json
+ -R ${PROJECT_SOURCE_DIR}/js/GeographicLib.md
+ ${PROJECT_SOURCE_DIR}/js/src > jsdoc.log
+ COMMENT "Generating JavaScript documentation tree")
+ set (DOCTARGETS ${DOCTARGETS} jsdoc)
+ endif ()
+
+ if (SPHINX)
+ file (GLOB PYTHONSOURCES
+ ../python/geographiclib/*.py ../python/doc/*.rst ../python/doc/conf.py)
+ add_custom_target (pythondoc ALL
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/html/python/index.html)
+ add_dependencies (pythondoc cxxdoc)
+ add_custom_command (OUTPUT
+ ${CMAKE_CURRENT_BINARY_DIR}/html/python/index.html
+ DEPENDS ${PYTHONSOURCES}
+ COMMAND ${SPHINX} -v -b html -d python-doctree
+ ${PROJECT_SOURCE_DIR}/python/doc html/python > pythondoc.log
+ COMMENT "Generating python documentation tree")
+ set (DOCTARGETS ${DOCTARGETS} pythondoc)
+ endif ()
+
+ add_custom_target (doc ALL)
+ add_dependencies (doc ${DOCTARGETS})
+
install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
DESTINATION ${INSTALL_DOC_DIR})
else ()
diff --git a/doc/GeographicLib.dox.in b/doc/GeographicLib.dox.in
index 62d6d2c..4e8a65b 100644
--- a/doc/GeographicLib.dox.in
+++ b/doc/GeographicLib.dox.in
@@ -12,7 +12,11 @@ namespace GeographicLib {
\mainpage GeographicLib library
\author Charles F. F. Karney (charles at karney.com)
\version @PROJECT_VERSION@
-\date 2015-09-30
+\date 2016-02-15
+
+The documentation for other versions is available at
+<tt>http://geographiclib.sourceforge.net/m.nn/</tt> for versions numbers
+<tt>m.nn</tt> ≥ 1.0.
\section abstract Abstract
@@ -41,20 +45,19 @@ the other hand, it does provide the core functionality offered by
\section download Download
The main project page is at
-- <a href="https://sourceforge.net/projects/geographiclib">
- https://sourceforge.net/projects/geographiclib </a>
+- https://sourceforge.net/projects/geographiclib
.
The code is available for download at
-- <a href="https://sf.net/projects/geographiclib/files/distrib/GeographicLib-@PROJECT_VERSION@.tar.gz">
+- <a href="https://sourceforge.net/projects/geographiclib/files/distrib/GeographicLib-@PROJECT_VERSION@.tar.gz">
GeographicLib- at PROJECT_VERSION@.tar.gz</a>
-- <a href="https://sf.net/projects/geographiclib/files/distrib/GeographicLib-@PROJECT_VERSION@.zip">
+- <a href="https://sourceforge.net/projects/geographiclib/files/distrib/GeographicLib-@PROJECT_VERSION@.zip">
GeographicLib- at PROJECT_VERSION@.zip</a>
.
as either a compressed tar file (tar.gz) or a zip file. (The two
archives have identical contents, except that the zip file has DOS
line endings.) Alternatively you can get the latest release using git
\verbatim
- git clone git://git.code.sf.net/p/geographiclib/code geographiclib
+ git clone git://git.code.sourceforge.net/p/geographiclib/code geographiclib
\endverbatim
Each release is tagged, e.g., with r at PROJECT_VERSION@. There are also
binary installers available for some platforms. See \ref binaryinst.
@@ -62,7 +65,9 @@ binary installers available for some platforms. See \ref binaryinst.
GeographicLib is licensed under the
<a href="http://www.opensource.org/licenses/MIT">MIT/X11 License</a>;
see <a href="LICENSE.txt">LICENSE.txt</a> for the terms.
-For more information, see http://geographiclib.sourceforge.net/.
+
+For more information on GeographicLib, see
+- http://geographiclib.sourceforge.net/.
\section contents Contents
- \ref intro
@@ -554,19 +559,11 @@ If cmake complains that sh mustn't be in your path, invoke cmake with
sed 's/:$//' )" \
cmake -G "MinGW Makefiles" -D CMAKE_INSTALL_PREFIX=C:/pkg-mingw/GeographicLib ..
\endverbatim
-If cmake is not available, there is a simple project file that compiles
-the GeographicLib library <i>only</i> with the Qt compiler: \verbatim
- cd src
- qmake GeographicLib.pro # configure the project
- make # build the library \endverbatim
-The library will be in the src directory (or the src/release or
-src/debug directory under Windows). The headers are in
-include/GeographicLib.
\section maintainer Maintainer tasks
Check the code out of git with \verbatim
- git clone -b master git://git.code.sf.net/p/geographiclib/code geographiclib
+ git clone -b master git://git.code.sourceforge.net/p/geographiclib/code geographiclib
\endverbatim
Here the "master" branch is checked out. There are three branches in
the git repository:
@@ -938,11 +935,11 @@ e.g.,
- echo 38SMB4488 | GeoConvert -d
Online versions of four of these utilities are provided:
- - <a href="http://geographiclib.sf.net/cgi-bin/GeoConvert">GeoConvert</a>
- - <a href="http://geographiclib.sf.net/cgi-bin/GeodSolve">GeodSolve</a>
- - <a href="http://geographiclib.sf.net/cgi-bin/Planimeter">Planimeter</a>
- - <a href="http://geographiclib.sf.net/cgi-bin/GeoidEval">GeoidEval</a>
- - <a href="http://geographiclib.sf.net/cgi-bin/RhumbSolve">RhumbSolve</a>
+ - <a href="http://geographiclib.sourceforge.net/cgi-bin/GeoConvert">GeoConvert</a>
+ - <a href="http://geographiclib.sourceforge.net/cgi-bin/GeodSolve">GeodSolve</a>
+ - <a href="http://geographiclib.sourceforge.net/cgi-bin/Planimeter">Planimeter</a>
+ - <a href="http://geographiclib.sourceforge.net/cgi-bin/GeoidEval">GeoidEval</a>
+ - <a href="http://geographiclib.sourceforge.net/cgi-bin/RhumbSolve">RhumbSolve</a>
<center>
Back to \ref start. Forward to \ref organization. Up to \ref contents.
@@ -1155,37 +1152,82 @@ Back to \ref utilities. Forward to \ref other. Up to \ref contents.
Back to \ref organization. Forward to \ref geoid. Up to \ref contents.
</center>
-Implementations of subsets of GeographicLib are available in other languages
+Various subsets of GeographicLib have been implemented in other
+languages. In some cases, these are available as independent packages.
+Here is a summary:
+- C (geodesic routines):
+ <a href="C/index.html">
+ documentation</a>, also included with recent versions of
+ <a href="https://github.com/OSGeo/proj.4/wiki">
+ proj.4</a>;
+- Fortran (geodesic routines):
+ <a href="Fortran/index.html">
+ documentation</a>;
+- Java (geodesic routines):
+ <a href="http://repo1.maven.org/maven2/net/sf/geographiclib/GeographicLib-Java/">
+ Maven Central package</a>,
+ <a href="java/index.html">
+ documentation</a>;
+- JavaScript (geodesic routines):
+ <a href="https://www.npmjs.com/package/geographiclib">
+ npm package</a>,
+ <a href="js/index.html">
+ documentation</a>;
+- Python (geodesic routines):
+ <a href="http://pypi.python.org/pypi/geographiclib">
+ PyPI package</a>,
+ <a href="python/index.html">
+ documentation</a>;
+- MATLAB/Octave (geodesic and some other routines):
+ <a href="http://www.mathworks.com/matlabcentral/fileexchange/50605">
+ MATLAB Central package</a>,
+ <a href="http://www.mathworks.com/matlabcentral/fileexchange/50605/content/Contents.m">
+ documentation</a>;
+- C# (.NET wrapper for C++ library):
+ <a href="NET/index.html">
+ documentation</a>.
+
+Some more details are available in the following sections
- \ref c-fortran
- \ref java.
- \ref javascript.
- \ref python.
- \ref matlab.
-- \ref maxima.
- \ref dotnet.
+- \ref maxima.
\section c-fortran C and Fortran implementation
-The directories <code>legacy/C</code> and <code>legacy/Fortran</code>
-contain implementations of Geodesic, GeodesicLine, and PolygonAreaT in C
-and Fortran respectively. These are intended for use in old codes
+This includes the geodesic capabilities of GeographicLib. The source
+code is in the directories <code>legacy/C</code> and
+<code>legacy/Fortran</code>. These are intended for use in old codes
written in these languages and should work any reasonably modern
compiler. These implementations are entirely self-contained and do not
depend on the rest of GeographicLib. Sample main programs to solve the
direct and inverse geodesic problems and to compute polygonal areas are
provided.
+The C library is also included as part of
+<a href="https://github.com/OSGeo/proj.4/wiki">proj.4</a> starting with
+version 4.9.0, where it is used as the computational backend for
+<a href="https://github.com/OSGeo/proj.4/wiki/Mangeod">geod(1)</a>.
+
For documentation, see
- <a href="C/index.html">C library for geodesics</a>,
- <a href="Fortran/index.html">Fortran library for geodesics</a>.
+It is also possible to call the C++ version of GeographicLib directly
+from C and the directory <code>wrapper/C</code> contains a small
+example, which converts heights above the geoid to heights above the
+ellipsoid.
+
\section java Java implementation
-The directory <code>java</code> contains implementations of Geodesic,
-GeodesicLine, and PolygonAreaT in Java. This implementation is entirely
-self-contained and does not depend on the rest of GeographicLib. Sample
-main programs to solve the direct and inverse geodesic problems and to
-compute polygonal areas are provided.
+This includes the geodesic capabilities of GeographicLib. The source
+code is in the directory <code>java</code>. This implementation is
+entirely self-contained and does not depend on the rest of
+GeographicLib. Sample main programs to solve the direct and inverse
+geodesic problems and to compute polygonal areas are provided.
This package is available on Maven Central; so if you're using Apache
Maven as your build system, you can use this package by including the
@@ -1193,7 +1235,7 @@ dependency \verbatim
<dependency>
<groupId>net.sf.geographiclib</groupId>
<artifactId>GeographicLib-Java</artifactId>
- <version>1.45</version>
+ <version>1.46</version>
</dependency>
\endverbatim
in your <code>pom.xml</code>.
@@ -1203,34 +1245,15 @@ For documentation, see
\section javascript JavaScript implementation
-The directory js/src contains the classes
-- Math
-- Accumulator
-- Geodesic
-- GeodesicLine
-- PolygonAreaT
-- DMS
-.
-translated into JavaScript. When GeographicLib is built the JavaScript
-source files are concatenated and compressed into a single file
-<code>geographiclib.min.js</code>. This can be included into your
-document with \code
-<script type="text/javascript"
- src="http://geographiclib.sf.net/scripts/geographiclib.min.js">
-</script> \endcode
-This file gives you the latest version of the library. If you need to
-use a specific version of this file, include a version number as in
-\code
-<script type="text/javascript"
- src="http://geographiclib.sf.net/scripts/geographiclib-1.45.min.js">
-</script> \endcode
-You can visit http://geographiclib.sf.net/scripts/ to see which versions
-are available.
-
-Starting with version 1.45, this package is available as an
-<a href="https://nodejs.org">node</a> package that can be installed with
-<a href="https://www.npmjs.com">npm</a> (thanks to Yurij Mikhalevich for
-help with this work). To install this as a node package, use \verbatim
+This includes the geodesic capabilities of GeographicLib. The source
+code is in the directory <code>js</code>. This implementation is
+entirely self-contained and does not depend on the rest of
+GeographicLib.
+
+The library is available as an
+<a href="https://www.npmjs.com/package/geographiclib">
+ npm package</a>.
+To install this package, use \verbatim
npm install geographiclib \endverbatim
For documentation, see
@@ -1240,208 +1263,83 @@ Examples of using this interface are
- a <a href="../scripts/geod-calc.html">geodesic calculator</a> showing
the solution of direct and inverse geodesic problem, finding
intermediate points on a geodesic line, and computing the area of a
- geodesic polygon.
+ geodesic polygon;
- <a href="../scripts/geod-google.html">displaying geodesics in Google
Maps</a> which shows the geodesic, the geodesic circle, and various
geodesic envelopes.
\section python Python implementation
-A Python implementation of the geodesic routines from GeographicLib
-are provided in the python/geographiclib directory (which is installed
-as PREFIX/lib/python/site-packages/geographiclib, if
-COMMON_INSTALL_PATH is ON, and as PREFIX/python/geographiclib,
-otherwise). This contains implementations of the classes
-- Math
-- Accumulator
-- Geodesic
-- GeodesicLine
-- PolygonAreaT
-
-You can install the Python interface independent of the rest of
-GeographicLib using pip \verbatim
- pip install geographiclib \endverbatim
-This requires root privileges and you might first need to install the
-python-pip package.
-
-Alternatively download
-- <a href="http://pypi.python.org/pypi/geographiclib">
- http://pypi.python.org/pypi/geographiclib</a>
-.
-and unpack the .tar.gz or .zip file. You can "install" these routines,
-so that they are in python's default path with, for example \verbatim
- cd geographiclib-1.16
- python setup.py install
-\endverbatim
-(this will require root privileges). Or else you can set the path
-within Python using \code{.py}
->>> import sys
->>> sys.path.append("/usr/local/lib/python/site-packages")
-\endcode
-
-An example of using this interface is \code{.py}
->>> from geographiclib.geodesic import Geodesic
->>> # The geodesic inverse problem
-... Geodesic.WGS84.Inverse(-41.32, 174.81, 40.96, -5.50)
->>> # The geodesic direct problem
-... Geodesic.WGS84.Direct(40.6, -73.8, 45, 10000e3)
->>> # How to obtain several points along a geodesic
-... line = Geodesic.WGS84.Line(40.6, -73.8, 45)
->>> line.Position( 5000e3)
->>> line.Position(10000e3)
->>> # Computing the area of a geodesic polygon
-... def p(lat,lon): return {'lat': lat, 'lon': lon}
-...
->>> Geodesic.WGS84.Area([p(0, 0), p(0, 90), p(90, 0)])
->>> # Introductory help
-... help(Geodesic)
-\endcode
+This includes the geodesic capabilities of GeographicLib. The source
+code is in the directory <code>python</code>. This implementation is
+entirely self-contained and does not depend on the rest of
+GeographicLib.
-Another illustrative exercise is finding the point midway between JFK
-Airport to Singapore Changi Airport
-\code{.py}
-from geographiclib.geodesic import Geodesic
-
-# Coordinates of airports
-lat1, lon1 = 40.640, -73.779 # JFK
-lat2, lon2 = 1.359, 103.989 # SIN
-
-# Compute path from 1 to 2
-g = Geodesic.WGS84.Inverse(lat1, lon1, lat2, lon2)
+The library is available as an
+<a href="http://pypi.python.org/pypi/geographiclib">
+ PyPI package</a>.
+To install this package, use \verbatim
+ pip install geographiclib \endverbatim
-# Compute midpoint starting at 1
-h = Geodesic.WGS84.Direct(lat1, lon1, g['azi1'], g['s12']/2)
-print(h['lat2'], h['lon2'])
-\endcode
+For documentation, see
+ - <a href="python/index.html">Python library for geodesics</a>.
-(Note: The initial version of setup.py was provided by Andrew MacIntyre
-of the Australian Communications and Media Authority.)
+It is also possible to call the C++ version of GeographicLib directly
+from Python and the directory <code>wrapper/python</code> contains a
+small example, which converts heights above the geoid to heights above
+the ellipsoid.
\section matlab MATLAB and Octave implementations
-The <code>matlab/geographiclib</code> directory contains MATLAB and
-Octave implementations of some of the functions of GeographicLib. To
-use these, start MATLAB or Octave and run one of (for example):
-\verbatim
- addpath /usr/local/share/matlab/geographiclib
- addpath C:/pkg-vc10-x64/GeographicLib- at PROJECT_VERSION@/matlab/geographiclib
- \endverbatim
-A summary of the routines is obtained by \verbatim
- help geographiclib \endverbatim
-These MATLAB functions is also available from the MATLAB File Exchange
-site as the
-<a href="http://www.mathworks.com/matlabcentral/fileexchange/50605">
-GeographicLib toolbox</a>, package 50605.
-
-The functions fall into the following groups
- - Geodesics
- - geoddistance - Distance between points on an ellipsoid
- - geodreckon - Point at specified azimuth, range on an ellipsoid
- - geodarea - Surface area of polygon on an ellipsoid
- - Projections
- - tranmerc_fwd - Forward transverse Mercator projection
- - tranmerc_inv - Inverse transverse Mercator projection
- - polarst_fwd - Forward polar stereographic projection
- - polarst_inv - Inverse polar stereographic projection
- - eqdazim_fwd - Forward azimuthal equidistant projection
- - eqdazim_inv - Inverse azimuthal equidistant projection
- - cassini_fwd - Forward Cassini-Soldner projection
- - cassini_inv - Inverse Cassini-Soldner projection
- - gnomonic_fwd - Forward ellipsoidal gnomonic projection
- - gnomonic_inv - Inverse ellipsoidal gnomonic projection
- - Grid systems
- - utmups_fwd - Convert to UTM/UPS system
- - utmups_inv - Convert from UTM/UPS system
- - mgrs_fwd - Convert UTM/UPS coordinates to MGRS
- - mgrs_inv - Convert MGRS to UTM/UPS coordinates
- - Geoid lookup
- - geoid_height - Compute the height of the geoid
- - geoid_load - Load a geoid model
- - Great ellipses
- - gedistance - Great ellipse distance between points on an ellipsoid
- - gereckon - Point along great ellipse at specified azimuth and range
- - Geometric transformations
- - geocent_fwd - Conversion from geographic to geocentric coordinates
- - geocent_inv - Conversion from geocentric to geographic coordinates
- - loccart_fwd - Convert geographic to local cartesian coordinates
- - loccart_inv - Convert local cartesian to geographic coordinates
- - Utility
- - defaultellipsoid - Return the WGS84 ellipsoid
- - ecc2flat - Convert eccentricity to flattening
- - flat2ecc - Convert flattening to eccentricity
- - Documentation
- - geoddoc - Geodesics on an ellipsoid of revolution
- - projdoc - Geodesic projections for an ellipsoid
- - gedoc - Great ellipses on an ellipsoid of revolution
- .
-These functions reimplement the C++ routines from GeographicLib in
-MATLAB code (but note that routines for great ellipses are <i>only</i>
-available as MATLAB code). Because these functions are all vectorized,
-their performance is comparable to the C++ routines. The minimum
-version numbers required are
+The includes the geodesic capabilities of GeographicLib and
+implementations of the TransverseMercator, PolarStereographic,
+AzimuthalEquidistant, CassiniSoldner, Gnomonic, UTMUPS, MGRS, Geocentric,
+and LocalCartesian classes. In addition, it includes solutions of the
+direct, inverse, and area problems for \ref greatellipse. Because these
+functions are all vectorized, their performance is comparable to the C++
+routines. The minimum version numbers required are
- MATLAB, version 7.9, 2009b,
- Octave, version 3.4, Feb. 2011.
.
In addition, in order to use the geoid routines, Octave needs to have
been built with a version of GraphicsMagick which supports 16-bit
-images.
-
-Previously, some of these routines were packaged as three separate
-packages
- - <a href="http://www.mathworks.com/matlabcentral/fileexchange/39108">
- Geodesics on an ellipsoid of revolution</a>,
- MATLAB File Exchange package 39108.
- - Geodesic projections for an ellipsoid,
- - Great ellipses.
- .
-These packages have now all been incorporated into the
+images. The source code is in the directory
+<code>matlab/geographiclib</code>. This implementation is entirely
+self-contained and does not depend on the rest of GeographicLib.
+
+The library is available as an MATLAB Central package,
<a href="http://www.mathworks.com/matlabcentral/fileexchange/50605">
-GeographicLib toolbox</a>.
+ GeographicLib toolbox</a>.
+
+A summary of the routines is obtained by \verbatim
+ help geographiclib \endverbatim
Prior to version 1.42, GeographicLib was distributed with some MATLAB
functionality offered via compiled interface code. This has now been
-replaced by native MATLAB wrapper functions which call the functions in
-the <a href="http://www.mathworks.com/matlabcentral/fileexchange/50605">
-GeographicLib toolbox</a>. To use these wrapper functions, run one of:
-\verbatim
- addpath /usr/local/share/matlab/geographiclib-legacy
- addpath C:/pkg-vc10-x64/GeographicLib- at PROJECT_VERSION@/matlab/geographiclib-legacy
- \endverbatim
-The <a href="http://www.mathworks.com/matlabcentral/fileexchange/50605">
-GeographicLib toolbox</a> <i>must</i> also be in your MATLAB path. A
-summary of the routines is obtained by \verbatim
+replaced by native MATLAB wrapper functions in
+<code>matlab/geographiclib-legacy</code>; these depend on the
+<a href="http://www.mathworks.com/matlabcentral/fileexchange/50605">
+GeographicLib toolbox</a>.
+A summary of the routines is obtained by \verbatim
help geographiclib-legacy \endverbatim
-These functions are <b>DEPRECATED</b>. Here is a function listing
- - Geodesics
- - geodesicdirect - Wrapper for geodreckon
- - geodesicinverse - Wrapper for geoddistance
- - geodesicline - Another wrapper for geodreckon
- - polygonarea - Wrapper for geodarea
- - Grid systems
- - utmupsforward - Wrapper for utmups_fwd
- - utmupsreverse - Wrapper for utmups_inv
- - mgrsforward - Wrapper for mgrs_fwd
- - mgrsreverse - Wrapper for mgrs_inv
- - Geoid lookup
- - geoidheight - Wrapper for geoid_height
- - Geometric transformations
- - geocentricforward - Wrapper for geocent_fwd
- - geocentricreverse - Wrapper for geocent_inv
- - localcartesianforward - Wrapper for loccart_fwd
- - localcartesianreverse - Wrapper for loccart_inv
- - Deprecated
- - geographiclibinterface - Compile interface code (DEPRECATED)
- .
-The last routine can be used to compile the obsolete interface code
-(which is still provided as C++ code in the same directory). Doing this
-will switch MATLAB from using the native MATLAB routines to the compiled
-interface. However, the native code is easier to deploy and is about as
-fast; so the compiled interface will be removed at some point in 2016.
+
+It is also possible to call the C++ version of GeographicLib directly
+from MATLAB or Octave and the directory <code>wrapper/matlab</code>
+contains a small example, which solves the inverse geodesic problem for
+ellipsoids with arbitrary flattening. (This example is taken from the
+MATLAB interface code which was provided prior to version 1.42.)
+
+\section dotnet .NET wrapper
+
+This is a comprehensive wrapper library, written and maintained by Scott
+Heiman, which exposes all of the functionality of GeographicLib to the
+.NET family of languages. For documentation, see
+ - <a href="NET/index.html">NETGeographicLib .NET wrapper library</a>.
\section maxima Maxima routines
Maxima is a free computer algebra system which can be downloaded from
-http://maxima.sf.net. Maxima was used to generate the series used by
+http://maxima.sourceforge.net. Maxima was used to generate the series used by
TransverseMercator (<a href="tmseries.mac"> tmseries.mac</a>), Geodesic
(<a href="geod.mac"> geod.mac</a>), Rhumb (<a href="rhumbarea.mac">
rhumbarea.mac</a>), \ref gearea (<a href="gearea.mac"> gearea.mac</a>),
@@ -1453,13 +1351,6 @@ solutions in terms of elliptic integrals (<a href="ellint.mac">
ellint.mac</a>). These files contain brief instructions on how to use
them.
-\section dotnet .NET wrapper
-
-This is a comprehensive wrapper library, written and maintained by Scott
-Heiman, which exposes all of the functionality of GeographicLib to the
-.NET family of languages. For documentation, see
- - <a href="NET/index.html">NETGeographicLib .NET wrapper library</a>.
-
<center>
Back to \ref organization. Forward to \ref geoid. Up to \ref contents.
</center>
@@ -1548,13 +1439,13 @@ EGM2008. These data files are available for download:
<td><center>30'</center>
<td><center>0.6</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/geoids-distrib/egm84-30.tar.bz2">
+ <a href="https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm84-30.tar.bz2">
link</a> (0.5)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/geoids-distrib/egm84-30.exe">
+ <a href="https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm84-30.exe">
link</a> (0.8)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/geoids-distrib/egm84-30.zip">
+ <a href="https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm84-30.zip">
link</a> (0.5)</center>
<tr>
<td>egm84-15
@@ -1562,13 +1453,13 @@ EGM2008. These data files are available for download:
<td><center>15'</center>
<td><center>2.1</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/geoids-distrib/egm84-15.tar.bz2">
+ <a href="https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm84-15.tar.bz2">
link</a> (1.5)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/geoids-distrib/egm84-15.exe">
+ <a href="https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm84-15.exe">
link</a> (1.9)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/geoids-distrib/egm84-15.zip">
+ <a href="https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm84-15.zip">
link</a> (2.0)</center>
<tr>
<td>egm96-15
@@ -1576,13 +1467,13 @@ EGM2008. These data files are available for download:
<td><center>15'</center>
<td><center>2.1</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/geoids-distrib/egm96-15.tar.bz2">
+ <a href="https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm96-15.tar.bz2">
link</a> (1.5)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/geoids-distrib/egm96-15.exe">
+ <a href="https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm96-15.exe">
link</a> (1.9)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/geoids-distrib/egm96-15.zip">
+ <a href="https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm96-15.zip">
link</a> (2.0)</center>
<tr>
<td>egm96-5
@@ -1590,13 +1481,13 @@ EGM2008. These data files are available for download:
<td><center>5'</center>
<td><center> 19</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/geoids-distrib/egm96-5.tar.bz2">
+ <a href="https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm96-5.tar.bz2">
link</a> (11)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/geoids-distrib/egm96-5.exe">
+ <a href="https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm96-5.exe">
link</a> (11)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/geoids-distrib/egm96-5.zip">
+ <a href="https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm96-5.zip">
link</a> (17)</center>
<tr>
<td>egm2008-5
@@ -1604,13 +1495,13 @@ EGM2008. These data files are available for download:
<td><center>5'</center>
<td><center> 19</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/geoids-distrib/egm2008-5.tar.bz2">
+ <a href="https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm2008-5.tar.bz2">
link</a> (11)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/geoids-distrib/egm2008-5.exe">
+ <a href="https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm2008-5.exe">
link</a> (11)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/geoids-distrib/egm2008-5.zip">
+ <a href="https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm2008-5.zip">
link</a> (17)</center>
<tr>
<td>egm2008-2_5
@@ -1618,13 +1509,13 @@ EGM2008. These data files are available for download:
<td><center>2.5'</center>
<td><center> 75</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/geoids-distrib/egm2008-2_5.tar.bz2">
+ <a href="https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm2008-2_5.tar.bz2">
link</a> (35)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/geoids-distrib/egm2008-2_5.exe">
+ <a href="https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm2008-2_5.exe">
link</a> (33)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/geoids-distrib/egm2008-2_5.zip">
+ <a href="https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm2008-2_5.zip">
link</a> (65)</center>
<tr>
<td>egm2008-1
@@ -1632,13 +1523,13 @@ EGM2008. These data files are available for download:
<td><center>1'</center>
<td><center>470</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/geoids-distrib/egm2008-1.tar.bz2">
+ <a href="https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm2008-1.tar.bz2">
link</a> (170)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/geoids-distrib/egm2008-1.exe">
+ <a href="https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm2008-1.exe">
link</a> (130)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/geoids-distrib/egm2008-1.zip">
+ <a href="https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm2008-1.zip">
link</a> (390)</center>
</table>
</center>
@@ -1708,13 +1599,13 @@ The gridded data used by the Geoid class is stored in
.
PGM simple graphic format with the following properties
- it is well documented
- <a href="http://netpbm.sf.net/doc/pgm.html">here</a>;
+ <a href="http://netpbm.sourceforge.net/doc/pgm.html">here</a>;
- there are no separate "little-endian" and "big-endian" versions;
- it uses 1 or 2 bytes per pixel;
- pixels can be randomly accessed;
- comments can be added to the file header;
- it is sufficiently simple that it can be easily read without using the
- <a href="http://netpbm.sf.net/doc/libnetpbm.html">libnetpbm</a>
+ <a href="http://netpbm.sourceforge.net/doc/libnetpbm.html">libnetpbm</a>
library (and thus we avoid adding a software dependency to
GeographicLib).
.
@@ -1986,7 +1877,7 @@ two alternatives:
\section testgeoid Test data for geoids
A test set for the geoid models is available at
- - <a href="https://sf.net/projects/geographiclib/files/testdata/GeoidHeights.dat.gz">
+ - <a href="https://sourceforge.net/projects/geographiclib/files/testdata/GeoidHeights.dat.gz">
GeoidHeights.dat.gz</a>
.
This is about 11 MB (compressed). This test set consists of a set of
@@ -2090,52 +1981,52 @@ These gravity models are available for download:
<td><center>180</center>
<td><center>27</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/gravity-distrib/egm84.tar.bz2">
+ <a href="https://sourceforge.net/projects/geographiclib/files/gravity-distrib/egm84.tar.bz2">
link</a> (26)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/gravity-distrib/egm84.exe">
+ <a href="https://sourceforge.net/projects/geographiclib/files/gravity-distrib/egm84.exe">
link</a> (55)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/gravity-distrib/egm84.zip">
+ <a href="https://sourceforge.net/projects/geographiclib/files/gravity-distrib/egm84.zip">
link</a> (26)</center>
<tr>
<td>egm96
<td><center>360</center>
<td><center>2100</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/gravity-distrib/egm96.tar.bz2">
+ <a href="https://sourceforge.net/projects/geographiclib/files/gravity-distrib/egm96.tar.bz2">
link</a> (2100)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/gravity-distrib/egm96.exe">
+ <a href="https://sourceforge.net/projects/geographiclib/files/gravity-distrib/egm96.exe">
link</a> (2300)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/gravity-distrib/egm96.zip">
+ <a href="https://sourceforge.net/projects/geographiclib/files/gravity-distrib/egm96.zip">
link</a> (2100)</center>
<tr>
<td>egm2008
<td><center>2190</center>
<td><center>76000</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/gravity-distrib/egm2008.tar.bz2">
+ <a href="https://sourceforge.net/projects/geographiclib/files/gravity-distrib/egm2008.tar.bz2">
link</a> (75000)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/gravity-distrib/egm2008.exe">
+ <a href="https://sourceforge.net/projects/geographiclib/files/gravity-distrib/egm2008.exe">
link</a> (72000)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/gravity-distrib/egm2008.zip">
+ <a href="https://sourceforge.net/projects/geographiclib/files/gravity-distrib/egm2008.zip">
link</a> (73000)</center>
<tr>
<td>wgs84
<td><center>20</center>
<td><center>1</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/gravity-distrib/wgs84.tar.bz2">
+ <a href="https://sourceforge.net/projects/geographiclib/files/gravity-distrib/wgs84.tar.bz2">
link</a> (1)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/gravity-distrib/wgs84.exe">
+ <a href="https://sourceforge.net/projects/geographiclib/files/gravity-distrib/wgs84.exe">
link</a> (30)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/gravity-distrib/wgs84.zip">
+ <a href="https://sourceforge.net/projects/geographiclib/files/gravity-distrib/wgs84.zip">
link</a> (1)</center>
</table>
</center>
@@ -2307,7 +2198,7 @@ As an illustration, here is egm2008.egm:
EGMF-1
# An Earth Gravity Model (Format 1) file. For documentation on the
# format of this file see
-# http://geographiclib.sf.net/html/gravity.html#gravityformat
+# http://geographiclib.sourceforge.net/html/gravity.html#gravityformat
Name egm2008
Publisher National Geospatial Intelligence Agency
Description Earth Gravity Model 2008
@@ -2596,13 +2487,13 @@ These magnetic models are available for download:
<td><center>2010--2015</center>
<td><center>3</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/magnetic-distrib/wmm2010.tar.bz2">
+ <a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/wmm2010.tar.bz2">
link</a> (2)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/magnetic-distrib/wmm2010.exe">
+ <a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/wmm2010.exe">
link</a> (300)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/magnetic-distrib/wmm2010.zip">
+ <a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/wmm2010.zip">
link</a> (2)</center>
<tr>
<td>wmm2015
@@ -2610,13 +2501,13 @@ These magnetic models are available for download:
<td><center>2015--2020</center>
<td><center>3</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/magnetic-distrib/wmm2015.tar.bz2">
+ <a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/wmm2015.tar.bz2">
link</a> (2)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/magnetic-distrib/wmm2015.exe">
+ <a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/wmm2015.exe">
link</a> (300)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/magnetic-distrib/wmm2015.zip">
+ <a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/wmm2015.zip">
link</a> (2)</center>
<tr>
<td>igrf11
@@ -2624,13 +2515,13 @@ These magnetic models are available for download:
<td><center>1900--2015</center>
<td><center>25</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/magnetic-distrib/igrf11.tar.bz2">
+ <a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/igrf11.tar.bz2">
link</a> (7)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/magnetic-distrib/igrf11.exe">
+ <a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/igrf11.exe">
link</a> (310)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/magnetic-distrib/igrf11.zip">
+ <a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/igrf11.zip">
link</a> (8)</center>
<tr>
<td>igrf12
@@ -2638,13 +2529,13 @@ These magnetic models are available for download:
<td><center>1900--2020</center>
<td><center>26</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/magnetic-distrib/igrf12.tar.bz2">
+ <a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/igrf12.tar.bz2">
link</a> (7)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/magnetic-distrib/igrf12.exe">
+ <a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/igrf12.exe">
link</a> (310)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/magnetic-distrib/igrf12.zip">
+ <a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/igrf12.zip">
link</a> (8)</center>
<tr>
<td>emm2010
@@ -2652,13 +2543,13 @@ These magnetic models are available for download:
<td><center>2010--2015</center>
<td><center>4400</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/magnetic-distrib/emm2010.tar.bz2">
+ <a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/emm2010.tar.bz2">
link</a> (3700)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/magnetic-distrib/emm2010.exe">
+ <a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/emm2010.exe">
link</a> (3000)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/magnetic-distrib/emm2010.zip">
+ <a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/emm2010.zip">
link</a> (4100)</center>
<tr>
<td>emm2015
@@ -2666,13 +2557,13 @@ These magnetic models are available for download:
<td><center>2000--2020</center>
<td><center>4300</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/magnetic-distrib/emm2015.tar.bz2">
+ <a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/emm2015.tar.bz2">
link</a> (660)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/magnetic-distrib/emm2015.exe">
+ <a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/emm2015.exe">
link</a> (1000)</center>
<td><center>
- <a href="https://sf.net/projects/geographiclib/files/magnetic-distrib/emm2015.zip">
+ <a href="https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/emm2015.zip">
link</a> (1100)</center>
</table>
</center>
@@ -2845,7 +2736,7 @@ As an illustration, here is igrf11.wmm:
WMMF-1
# A World Magnetic Model (Format 1) file. For documentation on the
# format of this file see
-# http://geographiclib.sf.net/html/magnetic.html#magneticformat
+# http://geographiclib.sourceforge.net/html/magnetic.html#magneticformat
Name igrf11
Description International Geomagnetic Reference Field 11th Generation
URL http://ngdc.noaa.gov/IAGA/vmod/igrf.html
@@ -2919,7 +2810,7 @@ References:
translated by C. F. F. Karney and R. E. Deakin; preprint:
<a href="http://arxiv.org/abs/0908.1824">arXiv:0908.1824</a>.
- F. R. Helmert,
- <a href="http://geographiclib.sf.net/geodesic-papers/helmert80-en.pdf">
+ <a href="https://dx.doi.org/10.5281/zenodo.32050">
Mathematical and Physical Theories of Higher Geodesy, Part 1 (1880)</a>,
Aeronautical Chart and Information Center (St. Louis, 1964),
Chaps. 5--7.
@@ -2934,10 +2825,10 @@ References:
J. Geodesy 87(1), 43--55 (2013);
DOI: <a href="https://dx.doi.org/10.1007/s00190-012-0578-z">
10.1007/s00190-012-0578-z</a>;
- addenda: <a href="http://geographiclib.sf.net/geod-addenda.html">
+ addenda: <a href="http://geographiclib.sourceforge.net/geod-addenda.html">
geod-addenda.html</a>;
resource page:
- <a href="http://geographiclib.sf.net/geod.html"> geod.html</a>.
+ <a href="http://geographiclib.sourceforge.net/geod.html"> geod.html</a>.
- A collection of some papers on geodesics is available at
http://geographiclib.sourceforge.net/geodesic-papers/biblio.html
- The wikipedia page,
@@ -2947,24 +2838,27 @@ References:
\section testgeod Test data for geodesics
A test set a geodesics is available at
- - <a href="https://sf.net/projects/geographiclib/files/testdata/GeodTest.dat.gz">
+ - <a href="https://sourceforge.net/projects/geographiclib/files/testdata/GeodTest.dat.gz">
GeodTest.dat.gz</a>
+ - C. F. F. Karney, <i>Test set for geodesics</i> (2010), <br>
+ DOI: <a href="https://dx.doi.org/10.5281/zenodo.32156">
+ 10.5281/zenodo.32156</a>.
.
This is about 39 MB (compressed). This consists of a set of geodesics
for the WGS84 ellipsoid. A subset of this (consisting of 1/50 of the
members — about 690 kB, compressed) is available at
- - <a href="https://sf.net/projects/geographiclib/files/testdata/GeodTest-short.dat.gz">
+ - <a href="https://sourceforge.net/projects/geographiclib/files/testdata/GeodTest-short.dat.gz">
GeodTest-short.dat.gz</a>
Each line of the test set gives 10 space delimited numbers
- - latitude for point 1, \e lat1 (degrees, exact)
- - longitude for point 1, \e lon1 (degrees, always 0)
- - azimuth for point 1, \e azi1 (clockwise from north in degrees, exact)
- - latitude for point 2, \e lat2 (degrees, accurate to
+ - latitude at point 1, \e lat1 (degrees, exact)
+ - longitude at point 1, \e lon1 (degrees, always 0)
+ - azimuth at point 1, \e azi1 (clockwise from north in degrees, exact)
+ - latitude at point 2, \e lat2 (degrees, accurate to
10<sup>−18</sup> deg)
- - longitude for point 2, \e lon2 (degrees, accurate to
+ - longitude at point 2, \e lon2 (degrees, accurate to
10<sup>−18</sup> deg)
- - azimuth for point 2, \e azi2 (degrees, accurate to
+ - azimuth at point 2, \e azi2 (degrees, accurate to
10<sup>−18</sup> deg)
- geodesic distance from point 1 to point 2, \e s12 (meters, exact)
- arc distance on the auxiliary sphere, \e a12 (degrees, accurate to
@@ -2982,7 +2876,7 @@ simplicity and without loss of generality, \e lat1 is chosen in
chosen in [0°, 180°]. Furthermore, \e lat1 and \e
azi1 are taken to be multiples of 10<sup>−12</sup> deg and \e s12
is a multiple of 0.1 μm in [0 m, 20003931.4586254 m].
-This results \e lon2 in [0°, 180°] and \e azi2 in [0°,
+This results in \e lon2 in [0°, 180°] and \e azi2 in [0°,
180°].
The direct calculation uses an expansion of the geodesic equations
@@ -3899,7 +3793,7 @@ Go to
-# I do not give full citations of the papers here. You can find these
in the
<a href="http://geographiclib.sourceforge.net/geodesic-papers/biblio.html">
- Online Geodesic Bibliography</a>; this includes links to online
+ Geodesic Bibliography</a>; this includes links to online
versions of the papers.
-# An alternative to exploring geodesics using Jacobi's solution is to
integrate the equations for the geodesics directly. This is the
@@ -3918,7 +3812,7 @@ Go to
J. Geodesy 87(1), 43--55 (2013);
DOI: <a href="https://dx.doi.org/10.1007/s00190-012-0578-z">
10.1007/s00190-012-0578-z</a>;
- addenda: <a href="http://geographiclib.sf.net/geod-addenda.html">
+ addenda: <a href="http://geographiclib.sourceforge.net/geod-addenda.html">
geod-addenda.html</a>.
\section triaxial-coords Triaxial coordinate systems
@@ -4428,7 +4322,7 @@ of ellipsoid. He covers this in greater detail in
<i>Vorlesungen über Dynamik</i>, §28</a>, which is now
available in an <a href="https://www.worldcat.org/oclc/440645889">
English translation: Lectures on Dynamics</a>
-(<a href="http://geographiclib.sf.net/jacobi-errata.html">
+(<a href="http://geographiclib.sourceforge.net/jacobi-errata.html">
errata</a>).
\section jacobi-conformal Conformal projection
@@ -4787,7 +4681,7 @@ References:
transverse Mercator mapping (almost)</a>,
Proc. XXIII Intl. Cartographic Conf. (ICC2007), Moscow (2007).
- F. R. Helmert,
- <a href="http://geographiclib.sf.net/geodesic-papers/helmert80-en.pdf">
+ <a href="https://dx.doi.org/10.5281/zenodo.32050">
Mathematical and Physical Theories of Higher Geodesy, Part 1 (1880)</a>,
Aeronautical Chart and Information Center (St. Louis, 1964),
Chaps. 5--7.
@@ -4806,17 +4700,17 @@ References:
preprint:
<a href="http://arxiv.org/abs/1002.1417"> arXiv:1002.1417</a>;
resource page:
- <a href="http://geographiclib.sf.net/tm.html"> tm.html</a>.
+ <a href="http://geographiclib.sourceforge.net/tm.html"> tm.html</a>.
- C. F. F. Karney,
<a href="https://dx.doi.org/10.1007/s00190-012-0578-z">
Algorithms for geodesics</a>,
J. Geodesy 87(1), 43--55 (2013);
DOI: <a href="https://dx.doi.org/10.1007/s00190-012-0578-z">
10.1007/s00190-012-0578-z</a>;
- addenda: <a href="http://geographiclib.sf.net/geod-addenda.html">
+ addenda: <a href="http://geographiclib.sourceforge.net/geod-addenda.html">
geod-addenda.html</a>;
resource page:
- <a href="http://geographiclib.sf.net/geod.html"> geod.html</a>.
+ <a href="http://geographiclib.sourceforge.net/geod.html"> geod.html</a>.
- L. Krüger,
<a href="https://dx.doi.org/10.2312/GFZ.b103-krueger28"> Konforme
Abbildung des Erdellipsoids in der Ebene</a> (Conformal mapping of
@@ -5359,7 +5253,7 @@ References:
- C. F. F. Karney,
<a href="https://dx.doi.org/10.1007/s00190-012-0578-z">
Algorithms for geodesics</a>, J. Geodesy 87(1), 43--55 (2013);
- addenda: <a href="http://geographiclib.sf.net/geod-addenda.html">
+ addenda: <a href="http://geographiclib.sourceforge.net/geod-addenda.html">
geod-addenda.html</a>.
- A. Pallikaris & G. Latsas,
<a href="https://dx.doi.org/1017/S0373463309005323">
@@ -5720,7 +5614,7 @@ References:
preprint:
<a href="http://arxiv.org/abs/1002.1417"> arXiv:1002.1417</a>;
resource page:
- <a href="http://geographiclib.sf.net/tm.html"> tm.html</a>.
+ <a href="http://geographiclib.sourceforge.net/tm.html"> tm.html</a>.
.
The algorithm for TransverseMercator is based on
Krüger (1912); that for TransverseMercatorExact is
@@ -5733,8 +5627,12 @@ illustration of the exact transverse Mercator grid in Google Earth.
\section testmerc Test data for the transverse Mercator projection
A test set for the transverse Mercator projection is available at
- - <a href="https://sf.net/projects/geographiclib/files/testdata/TMcoords.dat.gz">
+ - <a href="https://sourceforge.net/projects/geographiclib/files/testdata/TMcoords.dat.gz">
TMcoords.dat.gz</a>
+ - C. F. F. Karney, <i>Test data for the transverse Mercator projection</i>
+ (2009), <br>
+ DOI: <a href="https://dx.doi.org/10.5281/zenodo.32470">
+ 10.5281/zenodo.32470</a>.
.
This is about 17 MB (compressed). This test set consists of a set of
geographic coordinates together with the corresponding transverse
@@ -5752,8 +5650,8 @@ Each line of the test set gives 6 space delimited numbers
.
The latitude and longitude are all multiples of 10<sup>−12</sup>
deg and should be regarded as exact, except that longitude =
-82.63627282416406551 should be interpreted as exactly 90 (1 - \e e)
-degrees. These results are computed using Lee's formulas with
+82.63627282416406551 should be interpreted as exactly (1 − \e e)
+90°. These results are computed using Lee's formulas with
<a href="https://en.wikipedia.org/wiki/Maxima_(software)">Maxima</a>'s
bfloats and fpprec set to 80 (so the errors in the data are probably 1/2
of the values quoted above). The Maxima code,
@@ -5776,23 +5674,23 @@ The contents of the file are as follows:
0°, lon ≥ 0°;
- 1000 entries close to lat = 0°, lon = 90° with lat ≥
0°, lon ≤ 90°;
- - 2000 entries close to lat = 0°, lon = 90° (1 − \e e)
+ - 2000 entries close to lat = 0°, lon = (1 − \e e) 90°
with lat ≥ 0°;
- 25000 entries randomly distributed in lat in [−89°,
- 0°], lon in [90° (1 − \e e), 90°];
+ 0°], lon in [(1 − \e e) 90°, 90°];
- 1000 entries randomly distributed on lat in [−89°, 0°],
lon = 90°;
- 1000 entries randomly distributed on lat in [−89°, 0°],
- lon = 90° (1 − \e e);
+ lon = (1 − \e e) 90°;
- 1000 entries close to lat = 0°, lon = 90° (lat < 0°, lon
≤ 90°);
- - 1000 entries close to lat = 0°, lon = 90° (1 − \e e)
- (lat < 0°, lon ≤ 90° (1 − \e e));
+ - 1000 entries close to lat = 0°, lon = (1 − \e e) 90°
+ (lat < 0°, lon ≤ (1 − \e e) 90°);
.
(a total of 287000 entries). The entries for lat < 0° and
-lon in [90° (1 − \e e), 90°] use the "extended"
+lon in [(1 − \e e) 90°, 90°] use the "extended"
domain for the transverse Mercator projection explained in Sec. 5 of
-<a href="http://arxiv.org/abs/1002.1417">arXiv:1002.1417</a>. The first
+Karney (2011). The first
258000 entries have lat ≥ 0° and are suitable for testing
implementations following the standard convention.
@@ -5961,7 +5859,7 @@ This section gives color versions of the figures in
preprint:
<a href="http://arxiv.org/abs/1002.1417"> arXiv:1002.1417</a>;
resource page:
- <a href="http://geographiclib.sf.net/tm.html"> tm.html</a>.
+ <a href="http://geographiclib.sourceforge.net/tm.html"> tm.html</a>.
\b NOTE:
The numbering of the figures matches that in the paper cited above. The
@@ -6221,6 +6119,9 @@ Here we give the complete matrix of relations between all six latitudes;
there are 30 (= 6 × 5) such relations. The
expansions are in terms of the third flattening <i>n</i> =
(<i>a</i> − <i>b</i>)/(<i>a</i> + <i>b</i>).
+(Similar results have been obtained by Sebastián Orihuela,
+<a href="https://sites.google.com/site/geodesiafich/funciones_latitud.pdf">
+<i>Funciones de Latitud</i></a>, 2013.)
This results in expansions in which half the coefficients vanish for all
relations between φ, β, θ, and μ. In addition, the
expansions converge for <i>b</i>/<i>a</i> ∈ (0, ∞).
@@ -6998,10 +6899,10 @@ List of versions in reverse chronological order together with a brief
list of changes. (Note: Old versions of the library use a year-month
style of numbering. Now, the library uses a major and minor version
number.) Recent versions of GeographicLib are available at
-<a href="https://sf.net/projects/geographiclib/files/distrib/">
+<a href="https://sourceforge.net/projects/geographiclib/files/distrib/">
https://sourceforge.net/projects/geographiclib/files/distrib/</a>.
Older versions are in
-<a href="https://sf.net/projects/geographiclib/files/distrib/archive/">
+<a href="https://sourceforge.net/projects/geographiclib/files/distrib/archive/">
https://sourceforge.net/projects/geographiclib/files/distrib/archive/</a>.
The corresponding documentation for these versions is obtained by
@@ -7014,7 +6915,100 @@ of the
<a href="https://sourceforge.net/p/geographiclib/code/ci/release/tree/">
git repository for GeographicLib</a>.
- - <a href="http://geographiclib.sf.net/1.45">Version 1.45</a>
+ - <a href="http://geographiclib.sourceforge.net/1.46">Version 1.46</a>
+ (released 2016-02-15)
+ - The following BUGS have been fixed:
+ - the -w flag to <a href="Planimeter.1.html">Planimeter(1)</a> was
+ being ignored;
+ - in the Java package, the wrong longitude was being returned with
+ direct geodesic calculation with a negative distance when
+ starting point was at a pole (this bug was introduced in version
+ 1.44);
+ - in the JavaScript package, PolygonArea.TestEdge contained a
+ misspelling of a variable name and other typos (problem found by
+ threepointone).
+ - INCOMPATIBLE CHANGES:
+ - make the -w flag (to swap the default order of latitude and
+ longitude) a toggle for all \ref utilities;
+ - the -a option to <a href="GeodSolve.1.html">GeodSolve(1)</a> now
+ toggles (instead of sets) arc mode;
+ - swap order \e coslon and \e sinlon arguments in CircularEngine
+ class.
+ - Remove deprecated functionality:
+ - remove gradient calculation from the Geoid class and
+ <a href="GeoidEval.1.html">GeoidEval(1)</a> (this was inaccurate
+ and of dubious utility);
+ - remove reciprocal flattening functions, InverseFlattening in many
+ classes and Constants::WGS84_r(); stop treating flattening > 1
+ as the reciprocal flattening in constructors;
+ - remove DMS::Decode(string), DMS::DecodeFraction,
+ EllipticFunction:m, EllipticFunction:m1, Math::extradigits,
+ Math::AngNormalize2, PolygonArea::TestCompute;
+ - stop treating LONG_NOWRAP as an alias for LONG_UNROLL in
+ Geodesic (and related classes) and Rhumb;
+ - stop treating full/schmidt as aliases for FULL/SCHMIDT in
+ SphericalEngine (and related classes);
+ - remove qmake project file src/GeographicLib.pro because QtCreator
+ can handle cmake projects now;
+ - remove deprecated Visual Studio 2005 project and solution files.
+ - Changes to GeodesicLine and GeodesicLineExact classes; these
+ changes (1) simplify the process of computing waypoints on a
+ geodesic given two endpoints and (2) allow a GeodesicLine to be
+ defined which is consistent with the solution of the inverse
+ problem (in particular Geodesic::InverseLine the specification of
+ south-going lines which pass the poles in a westerly direction by
+ setting sin α<sub>1</sub> = −0):
+ - the class stores the distance \e s13 and arc length \e a13 to a
+ reference point 3; by default these quantities are NaNs;
+ - GeodesicLine::SetDistance (and GeodesicLine::SetArc) specify the
+ distance (and arc length) to point 3;
+ - GeodesicLine::Distance (and GeodesicLine::Arc) return the
+ distance (and arc length) to point 3;
+ - new methods Geodesic::InverseLine and Geodesic::DirectLine return
+ a GeodesicLine with the reference point 3 defined as point 2 of
+ the corresponding geodesic calculation;
+ - these changes are also included in the C, Java, JavaScript, and
+ Python packages.
+ - Other changes to the geodesic routines:
+ - more accurate solution of the inverse problem when longitude
+ difference is close to 180° (also in C, Fortran, Java,
+ JavaScript, Python, MATLAB, and Maxima packages);
+ - more accurate calculation of lon2 in the inverse calculation with
+ LONG_UNROLL (also in Java, JavaScript, Python packages).
+ - Changes to <a href="GeodSolve.1.html">GeodSolve(1)</a> utility:
+ - the -I and -D options now specify geodesic line calculation via
+ the standard inverse or direct geodesic problems;
+ - rename -l flag to -L to parallel the new -I and -D flags (-l is
+ is retained for backward compatibility but is deprecated), and
+ similarly for <a href="GeodSolve.1.html">RhumbSolve(1)</a>;
+ - the -F flag (in conjunction with the -I or -D flags) specifies that
+ distances read on standard input are fractions of \e s13 or \e
+ a13;
+ - the -a option now toggles arc mode (noted above);
+ - the -w option now toggles longitude first mode (noted above).
+ - Changes to Math class:
+ - Math::copysign added;
+ - add overloaded version of Math::AngDiff which returns the error
+ in the difference. This allows a more accurate treatment of
+ inverse geodesic problem when \e lon12 is close to 180°;
+ - Math::AngRound now converts tiny negative numbers to −0
+ (instead of +0), however −0 is still converted to +0.
+ - Add -S and -T options to
+ <a href="GeoConvert.1.html">GeoConvert(1)</a>.
+ - Add <a href="http://www.sphinx-doc.org/en/stable/">Sphinx</a>
+ documentation for Python package.
+ - Samples of wrapping the C++ library, so it's accessible in other
+ languages, are given in <code>wrapper/C</code>,
+ <code>wrapper/python</code>, and <code>wrapper/matlab</code>.
+ - Binary installers for Windows now use Visual Studio 12 2013.
+ - Remove top-level pom.xml from release (it was specific to SRI).
+ - A reminder: because of the JavaScript changes introduced in version
+ 1.45, you should remove the following installation directories from
+ your system:
+ - Windows: ${CMAKE_INSTALL_PREFIX}/doc/scripts
+ - Others: ${CMAKE_INSTALL_PREFIX}/share/doc/GeographicLib/scripts
+
+ - <a href="http://geographiclib.sourceforge.net/1.45">Version 1.45</a>
(released 2015-09-30)
- Fix BUG in solution of inverse geodesic caused by misbehavior of
some versions of Visual Studio on Windows (fmod(−0.0, 360.0)
@@ -7031,7 +7025,7 @@ git repository for GeographicLib</a>.
- make install now installs the node package in
<code>lib/node_modules/geographiclib</code>;
- add unit tests using mocha;
- - add documentation via JSDoc;
+ - add documentation via <a href="http://usejsdoc.org">JSDoc</a>;
- fix bug Geodesic.GenInverse (this bug, introduced in version
1.44, resulted in the wrong azimuth being reported for points at
the pole).
@@ -7070,7 +7064,7 @@ git repository for GeographicLib</a>.
- turn illegal latitudes into NaNs for Fortran library;
- add test suites for the C and Fortran libraries.
- - <a href="http://geographiclib.sf.net/1.44">Version 1.44</a>
+ - <a href="http://geographiclib.sourceforge.net/1.44">Version 1.44</a>
(released 2015-08-14)
- Various changes to improve accuracy, e.g., by minimizing round-off
errors:
@@ -7168,7 +7162,7 @@ git repository for GeographicLib</a>.
- Geohash uses "invalid" instead of "nan" when the latitude or
longitude is a nan.
- - <a href="http://geographiclib.sf.net/1.43">Version 1.43</a>
+ - <a href="http://geographiclib.sourceforge.net/1.43">Version 1.43</a>
(released 2015-05-23)
- Add the Enhanced Magnetic Model 2015, emm2015. This is valid for
2000 thru the end of 2019. This required some changes in the
@@ -7201,7 +7195,7 @@ git repository for GeographicLib</a>.
similarly sets <code>lon1</code> and <code>lon2</code> in output
dictionary respecting the LONG_UNROLL flag.
- The online version of
- <a href="http://geographiclib.sf.net/cgi-bin/GeodSolve">GeodSolve</a>
+ <a href="http://geographiclib.sourceforge.net/cgi-bin/GeodSolve">GeodSolve</a>
now offers an option to unroll the longitude.
- To support these changes DMS::DecodeLatLon no longer reduces the
longitude to the range [−180°, 180°) and
@@ -7226,15 +7220,15 @@ git repository for GeographicLib</a>.
- Minor internal changes:
- GeodSolve sets the geodesic mask so that unnecessary calculations
are avoided;
- - some routines have migrated into a math class for for Python,
- Java, JavaScript libraries.
+ - some routines have migrated into a math class for the Python,
+ Java, and JavaScript libraries.
- A reminder: because of changes in the installation directories for
non-Windows systems introduced in version 1.42, you should remove
the following directories from your system:
- ${CMAKE_INSTALL_PREFIX}/share/cmake/GeographicLib*
- ${CMAKE_INSTALL_PREFIX}/libexec/GeographicLib/matlab
- - <a href="http://geographiclib.sf.net/1.42">Version 1.42</a>
+ - <a href="http://geographiclib.sourceforge.net/1.42">Version 1.42</a>
(released 2015-04-28)
- DMS::Decode allows a single addition or subtraction operation,
e.g., 70W+0:0:15. This affects the GeoCoords class and the
@@ -7281,7 +7275,7 @@ git repository for GeographicLib</a>.
- Deprecate use of Visual Studio 2005 "-vc8" project files in the
windows directory.
- - <a href="http://geographiclib.sf.net/1.41">Version 1.41</a>
+ - <a href="http://geographiclib.sourceforge.net/1.41">Version 1.41</a>
(released 2015-03-09)
- Fix bug in Rhumb::Inverse (with \e exact = true) and related
functions which causes the wrong distance to be reported if one of
@@ -7293,7 +7287,7 @@ git repository for GeographicLib</a>.
- Split information about \ref jacobi to a separate section and
include more material.
- - <a href="http://geographiclib.sf.net/1.40">Version 1.40</a>
+ - <a href="http://geographiclib.sourceforge.net/1.40">Version 1.40</a>
(released 2014-12-18)
- Add the World Magnetic Model 2015, wmm2015. This is now the
default magnetic model for
@@ -7322,7 +7316,7 @@ git repository for GeographicLib</a>.
- The MATLAB function, geographiclibinterface, which compiles the
wrapper routines for MATLAB now works with MATLAB on a Mac.
- - <a href="http://geographiclib.sf.net/1.39">Version 1.39</a>
+ - <a href="http://geographiclib.sourceforge.net/1.39">Version 1.39</a>
(released 2014-11-11)
- GeographicLib usually normalizes longitudes to the range
[−180°, 180°). However, when solving the direct
@@ -7374,7 +7368,7 @@ git repository for GeographicLib</a>.
<a href="MagneticField.1.html">MagneticField</a> utility accepts
the string "now" as a legal time (meaning today).
- - <a href="http://geographiclib.sf.net/1.38">Version 1.38</a>
+ - <a href="http://geographiclib.sourceforge.net/1.38">Version 1.38</a>
(released 2014-10-02)
- On MacOSX, the installed package is relocatable (for cmake version
2.8.12 and later).
@@ -7388,7 +7382,7 @@ git repository for GeographicLib</a>.
greatellipse.
- Provide man pages for geographiclib-get-{geoids,gravity,magnetic}.
- - <a href="http://geographiclib.sf.net/1.37">Version 1.37</a>
+ - <a href="http://geographiclib.sourceforge.net/1.37">Version 1.37</a>
(released 2014-08-08)
- Add \ref highprec.
- <b>INCOMPATIBLE CHANGE</b>: the static instantiations of various
@@ -7465,7 +7459,7 @@ git repository for GeographicLib</a>.
<code>GEOGRAPHICLIB_VERSION_NUM</code>;
- add solution and project files for Visual Studio Express 2010.
- - <a href="http://geographiclib.sf.net/1.36">Version 1.36</a>
+ - <a href="http://geographiclib.sourceforge.net/1.36">Version 1.36</a>
(released 2014-05-13)
- Changes to comply with NGA's prohibition of the use of the
upper-case letters N/S to designate the hemisphere when displaying
@@ -7503,7 +7497,7 @@ git repository for GeographicLib</a>.
- Add missing std:: qualifications to copy in LocalCartesion and
Geocentric headers (bug found by Clemens).
- - <a href="http://geographiclib.sf.net/1.35">Version 1.35</a>
+ - <a href="http://geographiclib.sourceforge.net/1.35">Version 1.35</a>
(released 2014-03-13)
- Fix blunder in UTMUPS::EncodeEPSG (found by Ben
Adler).
@@ -7523,7 +7517,7 @@ git repository for GeographicLib</a>.
- this release includes a file, pom.xml, which is used by an
experimental build system (based on maven) at SRI.
- - <a href="http://geographiclib.sf.net/1.34">Version 1.34</a>
+ - <a href="http://geographiclib.sourceforge.net/1.34">Version 1.34</a>
(released 2013-12-11)
- Many changes in cmake support:
- minimum version of cmake needed increased to 2.8.4 (which was
@@ -7557,7 +7551,7 @@ git repository for GeographicLib</a>.
with <a href="GeodSolve.1.html">GeodSolve</a> (introduced in
version 1.30).
- - <a href="http://geographiclib.sf.net/1.33">Version 1.33</a>
+ - <a href="http://geographiclib.sourceforge.net/1.33">Version 1.33</a>
(released 2013-10-08)
- Add <a href="NET/index.html">NETGeographic .NET wrapper library</a>
(courtesy of Scott Heiman).
@@ -7567,13 +7561,13 @@ git repository for GeographicLib</a>.
is first called.
- Fix bug in autoconf builds under MacOS.
- - <a href="http://geographiclib.sf.net/1.32">Version 1.32</a>
+ - <a href="http://geographiclib.sourceforge.net/1.32">Version 1.32</a>
(released 2013-07-12)
- Generalize C interface for polygon areas to allow vertices to be
specified incrementally.
- Fix way flags for C++11 support are determined.
- - <a href="http://geographiclib.sf.net/1.31">Version 1.31</a>
+ - <a href="http://geographiclib.sourceforge.net/1.31">Version 1.31</a>
(released 2013-07-01)
- Changes breaking binary compatibility (source compatibility is
maintained):
@@ -7623,7 +7617,7 @@ git repository for GeographicLib</a>.
- Fixes to the way the MATLAB interface routines are built (thanks to
Phil Miller and Chris F.).
- - <a href="http://geographiclib.sf.net/1.30">Version 1.30</a>
+ - <a href="http://geographiclib.sourceforge.net/1.30">Version 1.30</a>
(released 2013-02-27)
- Changes to geodesic routines:
- FIX BUG in fail-safe mechanisms in Geodesic::Inverse;
@@ -7632,13 +7626,13 @@ git repository for GeographicLib</a>.
- allow addition of polygon edges in PolygonArea;
- add full Maxima implementation of geodesic algorithms.
- - <a href="http://geographiclib.sf.net/1.29">Version 1.29</a>
+ - <a href="http://geographiclib.sourceforge.net/1.29">Version 1.29</a>
(released 2013-01-16)
- Changes to allow compilation with libc++ (courtesy of Kal Conley).
- Add description of \ref triaxial to documentation.
- Update journal reference for "Algorithms for geodesics".
- - <a href="http://geographiclib.sf.net/1.28">Version 1.28</a>
+ - <a href="http://geographiclib.sourceforge.net/1.28">Version 1.28</a>
(released 2012-12-11)
- Changes to geodesic routines:
- compute longitude difference exactly;
@@ -7651,7 +7645,7 @@ git repository for GeographicLib</a>.
- include polygon area routine in C and Fortran implementations;
- add doxygen documentation for C and Fortran libraries.
- - <a href="http://geographiclib.sf.net/1.27">Version 1.27</a>
+ - <a href="http://geographiclib.sourceforge.net/1.27">Version 1.27</a>
(released 2012-11-29)
- Changes to geodesic routines:
- add native MATLAB implementations: geoddistance.m, geodreckon.m,
@@ -7667,13 +7661,13 @@ git repository for GeographicLib</a>.
- On MacOSX platforms with the cmake configuration, universal
binaries are built.
- - <a href="http://geographiclib.sf.net/1.26">Version 1.26</a>
+ - <a href="http://geographiclib.sourceforge.net/1.26">Version 1.26</a>
(released 2012-10-22)
- Replace the series used for geodesic areas by one with better
convergence (this only makes an appreciable difference if
|<i>f</i>| > 1/150).
- - <a href="http://geographiclib.sf.net/1.25">Version 1.25</a>
+ - <a href="http://geographiclib.sourceforge.net/1.25">Version 1.25</a>
(released 2012-10-16)
- Changes to geodesic calculations:
- restart Newton's method in Geodesic::Inverse when it goes awry;
@@ -7700,7 +7694,7 @@ git repository for GeographicLib</a>.
vulnerability; see
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-3386
- - <a href="http://geographiclib.sf.net/1.24">Version 1.24</a>
+ - <a href="http://geographiclib.sourceforge.net/1.24">Version 1.24</a>
(released 2012-09-22)
- Allow the specification of the hemisphere in UTM coordinates in
order to provide continuity across the equator:
@@ -7718,7 +7712,7 @@ git repository for GeographicLib</a>.
- Document restrictions on \e f in \ref intro.
- Fix Python interface to work with version 2.6.x.
- - <a href="http://geographiclib.sf.net/1.23">Version 1.23</a>
+ - <a href="http://geographiclib.sourceforge.net/1.23">Version 1.23</a>
(released 2012-07-17)
- Documentation changes:
- remove html documentation from distribution and use web links if
@@ -7741,7 +7735,7 @@ git repository for GeographicLib</a>.
(incorrect results were returned if the tangent latitude was
negative).
- - <a href="http://geographiclib.sf.net/1.22">Version 1.22</a>
+ - <a href="http://geographiclib.sourceforge.net/1.22">Version 1.22</a>
(released 2012-05-27)
- Add Geohash and Ellipsoid classes.
- FIX BUG in AlbersEqualArea for very prolate
@@ -7759,7 +7753,7 @@ git repository for GeographicLib</a>.
CMAKE_INSTALL_PREFIX;
- add a cmake configuration for build tree.
- - <a href="http://geographiclib.sf.net/1.21">Version 1.21</a>
+ - <a href="http://geographiclib.sourceforge.net/1.21">Version 1.21</a>
(released 2012-04-25)
- Support colon-separated DMS output:
- DMS::Encode and
@@ -7778,7 +7772,7 @@ git repository for GeographicLib</a>.
- allow the MATLAB compiler to be specified with the
MATLAB_COMPILER option.
- - <a href="http://geographiclib.sf.net/1.20">Version 1.20</a>
+ - <a href="http://geographiclib.sourceforge.net/1.20">Version 1.20</a>
(released 2012-03-23)
- cmake tweaks:
- improve find_package's matching of compiler versions;
@@ -7789,7 +7783,7 @@ git repository for GeographicLib</a>.
checking by Visual Studio.
- Fix transcription BUG is Geodesic.js.
- - <a href="http://geographiclib.sf.net/1.19">Version 1.19</a>
+ - <a href="http://geographiclib.sourceforge.net/1.19">Version 1.19</a>
(released 2012-03-13)
- Slight improvement in Geodesic::Inverse for very
short lines.
@@ -7799,14 +7793,14 @@ git repository for GeographicLib</a>.
- Add installer for 64-bit Windows; the compiled MATLAB interface is
supplied with the Windows 64-bit installer only.
- - <a href="http://geographiclib.sf.net/1.18">Version 1.18</a>
+ - <a href="http://geographiclib.sourceforge.net/1.18">Version 1.18</a>
(released 2012-02-18)
- Improve documentation on configuration with cmake.
- cmake's find_package ensures that the compiler versions match on Windows.
- Improve documentation on compiling MATLAB interface.
- Binary installer for Windows installs under C:/pkg-vc10 by default.
- - <a href="http://geographiclib.sf.net/1.17">Version 1.17</a>
+ - <a href="http://geographiclib.sourceforge.net/1.17">Version 1.17</a>
(released 2012-01-21)
- Work around optimization BUG in Geodesic::Inverse
with g++ version 4.4.0 (mingw).
@@ -7815,7 +7809,7 @@ git repository for GeographicLib</a>.
- Add simple examples of usage for each class.
- Add internal documentation to the cmake configuration files.
- - <a href="http://geographiclib.sf.net/1.16">Version 1.16</a>
+ - <a href="http://geographiclib.sourceforge.net/1.16">Version 1.16</a>
(released 2011-12-07)
- Add calculation of the earth's gravitational field:
- add NormalGravity GravityModel and
@@ -7849,7 +7843,7 @@ git repository for GeographicLib</a>.
- default height to zero in
<a href="MagneticField.1.html">MagneticField</a>.
- - <a href="http://geographiclib.sf.net/1.15">Version 1.15</a>
+ - <a href="http://geographiclib.sourceforge.net/1.15">Version 1.15</a>
(released 2011-11-08)
- Add calculation of the earth's magnetic field:
- add MagneticModel and MagneticCircle
@@ -7872,7 +7866,7 @@ git repository for GeographicLib</a>.
install setup.py for non-Windows systems.
- Include Doxygen tag file in distribution as doc/html/Geographic.tag.
- - <a href="http://geographiclib.sf.net/1.14">Version 1.14</a>
+ - <a href="http://geographiclib.sourceforge.net/1.14">Version 1.14</a>
(released 2011-09-30)
- Ensure that geographiclib-config.cmake is relocatable.
- Allow more unicode symbols to be used in DMS::Decode.
@@ -7887,7 +7881,7 @@ git repository for GeographicLib</a>.
- Supply a minimal Qt qmake project file for library
src/Geographic.pro.
- - <a href="http://geographiclib.sf.net/1.13">Version 1.13</a>
+ - <a href="http://geographiclib.sourceforge.net/1.13">Version 1.13</a>
(released 2011-08-13)
- Changes to I/O:
- allow : (colon) to be used as a DMS separator in
@@ -7916,7 +7910,7 @@ git repository for GeographicLib</a>.
geographiclib-config.cmake;
- better support for building a shared library under Windows.
- - <a href="http://geographiclib.sf.net/1.12">Version 1.12</a>
+ - <a href="http://geographiclib.sourceforge.net/1.12">Version 1.12</a>
(released 2011-07-21)
- Change license to MIT/X11.
- Add PolygonArea class and equivalent MATLAB function.
@@ -7928,7 +7922,7 @@ git repository for GeographicLib</a>.
- A couple of code changes to enable compilation with Visual
Studio 2003.
- - <a href="http://geographiclib.sf.net/1.11">Version 1.11</a>
+ - <a href="http://geographiclib.sourceforge.net/1.11">Version 1.11</a>
(released 2011-06-27)
- Changes to <a href="Planimeter.1.html">Planimeter</a>:
- add -l flag to <a href="Planimeter.1.html">Planimeter</a> for polyline
@@ -7955,7 +7949,7 @@ git repository for GeographicLib</a>.
- InverseFlattening() has been deprecated (and now returns inf for a
sphere, instead of 0).
- - <a href="http://geographiclib.sf.net/1.10">Version 1.10</a>
+ - <a href="http://geographiclib.sourceforge.net/1.10">Version 1.10</a>
(released 2011-06-11)
- Improvements to MATLAB/Octave interface:
- add {geocentric,localcartesian}{forward,reverse};
@@ -7968,7 +7962,7 @@ git repository for GeographicLib</a>.
- cmake installed in man/man1 instead of share/man/man1;
- cmake did not set the rpath on the tools.
- - <a href="http://geographiclib.sf.net/1.9">Version 1.9</a>
+ - <a href="http://geographiclib.sourceforge.net/1.9">Version 1.9</a>
(released 2011-05-28)
- FIX BUG in area returned by
<a href="Planimeter.1.html">Planimeter</a> for pole encircling polygons.
@@ -7995,10 +7989,10 @@ git repository for GeographicLib</a>.
- Reverse the initial sense of the -s option for
<a href="Planimeter.1.html"> Planimeter</a>.
- Migrate source from subversion to
- <a href="http://geographiclib.git.sf.net/git/gitweb-index.cgi">
+ <a href="http://geographiclib.git.sourceforge.net/git/gitweb-index.cgi">
git</a>.
- - <a href="http://geographiclib.sf.net/1.8">Version 1.8</a>
+ - <a href="http://geographiclib.sourceforge.net/1.8">Version 1.8</a>
(released 2011-02-22)
- Optionally return rotation matrix from Geocentric and
LocalCartesian.
@@ -8018,7 +8012,7 @@ git repository for GeographicLib</a>.
- Remove documentation that duplicates papers on transverse Mercator
and geodesics.
- - <a href="http://geographiclib.sf.net/1.7">Version 1.7</a>
+ - <a href="http://geographiclib.sourceforge.net/1.7">Version 1.7</a>
(released 2010-12-21)
- FIX BUG in scale returned by LambertConformalConic::Reverse.
- Add AlbersEqualArea projection.
@@ -8029,12 +8023,12 @@ git repository for GeographicLib</a>.
- Add solution/project files for Visual Studio 2010 (32-bit only).
- Use C++11 static_assert and math functions, if available.
- - <a href="http://geographiclib.sf.net/1.6">Version 1.6</a>
+ - <a href="http://geographiclib.sourceforge.net/1.6">Version 1.6</a>
(released 2010-11-23)
- FIX BUG introduced in Geoid in version 1.5 (found by
Dave Edwards).
- - <a href="http://geographiclib.sf.net/1.5">Version 1.5</a>
+ - <a href="http://geographiclib.sourceforge.net/1.5">Version 1.5</a>
(released 2010-11-19)
- Improve area calculations for small polygons.
- Add -s and -r flags to <a href="Planimeter.1.html">Planimeter</a>.
@@ -8060,7 +8054,7 @@ git repository for GeographicLib</a>.
- fixes to compile under cygwin;
- tweak expression used to find latitude from conformal latitude.
- - <a href="http://geographiclib.sf.net/1.4">Version 1.4</a>
+ - <a href="http://geographiclib.sourceforge.net/1.4">Version 1.4</a>
(released 2010-09-12)
- Changes to Geodesic and GeodesicLine:
- FIX BUG in Geodesic::Inverse with prolate ellipsoids;
@@ -8091,7 +8085,7 @@ git repository for GeographicLib</a>.
classes which don't return the convergence (or azimuth) and scale.
- Document function parameters and return values consistently.
- - <a href="http://geographiclib.sf.net/1.3">Version 1.3</a>
+ - <a href="http://geographiclib.sourceforge.net/1.3">Version 1.3</a>
(released 2010-07-21)
- Add Gnomonic, the ellipsoid generalization of the
gnomonic projection.
@@ -8111,7 +8105,7 @@ git repository for GeographicLib</a>.
- Update references to Geotrans in MGRS documentation.
- Speed up tmseries.mac.
- - <a href="http://geographiclib.sf.net/1.2">Version 1.2</a>
+ - <a href="http://geographiclib.sourceforge.net/1.2">Version 1.2</a>
(released 2010-05-21)
- FIX BUGS in Geodesic,
- wrong azimuth returned by Direct if point 2 is on a pole;
@@ -8143,7 +8137,7 @@ git repository for GeographicLib</a>.
- <a href="CartConvert.1.html">CartConvert</a> allows the ellipsoid
to be specified with -e.
- - <a href="http://geographiclib.sf.net/1.1">Version 1.1</a>
+ - <a href="http://geographiclib.sourceforge.net/1.1">Version 1.1</a>
(released 2010-02-09)
- FIX BUG (introduced in 2009-03) in EllipticFunction::E(sn,cn,dn).
- Increase accuracy of scale calculation in TransverseMercator and
@@ -8151,7 +8145,7 @@ git repository for GeographicLib</a>.
- Code and documentation changes for consistency with
<a href="http://arxiv.org/abs/1002.1417">arXiv:1002.1417</a>
- - <a href="http://geographiclib.sf.net/1.0">Version 1.0</a>
+ - <a href="http://geographiclib.sourceforge.net/1.0">Version 1.0</a>
(released 2010-01-07)
- Add autoconf configuration files.
- BUG FIX: Improve initial guess for Newton's method in
@@ -8175,7 +8169,7 @@ git repository for GeographicLib</a>.
cached area without disk reads;
- Add inspector functions to query the extent of the cache.
- - <a href="http://geographiclib.sf.net/2009-11">Version 2009-11</a>
+ - <a href="http://geographiclib.sourceforge.net/2009-11">Version 2009-11</a>
(released 2009-11-03)
- Allow specification of "closest UTM zone" in UTMUPS
and <a href="GeoConvert.1.html">GeoConvert</a> (via -t option).
@@ -8190,7 +8184,7 @@ git repository for GeographicLib</a>.
- Improve accuracy of inverse hyperbolic functions.
- Fix the way Math functions handle different precisions.
- - <a href="http://geographiclib.sf.net/2009-10">Version 2009-10</a>
+ - <a href="http://geographiclib.sourceforge.net/2009-10">Version 2009-10</a>
(released 2009-10-18)
- Change web site to http://geographiclib.sourceforge.net
- Several house-cleaning changes:
@@ -8212,12 +8206,12 @@ git repository for GeographicLib</a>.
northings.
- Add 64-bit targets in Visual Studio project files.
- - <a href="http://geographiclib.sf.net/2009-09">Version 2009-09</a>
+ - <a href="http://geographiclib.sourceforge.net/2009-09">Version 2009-09</a>
(released 2009-09-01)
- Add Geoid and
<a href="GeoidEval.1.html">GeoidEval</a> utility.
- - <a href="http://geographiclib.sf.net/2009-08">Version 2009-08</a>
+ - <a href="http://geographiclib.sourceforge.net/2009-08">Version 2009-08</a>
(released 2009-08-14)
- Add CassiniSoldner class and
<a href="GeodesicProj.1.html">EquidistantTest</a> utility.
@@ -8227,17 +8221,17 @@ git repository for GeographicLib</a>.
of the azimuthal scale instead of the reduced length.
- Add -n option to <a href="GeoConvert.1.html">GeoConvert</a>.
- - <a href="http://geographiclib.sf.net/2009-07">Version 2009-07</a>
+ - <a href="http://geographiclib.sourceforge.net/2009-07">Version 2009-07</a>
(released 2009-07-16)
- Speed up the series inversion code in tmseries.mac and geod.mac.
- Reference Borkowski in section on \ref geocentric.
- - <a href="http://geographiclib.sf.net/2009-06">Version 2009-06</a>
+ - <a href="http://geographiclib.sourceforge.net/2009-06">Version 2009-06</a>
(released 2009-06-01)
- Add routines to decode and encode zone+hemisphere to UTMUPS.
- Clean up code in Geodesic.
- - <a href="http://geographiclib.sf.net/2009-05">Version 2009-05</a>
+ - <a href="http://geographiclib.sourceforge.net/2009-05">Version 2009-05</a>
(released 2009-05-01)
- Improvements to Geodesic:
- more economical series expansions,
@@ -8253,7 +8247,7 @@ git repository for GeographicLib</a>.
carefully.
- Remove reference to defunct Constants.cpp from GeographicLib.vcproj.
- - <a href="http://geographiclib.sf.net/2009-04">Version 2009-04</a>
+ - <a href="http://geographiclib.sourceforge.net/2009-04">Version 2009-04</a>
(released 2009-04-01)
- Use compile-time constants to select the order of series in
TransverseMercator.
@@ -8271,7 +8265,7 @@ git repository for GeographicLib</a>.
- add -a, -e, -b options to the <a href="GeodSolve.1.html">Geod</a>
utility.
- - <a href="http://geographiclib.sf.net/2009-03">Version 2009-03</a>
+ - <a href="http://geographiclib.sourceforge.net/2009-03">Version 2009-03</a>
(released 2009-03-01)
- Add Geodesic and the
<a href="GeodSolve.1.html">Geod</a> utility.
@@ -8283,7 +8277,7 @@ git repository for GeographicLib</a>.
to <a href="CartConvert.1.html">CartConvert</a>.
- Use inline functions to define constant doubles in Constants.hpp.
- - <a href="http://geographiclib.sf.net/2009-02">Version 2009-02</a>
+ - <a href="http://geographiclib.sourceforge.net/2009-02">Version 2009-02</a>
(released 2009-01-30)
- Fix documentation of constructors (flattening → inverse
flattening).
@@ -8292,7 +8286,7 @@ git repository for GeographicLib</a>.
and the ECEFConvert utility.
- Gather the documentation on the \ref utilities onto one page.
- - <a href="http://geographiclib.sf.net/2009-01">Version 2009-01</a>
+ - <a href="http://geographiclib.sourceforge.net/2009-01">Version 2009-01</a>
(released 2009-01-12)
- First proper release of library.
- More robust TransverseMercatorExact:
diff --git a/doc/Makefile.in b/doc/Makefile.in
index b2a3048..fac283b 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -79,7 +89,6 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -87,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/include/GeographicLib/Config-ac.h
CONFIG_CLEAN_FILES =
@@ -111,6 +121,7 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -163,6 +174,7 @@ LTLIBOBJS = @LTLIBOBJS@
LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@
LT_REVISION = @LT_REVISION@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -351,7 +363,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu doc/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -528,6 +539,8 @@ uninstall-am:
mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am
+.PRECIOUS: Makefile
+
doc: html/index.html
diff --git a/doc/NETGeographicLib.dox b/doc/NETGeographicLib.dox
index 2ace891..b9b7c5b 100644
--- a/doc/NETGeographicLib.dox
+++ b/doc/NETGeographicLib.dox
@@ -11,8 +11,12 @@
/**
\mainpage NETGeographicLib library
\author Scott Heiman (mrmtdew2 at outlook.com)
-\version 1.44
-\date 2015-08-01
+\version 1.46
+\date 2016-02-15
+
+The documentation for other versions is available at
+<tt>http://geographiclib.sourceforge.net/m.nn/NET</tt> for versions numbers
+<tt>m.nn</tt> ≥ 1.33.
\section abstract-net Abstract
@@ -33,7 +37,7 @@ versions of Microsoft Visual Studio.
NETGeographicLib has been tested with C#, Managed C++, and Visual Basic.
Sample code snippets can be found in
-\<install folder\>/GeographicLib-1.40/dotnet/examples.
+\<install folder\>/GeographicLib-1.46/dotnet/examples.
\section differences Differences between NETGeographicLib and GeographicLib
@@ -139,7 +143,7 @@ to any Visual Basic source that uses NETGeographicLib classes.
A C# sample application is provided that demonstrates NETGeographicLib classes.
The source code for the sample application is located in
-\<install folder\>/GeographicLib-1.40/dotnet/Projections. The sample
+\<install folder\>/GeographicLib-1.46/dotnet/Projections. The sample
application creates a tabbed dialog. Each tab provides data entry fields that
allow the user to exercise one or more NETGeographicLib classes.
diff --git a/doc/geodesic-c.dox b/doc/geodesic-c.dox
index b268364..a92cb00 100644
--- a/doc/geodesic-c.dox
+++ b/doc/geodesic-c.dox
@@ -11,29 +11,34 @@
/**
\mainpage Geodesic routines implemented in C
\author Charles F. F. Karney (charles at karney.com)
-\version 1.45
+\version 1.46
+
+The documentation for other versions is available at
+<tt>http://geographiclib.sourceforge.net/m.nn/C</tt> for versions numbers
+<tt>m.nn</tt> ≥ 1.28.
\section abstract-c Abstract
This is a C implementation of the geodesic algorithms from <a
-href="http://geographiclib.sf.net">GeographicLib</a>. This is a
+href="http://geographiclib.sourceforge.net">GeographicLib</a>. This is a
self-contained library (requiring only the standard C math library)
which makes it easy to do geodesic computations for an ellipsoid of
-revolution in a C program. It uses ANSI C as described in
-B. W. Kernigan and D. M. Ritchie, The C Programming Language, 2nd
-Ed. (Prentice Hall, 1988), and so should compile correctly with just
-about any C compiler.
+revolution in a C program. It is included with the recent version of
+<a href="https://github.com/OSGeo/proj.4/wiki">proj.4</a>.
+It uses ANSI C as described in B. W. Kernigan and D. M. Ritchie, The C
+Programming Language, 2nd Ed. (Prentice Hall, 1988), and so should
+compile correctly with just about any C compiler.
\section download-c Downloading the source
The C library is part of %GeographicLib which available for download at
-- <a href="https://sf.net/projects/geographiclib/files/distrib/GeographicLib-1.45.tar.gz">
- GeographicLib-1.45.tar.gz</a>
-- <a href="https://sf.net/projects/geographiclib/files/distrib/GeographicLib-1.45.zip">
- GeographicLib-1.45.zip</a>
+- <a href="https://sourceforge.net/projects/geographiclib/files/distrib/GeographicLib-1.46.tar.gz">
+ GeographicLib-1.46.tar.gz</a>
+- <a href="https://sourceforge.net/projects/geographiclib/files/distrib/GeographicLib-1.46.zip">
+ GeographicLib-1.46.zip</a>
.
as either a compressed tar file (tar.gz) or a zip file. After unpacking
-the source, the C library can be found in GeographicLib-1.45/legacy/C.
+the source, the C library can be found in the directory <tt>legacy/C</tt>.
The library consists of two files geodesic.c and geodesic.h.
The library is also included as part of
@@ -42,10 +47,17 @@ version 4.9.0, where it is used as the computational backend for
<a href="https://github.com/OSGeo/proj.4/wiki/Mangeod">geod(1)</a>.
Instructions for how to use the library via proj.4 are given below.
+Licensed under the
+<a href="http://www.opensource.org/licenses/MIT">MIT/X11 License</a>; see
+<a href="http://geographiclib.sourceforge.net/html/LICENSE.txt">LICENSE.txt</a>.
+
\section doc-c Library documentation
-The interface to the library is documented via doxygen in the header
-file. To access this, see geodesic.h.
+Here is the
+\link geodesic.h <i>application programming interface</i>\endlink
+for the library (this is just the documentation for the header file,
+geodesic.h). See also the documentation on the structures geod_geodesic,
+geod_geodesicline, and geod_polygon.
\section samples-c Sample programs
@@ -116,31 +128,76 @@ echo 30 0 29.5 179.5 | ./inverse \endverbatim
<a href="https://dx.doi.org/10.1007/s00190-012-0578-z">
Algorithms for geodesics</a>,
J. Geodesy <b>87</b>, 43--55 (2013)
- (<a href="http://geographiclib.sf.net/geod-addenda.html"> addenda</a>).
+ (<a href="http://geographiclib.sourceforge.net/geod-addenda.html"> addenda</a>).
- A longer paper on geodesics: C. F. F. Karney,
<a href="http://arxiv.org/abs/1102.1215v1">Geodesics
on an ellipsoid of revolution</a>,
Feb. 2011
- (<a href="http://geographiclib.sf.net/geod-addenda.html#geod-errata">
+ (<a href="http://geographiclib.sourceforge.net/geod-addenda.html#geod-errata">
errata</a>).
-- <a href="http://geographiclib.sf.net">The GeographicLib web site</a>.
-- <a href="../index.html">The C++ library</a>.
-- <a href="../java/index.html">The Java library</a>.
-- <a href="../js/index.html">The JavaScript library</a>.
-- <a href="../Fortran/index.html">The Fortran library</a>.
-- Documentation on the C++ classes: GeographicLib::Geodesic,
- GeographicLib::GeodesicLine, GeographicLib::PolygonAreaT.
-- The section in the %GeographicLib documentation on geodesics: \ref
- geodesic.
-- <a href="http://geographiclib.sf.net/geodesic-papers/biblio.html">
- An online geodesic bibliography</a>.
+- <a href="https://sourceforge.net/projects/geographiclib/">
+ Main project page</a>
+- <a href="http://geographiclib.sourceforge.net/">
+ GeographicLib web site</a>
+ - Documentation on the C++ classes: GeographicLib::Geodesic,
+ GeographicLib::GeodesicLine, GeographicLib::PolygonAreaT.
+ - The section in the %GeographicLib documentation on geodesics: \ref
+ geodesic.
+- <a href="http://sourceforge.net/p/geographiclib/code/ci/release/tree/">
+ git repository</a>
+- Implementations in various languages
+ - C++ (complete library):
+ <a href="../index.html">
+ documentation</a>,
+ <a href="https://sourceforge.net/projects/geographiclib/files/distrib">
+ download</a>;
+ - C (geodesic routines):
+ <a href="../C/index.html">
+ documentation</a>, also included with recent versions of
+ <a href="https://github.com/OSGeo/proj.4/wiki">
+ proj.4</a>;
+ - Fortran (geodesic routines):
+ <a href="../Fortran/index.html">
+ documentation</a>;
+ - Java (geodesic routines):
+ <a href="http://repo1.maven.org/maven2/net/sf/geographiclib/GeographicLib-Java/">
+ Maven Central package</a>,
+ <a href="../java/index.html">
+ documentation</a>;
+ - JavaScript (geodesic routines):
+ <a href="https://www.npmjs.com/package/geographiclib">
+ npm package</a>,
+ <a href="../js/index.html">
+ documentation</a>;
+ - Python (geodesic routines):
+ <a href="http://pypi.python.org/pypi/geographiclib">
+ PyPI package</a>,
+ <a href="../python/index.html">
+ documentation</a>;
+ - Matlab/Octave (geodesic and some other routines):
+ <a href="http://www.mathworks.com/matlabcentral/fileexchange/50605">
+ Matlab Central package</a>,
+ <a href="http://www.mathworks.com/matlabcentral/fileexchange/50605/content/Contents.m">
+ documentation</a>;
+ - C# (.NET wrapper for complete C++ library):
+ <a href="../NET/index.html">
+ documentation</a>.
+- <a href="http://geographiclib.sourceforge.net/geodesic-papers/biblio.html">
+ A geodesic bibliography</a>.
- The wikipedia page,
<a href="https://en.wikipedia.org/wiki/Geodesics_on_an_ellipsoid">
Geodesics on an ellipsoid</a>.
\section changes-c Change log
- - <a href="http://geographiclib.sf.net/1.45/C">Version 1.45</a>
+ - <a href="http://geographiclib.sourceforge.net/1.46/C">Version 1.46</a>
+ (released 2016-02-15)
+ - Add s13 and a13 to the geod_geodesicline struct.
+ - Add geod_directline, geod_gendirectline, and geod_inverseline.
+ - More accurate inverse solution when longitude difference is close
+ to 180°.
+
+ - <a href="http://geographiclib.sourceforge.net/1.45/C">Version 1.45</a>
(released 2015-09-30)
- The solution of the inverse problem now correctly returns NaNs if
one of the latitudes is a NaN.
@@ -148,7 +205,7 @@ echo 30 0 29.5 179.5 | ./inverse \endverbatim
configuring with cmake.
- Add geod_polygon_clear().
- - <a href="http://geographiclib.sf.net/1.44/C">Version 1.44</a>
+ - <a href="http://geographiclib.sourceforge.net/1.44/C">Version 1.44</a>
(released 2015-08-14)
- Improve accuracy of calculations by evaluating trigonometric
functions more carefully and replacing the series for the reduced
diff --git a/doc/geodesic-for.dox b/doc/geodesic-for.dox
index 25437f2..e83bfcc 100644
--- a/doc/geodesic-for.dox
+++ b/doc/geodesic-for.dox
@@ -11,12 +11,16 @@
/**
\mainpage Geodesic routines implemented in Fortran
\author Charles F. F. Karney (charles at karney.com)
-\version 1.45
+\version 1.46
+
+The documentation for other versions is available at
+<tt>http://geographiclib.sourceforge.net/m.nn/Fortran</tt> for versions numbers
+<tt>m.nn</tt> ≥ 1.28.
\section abstract-for Abstract
This is a Fortran implementation of the geodesic algorithms from <a
-href="http://geographiclib.sf.net">GeographicLib</a>. This is a
+href="http://geographiclib.sourceforge.net">GeographicLib</a>. This is a
self-contained library which makes it easy to do geodesic computations
for an ellipsoid of revolution in a Fortran program. It is written in
Fortran 77 (avoiding features which are now deprecated) and should
@@ -25,20 +29,26 @@ compile correctly with just about any Fortran compiler.
\section download-for Downloading the source
The Fortran library is part of %GeographicLib which available for download at
-- <a href="https://sf.net/projects/geographiclib/files/distrib/GeographicLib-1.45.tar.gz">
- GeographicLib-1.45.tar.gz</a>
-- <a href="https://sf.net/projects/geographiclib/files/distrib/GeographicLib-1.45.zip">
- GeographicLib-1.45.zip</a>
+- <a href="https://sourceforge.net/projects/geographiclib/files/distrib/GeographicLib-1.46.tar.gz">
+ GeographicLib-1.46.tar.gz</a>
+- <a href="https://sourceforge.net/projects/geographiclib/files/distrib/GeographicLib-1.46.zip">
+ GeographicLib-1.46.zip</a>
.
as either a compressed tar file (tar.gz) or a zip file. After unpacking
-the source, the Fortran library can be found in
-GeographicLib-1.45/legacy/Fortran. The library consists of the file
-geodesic.for.
+the source, the Fortran library can be found in the directory
+<tt>legacy/Fortran</tt>. The library consists of the file
+geodesic.for. The Fortran-90 interface is defined in geodesic.inc.
+
+Licensed under the
+<a href="http://www.opensource.org/licenses/MIT">MIT/X11 License</a>; see
+<a href="http://geographiclib.sourceforge.net/html/LICENSE.txt">LICENSE.txt</a>.
\section doc-for Library documentation
-The interface to the library is documented via doxygen in the source
-file. To access this, see geodesic.for.
+Here is the
+\link geodesic.for <i>application programming interface</i>\endlink
+for the library (this is just the documentation for the source file,
+geodesic.for).
\section samples-for Sample programs
@@ -102,31 +112,74 @@ and are therefore in the public domain.
<a href="https://dx.doi.org/10.1007/s00190-012-0578-z">
Algorithms for geodesics</a>,
J. Geodesy <b>87</b>, 43--55 (2013)
- (<a href="http://geographiclib.sf.net/geod-addenda.html"> addenda</a>).
+ (<a href="http://geographiclib.sourceforge.net/geod-addenda.html"> addenda</a>).
- A longer paper on geodesics: C. F. F. Karney,
<a href="http://arxiv.org/abs/1102.1215v1">Geodesics
on an ellipsoid of revolution</a>,
Feb. 2011
- (<a href="http://geographiclib.sf.net/geod-addenda.html#geod-errata">
+ (<a href="http://geographiclib.sourceforge.net/geod-addenda.html#geod-errata">
errata</a>).
-- <a href="http://geographiclib.sf.net">The GeographicLib web site</a>.
-- <a href="../index.html">The C++ library</a>.
-- <a href="../C/index.html">The C library</a>.
-- <a href="../java/index.html">The Java library</a>.
-- <a href="../js/index.html">The JavaScript library</a>.
-- Documentation on the C++ classes: GeographicLib::Geodesic,
- GeographicLib::GeodesicLine, GeographicLib::PolygonAreaT.
-- The section in the %GeographicLib documentation on geodesics: \ref
- geodesic.
-- <a href="http://geographiclib.sf.net/geodesic-papers/biblio.html">
- An online geodesic bibliography</a>.
+- <a href="https://sourceforge.net/projects/geographiclib/">
+ Main project page</a>
+- <a href="http://geographiclib.sourceforge.net/">
+ GeographicLib web site</a>
+ - Documentation on the C++ classes: GeographicLib::Geodesic,
+ GeographicLib::GeodesicLine, GeographicLib::PolygonAreaT.
+ - The section in the %GeographicLib documentation on geodesics: \ref
+ geodesic.
+- <a href="http://sourceforge.net/p/geographiclib/code/ci/release/tree/">
+ git repository</a>
+- Implementations in various languages
+ - C++ (complete library):
+ <a href="../index.html">
+ documentation</a>,
+ <a href="https://sourceforge.net/projects/geographiclib/files/distrib">
+ download</a>;
+ - C (geodesic routines):
+ <a href="../C/index.html">
+ documentation</a>, also included with recent versions of
+ <a href="https://github.com/OSGeo/proj.4/wiki">
+ proj.4</a>;
+ - Fortran (geodesic routines):
+ <a href="../Fortran/index.html">
+ documentation</a>;
+ - Java (geodesic routines):
+ <a href="http://repo1.maven.org/maven2/net/sf/geographiclib/GeographicLib-Java/">
+ Maven Central package</a>,
+ <a href="../java/index.html">
+ documentation</a>;
+ - JavaScript (geodesic routines):
+ <a href="https://www.npmjs.com/package/geographiclib">
+ npm package</a>,
+ <a href="../js/index.html">
+ documentation</a>;
+ - Python (geodesic routines):
+ <a href="http://pypi.python.org/pypi/geographiclib">
+ PyPI package</a>,
+ <a href="../python/index.html">
+ documentation</a>;
+ - Matlab/Octave (geodesic and some other routines):
+ <a href="http://www.mathworks.com/matlabcentral/fileexchange/50605">
+ Matlab Central package</a>,
+ <a href="http://www.mathworks.com/matlabcentral/fileexchange/50605/content/Contents.m">
+ documentation</a>;
+ - C# (.NET wrapper for complete C++ library):
+ <a href="../NET/index.html">
+ documentation</a>.
+- <a href="http://geographiclib.sourceforge.net/geodesic-papers/biblio.html">
+ A geodesic bibliography</a>.
- The wikipedia page,
<a href="https://en.wikipedia.org/wiki/Geodesics_on_an_ellipsoid">
Geodesics on an ellipsoid</a>.
\section changes-for Change log
- - <a href="http://geographiclib.sf.net/1.45/Fortran">Version 1.45</a>
+ - <a href="http://geographiclib.sourceforge.net/1.46/Fortran">Version 1.46</a>
+ (released 2016-02-15)
+ - More accurate inverse solution when longitude difference is close
+ to 180°.
+
+ - <a href="http://geographiclib.sourceforge.net/1.45/Fortran">Version 1.45</a>
(released 2015-09-30)
- The solution of the inverse problem now correctly returns NaNs if
one of the latitudes is a NaN.
@@ -136,7 +189,7 @@ and are therefore in the public domain.
90°] as NaNs; so the sample programs no longer check for legal
values of latitude.
- - <a href="http://geographiclib.sf.net/1.44/Fortran">Version 1.44</a>
+ - <a href="http://geographiclib.sourceforge.net/1.44/Fortran">Version 1.44</a>
(released 2015-08-14)
- Improve accuracy of calculations by evaluating trigonometric
functions more carefully and replacing the series for the reduced
diff --git a/doc/geodseries30.html b/doc/geodseries30.html
index fc8f6c9..59cf575 100644
--- a/doc/geodseries30.html
+++ b/doc/geodseries30.html
@@ -3,8 +3,7 @@
<title>
Series for geodesic calculations
</title>
- <meta http-equiv="Content-Type"
- content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<body>
<h2>
Series for geodesic calculations
@@ -21,7 +20,7 @@ flattening. See
<a href="https://dx.doi.org/10.1007/s00190-012-0578-z">
10.1007/s00190-012-0578-z</a>
(<a href="https://dx.doi.org/10.1007/s00190-012-0578-z">pdf</a>);
- addenda: <a href="http://geographiclib.sf.net/geod-addenda.html">
+ addenda: <a href="http://geographiclib.sourceforge.net/geod-addenda.html">
geod-addenda.html</a>.
</blockquote>
diff --git a/doc/tmseries30.html b/doc/tmseries30.html
index 505020e..2739772 100644
--- a/doc/tmseries30.html
+++ b/doc/tmseries30.html
@@ -3,8 +3,7 @@
<title>
Krueger's series for the transverse Mercator projection
</title>
- <meta http-equiv="Content-Type"
- content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<body>
<h2>
Krueger's series for the transverse Mercator projection
@@ -29,7 +28,7 @@
J. Geodesy 85(8), 475–485 (Aug. 2011); preprint
<a href="http://arxiv.org/abs/1002.1417">arXiv:1002.1417</a>;
resource page
- <a href="http://geographiclib.sf.net/tm.html">tm.html</a>.
+ <a href="http://geographiclib.sourceforge.net/tm.html">tm.html</a>.
</blockquote>
<pre>
diff --git a/dotnet/NETGeographicLib/CMakeLists.txt b/dotnet/NETGeographicLib/CMakeLists.txt
index 7100d84..d83d064 100644
--- a/dotnet/NETGeographicLib/CMakeLists.txt
+++ b/dotnet/NETGeographicLib/CMakeLists.txt
@@ -38,7 +38,7 @@ endif ()
if (NOT CMAKE_VERSION VERSION_LESS 3.0)
# Suppress 3.0 warnings about use of the LOCATION target property
cmake_policy (SET CMP0026 OLD)
-endif()
+endif ()
# Install pdb file.
foreach (_c ${CMAKE_CONFIGURATION_TYPES})
diff --git a/dotnet/NETGeographicLib/Geodesic.cpp b/dotnet/NETGeographicLib/Geodesic.cpp
index 1fbb6a8..28c5824 100644
--- a/dotnet/NETGeographicLib/Geodesic.cpp
+++ b/dotnet/NETGeographicLib/Geodesic.cpp
@@ -10,6 +10,7 @@
**********************************************************************/
#include "stdafx.h"
#include <GeographicLib/Geodesic.hpp>
+#include <GeographicLib/GeodesicLine.hpp>
#include "Geodesic.h"
#include "GeodesicLine.h"
#include "NETGeographicLib.h"
@@ -474,6 +475,38 @@ GeodesicLine^ Geodesic::Line(double lat1, double lon1, double azi1,
}
//*****************************************************************************
+GeodesicLine^ Geodesic::InverseLine(double lat1, double lon1, double lat2,
+ double lon2, NETGeographicLib::Mask caps)
+{
+ return gcnew GeodesicLine(m_pGeodesic->InverseLine(lat1, lon1, lat2,
+ lon2, static_cast<unsigned int>(caps)));
+}
+
+//*****************************************************************************
+GeodesicLine^ Geodesic::DirectLine(double lat1, double lon1, double azi1,
+ double s12, NETGeographicLib::Mask caps)
+{
+ return gcnew GeodesicLine(m_pGeodesic->DirectLine(lat1, lon1, azi1,
+ s12, static_cast<unsigned int>(caps)));
+}
+
+//*****************************************************************************
+GeodesicLine^ Geodesic::ArcDirectLine(double lat1, double lon1, double azi1,
+ double a12, NETGeographicLib::Mask caps)
+{
+ return gcnew GeodesicLine(m_pGeodesic->ArcDirectLine(lat1, lon1, azi1,
+ a12, static_cast<unsigned int>(caps)));
+}
+
+//*****************************************************************************
+GeodesicLine^ Geodesic::GenDirectLine(double lat1, double lon1, double azi1,
+ bool arcmode, double s12_a12, NETGeographicLib::Mask caps)
+{
+ return gcnew GeodesicLine(m_pGeodesic->GenDirectLine(lat1, lon1, azi1,
+ arcmode, s12_a12, static_cast<unsigned int>(caps)));
+}
+
+//*****************************************************************************
double Geodesic::MajorRadius::get() { return m_pGeodesic->MajorRadius(); }
//*****************************************************************************
diff --git a/dotnet/NETGeographicLib/Geodesic.h b/dotnet/NETGeographicLib/Geodesic.h
index ebec5c9..8c91bdf 100644
--- a/dotnet/NETGeographicLib/Geodesic.h
+++ b/dotnet/NETGeographicLib/Geodesic.h
@@ -145,7 +145,7 @@ namespace NETGeographicLib
* J. Geodesy <b>87</b>, 43--55 (2013);
* DOI: <a href="https://dx.doi.org/10.1007/s00190-012-0578-z">
* 10.1007/s00190-012-0578-z</a>;
- * addenda: <a href="http://geographiclib.sf.net/geod-addenda.html">
+ * addenda: <a href="http://geographiclib.sourceforge.net/geod-addenda.html">
* geod-addenda.html</a>.
* .
* For more information on geodesics see \ref geodesic.
@@ -235,12 +235,10 @@ namespace NETGeographicLib
**********************************************************************/
AREA = 1U<<14 | unsigned(captype::CAP_C4),
/**
- * Unroll \e lon2 in the direct calculation. (This flag used to be
- * called LONG_NOWRAP.)
+ * Unroll \e lon2 in the direct calculation.
* @hideinitializer
**********************************************************************/
LONG_UNROLL = 1U<<15,
- LONG_NOWRAP = LONG_UNROLL,
/**
* All capabilities, calculate everything. (LONG_UNROLL is not
* included in this mask.)
@@ -726,6 +724,99 @@ namespace NETGeographicLib
GeodesicLine^ Line(double lat1, double lon1, double azi1,
NETGeographicLib::Mask caps );
+ /**
+ * Define a GeodesicLine in terms of the inverse geodesic problem.
+ *
+ * @param[in] lat1 latitude of point 1 (degrees).
+ * @param[in] lon1 longitude of point 1 (degrees).
+ * @param[in] lat2 latitude of point 2 (degrees).
+ * @param[in] lon2 longitude of point 2 (degrees).
+ * @param[in] caps bitor'ed combination of Geodesic::mask values
+ * specifying the capabilities the GeodesicLine object should possess,
+ * i.e., which quantities can be returned in calls to
+ * GeodesicLine::Position.
+ * @return a GeodesicLine object.
+ *
+ * This function sets point 3 of the GeodesicLine to correspond to point 2
+ * of the inverse geodesic problem.
+ *
+ * \e lat1 and \e lat2 should be in the range [−90°, 90°].
+ **********************************************************************/
+ GeodesicLine^ InverseLine(double lat1, double lon1, double lat2,
+ double lon2, NETGeographicLib::Mask caps);
+
+ /**
+ * Define a GeodesicLine in terms of the direct geodesic problem specified
+ * in terms of distance.
+ *
+ * @param[in] lat1 latitude of point 1 (degrees).
+ * @param[in] lon1 longitude of point 1 (degrees).
+ * @param[in] azi1 azimuth at point 1 (degrees).
+ * @param[in] s12 distance between point 1 and point 2 (meters); it can be
+ * negative.
+ * @param[in] caps bitor'ed combination of Geodesic::mask values
+ * specifying the capabilities the GeodesicLine object should possess,
+ * i.e., which quantities can be returned in calls to
+ * GeodesicLine::Position.
+ * @return a GeodesicLine object.
+ *
+ * This function sets point 3 of the GeodesicLine to correspond to point 2
+ * of the direct geodesic problem.
+ *
+ * \e lat1 should be in the range [−90°, 90°].
+ **********************************************************************/
+ GeodesicLine^ DirectLine(double lat1, double lon1, double azi1,
+ double s12, NETGeographicLib::Mask caps);
+
+ /**
+ * Define a GeodesicLine in terms of the direct geodesic problem specified
+ * in terms of arc length.
+ *
+ * @param[in] lat1 latitude of point 1 (degrees).
+ * @param[in] lon1 longitude of point 1 (degrees).
+ * @param[in] azi1 azimuth at point 1 (degrees).
+ * @param[in] a12 arc length between point 1 and point 2 (degrees); it can
+ * be negative.
+ * @param[in] caps bitor'ed combination of Geodesic::mask values
+ * specifying the capabilities the GeodesicLine object should possess,
+ * i.e., which quantities can be returned in calls to
+ * GeodesicLine::Position.
+ * @return a GeodesicLine object.
+ *
+ * This function sets point 3 of the GeodesicLine to correspond to point 2
+ * of the direct geodesic problem.
+ *
+ * \e lat1 should be in the range [−90°, 90°].
+ **********************************************************************/
+ GeodesicLine^ ArcDirectLine(double lat1, double lon1, double azi1,
+ double a12, NETGeographicLib::Mask caps);
+
+ /**
+ * Define a GeodesicLine in terms of the direct geodesic problem specified
+ * in terms of either distance or arc length.
+ *
+ * @param[in] lat1 latitude of point 1 (degrees).
+ * @param[in] lon1 longitude of point 1 (degrees).
+ * @param[in] azi1 azimuth at point 1 (degrees).
+ * @param[in] arcmode boolean flag determining the meaning of the \e
+ * s12_a12.
+ * @param[in] s12_a12 if \e arcmode is false, this is the distance between
+ * point 1 and point 2 (meters); otherwise it is the arc length between
+ * point 1 and point 2 (degrees); it can be negative.
+ * @param[in] caps bitor'ed combination of Geodesic::mask values
+ * specifying the capabilities the GeodesicLine object should possess,
+ * i.e., which quantities can be returned in calls to
+ * GeodesicLine::Position.
+ * @return a GeodesicLine object.
+ *
+ * This function sets point 3 of the GeodesicLine to correspond to point 2
+ * of the direct geodesic problem.
+ *
+ * \e lat1 should be in the range [−90°, 90°].
+ **********************************************************************/
+ GeodesicLine^ GenDirectLine(double lat1, double lon1, double azi1,
+ bool arcmode, double s12_a12,
+ NETGeographicLib::Mask caps);
///@}
/** \name Inspector functions.
diff --git a/dotnet/NETGeographicLib/GeodesicExact.cpp b/dotnet/NETGeographicLib/GeodesicExact.cpp
index 9ebea6e..cdd224b 100644
--- a/dotnet/NETGeographicLib/GeodesicExact.cpp
+++ b/dotnet/NETGeographicLib/GeodesicExact.cpp
@@ -10,6 +10,7 @@
**********************************************************************/
#include "stdafx.h"
#include "GeographicLib/GeodesicExact.hpp"
+#include "GeographicLib/GeodesicLineExact.hpp"
#include "GeodesicExact.h"
#include "GeodesicLineExact.h"
@@ -477,6 +478,38 @@ GeodesicLineExact^ GeodesicExact::Line(double lat1, double lon1, double azi1,
}
//*****************************************************************************
+GeodesicLineExact^ GeodesicExact::InverseLine(double lat1, double lon1,
+ double lat2, double lon2, NETGeographicLib::Mask caps)
+{
+ return gcnew GeodesicLineExact(m_pGeodesicExact->InverseLine(
+ lat1, lon1, lat2, lon2, static_cast<unsigned>(caps)));
+}
+
+//*****************************************************************************
+GeodesicLineExact^ GeodesicExact::DirectLine(double lat1, double lon1,
+ double azi1, double s12, NETGeographicLib::Mask caps)
+{
+ return gcnew GeodesicLineExact(m_pGeodesicExact->DirectLine(
+ lat1, lon1, azi1, s12, static_cast<unsigned>(caps)));
+}
+
+//*****************************************************************************
+GeodesicLineExact^ GeodesicExact::ArcDirectLine(double lat1, double lon1,
+ double azi1, double a12, NETGeographicLib::Mask caps)
+{
+ return gcnew GeodesicLineExact(m_pGeodesicExact->ArcDirectLine(
+ lat1, lon1, azi1, a12, static_cast<unsigned>(caps)));
+}
+
+//*****************************************************************************
+GeodesicLineExact^ GeodesicExact::GenDirectLine(double lat1, double lon1,
+ double azi1, bool arcmode, double s12_a12, NETGeographicLib::Mask caps)
+{
+ return gcnew GeodesicLineExact(m_pGeodesicExact->GenDirectLine(
+ lat1, lon1, azi1, arcmode, s12_a12, static_cast<unsigned>(caps)));
+}
+
+//*****************************************************************************
double GeodesicExact::MajorRadius::get()
{ return m_pGeodesicExact->MajorRadius(); }
diff --git a/dotnet/NETGeographicLib/GeodesicExact.h b/dotnet/NETGeographicLib/GeodesicExact.h
index b1cb6a8..ff636e3 100644
--- a/dotnet/NETGeographicLib/GeodesicExact.h
+++ b/dotnet/NETGeographicLib/GeodesicExact.h
@@ -164,12 +164,10 @@ namespace NETGeographicLib
**********************************************************************/
AREA = 1U<<14 | unsigned(captype::CAP_C4),
/**
- * Unroll \e lon2 in the direct calculation. (This flag used to be
- * called LONG_NOWRAP.)
+ * Unroll \e lon2 in the direct calculation.
* @hideinitializer
**********************************************************************/
LONG_UNROLL = 1U<<15,
- LONG_NOWRAP = LONG_UNROLL,
/**
* All capabilities, calculate everything. (LONG_UNROLL is not
* included in this mask.)
@@ -653,6 +651,98 @@ namespace NETGeographicLib
GeodesicLineExact^ Line(double lat1, double lon1, double azi1,
NETGeographicLib::Mask caps );
+ /**
+ * Define a GeodesicLineExact in terms of the inverse geodesic problem.
+ *
+ * @param[in] lat1 latitude of point 1 (degrees).
+ * @param[in] lon1 longitude of point 1 (degrees).
+ * @param[in] lat2 latitude of point 2 (degrees).
+ * @param[in] lon2 longitude of point 2 (degrees).
+ * @param[in] caps bitor'ed combination of GeodesicExact::mask values
+ * specifying the capabilities the GeodesicLineExact object should
+ * possess, i.e., which quantities can be returned in calls to
+ * GeodesicLineExact::Position.
+ * @return a GeodesicLineExact object.
+ *
+ * This function sets point 3 of the GeodesicLineExact to correspond to
+ * point 2 of the inverse geodesic problem.
+ *
+ * \e lat1 and \e lat2 should be in the range [−90°, 90°].
+ **********************************************************************/
+ GeodesicLineExact^ InverseLine(double lat1, double lon1, double lat2,
+ double lon2, NETGeographicLib::Mask caps );
+
+ /**
+ * Define a GeodesicLineExact in terms of the direct geodesic problem
+ * specified in terms of distance.
+ *
+ * @param[in] lat1 latitude of point 1 (degrees).
+ * @param[in] lon1 longitude of point 1 (degrees).
+ * @param[in] azi1 azimuth at point 1 (degrees).
+ * @param[in] s12 distance between point 1 and point 2 (meters); it can be
+ * negative.
+ * @param[in] caps bitor'ed combination of GeodesicExact::mask values
+ * specifying the capabilities the GeodesicLineExact object should
+ * possess, i.e., which quantities can be returned in calls to
+ * GeodesicLineExact::Position.
+ * @return a GeodesicLineExact object.
+ *
+ * This function sets point 3 of the GeodesicLineExact to correspond to
+ * point 2 of the direct geodesic problem.
+ *
+ * \e lat1 should be in the range [−90°, 90°].
+ **********************************************************************/
+ GeodesicLineExact^ DirectLine(double lat1, double lon1, double azi1,
+ double s12, NETGeographicLib::Mask caps);
+
+ /**
+ * Define a GeodesicLineExact in terms of the direct geodesic problem
+ * specified in terms of arc length.
+ *
+ * @param[in] lat1 latitude of point 1 (degrees).
+ * @param[in] lon1 longitude of point 1 (degrees).
+ * @param[in] azi1 azimuth at point 1 (degrees).
+ * @param[in] a12 arc length between point 1 and point 2 (degrees); it can
+ * be negative.
+ * @param[in] caps bitor'ed combination of GeodesicExact::mask values
+ * specifying the capabilities the GeodesicLineExact object should
+ * possess, i.e., which quantities can be returned in calls to
+ * GeodesicLineExact::Position.
+ * @return a GeodesicLineExact object.
+ *
+ * This function sets point 3 of the GeodesicLineExact to correspond to
+ * point 2 of the direct geodesic problem.
+ *
+ * \e lat1 should be in the range [−90°, 90°].
+ **********************************************************************/
+ GeodesicLineExact^ ArcDirectLine(double lat1, double lon1, double azi1,
+ double a12, NETGeographicLib::Mask caps);
+
+ /**
+ * Define a GeodesicLineExact in terms of the direct geodesic problem
+ * specified in terms of either distance or arc length.
+ *
+ * @param[in] lat1 latitude of point 1 (degrees).
+ * @param[in] lon1 longitude of point 1 (degrees).
+ * @param[in] azi1 azimuth at point 1 (degrees).
+ * @param[in] arcmode boolean flag determining the meaning of the \e
+ * s12_a12.
+ * @param[in] s12_a12 if \e arcmode is false, this is the distance between
+ * point 1 and point 2 (meters); otherwise it is the arc length between
+ * point 1 and point 2 (degrees); it can be negative.
+ * @param[in] caps bitor'ed combination of GeodesicExact::mask values
+ * specifying the capabilities the GeodesicLineExact object should
+ * possess, i.e., which quantities can be returned in calls to
+ * GeodesicLineExact::Position.
+ * @return a GeodesicLineExact object.
+ *
+ * This function sets point 3 of the GeodesicLineExact to correspond to
+ * point 2 of the direct geodesic problem.
+ *
+ * \e lat1 should be in the range [−90°, 90°].
+ **********************************************************************/
+ GeodesicLineExact^ GenDirectLine(double lat1, double lon1, double azi1,
+ bool arcmode, double s12_a12, NETGeographicLib::Mask caps);
///@}
/** \name Inspector functions.
diff --git a/dotnet/NETGeographicLib/GeodesicLine.cpp b/dotnet/NETGeographicLib/GeodesicLine.cpp
index fedda12..a1d8b28 100644
--- a/dotnet/NETGeographicLib/GeodesicLine.cpp
+++ b/dotnet/NETGeographicLib/GeodesicLine.cpp
@@ -46,6 +46,19 @@ GeodesicLine::GeodesicLine( Geodesic^ g, double lat1, double lon1, double azi1,
}
//*****************************************************************************
+GeodesicLine::GeodesicLine(const GeographicLib::GeodesicLine& gl)
+{
+ try
+ {
+ m_pGeodesicLine = new GeographicLib::GeodesicLine(gl);
+ }
+ catch (std::bad_alloc)
+ {
+ throw gcnew GeographicErr(BADALLOC);
+ }
+}
+
+//*****************************************************************************
GeodesicLine::GeodesicLine(double lat1, double lon1, double azi1,
NETGeographicLib::Mask caps)
{
@@ -342,9 +355,51 @@ double GeodesicLine::Flattening::get()
{ return m_pGeodesicLine->Flattening(); }
//*****************************************************************************
+double GeodesicLine::Distance::get()
+{ return m_pGeodesicLine->Distance(); }
+
+//*****************************************************************************
+double GeodesicLine::Arc::get()
+{ return m_pGeodesicLine->Arc(); }
+
+//*****************************************************************************
NETGeographicLib::Mask GeodesicLine::Capabilities()
{ return static_cast<NETGeographicLib::Mask>(m_pGeodesicLine->Capabilities()); }
//*****************************************************************************
bool GeodesicLine::Capabilities(GeodesicLine::mask testcaps)
{ return m_pGeodesicLine->Capabilities( static_cast<unsigned>(testcaps) ); }
+
+//*****************************************************************************
+void GeodesicLine::SetDistance(double s13)
+{ m_pGeodesicLine->SetDistance(s13); }
+
+//*****************************************************************************
+void GeodesicLine::SetArc(double a13)
+{ m_pGeodesicLine->SetArc(a13); }
+
+//*****************************************************************************
+void GeodesicLine::GenSetDistance(bool arcmode, double s13_a13)
+{ m_pGeodesicLine->GenSetDistance(arcmode, s13_a13); }
+
+//*****************************************************************************
+void GeodesicLine::AzimuthSinCos(double% sazi1, double% cazi1)
+{
+ double x1, x2;
+ m_pGeodesicLine->Azimuth(x1, x2);
+ sazi1 = x1;
+ cazi1 = x2;
+}
+
+//*****************************************************************************
+void GeodesicLine::EquatorialAzimuthSinCos(double% sazi0, double% cazi0)
+{
+ double x1, x2;
+ m_pGeodesicLine->EquatorialAzimuth(x1, x2);
+ sazi0 = x1;
+ cazi0 = x2;
+}
+
+//*****************************************************************************
+double GeodesicLine::GenDistance(bool arcmode)
+{ return m_pGeodesicLine->GenDistance(arcmode); }
diff --git a/dotnet/NETGeographicLib/GeodesicLine.h b/dotnet/NETGeographicLib/GeodesicLine.h
index 525706d..49902d5 100644
--- a/dotnet/NETGeographicLib/GeodesicLine.h
+++ b/dotnet/NETGeographicLib/GeodesicLine.h
@@ -44,7 +44,7 @@ namespace NETGeographicLib
* J. Geodesy <b>87</b>, 43--55 (2013);
* DOI: <a href="https://dx.doi.org/10.1007/s00190-012-0578-z">
* 10.1007/s00190-012-0578-z</a>;
- * addenda: <a href="http://geographiclib.sf.net/geod-addenda.html">
+ * addenda: <a href="http://geographiclib.sourceforge.net/geod-addenda.html">
* geod-addenda.html</a>.
* .
* For more information on geodesics see \ref geodesic.
@@ -61,18 +61,22 @@ namespace NETGeographicLib
*
* The following functions are implemented as properties:
* Latitude, Longitude, Azimuth, EquatorialAzimuth, EquatorialArc,
- * MajorRadius, and Flattening.
+ * MajorRadius, Distance, Arc, and Flattening.
*
* The constructors, Capabilities, and GenPosition functions accept the
* "capabilities mask" as a NETGeographicLib::Mask rather than an
* unsigned. The Capabilities function returns a NETGeographicLib::Mask
* rather than an unsigned.
+ *
+ * The overloaded Azimuth and EquatorialAzimuth functions that return
+ * the sin and cosine terms have been renamed AzimuthSinCos and
+ * EquatorialAzimuthSinCos, repectively.
**********************************************************************/
public ref class GeodesicLine
{
private:
// pointer to the unmanaged GeographicLib::GeodesicLine.
- const GeographicLib::GeodesicLine* m_pGeodesicLine;
+ GeographicLib::GeodesicLine* m_pGeodesicLine;
// The finalizer frees the unmanaged memory when this object is destroyed.
!GeodesicLine(void);
@@ -135,12 +139,10 @@ namespace NETGeographicLib
**********************************************************************/
AREA = 1U<<14 | unsigned(captype::CAP_C4),
/**
- * Unroll \e lon2 in the direct calculation. (This flag used to be
- * called LONG_NOWRAP.)
+ * Unroll \e lon2 in the direct calculation.
* @hideinitializer
**********************************************************************/
LONG_UNROLL = 1U<<15,
- LONG_NOWRAP = LONG_UNROLL,
/**
* All capabilities, calculate everything. (LONG_UNROLL is not
* included in this mask.)
@@ -198,6 +200,12 @@ namespace NETGeographicLib
**********************************************************************/
GeodesicLine(double lat1, double lon1, double azi1,
NETGeographicLib::Mask caps);
+
+ /**
+ * A constructoe that accepts a reference to an unmanages GeodesicLin.
+ * FOR INTERNAL USE ONLY
+ **********************************************************************/
+ GeodesicLine(const GeographicLib::GeodesicLine& gl);
///@}
/**
@@ -488,6 +496,77 @@ namespace NETGeographicLib
///@}
+ /** \name Setting point 3
+ **********************************************************************/
+ ///@{
+
+ /**
+ * Specify position of point 3 in terms of distance.
+ *
+ * @param[in] s13 the distance from point 1 to point 3 (meters); it
+ * can be negative.
+ *
+ * This is only useful if the GeodesicLine object has been constructed
+ * with \e caps |= GeodesicLine::DISTANCE_IN.
+ **********************************************************************/
+ void SetDistance(double s13);
+
+ /**
+ * Specify position of point 3 in terms of arc length.
+ *
+ * @param[in] a13 the arc length from point 1 to point 3 (degrees); it
+ * can be negative.
+ *
+ * The distance \e s13 is only set if the GeodesicLine object has been
+ * constructed with \e caps |= GeodesicLine::DISTANCE.
+ **********************************************************************/
+ void SetArc(double a13);
+
+ /**
+ * Specify position of point 3 in terms of either distance or arc length.
+ *
+ * @param[in] arcmode boolean flag determining the meaning of the second
+ * parameter; if \e arcmode is false, then the GeodesicLine object must
+ * have been constructed with \e caps |= GeodesicLine::DISTANCE_IN.
+ * @param[in] s13_a13 if \e arcmode is false, this is the distance from
+ * point 1 to point 3 (meters); otherwise it is the arc length from
+ * point 1 to point 3 (degrees); it can be negative.
+ **********************************************************************/
+ void GenSetDistance(bool arcmode, double s13_a13);
+ ///@}
+
+ /** \name Trigonometric accessor functions
+ **********************************************************************/
+ ///@{
+ /**
+ * The sine and cosine of \e azi1.
+ *
+ * @param[out] sazi1 the sine of \e azi1.
+ * @param[out] cazi1 the cosine of \e azi1.
+ **********************************************************************/
+ void AzimuthSinCos([System::Runtime::InteropServices::Out] double% sazi1,
+ [System::Runtime::InteropServices::Out] double% cazi1);
+
+ /**
+ * The sine and cosine of \e azi0.
+ *
+ * @param[out] sazi0 the sine of \e azi0.
+ * @param[out] cazi0 the cosine of \e azi0.
+ **********************************************************************/
+ void EquatorialAzimuthSinCos(
+ [System::Runtime::InteropServices::Out] double% sazi0,
+ [System::Runtime::InteropServices::Out] double% cazi0);
+
+ /**
+ * The distance or arc length to point 3.
+ *
+ * @param[in] arcmode boolean flag determining the meaning of returned
+ * value.
+ * @return \e s13 if \e arcmode is false; \e a13 if \e arcmode is true.
+ **********************************************************************/
+ double GenDistance(bool arcmode);
+ ///@}
+
/** \name Inspector functions
**********************************************************************/
///@{
@@ -532,6 +611,16 @@ namespace NETGeographicLib
property double Flattening { double get(); }
/**
+ * @return \e s13, the distance to point 3 (meters).
+ **********************************************************************/
+ property double Distance { double get(); }
+
+ /**
+ * @return \e a13, the arc length to point 3 (degrees).
+ **********************************************************************/
+ property double Arc { double get(); }
+
+ /**
* @return \e caps the computational capabilities that this object was
* constructed with. LATITUDE and AZIMUTH are always included.
**********************************************************************/
diff --git a/dotnet/NETGeographicLib/GeodesicLineExact.cpp b/dotnet/NETGeographicLib/GeodesicLineExact.cpp
index 8792b02..059ebd6 100644
--- a/dotnet/NETGeographicLib/GeodesicLineExact.cpp
+++ b/dotnet/NETGeographicLib/GeodesicLineExact.cpp
@@ -46,6 +46,20 @@ GeodesicLineExact::GeodesicLineExact(GeodesicExact^ g, double lat1,
}
//*****************************************************************************
+GeodesicLineExact::GeodesicLineExact(
+ const GeographicLib::GeodesicLineExact& gle)
+{
+ try
+ {
+ m_pGeodesicLineExact = new GeographicLib::GeodesicLineExact(gle);
+ }
+ catch (std::bad_alloc)
+ {
+ throw gcnew GeographicErr(BADALLOC);
+ }
+}
+
+//*****************************************************************************
GeodesicLineExact::GeodesicLineExact(double lat1, double lon1, double azi1,
NETGeographicLib::Mask caps)
{
@@ -346,9 +360,51 @@ double GeodesicLineExact::Flattening::get()
{ return m_pGeodesicLineExact->Flattening(); }
//*****************************************************************************
+double GeodesicLineExact::Distance::get()
+{ return m_pGeodesicLineExact->Distance(); }
+
+//*****************************************************************************
+double GeodesicLineExact::Arc::get()
+{ return m_pGeodesicLineExact->Arc(); }
+
+//*****************************************************************************
NETGeographicLib::Mask GeodesicLineExact::Capabilities()
{ return static_cast<NETGeographicLib::Mask>(m_pGeodesicLineExact->Capabilities()); }
//*****************************************************************************
bool GeodesicLineExact::Capabilities(NETGeographicLib::Mask testcaps)
{ return m_pGeodesicLineExact->Capabilities(static_cast<unsigned>(testcaps)); }
+
+//*****************************************************************************
+void GeodesicLineExact::SetDistance(double s13)
+{ m_pGeodesicLineExact->SetDistance(s13); }
+
+//*****************************************************************************
+void GeodesicLineExact::SetArc(double a13)
+{ m_pGeodesicLineExact->SetArc(a13); }
+
+//*****************************************************************************
+void GeodesicLineExact::GenSetDistance(bool arcmode, double s13_a13)
+{ m_pGeodesicLineExact->GenSetDistance(arcmode, s13_a13); }
+
+//*****************************************************************************
+void GeodesicLineExact::AzimuthSinCos(double% sazi1, double% cazi1)
+{
+ double x1, x2;
+ m_pGeodesicLineExact->Azimuth(x1, x2);
+ sazi1 = x1;
+ cazi1 = x2;
+}
+
+//*****************************************************************************
+void GeodesicLineExact::EquatorialAzimuthSinCos(double% sazi0, double% cazi0)
+{
+ double x1, x2;
+ m_pGeodesicLineExact->EquatorialAzimuth(x1, x2);
+ sazi0 = x1;
+ cazi0 = x2;
+}
+
+//*****************************************************************************
+double GeodesicLineExact::GenDistance(bool arcmode)
+{ return m_pGeodesicLineExact->GenDistance(arcmode); }
diff --git a/dotnet/NETGeographicLib/GeodesicLineExact.h b/dotnet/NETGeographicLib/GeodesicLineExact.h
index bcbbd54..411fc64 100644
--- a/dotnet/NETGeographicLib/GeodesicLineExact.h
+++ b/dotnet/NETGeographicLib/GeodesicLineExact.h
@@ -36,12 +36,16 @@ namespace NETGeographicLib
*
* The following functions are implemented as properties:
* Latitude, Longitude, Azimuth, EquatorialAzimuth, EquatorialArc,
- * MajorRadius, and Flattening.
+ * MajorRadius, Distance, Arc, and Flattening.
*
* The constructors, GenPosition, and Capabilities functions accept the
* "capabilities mask" as a NETGeographicLib::Mask rather than an
* unsigned. The Capabilities function returns a NETGeographicLib::Mask
* rather than an unsigned.
+ *
+ * The overloaded Azimuth and EquatorialAzimuth functions that return
+ * the sin and cosine terms have been renamed AzimuthSinCos and
+ * EquatorialAzimuthSinCos, repectively.
**********************************************************************/
public ref class GeodesicLineExact
{
@@ -59,7 +63,7 @@ namespace NETGeographicLib
OUT_MASK = 0xFF80U, // Includes LONG_UNROLL
};
// a pointer to the GeographicLib::GeodesicLineExact.
- const GeographicLib::GeodesicLineExact* m_pGeodesicLineExact;
+ GeographicLib::GeodesicLineExact* m_pGeodesicLineExact;
// the finalizer frees the unmanaged memory when the object is destroyed.
!GeodesicLineExact(void);
@@ -124,12 +128,10 @@ namespace NETGeographicLib
**********************************************************************/
AREA = 1U<<14 | unsigned(captype::CAP_C4),
/**
- * Unroll \e lon2 in the direct calculation. (This flag used to be
- * called LONG_NOWRAP.)
+ * Unroll \e lon2 in the direct calculation.
* @hideinitializer
**********************************************************************/
LONG_UNROLL = 1U<<15,
- LONG_NOWRAP = LONG_UNROLL,
/**
* All capabilities, calculate everything. (LONG_UNROLL is not
* included in this mask.)
@@ -189,6 +191,13 @@ namespace NETGeographicLib
**********************************************************************/
GeodesicLineExact(double lat1, double lon1, double azi1,
NETGeographicLib::Mask caps);
+
+ /**
+ * This constructor accepts a reference to an unmanaged
+ * GeodesicLineExact.
+ * FOR INTERNAL USE ONLY.
+ **********************************************************************/
+ GeodesicLineExact(const GeographicLib::GeodesicLineExact& gle);
///@}
/**
@@ -479,6 +488,79 @@ namespace NETGeographicLib
///@}
+ /** \name Setting point 3
+ **********************************************************************/
+ ///@{
+
+ /**
+ * Specify position of point 3 in terms of distance.
+ *
+ * @param[in] s13 the distance from point 1 to point 3 (meters); it
+ * can be negative.
+ *
+ * This is only useful if the GeodesicLineExact object has been constructed
+ * with \e caps |= GeodesicLineExact::DISTANCE_IN.
+ **********************************************************************/
+ void SetDistance(double s13);
+
+ /**
+ * Specify position of point 3 in terms of arc length.
+ *
+ * @param[in] a13 the arc length from point 1 to point 3 (degrees); it
+ * can be negative.
+ *
+ * The distance \e s13 is only set if the GeodesicLineExact object has been
+ * constructed with \e caps |= GeodesicLineExact::DISTANCE.
+ **********************************************************************/
+ void SetArc(double a13);
+
+ /**
+ * Specify position of point 3 in terms of either distance or arc length.
+ *
+ * @param[in] arcmode boolean flag determining the meaning of the second
+ * parameter; if \e arcmode is false, then the GeodesicLineExact object
+ * must have been constructed with \e caps |=
+ * GeodesicLineExact::DISTANCE_IN.
+ * @param[in] s13_a13 if \e arcmode is false, this is the distance from
+ * point 1 to point 3 (meters); otherwise it is the arc length from
+ * point 1 to point 3 (degrees); it can be negative.
+ **********************************************************************/
+ void GenSetDistance(bool arcmode, double s13_a13);
+
+ /**
+ * The distance or arc length to point 3.
+ *
+ * @param[in] arcmode boolean flag determining the meaning of returned
+ * value.
+ * @return \e s13 if \e arcmode is false; \e a13 if \e arcmode is true.
+ **********************************************************************/
+ double GenDistance(bool arcmode);
+ ///@}
+
+ /** \name Trigonometric accessor functions
+ **********************************************************************/
+ ///@{
+ /**
+ * The sine and cosine of \e azi1.
+ *
+ * @param[out] sazi1 the sine of \e azi1.
+ * @param[out] cazi1 the cosine of \e azi1.
+ **********************************************************************/
+ void AzimuthSinCos(
+ [System::Runtime::InteropServices::Out] double% sazi1,
+ [System::Runtime::InteropServices::Out] double% cazi1);
+
+ /**
+ * The sine and cosine of \e azi0.
+ *
+ * @param[out] sazi0 the sine of \e azi0.
+ * @param[out] cazi0 the cosine of \e azi0.
+ **********************************************************************/
+ void EquatorialAzimuthSinCos(
+ [System::Runtime::InteropServices::Out] double% sazi0,
+ [System::Runtime::InteropServices::Out] double% cazi0);
+ ///@}
+
/** \name Inspector functions
**********************************************************************/
///@{
@@ -523,6 +605,16 @@ namespace NETGeographicLib
property double Flattening { double get(); }
/**
+ * @return \e s13, the distance to point 3 (meters).
+ **********************************************************************/
+ property double Distance { double get(); }
+
+ /**
+ * @return \e a13, the arc length to point 3 (degrees).
+ **********************************************************************/
+ property double Arc { double get(); }
+
+ /**
* @return \e caps the computational capabilities that this object was
* constructed with. LATITUDE and AZIMUTH are always included.
**********************************************************************/
diff --git a/dotnet/NETGeographicLib/Geoid.cpp b/dotnet/NETGeographicLib/Geoid.cpp
index 9814d16..a3b37c6 100644
--- a/dotnet/NETGeographicLib/Geoid.cpp
+++ b/dotnet/NETGeographicLib/Geoid.cpp
@@ -93,25 +93,6 @@ double Geoid::Height(double lat, double lon)
}
//*****************************************************************************
-double Geoid::Height(double lat, double lon,
- [System::Runtime::InteropServices::Out] double% gradn,
- [System::Runtime::InteropServices::Out] double% grade)
-{
- try
- {
- double lgradn, lgrade;
- double out = m_pGeoid->operator()( lat, lon, lgradn, lgrade );
- gradn = lgradn;
- grade = lgrade;
- return out;
- }
- catch ( const std::exception& err )
- {
- throw gcnew GeographicErr( err.what() );
- }
-}
-
-//*****************************************************************************
double Geoid::ConvertHeight(double lat, double lon, double h,
ConvertFlag d)
{
diff --git a/dotnet/NETGeographicLib/Geoid.h b/dotnet/NETGeographicLib/Geoid.h
index f0e87c0..d0a4422 100644
--- a/dotnet/NETGeographicLib/Geoid.h
+++ b/dotnet/NETGeographicLib/Geoid.h
@@ -42,15 +42,6 @@ namespace NETGeographicLib
* See \ref geoid for details of how to install the data sets, the data
* format, estimates of the interpolation errors, and how to use caching.
*
- * In addition to returning the geoid height, the gradient of the geoid can
- * be calculated. The gradient is defined as the rate of change of the geoid
- * as a function of position on the ellipsoid. This uses the parameters for
- * the WGS84 ellipsoid. The gradient defined in terms of the interpolated
- * heights. As a result of the way that the geoid data is stored, the
- * calculation of gradients can result in large quantization errors. This is
- * particularly acute for fine grids, at high latitudes, and for the easterly
- * gradient.
- *
* This class is typically \e not thread safe in that a single instantiation
* cannot be safely used by multiple threads because of the way the object
* reads the data set and because it maintains a single-cell cache. If
@@ -200,28 +191,6 @@ namespace NETGeographicLib
double Height(double lat, double lon);
/**
- * Compute the geoid height and gradient at a point
- *
- * @param[in] lat latitude of the point (degrees).
- * @param[in] lon longitude of the point (degrees).
- * @param[out] gradn northerly gradient (dimensionless).
- * @param[out] grade easterly gradient (dimensionless).
- * @exception GeographicErr if there's a problem reading the data; this
- * never happens if (\e lat, \e lon) is within a successfully cached area.
- * @return geoid height (meters).
- *
- * The latitude should be in [−90°, 90°]. As a result of
- * the way that the geoid data is stored, the calculation of gradients
- * can result in large quantization errors. This is particularly acute
- * for fine grids, at high latitudes, and for the easterly gradient.
- * If you need to compute the direction of the acceleration due to
- * gravity accurately, you should use GravityModel::Gravity.
- **********************************************************************/
- double Height(double lat, double lon,
- [System::Runtime::InteropServices::Out] double% gradn,
- [System::Runtime::InteropServices::Out] double% grade);
-
- /**
* Convert a height above the geoid to a height above the ellipsoid and
* vice versa.
*
diff --git a/dotnet/NETGeographicLib/Gnomonic.h b/dotnet/NETGeographicLib/Gnomonic.h
index a5c9992..337d023 100644
--- a/dotnet/NETGeographicLib/Gnomonic.h
+++ b/dotnet/NETGeographicLib/Gnomonic.h
@@ -26,7 +26,7 @@ namespace NETGeographicLib
* J. Geodesy <b>87</b>, 43--55 (2013);
* DOI: <a href="https://dx.doi.org/10.1007/s00190-012-0578-z">
* 10.1007/s00190-012-0578-z</a>;
- * addenda: <a href="http://geographiclib.sf.net/geod-addenda.html">
+ * addenda: <a href="http://geographiclib.sourceforge.net/geod-addenda.html">
* geod-addenda.html</a>.
* .
* The projection of \e P is defined as follows: compute the geodesic line
diff --git a/dotnet/NETGeographicLib/NETGeographicLib.h b/dotnet/NETGeographicLib/NETGeographicLib.h
index 7cb0dcb..64d097f 100644
--- a/dotnet/NETGeographicLib/NETGeographicLib.h
+++ b/dotnet/NETGeographicLib/NETGeographicLib.h
@@ -92,7 +92,7 @@ namespace NETGeographicLib
* Do not wrap the \e lon2 in the direct calculation.
* @hideinitializer
**********************************************************************/
- LONG_NOWRAP = 1U<<15,
+ LONG_UNROLL = 1U<<15,
/**
* All capabilities, calculate everything.
* @hideinitializer
diff --git a/dotnet/NETGeographicLib/PolygonArea.h b/dotnet/NETGeographicLib/PolygonArea.h
index ab4a299..30bbf3c 100644
--- a/dotnet/NETGeographicLib/PolygonArea.h
+++ b/dotnet/NETGeographicLib/PolygonArea.h
@@ -26,7 +26,7 @@ namespace NETGeographicLib
* J. Geodesy <b>87</b>, 43--55 (2013);
* DOI: <a href="https://dx.doi.org/10.1007/s00190-012-0578-z">
* 10.1007/s00190-012-0578-z</a>;
- * addenda: <a href="http://geographiclib.sf.net/geod-addenda.html">
+ * addenda: <a href="http://geographiclib.sourceforge.net/geod-addenda.html">
* geod-addenda.html</a>.
*
* This class lets you add vertices one at a time to the polygon. The area
diff --git a/dotnet/NETGeographicLib/Rhumb.h b/dotnet/NETGeographicLib/Rhumb.h
index a27a450..d76ff64 100644
--- a/dotnet/NETGeographicLib/Rhumb.h
+++ b/dotnet/NETGeographicLib/Rhumb.h
@@ -107,12 +107,10 @@ namespace NETGeographicLib {
**********************************************************************/
AREA = 1U<<14,
/**
- * Unroll \e lon2 in the direct calculation. (This flag used to be
- * called LONG_NOWRAP.)
+ * Unroll \e lon2 in the direct calculation.
* @hideinitializer
**********************************************************************/
LONG_UNROLL = 1U<<15,
- LONG_NOWRAP = LONG_UNROLL,
/**
* Calculate everything. (LONG_UNROLL is not included in this mask.)
* @hideinitializer
@@ -413,12 +411,10 @@ namespace NETGeographicLib {
**********************************************************************/
AREA = 1U<<14, //Rhumb::AREA,
/**
- * Unroll \e lon2 in the direct calculation. (This flag used to be
- * called LONG_NOWRAP.)
+ * Unroll \e lon2 in the direct calculation.
* @hideinitializer
**********************************************************************/
LONG_UNROLL = 1U<<15, //Rhumb::LONG_UNROLL,
- LONG_NOWRAP = LONG_UNROLL,
/**
* Calculate everything. (LONG_UNROLL is not included in this mask.)
* @hideinitializer
diff --git a/dotnet/Projections/GeodesicPanel.cs b/dotnet/Projections/GeodesicPanel.cs
index 89d7bad..b09a6a6 100644
--- a/dotnet/Projections/GeodesicPanel.cs
+++ b/dotnet/Projections/GeodesicPanel.cs
@@ -426,6 +426,9 @@ namespace Projections
outd != distance || fm12 != M12 || fm21 != M21 || frd != reducedLength)
throw new Exception("Geodesic.Inverse #6 failed");
GeodesicLine gl = g.Line(32.0, -86.0, 45.0, Mask.ALL);
+ gl = g.InverseLine(32.0, -86.0, 33.0, -87.0, Mask.ALL);
+ gl = g.DirectLine(32.0, -86.0, 45.0, 10000.0, Mask.ALL);
+ gl = g.ArcDirectLine(32.0, -86.0, 45.0, 10000.0, Mask.ALL);
gl = new GeodesicLine(32.0, -86.0, 45.0, Mask.ALL);
gl = new GeodesicLine(g, 32.0, -86.0, 45.0, Mask.ALL);
arcDistance = gl.Position(10000.0, out finalLatitude, out finalLongitude, out finalAzimuth,
@@ -563,6 +566,9 @@ namespace Projections
outd != distance || fm12 != M12 || fm21 != M21 || frd != reducedLength)
throw new Exception("GeodesicExact.Inverse #6 failed");
GeodesicLineExact gle = ge.Line(32.0, -86.0, 45.0, Mask.ALL);
+ gle = ge.InverseLine(32.0, -86.0, 33.0, -87.0, Mask.ALL);
+ gle = ge.DirectLine(32.0, -86.0, 45.0, 10000.0, Mask.ALL);
+ gle = ge.ArcDirectLine(32.0, -86.0, 45.0, 10000.0, Mask.ALL);
gle = new GeodesicLineExact(32.0, -86.0, 45.0, Mask.ALL);
gle = new GeodesicLineExact(ge, 32.0, -86.0, 45.0, Mask.ALL);
arcDistance = gle.Position(10000.0, out finalLatitude, out finalLongitude, out finalAzimuth,
diff --git a/dotnet/Projections/GeoidPanel.cs b/dotnet/Projections/GeoidPanel.cs
index 7a1a7d5..290106f 100644
--- a/dotnet/Projections/GeoidPanel.cs
+++ b/dotnet/Projections/GeoidPanel.cs
@@ -153,11 +153,7 @@ namespace Projections
Geoid g = new Geoid(m_fileName, m_path, false, false);
g.CacheArea(20.0, -30.0, 30.0, -20.0);
g.CacheAll();
- double gradx, grady;
- double h1 = g.Height(32.0, -60.0, out gradx, out grady);
double h2 = g.Height(32.0, -60.0);
- if (h1 != h2)
- throw new Exception("Error in Geoid.Height");
g.ConvertHeight(32.0, -60.0, 100.0, Geoid.ConvertFlag.ELLIPSOIDTOGEOID);
MessageBox.Show("No errors detected", "OK", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 7a15158..834af4c 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -19,7 +19,17 @@
#
# Copyright (C) 2011, Charles Karney <charles at karney.com>
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -84,7 +94,6 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
subdir = examples
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -92,6 +101,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/include/GeographicLib/Config-ac.h
CONFIG_CLEAN_FILES =
@@ -116,6 +126,7 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -168,6 +179,7 @@ LTLIBOBJS = @LTLIBOBJS@
LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@
LT_REVISION = @LT_REVISION@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -316,7 +328,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu examples/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -491,6 +502,8 @@ uninstall-am:
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
# 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.
diff --git a/examples/example-GeodesicLine.cpp b/examples/example-GeodesicLine.cpp
index 0f31587..cedfd82 100644
--- a/examples/example-GeodesicLine.cpp
+++ b/examples/example-GeodesicLine.cpp
@@ -19,17 +19,14 @@ int main() {
double
lat1 = 40.640, lon1 = -73.779, // JFK
lat2 = 1.359, lon2 = 103.989; // SIN
- double s12, azi1, azi2,
- a12 = geod.Inverse(lat1, lon1, lat2, lon2, s12, azi1, azi2);
- const GeographicLib::GeodesicLine line(geod, lat1, lon1, azi1);
- // Alternatively
- // const GeographicLib::GeodesicLine line = geod.Line(lat1, lon1, azi1);
+ const GeographicLib::GeodesicLine line =
+ geod.InverseLine(lat1, lon1, lat2, lon2);
double ds0 = 500e3; // Nominal distance between points = 500 km
- int num = int(ceil(s12 / ds0)); // The number of intervals
+ int num = int(ceil(line.Distance() / ds0)); // The number of intervals
cout << fixed << setprecision(3);
{
// Use intervals of equal length
- double ds = s12 / num;
+ double ds = line.Distance() / num;
for (int i = 0; i <= num; ++i) {
double lat, lon;
line.Position(i * ds, lat, lon);
@@ -38,7 +35,7 @@ int main() {
}
{
// Slightly faster, use intervals of equal arc length
- double da = a12 / num;
+ double da = line.Arc() / num;
for (int i = 0; i <= num; ++i) {
double lat, lon;
line.ArcPosition(i * da, lat, lon);
diff --git a/examples/example-GeodesicLineExact.cpp b/examples/example-GeodesicLineExact.cpp
index 5567ad3..86d69f0 100644
--- a/examples/example-GeodesicLineExact.cpp
+++ b/examples/example-GeodesicLineExact.cpp
@@ -19,17 +19,14 @@ int main() {
double
lat1 = 40.640, lon1 = -73.779, // JFK
lat2 = 1.359, lon2 = 103.989; // SIN
- double s12, azi1, azi2,
- a12 = geod.Inverse(lat1, lon1, lat2, lon2, s12, azi1, azi2);
- const GeographicLib::GeodesicLineExact line(geod, lat1, lon1, azi1);
- // Alternatively
- // const GeographicLib::GeodesicLineExact line = geod.Line(lat1,lon1,azi1);
+ const GeographicLib::GeodesicLineExact line =
+ geod.InverseLine(lat1, lon1, lat2, lon2);
double ds0 = 500e3; // Nominal distance between points = 500 km
- int num = int(ceil(s12 / ds0)); // The number of intervals
+ int num = int(ceil(line.Distance() / ds0)); // The number of intervals
cout << fixed << setprecision(3);
{
// Use intervals of equal length
- double ds = s12 / num;
+ double ds = line.Distance() / num;
for (int i = 0; i <= num; ++i) {
double lat, lon;
line.Position(i * ds, lat, lon);
@@ -38,7 +35,7 @@ int main() {
}
{
// Slightly faster, use intervals of equal arc length
- double da = a12 / num;
+ double da = line.Arc() / num;
for (int i = 0; i <= num; ++i) {
double lat, lon;
line.ArcPosition(i * da, lat, lon);
diff --git a/include/GeographicLib/AlbersEqualArea.hpp b/include/GeographicLib/AlbersEqualArea.hpp
index 146162a..21624e7 100644
--- a/include/GeographicLib/AlbersEqualArea.hpp
+++ b/include/GeographicLib/AlbersEqualArea.hpp
@@ -269,14 +269,6 @@ namespace GeographicLib {
**********************************************************************/
Math::real Flattening() const { return _f; }
- /// \cond SKIP
- /**
- * <b>DEPRECATED</b>
- * @return \e r the inverse flattening of the ellipsoid.
- **********************************************************************/
- Math::real InverseFlattening() const { return 1/_f; }
- /// \endcond
-
/**
* @return latitude of the origin for the projection (degrees).
*
diff --git a/include/GeographicLib/AzimuthalEquidistant.hpp b/include/GeographicLib/AzimuthalEquidistant.hpp
index 8f42900..8d08631 100644
--- a/include/GeographicLib/AzimuthalEquidistant.hpp
+++ b/include/GeographicLib/AzimuthalEquidistant.hpp
@@ -132,14 +132,6 @@ namespace GeographicLib {
Math::real Flattening() const { return _earth.Flattening(); }
///@}
- /// \cond SKIP
- /**
- * <b>DEPRECATED</b>
- * @return \e r the inverse flattening of the ellipsoid.
- **********************************************************************/
- Math::real InverseFlattening() const
- { return _earth.InverseFlattening(); }
- /// \endcond
};
} // namespace GeographicLib
diff --git a/include/GeographicLib/CassiniSoldner.hpp b/include/GeographicLib/CassiniSoldner.hpp
index 011bc21..f6f5f6b 100644
--- a/include/GeographicLib/CassiniSoldner.hpp
+++ b/include/GeographicLib/CassiniSoldner.hpp
@@ -197,14 +197,6 @@ namespace GeographicLib {
Math::real Flattening() const { return _earth.Flattening(); }
///@}
- /// \cond SKIP
- /**
- * <b>DEPRECATED</b>
- * @return \e r the inverse flattening of the ellipsoid.
- **********************************************************************/
- Math::real InverseFlattening() const
- { return _earth.InverseFlattening(); }
- /// \endcond
};
} // namespace GeographicLib
diff --git a/include/GeographicLib/CircularEngine.hpp b/include/GeographicLib/CircularEngine.hpp
index b3e0ea9..10ab8fb 100644
--- a/include/GeographicLib/CircularEngine.hpp
+++ b/include/GeographicLib/CircularEngine.hpp
@@ -63,7 +63,7 @@ namespace GeographicLib {
std::vector<real> _wc, _ws, _wrc, _wrs, _wtc, _wts;
real _q, _uq, _uq2;
- Math::real Value(bool gradp, real cl, real sl,
+ Math::real Value(bool gradp, real sl, real cl,
real& gradx, real& grady, real& gradz) const;
friend class SphericalEngine;
@@ -116,18 +116,18 @@ namespace GeographicLib {
/**
* Evaluate the sum for a particular longitude given in terms of its
- * cosine and sine.
+ * sine and cosine.
*
- * @param[in] coslon the cosine of the longitude.
* @param[in] sinlon the sine of the longitude.
+ * @param[in] coslon the cosine of the longitude.
* @return \e V the value of the sum.
*
- * The arguments must satisfy <i>coslon</i><sup>2</sup> +
- * <i>sinlon</i><sup>2</sup> = 1.
+ * The arguments must satisfy <i>sinlon</i><sup>2</sup> +
+ * <i>coslon</i><sup>2</sup> = 1.
**********************************************************************/
- Math::real operator()(real coslon, real sinlon) const {
+ Math::real operator()(real sinlon, real coslon) const {
real dummy;
- return Value(false, coslon, sinlon, dummy, dummy, dummy);
+ return Value(false, sinlon, coslon, dummy, dummy, dummy);
}
/**
@@ -137,17 +137,17 @@ namespace GeographicLib {
* @return \e V the value of the sum.
**********************************************************************/
Math::real operator()(real lon) const {
- real coslon, sinlon;
+ real sinlon, coslon;
Math::sincosd(lon, sinlon, coslon);
- return (*this)(coslon, sinlon);
+ return (*this)(sinlon, coslon);
}
/**
* Evaluate the sum and its gradient for a particular longitude given in
- * terms of its cosine and sine.
+ * terms of its sine and cosine.
*
- * @param[in] coslon the cosine of the longitude.
* @param[in] sinlon the sine of the longitude.
+ * @param[in] coslon the cosine of the longitude.
* @param[out] gradx \e x component of the gradient.
* @param[out] grady \e y component of the gradient.
* @param[out] gradz \e z component of the gradient.
@@ -156,12 +156,12 @@ namespace GeographicLib {
* The gradients will only be computed if the CircularEngine object was
* created with this capability (e.g., via \e gradp = true in
* SphericalHarmonic::Circle). If not, \e gradx, etc., will not be
- * touched. The arguments must satisfy <i>coslon</i><sup>2</sup> +
- * <i>sinlon</i><sup>2</sup> = 1.
+ * touched. The arguments must satisfy <i>sinlon</i><sup>2</sup> +
+ * <i>coslon</i><sup>2</sup> = 1.
**********************************************************************/
- Math::real operator()(real coslon, real sinlon,
+ Math::real operator()(real sinlon, real coslon,
real& gradx, real& grady, real& gradz) const {
- return Value(true, coslon, sinlon, gradx, grady, gradz);
+ return Value(true, sinlon, coslon, gradx, grady, gradz);
}
/**
@@ -180,9 +180,9 @@ namespace GeographicLib {
**********************************************************************/
Math::real operator()(real lon,
real& gradx, real& grady, real& gradz) const {
- real coslon, sinlon;
+ real sinlon, coslon;
Math::sincosd(lon, sinlon, coslon);
- return (*this)(coslon, sinlon, gradx, grady, gradz);
+ return (*this)(sinlon, coslon, gradx, grady, gradz);
}
};
diff --git a/include/GeographicLib/Config-ac.h.in b/include/GeographicLib/Config-ac.h.in
index eb92211..e732376 100644
--- a/include/GeographicLib/Config-ac.h.in
+++ b/include/GeographicLib/Config-ac.h.in
@@ -45,8 +45,7 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Name of package */
diff --git a/include/GeographicLib/Config.h b/include/GeographicLib/Config.h
index 0405505..69d9eee 100644
--- a/include/GeographicLib/Config.h
+++ b/include/GeographicLib/Config.h
@@ -1,8 +1,8 @@
// This will be overwritten by ./configure
-#define GEOGRAPHICLIB_VERSION_STRING "1.45"
+#define GEOGRAPHICLIB_VERSION_STRING "1.46"
#define GEOGRAPHICLIB_VERSION_MAJOR 1
-#define GEOGRAPHICLIB_VERSION_MINOR 45
+#define GEOGRAPHICLIB_VERSION_MINOR 46
#define GEOGRAPHICLIB_VERSION_PATCH 0
// Undefine HAVE_LONG_DOUBLE if this type is unknown to the compiler
diff --git a/include/GeographicLib/Constants.hpp b/include/GeographicLib/Constants.hpp
index e515858..6bfa8f8 100644
--- a/include/GeographicLib/Constants.hpp
+++ b/include/GeographicLib/Constants.hpp
@@ -182,19 +182,6 @@ namespace GeographicLib {
* A synonym for WGS84_omega<real>().
**********************************************************************/
static inline Math::real WGS84_omega() { return WGS84_omega<real>(); }
- /// \cond SKIP
- /**
- * <b>DEPRECATED</b>
- * @return the reciprocal flattening of WGS84 ellipsoid.
- **********************************************************************/
- template<typename T> static inline T WGS84_r()
- { return 1/WGS84_f<T>(); }
- /**
- * <b>DEPRECATED</b>
- * A synonym for WGS84_r<real>().
- **********************************************************************/
- static inline Math::real WGS84_r() { return WGS84_r<real>(); }
- /// \endcond
/**
* @tparam T the type of the returned value.
* @return the equatorial radius of GRS80 ellipsoid, \e a, in m.
diff --git a/include/GeographicLib/DMS.hpp b/include/GeographicLib/DMS.hpp
index 8671f2c..2972285 100644
--- a/include/GeographicLib/DMS.hpp
+++ b/include/GeographicLib/DMS.hpp
@@ -223,31 +223,6 @@ namespace GeographicLib {
static Math::real Decode(real d, real m = 0, real s = 0)
{ return d + (m + s / 60) / 60; }
- /// \cond SKIP
- /**
- * <b>DEPRECATED</b> (use Utility::num, instead).
- * Convert a string to a real number.
- *
- * @param[in] str string input.
- * @exception GeographicErr if \e str is malformed.
- * @return decoded number.
- **********************************************************************/
- static Math::real Decode(const std::string& str)
- { return Utility::num<real>(str); }
-
- /**
- * <b>DEPRECATED</b> (use Utility::fract, instead).
- * Convert a string to a real number treating the case where the string is
- * a simple fraction.
- *
- * @param[in] str string input.
- * @exception GeographicErr if \e str is malformed.
- * @return decoded number.
- **********************************************************************/
- static Math::real DecodeFraction(const std::string& str)
- { return Utility::fract<real>(str); }
- /// \endcond
-
/**
* Convert a pair of strings to latitude and longitude.
*
diff --git a/include/GeographicLib/EllipticFunction.hpp b/include/GeographicLib/EllipticFunction.hpp
index fe4f3fb..cdf73a6 100644
--- a/include/GeographicLib/EllipticFunction.hpp
+++ b/include/GeographicLib/EllipticFunction.hpp
@@ -168,22 +168,6 @@ namespace GeographicLib {
Math::real alphap2() const { return _alphap2; }
///@}
- /// \cond SKIP
- /**
- * @return the square of the modulus <i>k</i><sup>2</sup>.
- *
- * <b>DEPRECATED</b>, use k2() instead.
- **********************************************************************/
- Math::real m() const { return _k2; }
- /**
- * @return the square of the complementary modulus <i>k'</i><sup>2</sup> =
- * 1 − <i>k</i><sup>2</sup>.
- *
- * <b>DEPRECATED</b>, use kp2() instead.
- **********************************************************************/
- Math::real m1() const { return _kp2; }
- /// \endcond
-
/** \name Complete elliptic integrals.
**********************************************************************/
///@{
diff --git a/include/GeographicLib/GeoCoords.hpp b/include/GeographicLib/GeoCoords.hpp
index 720e2ab..09f8590 100644
--- a/include/GeographicLib/GeoCoords.hpp
+++ b/include/GeographicLib/GeoCoords.hpp
@@ -537,14 +537,6 @@ namespace GeographicLib {
Math::real Flattening() const { return UTMUPS::Flattening(); }
///@}
- /// \cond SKIP
- /**
- * <b>DEPRECATED</b>
- * @return \e r the inverse flattening of the ellipsoid.
- **********************************************************************/
- Math::real InverseFlattening() const
- { return UTMUPS::InverseFlattening(); }
- /// \endcond
};
} // namespace GeographicLib
diff --git a/include/GeographicLib/Geocentric.hpp b/include/GeographicLib/Geocentric.hpp
index 26c4b1f..7772153 100644
--- a/include/GeographicLib/Geocentric.hpp
+++ b/include/GeographicLib/Geocentric.hpp
@@ -255,15 +255,6 @@ namespace GeographicLib {
{ return Init() ? _f : Math::NaN(); }
///@}
- /// \cond SKIP
- /**
- * <b>DEPRECATED</b>
- * @return \e r the inverse flattening of the ellipsoid.
- **********************************************************************/
- Math::real InverseFlattening() const
- { return Init() ? 1/_f : Math::NaN(); }
- /// \endcond
-
/**
* A global instantiation of Geocentric with the parameters for the WGS84
* ellipsoid.
diff --git a/include/GeographicLib/Geodesic.hpp b/include/GeographicLib/Geodesic.hpp
index 1eae78d..52175ec 100644
--- a/include/GeographicLib/Geodesic.hpp
+++ b/include/GeographicLib/Geodesic.hpp
@@ -156,7 +156,7 @@ namespace GeographicLib {
* J. Geodesy <b>87</b>, 43--55 (2013);
* DOI: <a href="https://dx.doi.org/10.1007/s00190-012-0578-z">
* 10.1007/s00190-012-0578-z</a>;
- * addenda: <a href="http://geographiclib.sf.net/geod-addenda.html">
+ * addenda: <a href="http://geographiclib.sourceforge.net/geod-addenda.html">
* geod-addenda.html</a>.
* .
* For more information on geodesics see \ref geodesic.
@@ -218,18 +218,21 @@ namespace GeographicLib {
real& M12, real& M21, real Ca[]) const;
real InverseStart(real sbet1, real cbet1, real dn1,
real sbet2, real cbet2, real dn2,
- real lam12,
+ real lam12, real slam12, real clam12,
real& salp1, real& calp1,
real& salp2, real& calp2, real& dnm,
real Ca[]) const;
real Lambda12(real sbet1, real cbet1, real dn1,
real sbet2, real cbet2, real dn2,
- real salp1, real calp1,
+ real salp1, real calp1, real slam120, real clam120,
real& salp2, real& calp2, real& sig12,
real& ssig1, real& csig1, real& ssig2, real& csig2,
- real& eps, real& domg12, bool diffp, real& dlam12,
- real Ca[])
- const;
+ real& eps, real& somg12, real& comg12,
+ bool diffp, real& dlam12, real Ca[]) const;
+ real GenInverse(real lat1, real lon1, real lat2, real lon2,
+ unsigned outmask, real& s12,
+ real& salp1, real& calp1, real& salp2, real& calp2,
+ real& m12, real& M12, real& M21, real& S12) const;
// These are Maxima generated functions to provide series approximations to
// the integrals for the ellipsoidal geodesic.
@@ -307,14 +310,10 @@ namespace GeographicLib {
**********************************************************************/
AREA = 1U<<14 | CAP_C4,
/**
- * Unroll \e lon2 in the direct calculation. (This flag used to be
- * called LONG_NOWRAP.)
+ * Unroll \e lon2 in the direct calculation.
* @hideinitializer
**********************************************************************/
LONG_UNROLL = 1U<<15,
- /// \cond SKIP
- LONG_NOWRAP = LONG_UNROLL,
- /// \endcond
/**
* All capabilities, calculate everything. (LONG_UNROLL is not
* included in this mask.)
@@ -791,8 +790,7 @@ namespace GeographicLib {
Math::real GenInverse(real lat1, real lon1, real lat2, real lon2,
unsigned outmask,
real& s12, real& azi1, real& azi2,
- real& m12, real& M12, real& M21, real& S12)
- const;
+ real& m12, real& M12, real& M21, real& S12) const;
///@}
/** \name Interface to GeodesicLine.
@@ -838,6 +836,99 @@ namespace GeographicLib {
GeodesicLine Line(real lat1, real lon1, real azi1, unsigned caps = ALL)
const;
+ /**
+ * Define a GeodesicLine in terms of the inverse geodesic problem.
+ *
+ * @param[in] lat1 latitude of point 1 (degrees).
+ * @param[in] lon1 longitude of point 1 (degrees).
+ * @param[in] lat2 latitude of point 2 (degrees).
+ * @param[in] lon2 longitude of point 2 (degrees).
+ * @param[in] caps bitor'ed combination of Geodesic::mask values
+ * specifying the capabilities the GeodesicLine object should possess,
+ * i.e., which quantities can be returned in calls to
+ * GeodesicLine::Position.
+ * @return a GeodesicLine object.
+ *
+ * This function sets point 3 of the GeodesicLine to correspond to point 2
+ * of the inverse geodesic problem.
+ *
+ * \e lat1 and \e lat2 should be in the range [−90°, 90°].
+ **********************************************************************/
+ GeodesicLine InverseLine(real lat1, real lon1, real lat2, real lon2,
+ unsigned caps = ALL) const;
+
+ /**
+ * Define a GeodesicLine in terms of the direct geodesic problem specified
+ * in terms of distance.
+ *
+ * @param[in] lat1 latitude of point 1 (degrees).
+ * @param[in] lon1 longitude of point 1 (degrees).
+ * @param[in] azi1 azimuth at point 1 (degrees).
+ * @param[in] s12 distance between point 1 and point 2 (meters); it can be
+ * negative.
+ * @param[in] caps bitor'ed combination of Geodesic::mask values
+ * specifying the capabilities the GeodesicLine object should possess,
+ * i.e., which quantities can be returned in calls to
+ * GeodesicLine::Position.
+ * @return a GeodesicLine object.
+ *
+ * This function sets point 3 of the GeodesicLine to correspond to point 2
+ * of the direct geodesic problem.
+ *
+ * \e lat1 should be in the range [−90°, 90°].
+ **********************************************************************/
+ GeodesicLine DirectLine(real lat1, real lon1, real azi1, real s12,
+ unsigned caps = ALL) const;
+
+ /**
+ * Define a GeodesicLine in terms of the direct geodesic problem specified
+ * in terms of arc length.
+ *
+ * @param[in] lat1 latitude of point 1 (degrees).
+ * @param[in] lon1 longitude of point 1 (degrees).
+ * @param[in] azi1 azimuth at point 1 (degrees).
+ * @param[in] a12 arc length between point 1 and point 2 (degrees); it can
+ * be negative.
+ * @param[in] caps bitor'ed combination of Geodesic::mask values
+ * specifying the capabilities the GeodesicLine object should possess,
+ * i.e., which quantities can be returned in calls to
+ * GeodesicLine::Position.
+ * @return a GeodesicLine object.
+ *
+ * This function sets point 3 of the GeodesicLine to correspond to point 2
+ * of the direct geodesic problem.
+ *
+ * \e lat1 should be in the range [−90°, 90°].
+ **********************************************************************/
+ GeodesicLine ArcDirectLine(real lat1, real lon1, real azi1, real a12,
+ unsigned caps = ALL) const;
+
+ /**
+ * Define a GeodesicLine in terms of the direct geodesic problem specified
+ * in terms of either distance or arc length.
+ *
+ * @param[in] lat1 latitude of point 1 (degrees).
+ * @param[in] lon1 longitude of point 1 (degrees).
+ * @param[in] azi1 azimuth at point 1 (degrees).
+ * @param[in] arcmode boolean flag determining the meaning of the \e
+ * s12_a12.
+ * @param[in] s12_a12 if \e arcmode is false, this is the distance between
+ * point 1 and point 2 (meters); otherwise it is the arc length between
+ * point 1 and point 2 (degrees); it can be negative.
+ * @param[in] caps bitor'ed combination of Geodesic::mask values
+ * specifying the capabilities the GeodesicLine object should possess,
+ * i.e., which quantities can be returned in calls to
+ * GeodesicLine::Position.
+ * @return a GeodesicLine object.
+ *
+ * This function sets point 3 of the GeodesicLine to correspond to point 2
+ * of the direct geodesic problem.
+ *
+ * \e lat1 should be in the range [−90°, 90°].
+ **********************************************************************/
+ GeodesicLine GenDirectLine(real lat1, real lon1, real azi1,
+ bool arcmode, real s12_a12,
+ unsigned caps = ALL) const;
///@}
/** \name Inspector functions.
@@ -856,14 +947,6 @@ namespace GeographicLib {
**********************************************************************/
Math::real Flattening() const { return _f; }
- /// \cond SKIP
- /**
- * <b>DEPRECATED</b>
- * @return \e r the inverse flattening of the ellipsoid.
- **********************************************************************/
- Math::real InverseFlattening() const { return 1/_f; }
- /// \endcond
-
/**
* @return total area of ellipsoid in meters<sup>2</sup>. The area of a
* polygon encircling a pole can be found by adding
diff --git a/include/GeographicLib/GeodesicExact.hpp b/include/GeographicLib/GeodesicExact.hpp
index b625b38..4799c09 100644
--- a/include/GeographicLib/GeodesicExact.hpp
+++ b/include/GeographicLib/GeodesicExact.hpp
@@ -116,16 +116,20 @@ namespace GeographicLib {
real InverseStart(EllipticFunction& E,
real sbet1, real cbet1, real dn1,
real sbet2, real cbet2, real dn2,
- real lam12,
+ real lam12, real slam12, real clam12,
real& salp1, real& calp1,
real& salp2, real& calp2, real& dnm) const;
real Lambda12(real sbet1, real cbet1, real dn1,
real sbet2, real cbet2, real dn2,
- real salp1, real calp1,
+ real salp1, real calp1, real slam120, real clam120,
real& salp2, real& calp2, real& sig12,
real& ssig1, real& csig1, real& ssig2, real& csig2,
EllipticFunction& E,
- real& omg12, bool diffp, real& dlam12) const;
+ real& somg12, real& comg12, bool diffp, real& dlam12) const;
+ real GenInverse(real lat1, real lon1, real lat2, real lon2,
+ unsigned outmask, real& s12,
+ real& salp1, real& calp1, real& salp2, real& calp2,
+ real& m12, real& M12, real& M21, real& S12) const;
// These are Maxima generated functions to provide series approximations to
// the integrals for the area.
@@ -202,14 +206,10 @@ namespace GeographicLib {
**********************************************************************/
AREA = 1U<<14 | CAP_C4,
/**
- * Unroll \e lon2 in the direct calculation. (This flag used to be
- * called LONG_NOWRAP.)
+ * Unroll \e lon2 in the direct calculation.
* @hideinitializer
**********************************************************************/
LONG_UNROLL = 1U<<15,
- /// \cond SKIP
- LONG_NOWRAP = LONG_UNROLL,
- /// \endcond
/**
* All capabilities, calculate everything. (LONG_UNROLL is not
* included in this mask.)
@@ -681,8 +681,7 @@ namespace GeographicLib {
Math::real GenInverse(real lat1, real lon1, real lat2, real lon2,
unsigned outmask,
real& s12, real& azi1, real& azi2,
- real& m12, real& M12, real& M21, real& S12)
- const;
+ real& m12, real& M12, real& M21, real& S12) const;
///@}
/** \name Interface to GeodesicLineExact.
@@ -729,6 +728,99 @@ namespace GeographicLib {
GeodesicLineExact Line(real lat1, real lon1, real azi1, unsigned caps = ALL)
const;
+ /**
+ * Define a GeodesicLineExact in terms of the inverse geodesic problem.
+ *
+ * @param[in] lat1 latitude of point 1 (degrees).
+ * @param[in] lon1 longitude of point 1 (degrees).
+ * @param[in] lat2 latitude of point 2 (degrees).
+ * @param[in] lon2 longitude of point 2 (degrees).
+ * @param[in] caps bitor'ed combination of GeodesicExact::mask values
+ * specifying the capabilities the GeodesicLineExact object should
+ * possess, i.e., which quantities can be returned in calls to
+ * GeodesicLineExact::Position.
+ * @return a GeodesicLineExact object.
+ *
+ * This function sets point 3 of the GeodesicLineExact to correspond to
+ * point 2 of the inverse geodesic problem.
+ *
+ * \e lat1 and \e lat2 should be in the range [−90°, 90°].
+ **********************************************************************/
+ GeodesicLineExact InverseLine(real lat1, real lon1, real lat2, real lon2,
+ unsigned caps = ALL) const;
+
+ /**
+ * Define a GeodesicLineExact in terms of the direct geodesic problem
+ * specified in terms of distance.
+ *
+ * @param[in] lat1 latitude of point 1 (degrees).
+ * @param[in] lon1 longitude of point 1 (degrees).
+ * @param[in] azi1 azimuth at point 1 (degrees).
+ * @param[in] s12 distance between point 1 and point 2 (meters); it can be
+ * negative.
+ * @param[in] caps bitor'ed combination of GeodesicExact::mask values
+ * specifying the capabilities the GeodesicLineExact object should
+ * possess, i.e., which quantities can be returned in calls to
+ * GeodesicLineExact::Position.
+ * @return a GeodesicLineExact object.
+ *
+ * This function sets point 3 of the GeodesicLineExact to correspond to
+ * point 2 of the direct geodesic problem.
+ *
+ * \e lat1 should be in the range [−90°, 90°].
+ **********************************************************************/
+ GeodesicLineExact DirectLine(real lat1, real lon1, real azi1, real s12,
+ unsigned caps = ALL) const;
+
+ /**
+ * Define a GeodesicLineExact in terms of the direct geodesic problem
+ * specified in terms of arc length.
+ *
+ * @param[in] lat1 latitude of point 1 (degrees).
+ * @param[in] lon1 longitude of point 1 (degrees).
+ * @param[in] azi1 azimuth at point 1 (degrees).
+ * @param[in] a12 arc length between point 1 and point 2 (degrees); it can
+ * be negative.
+ * @param[in] caps bitor'ed combination of GeodesicExact::mask values
+ * specifying the capabilities the GeodesicLineExact object should
+ * possess, i.e., which quantities can be returned in calls to
+ * GeodesicLineExact::Position.
+ * @return a GeodesicLineExact object.
+ *
+ * This function sets point 3 of the GeodesicLineExact to correspond to
+ * point 2 of the direct geodesic problem.
+ *
+ * \e lat1 should be in the range [−90°, 90°].
+ **********************************************************************/
+ GeodesicLineExact ArcDirectLine(real lat1, real lon1, real azi1, real a12,
+ unsigned caps = ALL) const;
+
+ /**
+ * Define a GeodesicLineExact in terms of the direct geodesic problem
+ * specified in terms of either distance or arc length.
+ *
+ * @param[in] lat1 latitude of point 1 (degrees).
+ * @param[in] lon1 longitude of point 1 (degrees).
+ * @param[in] azi1 azimuth at point 1 (degrees).
+ * @param[in] arcmode boolean flag determining the meaning of the \e
+ * s12_a12.
+ * @param[in] s12_a12 if \e arcmode is false, this is the distance between
+ * point 1 and point 2 (meters); otherwise it is the arc length between
+ * point 1 and point 2 (degrees); it can be negative.
+ * @param[in] caps bitor'ed combination of GeodesicExact::mask values
+ * specifying the capabilities the GeodesicLineExact object should
+ * possess, i.e., which quantities can be returned in calls to
+ * GeodesicLineExact::Position.
+ * @return a GeodesicLineExact object.
+ *
+ * This function sets point 3 of the GeodesicLineExact to correspond to
+ * point 2 of the direct geodesic problem.
+ *
+ * \e lat1 should be in the range [−90°, 90°].
+ **********************************************************************/
+ GeodesicLineExact GenDirectLine(real lat1, real lon1, real azi1,
+ bool arcmode, real s12_a12,
+ unsigned caps = ALL) const;
///@}
/** \name Inspector functions.
@@ -747,14 +839,6 @@ namespace GeographicLib {
**********************************************************************/
Math::real Flattening() const { return _f; }
- /// \cond SKIP
- /**
- * <b>DEPRECATED</b>
- * @return \e r the inverse flattening of the ellipsoid.
- **********************************************************************/
- Math::real InverseFlattening() const { return 1/_f; }
- /// \endcond
-
/**
* @return total area of ellipsoid in meters<sup>2</sup>. The area of a
* polygon encircling a pole can be found by adding
diff --git a/include/GeographicLib/GeodesicLine.hpp b/include/GeographicLib/GeodesicLine.hpp
index 5e19fee..07abcf2 100644
--- a/include/GeographicLib/GeodesicLine.hpp
+++ b/include/GeographicLib/GeodesicLine.hpp
@@ -2,7 +2,7 @@
* \file GeodesicLine.hpp
* \brief Header for GeographicLib::GeodesicLine class
*
- * Copyright (c) Charles Karney (2009-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2009-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
**********************************************************************/
@@ -20,10 +20,21 @@ namespace GeographicLib {
*
* GeodesicLine facilitates the determination of a series of points on a
* single geodesic. The starting point (\e lat1, \e lon1) and the azimuth \e
- * azi1 are specified in the constructor. GeodesicLine.Position returns the
- * location of point 2 a distance \e s12 along the geodesic. Alternatively
- * GeodesicLine.ArcPosition gives the position of point 2 an arc length \e
- * a12 along the geodesic.
+ * azi1 are specified in the constructor; alternatively, the Geodesic::Line
+ * method can be used to create a GeodesicLine. GeodesicLine.Position
+ * returns the location of point 2 a distance \e s12 along the geodesic. In
+ * addition, GeodesicLine.ArcPosition gives the position of point 2 an arc
+ * length \e a12 along the geodesic.
+ *
+ * You can register the position of a reference point 3 a distance (arc
+ * length), \e s13 (\e a13) along the geodesic with the
+ * GeodesicLine.SetDistance (GeodesicLine.SetArc) functions. Points a
+ * fractional distance along the line can be found by providing, for example,
+ * 0.5 * Distance() as an argument to GeodesicLine.Position. The
+ * Geodesic::InverseLine or Geodesic::DirectLine methods return GeodesicLine
+ * objects with point 3 set to the point 2 of the corresponding geodesic
+ * problem. GeodesicLine objects created with the public constructor or with
+ * Geodesic::Line have \e s13 and \e a13 set to NaNs.
*
* The default copy constructor and assignment operators work with this
* class. Similarly, a vector can be used to hold GeodesicLine objects.
@@ -44,7 +55,7 @@ namespace GeographicLib {
* J. Geodesy <b>87</b>, 43--55 (2013);
* DOI: <a href="https://dx.doi.org/10.1007/s00190-012-0578-z">
* 10.1007/s00190-012-0578-z</a>;
- * addenda: <a href="http://geographiclib.sf.net/geod-addenda.html">
+ * addenda: <a href="http://geographiclib.sourceforge.net/geod-addenda.html">
* geod-addenda.html</a>.
* .
* For more information on geodesics see \ref geodesic.
@@ -71,11 +82,21 @@ namespace GeographicLib {
real _a, _f, _b, _c2, _f1, _salp0, _calp0, _k2,
_salp1, _calp1, _ssig1, _csig1, _dn1, _stau1, _ctau1, _somg1, _comg1,
_A1m1, _A2m1, _A3c, _B11, _B21, _B31, _A4, _B41;
+ real _a13, _s13;
// index zero elements of _C1a, _C1pa, _C2a, _C3a are unused
real _C1a[nC1_ + 1], _C1pa[nC1p_ + 1], _C2a[nC2_ + 1], _C3a[nC3_],
_C4a[nC4_]; // all the elements of _C4a are used
unsigned _caps;
+ void LineInit(const Geodesic& g,
+ real lat1, real lon1,
+ real azi1, real salp1, real calp1,
+ unsigned caps);
+ GeodesicLine(const Geodesic& g,
+ real lat1, real lon1,
+ real azi1, real salp1, real calp1,
+ unsigned caps, bool arcmode, real s13_a13);
+
enum captype {
CAP_NONE = Geodesic::CAP_NONE,
CAP_C1 = Geodesic::CAP_C1,
@@ -147,14 +168,10 @@ namespace GeographicLib {
**********************************************************************/
AREA = Geodesic::AREA,
/**
- * Unroll \e lon2 in the direct calculation. (This flag used to be
- * called LONG_NOWRAP.)
+ * Unroll \e lon2 in the direct calculation.
* @hideinitializer
**********************************************************************/
LONG_UNROLL = Geodesic::LONG_UNROLL,
- /// \cond SKIP
- LONG_NOWRAP = LONG_UNROLL,
- /// \endcond
/**
* All capabilities, calculate everything. (LONG_UNROLL is not
* included in this mask.)
@@ -225,7 +242,7 @@ namespace GeographicLib {
* Compute the position of point 2 which is a distance \e s12 (meters) from
* point 1.
*
- * @param[in] s12 distance between point 1 and point 2 (meters); it can be
+ * @param[in] s12 distance from point 1 to point 2 (meters); it can be
* negative.
* @param[out] lat2 latitude of point 2 (degrees).
* @param[out] lon2 longitude of point 2 (degrees); requires that the
@@ -244,7 +261,7 @@ namespace GeographicLib {
* @param[out] S12 area under the geodesic (meters<sup>2</sup>); requires
* that the GeodesicLine object was constructed with \e caps |=
* GeodesicLine::AREA.
- * @return \e a12 arc length of between point 1 and point 2 (degrees).
+ * @return \e a12 arc length from point 1 to point 2 (degrees).
*
* The values of \e lon2 and \e azi2 returned are in the range
* [−180°, 180°).
@@ -330,7 +347,6 @@ namespace GeographicLib {
REDUCEDLENGTH | GEODESICSCALE,
lat2, lon2, azi2, t, m12, M12, M21, t);
}
-
///@}
/** \name Position in terms of arc length
@@ -341,14 +357,14 @@ namespace GeographicLib {
* Compute the position of point 2 which is an arc length \e a12 (degrees)
* from point 1.
*
- * @param[in] a12 arc length between point 1 and point 2 (degrees); it can
+ * @param[in] a12 arc length from point 1 to point 2 (degrees); it can
* be negative.
* @param[out] lat2 latitude of point 2 (degrees).
* @param[out] lon2 longitude of point 2 (degrees); requires that the
* GeodesicLine object was constructed with \e caps |=
* GeodesicLine::LONGITUDE.
* @param[out] azi2 (forward) azimuth at point 2 (degrees).
- * @param[out] s12 distance between point 1 and point 2 (meters); requires
+ * @param[out] s12 distance from point 1 to point 2 (meters); requires
* that the GeodesicLine object was constructed with \e caps |=
* GeodesicLine::DISTANCE.
* @param[out] m12 reduced length of geodesic (meters); requires that the
@@ -465,8 +481,8 @@ namespace GeographicLib {
* GeodesicLine::ArcPosition are defined in terms of this function.
*
* @param[in] arcmode boolean flag determining the meaning of the second
- * parameter; if arcmode is false, then the GeodesicLine object must have
- * been constructed with \e caps |= GeodesicLine::DISTANCE_IN.
+ * parameter; if \e arcmode is false, then the GeodesicLine object must
+ * have been constructed with \e caps |= GeodesicLine::DISTANCE_IN.
* @param[in] s12_a12 if \e arcmode is false, this is the distance between
* point 1 and point 2 (meters); otherwise it is the arc length between
* point 1 and point 2 (degrees); it can be negative.
@@ -477,7 +493,7 @@ namespace GeographicLib {
* GeodesicLine object was constructed with \e caps |=
* GeodesicLine::LONGITUDE.
* @param[out] azi2 (forward) azimuth at point 2 (degrees).
- * @param[out] s12 distance between point 1 and point 2 (meters); requires
+ * @param[out] s12 distance from point 1 to point 2 (meters); requires
* that the GeodesicLine object was constructed with \e caps |=
* GeodesicLine::DISTANCE.
* @param[out] m12 reduced length of geodesic (meters); requires that the
@@ -492,7 +508,7 @@ namespace GeographicLib {
* @param[out] S12 area under the geodesic (meters<sup>2</sup>); requires
* that the GeodesicLine object was constructed with \e caps |=
* GeodesicLine::AREA.
- * @return \e a12 arc length of between point 1 and point 2 (degrees).
+ * @return \e a12 arc length from point 1 to point 2 (degrees).
*
* The GeodesicLine::mask values possible for \e outmask are
* - \e outmask |= GeodesicLine::LATITUDE for the latitude \e lat2;
@@ -521,7 +537,45 @@ namespace GeographicLib {
real& lat2, real& lon2, real& azi2,
real& s12, real& m12, real& M12, real& M21,
real& S12) const;
+ ///@}
+
+ /** \name Setting point 3
+ **********************************************************************/
+ ///@{
+
+ /**
+ * Specify position of point 3 in terms of distance.
+ *
+ * @param[in] s13 the distance from point 1 to point 3 (meters); it
+ * can be negative.
+ *
+ * This is only useful if the GeodesicLine object has been constructed
+ * with \e caps |= GeodesicLine::DISTANCE_IN.
+ **********************************************************************/
+ void SetDistance(real s13);
+
+ /**
+ * Specify position of point 3 in terms of arc length.
+ *
+ * @param[in] a13 the arc length from point 1 to point 3 (degrees); it
+ * can be negative.
+ *
+ * The distance \e s13 is only set if the GeodesicLine object has been
+ * constructed with \e caps |= GeodesicLine::DISTANCE.
+ **********************************************************************/
+ void SetArc(real a13);
+ /**
+ * Specify position of point 3 in terms of either distance or arc length.
+ *
+ * @param[in] arcmode boolean flag determining the meaning of the second
+ * parameter; if \e arcmode is false, then the GeodesicLine object must
+ * have been constructed with \e caps |= GeodesicLine::DISTANCE_IN.
+ * @param[in] s13_a13 if \e arcmode is false, this is the distance from
+ * point 1 to point 3 (meters); otherwise it is the arc length from
+ * point 1 to point 3 (degrees); it can be negative.
+ **********************************************************************/
+ void GenSetDistance(bool arcmode, real s13_a13);
///@}
/** \name Inspector functions
@@ -552,14 +606,31 @@ namespace GeographicLib {
{ return Init() ? _azi1 : Math::NaN(); }
/**
+ * The sine and cosine of \e azi1.
+ *
+ * @param[out] sazi1 the sine of \e azi1.
+ * @param[out] cazi1 the cosine of \e azi1.
+ **********************************************************************/
+ void Azimuth(real& sazi1, real& cazi1) const
+ { if (Init()) { sazi1 = _salp1; cazi1 = _calp1; } }
+
+ /**
* @return \e azi0 the azimuth (degrees) of the geodesic line as it crosses
* the equator in a northward direction.
*
* The result lies in [−90°, 90°].
**********************************************************************/
- Math::real EquatorialAzimuth() const {
- return Init() ? Math::atan2d(_salp0, _calp0) : Math::NaN();
- }
+ Math::real EquatorialAzimuth() const
+ { return Init() ? Math::atan2d(_salp0, _calp0) : Math::NaN(); }
+
+ /**
+ * The sine and cosine of \e azi0.
+ *
+ * @param[out] sazi0 the sine of \e azi0.
+ * @param[out] cazi0 the cosine of \e azi0.
+ **********************************************************************/
+ void EquatorialAzimuth(real& sazi0, real& cazi0) const
+ { if (Init()) { sazi0 = _salp0; cazi0 = _calp0; } }
/**
* @return \e a1 the arc length (degrees) between the northward equatorial
@@ -585,15 +656,6 @@ namespace GeographicLib {
Math::real Flattening() const
{ return Init() ? _f : Math::NaN(); }
- /// \cond SKIP
- /**
- * <b>DEPRECATED</b>
- * @return \e r the inverse flattening of the ellipsoid.
- **********************************************************************/
- Math::real InverseFlattening() const
- { return Init() ? 1/_f : Math::NaN(); }
- /// \endcond
-
/**
* @return \e caps the computational capabilities that this object was
* constructed with. LATITUDE and AZIMUTH are always included.
@@ -601,6 +663,8 @@ namespace GeographicLib {
unsigned Capabilities() const { return _caps; }
/**
+ * Test what capabilities are available.
+ *
* @param[in] testcaps a set of bitor'ed GeodesicLine::mask values.
* @return true if the GeodesicLine object has all these capabilities.
**********************************************************************/
@@ -608,6 +672,26 @@ namespace GeographicLib {
testcaps &= OUT_ALL;
return (_caps & testcaps) == testcaps;
}
+
+ /**
+ * The distance or arc length to point 3.
+ *
+ * @param[in] arcmode boolean flag determining the meaning of returned
+ * value.
+ * @return \e s13 if \e arcmode is false; \e a13 if \e arcmode is true.
+ **********************************************************************/
+ Math::real GenDistance(bool arcmode) const
+ { return Init() ? (arcmode ? _a13 : _s13) : Math::NaN(); }
+
+ /**
+ * @return \e s13, the distance to point 3 (meters).
+ **********************************************************************/
+ Math::real Distance() const { return GenDistance(false); }
+
+ /**
+ * @return \e a13, the arc length to point 3 (degrees).
+ **********************************************************************/
+ Math::real Arc() const { return GenDistance(true); }
///@}
};
diff --git a/include/GeographicLib/GeodesicLineExact.hpp b/include/GeographicLib/GeodesicLineExact.hpp
index 548b790..7a19a1e 100644
--- a/include/GeographicLib/GeodesicLineExact.hpp
+++ b/include/GeographicLib/GeodesicLineExact.hpp
@@ -2,7 +2,7 @@
* \file GeodesicLineExact.hpp
* \brief Header for GeographicLib::GeodesicLineExact class
*
- * Copyright (c) Charles Karney (2012-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2012-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
**********************************************************************/
@@ -44,10 +44,20 @@ namespace GeographicLib {
_salp1, _calp1, _ssig1, _csig1, _dn1, _stau1, _ctau1,
_somg1, _comg1, _cchi1,
_A4, _B41, _E0, _D0, _H0, _E1, _D1, _H1;
+ real _a13, _s13;
real _C4a[nC4_]; // all the elements of _C4a are used
EllipticFunction _E;
unsigned _caps;
+ void LineInit(const GeodesicExact& g,
+ real lat1, real lon1,
+ real azi1, real salp1, real calp1,
+ unsigned caps);
+ GeodesicLineExact(const GeodesicExact& g,
+ real lat1, real lon1,
+ real azi1, real salp1, real calp1,
+ unsigned caps, bool arcmode, real s13_a13);
+
enum captype {
CAP_NONE = GeodesicExact::CAP_NONE,
CAP_E = GeodesicExact::CAP_E,
@@ -119,14 +129,10 @@ namespace GeographicLib {
**********************************************************************/
AREA = GeodesicExact::AREA,
/**
- * Unroll \e lon2 in the direct calculation. (This flag used to be
- * called LONG_NOWRAP.)
+ * Unroll \e lon2 in the direct calculation.
* @hideinitializer
**********************************************************************/
LONG_UNROLL = GeodesicExact::LONG_UNROLL,
- /// \cond SKIP
- LONG_NOWRAP = LONG_UNROLL,
- /// \endcond
/**
* All capabilities, calculate everything. (LONG_UNROLL is not
* included in this mask.)
@@ -199,7 +205,7 @@ namespace GeographicLib {
* Compute the position of point 2 which is a distance \e s12 (meters)
* from point 1.
*
- * @param[in] s12 distance between point 1 and point 2 (meters); it can be
+ * @param[in] s12 distance from point 1 to point 2 (meters); it can be
* signed.
* @param[out] lat2 latitude of point 2 (degrees).
* @param[out] lon2 longitude of point 2 (degrees); requires that the
@@ -218,7 +224,7 @@ namespace GeographicLib {
* @param[out] S12 area under the geodesic (meters<sup>2</sup>); requires
* that the GeodesicLineExact object was constructed with \e caps |=
* GeodesicLineExact::AREA.
- * @return \e a12 arc length of between point 1 and point 2 (degrees).
+ * @return \e a12 arc length from point 1 to point 2 (degrees).
*
* The values of \e lon2 and \e azi2 returned are in the range
* [−180°, 180°).
@@ -304,7 +310,6 @@ namespace GeographicLib {
REDUCEDLENGTH | GEODESICSCALE,
lat2, lon2, azi2, t, m12, M12, M21, t);
}
-
///@}
/** \name Position in terms of arc length
@@ -315,14 +320,14 @@ namespace GeographicLib {
* Compute the position of point 2 which is an arc length \e a12 (degrees)
* from point 1.
*
- * @param[in] a12 arc length between point 1 and point 2 (degrees); it can
+ * @param[in] a12 arc length from point 1 to point 2 (degrees); it can
* be signed.
* @param[out] lat2 latitude of point 2 (degrees).
* @param[out] lon2 longitude of point 2 (degrees); requires that the
* GeodesicLineExact object was constructed with \e caps |=
* GeodesicLineExact::LONGITUDE.
* @param[out] azi2 (forward) azimuth at point 2 (degrees).
- * @param[out] s12 distance between point 1 and point 2 (meters); requires
+ * @param[out] s12 distance from point 1 to point 2 (meters); requires
* that the GeodesicLineExact object was constructed with \e caps |=
* GeodesicLineExact::DISTANCE.
* @param[out] m12 reduced length of geodesic (meters); requires that the
@@ -439,8 +444,9 @@ namespace GeographicLib {
* GeodesicLineExact::ArcPosition are defined in terms of this function.
*
* @param[in] arcmode boolean flag determining the meaning of the second
- * parameter; if arcmode is false, then the GeodesicLineExact object must
- * have been constructed with \e caps |= GeodesicLineExact::DISTANCE_IN.
+ * parameter; if \e arcmode is false, then the GeodesicLineExact object
+ * must have been constructed with \e caps |=
+ * GeodesicLineExact::DISTANCE_IN.
* @param[in] s12_a12 if \e arcmode is false, this is the distance between
* point 1 and point 2 (meters); otherwise it is the arc length between
* point 1 and point 2 (degrees); it can be signed.
@@ -451,7 +457,7 @@ namespace GeographicLib {
* GeodesicLineExact object was constructed with \e caps |=
* GeodesicLineExact::LONGITUDE.
* @param[out] azi2 (forward) azimuth at point 2 (degrees).
- * @param[out] s12 distance between point 1 and point 2 (meters); requires
+ * @param[out] s12 distance from point 1 to point 2 (meters); requires
* that the GeodesicLineExact object was constructed with \e caps |=
* GeodesicLineExact::DISTANCE.
* @param[out] m12 reduced length of geodesic (meters); requires that the
@@ -466,7 +472,7 @@ namespace GeographicLib {
* @param[out] S12 area under the geodesic (meters<sup>2</sup>); requires
* that the GeodesicLineExact object was constructed with \e caps |=
* GeodesicLineExact::AREA.
- * @return \e a12 arc length of between point 1 and point 2 (degrees).
+ * @return \e a12 arc length from point 1 to point 2 (degrees).
*
* The GeodesicLineExact::mask values possible for \e outmask are
* - \e outmask |= GeodesicLineExact::LATITUDE for the latitude \e lat2;
@@ -495,9 +501,47 @@ namespace GeographicLib {
real& lat2, real& lon2, real& azi2,
real& s12, real& m12, real& M12, real& M21,
real& S12) const;
-
///@}
+ /** \name Setting point 3
+ **********************************************************************/
+ ///@{
+
+ /**
+ * Specify position of point 3 in terms of distance.
+ *
+ * @param[in] s13 the distance from point 1 to point 3 (meters); it
+ * can be negative.
+ *
+ * This is only useful if the GeodesicLineExact object has been constructed
+ * with \e caps |= GeodesicLineExact::DISTANCE_IN.
+ **********************************************************************/
+ void SetDistance(real s13);
+
+ /**
+ * Specify position of point 3 in terms of arc length.
+ *
+ * @param[in] a13 the arc length from point 1 to point 3 (degrees); it
+ * can be negative.
+ *
+ * The distance \e s13 is only set if the GeodesicLineExact object has been
+ * constructed with \e caps |= GeodesicLineExact::DISTANCE.
+ **********************************************************************/
+ void SetArc(real a13);
+
+ /**
+ * Specify position of point 3 in terms of either distance or arc length.
+ *
+ * @param[in] arcmode boolean flag determining the meaning of the second
+ * parameter; if \e arcmode is false, then the GeodesicLineExact object
+ * must have been constructed with \e caps |=
+ * GeodesicLineExact::DISTANCE_IN.
+ * @param[in] s13_a13 if \e arcmode is false, this is the distance from
+ * point 1 to point 3 (meters); otherwise it is the arc length from
+ * point 1 to point 3 (degrees); it can be negative.
+ **********************************************************************/
+ void GenSetDistance(bool arcmode, real s13_a13);
+
/** \name Inspector functions
**********************************************************************/
///@{
@@ -526,15 +570,31 @@ namespace GeographicLib {
{ return Init() ? _azi1 : Math::NaN(); }
/**
+ * The sine and cosine of \e azi1.
+ *
+ * @param[out] sazi1 the sine of \e azi1.
+ * @param[out] cazi1 the cosine of \e azi1.
+ **********************************************************************/
+ void Azimuth(real& sazi1, real& cazi1) const
+ { if (Init()) { sazi1 = _salp1; cazi1 = _calp1; } }
+
+ /**
* @return \e azi0 the azimuth (degrees) of the geodesic line as it crosses
* the equator in a northward direction.
*
* The result lies in [−90°, 90°].
**********************************************************************/
- Math::real EquatorialAzimuth() const {
- using std::atan2;
- return Init() ? Math::atan2d(_salp0, _calp0) : Math::NaN();
- }
+ Math::real EquatorialAzimuth() const
+ { return Init() ? Math::atan2d(_salp0, _calp0) : Math::NaN(); }
+
+ /**
+ * The sine and cosine of \e azi0.
+ *
+ * @param[out] sazi0 the sine of \e azi0.
+ * @param[out] cazi0 the cosine of \e azi0.
+ **********************************************************************/
+ void EquatorialAzimuth(real& sazi0, real& cazi0) const
+ { if (Init()) { sazi0 = _salp0; cazi0 = _calp0; } }
/**
* @return \e a1 the arc length (degrees) between the northward equatorial
@@ -562,15 +622,6 @@ namespace GeographicLib {
Math::real Flattening() const
{ return Init() ? _f : Math::NaN(); }
- /// \cond SKIP
- /**
- * <b>DEPRECATED</b>
- * @return \e r the inverse flattening of the ellipsoid.
- **********************************************************************/
- Math::real InverseFlattening() const
- { return Init() ? 1/_f : Math::NaN(); }
- /// \endcond
-
/**
* @return \e caps the computational capabilities that this object was
* constructed with. LATITUDE and AZIMUTH are always included.
@@ -578,6 +629,8 @@ namespace GeographicLib {
unsigned Capabilities() const { return _caps; }
/**
+ * Test what capabilities are available.
+ *
* @param[in] testcaps a set of bitor'ed GeodesicLineExact::mask values.
* @return true if the GeodesicLineExact object has all these capabilities.
**********************************************************************/
@@ -585,6 +638,26 @@ namespace GeographicLib {
testcaps &= OUT_ALL;
return (_caps & testcaps) == testcaps;
}
+
+ /**
+ * The distance or arc length to point 3.
+ *
+ * @param[in] arcmode boolean flag determining the meaning of returned
+ * value.
+ * @return \e s13 if \e arcmode is false; \e a13 if \e arcmode is true.
+ **********************************************************************/
+ Math::real GenDistance(bool arcmode) const
+ { return Init() ? (arcmode ? _a13 : _s13) : Math::NaN(); }
+
+ /**
+ * @return \e s13, the distance to point 3 (meters).
+ **********************************************************************/
+ Math::real Distance() const { return GenDistance(false); }
+
+ /**
+ * @return \e a13, the arc length to point 3 (degrees).
+ **********************************************************************/
+ Math::real Arc() const { return GenDistance(true); }
///@}
};
diff --git a/include/GeographicLib/Geoid.hpp b/include/GeographicLib/Geoid.hpp
index 9f2e388..4e1a42d 100644
--- a/include/GeographicLib/Geoid.hpp
+++ b/include/GeographicLib/Geoid.hpp
@@ -170,8 +170,7 @@ namespace GeographicLib {
}
}
}
- real height(real lat, real lon, bool gradp,
- real& grade, real& gradn) const;
+ real height(real lat, real lon) const;
Geoid(const Geoid&); // copy constructor not allowed
Geoid& operator=(const Geoid&); // copy assignment not allowed
public:
@@ -284,35 +283,9 @@ namespace GeographicLib {
* The latitude should be in [−90°, 90°].
**********************************************************************/
Math::real operator()(real lat, real lon) const {
- real gradn, grade;
- return height(lat, lon, false, gradn, grade);
+ return height(lat, lon);
}
- /// \cond SKIP
- /**
- * Compute the geoid height and gradient at a point
- *
- * @param[in] lat latitude of the point (degrees).
- * @param[in] lon longitude of the point (degrees).
- * @param[out] gradn northerly gradient (dimensionless).
- * @param[out] grade easterly gradient (dimensionless).
- * @exception GeographicErr if there's a problem reading the data; this
- * never happens if (\e lat, \e lon) is within a successfully cached area.
- * @return geoid height (meters).
- *
- * The latitude should be in [−90°, 90°]. As a result of the
- * way that the geoid data is stored, the calculation of gradients can
- * result in large quantization errors. This is particularly acute for
- * fine grids, at high latitudes, and for the easterly gradient. For this
- * reason, the computation of the gradient is <b>DEPRECATED</b>. If you
- * need to compute the direction of the acceleration due to gravity
- * accurately, you should use GravityModel::Gravity.
- **********************************************************************/
- Math::real operator()(real lat, real lon, real& gradn, real& grade) const {
- return height(lat, lon, true, gradn, grade);
- }
- /// \endcond
-
/**
* Convert a height above the geoid to a height above the ellipsoid and
* vice versa.
@@ -330,8 +303,7 @@ namespace GeographicLib {
**********************************************************************/
Math::real ConvertHeight(real lat, real lon, real h,
convertflag d) const {
- real gradn, grade;
- return h + real(d) * height(lat, lon, false, gradn, grade);
+ return h + real(d) * height(lat, lon);
}
///@}
@@ -468,15 +440,6 @@ namespace GeographicLib {
Math::real Flattening() const { return Constants::WGS84_f(); }
///@}
- /// \cond SKIP
- /**
- * <b>DEPRECATED</b>
- * @return \e r the inverse flattening of the WGS84 ellipsoid.
- **********************************************************************/
- Math::real InverseFlattening() const
- { return 1/Constants::WGS84_f(); }
- /// \endcond
-
/**
* @return the default path for geoid data files.
*
diff --git a/include/GeographicLib/Gnomonic.hpp b/include/GeographicLib/Gnomonic.hpp
index be3645c..53b9068 100644
--- a/include/GeographicLib/Gnomonic.hpp
+++ b/include/GeographicLib/Gnomonic.hpp
@@ -27,7 +27,7 @@ namespace GeographicLib {
* J. Geodesy <b>87</b>, 43--55 (2013);
* DOI: <a href="https://dx.doi.org/10.1007/s00190-012-0578-z">
* 10.1007/s00190-012-0578-z</a>;
- * addenda: <a href="http://geographiclib.sf.net/geod-addenda.html">
+ * addenda: <a href="http://geographiclib.sourceforge.net/geod-addenda.html">
* geod-addenda.html</a>.
* .
* The projection of \e P is defined as follows: compute the geodesic line
@@ -199,14 +199,6 @@ namespace GeographicLib {
Math::real Flattening() const { return _earth.Flattening(); }
///@}
- /// \cond SKIP
- /**
- * <b>DEPRECATED</b>
- * @return \e r the inverse flattening of the ellipsoid.
- **********************************************************************/
- Math::real InverseFlattening() const
- { return _earth.InverseFlattening(); }
- /// \endcond
};
} // namespace GeographicLib
diff --git a/include/GeographicLib/GravityCircle.hpp b/include/GeographicLib/GravityCircle.hpp
index 335b23b..7bd94e0 100644
--- a/include/GeographicLib/GravityCircle.hpp
+++ b/include/GeographicLib/GravityCircle.hpp
@@ -89,11 +89,11 @@ namespace GeographicLib {
{}
friend class GravityModel; // GravityModel calls the private constructor
- Math::real W(real clam, real slam,
+ Math::real W(real slam, real clam,
real& gX, real& gY, real& gZ) const;
- Math::real V(real clam, real slam,
+ Math::real V(real slam, real clam,
real& gX, real& gY, real& gZ) const;
- Math::real InternalT(real clam, real slam,
+ Math::real InternalT(real slam, real clam,
real& deltaX, real& deltaY, real& deltaZ,
bool gradp, bool correct) const;
public:
@@ -184,9 +184,9 @@ namespace GeographicLib {
* centrifugal potentials (m<sup>2</sup> s<sup>−2</sup>).
**********************************************************************/
Math::real W(real lon, real& gX, real& gY, real& gZ) const {
- real clam, slam;
+ real slam, clam;
Math::sincosd(lon, slam, clam);
- return W(clam, slam, gX, gY, gZ);
+ return W(slam, clam, gX, gY, gZ);
}
/**
@@ -204,9 +204,9 @@ namespace GeographicLib {
* (m<sup>2</sup> s<sup>−2</sup>).
**********************************************************************/
Math::real V(real lon, real& GX, real& GY, real& GZ) const {
- real clam, slam;
+ real slam, clam;
Math::sincosd(lon, slam, clam);
- return V(clam, slam, GX, GY, GZ);
+ return V(slam, clam, GX, GY, GZ);
}
/**
@@ -225,9 +225,9 @@ namespace GeographicLib {
**********************************************************************/
Math::real T(real lon, real& deltaX, real& deltaY, real& deltaZ)
const {
- real clam, slam;
+ real slam, clam;
Math::sincosd(lon, slam, clam);
- return InternalT(clam, slam, deltaX, deltaY, deltaZ, true, true);
+ return InternalT(slam, clam, deltaX, deltaY, deltaZ, true, true);
}
/**
@@ -238,9 +238,9 @@ namespace GeographicLib {
* anomalous potential) (m<sup>2</sup> s<sup>−2</sup>).
**********************************************************************/
Math::real T(real lon) const {
- real clam, slam, dummy;
+ real slam, clam, dummy;
Math::sincosd(lon, slam, clam);
- return InternalT(clam, slam, dummy, dummy, dummy, false, true);
+ return InternalT(slam, clam, dummy, dummy, dummy, false, true);
}
///@}
diff --git a/include/GeographicLib/LambertConformalConic.hpp b/include/GeographicLib/LambertConformalConic.hpp
index 977eff8..4abd93b 100644
--- a/include/GeographicLib/LambertConformalConic.hpp
+++ b/include/GeographicLib/LambertConformalConic.hpp
@@ -284,14 +284,6 @@ namespace GeographicLib {
**********************************************************************/
Math::real Flattening() const { return _f; }
- /// \cond SKIP
- /**
- * <b>DEPRECATED</b>
- * @return \e r the inverse flattening of the ellipsoid.
- **********************************************************************/
- Math::real InverseFlattening() const { return 1/_f; }
- /// \endcond
-
/**
* @return latitude of the origin for the projection (degrees).
*
diff --git a/include/GeographicLib/LocalCartesian.hpp b/include/GeographicLib/LocalCartesian.hpp
index 110cb30..b6ed512 100644
--- a/include/GeographicLib/LocalCartesian.hpp
+++ b/include/GeographicLib/LocalCartesian.hpp
@@ -229,14 +229,6 @@ namespace GeographicLib {
Math::real Flattening() const { return _earth.Flattening(); }
///@}
- /// \cond SKIP
- /**
- * <b>DEPRECATED</b>
- * @return \e r the inverse flattening of the ellipsoid.
- **********************************************************************/
- Math::real InverseFlattening() const
- { return _earth.InverseFlattening(); }
- /// \endcond
};
} // namespace GeographicLib
diff --git a/include/GeographicLib/MGRS.hpp b/include/GeographicLib/MGRS.hpp
index 9d48729..b423195 100644
--- a/include/GeographicLib/MGRS.hpp
+++ b/include/GeographicLib/MGRS.hpp
@@ -344,14 +344,6 @@ namespace GeographicLib {
**********************************************************************/
static void Check();
- /// \cond SKIP
- /**
- * <b>DEPRECATED</b>
- * @return \e r the inverse flattening of the WGS84 ellipsoid.
- **********************************************************************/
- static Math::real InverseFlattening()
- { return UTMUPS::InverseFlattening(); }
- /// \endcond
};
} // namespace GeographicLib
diff --git a/include/GeographicLib/Math.hpp b/include/GeographicLib/Math.hpp
index e1cb0f4..0368b63 100644
--- a/include/GeographicLib/Math.hpp
+++ b/include/GeographicLib/Math.hpp
@@ -2,7 +2,7 @@
* \file Math.hpp
* \brief Header for GeographicLib::Math class
*
- * Copyright (c) Charles Karney (2008-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2008-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
**********************************************************************/
@@ -190,20 +190,6 @@ namespace GeographicLib {
digits10() - std::numeric_limits<double>::digits10 : 0;
}
-#if GEOGRAPHICLIB_PRECISION <= 3
- /**
- * Number of additional decimal digits of precision of real relative to
- * double (0 for float).
- *
- * <b>DEPRECATED</b>: use extra_digits() instead
- **********************************************************************/
- static const int extradigits =
- std::numeric_limits<real>::digits10 >
- std::numeric_limits<double>::digits10 ?
- std::numeric_limits<real>::digits10 -
- std::numeric_limits<double>::digits10 : 0;
-#endif
-
/**
* true if the machine is big-endian.
**********************************************************************/
@@ -460,18 +446,6 @@ namespace GeographicLib {
}
/**
- * Normalize an arbitrary angle.
- *
- * @tparam T the type of the argument and returned value.
- * @param[in] x the angle in degrees.
- * @return the angle reduced to the range [−180°, 180°).
- *
- * <b>DEPRECATED</b>: use AngNormalize instead.
- **********************************************************************/
- template<typename T> static inline T AngNormalize2(T x)
- { return AngNormalize<T>(x); }
-
- /**
* Normalize a latitude.
*
* @tparam T the type of the argument and returned value.
@@ -483,20 +457,22 @@ namespace GeographicLib {
{ using std::abs; return abs(x) > 90 ? NaN<T>() : x; }
/**
- * Difference of two angles reduced to [−180°, 180°]
+ * The exact difference of two angles reduced to
+ * (−180°, 180°].
*
* @tparam T the type of the arguments and returned value.
* @param[in] x the first angle in degrees.
* @param[in] y the second angle in degrees.
- * @return \e y − \e x, reduced to the range [−180°,
- * 180°].
+ * @param[out] e the error term in degrees.
+ * @return \e d, the truncated value of \e y − \e x.
*
- * The result is equivalent to computing the difference exactly, reducing
- * it to (−180°, 180°] and rounding the result. Note that
- * this prescription allows −180° to be returned (e.g., if \e x
- * is tiny and negative and \e y = 180°).
+ * This computes \e z = \e y − \e x exactly, reduced to
+ * (−180°, 180°]; and then sets \e z = \e d + \e e where \e d
+ * is the nearest representable number to \e z and \e e is the truncation
+ * error. If \e d = −180, then \e e > 0; If \e d = 180, then \e e
+ * ≤ 0.
**********************************************************************/
- template<typename T> static inline T AngDiff(T x, T y) {
+ template<typename T> static inline T AngDiff(T x, T y, T& e) {
#if GEOGRAPHICLIB_CXX11_MATH && GEOGRAPHICLIB_PRECISION != 4
using std::remainder;
T t, d = - AngNormalize(sum(remainder( x, T(360)),
@@ -510,10 +486,27 @@ namespace GeographicLib {
// and t < 0. The case, d = -180 + eps, t = eps, can't happen, since
// sum would have returned the exact result in such a case (i.e., given t
// = 0).
- return (d == 180 && t < 0 ? -180 : d) - t;
+ return sum(d == 180 && t < 0 ? -180 : d, -t, e);
}
/**
+ * Difference of two angles reduced to [−180°, 180°]
+ *
+ * @tparam T the type of the arguments and returned value.
+ * @param[in] x the first angle in degrees.
+ * @param[in] y the second angle in degrees.
+ * @return \e y − \e x, reduced to the range [−180°,
+ * 180°].
+ *
+ * The result is equivalent to computing the difference exactly, reducing
+ * it to (−180°, 180°] and rounding the result. Note that
+ * this prescription allows −180° to be returned (e.g., if \e x
+ * is tiny and negative and \e y = 180°).
+ **********************************************************************/
+ template<typename T> static inline T AngDiff(T x, T y)
+ { T e; return AngDiff(x, y, e); }
+
+ /**
* Coarsen a value close to zero.
*
* @tparam T the type of the argument and returned value.
@@ -525,24 +518,17 @@ namespace GeographicLib {
* degrees. (This is about 1000 times more resolution than we get with
* angles around 90°.) We use this to avoid having to deal with near
* singular cases when \e x is non-zero but tiny (e.g.,
- * 10<sup>−200</sup>). This also converts -0 to +0.
+ * 10<sup>−200</sup>). This converts -0 to +0; however tiny negative
+ * numbers get converted to -0.
**********************************************************************/
template<typename T> static inline T AngRound(T x) {
using std::abs;
- const T z = 1/T(16);
+ static const T z = 1/T(16);
+ if (x == 0) return 0;
GEOGRAPHICLIB_VOLATILE T y = abs(x);
// The compiler mustn't "simplify" z - (z - y) to y
y = y < z ? z - (z - y) : y;
-#if GEOGRAPHICLIB_PRECISION == 4
- // With quad precision and x = +/-0, this gives y = -0. So change test
- // to x <= 0 here to force +0 to be returned.
- return x <= 0 ? 0 - y : y;
-#elif GEOGRAPHICLIB_PRECISION == 5
- // With mpfr, 0 - y is a call to +=(int) which doesn't fix the sign of -0
- return x < 0 ? T(0) - y : y;
-#else
- return x < 0 ? 0 - y : y;
-#endif
+ return x < 0 ? -y : y;
}
/**
@@ -566,7 +552,9 @@ namespace GeographicLib {
// Disable for gcc because of bug in glibc version < 2.22, see
// https://sourceware.org/bugzilla/show_bug.cgi?id=17569
// Once this fix is widely deployed, should insert a runtime test for the
- // glibc version number.
+ // glibc version number. For example
+ // #include <gnu/libc-version.h>
+ // std::string version(gnu_get_libc_version()); => "2.22"
using std::remquo;
r = remquo(x, T(90), &q);
#else
@@ -579,11 +567,18 @@ namespace GeographicLib {
r *= degree();
// Possibly could call the gnu extension sincos
T s = sin(r), c = cos(r);
+#if defined(_MSC_VER) && _MSC_VER < 1900
+ // Before version 14 (2015), Visual Studio had problems dealing
+ // with -0.0. Specifically
+ // VC 10,11,12 and 32-bit compile: fmod(-0.0, 360.0) -> +0.0
+ // VC 12 and 64-bit compile: sin(-0.0) -> +0.0
+ if (x == 0) s = x;
+#endif
switch (unsigned(q) & 3U) {
- case 0U: sinx = s; cosx = c; break;
- case 1U: sinx = c; cosx = 0 - s; break;
- case 2U: sinx = 0 - s; cosx = 0 - c; break;
- default: sinx = 0 - c; cosx = s; break; // case 3U
+ case 0U: sinx = s; cosx = c; break;
+ case 1U: sinx = c; cosx = T(0) - s; break;
+ case 2U: sinx = T(0) - s; cosx = T(0) - c; break;
+ default: sinx = T(0) - c; cosx = s; break; // case 3U
}
}
@@ -612,7 +607,7 @@ namespace GeographicLib {
r *= degree();
unsigned p = unsigned(q);
r = p & 1U ? cos(r) : sin(r);
- return p & 2U ? 0 - r : r;
+ return p & 2U ? T(0) - r : r;
}
/**
@@ -640,7 +635,7 @@ namespace GeographicLib {
r *= degree();
unsigned p = unsigned(q + 1);
r = p & 1U ? cos(r) : sin(r);
- return p & 2U ? 0 - r : r;
+ return p & 2U ? T(0) - r : r;
}
/**
@@ -723,6 +718,24 @@ namespace GeographicLib {
template<typename T> static T eatanhe(T x, T es);
/**
+ * Copy the sign.
+ *
+ * @tparam T the type of the argument.
+ * @param[in] x gives the magitude of the result.
+ * @param[in] y gives the sign of the result.
+ * @return value with the magnitude of \e x and with the sign of \e y.
+ **********************************************************************/
+ template<typename T> static inline T copysign(T x, T y) {
+#if GEOGRAPHICLIB_CXX11_MATH
+ using std::copysign; return copysign(x, y);
+#else
+ using std::abs; using std::atan2;
+ // NaN counts as positive
+ return abs(x) * (y < 0 || (y == 0 && 1/y < 0) ? -1 : 1);
+#endif
+ }
+
+ /**
* tanχ in terms of tanφ
*
* @tparam T the type of the argument and the returned value.
@@ -770,7 +783,16 @@ namespace GeographicLib {
using std::isfinite; return isfinite(x);
#else
using std::abs;
+#if defined(_MSC_VER)
return abs(x) <= (std::numeric_limits<T>::max)();
+#else
+ // There's a problem using MPFR C++ 3.6.3 and g++ -std=c++14 (reported on
+ // 2015-05-04) with the parens around std::numeric_limits<T>::max. Of
+ // course, these parens are only needed to deal with Windows stupidly
+ // defining max as a macro. So don't insert the parens on non-Windows
+ // platforms.
+ return abs(x) <= std::numeric_limits<T>::max();
+#endif
#endif
}
@@ -781,9 +803,15 @@ namespace GeographicLib {
* @return NaN if available, otherwise return the max real of type T.
**********************************************************************/
template<typename T> static inline T NaN() {
+#if defined(_MSC_VER)
return std::numeric_limits<T>::has_quiet_NaN ?
std::numeric_limits<T>::quiet_NaN() :
(std::numeric_limits<T>::max)();
+#else
+ return std::numeric_limits<T>::has_quiet_NaN ?
+ std::numeric_limits<T>::quiet_NaN() :
+ std::numeric_limits<T>::max();
+#endif
}
/**
* A synonym for NaN<real>().
@@ -812,9 +840,15 @@ namespace GeographicLib {
* @return infinity if available, otherwise return the max real.
**********************************************************************/
template<typename T> static inline T infinity() {
+#if defined(_MSC_VER)
return std::numeric_limits<T>::has_infinity ?
std::numeric_limits<T>::infinity() :
(std::numeric_limits<T>::max)();
+#else
+ return std::numeric_limits<T>::has_infinity ?
+ std::numeric_limits<T>::infinity() :
+ std::numeric_limits<T>::max();
+#endif
}
/**
* A synonym for infinity<real>().
@@ -872,6 +906,9 @@ namespace GeographicLib {
static inline real fma(real x, real y, real z)
{ return fmaq(__float128(x), __float128(y), __float128(z)); }
+ static inline real copysign(real x, real y)
+ { return boost::math::copysign(x, y); }
+
static inline bool isnan(real x) { return boost::math::isnan(x); }
static inline bool isfinite(real x) { return boost::math::isfinite(x); }
diff --git a/include/GeographicLib/OSGB.hpp b/include/GeographicLib/OSGB.hpp
index ec55fb8..450dfe7 100644
--- a/include/GeographicLib/OSGB.hpp
+++ b/include/GeographicLib/OSGB.hpp
@@ -205,14 +205,6 @@ namespace GeographicLib {
static Math::real Flattening()
{ return real(20923713 - 20853810) / 20923713; }
- /// \cond SKIP
- /**
- * <b>DEPRECATED</b>
- * @return \e r the inverse flattening of the Airy 1830 ellipsoid.
- **********************************************************************/
- static Math::real InverseFlattening() { return 1/Flattening(); }
- /// \endcond
-
/**
* @return \e k0 central scale for the OSGB projection (0.9996012717...).
*
diff --git a/include/GeographicLib/PolarStereographic.hpp b/include/GeographicLib/PolarStereographic.hpp
index 0e7213f..ce361f8 100644
--- a/include/GeographicLib/PolarStereographic.hpp
+++ b/include/GeographicLib/PolarStereographic.hpp
@@ -129,14 +129,6 @@ namespace GeographicLib {
**********************************************************************/
Math::real Flattening() const { return _f; }
- /// \cond SKIP
- /**
- * <b>DEPRECATED</b>
- * @return \e r the inverse flattening of the ellipsoid.
- **********************************************************************/
- Math::real InverseFlattening() const { return 1/_f; }
- /// \endcond
-
/**
* The central scale for the projection. This is the value of \e k0 used
* in the constructor and is the scale at the pole unless overridden by
diff --git a/include/GeographicLib/PolygonArea.hpp b/include/GeographicLib/PolygonArea.hpp
index f21f7e8..ef3b801 100644
--- a/include/GeographicLib/PolygonArea.hpp
+++ b/include/GeographicLib/PolygonArea.hpp
@@ -2,7 +2,7 @@
* \file PolygonArea.hpp
* \brief Header for GeographicLib::PolygonAreaT class
*
- * Copyright (c) Charles Karney (2010-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2010-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
**********************************************************************/
@@ -28,16 +28,17 @@ namespace GeographicLib {
* J. Geodesy <b>87</b>, 43--55 (2013);
* DOI: <a href="https://dx.doi.org/10.1007/s00190-012-0578-z">
* 10.1007/s00190-012-0578-z</a>;
- * addenda: <a href="http://geographiclib.sf.net/geod-addenda.html">
+ * addenda:
+ * <a href="http://geographiclib.sourceforge.net/geod-addenda.html">
* geod-addenda.html</a>.
*
* This class lets you add vertices and edges one at a time to the polygon.
* The sequence must start with a vertex and thereafter vertices and edges
* can be added in any order. Any vertex after the first creates a new edge
- * which is the ''shortest'' geodesic from the previous vertex. In some
+ * which is the \e shortest geodesic from the previous vertex. In some
* cases there may be two or many such shortest geodesics and the area is
* then not uniquely defined. In this case, either add an intermediate
- * vertex or add the edge ''as'' an edge (by defining its direction and
+ * vertex or add the edge \e as an edge (by defining its direction and
* length).
*
* The area and perimeter are accumulated at two times the standard floating
@@ -228,17 +229,6 @@ namespace GeographicLib {
unsigned TestEdge(real azi, real s, bool reverse, bool sign,
real& perimeter, real& area) const;
- /// \cond SKIP
- /**
- * <b>DEPRECATED</b>
- * The old name for PolygonAreaT::TestPoint.
- **********************************************************************/
- unsigned TestCompute(real lat, real lon, bool reverse, bool sign,
- real& perimeter, real& area) const {
- return TestPoint(lat, lon, reverse, sign, perimeter, area);
- }
- /// \endcond
-
/** \name Inspector functions
**********************************************************************/
///@{
diff --git a/include/GeographicLib/Rhumb.hpp b/include/GeographicLib/Rhumb.hpp
index feacb2a..d51f5c9 100644
--- a/include/GeographicLib/Rhumb.hpp
+++ b/include/GeographicLib/Rhumb.hpp
@@ -218,14 +218,10 @@ namespace GeographicLib {
**********************************************************************/
AREA = 1U<<14,
/**
- * Unroll \e lon2 in the direct calculation. (This flag used to be
- * called LONG_NOWRAP.)
+ * Unroll \e lon2 in the direct calculation.
* @hideinitializer
**********************************************************************/
LONG_UNROLL = 1U<<15,
- /// \cond SKIP
- LONG_NOWRAP = LONG_UNROLL,
- /// \endcond
/**
* Calculate everything. (LONG_UNROLL is not included in this mask.)
* @hideinitializer
@@ -484,14 +480,10 @@ namespace GeographicLib {
**********************************************************************/
AREA = Rhumb::AREA,
/**
- * Unroll \e lon2 in the direct calculation. (This flag used to be
- * called LONG_NOWRAP.)
+ * Unroll \e lon2 in the direct calculation.
* @hideinitializer
**********************************************************************/
LONG_UNROLL = Rhumb::LONG_UNROLL,
- /// \cond SKIP
- LONG_NOWRAP = LONG_UNROLL,
- /// \endcond
/**
* Calculate everything. (LONG_UNROLL is not included in this mask.)
* @hideinitializer
diff --git a/include/GeographicLib/SphericalEngine.hpp b/include/GeographicLib/SphericalEngine.hpp
index 994ae30..f1bff78 100644
--- a/include/GeographicLib/SphericalEngine.hpp
+++ b/include/GeographicLib/SphericalEngine.hpp
@@ -78,11 +78,6 @@ namespace GeographicLib {
* @hideinitializer
**********************************************************************/
SCHMIDT = 1,
- /// \cond SKIP
- // These are deprecated...
- full = FULL,
- schmidt = SCHMIDT,
- /// \endcond
};
/**
diff --git a/include/GeographicLib/SphericalHarmonic.hpp b/include/GeographicLib/SphericalHarmonic.hpp
index 0351837..a500ef8 100644
--- a/include/GeographicLib/SphericalHarmonic.hpp
+++ b/include/GeographicLib/SphericalHarmonic.hpp
@@ -116,11 +116,6 @@ namespace GeographicLib {
* @hideinitializer
**********************************************************************/
SCHMIDT = SphericalEngine::SCHMIDT,
- /// \cond SKIP
- // These are deprecated...
- full = FULL,
- schmidt = SCHMIDT,
- /// \endcond
};
private:
diff --git a/include/GeographicLib/SphericalHarmonic1.hpp b/include/GeographicLib/SphericalHarmonic1.hpp
index 0efd669..e4d80d9 100644
--- a/include/GeographicLib/SphericalHarmonic1.hpp
+++ b/include/GeographicLib/SphericalHarmonic1.hpp
@@ -49,11 +49,6 @@ namespace GeographicLib {
* @hideinitializer
**********************************************************************/
SCHMIDT = SphericalEngine::SCHMIDT,
- /// \cond SKIP
- // These are deprecated...
- full = FULL,
- schmidt = SCHMIDT,
- /// \endcond
};
private:
diff --git a/include/GeographicLib/SphericalHarmonic2.hpp b/include/GeographicLib/SphericalHarmonic2.hpp
index adc5c58..49fbae7 100644
--- a/include/GeographicLib/SphericalHarmonic2.hpp
+++ b/include/GeographicLib/SphericalHarmonic2.hpp
@@ -52,11 +52,6 @@ namespace GeographicLib {
* @hideinitializer
**********************************************************************/
SCHMIDT = SphericalEngine::SCHMIDT,
- /// \cond SKIP
- // These are deprecated...
- full = FULL,
- schmidt = SCHMIDT,
- /// \endcond
};
private:
diff --git a/include/GeographicLib/TransverseMercator.hpp b/include/GeographicLib/TransverseMercator.hpp
index 6f95f0c..0ea977b 100644
--- a/include/GeographicLib/TransverseMercator.hpp
+++ b/include/GeographicLib/TransverseMercator.hpp
@@ -176,14 +176,6 @@ namespace GeographicLib {
**********************************************************************/
Math::real Flattening() const { return _f; }
- /// \cond SKIP
- /**
- * <b>DEPRECATED</b>
- * @return \e r the inverse flattening of the ellipsoid.
- **********************************************************************/
- Math::real InverseFlattening() const { return 1/_f; }
- /// \endcond
-
/**
* @return \e k0 central scale for the projection. This is the value of \e
* k0 used in the constructor and is the scale on the central meridian.
diff --git a/include/GeographicLib/TransverseMercatorExact.hpp b/include/GeographicLib/TransverseMercatorExact.hpp
index 584d3e6..a9841b7 100644
--- a/include/GeographicLib/TransverseMercatorExact.hpp
+++ b/include/GeographicLib/TransverseMercatorExact.hpp
@@ -234,14 +234,6 @@ namespace GeographicLib {
**********************************************************************/
Math::real Flattening() const { return _f; }
- /// \cond SKIP
- /**
- * <b>DEPRECATED</b>
- * @return \e r the inverse flattening of the ellipsoid.
- **********************************************************************/
- Math::real InverseFlattening() const { return 1/_f; }
- /// \endcond
-
/**
* @return \e k0 central scale for the projection. This is the value of \e
* k0 used in the constructor and is the scale on the central meridian.
diff --git a/include/GeographicLib/UTMUPS.hpp b/include/GeographicLib/UTMUPS.hpp
index d77bd5e..4f1bc79 100644
--- a/include/GeographicLib/UTMUPS.hpp
+++ b/include/GeographicLib/UTMUPS.hpp
@@ -414,14 +414,6 @@ namespace GeographicLib {
{ return Constants::WGS84_f(); }
///@}
- /// \cond SKIP
- /**
- * <b>DEPRECATED</b>
- * @return \e r the inverse flattening of the WGS84 ellipsoid.
- **********************************************************************/
- static Math::real InverseFlattening()
- { return 1/Constants::WGS84_f(); }
- /// \endcond
};
} // namespace GeographicLib
diff --git a/include/GeographicLib/Utility.hpp b/include/GeographicLib/Utility.hpp
index 1466886..90bfe57 100644
--- a/include/GeographicLib/Utility.hpp
+++ b/include/GeographicLib/Utility.hpp
@@ -298,7 +298,7 @@ namespace GeographicLib {
std::ostringstream s;
#if GEOGRAPHICLIB_PRECISION == 4
// boost-quadmath treats precision == 0 as "use as many digits as
- // necessary", so...
+ // necessary" (see https://svn.boost.org/trac/boost/ticket/10103), so...
using std::floor; using std::fmod;
if (p == 0) {
x += Math::real(0.5);
diff --git a/include/Makefile.in b/include/Makefile.in
index 18297df..790da3d 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,17 @@
# Copyright (C) 2009, Francesco P. Lovergine <frankie at debian.org>
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -85,8 +95,6 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
subdir = include
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(nobase_include_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -94,6 +102,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(nobase_include_HEADERS) \
+ $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/include/GeographicLib/Config-ac.h
CONFIG_CLEAN_FILES =
@@ -165,6 +175,7 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -217,6 +228,7 @@ LTLIBOBJS = @LTLIBOBJS@
LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@
LT_REVISION = @LT_REVISION@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -360,7 +372,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu include/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -610,6 +621,8 @@ uninstall-am: uninstall-nobase_includeHEADERS
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am uninstall-nobase_includeHEADERS
+.PRECIOUS: Makefile
+
# 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.
diff --git a/install-sh b/install-sh
index 377bb86..0b0fdcb 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2011-11-20.07; # UTC
+scriptversion=2013-12-25.23; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC
# This script is compatible with the BSD install script, but was written
# from scratch.
+tab=' '
nl='
'
-IFS=" "" $nl"
+IFS=" $tab$nl"
-# set DOITPROG to echo to test this script
+# Set DOITPROG to "echo" to test this script.
-# Don't use :- since 4.3BSD and earlier shells don't like it.
doit=${DOITPROG-}
-if test -z "$doit"; then
- doit_exec=exec
-else
- doit_exec=$doit
-fi
+doit_exec=${doit:-exec}
# Put in absolute file names if you don't have them in your path;
# or use environment vars.
@@ -68,17 +64,6 @@ mvprog=${MVPROG-mv}
rmprog=${RMPROG-rm}
stripprog=${STRIPPROG-strip}
-posix_glob='?'
-initialize_posix_glob='
- test "$posix_glob" != "?" || {
- if (set -f) 2>/dev/null; then
- posix_glob=
- else
- posix_glob=:
- fi
- }
-'
-
posix_mkdir=
# Desired mode of installed file.
@@ -97,7 +82,7 @@ dir_arg=
dst_arg=
copy_on_change=false
-no_target_directory=
+is_target_a_directory=possibly
usage="\
Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -137,46 +122,57 @@ while test $# -ne 0; do
-d) dir_arg=true;;
-g) chgrpcmd="$chgrpprog $2"
- shift;;
+ shift;;
--help) echo "$usage"; exit $?;;
-m) mode=$2
- case $mode in
- *' '* | *' '* | *'
-'* | *'*'* | *'?'* | *'['*)
- echo "$0: invalid mode: $mode" >&2
- exit 1;;
- esac
- shift;;
+ case $mode in
+ *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+ echo "$0: invalid mode: $mode" >&2
+ exit 1;;
+ esac
+ shift;;
-o) chowncmd="$chownprog $2"
- shift;;
+ shift;;
-s) stripcmd=$stripprog;;
- -t) dst_arg=$2
- # Protect names problematic for 'test' and other utilities.
- case $dst_arg in
- -* | [=\(\)!]) dst_arg=./$dst_arg;;
- esac
- shift;;
+ -t)
+ is_target_a_directory=always
+ dst_arg=$2
+ # Protect names problematic for 'test' and other utilities.
+ case $dst_arg in
+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
+ esac
+ shift;;
- -T) no_target_directory=true;;
+ -T) is_target_a_directory=never;;
--version) echo "$0 $scriptversion"; exit $?;;
- --) shift
- break;;
+ --) shift
+ break;;
- -*) echo "$0: invalid option: $1" >&2
- exit 1;;
+ -*) echo "$0: invalid option: $1" >&2
+ exit 1;;
*) break;;
esac
shift
done
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+ if test -n "$dst_arg"; then
+ echo "$0: target directory not allowed when installing a directory." >&2
+ exit 1
+ fi
+fi
+
if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
# When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
@@ -208,6 +204,15 @@ if test $# -eq 0; then
fi
if test -z "$dir_arg"; then
+ if test $# -gt 1 || test "$is_target_a_directory" = always; then
+ if test ! -d "$dst_arg"; then
+ echo "$0: $dst_arg: Is not a directory." >&2
+ exit 1
+ fi
+ fi
+fi
+
+if test -z "$dir_arg"; then
do_exit='(exit $ret); exit $ret'
trap "ret=129; $do_exit" 1
trap "ret=130; $do_exit" 2
@@ -223,16 +228,16 @@ if test -z "$dir_arg"; then
*[0-7])
if test -z "$stripcmd"; then
- u_plus_rw=
+ u_plus_rw=
else
- u_plus_rw='% 200'
+ u_plus_rw='% 200'
fi
cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
*)
if test -z "$stripcmd"; then
- u_plus_rw=
+ u_plus_rw=
else
- u_plus_rw=,u+rw
+ u_plus_rw=,u+rw
fi
cp_umask=$mode$u_plus_rw;;
esac
@@ -269,41 +274,15 @@ do
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then
- if test -n "$no_target_directory"; then
- echo "$0: $dst_arg: Is a directory" >&2
- exit 1
+ if test "$is_target_a_directory" = never; then
+ echo "$0: $dst_arg: Is a directory" >&2
+ exit 1
fi
dstdir=$dst
dst=$dstdir/`basename "$src"`
dstdir_status=0
else
- # Prefer dirname, but fall back on a substitute if dirname fails.
- dstdir=`
- (dirname "$dst") 2>/dev/null ||
- expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$dst" : 'X\(//\)[^/]' \| \
- X"$dst" : 'X\(//\)$' \| \
- X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$dst" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'
- `
-
+ dstdir=`dirname "$dst"`
test -d "$dstdir"
dstdir_status=$?
fi
@@ -314,74 +293,74 @@ do
if test $dstdir_status != 0; then
case $posix_mkdir in
'')
- # Create intermediate dirs using mode 755 as modified by the umask.
- # This is like FreeBSD 'install' as of 1997-10-28.
- umask=`umask`
- case $stripcmd.$umask in
- # Optimize common cases.
- *[2367][2367]) mkdir_umask=$umask;;
- .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
- *[0-7])
- mkdir_umask=`expr $umask + 22 \
- - $umask % 100 % 40 + $umask % 20 \
- - $umask % 10 % 4 + $umask % 2
- `;;
- *) mkdir_umask=$umask,go-w;;
- esac
-
- # With -d, create the new directory with the user-specified mode.
- # Otherwise, rely on $mkdir_umask.
- if test -n "$dir_arg"; then
- mkdir_mode=-m$mode
- else
- mkdir_mode=
- fi
-
- posix_mkdir=false
- case $umask in
- *[123567][0-7][0-7])
- # POSIX mkdir -p sets u+wx bits regardless of umask, which
- # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
- ;;
- *)
- tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
- if (umask $mkdir_umask &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
- then
- if test -z "$dir_arg" || {
- # Check for POSIX incompatibilities with -m.
- # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
- # other-writable bit of parent directory when it shouldn't.
- # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- ls_ld_tmpdir=`ls -ld "$tmpdir"`
- case $ls_ld_tmpdir in
- d????-?r-*) different_mode=700;;
- d????-?--*) different_mode=755;;
- *) false;;
- esac &&
- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
- test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
- }
- }
- then posix_mkdir=:
- fi
- rmdir "$tmpdir/d" "$tmpdir"
- else
- # Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
- fi
- trap '' 0;;
- esac;;
+ # Create intermediate dirs using mode 755 as modified by the umask.
+ # This is like FreeBSD 'install' as of 1997-10-28.
+ umask=`umask`
+ case $stripcmd.$umask in
+ # Optimize common cases.
+ *[2367][2367]) mkdir_umask=$umask;;
+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+ *[0-7])
+ mkdir_umask=`expr $umask + 22 \
+ - $umask % 100 % 40 + $umask % 20 \
+ - $umask % 10 % 4 + $umask % 2
+ `;;
+ *) mkdir_umask=$umask,go-w;;
+ esac
+
+ # With -d, create the new directory with the user-specified mode.
+ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+ mkdir_mode=-m$mode
+ else
+ mkdir_mode=
+ fi
+
+ posix_mkdir=false
+ case $umask in
+ *[123567][0-7][0-7])
+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+ ;;
+ *)
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+ if (umask $mkdir_umask &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ then
+ if test -z "$dir_arg" || {
+ # Check for POSIX incompatibilities with -m.
+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+ # other-writable bit of parent directory when it shouldn't.
+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ case $ls_ld_tmpdir in
+ d????-?r-*) different_mode=700;;
+ d????-?--*) different_mode=755;;
+ *) false;;
+ esac &&
+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+ }
+ }
+ then posix_mkdir=:
+ fi
+ rmdir "$tmpdir/d" "$tmpdir"
+ else
+ # Remove any dirs left behind by ancient mkdir implementations.
+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ fi
+ trap '' 0;;
+ esac;;
esac
if
$posix_mkdir && (
- umask $mkdir_umask &&
- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+ umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
)
then :
else
@@ -391,53 +370,51 @@ do
# directory the slow way, step by step, checking for races as we go.
case $dstdir in
- /*) prefix='/';;
- [-=\(\)!]*) prefix='./';;
- *) prefix='';;
+ /*) prefix='/';;
+ [-=\(\)!]*) prefix='./';;
+ *) prefix='';;
esac
- eval "$initialize_posix_glob"
-
oIFS=$IFS
IFS=/
- $posix_glob set -f
+ set -f
set fnord $dstdir
shift
- $posix_glob set +f
+ set +f
IFS=$oIFS
prefixes=
for d
do
- test X"$d" = X && continue
-
- prefix=$prefix$d
- if test -d "$prefix"; then
- prefixes=
- else
- if $posix_mkdir; then
- (umask=$mkdir_umask &&
- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
- # Don't fail if two instances are running concurrently.
- test -d "$prefix" || exit 1
- else
- case $prefix in
- *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
- *) qprefix=$prefix;;
- esac
- prefixes="$prefixes '$qprefix'"
- fi
- fi
- prefix=$prefix/
+ test X"$d" = X && continue
+
+ prefix=$prefix$d
+ if test -d "$prefix"; then
+ prefixes=
+ else
+ if $posix_mkdir; then
+ (umask=$mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+ # Don't fail if two instances are running concurrently.
+ test -d "$prefix" || exit 1
+ else
+ case $prefix in
+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) qprefix=$prefix;;
+ esac
+ prefixes="$prefixes '$qprefix'"
+ fi
+ fi
+ prefix=$prefix/
done
if test -n "$prefixes"; then
- # Don't fail if two instances are running concurrently.
- (umask $mkdir_umask &&
- eval "\$doit_exec \$mkdirprog $prefixes") ||
- test -d "$dstdir" || exit 1
- obsolete_mkdir_used=true
+ # Don't fail if two instances are running concurrently.
+ (umask $mkdir_umask &&
+ eval "\$doit_exec \$mkdirprog $prefixes") ||
+ test -d "$dstdir" || exit 1
+ obsolete_mkdir_used=true
fi
fi
fi
@@ -472,15 +449,12 @@ do
# If -C, don't bother to copy if it wouldn't change the file.
if $copy_on_change &&
- old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
- new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
-
- eval "$initialize_posix_glob" &&
- $posix_glob set -f &&
+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
+ set -f &&
set X $old && old=:$2:$4:$5:$6 &&
set X $new && new=:$2:$4:$5:$6 &&
- $posix_glob set +f &&
-
+ set +f &&
test "$old" = "$new" &&
$cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
then
@@ -493,24 +467,24 @@ do
# to itself, or perhaps because mv is so ancient that it does not
# support -f.
{
- # Now remove or move aside any old file at destination location.
- # We try this two ways since rm can't unlink itself on some
- # systems and the destination file might be busy for other
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
- test ! -f "$dst" ||
- $doit $rmcmd -f "$dst" 2>/dev/null ||
- { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
- { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
- } ||
- { echo "$0: cannot unlink or rename $dst" >&2
- (exit 1); exit 1
- }
- } &&
-
- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dst"
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ test ! -f "$dst" ||
+ $doit $rmcmd -f "$dst" 2>/dev/null ||
+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+ } ||
+ { echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
}
fi || exit 1
diff --git a/java/README.txt b/java/README.txt
index 329377b..5092129 100644
--- a/java/README.txt
+++ b/java/README.txt
@@ -4,7 +4,7 @@ This is a Java implementation of the geodesic algorithms described in
Algorithms for geodesics,
J. Geodesy 87, 43-55 (2013);
https://dx.doi.org/10.1007/s00190-012-0578-z
- Addenda: http://geographiclib.sf.net/geod-addenda.html
+ Addenda: http://geographiclib.sourceforge.net/geod-addenda.html
For documentation, see
diff --git a/java/direct/pom.xml b/java/direct/pom.xml
index 2c229f9..7f4236a 100644
--- a/java/direct/pom.xml
+++ b/java/direct/pom.xml
@@ -9,7 +9,7 @@
<groupId>net.sf.geographiclib.example</groupId>
<artifactId>Direct</artifactId>
<name>Direct</name>
- <version>1.45-SNAPSHOT</version>
+ <version>1.46-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -28,7 +28,7 @@
<dependency>
<groupId>net.sf.geographiclib</groupId>
<artifactId>GeographicLib-Java</artifactId>
- <version>1.45</version>
+ <version>1.46</version>
</dependency>
</dependencies>
diff --git a/java/inverse/pom.xml b/java/inverse/pom.xml
index 78bcceb..85ea443 100644
--- a/java/inverse/pom.xml
+++ b/java/inverse/pom.xml
@@ -9,7 +9,7 @@
<groupId>net.sf.geographiclib.example</groupId>
<artifactId>Inverse</artifactId>
<name>Inverse</name>
- <version>1.45-SNAPSHOT</version>
+ <version>1.46-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -28,7 +28,7 @@
<dependency>
<groupId>net.sf.geographiclib</groupId>
<artifactId>GeographicLib-Java</artifactId>
- <version>1.45</version>
+ <version>1.46</version>
</dependency>
</dependencies>
diff --git a/java/planimeter/pom.xml b/java/planimeter/pom.xml
index 6f66d45..c524735 100644
--- a/java/planimeter/pom.xml
+++ b/java/planimeter/pom.xml
@@ -9,7 +9,7 @@
<groupId>net.sf.geographiclib.example</groupId>
<artifactId>Planimeter</artifactId>
<name>Planimeter</name>
- <version>1.45-SNAPSHOT</version>
+ <version>1.46-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -28,7 +28,7 @@
<dependency>
<groupId>net.sf.geographiclib</groupId>
<artifactId>GeographicLib-Java</artifactId>
- <version>1.45</version>
+ <version>1.46</version>
</dependency>
</dependencies>
diff --git a/java/pom.xml b/java/pom.xml
index 684aa59..65ab122 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -8,7 +8,7 @@
<groupId>net.sf.geographiclib</groupId>
<artifactId>GeographicLib-Java</artifactId>
- <version>1.45</version>
+ <version>1.46</version>
<packaging>jar</packaging>
@@ -26,7 +26,7 @@
easy to do geodesic computations for an ellipsoid of revolution in
a Java program. It requires Java version 1.1 or later.
</description>
- <url>http://geographiclib.sf.net</url>
+ <url>http://geographiclib.sourceforge.net</url>
<developers>
<developer>
@@ -157,10 +157,10 @@
<scm>
<connection>
- scm:git://git.code.sf.net/p/geographiclib/code
+ scm:git://git.code.sourceforge.net/p/geographiclib/code
</connection>
<developerConnection>
- scm:git:http://git.code.sf.net/p/geographiclib/code
+ scm:git:http://git.code.sourceforge.net/p/geographiclib/code
</developerConnection>
<url>
http://sourceforge.net/p/geographiclib/code/ci/master/tree/
@@ -174,4 +174,5 @@
<version>4.12</version>
</dependency>
</dependencies>
+
</project>
diff --git a/java/src/main/java/net/sf/geographiclib/GeoMath.java b/java/src/main/java/net/sf/geographiclib/GeoMath.java
index 8c2ac6f..7bb6ead 100644
--- a/java/src/main/java/net/sf/geographiclib/GeoMath.java
+++ b/java/src/main/java/net/sf/geographiclib/GeoMath.java
@@ -1,7 +1,7 @@
/**
* Implementation of the net.sf.geographiclib.GeoMath class
*
- * Copyright (c) Charles Karney (2013-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2013-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
**********************************************************************/
@@ -94,6 +94,18 @@ public class GeoMath {
}
/**
+ * Copy the sign. In Java version 1.6 and later, Math.copysign can be used.
+ * <p>
+ * @param x gives the magitude of the result.
+ * @param x gives the sign of the result.
+ * @return value with the magnitude of <i>x</i> and with the sign of
+ * <i>y</i>.
+ **********************************************************************/
+ public static double copysign(double x, double y) {
+ return Math.abs(x) * (y < 0 || (y == 0 && 1/y < 0) ? -1 : 1);
+ }
+
+ /**
* The cube root function. In Java version 1.5 and later, Math.cbrt can be
* used.
* <p>
@@ -158,13 +170,14 @@ public class GeoMath {
// for reals = 0.7 pm on the earth if x is an angle in degrees. (This
// is about 1000 times more resolution than we get with angles around 90
// degrees.) We use this to avoid having to deal with near singular
- // cases when x is non-zero but tiny (e.g., 1.0e-200). This also converts
- // -0 to +0.
+ // cases when x is non-zero but tiny (e.g., 1.0e-200). This converts -0 to
+ // +0; however tiny negative numbers get converted to -0.
final double z = 1/16.0;
+ if (x == 0) return 0;
double y = Math.abs(x);
// The compiler mustn't "simplify" z - (z - y) to y
y = y < z ? z - (z - y) : y;
- return x < 0 ? 0 - y : y;
+ return x < 0 ? -y : y;
}
/**
@@ -192,26 +205,26 @@ public class GeoMath {
}
/**
- * Difference of two angles reduced to [−180°, 180°]
+ * The exact difference of two angles reduced to (−180°, 180°].
* <p>
* @param x the first angle in degrees.
* @param y the second angle in degrees.
- * @return <i>y</i> − <i>x</i>, reduced to the range [−180°,
- * 180°].
+ * @return Pair(<i>d</i>, <i>e</i>) with <i>d</i> being the rounded
+ * difference and <i>e</i> being the error.
* <p>
- * <i>x</i> and <i>y</i> must both lie in [−180°, 180°]. The
- * result is equivalent to computing the difference exactly, reducing it to
- * (−180°, 180°] and rounding the result. Note that this
- * prescription allows −180° to be returned (e.g., if <i>x</i> is
- * tiny and negative and <i>y</i> = 180°).
+ * The computes <i>z</i> = <i>y</i> − <i>x</i> exactly, reduced to
+ * (−180°, 180°]; and then sets <i>z</i> = <i>d</i> + <i>e</i>
+ * where <i>d</i> is the nearest representable number to <i>z</i> and
+ * <i>e</i> is the truncation error. If <i>d</i> = −180, then <i>e</i>
+ * > 0; If <i>d</i> = 180, then <i>e</i> ≤ 0.
**********************************************************************/
- public static double AngDiff(double x, double y) {
+ public static Pair AngDiff(double x, double y) {
double d, t;
{
Pair r = sum(AngNormalize(x), AngNormalize(-y));
d = - AngNormalize(r.first); t = r.second;
}
- return (d == 180 && t < 0 ? -180 : d) - t;
+ return sum(d == 180 && t < 0 ? -180 : d, -t);
}
/**
@@ -245,18 +258,18 @@ public class GeoMath {
return new Pair(sinx, cosx);
}
- /**
- * Evaluate the atan2 function with the result in degrees
- *
- * @param y
- * @param x
- * @return atan2(<i>y</i>, <i>x</i>) in degrees.
- *
- * The result is in the range [−180° 180°). N.B.,
- * atan2d(±0, −1) = −180°; atan2d(+ε,
- * −1) = +180°, for ε positive and tiny;
- * atan2d(±0, 1) = ±0°.
- **********************************************************************/
+ /**
+ * Evaluate the atan2 function with the result in degrees
+ *
+ * @param y the sine of the angle
+ * @param x the cosine of the angle
+ * @return atan2(<i>y</i>, <i>x</i>) in degrees.
+ *
+ * The result is in the range [−180° 180°). N.B.,
+ * atan2d(±0, −1) = −180°; atan2d(+ε,
+ * −1) = +180°, for ε positive and tiny;
+ * atan2d(±0, 1) = ±0°.
+ **********************************************************************/
public static double atan2d(double y, double x) {
// In order to minimize round-off errors, this function rearranges the
// arguments so that result of atan2 is in the range [-pi/4, pi/4] before
diff --git a/java/src/main/java/net/sf/geographiclib/Geodesic.java b/java/src/main/java/net/sf/geographiclib/Geodesic.java
index d684e37..1f1cc99 100644
--- a/java/src/main/java/net/sf/geographiclib/Geodesic.java
+++ b/java/src/main/java/net/sf/geographiclib/Geodesic.java
@@ -1,7 +1,7 @@
/**
* Implementation of the net.sf.geographiclib.Geodesic class
*
- * Copyright (c) Charles Karney (2013-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2013-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
**********************************************************************/
@@ -170,7 +170,7 @@ package net.sf.geographiclib;
* <a href="https://dx.doi.org/10.1007/s00190-012-0578-z">
* Algorithms for geodesics</a>,
* J. Geodesy <b>87</b>, 43–55 (2013)
- * (<a href="http://geographiclib.sf.net/geod-addenda.html">addenda</a>).
+ * (<a href="http://geographiclib.sourceforge.net/geod-addenda.html">addenda</a>).
* </ul>
* <p>
* Example of use:
@@ -249,7 +249,7 @@ public class Geodesic {
**********************************************************************/
public Geodesic(double a, double f) {
_a = a;
- _f = f <= 1 ? f : 1/f; // f > 1 behavior is DEPRECATED
+ _f = f;
_f1 = 1 - _f;
_e2 = _f * (2 - _f);
_ep2 = _e2 / GeoMath.sq(_f1); // e2 / (1 - e2)
@@ -413,28 +413,32 @@ public class Geodesic {
* The {@link GeodesicMask} values possible for <i>outmask</i> are
* <ul>
* <li>
- * <i>outmask</i> |= GeodesicMask.LATITUDE for the latitude <i>lat2</i>;
+ * <i>outmask</i> |= {@link GeodesicMask#LATITUDE} for the latitude
+ * <i>lat2</i>;
* <li>
- * <i>outmask</i> |= GeodesicMask.LONGITUDE for the latitude <i>lon2</i>;
+ * <i>outmask</i> |= {@link GeodesicMask#LONGITUDE} for the latitude
+ * <i>lon2</i>;
* <li>
- * <i>outmask</i> |= GeodesicMask.AZIMUTH for the latitude <i>azi2</i>;
+ * <i>outmask</i> |= {@link GeodesicMask#AZIMUTH} for the latitude
+ * <i>azi2</i>;
* <li>
- * <i>outmask</i> |= GeodesicMask.DISTANCE for the distance <i>s12</i>;
+ * <i>outmask</i> |= {@link GeodesicMask#DISTANCE} for the distance
+ * <i>s12</i>;
* <li>
- * <i>outmask</i> |= GeodesicMask.REDUCEDLENGTH for the reduced length
- * <i>m12</i>;
+ * <i>outmask</i> |= {@link GeodesicMask#REDUCEDLENGTH} for the reduced
+ * length <i>m12</i>;
* <li>
- * <i>outmask</i> |= GeodesicMask.GEODESICSCALE for the geodesic scales
- * <i>M12</i> and <i>M21</i>;
+ * <i>outmask</i> |= {@link GeodesicMask#GEODESICSCALE} for the geodesic
+ * scales <i>M12</i> and <i>M21</i>;
* <li>
- * <i>outmask</i> |= GeodesicMask.AREA for the area <i>S12</i>;
+ * <i>outmask</i> |= {@link GeodesicMask#AREA} for the area <i>S12</i>;
* <li>
- * <i>outmask</i> |= GeodesicMask.ALL for all of the above;
+ * <i>outmask</i> |= {@link GeodesicMask#ALL} for all of the above;
* <li>
- * <i>outmask</i> |= GeodesicMask.LONG_UNROLL, if set then <i>lon1</i> is
- * unchanged and <i>lon2</i> − <i>lon1</i> indicates how many times
- * and in what sense the geodesic encircles the ellipsoid. Otherwise
- * <i>lon1</i> and <i>lon2</i> are both reduced to the range
+ * <i>outmask</i> |= {@link GeodesicMask#LONG_UNROLL}, if set then
+ * <i>lon1</i> is unchanged and <i>lon2</i> − <i>lon1</i> indicates
+ * how many times and in what sense the geodesic encircles the ellipsoid.
+ * Otherwise <i>lon1</i> and <i>lon2</i> are both reduced to the range
* [−180°, 180°).
* </ul>
* <p>
@@ -447,15 +451,143 @@ public class Geodesic {
**********************************************************************/
public GeodesicData Direct(double lat1, double lon1, double azi1,
boolean arcmode, double s12_a12, int outmask) {
- return new GeodesicLine(this, lat1, lon1, azi1,
- // Automatically supply DISTANCE_IN if necessary
- outmask | (arcmode ? GeodesicMask.NONE :
- GeodesicMask.DISTANCE_IN))
+ // Automatically supply DISTANCE_IN if necessary
+ if (!arcmode) outmask |= GeodesicMask.DISTANCE_IN;
+ return new GeodesicLine(this, lat1, lon1, azi1, outmask)
. // Note the dot!
Position(arcmode, s12_a12, outmask);
}
/**
+ * Define a {@link GeodesicLine} in terms of the direct geodesic problem
+ * specified in terms of distance with all capabilities included.
+ * <p>
+ * @param lat1 latitude of point 1 (degrees).
+ * @param lon1 longitude of point 1 (degrees).
+ * @param azi1 azimuth at point 1 (degrees).
+ * @param s12 distance between point 1 and point 2 (meters); it can be
+ * negative.
+ * @return a {@link GeodesicLine} object.
+ * <p>
+ * This function sets point 3 of the GeodesicLine to correspond to point 2
+ * of the direct geodesic problem.
+ * <p>
+ * <i>lat1</i> should be in the range [−90°, 90°].
+ **********************************************************************/
+ public GeodesicLine DirectLine(double lat1, double lon1, double azi1,
+ double s12) {
+ return DirectLine(lat1, lon1, azi1, s12, GeodesicMask.ALL);
+ }
+
+ /**
+ * Define a {@link GeodesicLine} in terms of the direct geodesic problem
+ * specified in terms of distance with a subset of the capabilities included.
+ * <p>
+ * @param lat1 latitude of point 1 (degrees).
+ * @param lon1 longitude of point 1 (degrees).
+ * @param azi1 azimuth at point 1 (degrees).
+ * @param s12 distance between point 1 and point 2 (meters); it can be
+ * negative.
+ * @param caps bitor'ed combination of {@link GeodesicMask} values
+ * specifying the capabilities the GeodesicLine object should possess,
+ * i.e., which quantities can be returned in calls to
+ * {@link GeodesicLine#Position GeodesicLine.Position}.
+ * @return a {@link GeodesicLine} object.
+ * <p>
+ * This function sets point 3 of the GeodesicLine to correspond to point 2
+ * of the direct geodesic problem.
+ * <p>
+ * <i>lat1</i> should be in the range [−90°, 90°].
+ **********************************************************************/
+ public GeodesicLine DirectLine(double lat1, double lon1, double azi1,
+ double s12, int caps) {
+ return GenDirectLine(lat1, lon1, azi1, false, s12, caps);
+ }
+
+ /**
+ * Define a {@link GeodesicLine} in terms of the direct geodesic problem
+ * specified in terms of arc length with all capabilities included.
+ * <p>
+ * @param lat1 latitude of point 1 (degrees).
+ * @param lon1 longitude of point 1 (degrees).
+ * @param azi1 azimuth at point 1 (degrees).
+ * @param a12 arc length between point 1 and point 2 (degrees); it can
+ * be negative.
+ * @return a {@link GeodesicLine} object.
+ * <p>
+ * This function sets point 3 of the GeodesicLine to correspond to point 2
+ * of the direct geodesic problem.
+ * <p>
+ * <i>lat1</i> should be in the range [−90°, 90°].
+ **********************************************************************/
+ public GeodesicLine ArcDirectLine(double lat1, double lon1, double azi1,
+ double a12) {
+ return ArcDirectLine(lat1, lon1, azi1, a12, GeodesicMask.ALL);
+ }
+
+ /**
+ * Define a {@link GeodesicLine} in terms of the direct geodesic problem
+ * specified in terms of arc length with a subset of the capabilities
+ * included.
+ * <p>
+ * @param lat1 latitude of point 1 (degrees).
+ * @param lon1 longitude of point 1 (degrees).
+ * @param azi1 azimuth at point 1 (degrees).
+ * @param a12 arc length between point 1 and point 2 (degrees); it can
+ * be negative.
+ * @param caps bitor'ed combination of {@link GeodesicMask} values
+ * specifying the capabilities the GeodesicLine object should possess,
+ * i.e., which quantities can be returned in calls to
+ * {@link GeodesicLine#Position GeodesicLine.Position}.
+ * @return a {@link GeodesicLine} object.
+ * <p>
+ * This function sets point 3 of the GeodesicLine to correspond to point 2
+ * of the direct geodesic problem.
+ * <p>
+ * <i>lat1</i> should be in the range [−90°, 90°].
+ **********************************************************************/
+ public GeodesicLine ArcDirectLine(double lat1, double lon1, double azi1,
+ double a12, int caps) {
+ return GenDirectLine(lat1, lon1, azi1, true, a12, caps);
+ }
+
+ /**
+ * Define a {@link GeodesicLine} in terms of the direct geodesic problem
+ * specified in terms of either distance or arc length with a subset of the
+ * capabilities included.
+ * <p>
+ * @param lat1 latitude of point 1 (degrees).
+ * @param lon1 longitude of point 1 (degrees).
+ * @param azi1 azimuth at point 1 (degrees).
+ * @param arcmode boolean flag determining the meaning of the <i>s12_a12</i>.
+ * @param s12_a12 if <i>arcmode</i> is false, this is the distance between
+ * point 1 and point 2 (meters); otherwise it is the arc length between
+ * point 1 and point 2 (degrees); it can be negative.
+ * @param caps bitor'ed combination of {@link GeodesicMask} values
+ * specifying the capabilities the GeodesicLine object should possess,
+ * i.e., which quantities can be returned in calls to
+ * {@link GeodesicLine#Position GeodesicLine.Position}.
+ * @return a {@link GeodesicLine} object.
+ * <p>
+ * This function sets point 3 of the GeodesicLine to correspond to point 2
+ * of the direct geodesic problem.
+ * <p>
+ * <i>lat1</i> should be in the range [−90°, 90°].
+ **********************************************************************/
+ public GeodesicLine GenDirectLine(double lat1, double lon1, double azi1,
+ boolean arcmode, double s12_a12, int caps) {
+ azi1 = GeoMath.AngNormalize(azi1);
+ double salp1, calp1;
+ // Guard against underflow in salp0. Also -0 is converted to +0.
+ { Pair p = GeoMath.sincosd(GeoMath.AngRound(azi1));
+ salp1 = p.first; calp1 = p.second; }
+ // Automatically supply DISTANCE_IN if necessary
+ if (!arcmode) caps |= GeodesicMask.DISTANCE_IN;
+ return new GeodesicLine(this, lat1, lon1, azi1, salp1, calp1,
+ caps, arcmode, s12_a12);
+ }
+
+ /**
* Solve the inverse geodesic problem.
* <p>
* @param lat1 latitude of point 1 (degrees).
@@ -484,49 +616,19 @@ public class Geodesic {
return Inverse(lat1, lon1, lat2, lon2, GeodesicMask.STANDARD);
}
- /**
- * Solve the inverse geodesic problem with a subset of the geodesic results
- * returned.
- * <p>
- * @param lat1 latitude of point 1 (degrees).
- * @param lon1 longitude of point 1 (degrees).
- * @param lat2 latitude of point 2 (degrees).
- * @param lon2 longitude of point 2 (degrees).
- * @param outmask a bitor'ed combination of {@link GeodesicMask} values
- * specifying which results should be returned.
- * @return a {@link GeodesicData} object with the fields specified by
- * <i>outmask</i> computed.
- * <p>
- * The {@link GeodesicMask} values possible for <i>outmask</i> are
- * <ul>
- * <li>
- * <i>outmask</i> |= GeodesicMask.DISTANCE for the distance <i>s12</i>;
- * <li>
- * <i>outmask</i> |= GeodesicMask.AZIMUTH for the latitude <i>azi2</i>;
- * <li>
- * <i>outmask</i> |= GeodesicMask.REDUCEDLENGTH for the reduced length
- * <i>m12</i>;
- * <li>
- * <i>outmask</i> |= GeodesicMask.GEODESICSCALE for the geodesic scales
- * <i>M12</i> and <i>M21</i>;
- * <li>
- * <i>outmask</i> |= GeodesicMask.AREA for the area <i>S12</i>;
- * <li>
- * <i>outmask</i> |= GeodesicMask.ALL for all of the above.
- * <li>
- * <i>outmask</i> |= GeodesicMask.LONG_UNROLL, if set then <i>lon1</i> is
- * unchanged and <i>lon2</i> − <i>lon1</i> indicates whether the
- * geodesic is east going or west going. Otherwise <i>lon1</i> and
- * <i>lon2</i> are both reduced to the range [−180°, 180°).
- * </ul>
- * <p>
- * <i>lat1</i>, <i>lon1</i>, <i>lat2</i>, <i>lon2</i>, and <i>a12</i> are
- * always included in the returned result.
- **********************************************************************/
- public GeodesicData Inverse(double lat1, double lon1,
- double lat2, double lon2, int outmask) {
- outmask &= GeodesicMask.OUT_MASK;
- GeodesicData r = new GeodesicData();
+ private class InverseData {
+ private GeodesicData g;
+ private double salp1, calp1, salp2, calp2;
+ private InverseData() {
+ g = new GeodesicData();
+ salp1 = calp1 = salp2 = calp2 = Double.NaN;
+ }
+ }
+
+ private InverseData InverseInt(double lat1, double lon1,
+ double lat2, double lon2, int outmask) {
+ InverseData result = new InverseData();
+ GeodesicData r = result.g;
// Compute longitude difference (AngDiff does this carefully). Result is
// in [-180, 180] but -180 is only for west-going geodesics. 180 is for
// east-going and meridional geodesics.
@@ -534,17 +636,26 @@ public class Geodesic {
// If really close to the equator, treat as on equator.
lat1 = GeoMath.AngRound(lat1);
lat2 = GeoMath.AngRound(lat2);
- double lon12 = GeoMath.AngDiff(lon1, lon2);
+ double lon12, lon12s;
+ {
+ Pair p = GeoMath.AngDiff(lon1, lon2);
+ lon12 = p.first; lon12s = p.second;
+ }
if ((outmask & GeodesicMask.LONG_UNROLL) != 0) {
- r.lon1 = lon1; r.lon2 = lon1 + lon12;
+ r.lon1 = lon1; r.lon2 = (lon1 + lon12) + lon12s;
} else {
r.lon1 = GeoMath.AngNormalize(lon1); r.lon2 = GeoMath.AngNormalize(lon2);
}
- // If very close to being on the same half-meridian, then make it so.
- lon12 = GeoMath.AngRound(lon12);
// Make longitude difference positive.
int lonsign = lon12 >= 0 ? 1 : -1;
- lon12 *= lonsign;
+ // If very close to being on the same half-meridian, then make it so.
+ lon12 = lonsign * GeoMath.AngRound(lon12);
+ lon12s = GeoMath.AngRound((180 - lon12) - lonsign * lon12s);
+ double
+ lam12 = Math.toRadians(lon12), slam12, clam12;
+ { Pair p = GeoMath.sincosd(lon12 > 90 ? lon12s : lon12);
+ slam12 = p.first; clam12 = (lon12 > 90 ? -1 : 1) * p.second; }
+
// Swap points so that point with higher (abs) latitude is point 1
// If one latitude is a nan, then it becomes lat1.
int swapp = Math.abs(lat1) < Math.abs(lat2) ? -1 : 1;
@@ -602,10 +713,6 @@ public class Geodesic {
dn1 = Math.sqrt(1 + _ep2 * GeoMath.sq(sbet1)),
dn2 = Math.sqrt(1 + _ep2 * GeoMath.sq(sbet2));
- double
- lam12 = Math.toRadians(lon12), slam12, clam12;
- { Pair p = GeoMath.sincosd(lon12); slam12 = p.first; clam12 = p.second; }
-
double a12, sig12, calp1, salp1, calp2, salp2;
a12 = sig12 = calp1 = salp1 = calp2 = salp2 = Double.NaN;
// index zero elements of these arrays are unused
@@ -660,11 +767,11 @@ public class Geodesic {
meridian = false;
}
- double omg12 = Double.NaN;
+ double omg12 = Double.NaN, somg12 = 2, comg12 = Double.NaN;
if (!meridian &&
sbet1 == 0 && // and sbet2 == 0
// Mimic the way Lambda12 works with calp1 = 0
- (_f <= 0 || lam12 <= Math.PI - _f * Math.PI)) {
+ (_f <= 0 || lon12s >= _f * 180)) {
// Geodesic runs along equator
calp1 = calp2 = 0; salp1 = salp2 = 1;
@@ -685,7 +792,7 @@ public class Geodesic {
{
InverseStartV v =
InverseStart(sbet1, cbet1, dn1, sbet2, cbet2, dn2,
- lam12,
+ lam12, slam12, clam12,
C1a, C2a);
sig12 = v.sig12;
salp1 = v.salp1; calp1 = v.calp1;
@@ -726,18 +833,18 @@ public class Geodesic {
{
Lambda12V w =
Lambda12(sbet1, cbet1, dn1, sbet2, cbet2, dn2, salp1, calp1,
- numit < maxit1_, C1a, C2a, C3a);
- v = w.lam12 - lam12;
+ slam12, clam12, numit < maxit1_, C1a, C2a, C3a);
+ v = w.lam12;
salp2 = w.salp2; calp2 = w.calp2;
sig12 = w.sig12;
ssig1 = w.ssig1; csig1 = w.csig1;
ssig2 = w.ssig2; csig2 = w.csig2;
- eps = w.eps; omg12 = w.domg12;
+ eps = w.eps; comg12 = w.comg12; somg12 = w.somg12;
dv = w.dlam12;
}
// 2 * tol0 is approximately 1 ulp for a number in [0, pi].
// Reversed test to allow escape with NaNs
- if (tripb || !(Math.abs(v) >= (tripn ? 8 : 2) * tol0_)) break;
+ if (tripb || !(Math.abs(v) >= (tripn ? 8 : 1) * tol0_)) break;
// Update bracketing values
if (v > 0 && (numit > maxit1_ || calp1/salp1 > calp1b/salp1b))
{ salp1b = salp1; calp1b = calp1; }
@@ -796,7 +903,6 @@ public class Geodesic {
m12x *= _b;
s12x *= _b;
a12 = Math.toDegrees(sig12);
- omg12 = lam12 - omg12;
}
}
@@ -835,15 +941,23 @@ public class Geodesic {
// Avoid problems with indeterminate sig1, sig2 on equator
r.S12 = 0;
+ if (!meridian) {
+ if (somg12 > 1) {
+ somg12 = Math.sin(omg12); comg12 = Math.cos(omg12);
+ } else {
+ Pair p = GeoMath.norm(somg12, comg12);
+ somg12 = p.first; comg12 = p.second;
+ }
+ }
+
if (!meridian &&
- omg12 < 0.75 * Math.PI && // Long difference too big
- sbet2 - sbet1 < 1.75) { // Lat difference too big
+ comg12 > -0.7071 && // Long difference not too big
+ sbet2 - sbet1 < 1.75) { // Lat difference not too big
// Use tan(Gamma/2) = tan(omg12/2)
// * (tan(bet1/2)+tan(bet2/2))/(1+tan(bet1/2)*tan(bet2/2))
// with tan(x/2) = sin(x)/(1+cos(x))
double
- somg12 = Math.sin(omg12), domg12 = 1 + Math.cos(omg12),
- dbet1 = 1 + cbet1, dbet2 = 1 + cbet2;
+ domg12 = 1 + comg12, dbet1 = 1 + cbet1, dbet2 = 1 + cbet2;
alp12 = 2 * Math.atan2( somg12 * ( sbet1 * dbet2 + sbet2 * dbet1 ),
domg12 * ( sbet1 * sbet2 + dbet1 * dbet2 ) );
} else {
@@ -878,17 +992,123 @@ public class Geodesic {
salp1 *= swapp * lonsign; calp1 *= swapp * latsign;
salp2 *= swapp * lonsign; calp2 *= swapp * latsign;
- if ((outmask & GeodesicMask.AZIMUTH) != 0) {
- r.azi1 = GeoMath.atan2d(salp1, calp1);
- r.azi2 = GeoMath.atan2d(salp2, calp2);
- }
// Returned value in [0, 180]
r.a12 = a12;
+ result.salp1 = salp1; result.calp1 = calp1;
+ result.salp2 = salp2; result.calp2 = calp2;
+ return result;
+ }
+
+ /**
+ * Solve the inverse geodesic problem with a subset of the geodesic results
+ * returned.
+ * <p>
+ * @param lat1 latitude of point 1 (degrees).
+ * @param lon1 longitude of point 1 (degrees).
+ * @param lat2 latitude of point 2 (degrees).
+ * @param lon2 longitude of point 2 (degrees).
+ * @param outmask a bitor'ed combination of {@link GeodesicMask} values
+ * specifying which results should be returned.
+ * @return a {@link GeodesicData} object with the fields specified by
+ * <i>outmask</i> computed.
+ * <p>
+ * The {@link GeodesicMask} values possible for <i>outmask</i> are
+ * <ul>
+ * <li>
+ * <i>outmask</i> |= {@link GeodesicMask#DISTANCE} for the distance
+ * <i>s12</i>;
+ * <li>
+ * <i>outmask</i> |= {@link GeodesicMask#AZIMUTH} for the latitude
+ * <i>azi2</i>;
+ * <li>
+ * <i>outmask</i> |= {@link GeodesicMask#REDUCEDLENGTH} for the reduced
+ * length <i>m12</i>;
+ * <li>
+ * <i>outmask</i> |= {@link GeodesicMask#GEODESICSCALE} for the geodesic
+ * scales <i>M12</i> and <i>M21</i>;
+ * <li>
+ * <i>outmask</i> |= {@link GeodesicMask#AREA} for the area <i>S12</i>;
+ * <li>
+ * <i>outmask</i> |= {@link GeodesicMask#ALL} for all of the above.
+ * <li>
+ * <i>outmask</i> |= {@link GeodesicMask#LONG_UNROLL}, if set then
+ * <i>lon1</i> is unchanged and <i>lon2</i> − <i>lon1</i> indicates
+ * whether the geodesic is east going or west going. Otherwise <i>lon1</i>
+ * and <i>lon2</i> are both reduced to the range [−180°,
+ * 180°).
+ * </ul>
+ * <p>
+ * <i>lat1</i>, <i>lon1</i>, <i>lat2</i>, <i>lon2</i>, and <i>a12</i> are
+ * always included in the returned result.
+ **********************************************************************/
+ public GeodesicData Inverse(double lat1, double lon1,
+ double lat2, double lon2, int outmask) {
+ outmask &= GeodesicMask.OUT_MASK;
+ InverseData result = InverseInt(lat1, lon1, lat2, lon2, outmask);
+ GeodesicData r = result.g;
+ if ((outmask & GeodesicMask.AZIMUTH) != 0) {
+ r.azi1 = GeoMath.atan2d(result.salp1, result.calp1);
+ r.azi2 = GeoMath.atan2d(result.salp2, result.calp2);
+ }
return r;
}
/**
- * Set up to compute several points on a single geodesic.
+ * Define a {@link GeodesicLine} in terms of the inverse geodesic problem
+ * with all capabilities included.
+ * <p>
+ * @param lat1 latitude of point 1 (degrees).
+ * @param lon1 longitude of point 1 (degrees).
+ * @param lat2 latitude of point 2 (degrees).
+ * @param lon2 longitude of point 2 (degrees).
+ * @return a {@link GeodesicLine} object.
+ * <p>
+ * This function sets point 3 of the GeodesicLine to correspond to point 2
+ * of the inverse geodesic problem.
+ * <p>
+ * <i>lat1</i> and <i>lat2</i> should be in the range [−90°,
+ * 90°].
+ **********************************************************************/
+ public GeodesicLine InverseLine(double lat1, double lon1,
+ double lat2, double lon2) {
+ return InverseLine(lat1, lon1, lat2, lon2, GeodesicMask.ALL);
+ }
+
+ /**
+ * Define a {@link GeodesicLine} in terms of the inverse geodesic problem
+ * with a subset of the capabilities included.
+ * <p>
+ * @param lat1 latitude of point 1 (degrees).
+ * @param lon1 longitude of point 1 (degrees).
+ * @param lat2 latitude of point 2 (degrees).
+ * @param lon2 longitude of point 2 (degrees).
+ * @param caps bitor'ed combination of {@link GeodesicMask} values specifying
+ * the capabilities the GeodesicLine object should possess, i.e., which
+ * quantities can be returned in calls to
+ * {@link GeodesicLine#Position GeodesicLine.Position}.
+ * @return a {@link GeodesicLine} object.
+ * <p>
+ * This function sets point 3 of the GeodesicLine to correspond to point 2
+ * of the inverse geodesic problem.
+ * <p>
+ * <i>lat1</i> and <i>lat2</i> should be in the range [−90°,
+ * 90°].
+ **********************************************************************/
+ public GeodesicLine InverseLine(double lat1, double lon1,
+ double lat2, double lon2, int caps) {
+ InverseData result = InverseInt(lat1, lon1, lat2, lon2, 0);
+ double salp1 = result.salp1, calp1 = result.calp1,
+ azi1 = GeoMath.atan2d(salp1, calp1), a12 = result.g.a12;
+ // Ensure that a12 can be converted to a distance
+ if ((caps & (GeodesicMask.OUT_MASK & GeodesicMask.DISTANCE_IN)) != 0)
+ caps |= GeodesicMask.DISTANCE;
+ return new GeodesicLine(this, lat1, lon1, azi1, salp1, calp1, caps,
+ true, a12);
+ }
+
+ /**
+ * Set up to compute several points on a single geodesic with all
+ * capabilities included.
* <p>
* @param lat1 latitude of point 1 (degrees).
* @param lon1 longitude of point 1 (degrees).
@@ -921,29 +1141,31 @@ public class Geodesic {
* The {@link GeodesicMask} values are
* <ul>
* <li>
- * <i>caps</i> |= GeodesicMask.LATITUDE for the latitude <i>lat2</i>; this
- * is added automatically;
+ * <i>caps</i> |= {@link GeodesicMask#LATITUDE} for the latitude
+ * <i>lat2</i>; this is added automatically;
* <li>
- * <i>caps</i> |= GeodesicMask.LONGITUDE for the latitude <i>lon2</i>;
+ * <i>caps</i> |= {@link GeodesicMask#LONGITUDE} for the latitude
+ * <i>lon2</i>;
* <li>
- * <i>caps</i> |= GeodesicMask.AZIMUTH for the azimuth <i>azi2</i>; this is
- * added automatically;
+ * <i>caps</i> |= {@link GeodesicMask#AZIMUTH} for the azimuth <i>azi2</i>;
+ * this is added automatically;
* <li>
- * <i>caps</i> |= GeodesicMask.DISTANCE for the distance <i>s12</i>;
+ * <i>caps</i> |= {@link GeodesicMask#DISTANCE} for the distance
+ * <i>s12</i>;
* <li>
- * <i>caps</i> |= GeodesicMask.REDUCEDLENGTH for the reduced length
+ * <i>caps</i> |= {@link GeodesicMask#REDUCEDLENGTH} for the reduced length
* <i>m12</i>;
* <li>
- * <i>caps</i> |= GeodesicMask.GEODESICSCALE for the geodesic scales
- * <i>M12</i> and <i>M21</i>;
+ * <i>caps</i> |= {@link GeodesicMask#GEODESICSCALE} for the geodesic
+ * scales <i>M12</i> and <i>M21</i>;
* <li>
- * <i>caps</i> |= GeodesicMask.AREA for the area <i>S12</i>;
+ * <i>caps</i> |= {@link GeodesicMask#AREA} for the area <i>S12</i>;
* <li>
- * <i>caps</i> |= GeodesicMask.DISTANCE_IN permits the length of the
- * geodesic to be given in terms of <i>s12</i>; without this capability the
- * length can only be specified in terms of arc length;
+ * <i>caps</i> |= {@link GeodesicMask#DISTANCE_IN} permits the length of
+ * the geodesic to be given in terms of <i>s12</i>; without this capability
+ * the length can only be specified in terms of arc length;
* <li>
- * <i>caps</i> |= GeodesicMask.ALL for all of the above.
+ * <i>caps</i> |= {@link GeodesicMask#ALL} for all of the above.
* </ul>
* <p>
* If the point is at a pole, the azimuth is defined by keeping <i>lon1</i>
@@ -1159,7 +1381,7 @@ public class Geodesic {
private InverseStartV InverseStart(double sbet1, double cbet1, double dn1,
double sbet2, double cbet2, double dn2,
- double lam12,
+ double lam12, double slam12, double clam12,
// Scratch areas of the right size
double C1a[], double C2a[]) {
// Return a starting point for Newton's method in salp1 and calp1 (function
@@ -1176,16 +1398,18 @@ public class Geodesic {
double sbet12a = sbet2 * cbet1 + cbet2 * sbet1;
boolean shortline = cbet12 >= 0 && sbet12 < 0.5 &&
cbet2 * lam12 < 0.5;
- double omg12 = lam12;
+ double somg12, comg12;
if (shortline) {
double sbetm2 = GeoMath.sq(sbet1 + sbet2);
// sin((bet1+bet2)/2)^2
// = (sbet1 + sbet2)^2 / ((sbet1 + sbet2)^2 + (cbet1 + cbet2)^2)
sbetm2 /= sbetm2 + GeoMath.sq(cbet1 + cbet2);
w.dnm = Math.sqrt(1 + _ep2 * sbetm2);
- omg12 /= _f1 * w.dnm;
+ double omg12 = lam12 / (_f1 * w.dnm);
+ somg12 = Math.sin(omg12); comg12 = Math.cos(omg12);
+ } else {
+ somg12 = slam12; comg12 = clam12;
}
- double somg12 = Math.sin(omg12), comg12 = Math.cos(omg12);
w.salp1 = cbet2 * somg12;
w.calp1 = comg12 >= 0 ?
@@ -1217,6 +1441,7 @@ public class Geodesic {
// 56.320923501171 0 -56.320923501171 179.664747671772880215
// which otherwise fails with g++ 4.4.4 x86 -O3
double x;
+ double lam12x = Math.atan2(-slam12, -clam12); // lam12 - pi
if (_f >= 0) { // In fact f == 0 does not get here
// x = dlong, y = dlat
{
@@ -1227,7 +1452,7 @@ public class Geodesic {
}
betscale = lamscale * cbet1;
- x = (lam12 - Math.PI) / lamscale;
+ x = lam12x / lamscale;
y = sbet12a / betscale;
} else { // _f < 0
// x = dlat, y = dlong
@@ -1247,7 +1472,7 @@ public class Geodesic {
betscale = x < -0.01 ? sbet12a / x :
-_f * GeoMath.sq(cbet1) * Math.PI;
lamscale = betscale / cbet1;
- y = (lam12 - Math.PI) / lamscale;
+ y = lam12x / lamscale;
}
if (y > -tol1_ && x > -1 - xthresh_) {
@@ -1315,16 +1540,17 @@ public class Geodesic {
private class Lambda12V {
private double lam12, salp2, calp2, sig12, ssig1, csig1, ssig2, csig2,
- eps, domg12, dlam12;
+ eps, somg12, comg12, dlam12;
private Lambda12V() {
lam12 = salp2 = calp2 = sig12 = ssig1 = csig1 = ssig2 = csig2
- = eps = domg12 = dlam12 = Double.NaN;
+ = eps = somg12 = comg12 = dlam12 = Double.NaN;
}
}
private Lambda12V Lambda12(double sbet1, double cbet1, double dn1,
double sbet2, double cbet2, double dn2,
double salp1, double calp1,
+ double slam120, double clam120,
boolean diffp,
// Scratch areas of the right size
double C1a[], double C2a[], double C3a[]) {
@@ -1343,7 +1569,7 @@ public class Geodesic {
salp0 = salp1 * cbet1,
calp0 = GeoMath.hypot(calp1, salp1 * sbet1); // calp0 > 0
- double somg1, comg1, somg2, comg2, omg12;
+ double somg1, comg1, somg2, comg2;
// tan(bet1) = tan(sig1) * cos(alp1)
// tan(omg1) = sin(alp0) * tan(sig1) = tan(omg1)=tan(alp1)*sin(bet1)
w.ssig1 = sbet1; somg1 = salp0 * sbet1;
@@ -1380,17 +1606,18 @@ public class Geodesic {
w.csig1 * w.csig2 + w.ssig1 * w.ssig2);
// omg12 = omg2 - omg1, limit to [0, pi]
- omg12 = Math.atan2(Math.max(0.0, comg1 * somg2 - somg1 * comg2),
- comg1 * comg2 + somg1 * somg2);
- double B312, h0;
+ w.somg12 = Math.max(0.0, comg1 * somg2 - somg1 * comg2);
+ w.comg12 = comg1 * comg2 + somg1 * somg2;
+ // eta = omg12 - lam120
+ double eta = Math.atan2(w.somg12 * clam120 - w.comg12 * slam120,
+ w.comg12 * clam120 + w.somg12 * slam120);
+ double B312;
double k2 = GeoMath.sq(calp0) * _ep2;
w.eps = k2 / (2 * (1 + Math.sqrt(1 + k2)) + k2);
C3f(w.eps, C3a);
B312 = (SinCosSeries(true, w.ssig2, w.csig2, C3a) -
SinCosSeries(true, w.ssig1, w.csig1, C3a));
- h0 = -_f * A3f(w.eps);
- w.domg12 = salp0 * h0 * (w.sig12 + B312);
- w.lam12 = omg12 + w.domg12;
+ w.lam12 = eta - _f * A3f(w.eps) * salp0 * (w.sig12 + B312);
if (diffp) {
if (w.calp2 == 0)
diff --git a/java/src/main/java/net/sf/geographiclib/GeodesicLine.java b/java/src/main/java/net/sf/geographiclib/GeodesicLine.java
index 307b316..d0cf9f6 100644
--- a/java/src/main/java/net/sf/geographiclib/GeodesicLine.java
+++ b/java/src/main/java/net/sf/geographiclib/GeodesicLine.java
@@ -1,7 +1,7 @@
/**
* Implementation of the net.sf.geographiclib.GeodesicLine class
*
- * Copyright (c) Charles Karney (2013-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2013-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
**********************************************************************/
@@ -12,10 +12,24 @@ package net.sf.geographiclib;
* <p>
* GeodesicLine facilitates the determination of a series of points on a single
* geodesic. The starting point (<i>lat1</i>, <i>lon1</i>) and the azimuth
- * <i>azi1</i> are specified in the constructor. {@link #Position Position}
- * returns the location of point 2 a distance <i>s12</i> along the geodesic.
- * Alternatively {@link #ArcPosition ArcPosition} gives the position of point 2
- * an arc length <i>a12</i> along the geodesic.
+ * <i>azi1</i> are specified in the constructor; alternatively, the {@link
+ * Geodesic#Line Geodesic.Line} method can be used to create a GeodesicLine.
+ * {@link #Position Position} returns the location of point 2 a distance
+ * <i>s12</i> along the geodesic. Alternatively {@link #ArcPosition
+ * ArcPosition} gives the position of point 2 an arc length <i>a12</i> along
+ * the geodesic.
+ * <p>
+ * You can register the position of a reference point 3 a distance (arc
+ * length), <i>s13</i> (<i>a13</i>) along the geodesic with the
+ * {@link #SetDistance SetDistance} ({@link #SetArc SetArc}) functions. Points
+ * a fractional distance along the line can be found by providing, for example,
+ * 0.5 * {@link #Distance} as an argument to {@link #Position Position}. The
+ * {@link Geodesic#InverseLine Geodesic.InverseLine} or
+ * {@link Geodesic#DirectLine Geodesic.DirectLine} methods return GeodesicLine
+ * objects with point 3 set to the point 2 of the corresponding geodesic
+ * problem. GeodesicLine objects created with the public constructor or with
+ * {@link Geodesic#Line Geodesic.Line} have <i>s13</i> and <i>a13</i> set to
+ * NaNs.
* <p>
* The calculations are accurate to better than 15 nm (15 nanometers). See
* Sec. 9 of
@@ -32,7 +46,7 @@ package net.sf.geographiclib;
* <a href="https://dx.doi.org/10.1007/s00190-012-0578-z">
* Algorithms for geodesics</a>,
* J. Geodesy <b>87</b>, 43–55 (2013)
- * (<a href="http://geographiclib.sf.net/geod-addenda.html">addenda</a>).
+ * (<a href="http://geographiclib.sourceforge.net/geod-addenda.html">addenda</a>).
* </ul>
* <p>
* Here's an example of using this class
@@ -46,30 +60,30 @@ package net.sf.geographiclib;
* double
* lat1 = 40.640, lon1 = -73.779, // JFK
* lat2 = 1.359, lon2 = 103.989; // SIN
- * GeodesicData g = geod.Inverse(lat1, lon1, lat2, lon2,
- * GeodesicMask.DISTANCE | GeodesicMask.AZIMUTH);
- * GeodesicLine line = new GeodesicLine(geod, lat1, lon1, g.azi1,
- * GeodesicMask.DISTANCE_IN | GeodesicMask.LONGITUDE);
- * double
- * s12 = g.s12,
- * a12 = g.a12,
- * ds0 = 500e3; // Nominal distance between points = 500 km
- * int num = (int)(Math.ceil(s12 / ds0)); // The number of intervals
+ * GeodesicLine line = geod.InverseLine(lat1, lon1, lat2, lon2,
+ * GeodesicMask.DISTANCE_IN |
+ * GeodesicMask.LATITUDE |
+ * GeodesicMask.LONGITUDE);
+ * double ds0 = 500e3; // Nominal distance between points = 500 km
+ * // The number of intervals
+ * int num = (int)(Math.ceil(line.Distance() / ds0));
* {
* // Use intervals of equal length
- * double ds = s12 / num;
+ * double ds = line.Distance() / num;
* for (int i = 0; i <= num; ++i) {
- * g = line.Position(i * ds,
- * GeodesicMask.LATITUDE | GeodesicMask.LONGITUDE);
+ * GeodesicData g = line.Position(i * ds,
+ * GeodesicMask.LATITUDE |
+ * GeodesicMask.LONGITUDE);
* System.out.println(i + " " + g.lat2 + " " + g.lon2);
* }
* }
* {
* // Slightly faster, use intervals of equal arc length
- * double da = a12 / num;
+ * double da = line.Arc() / num;
* for (int i = 0; i <= num; ++i) {
- * g = line.ArcPosition(i * da,
- * GeodesicMask.LATITUDE | GeodesicMask.LONGITUDE);
+ * GeodesicData g = line.ArcPosition(i * da,
+ * GeodesicMask.LATITUDE |
+ * GeodesicMask.LONGITUDE);
* System.out.println(i + " " + g.lat2 + " " + g.lon2);
* }
* }
@@ -88,6 +102,7 @@ public class GeodesicLine {
private double _a, _f, _b, _c2, _f1, _salp0, _calp0, _k2,
_salp1, _calp1, _ssig1, _csig1, _dn1, _stau1, _ctau1, _somg1, _comg1,
_A1m1, _A2m1, _A3c, _B11, _B21, _B31, _A4, _B41;
+ private double _a13, _s13;
// index zero elements of _C1a, _C1pa, _C2a, _C3a are unused
private double _C1a[], _C1pa[], _C2a[], _C3a[],
_C4a[]; // all the elements of _C4a are used
@@ -132,34 +147,48 @@ public class GeodesicLine {
* The {@link GeodesicMask} values are
* <ul>
* <li>
- * <i>caps</i> |= GeodesicMask.LATITUDE for the latitude <i>lat2</i>; this
- * is added automatically;
+ * <i>caps</i> |= {@link GeodesicMask#LATITUDE} for the latitude
+ * <i>lat2</i>; this is added automatically;
* <li>
- * <i>caps</i> |= GeodesicMask.LONGITUDE for the latitude <i>lon2</i>;
+ * <i>caps</i> |= {@link GeodesicMask#LONGITUDE} for the latitude
+ * <i>lon2</i>;
* <li>
- * <i>caps</i> |= GeodesicMask.AZIMUTH for the latitude <i>azi2</i>; this
- * is added automatically;
+ * <i>caps</i> |= {@link GeodesicMask#AZIMUTH} for the latitude
+ * <i>azi2</i>; this is added automatically;
* <li>
- * <i>caps</i> |= GeodesicMask.DISTANCE for the distance <i>s12</i>;
+ * <i>caps</i> |= {@link GeodesicMask#DISTANCE} for the distance
+ * <i>s12</i>;
* <li>
- * <i>caps</i> |= GeodesicMask.REDUCEDLENGTH for the reduced length
+ * <i>caps</i> |= {@link GeodesicMask#REDUCEDLENGTH} for the reduced length
* <i>m12</i>;
* <li>
- * <i>caps</i> |= GeodesicMask.GEODESICSCALE for the geodesic scales
- * <i>M12</i> and <i>M21</i>;
+ * <i>caps</i> |= {@link GeodesicMask#GEODESICSCALE} for the geodesic
+ * scales <i>M12</i> and <i>M21</i>;
* <li>
- * <i>caps</i> |= GeodesicMask.AREA for the area <i>S12</i>;
+ * <i>caps</i> |= {@link GeodesicMask#AREA} for the area <i>S12</i>;
* <li>
- * <i>caps</i> |= GeodesicMask.DISTANCE_IN permits the length of the
- * geodesic to be given in terms of <i>s12</i>; without this capability the
- * length can only be specified in terms of arc length;
+ * <i>caps</i> |= {@link GeodesicMask#DISTANCE_IN} permits the length of
+ * the geodesic to be given in terms of <i>s12</i>; without this capability
+ * the length can only be specified in terms of arc length;
* <li>
- * <i>caps</i> |= GeodesicMask.ALL for all of the above;
+ * <i>caps</i> |= {@link GeodesicMask#ALL} for all of the above.
* </ul>
**********************************************************************/
public GeodesicLine(Geodesic g,
double lat1, double lon1, double azi1,
int caps) {
+ azi1 = GeoMath.AngNormalize(azi1);
+ double salp1, calp1;
+ // Guard against underflow in salp0
+ { Pair p = GeoMath.sincosd(GeoMath.AngRound(azi1));
+ salp1 = p.first; calp1 = p.second; }
+ LineInit(g, lat1, lon1, azi1, salp1, calp1, caps);
+ }
+
+ private void LineInit(Geodesic g,
+ double lat1, double lon1,
+ double azi1, double salp1, double calp1,
+ int caps) {
_a = g._a;
_f = g._f;
_b = g._b;
@@ -171,15 +200,13 @@ public class GeodesicLine {
_lat1 = GeoMath.LatFix(lat1);
_lon1 = lon1;
- _azi1 = GeoMath.AngNormalize(azi1);
- // Guard against underflow in salp0
- { Pair p = GeoMath.sincosd(GeoMath.AngRound(_azi1));
- _salp1 = p.first; _calp1 = p.second; }
+ _azi1 = azi1; _salp1 = salp1; _calp1 = calp1;
double cbet1, sbet1;
{ Pair p = GeoMath.sincosd(GeoMath.AngRound(_lat1));
sbet1 = _f1 * p.first; cbet1 = p.second; }
// Ensure cbet1 = +epsilon at poles
- { Pair p = GeoMath.norm(sbet1, cbet1); sbet1 = p.first; cbet1 = p.second; }
+ { Pair p = GeoMath.norm(sbet1, cbet1);
+ sbet1 = p.first; cbet1 = Math.max(Geodesic.tiny_, p.second); }
_dn1 = Math.sqrt(1 + g._ep2 * GeoMath.sq(sbet1));
// Evaluate alp0 from sin(alp1) * cos(bet1) = sin(alp0),
@@ -246,6 +273,14 @@ public class GeodesicLine {
}
}
+ protected GeodesicLine(Geodesic g,
+ double lat1, double lon1,
+ double azi1, double salp1, double calp1,
+ int caps, boolean arcmode, double s13_a13) {
+ LineInit(g, lat1, lon1, azi1, salp1, calp1, caps);
+ GenSetDistance(arcmode, s13_a13);
+ }
+
/**
* A default constructor. If GeodesicLine.Position is called on the
* resulting object, it returns immediately (without doing any calculations).
@@ -260,7 +295,7 @@ public class GeodesicLine {
* Compute the position of point 2 which is a distance <i>s12</i> (meters)
* from point 1.
* <p>
- * @param s12 distance between point 1 and point 2 (meters); it can be
+ * @param s12 distance from point 1 to point 2 (meters); it can be
* negative.
* @return a {@link GeodesicData} object with the following fields:
* <i>lat1</i>, <i>lon1</i>, <i>azi1</i>, <i>lat2</i>, <i>lon2</i>,
@@ -280,7 +315,7 @@ public class GeodesicLine {
* Compute the position of point 2 which is a distance <i>s12</i> (meters)
* from point 1 and with a subset of the geodesic results returned.
* <p>
- * @param s12 distance between point 1 and point 2 (meters); it can be
+ * @param s12 distance from point 1 to point 2 (meters); it can be
* negative.
* @param outmask a bitor'ed combination of {@link GeodesicMask} values
* specifying which results should be returned.
@@ -304,7 +339,7 @@ public class GeodesicLine {
* Compute the position of point 2 which is an arc length <i>a12</i>
* (degrees) from point 1.
* <p>
- * @param a12 arc length between point 1 and point 2 (degrees); it can
+ * @param a12 arc length from point 1 to point 2 (degrees); it can
* be negative.
* @return a {@link GeodesicData} object with the following fields:
* <i>lat1</i>, <i>lon1</i>, <i>azi1</i>, <i>lat2</i>, <i>lon2</i>,
@@ -324,15 +359,13 @@ public class GeodesicLine {
* Compute the position of point 2 which is an arc length <i>a12</i>
* (degrees) from point 1 and with a subset of the geodesic results returned.
* <p>
- * @param a12 arc length between point 1 and point 2 (degrees); it can
+ * @param a12 arc length from point 1 to point 2 (degrees); it can
* be negative.
* @param outmask a bitor'ed combination of {@link GeodesicMask} values
* specifying which results should be returned.
* @return a {@link GeodesicData} object giving <i>lat1</i>, <i>lon2</i>,
* <i>azi2</i>, and <i>a12</i>.
* <p>
- * The GeodesicLine object <i>must</i> have been constructed with <i>caps</i>
- * |= {@link GeodesicMask#DISTANCE_IN}; otherwise no parameters are set.
* Requesting a value which the GeodesicLine object is not capable of
* computing is not an error (no parameters will be set). The value of
* <i>lon2</i> returned is in the range [−180°, 180°), unless
@@ -360,23 +393,27 @@ public class GeodesicLine {
* The {@link GeodesicMask} values possible for <i>outmask</i> are
* <ul>
* <li>
- * <i>outmask</i> |= GeodesicMask.LATITUDE for the latitude <i>lat2</i>.
+ * <i>outmask</i> |= {@link GeodesicMask#LATITUDE} for the latitude
+ * <i>lat2</i>;
* <li>
- * <i>outmask</i> |= GeodesicMask.LONGITUDE for the latitude <i>lon2</i>.
+ * <i>outmask</i> |= {@link GeodesicMask#LONGITUDE} for the latitude
+ * <i>lon2</i>;
* <li>
- * <i>outmask</i> |= GeodesicMask.AZIMUTH for the latitude <i>azi2</i>.
+ * <i>outmask</i> |= {@link GeodesicMask#AZIMUTH} for the latitude
+ * <i>azi2</i>;
* <li>
- * <i>outmask</i> |= GeodesicMask.DISTANCE for the distance <i>s12</i>.
+ * <i>outmask</i> |= {@link GeodesicMask#DISTANCE} for the distance
+ * <i>s12</i>;
* <li>
- * <i>outmask</i> |= GeodesicMask.REDUCEDLENGTH for the reduced length
- * <i>m12</i>.
+ * <i>outmask</i> |= {@link GeodesicMask#REDUCEDLENGTH} for the reduced
+ * length <i>m12</i>;
* <li>
- * <i>outmask</i> |= GeodesicMask.GEODESICSCALE for the geodesic scales
- * <i>M12</i> and <i>M21</i>.
+ * <i>outmask</i> |= {@link GeodesicMask#GEODESICSCALE} for the geodesic
+ * scales <i>M12</i> and <i>M21</i>;
* <li>
- * <i>outmask</i> |= GeodesicMask.ALL for all of the above;
+ * <i>outmask</i> |= {@link GeodesicMask#ALL} for all of the above;
* <li>
- * <i>outmask</i> |= GeodesicMask.LONG_UNROLL to unroll <i>lon2</i>
+ * <i>outmask</i> |= {@link GeodesicMask#LONG_UNROLL} to unroll <i>lon2</i>
* (instead of reducing it to the range [−180°, 180°)).
* </ul>
* <p>
@@ -389,7 +426,8 @@ public class GeodesicLine {
GeodesicData r = new GeodesicData();
if (!( Init() &&
(arcmode ||
- (_caps & GeodesicMask.DISTANCE_IN & GeodesicMask.OUT_MASK) != 0) ))
+ (_caps & (GeodesicMask.OUT_MASK & GeodesicMask.DISTANCE_IN)) != 0)
+ ))
// Uninitialized or impossible distance calculation requested
return r;
r.lat1 = _lat1; r.azi1 = _azi1;
@@ -452,8 +490,7 @@ public class GeodesicLine {
r.a12 = Math.toDegrees(sig12);
}
- double omg12, lam12, lon12;
- double ssig2, csig2, sbet2, cbet2, somg2, comg2, salp2, calp2;
+ double ssig2, csig2, sbet2, cbet2, salp2, calp2;
// sig2 = sig1 + sig12
ssig2 = _ssig1 * csig12 + _csig1 * ssig12;
csig2 = _csig1 * csig12 - _ssig1 * ssig12;
@@ -479,19 +516,19 @@ public class GeodesicLine {
if ((outmask & GeodesicMask.LONGITUDE) != 0) {
// tan(omg2) = sin(alp0) * tan(sig2)
- somg2 = _salp0 * ssig2; comg2 = csig2; // No need to normalize
- int E = _salp0 < 0 ? -1 : 1; // east or west going?
+ double somg2 = _salp0 * ssig2, comg2 = csig2, // No need to normalize
+ E = GeoMath.copysign(1, _salp0); // east or west going?
// omg12 = omg2 - omg1
- omg12 = ((outmask & GeodesicMask.LONG_UNROLL) != 0)
+ double omg12 = ((outmask & GeodesicMask.LONG_UNROLL) != 0)
? E * (sig12
- (Math.atan2( ssig2, csig2) - Math.atan2( _ssig1, _csig1))
+ (Math.atan2(E*somg2, comg2) - Math.atan2(E*_somg1, _comg1)))
: Math.atan2(somg2 * _comg1 - comg2 * _somg1,
comg2 * _comg1 + somg2 * _somg1);
- lam12 = omg12 + _A3c *
+ double lam12 = omg12 + _A3c *
( sig12 + (Geodesic.SinCosSeries(true, ssig2, csig2, _C3a)
- _B31));
- lon12 = Math.toDegrees(lam12);
+ double lon12 = Math.toDegrees(lam12);
r.lon2 = ((outmask & GeodesicMask.LONG_UNROLL) != 0) ? _lon1 + lon12 :
GeoMath.AngNormalize(r.lon1 + GeoMath.AngNormalize(lon12));
}
@@ -528,14 +565,6 @@ public class GeodesicLine {
// alp12 = alp2 - alp1, used in atan2 so no need to normalize
salp12 = salp2 * _calp1 - calp2 * _salp1;
calp12 = calp2 * _calp1 + salp2 * _salp1;
- // The right thing appears to happen if alp1 = +/-180 and alp2 = 0, viz
- // salp12 = -0 and alp12 = -180. However this depends on the sign
- // being attached to 0 correctly. The following ensures the correct
- // behavior.
- if (salp12 == 0 && calp12 < 0) {
- salp12 = Geodesic.tiny_ * _calp1;
- calp12 = -1;
- }
} else {
// tan(alp) = tan(alp0) * sec(sig)
// tan(alp2-alp1) = (tan(alp2) -tan(alp1)) / (tan(alp2)*tan(alp1)+1)
@@ -557,6 +586,54 @@ public class GeodesicLine {
}
/**
+ * Specify position of point 3 in terms of distance.
+ *
+ * @param s13 the distance from point 1 to point 3 (meters); it
+ * can be negative.
+ *
+ * This is only useful if the GeodesicLine object has been constructed
+ * with <i>caps</i> |= {@link GeodesicMask#DISTANCE_IN}.
+ **********************************************************************/
+ public void SetDistance(double s13) {
+ _s13 = s13;
+ GeodesicData g = Position(false, _s13, 0);
+ _a13 = g.a12;
+ }
+
+ /**
+ * Specify position of point 3 in terms of arc length.
+ *
+ * @param a13 the arc length from point 1 to point 3 (degrees); it
+ * can be negative.
+ *
+ * The distance <i>s13</i> is only set if the GeodesicLine object has been
+ * constructed with <i>caps</i> |= {@link GeodesicMask#DISTANCE}.
+ **********************************************************************/
+ void SetArc(double a13) {
+ _a13 = a13;
+ GeodesicData g = Position(true, _a13, GeodesicMask.DISTANCE);
+ _s13 = g.s12;
+ }
+
+ /**
+ * Specify position of point 3 in terms of either distance or arc length.
+ *
+ * @param arcmode boolean flag determining the meaning of the second
+ * parameter; if <i>arcmode</i> is false, then the GeodesicLine object must
+ * have been constructed with <i>caps</i> |=
+ * {@link GeodesicMask#DISTANCE_IN}.
+ * @param s13_a13 if <i>arcmode</i> is false, this is the distance from
+ * point 1 to point 3 (meters); otherwise it is the arc length from
+ * point 1 to point 3 (degrees); it can be negative.
+ **********************************************************************/
+ public void GenSetDistance(boolean arcmode, double s13_a13) {
+ if (arcmode)
+ SetArc(s13_a13);
+ else
+ SetDistance(s13_a13);
+ }
+
+ /**
* @return true if the object has been initialized.
**********************************************************************/
private boolean Init() { return _caps != 0; }
@@ -580,6 +657,15 @@ public class GeodesicLine {
{ return Init() ? _azi1 : Double.NaN; }
/**
+ * @return pair of sine and cosine of <i>azi1</i> the azimuth (degrees) of
+ * the geodesic line at point 1.
+ **********************************************************************/
+ public Pair AzimuthCosines() {
+ return new Pair(Init() ? _salp1 : Double.NaN,
+ Init() ? _calp1 : Double.NaN);
+ }
+
+ /**
* @return <i>azi0</i> the azimuth (degrees) of the geodesic line as it
* crosses the equator in a northward direction.
**********************************************************************/
@@ -589,6 +675,15 @@ public class GeodesicLine {
}
/**
+ * @return pair of sine and cosine of <i>azi0</i> the azimuth of the geodesic
+ * line as it crosses the equator in a northward direction.
+ **********************************************************************/
+ public Pair EquatorialAzimuthCosines() {
+ return new Pair(Init() ? _salp0 : Double.NaN,
+ Init() ? _calp0 : Double.NaN);
+ }
+
+ /**
* @return <i>a1</i> the arc length (degrees) between the northward
* equatorial crossing and point 1.
**********************************************************************/
@@ -626,4 +721,25 @@ public class GeodesicLine {
return (_caps & testcaps) == testcaps;
}
+ /**
+ * The distance or arc length to point 3.
+ *
+ * @param arcmode boolean flag determining the meaning of returned
+ * value.
+ * @return <i>s13</i> if <i>arcmode</i> is false; <i>a13</i> if
+ * <i>arcmode</i> is true.
+ **********************************************************************/
+ public double GenDistance(boolean arcmode)
+ { return Init() ? (arcmode ? _a13 : _s13) : Double.NaN; }
+
+ /**
+ * @return <i>s13</i>, the distance to point 3 (meters).
+ **********************************************************************/
+ public double Distance() { return GenDistance(false); }
+
+ /**
+ * @return <i>a13</i>, the arc length to point 3 (degrees).
+ **********************************************************************/
+ public double Arc() { return GenDistance(true); }
+
}
diff --git a/java/src/main/java/net/sf/geographiclib/GeodesicMask.java b/java/src/main/java/net/sf/geographiclib/GeodesicMask.java
index 09d96dd..7329c09 100644
--- a/java/src/main/java/net/sf/geographiclib/GeodesicMask.java
+++ b/java/src/main/java/net/sf/geographiclib/GeodesicMask.java
@@ -86,8 +86,4 @@ public class GeodesicMask {
* Unroll <i>lon2</i>.
**********************************************************************/
public static final int LONG_UNROLL = 1<<15;
- /**
- * For backward compatibility only; use LONG_UNROLL instead.
- **********************************************************************/
- public static final int LONG_NOWRAP = LONG_UNROLL;
}
diff --git a/java/src/main/java/net/sf/geographiclib/Gnomonic.java b/java/src/main/java/net/sf/geographiclib/Gnomonic.java
index 28d8e63..2319263 100644
--- a/java/src/main/java/net/sf/geographiclib/Gnomonic.java
+++ b/java/src/main/java/net/sf/geographiclib/Gnomonic.java
@@ -1,8 +1,8 @@
/**
* Implementation of the net.sf.geographiclib.Gnomonic class
*
- * Copyright (c) BMW Car IT GmbH (2014) <sebastian.mattheis at bmw-carit.de> and
- * licensed under the MIT/X11 License. For more information, see
+ * Copyright (c) BMW Car IT GmbH (2014-2016) <sebastian.mattheis at bmw-carit.de>
+ * and licensed under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
**********************************************************************/
package net.sf.geographiclib;
@@ -23,7 +23,7 @@ package net.sf.geographiclib;
* Algorithms for geodesics</a>, J. Geodesy <b>87</b>, 43–55 (2013);
* DOI: <a href="http://dx.doi.org/10.1007/s00190-012-0578-z">
* 10.1007/s00190-012-0578-z</a>; addenda:
- * <a href="http://geographiclib.sf.net/geod-addenda.html">
+ * <a href="http://geographiclib.sourceforge.net/geod-addenda.html">
* geod-addenda.html</a>.
* </li>
* </ul>
@@ -69,9 +69,6 @@ package net.sf.geographiclib;
* 135°. To lowest order in <i>r</i> and the flattening <i>f</i>, the
* deviation is <i>f</i> (<i>r</i>/2<i>a</i>)<sup>3</sup> <i>r</i>.
* <p>
- * The conversions all take place using a Geodesic object (by default
- * Geodesic::WGS84). For more information on geodesics see \ref geodesic.
- * <p>
* <b>CAUTION:</b> The definition of this projection for a sphere is standard.
* However, there is no standard for how it should be extended to an ellipsoid.
* The choices are:
@@ -142,7 +139,7 @@ public class Gnomonic {
* Constructor for Gnomonic.
* <p>
* @param earth the {@link Geodesic} object to use for geodesic
- * calculations. By default the WGS84 ellipsoid should be used.
+ * calculations.
*/
public Gnomonic(Geodesic earth) {
_earth = earth;
diff --git a/java/src/main/java/net/sf/geographiclib/GnomonicData.java b/java/src/main/java/net/sf/geographiclib/GnomonicData.java
index 75fcccf..d2bf22a 100644
--- a/java/src/main/java/net/sf/geographiclib/GnomonicData.java
+++ b/java/src/main/java/net/sf/geographiclib/GnomonicData.java
@@ -1,8 +1,8 @@
/**
* Implementation of the net.sf.geographiclib.GnomonicData class
*
- * Copyright (c) BMW Car IT GmbH (2014) <sebastian.mattheis at bmw-carit.de> and
- * licensed under the MIT/X11 License. For more information, see
+ * Copyright (c) BMW Car IT GmbH (2014-2016) <sebastian.mattheis at bmw-carit.de>
+ * and licensed under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
**********************************************************************/
package net.sf.geographiclib;
@@ -15,9 +15,9 @@ package net.sf.geographiclib;
* (<i>lat</i>, <i>lon</i>) given a center point of projection (<i>lat0</i>,
* <i>lon0</i>). The returned GnomonicData objects always include the
* parameters provided to
- * {@link Gnomonic#Forward(double, double, double, double) Gnomonic.Forward}
+ * {@link Gnomonic#Forward Gnomonic.Forward}
* and
- * {@link Gnomonic#Reverse(double, double, double, double) Gnomonic.Reverse}
+ * {@link Gnomonic#Reverse Gnomonic.Reverse}
* and it always includes the fields <i>x</i>, <i>y</i>, <i>azi</i>. and
* <i>rk</i>.
**********************************************************************/
diff --git a/java/src/main/java/net/sf/geographiclib/PolygonArea.java b/java/src/main/java/net/sf/geographiclib/PolygonArea.java
index 8938bf1..f98ab60 100644
--- a/java/src/main/java/net/sf/geographiclib/PolygonArea.java
+++ b/java/src/main/java/net/sf/geographiclib/PolygonArea.java
@@ -1,7 +1,7 @@
/**
* Implementation of the net.sf.geographiclib.PolygonArea class
*
- * Copyright (c) Charles Karney (2013-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2013-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
**********************************************************************/
@@ -18,7 +18,7 @@ package net.sf.geographiclib;
* <a href="https://dx.doi.org/10.1007/s00190-012-0578-z">
* Algorithms for geodesics</a>,
* J. Geodesy <b>87</b>, 43–55 (2013)
- * (<a href="http://geographiclib.sf.net/geod-addenda.html">addenda</a>).
+ * (<a href="http://geographiclib.sourceforge.net/geod-addenda.html">addenda</a>).
* </ul>
* <p>
* This class lets you add vertices one at a time to the polygon. The area
@@ -72,7 +72,7 @@ public class PolygonArea {
// Compute lon12 the same way as Geodesic.Inverse.
lon1 = GeoMath.AngNormalize(lon1);
lon2 = GeoMath.AngNormalize(lon2);
- double lon12 = GeoMath.AngDiff(lon1, lon2);
+ double lon12 = GeoMath.AngDiff(lon1, lon2).first;
int cross =
lon1 < 0 && lon2 >= 0 && lon12 > 0 ? 1 :
(lon2 < 0 && lon1 >= 0 && lon12 < 0 ? -1 : 0);
diff --git a/java/src/main/java/net/sf/geographiclib/package-info.java b/java/src/main/java/net/sf/geographiclib/package-info.java
index 5b0aa6b..f87e016 100644
--- a/java/src/main/java/net/sf/geographiclib/package-info.java
+++ b/java/src/main/java/net/sf/geographiclib/package-info.java
@@ -1,12 +1,22 @@
/**
* <h1>Geodesic routines from GeographicLib implemented in Java</h1>
* @author Charles F. F. Karney (charles at karney.com)
- * @version 1.45
+ * @version 1.46
+ *
+ * <p>
+ * The documentation for other versions is available at
+ * <tt>http://geographiclib.sourceforge.net/m.nn/java</tt> for versions numbers
+ * <tt>m.nn</tt> ≥ 1.31.
+ * <p>
+ * Licensed under the
+ * <a href="http://www.opensource.org/licenses/MIT">MIT/X11 License</a>; see
+ * <a href="http://geographiclib.sourceforge.net/html/LICENSE.txt">
+ * LICENSE.txt</a>.
*
* <h2>Abstract</h2>
* <p>
* GeographicLib-Java is a Java implementation of the geodesic algorithms from
- * <a href="http://geographiclib.sf.net">GeographicLib</a>. This is a
+ * <a href="http://geographiclib.sourceforge.net">GeographicLib</a>. This is a
* self-contained library which makes it easy to do geodesic computations for
* an ellipsoid of revolution in a Java program. It requires Java version 1.2
* or later.
@@ -19,15 +29,15 @@
* GeographicLib-Java is part of GeographicLib which available for download at
* <ul>
* <li>
- * <a href="https://sf.net/projects/geographiclib/files/distrib/GeographicLib-1.45.tar.gz">
- * GeographicLib-1.45.tar.gz</a>
+ * <a href="https://sourceforge.net/projects/geographiclib/files/distrib/GeographicLib-1.46.tar.gz">
+ * GeographicLib-1.46.tar.gz</a>
* <li>
- * <a href="https://sf.net/projects/geographiclib/files/distrib/GeographicLib-1.45.zip">
- * GeographicLib-1.45.zip</a>
+ * <a href="https://sourceforge.net/projects/geographiclib/files/distrib/GeographicLib-1.46.zip">
+ * GeographicLib-1.46.zip</a>
* </ul>
* <p>
* as either a compressed tar file (tar.gz) or a zip file. After unpacking
- * the source, the Java library can be found in GeographicLib-1.45/java. (This
+ * the source, the Java library can be found in GeographicLib-1.46/java. (This
* library is completely independent from the rest of GeodegraphicLib.) The
* library consists of the files in the src/main/java/net/sf/geographiclib
* subdirectory.
@@ -40,7 +50,7 @@
* <dependency>
* <groupId>net.sf.geographiclib</groupId>
* <artifactId>GeographicLib-Java</artifactId>
- * <version>1.45</version>
+ * <version>1.46</version>
* </dependency> }</pre>
* in your {@code pom.xml}.
*
@@ -105,9 +115,9 @@
* some additional packages to your local repository.) Then compile and run
* Inverse.java with <pre>
* cd inverse/src/main/java
- * javac -cp .:../../../../target/GeographicLib-Java-1.45.jar Inverse.java
+ * javac -cp .:../../../../target/GeographicLib-Java-1.46.jar Inverse.java
* echo -30 0 29.5 179.5 |
- * java -cp .:../../../../target/GeographicLib-Java-1.45.jar Inverse </pre>
+ * java -cp .:../../../../target/GeographicLib-Java-1.46.jar Inverse </pre>
*
* <h3>Using maven to build and run {@code Inverse.java}</h3>
* The sample code includes a {@code pom.xml} which specifies
@@ -121,7 +131,6 @@
* echo -30 0 29.5 179.5 | mvn -q exec:java </pre>
*
* <h2>Using the library</h2>
- * <p>
* <ul>
* <li>
* Put <pre>
@@ -161,55 +170,117 @@
* The documentation is generated using javadoc when
* {@code mvn package -P release} is run (the top of the documentation tree is
* {@code target/apidocs/index.html}). This is also available on the web at
- * <a href="http://geographiclib.sf.net/html/java/index.html">
- * http://geographiclib.sf.net/html/java/index.html</a>.
+ * <a href="http://geographiclib.sourceforge.net/html/java/index.html">
+ * http://geographiclib.sourceforge.net/html/java/index.html</a>.
*
* <h2>External links</h2>
- * <p>
* <ul>
* <li>
* These algorithms are derived in C. F. F. Karney,
* <a href="https://dx.doi.org/10.1007/s00190-012-0578-z">
* Algorithms for geodesics</a>,
* J. Geodesy <b>87</b>, 43–55 (2013)
- * (<a href="http://geographiclib.sf.net/geod-addenda.html">addenda</a>).
+ * (<a href="http://geographiclib.sourceforge.net/geod-addenda.html">addenda</a>).
* <li>
* A longer paper on geodesics: C. F. F. Karney,
* <a href="http://arxiv.org/abs/1102.1215v1">Geodesics
* on an ellipsoid of revolution</a>,
* Feb. 2011
- * (<a href=
- * "http://geographiclib.sf.net/geod-addenda.html#geod-errata">errata</a>).
- * <li>
- * <a href="http://geographiclib.sf.net">The GeographicLib web site</a>.
- * <li>
- * <a href="http://geographiclib.sf.net/html/index.html">The C++ library</a>.
- * <li>
- * <a href="http://geographiclib.sf.net/html/C/index.html">The C library</a>.
- * <li>
- * <a href="http://geographiclib.sf.net/html/Fortran/index.html">The
- * Fortran library</a>.
- * <li>
- * <a href="http://www.mathworks.com/matlabcentral/fileexchange/50605">
- * MATLAB toolbox</a>.
+ * (<a href="http://geographiclib.sourceforge.net/geod-addenda.html#geod-errata">
+ * errata</a>).
+ * <li>
+ * <a href="http://geographiclib.sourceforge.net">
+ * The GeographicLib web site</a>.
+ * <li>
+ * <a href="https://sourceforge.net/projects/geographiclib/">
+ * Main project page</a>
+ * <li>
+ * <a href="http://sourceforge.net/p/geographiclib/code/ci/release/tree/">
+ * git repository</a>
+ * <li>
+ * Implementations in various languages:
+ * <ul>
+ * <li>
+ * C++ (complete library):
+ * <a href="http://geographiclib.sourceforge.net/html/">
+ * documentation</a>,
+ * <a href="https://sourceforge.net/projects/geographiclib/files/distrib">
+ * download</a>
+ * <li>
+ * C (geodesic routines):
+ * <a href="http://geographiclib.sourceforge.net/html/C/">
+ * documentation</a>, also included with recent versions of
+ * <a href="https://github.com/OSGeo/proj.4/wiki">
+ * proj.4</a>
+ * <li>
+ * Fortran (geodesic routines):
+ * <a href="http://geographiclib.sourceforge.net/html/Fortran/">
+ * documentation</a>
+ * <li>
+ * Java (geodesic routines):
+ * <a href="http://repo1.maven.org/maven2/net/sf/geographiclib/GeographicLib-Java/">
+ * Maven Central package</a>,
+ * <a href="http://geographiclib.sourceforge.net/html/java/">
+ * documentation</a>
+ * <li>
+ * JavaScript (geodesic routines):
+ * <a href="https://www.npmjs.com/package/geographiclib">
+ * npm package</a>,
+ * <a href="http://geographiclib.sourceforge.net/html/js/">
+ * documentation</a>
+ * <li>
+ * Python (geodesic routines):
+ * <a href="http://pypi.python.org/pypi/geographiclib">
+ * PyPI package</a>,
+ * <a href="http://geographiclib.sourceforge.net/html/python/">
+ * documentation</a>
+ * <li>
+ * Matlab/Octave (geodesic and some other routines):
+ * <a href="http://www.mathworks.com/matlabcentral/fileexchange/50605">
+ * Matlab Central package</a>,
+ * <a href="http://www.mathworks.com/matlabcentral/fileexchange/50605/content/Contents.m">
+ * documentation</a>
+ * <li>
+ * C# (.NET wrapper for complete C++ library):
+ * <a href="http://geographiclib.sourceforge.net/html/NET/">
+ * documentation</a>.
+ * </ul>
* <li>
* The section in the GeographicLib documentation on geodesics:
- * <a href="http://geographiclib.sf.net/html/geodesic.html">Geodesics
- * on an ellipsoid of revolution</a>.
+ * <a href="http://geographiclib.sourceforge.net/html/geodesic.html">
+ * Geodesics on an ellipsoid of revolution</a>
* <li>
- * <a href="http://geographiclib.sf.net/geodesic-papers/biblio.html">
- * An online geodesic bibliography</a>.
+ * <a href="http://geographiclib.sourceforge.net/geodesic-papers/biblio.html">
+ * A geodesic bibliography</a>
* <li>
* The wikipedia page,
* <a href="https://en.wikipedia.org/wiki/Geodesics_on_an_ellipsoid">
- * Geodesics on an ellipsoid</a>.
+ * Geodesics on an ellipsoid</a>
* </ul>
*
* <h2>Change log</h2>
- * <p>
* <ul>
* <li>
- * <a href="http://geographiclib.sf.net/1.45/java">Version 1.45</a>
+ * <a href="http://geographiclib.sourceforge.net/1.46/java">Version 1.46</a>
+ * (released 2016-02-15)
+ * <ul>
+ * <li>
+ * Fix bug where the wrong longitude was being returned with direct geodesic
+ * calculation with a negative distance when starting point was at a pole
+ * (this bug was introduced in version 1.44).
+ * <li>
+ * Add Geodesic.DirectLine, Geodesic.ArcDirectLine, Geodesic.GenDirectLine,
+ * Geodesic.InverseLine, GeodesicLine.SetDistance, GeodesicLine.SetArc,
+ * GeodesicLine.GenSetDistance, GeodesicLine.Distance, GeodesicLine.Arc,
+ * GeodesicLine.GenDistance.
+ * <li>
+ * More accurate inverse solution when longitude difference is close to
+ * 180°.
+ * <li>
+ * GeoMath.AngDiff now returns a Pair.
+ * </ul>
+ * <li>
+ * <a href="http://geographiclib.sourceforge.net/1.45/java">Version 1.45</a>
* (released 2015-09-30)
* <ul>
* <li>
@@ -224,7 +295,7 @@
* 1998-12).
* </ul>
* <li>
- * <a href="http://geographiclib.sf.net/1.44/java">Version 1.44</a>
+ * <a href="http://geographiclib.sourceforge.net/1.44/java">Version 1.44</a>
* (released 2015-08-14)
* <ul>
* <li>
diff --git a/java/src/test/java/net/sf/geographiclib/GeodesicTest.java b/java/src/test/java/net/sf/geographiclib/GeodesicTest.java
index 109a7e7..de4aa0c 100644
--- a/java/src/test/java/net/sf/geographiclib/GeodesicTest.java
+++ b/java/src/test/java/net/sf/geographiclib/GeodesicTest.java
@@ -431,6 +431,109 @@ public class GeodesicTest {
}
@Test
+ public void GeodSolve59() {
+ // Check for points close with longitudes close to 180 deg apart.
+ GeodesicData inv = Geodesic.WGS84.Inverse(5, 0.00000000000001, 10, 180);
+ assertEquals(inv.azi1, 0.000000000000035, 1.5e-14);
+ assertEquals(inv.azi2, 179.99999999999996, 1.5e-14);
+ assertEquals(inv.s12, 18345191.174332713, 4e-9);
+ }
+
+ @Test
+ public void GeodSolve61() {
+ // Make sure small negative azimuths are west-going
+ GeodesicData dir =
+ Geodesic.WGS84.Direct(45, 0, -0.000000000000000003, 1e7,
+ GeodesicMask.STANDARD | GeodesicMask.LONG_UNROLL);
+ assertEquals(dir.lat2, 45.30632, 0.5e-5);
+ assertEquals(dir.lon2, -180, 0.5e-5);
+ assertEquals(dir.azi2, -180, 0.5e-5);
+ GeodesicLine line = Geodesic.WGS84.InverseLine(45, 0, 80,
+ -0.000000000000000003);
+ dir = line.Position(1e7);
+ assertEquals(dir.lat2, 45.30632, 0.5e-5);
+ assertEquals(dir.lon2, -180, 0.5e-5);
+ assertEquals(dir.azi2, -180, 0.5e-5);
+ }
+
+ @Test
+ public void GeodSolve65() {
+ // Check for bug in east-going check in GeodesicLine (needed to check for
+ // sign of 0) and sign error in area calculation due to a bogus override
+ // of the code for alp12. Found/fixed on 2015-12-19.
+ GeodesicLine line = Geodesic.WGS84.InverseLine(30, -0.000000000000000001,
+ -31, 180);
+ GeodesicData dir =
+ line.Position(1e7, GeodesicMask.ALL | GeodesicMask.LONG_UNROLL);
+ assertEquals(dir.lat1, 30.00000 , 0.5e-5);
+ assertEquals(dir.lon1, -0.00000 , 0.5e-5);
+ assertEquals(dir.azi1, -180.00000, 0.5e-5);
+ assertEquals(dir.lat2, -60.23169 , 0.5e-5);
+ assertEquals(dir.lon2, -0.00000 , 0.5e-5);
+ assertEquals(dir.azi2, -180.00000, 0.5e-5);
+ assertEquals(dir.s12 , 10000000 , 0.5);
+ assertEquals(dir.a12 , 90.06544 , 0.5e-5);
+ assertEquals(dir.m12 , 6363636 , 0.5);
+ assertEquals(dir.M12 , -0.0012834, 0.5e7);
+ assertEquals(dir.M21 , 0.0013749 , 0.5e-7);
+ assertEquals(dir.S12 , 0 , 0.5);
+ dir = line.Position(2e7, GeodesicMask.ALL | GeodesicMask.LONG_UNROLL);
+ assertEquals(dir.lat1, 30.00000 , 0.5e-5);
+ assertEquals(dir.lon1, -0.00000 , 0.5e-5);
+ assertEquals(dir.azi1, -180.00000, 0.5e-5);
+ assertEquals(dir.lat2, -30.03547 , 0.5e-5);
+ assertEquals(dir.lon2, -180.00000, 0.5e-5);
+ assertEquals(dir.azi2, -0.00000 , 0.5e-5);
+ assertEquals(dir.s12 , 20000000 , 0.5);
+ assertEquals(dir.a12 , 179.96459 , 0.5e-5);
+ assertEquals(dir.m12 , 54342 , 0.5);
+ assertEquals(dir.M12 , -1.0045592, 0.5e7);
+ assertEquals(dir.M21 , -0.9954339, 0.5e-7);
+ assertEquals(dir.S12 , 127516405431022.0, 0.5);
+ }
+
+ @Test
+ public void GeodSolve69() {
+ // Check for InverseLine if line is slightly west of S and that s13 is
+ // correctly set.
+ GeodesicLine line =
+ Geodesic.WGS84.InverseLine(-5, -0.000000000000002, -10, 180);
+ GeodesicData dir =
+ line.Position(2e7, GeodesicMask.STANDARD | GeodesicMask.LONG_UNROLL);
+ assertEquals(dir.lat2, 4.96445 , 0.5e-5);
+ assertEquals(dir.lon2, -180.00000, 0.5e-5);
+ assertEquals(dir.azi2, -0.00000 , 0.5e-5);
+ dir = line.Position(0.5 * line.Distance(),
+ GeodesicMask.STANDARD | GeodesicMask.LONG_UNROLL);
+ assertEquals(dir.lat2, -87.52461 , 0.5e-5);
+ assertEquals(dir.lon2, -0.00000 , 0.5e-5);
+ assertEquals(dir.azi2, -180.00000, 0.5e-5);
+ }
+
+ @Test
+ public void GeodSolve71() {
+ // Check that DirectLine sets s13.
+ GeodesicLine line = Geodesic.WGS84.DirectLine(1, 2, 45, 1e7);
+ GeodesicData dir =
+ line.Position(0.5 * line.Distance(),
+ GeodesicMask.STANDARD | GeodesicMask.LONG_UNROLL);
+ assertEquals(dir.lat2, 30.92625, 0.5e-5);
+ assertEquals(dir.lon2, 37.54640, 0.5e-5);
+ assertEquals(dir.azi2, 55.43104, 0.5e-5);
+ }
+
+ @Test
+ public void GeodSolve73() {
+ // Check for backwards from the pole bug reported by Anon on 2016-02-13.
+ // This only affected the Java implementation. It was introduced in Java
+ // version 1.44 and fixed in 1.46-SNAPSHOT on 2016-01-17.
+ GeodesicData dir = Geodesic.WGS84.Direct(90, 10, 180, -1e6);
+ assertEquals(dir.lat2, 81.04623, 0.5e-5);
+ assertEquals(dir.lon2, -170, 0.5e-5);
+ assertEquals(dir.azi2, 0, 0.5e-5);
+ }
+
+ @Test
public void Planimeter0() {
// Check fix for pole-encircling bug found 2011-03-16
double pa[][] = {{89, 0}, {89, 90}, {89, 180}, {89, 270}};
diff --git a/js/CMakeLists.txt b/js/CMakeLists.txt
index 719c5ba..30b0293 100644
--- a/js/CMakeLists.txt
+++ b/js/CMakeLists.txt
@@ -31,7 +31,7 @@ if (JS_BUILD)
file (APPEND ${JS_TARGET} "${_S}")
file (APPEND ${JS_TARGET} "\n(function(cb) {\n")
foreach (_F ${JSSCRIPTS})
- get_filename_component(_N ${_F} NAME)
+ get_filename_component (_N ${_F} NAME)
file (READ "${_F}" _S)
# Normalize the line endings.
string (REGEX REPLACE "\r" "" _S "${_S}")
@@ -66,7 +66,7 @@ if (JS_BUILD_MIN)
file (APPEND ${JS_TARGET_MIN} "${_S}")
file (APPEND ${JS_TARGET_MIN} "(function(cb){\n")
foreach (_F ${JSSCRIPTS})
- get_filename_component(_N ${_F} NAME)
+ get_filename_component (_N ${_F} NAME)
file (READ "${_F}" _S)
# Normalize the line endings.
string (REGEX REPLACE "\r" "\n" _S "${_S}")
@@ -112,6 +112,15 @@ file (COPY ${SAMPLES} DESTINATION .)
add_custom_target (javascript ALL DEPENDS ${JS_TARGETS})
+# Copy files so that publishing nodejs package can be done with:
+# npm publish ${CMAKE_CURRENT_BINARY_DIR}/geographiclib
+# To test, do:
+# cd ${CMAKE_CURRENT_BINARY_DIR}/geographiclib && npm test
+file (COPY ../LICENSE.txt package.json README.md ${JS_TARGETS}
+ DESTINATION geographiclib)
+file (COPY ${JSSCRIPTS} DESTINATION geographiclib/src)
+file (COPY test/geodesictest.js DESTINATION geographiclib/test)
+
if (COMMON_INSTALL_PATH)
set (INSTALL_JS_DIR "lib${LIB_SUFFIX}/node_modules/geographiclib")
else ()
@@ -123,18 +132,3 @@ install (FILES ../LICENSE.txt package.json README.md ${JS_TARGETS}
DESTINATION ${INSTALL_JS_DIR})
install (FILES ${JSSCRIPTS} DESTINATION ${INSTALL_JS_DIR}/src)
install (FILES test/geodesictest.js DESTINATION ${INSTALL_JS_DIR}/test)
-
-if (MAINTAINER)
- add_custom_target (distrib-npm)
- add_dependencies (distrib-npm javascript)
- set (_D ${CMAKE_CURRENT_BINARY_DIR}/geographiclib)
- add_custom_command (TARGET distrib-npm
- COMMAND
- mkdir -p ${_D}/src ${_D}/test &&
- install -C -m 644 ../LICENSE.txt package.json README.md ${JS_TARGETS}
- ${_D} &&
- install -C -m 644 ${JSSCRIPTS} ${_D}/src &&
- install -C -m 644 test/geodesictest.js ${_D}/test
- COMMENT "To publish nodejs package, run\nnpm publish ${_D}"
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-endif ()
diff --git a/js/GeographicLib.md b/js/GeographicLib.md
index 298b832..c244568 100644
--- a/js/GeographicLib.md
+++ b/js/GeographicLib.md
@@ -1,11 +1,18 @@
## Geodesic routines from GeographicLib
-This documentation applies to version 1.45.
+This documentation applies to version 1.46.
+
+The documentation for other versions is available
+at <tt>http://geographiclib.sourceforge.net/m.nn/js</tt> for versions
+numbers <tt>m.nn</tt> ≥ 1.45.
+
+Licensed under the MIT/X11 License; see
+[LICENSE.txt](http://geographiclib.sourceforge.net/html/LICENSE.txt).
### Installation
This library is a JavaScript implementation of the geodesic routines
-from [GeographicLib](http://geographiclib.sf.net). This solves the
+from [GeographicLib](http://geographiclib.sourceforge.net). This solves the
direct and inverse geodesic problems for an ellipsoid of revolution.
The library can be used in [node](https://nodejs.org) by first
@@ -17,11 +24,17 @@ $ npm install geographiclib
$ node
> var GeographicLib = require("geographiclib");
```
+The npm package includes a test suite. Run this by
+```bash
+$ cd node_modules/geograliblib
+$ npm test
+```
+
Alternatively, you can use it in client-side JavaScript, by including in
your HTML page
```html
<script type="text/javascript"
- src="http://geographiclib.sf.net/scripts/geographiclib.js">
+ src="http://geographiclib.sourceforge.net/scripts/geographiclib.js">
</script>
```
Both of these prescriptions define a {@link GeographicLib} namespace.
@@ -45,15 +58,66 @@ console.log("The position is (" +
// This prints "The position is (32.11195529, -63.95925278)."
```
Two examples of this library in use are
-* [A geodesic calculator](http://geographiclib.sf.net/scripts/geod-calc.html)
+* [A geodesic calculator](http://geographiclib.sourceforge.net/scripts/geod-calc.html)
* [Displaying geodesics on Google
- Maps](http://geographiclib.sf.net/scripts/geod-google.html)
+ Maps](http://geographiclib.sourceforge.net/scripts/geod-google.html)
### More information
* {@tutorial 1-geodesics}
* {@tutorial 2-interface}
* {@tutorial 3-examples}
+### Implementations in various languages
+* {@link http://sourceforge.net/p/geographiclib/code/ci/release/tree/
+ git repository}
+* C++ (complete library):
+ {@link http://geographiclib.sourceforge.net/html/index.html
+ documentation},
+ {@link https://sourceforge.net/projects/geographiclib/files/distrib
+ download};
+* C (geodesic routines):
+ {@link http://geographiclib.sourceforge.net/html/C/index.html
+ documentation}, also included with recent versions of
+ {@link https://github.com/OSGeo/proj.4/wiki
+ proj.4};
+* Fortran (geodesic routines):
+ {@link http://geographiclib.sourceforge.net/html/Fortran/index.html
+ documentation};
+* Java (geodesic routines):
+ {@link http://repo1.maven.org/maven2/net/sf/geographiclib/GeographicLib-Java/
+ Maven Central package},
+ {@link http://geographiclib.sourceforge.net/html/java/index.html
+ documentation};
+* JavaScript (geodesic routines):
+ {@link https://www.npmjs.com/package/geographiclib
+ npm package},
+ {@link http://geographiclib.sourceforge.net/html/js/index.html
+ documentation};
+* Python (geodesic routines):
+ {@link http://pypi.python.org/pypi/geographiclib
+ PyPI package},
+ {@link http://geographiclib.sourceforge.net/html/python/index.html
+ documentation};
+* Matlab/Octave (geodesic and some other routines):
+ {@link http://www.mathworks.com/matlabcentral/fileexchange/50605
+ Matlab Central package},
+ {@link http://www.mathworks.com/matlabcentral/fileexchange/50605/content/Contents.m
+ documentation};
+* C# (.NET wrapper for complete C++ library):
+ {@link http://geographiclib.sourceforge.net/html/NET/index.html
+ documentation}.
+
+### Change log
+
+* Version 1.46 (released 2016-02-15)
+ * Fix bugs in PolygonArea.TestEdge (problem found by threepointone).
+ * Add Geodesic.DirectLine, Geodesic.ArcDirectLine,
+ Geodesic.GenDirectLine, Geodesic.InverseLine,
+ GeodesicLine.SetDistance, GeodesicLine.SetArc,
+ GeodesicLine.GenSetDistance, GeodesicLine.s13, GeodesicLine.a13.
+ * More accurate inverse solution when longitude difference is close to
+ 180°.
+
### Authors
* algorithms + js code: Charles Karney (charles at karney.com)
diff --git a/js/HEADER.js b/js/HEADER.js
index 583afa0..258ce49 100644
--- a/js/HEADER.js
+++ b/js/HEADER.js
@@ -1,20 +1,20 @@
/*
* Geodesic routines from GeographicLib translated to JavaScript. See
- * http://geographiclib.sf.net/html/other.html#javascript
+ * http://geographiclib.sourceforge.net/html/js/
*
* The algorithms are derived in
*
* Charles F. F. Karney,
* Algorithms for geodesics, J. Geodesy 87, 43-55 (2013),
* https://dx.doi.org/10.1007/s00190-012-0578-z
- * Addenda: http://geographiclib.sf.net/geod-addenda.html
+ * Addenda: http://geographiclib.sourceforge.net/geod-addenda.html
*
* This file is the concatenation and compression of the JavaScript files in
* doc/scripts/GeographicLib in the source tree for GeographicLib.
*
* Copyright (c) Charles Karney (2011-2015) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
- * http://geographiclib.sf.net/
+ * http://geographiclib.sourceforge.net/
*
* Version: @JS_VERSION@
* File inventory:
diff --git a/js/Makefile.in b/js/Makefile.in
index 62163e9..5582fa8 100644
--- a/js/Makefile.in
+++ b/js/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -79,7 +89,6 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
subdir = js
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -87,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/include/GeographicLib/Config-ac.h
CONFIG_CLEAN_FILES =
@@ -111,6 +121,7 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -163,6 +174,7 @@ LTLIBOBJS = @LTLIBOBJS@
LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@
LT_REVISION = @LT_REVISION@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -278,7 +290,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu js/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu js/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -452,6 +463,8 @@ uninstall-am:
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
all: geographiclib.js geographiclib.min.js $(SAMPLES)
diff --git a/js/README.md b/js/README.md
index 4cf5524..d4cc034 100644
--- a/js/README.md
+++ b/js/README.md
@@ -1,9 +1,12 @@
# Geodesic routines from GeographicLib
This library is a JavaScript implementation of the geodesic routines
-from [GeographicLib](http://geographiclib.sf.net). This solves the
+from [GeographicLib](http://geographiclib.sourceforge.net). This solves the
direct and inverse geodesic problems for an ellipsoid of revolution.
+Licensed under the MIT/X11 License; see
+[LICENSE.txt](http://geographiclib.sourceforge.net/html/LICENSE.txt).
+
## Installation
```bash
@@ -20,7 +23,7 @@ var GeographicLib = require("geographiclib");
## Documentation
Full documentation is provided at
-[http://geographiclib.sourceforge.net/1.45/js/](http://geographiclib.sourceforge.net/1.45/js/).
+[http://geographiclib.sourceforge.net/1.46/js/](http://geographiclib.sourceforge.net/1.46/js/).
## Examples
diff --git a/js/doc/1-geodesics.md b/js/doc/1-geodesics.md
index a8cd9e3..d8d5383 100644
--- a/js/doc/1-geodesics.md
+++ b/js/doc/1-geodesics.md
@@ -144,7 +144,7 @@ Vincenty (1975) in the following respects:
Astron. Nachr. **331**(8), 852–861 (2010),
translated by C. F. F. Karney and R. E. Deakin.
* F. R. Helmert,
- {@link http://geographiclib.sf.net/geodesic-papers/helmert80-en.html
+ {@link https://dx.doi.org/10.5281/zenodo.32050
Mathematical and Physical Theories of Higher Geodesy, Vol 1},
(Teubner, Leipzig, 1880), Chaps. 5–7.
* T. Vincenty,
@@ -152,15 +152,21 @@ Vincenty (1975) in the following respects:
Direct and inverse solutions of geodesics on the ellipsoid with
application of nested equations},
Survey Review **23**(176), 88–93 (1975).
-- J. Danielsen,
+* J. Danielsen,
{@link https://dx.doi.org/10.1179/003962689791474267 The area under
the geodesic}, Survey Review **30**(232), 61–66 (1989).
* C. F. F. Karney,
{@link https://dx.doi.org/10.1007/s00190-012-0578-z
Algorithms for geodesics}, J. Geodesy **87**(1) 43–55 (2013);
- {@link http://geographiclib.sf.net/geod-addenda.html addenda}.
-- {@link http://geographiclib.sf.net/geodesic-papers/biblio.html
- An online geodesic bibliography}.
+ {@link http://geographiclib.sourceforge.net/geod-addenda.html addenda}.
+* C. F. F. Karney,
+ {@http://arxiv.org/abs/1102.1215v1
+ Geodesics on an ellipsoid of revolution},
+ Feb. 2011;
+ {@link http://geographiclib.sourceforge.net/geod-addenda.html#geod-errata
+ errata}.
+* {@link http://geographiclib.sourceforge.net/geodesic-papers/biblio.html
+ A geodesic bibliography}.
* The wikipedia page,
{@link https://en.wikipedia.org/wiki/Geodesics_on_an_ellipsoid
Geodesics on an ellipsoid}.
diff --git a/js/doc/2-interface.md b/js/doc/2-interface.md
index 93c1cc2..bf9194b 100644
--- a/js/doc/2-interface.md
+++ b/js/doc/2-interface.md
@@ -48,11 +48,13 @@ length *a12*. The optional output mask parameter, *outmask*, can be
used to tailor which quantities to calculate. In addition, when a
{@link module:GeographicLib/GeodesicLine.GeodesicLine GeodesicLine} is
constructed it can be provided with the optional capabilities parameter,
-*caps*.
+*caps*, which specifies what quantities can be returned from the
+resulting object.
Both *outmask* and *caps* are obtained by or'ing together the following
values
* Geodesic.NONE, no capabilities, no output;
+* Geodesic.ARC, compute arc length, *a12*; this is always implicitly set;
* Geodesic.LATITUDE, compute latitude, *lat2*;
* Geodesic.LONGITUDE, compute longitude, *lon2*;
* Geodesic.AZIMUTH, compute azimuths, *azi1* and *azi2*;
@@ -69,25 +71,29 @@ Geodesic.DISTANCE_IN is a capability provided to the
{@link module:GeographicLib/GeodesicLine.GeodesicLine GeodesicLine}
constructor. It allows the position on the line to specified in terms
of distance. (Without this, the position can only be specified in terms
-of the arc length.)
+of the arc length.) This only makes sense in the *caps* parameter.
Geodesic.LONG_UNROLL controls the treatment of longitude. If it is not
set then the *lon1* and *lon2* fields are both reduced to the range
[−180°, 180°). If it is set, then *lon1* is as given in
the function call and (*lon2* − *lon1*) determines how many times
-and in what sense the geodesic has encircled the ellipsoid.
+and in what sense the geodesic has encircled the ellipsoid. This only
+makes sense in the *outmask* parameter.
+
+Note that *a12* is always included in the result.
### <a name="restrict"></a>Restrictions on the parameters
-* Latitudes must lie in [−90°, 90°]. Latitudes outside of
+* Latitudes must lie in [−90°, 90°]. Latitudes outside
this range are replaced by NaNs.
* The distance *s12* is unrestricted. This allows geodesics to wrap
around the ellipsoid. Such geodesics are no longer shortest paths.
However they retain the property that they are the straightest curves
on the surface.
* Similarly, the spherical arc length *a12* is unrestricted.
-* Azimuths are unrestricted; internally these are exactly reduced to
- the range [−180°, 180°).
+* Longitudes and azimuths are unrestricted; internally these are exactly
+ reduced to the range [−180°, 180°); but see also the
+ LONG_UNROLL bit.
* The equatorial radius *a* and the polar semi-axis *b* must both be
positive and finite (this implies that −∞ < *f* < 1).
* The flattening *f* should satisfy *f* ∈ [−1/50,1/50] in
@@ -108,4 +114,4 @@ ellipsoid and different values of the flattening.
| 0.1 | 1.5 mm
| 0.2 | 300 mm
-Here 1 nm (nanometer) = 10<sup>−9</sup> m (*not* nautical mile!)
+Here 1 nm = 1 nanometer = 10<sup>−9</sup> m (*not* 1 nautical mile!)
diff --git a/js/doc/3-examples.md b/js/doc/3-examples.md
index 42bbf5b..70258c0 100644
--- a/js/doc/3-examples.md
+++ b/js/doc/3-examples.md
@@ -51,18 +51,18 @@ redundant white space; this is appropriate for web applications.
Load geographiclib.min.js with
```html
<script type="text/javascript"
- src="http://geographiclib.sf.net/scripts/geographiclib.min.js">
+ src="http://geographiclib.sourceforge.net/scripts/geographiclib.min.js">
</script>
```
This uses the latest version. If you want use a specific version, load
with, for example,
```html
<script type="text/javascript"
- src="http://geographiclib.sf.net/scripts/geographiclib-1.45.min.js">
+ src="http://geographiclib.sourceforge.net/scripts/geographiclib-1.45.min.js">
</script>
```
Browse
-[http://geographiclib.sf.net/scripts](http://geographiclib.sf.net/scripts)
+[http://geographiclib.sourceforge.net/scripts](http://geographiclib.sourceforge.net/scripts)
to see what versions are available.
#### Loading geographiclib.min.js with AMD
@@ -152,18 +152,17 @@ console.log("The area is " + r.S12.toFixed(1) + " m^2");
Consider the geodesic between Beijing Airport (40.1N, 116.6E) and San
Fransisco Airport (37.6N, 122.4W). Compute waypoints and azimuths at
intervals of 1000 km using
-{@link module:GeographicLib/Geodesic.Geodesic#Line
-Geodesic.Line} and
+{@link module:GeographicLib/Geodesic.Geodesic#InverseLine
+Geodesic.InverseLine} and
{@link module:GeographicLib/GeodesicLine.GeodesicLine#Position
GeodesicLine.Position}:
```javascript
-var r = geod.Inverse(40.1, 116.6, 37.6, -122.4),
- l = geod.Line(r.lat1, r.lon1, r.azi1),
- s12 = r.s12; ds = 1000e3, n = Math.ceil(s12 / ds),
+var l = geod.InverseLine(40.1, 116.6, 37.6, -122.4),
+ n = Math.ceil(l.s13 / ds),
i, s;
console.log("distance latitude longitude azimuth");
for (i = 0; i <= n; ++i) {
- s = Math.min(ds * i, s12);
+ s = Math.min(ds * i, l.s13);
r = l.Position(s, Geodesic.STANDARD | Geodesic.LONG_UNROLL);
console.log(r.s12.toFixed(0) + " " + r.lat2.toFixed(5) + " " +
r.lon2.toFixed(5) + " " + r.azi2.toFixed(5));
@@ -198,12 +197,11 @@ GeodesicLine.ArcPosition} instead of the distance. Here the spacing is
about 1° of arc which means that the distance between the waypoints
will be about 60 NM.
```javascript
-var r = geod.Inverse(40.1, 116.6, 37.6, -122.4, Geodesic.AZIMUTH),
- l = geod.Line(r.lat1, r.lon1, r.azi1,
- Geodesic.LATITUDE | Geodesic.LONGITUDE),
- a12 = r.a12; da = 1, n = Math.ceil(a12 / da),
+var l = geod.InverseLine(40.1, 116.6, 37.6, -122.4,
+ Geodesic.LATITUDE | Geodesic.LONGITUDE),
+ da = 1, n = Math.ceil(l.a13 / da),
i, a;
-da = a12 / n;
+da = l.a13 / n;
console.log("latitude longitude");
for (i = 0; i <= n; ++i) {
a = da * i;
diff --git a/js/package.json b/js/package.json
index cd0a774..5441399 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
{
"name": "geographiclib",
- "version": "1.45.0",
+ "version": "1.46.0",
"description":
"JavaScript implementation of geodesic routines in GeographicLib",
"main": "geographiclib.js",
@@ -9,9 +9,9 @@
},
"repository": {
"type": "git",
- "url": "git://git.code.sf.net/p/geographiclib/code geographiclib-code"
+ "url": "git://git.code.sourceforge.net/p/geographiclib/code"
},
- "url": "https://geographiclib.sf.net",
+ "url": "https://geographiclib.sourceforge.net",
"keywords": [
"geodesics",
"geometry",
diff --git a/js/samples/geod-calc.html b/js/samples/geod-calc.html
index bb61d79..b28aff3 100644
--- a/js/samples/geod-calc.html
+++ b/js/samples/geod-calc.html
@@ -22,13 +22,12 @@
online calculator,
WGS84 ellipsoid,
GeographicLib" />
- <meta http-equiv="Content-Type"
- content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<!--
Full URL for latest version of geographiclib.min.js is
- http://geographiclib.sf.net/scripts/geographiclib.min.js
+ http://geographiclib.sourceforge.net/scripts/geographiclib.min.js
URL for a specific version is, for example,
- http://geographiclib.sf.net/scripts/geographiclib-1.45.min.js
+ http://geographiclib.sourceforge.net/scripts/geographiclib-1.45.min.js
-->
<script type="text/javascript" src="geographiclib.min.js">
</script>
@@ -252,7 +251,7 @@ function GeodesicArea(input, polyline) {
<a href="https://dx.doi.org/10.1007/s00190-012-0578-z">
10.1007/s00190-012-0578-z</a>
(<a href="https://dx.doi.org/10.1007/s00190-012-0578-z">pdf</a>);
- addenda: <a href="http://geographiclib.sf.net/geod-addenda.html">
+ addenda: <a href="http://geographiclib.sourceforge.net/geod-addenda.html">
geod-addenda.html</a>.
</blockquote>
This page just provides a basic interface. Enter latitudes,
@@ -265,9 +264,9 @@ function GeodesicArea(input, polyline) {
areas). A slicker page where the geodesics are incorporated into
Google Maps is given <a href="geod-google.html">here</a>. Basic
online tools which provide similar capabilities are
- <a href="http://geographiclib.sf.net/cgi-bin/GeodSolve">GeodSolve</a>
+ <a href="http://geographiclib.sourceforge.net/cgi-bin/GeodSolve">GeodSolve</a>
and
- <a href="http://geographiclib.sf.net/cgi-bin/Planimeter">Planimeter</a>;
+ <a href="http://geographiclib.sourceforge.net/cgi-bin/Planimeter">Planimeter</a>;
these call a C++ backend. This page uses version
<script type="text/javascript">
document.write(GeographicLib.Constants.version_string);
@@ -291,7 +290,7 @@ function GeodesicArea(input, polyline) {
Find the shortest path between two points on the earth. The
path is characterized by its length <i>s12</i> and its azimuth
at the two ends <i>azi1</i> and <i>azi2</i>. See
- <a href="http://geographiclib.sf.net/html/GeodSolve.1.html">
+ <a href="http://geographiclib.sourceforge.net/html/GeodSolve.1.html">
GeodSolve(1)</a>
for the definition of the
quantities <i>a12</i>, <i>m12</i>, <i>M12</i>, <i>M21</i>,
@@ -380,7 +379,7 @@ function GeodesicArea(input, polyline) {
with a given azimuth at the starting point. The destination is
characterized by its position <i>lat2, lon2</i> and its azimuth
at the destination <i>azi2</i>. See
- <a href="http://geographiclib.sf.net/html/GeodSolve.1.html">
+ <a href="http://geographiclib.sourceforge.net/html/GeodSolve.1.html">
GeodSolve(1)</a>
for the definition of the
quantities <i>a12</i>, <i>m12</i>, <i>M12</i>, <i>M21</i>,
@@ -590,6 +589,6 @@ function GeodesicArea(input, polyline) {
<a href="mailto:charles at karney.com"><charles at karney.com></a>
(2015-08-12)</address>
<br>
- <a href="http://geographiclib.sf.net">Geographiclib Sourceforge</a>
+ <a href="http://geographiclib.sourceforge.net">Geographiclib Sourceforge</a>
</body>
</html>
diff --git a/js/samples/geod-google-instructions.html b/js/samples/geod-google-instructions.html
index bbbf1ae..46a25e3 100644
--- a/js/samples/geod-google-instructions.html
+++ b/js/samples/geod-google-instructions.html
@@ -25,8 +25,7 @@
Google Maps,
WGS84 ellipsoid,
GeographicLib" />
- <meta http-equiv="Content-Type"
- content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
</head>
<body>
<h2>
@@ -85,9 +84,9 @@
output and choose between decimal degrees and degress, minutes,
and seconds. Basic online tools which provide similar capabilities
are
- <a href="http://geographiclib.sf.net/cgi-bin/GeodSolve">GeodSolve</a>
+ <a href="http://geographiclib.sourceforge.net/cgi-bin/GeodSolve">GeodSolve</a>
and
- <a href="http://geographiclib.sf.net/cgi-bin/Planimeter">Planimeter</a>;
+ <a href="http://geographiclib.sourceforge.net/cgi-bin/Planimeter">Planimeter</a>;
these call a C++ backend.
</p>
<p>
@@ -106,7 +105,7 @@
<a href="https://dx.doi.org/10.1007/s00190-012-0578-z">
10.1007/s00190-012-0578-z</a>
(<a href="https://dx.doi.org/10.1007/s00190-012-0578-z">pdf</a>);<br>
- addenda: <a href="http://geographiclib.sf.net/geod-addenda.html">
+ addenda: <a href="http://geographiclib.sourceforge.net/geod-addenda.html">
geod-addenda.html</a>.
</blockquote>
In putting together this Google Maps demonstration, I started with
@@ -119,6 +118,6 @@
<a href="mailto:charles at karney.com"><charles at karney.com></a>
(2011-08-02)</address>
<br>
- <a href="http://geographiclib.sf.net">Geographiclib Sourceforge</a>
+ <a href="http://geographiclib.sourceforge.net">Geographiclib Sourceforge</a>
</body>
</html>
diff --git a/js/samples/geod-google.html b/js/samples/geod-google.html
index 3c0be63..bd7408a 100644
--- a/js/samples/geod-google.html
+++ b/js/samples/geod-google.html
@@ -2,7 +2,6 @@
<html>
<head>
<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
- <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
<title>Geodesic lines, circles, envelopes in Google Maps</title>
<meta name="description"
content="Geodesic lines, circles, envelopes in Google Maps" />
@@ -24,8 +23,7 @@
Google Maps,
WGS84 ellipsoid,
GeographicLib" />
- <meta http-equiv="Content-Type"
- content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<style>
html, body, #map-canvas {
height: 100%;
@@ -35,9 +33,9 @@
</style>
<!--
Full URL for latest version of geographiclib.min.js is
- http://geographiclib.sf.net/scripts/geographiclib.min.js
+ http://geographiclib.sourceforge.net/scripts/geographiclib.min.js
URL for a specific version is, for example,
- http://geographiclib.sf.net/scripts/geographiclib-1.45.min.js
+ http://geographiclib.sourceforge.net/scripts/geographiclib-1.45.min.js
-->
<script type="text/javascript" src="geographiclib.min.js">
</script>
diff --git a/js/src/DMS.js b/js/src/DMS.js
index a87382e..3b8864d 100644
--- a/js/src/DMS.js
+++ b/js/src/DMS.js
@@ -32,9 +32,8 @@ GeographicLib.DMS = {};
* - SECOND.
*/
d) {
- "use strict";
- var lookup, zerofill, InternalDecode, NumMatch,
+ var lookup, zerofill, internalDecode, numMatch,
hemispheres_ = "SNWE",
signs_ = "-+",
digits_ = "0123456789",
@@ -101,7 +100,7 @@ GeographicLib.DMS = {};
if (mi < 0) mi = end; else mi += pa;
if (pi < 0) pi = end; else pi += pa;
pb = Math.min(mi, pi);
- vals = InternalDecode(dmsa.substr(p, pb - p));
+ vals = internalDecode(dmsa.substr(p, pb - p));
v += vals.val; ind2 = vals.ind;
if (ind1 == d.NONE)
ind1 = ind2;
@@ -114,7 +113,7 @@ GeographicLib.DMS = {};
return {val: v, ind: ind1};
};
- InternalDecode = function(dmsa) {
+ internalDecode = function(dmsa) {
var vals = {}, errormsg = "",
sign, beg, end, ind1, k,
ipieces, fpieces, npiece,
@@ -279,7 +278,7 @@ GeographicLib.DMS = {};
( fpieces[1] ? (60*fpieces[0] + fpieces[1]) / 60 : fpieces[0] ) );
return vals;
} while (false);
- vals.val = NumMatch(dmsa);
+ vals.val = numMatch(dmsa);
if (vals.val === 0)
throw new Error(errormsg);
else
@@ -287,7 +286,7 @@ GeographicLib.DMS = {};
return vals;
};
- NumMatch = function(s) {
+ numMatch = function(s) {
var t, sign, p0, p1;
if (s.length < 3)
return 0;
diff --git a/js/src/Geodesic.js b/js/src/Geodesic.js
index 927adc7..8616c02 100644
--- a/js/src/Geodesic.js
+++ b/js/src/Geodesic.js
@@ -10,9 +10,9 @@
* Charles F. F. Karney,
* Algorithms for geodesics, J. Geodesy 87, 43-55 (2013);
* https://dx.doi.org/10.1007/s00190-012-0578-z
- * Addenda: http://geographiclib.sf.net/geod-addenda.html
+ * Addenda: http://geographiclib.sourceforge.net/geod-addenda.html
*
- * Copyright (c) Charles Karney (2011-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2011-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
*/
@@ -30,7 +30,6 @@ GeographicLib.PolygonArea = {};
* {@link module:GeographicLib/Geodesic.Geodesic Geodesic} class.
*/
g, l, p, m, c) {
- "use strict";
var GEOGRAPHICLIB_GEODESIC_ORDER = 6,
nA1_ = GEOGRAPHICLIB_GEODESIC_ORDER,
@@ -49,7 +48,7 @@ GeographicLib.PolygonArea = {};
CAP_ALL = 0x1F,
CAP_MASK = CAP_ALL,
OUT_ALL = 0x7F80,
- Astroid,
+ astroid,
A1m1f_coeff, C1f_coeff, C1pf_coeff,
A2m1f_coeff, C2f_coeff,
A3_coeff, C3_coeff, C4_coeff;
@@ -61,7 +60,7 @@ GeographicLib.PolygonArea = {};
g.nC3_ = GEOGRAPHICLIB_GEODESIC_ORDER;
g.nC4_ = GEOGRAPHICLIB_GEODESIC_ORDER;
nC3x_ = (g.nC3_ * (g.nC3_ - 1)) / 2;
- nC4x_ = (g.nC4_ * (g.nC4_ + 1)) / 2,
+ nC4x_ = (g.nC4_ * (g.nC4_ + 1)) / 2;
g.CAP_C1 = 1<<0;
g.CAP_C1p = 1<<1;
g.CAP_C2 = 1<<2;
@@ -69,6 +68,7 @@ GeographicLib.PolygonArea = {};
g.CAP_C4 = 1<<4;
g.NONE = 0;
+ g.ARC = 1<<6;
g.LATITUDE = 1<<7 | CAP_NONE;
g.LONGITUDE = 1<<8 | g.CAP_C3;
g.AZIMUTH = 1<<9 | CAP_NONE;
@@ -103,7 +103,7 @@ GeographicLib.PolygonArea = {};
cosx * (y0 - y1)); // cos(x) * (y0 - y1)
};
- Astroid = function(x, y) {
+ astroid = function(x, y) {
// Solve k^4+2*k^3-(x^2+y^2-1)*k^2-2*y^2*k-y^2 = 0 for positive
// root k. This solution is adapted from Geocentric::Reverse.
var k,
@@ -116,7 +116,7 @@ GeographicLib.PolygonArea = {};
// equations for s and t by r^3 and r, resp.
S = p * q / 4; // S = r^3 * s
r2 = m.sq(r);
- r3 = r * r2
+ r3 = r * r2;
// The discriminant of the quadratic equation for T3. This is
// zero on the evolute curve p^(1/3)+q^(1/3) = 1
disc = S * (S + 2 * r3);
@@ -157,7 +157,7 @@ GeographicLib.PolygonArea = {};
A1m1f_coeff = [
// (1-eps)*A1-1, polynomial in eps2 of order 3
- +1, 4, 64, 0, 256,
+ +1, 4, 64, 0, 256
];
// The scale factor A1-1 = mean value of (d/dsigma)I1 - 1
@@ -179,7 +179,7 @@ GeographicLib.PolygonArea = {};
// C1[5]/eps^5, polynomial in eps2 of order 0
-7, 1280,
// C1[6]/eps^6, polynomial in eps2 of order 0
- -7, 2048,
+ -7, 2048
];
// The coefficients C1[l] in the Fourier expansion of B1
@@ -208,7 +208,7 @@ GeographicLib.PolygonArea = {};
// C1p[5]/eps^5, polynomial in eps2 of order 0
+3467, 7680,
// C1p[6]/eps^6, polynomial in eps2 of order 0
- +38081, 61440,
+ +38081, 61440
];
// The coefficients C1p[l] in the Fourier expansion of B1p
@@ -227,7 +227,7 @@ GeographicLib.PolygonArea = {};
A2m1f_coeff = [
// (eps+1)*A2-1, polynomial in eps2 of order 3
- -11, -28, -192, 0, 256,
+ -11, -28, -192, 0, 256
];
// The scale factor A2-1 = mean value of (d/dsigma)I2 - 1
@@ -249,7 +249,7 @@ GeographicLib.PolygonArea = {};
// C2[5]/eps^5, polynomial in eps2 of order 0
+63, 1280,
// C2[6]/eps^6, polynomial in eps2 of order 0
- +77, 2048,
+ +77, 2048
];
// The coefficients C2[l] in the Fourier expansion of B2
@@ -340,7 +340,7 @@ GeographicLib.PolygonArea = {};
// A3, coeff of eps^1, polynomial in n of order 1
+1, -1, 2,
// A3, coeff of eps^0, polynomial in n of order 0
- +1, 1,
+ +1, 1
];
// The scale factor A3 = mean value of (d/dsigma)I3
@@ -349,8 +349,8 @@ GeographicLib.PolygonArea = {};
j, p;
for (j = nA3_ - 1; j >= 0; --j) { // coeff of eps^j
p = Math.min(nA3_ - j - 1, j); // order of polynomial in n
- this._A3x[k++] = m.polyval(p, A3_coeff, o, this._n)
- / A3_coeff[o + p + 1];
+ this._A3x[k++] = m.polyval(p, A3_coeff, o, this._n) /
+ A3_coeff[o + p + 1];
o += p + 2;
}
};
@@ -385,7 +385,7 @@ GeographicLib.PolygonArea = {};
// C3[4], coeff of eps^4, polynomial in n of order 1
-14, 7, 512,
// C3[5], coeff of eps^5, polynomial in n of order 0
- +21, 2560,
+ +21, 2560
];
// The coefficients C3[l] in the Fourier expansion of B3
@@ -444,7 +444,7 @@ GeographicLib.PolygonArea = {};
// C4[4], coeff of eps^4, polynomial in n of order 1
-2560, 832, 405405,
// C4[5], coeff of eps^5, polynomial in n of order 0
- +128, 99099,
+ +128, 99099
];
g.Geodesic.prototype.C4coeff = function() {
@@ -453,8 +453,8 @@ GeographicLib.PolygonArea = {};
for (l = 0; l < g.nC4_; ++l) { // l is index of C4[l]
for (j = g.nC4_ - 1; j >= l; --j) { // coeff of eps^j
p = g.nC4_ - j - 1; // order of polynomial in n
- this._C4x[k++] = m.polyval(p, C4_coeff, o, this._n)
- / C4_coeff[o + p + 1];
+ this._C4x[k++] = m.polyval(p, C4_coeff, o, this._n) /
+ C4_coeff[o + p + 1];
o += p + 2;
}
}
@@ -552,7 +552,8 @@ GeographicLib.PolygonArea = {};
// return sig12, salp1, calp1, salp2, calp2, dnm
g.Geodesic.prototype.InverseStart = function(sbet1, cbet1, dn1,
- sbet2, cbet2, dn2, lam12,
+ sbet2, cbet2, dn2,
+ lam12, slam12, clam12,
C1a, C2a) {
// Return a starting point for Newton's method in salp1 and calp1
// (function value is -1). If Newton's method doesn't need to be
@@ -564,7 +565,7 @@ GeographicLib.PolygonArea = {};
cbet12 = cbet2 * cbet1 + sbet2 * sbet1,
sbet12a, shortline, omg12, sbetm2, somg12, comg12, t, ssig12, csig12,
x, y, lamscale, betscale, k2, eps, cbet12a, bet12a, m12b, m0, nvals,
- k, omg12a;
+ k, omg12a, lam12x;
vals.sig12 = -1; // Return value
// Volatile declaration needed to fix inverse cases
// 88.202499451857 0 -88.202499451857 179.981022032992859592
@@ -575,16 +576,17 @@ GeographicLib.PolygonArea = {};
sbet12a += cbet2 * sbet1;
shortline = cbet12 >= 0 && sbet12 < 0.5 && cbet2 * lam12 < 0.5;
- omg12 = lam12;
if (shortline) {
sbetm2 = m.sq(sbet1 + sbet2);
// sin((bet1+bet2)/2)^2
// = (sbet1 + sbet2)^2 / ((sbet1 + sbet2)^2 + (cbet1 + cbet2)^2)
sbetm2 /= sbetm2 + m.sq(cbet1 + cbet2);
vals.dnm = Math.sqrt(1 + this._ep2 * sbetm2);
- omg12 /= this._f1 * vals.dnm;
+ omg12 = lam12 / (this._f1 * vals.dnm);
+ somg12 = Math.sin(omg12); comg12 = Math.cos(omg12);
+ } else {
+ somg12 = slam12; comg12 = clam12;
}
- somg12 = Math.sin(omg12); comg12 = Math.cos(omg12);
vals.salp1 = cbet2 * somg12;
vals.calp1 = comg12 >= 0 ?
@@ -593,7 +595,6 @@ GeographicLib.PolygonArea = {};
ssig12 = m.hypot(vals.salp1, vals.calp1);
csig12 = sbet1 * sbet2 + cbet1 * cbet2 * comg12;
-
if (shortline && ssig12 < this._etol2) {
// really short lines
vals.salp2 = cbet1 * somg12;
@@ -610,6 +611,7 @@ GeographicLib.PolygonArea = {};
} else {
// Scale lam12 and bet2 to x, y coordinate system where antipodal
// point is at origin and singular point is at y = 0, x = -1.
+ lam12x = Math.atan2(-slam12, -clam12); // lam12 - pi
if (this.f >= 0) { // In fact f == 0 does not get here
// x = dlong, y = dlat
k2 = m.sq(sbet1) * this._ep2;
@@ -617,7 +619,7 @@ GeographicLib.PolygonArea = {};
lamscale = this.f * cbet1 * this.A3f(eps) * Math.PI;
betscale = lamscale * cbet1;
- x = (lam12 - Math.PI) / lamscale;
+ x = lam12x / lamscale;
y = sbet12a / betscale;
} else { // f < 0
// x = dlat, y = dlong
@@ -633,7 +635,7 @@ GeographicLib.PolygonArea = {};
betscale = x < -0.01 ? sbet12a / x :
-this.f * m.sq(cbet1) * Math.PI;
lamscale = betscale / cbet1;
- y = (lam12 - Math.PI) / lamscale;
+ y = lam12 / lamscale;
}
if (y > -tol1_ && x > -1 - xthresh_) {
@@ -680,7 +682,7 @@ GeographicLib.PolygonArea = {};
// 6 56 0
//
// Because omg12 is near pi, estimate work with omg12a = pi - omg12
- k = Astroid(x, y);
+ k = astroid(x, y);
omg12a = lamscale * ( this.f >= 0 ? -x * k/(1 + k) : -y * (1 + k)/k );
somg12 = Math.sin(omg12a); comg12 = -Math.cos(omg12a);
// Update spherical estimate of alp1 using omg12 instead of
@@ -691,7 +693,7 @@ GeographicLib.PolygonArea = {};
}
}
// Sanity check on starting guess. Backwards check allows NaN through.
- if (!(vals.salp1 <= 0)) {
+ if (!(vals.salp1 <= 0.0)) {
// norm(vals.salp1, vals.calp1);
t = m.hypot(vals.salp1, vals.calp1); vals.salp1 /= t; vals.calp1 /= t;
} else {
@@ -703,11 +705,11 @@ GeographicLib.PolygonArea = {};
// return lam12, salp2, calp2, sig12, ssig1, csig1, ssig2, csig2, eps,
// domg12, dlam12,
g.Geodesic.prototype.Lambda12 = function(sbet1, cbet1, dn1, sbet2, cbet2, dn2,
- salp1, calp1, diffp,
- C1a, C2a, C3a) {
+ salp1, calp1, slam120, clam120,
+ diffp, C1a, C2a, C3a) {
var vals = {},
t, salp0, calp0,
- somg1, comg1, somg2, comg2, omg12, B312, h0, k2, nvals;
+ somg1, comg1, somg2, comg2, B312, eta, k2, nvals;
if (sbet1 === 0 && calp1 === 0)
// Break degeneracy of equatorial line. This case has already been
// handled.
@@ -753,17 +755,18 @@ GeographicLib.PolygonArea = {};
vals.csig1 * vals.csig2 + vals.ssig1 * vals.ssig2);
// omg12 = omg2 - omg1, limit to [0, pi]
- omg12 = Math.atan2(Math.max(0, comg1 * somg2 - somg1 * comg2),
- comg1 * comg2 + somg1 * somg2);
+ vals.somg12 = Math.max(0, comg1 * somg2 - somg1 * comg2);
+ vals.comg12 = comg1 * comg2 + somg1 * somg2;
+ // eta = omg12 - lam120
+ eta = Math.atan2(vals.somg12 * clam120 - vals.comg12 * slam120,
+ vals.comg12 * clam120 + vals.somg12 * slam120);
k2 = m.sq(calp0) * this._ep2;
vals.eps = k2 / (2 * (1 + Math.sqrt(1 + k2)) + k2);
this.C3f(vals.eps, C3a);
B312 = (g.SinCosSeries(true, vals.ssig2, vals.csig2, C3a) -
g.SinCosSeries(true, vals.ssig1, vals.csig1, C3a));
- h0 = -this.f * this.A3f(vals.eps);
- vals.domg12 = salp0 * h0 * (vals.sig12 + B312);
- vals.lam12 = omg12 + vals.domg12;
-
+ vals.lam12 = eta - this.f * this.A3f(vals.eps) *
+ salp0 * (vals.sig12 + B312);
if (diffp) {
if (vals.calp2 === 0)
vals.dlam12 = - 2 * this._f1 * dn1 / sbet1;
@@ -792,8 +795,22 @@ GeographicLib.PolygonArea = {};
* 2-interface}, "The outmask and caps parameters".
*/
g.Geodesic.prototype.Inverse = function(lat1, lon1, lat2, lon2, outmask) {
+ var r, vals;
+ if (!outmask) outmask = g.STANDARD;
+ if (outmask === g.LONG_UNROLL) outmask |= g.STANDARD;
+ outmask &= g.OUT_MASK;
+ r = this.InverseInt(lat1, lon1, lat2, lon2, outmask);
+ vals = r.vals;
+ if (outmask & g.AZIMUTH) {
+ vals.azi1 = m.atan2d(r.salp1, r.calp1);
+ vals.azi2 = m.atan2d(r.salp2, r.calp2);
+ }
+ return vals;
+ };
+
+ g.Geodesic.prototype.InverseInt = function(lat1, lon1, lat2, lon2, outmask) {
var vals = {},
- lon12, lonsign, t, swapp, latsign,
+ lon12, lon12s, lonsign, t, swapp, latsign,
sbet1, cbet1, sbet2, cbet2, s12x, m12x,
dn1, dn2, lam12, slam12, clam12,
sig12, calp1, salp1, calp2, salp2, C1a, C2a, C3a, meridian, nvals,
@@ -801,28 +818,29 @@ GeographicLib.PolygonArea = {};
numit, salp1a, calp1a, salp1b, calp1b,
tripn, tripb, v, dv, dalp1, sdalp1, cdalp1, nsalp1,
lengthmask, salp0, calp0, alp12, k2, A4, C4a, B41, B42,
- somg12, domg12, dbet1, dbet2, salp12, calp12;
- if (!outmask) outmask = g.STANDARD;
- if (outmask == g.LONG_UNROLL) outmask |= g.STANDARD;
- outmask &= g.OUT_MASK;
+ somg12, comg12, domg12, dbet1, dbet2, salp12, calp12;
// Compute longitude difference (AngDiff does this carefully). Result is
// in [-180, 180] but -180 is only for west-going geodesics. 180 is for
// east-going and meridional geodesics.
vals.lat1 = lat1 = m.LatFix(lat1); vals.lat2 = lat2 = m.LatFix(lat2);
- lon12 = m.AngDiff(lon1, lon2);
+ // If really close to the equator, treat as on equator.
+ lat1 = m.AngRound(lat1);
+ lat2 = m.AngRound(lat2);
+ lon12 = m.AngDiff(lon1, lon2); lon12s = lon12.t; lon12 = lon12.s;
if (outmask & g.LONG_UNROLL) {
- vals.lon1 = lon1; vals.lon2 = lon1 + lon12;
+ vals.lon1 = lon1; vals.lon2 = (lon1 + lon12) + lon12s;
} else {
vals.lon1 = m.AngNormalize(lon1); vals.lon2 = m.AngNormalize(lon2);
}
- // If very close to being on the same half-meridian, then make it so.
- lon12 = m.AngRound(lon12);
// Make longitude difference positive.
lonsign = lon12 >= 0 ? 1 : -1;
- lon12 *= lonsign;
- // If really close to the equator, treat as on equator.
- lat1 = m.AngRound(lat1);
- lat2 = m.AngRound(lat2);
+ // If very close to being on the same half-meridian, then make it so.
+ lon12 = lonsign * m.AngRound(lon12);
+ lon12s = m.AngRound((180 - lon12) - lonsign * lon12s);
+ lam12 = lon12 * m.degree;
+ t = m.sincosd(lon12 > 90 ? lon12s : lon12);
+ slam12 = t.s; clam12 = (lon12 > 90 ? -1 : 1) * t.c;
+
// Swap points so that point with higher (abs) latitude is point 1
// If one latitude is a nan, then it becomes lat1.
swapp = Math.abs(lat1) < Math.abs(lat2) ? -1 : 1;
@@ -880,12 +898,9 @@ GeographicLib.PolygonArea = {};
dn1 = Math.sqrt(1 + this._ep2 * m.sq(sbet1));
dn2 = Math.sqrt(1 + this._ep2 * m.sq(sbet2));
- lam12 = lon12 * m.degree;
- t = m.sincosd(lon12); slam12 = t.s; clam12 = t.c;
-
// index zero elements of these arrays are unused
C1a = new Array(g.nC1_ + 1);
- C2a = new Array(g.nC2_ + 1)
+ C2a = new Array(g.nC2_ + 1);
C3a = new Array(g.nC3_);
meridian = lat1 === -90 || slam12 === 0;
@@ -934,10 +949,10 @@ GeographicLib.PolygonArea = {};
meridian = false;
}
+ somg12 = 2;
if (!meridian &&
sbet1 === 0 && // and sbet2 == 0
- // Mimic the way Lambda12 works with calp1 = 0
- (this.f <= 0 || lam12 <= Math.PI - this.f * Math.PI)) {
+ (this.f <= 0 || lon12s >= this.f * 180)) {
// Geodesic runs along equator
calp1 = calp2 = 0; salp1 = salp2 = 1;
@@ -954,8 +969,8 @@ GeographicLib.PolygonArea = {};
// meridian and geodesic is neither meridional or equatorial.
// Figure a starting point for Newton's method
- nvals = this.InverseStart(sbet1, cbet1, dn1, sbet2, cbet2, dn2, lam12,
- C1a, C2a);
+ nvals = this.InverseStart(sbet1, cbet1, dn1, sbet2, cbet2, dn2,
+ lam12, slam12, clam12, C1a, C2a);
sig12 = nvals.sig12;
salp1 = nvals.salp1;
calp1 = nvals.calp1;
@@ -992,9 +1007,9 @@ GeographicLib.PolygonArea = {};
// the WGS84 test set: mean = 1.47, sd = 1.25, max = 16
// WGS84 and random input: mean = 2.85, sd = 0.60
nvals = this.Lambda12(sbet1, cbet1, dn1, sbet2, cbet2, dn2,
- salp1, calp1, numit < maxit1_,
+ salp1, calp1, slam12, clam12, numit < maxit1_,
C1a, C2a, C3a);
- v = nvals.lam12 - lam12;
+ v = nvals.lam12;
salp2 = nvals.salp2;
calp2 = nvals.calp2;
sig12 = nvals.sig12;
@@ -1003,12 +1018,13 @@ GeographicLib.PolygonArea = {};
ssig2 = nvals.ssig2;
csig2 = nvals.csig2;
eps = nvals.eps;
- omg12 = nvals.domg12;
+ somg12 = nvals.somg12;
+ comg12 = nvals.comg12;
dv = nvals.dlam12;
// 2 * tol0 is approximately 1 ulp for a number in [0, pi].
// Reversed test to allow escape with NaNs
- if (tripb || !(Math.abs(v) >= (tripn ? 8 : 2) * tol0_))
+ if (tripb || !(Math.abs(v) >= (tripn ? 8 : 1) * tol0_))
break;
// Update bracketing values
if (v > 0 && (numit < maxit1_ || calp1/salp1 > calp1b/salp1b)) {
@@ -1065,7 +1081,6 @@ GeographicLib.PolygonArea = {};
m12x *= this._b;
s12x *= this._b;
vals.a12 = sig12 / m.degree;
- omg12 = lam12 - omg12;
}
}
@@ -1099,14 +1114,20 @@ GeographicLib.PolygonArea = {};
} else
// Avoid problems with indeterminate sig1, sig2 on equator
vals.S12 = 0;
+ if (!meridian) {
+ if (somg12 > 1) {
+ somg12 = Math.sin(omg12); comg12 = Math.cos(omg12);
+ } else {
+ t = m.hypot(somg12, comg12); somg12 /= t; comg12 /= t;
+ }
+ }
if (!meridian &&
- omg12 < 0.75 * Math.PI && // Long difference too big
- sbet2 - sbet1 < 1.75) { // Lat difference too big
+ omg12 > -0.7071 && // Long difference not too big
+ sbet2 - sbet1 < 1.75) { // Lat difference not too big
// Use tan(Gamma/2) = tan(omg12/2)
// * (tan(bet1/2)+tan(bet2/2))/(1+tan(bet1/2)*tan(bet2/2))
// with tan(x/2) = sin(x)/(1+cos(x))
- somg12 = Math.sin(omg12); domg12 = 1 + Math.cos(omg12);
- dbet1 = 1 + cbet1; dbet2 = 1 + cbet2;
+ domg12 = 1 + comg12; dbet1 = 1 + cbet1; dbet2 = 1 + cbet2;
alp12 = 2 * Math.atan2( somg12 * (sbet1*dbet2 + sbet2*dbet1),
domg12 * (sbet1*sbet2 + dbet1*dbet2) );
} else {
@@ -1150,13 +1171,9 @@ GeographicLib.PolygonArea = {};
salp1 *= swapp * lonsign; calp1 *= swapp * latsign;
salp2 *= swapp * lonsign; calp2 *= swapp * latsign;
- if (outmask & g.AZIMUTH) {
- vals.azi1 = m.atan2d(salp1, calp1);
- vals.azi2 = m.atan2d(salp2, calp2);
- }
-
- // Returned value in [0, 180]
- return vals;
+ return {vals: vals,
+ salp1: salp1, calp1: calp1,
+ salp2: salp2, calp2: calp2};
};
/**
@@ -1177,13 +1194,11 @@ GeographicLib.PolygonArea = {};
g.Geodesic.prototype.GenDirect = function (lat1, lon1, azi1,
arcmode, s12_a12, outmask) {
var line;
- if (!outmask)
- outmask = g.STANDARD;
- else if (outmask == g.LONG_UNROLL)
- outmask |= g.STANDARD;
- line = new l.GeodesicLine(this, lat1, lon1, azi1,
+ if (!outmask) outmask = g.STANDARD;
+ else if (outmask === g.LONG_UNROLL) outmask |= g.STANDARD;
// Automatically supply DISTANCE_IN if necessary
- outmask | (arcmode ? g.NONE : g.DISTANCE_IN));
+ if (!arcmode) outmask |= g.DISTANCE_IN;
+ line = new l.GeodesicLine(this, lat1, lon1, azi1, outmask);
return line.GenPosition(arcmode, s12_a12, outmask);
};
@@ -1241,6 +1256,117 @@ GeographicLib.PolygonArea = {};
};
/**
+ * @summary Define a {@link module:GeographicLib/GeodesicLine.GeodesicLine
+ * GeodesicLine} in terms of the direct geodesic problem specified in terms
+ * of distance.
+ * @param {number} lat1 the latitude of the first point in degrees.
+ * @param {number} lon1 the longitude of the first point in degrees.
+ * @param {number} azi1 the azimuth at the first point in degrees.
+ * degrees.
+ * @param {number} s12 the distance between point 1 and point 2 (meters); it
+ * can be negative.
+ * @param {bitmask} [caps = STANDARD | DISTANCE_IN] which capabilities to
+ * include.
+ * @returns {object} the
+ * {@link module:GeographicLib/GeodesicLine.GeodesicLine
+ * GeodesicLine} object
+ * @description This function sets point 3 of the GeodesicLine to correspond
+ * to point 2 of the direct geodesic problem. For details on the caps
+ * parameter, see {@tutorial 2-interface}, "The outmask and caps
+ * parameters".
+ */
+ g.Geodesic.prototype.DirectLine = function (lat1, lon1, azi1, s12, caps) {
+ return this.GenDirectLine(lat1, lon1, azi1, false, s12, caps);
+ };
+
+ /**
+ * @summary Define a {@link module:GeographicLib/GeodesicLine.GeodesicLine
+ * GeodesicLine} in terms of the direct geodesic problem specified in terms
+ * of arc length.
+ * @param {number} lat1 the latitude of the first point in degrees.
+ * @param {number} lon1 the longitude of the first point in degrees.
+ * @param {number} azi1 the azimuth at the first point in degrees.
+ * degrees.
+ * @param {number} a12 the arc length between point 1 and point 2 (degrees);
+ * it can be negative.
+ * @param {bitmask} [caps = STANDARD | DISTANCE_IN] which capabilities to
+ * include.
+ * @returns {object} the
+ * {@link module:GeographicLib/GeodesicLine.GeodesicLine
+ * GeodesicLine} object
+ * @description This function sets point 3 of the GeodesicLine to correspond
+ * to point 2 of the direct geodesic problem. For details on the caps
+ * parameter, see {@tutorial 2-interface}, "The outmask and caps
+ * parameters".
+ */
+ g.Geodesic.prototype.ArcDirectLine = function (lat1, lon1, azi1, a12, caps) {
+ return this.GenDirectLine(lat1, lon1, azi1, true, a12, caps);
+ };
+
+ /**
+ * @summary Define a {@link module:GeographicLib/GeodesicLine.GeodesicLine
+ * GeodesicLine} in terms of the direct geodesic problem specified in terms
+ * of either distance or arc length.
+ * @param {number} lat1 the latitude of the first point in degrees.
+ * @param {number} lon1 the longitude of the first point in degrees.
+ * @param {number} azi1 the azimuth at the first point in degrees.
+ * degrees.
+ * @param {bool} arcmode boolean flag determining the meaning of the
+ * s12_a12.
+ * @param {number} s12_a12 if arcmode is false, this is the distance between
+ * point 1 and point 2 (meters); otherwise it is the arc length between
+ * point 1 and point 2 (degrees); it can be negative.
+ * @param {bitmask} [caps = STANDARD | DISTANCE_IN] which capabilities to
+ * include.
+ * @returns {object} the
+ * {@link module:GeographicLib/GeodesicLine.GeodesicLine
+ * GeodesicLine} object
+ * @description This function sets point 3 of the GeodesicLine to correspond
+ * to point 2 of the direct geodesic problem. For details on the caps
+ * parameter, see {@tutorial 2-interface}, "The outmask and caps
+ * parameters".
+ */
+ g.Geodesic.prototype.GenDirectLine = function (lat1, lon1, azi1,
+ arcmode, s12_a12, caps) {
+ var t;
+ if (!caps) caps = g.STANDARD | g.DISTANCE_IN;
+ // Automatically supply DISTANCE_IN if necessary
+ if (!arcmode) caps |= g.DISTANCE_IN;
+ t = new l.GeodesicLine(this, lat1, lon1, azi1, caps);
+ t.GenSetDistance(arcmode, s12_a12);
+ return t;
+ };
+
+ /**
+ * @summary Define a {@link module:GeographicLib/GeodesicLine.GeodesicLine
+ * GeodesicLine} in terms of the inverse geodesic problem.
+ * @param {number} lat1 the latitude of the first point in degrees.
+ * @param {number} lon1 the longitude of the first point in degrees.
+ * @param {number} lat2 the latitude of the second point in degrees.
+ * @param {number} lon2 the longitude of the second point in degrees.
+ * @param {bitmask} [caps = STANDARD | DISTANCE_IN] which capabilities to
+ * include.
+ * @returns {object} the
+ * {@link module:GeographicLib/GeodesicLine.GeodesicLine
+ * GeodesicLine} object
+ * @description This function sets point 3 of the GeodesicLine to correspond
+ * to point 2 of the inverse geodesic problem. For details on the caps
+ * parameter, see {@tutorial 2-interface}, "The outmask and caps
+ * parameters".
+ */
+ g.Geodesic.prototype.InverseLine = function (lat1, lon1, lat2, lon2, caps) {
+ var r, t, azi1;
+ if (!caps) caps = g.STANDARD | g.DISTANCE_IN;
+ r = this.InverseInt(lat1, lon1, lat2, lon2, g.ARC);
+ azi1 = m.atan2d(r.salp1, r.calp1);
+ // Ensure that a12 can be converted to a distance
+ if (caps & (g.OUT_MASK & g.DISTANCE_IN)) caps |= g.DISTANCE;
+ t = new l.GeodesicLine(this, lat1, lon1, azi1, caps, r.salp1, r.calp1);
+ t.SetArc(r.vals.a12);
+ return t;
+ };
+
+ /**
* @summary Create a {@link module:GeographicLib/PolygonArea.PolygonArea
* PolygonArea} object.
* @param {bool} [polyline = false] if true the new PolygonArea object
diff --git a/js/src/GeodesicLine.js b/js/src/GeodesicLine.js
index 3dd11dc..6cfaad9 100644
--- a/js/src/GeodesicLine.js
+++ b/js/src/GeodesicLine.js
@@ -10,9 +10,9 @@
* Charles F. F. Karney,
* Algorithms for geodesics, J. Geodesy 87, 43-55 (2013);
* https://dx.doi.org/10.1007/s00190-012-0578-z
- * Addenda: http://geographiclib.sf.net/geod-addenda.html
+ * Addenda: http://geographiclib.sourceforge.net/geod-addenda.html
*
- * Copyright (c) Charles Karney (2011-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2011-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
*/
@@ -28,7 +28,6 @@
* class.
*/
l, m) {
- "use strict";
/**
* @class
@@ -37,6 +36,10 @@
* @property {number} lat1 the initial latitude (degrees).
* @property {number} lon1 the initial longitude (degrees).
* @property {number} azi1 the initial azimuth (degrees).
+ * @property {number} salp1 the sine of the azimuth at the first point.
+ * @property {number} calp1 the cosine the azimuth at the first point.
+ * @property {number} s13 the distance to point 3 (meters).
+ * @property {number} a13 the arc length to point 3 (degrees).
* @property {bitmask} caps the capabilities of the object.
* @summary Initialize a GeodesicLine object. For details on the caps
* parameter, see {@tutorial 2-interface}, "The outmask and caps
@@ -44,6 +47,12 @@
* @classdesc Performs geodesic calculations along a given geodesic line.
* This object is usually instantiated by
* {@link module:GeographicLib/Geodesic.Geodesic#Line Geodesic.Line}.
+ * The methods
+ * {@link module:GeographicLib/Geodesic.Geodesic#DirectLine
+ * Geodesic.DirectLine} and
+ * {@link module:GeographicLib/Geodesic.Geodesic#InverseLine
+ * Geodesic.InverseLine} set in addition the position of a reference point
+ * 3.
* @param {object} geod a {@link module:GeographicLib/Geodesic.Geodesic
* Geodesic} object.
* @param {number} lat1 the latitude of the first point in degrees.
@@ -52,7 +61,7 @@
* @param {bitmask} [caps = STANDARD | DISTANCE_IN] which capabilities to
* include; LATITUDE | AZIMUTH are always included.
*/
- l.GeodesicLine = function(geod, lat1, lon1, azi1, caps) {
+ l.GeodesicLine = function(geod, lat1, lon1, azi1, caps, salp1, calp1) {
var t, cbet1, sbet1, eps, s, c;
if (!caps) caps = g.STANDARD | g.DISTANCE_IN;
@@ -61,13 +70,16 @@
this._b = geod._b;
this._c2 = geod._c2;
this._f1 = geod._f1;
- this._caps = (!caps ? g.ALL : (caps | g.LATITUDE | g.AZIMUTH)) |
- g.LONG_UNROLL;
+ this.caps = caps | g.LATITUDE | g.AZIMUTH | g.LONG_UNROLL;
this.lat1 = m.LatFix(lat1);
this.lon1 = lon1;
- this.azi1 = m.AngNormalize(azi1);
- t = m.sincosd(m.AngRound(this.azi1)); this._salp1 = t.s; this._calp1 = t.c;
+ if (typeof salp1 === 'undefined' || typeof calp1 === 'undefined') {
+ this.azi1 = m.AngNormalize(azi1);
+ t = m.sincosd(m.AngRound(this.azi1)); this.salp1 = t.s; this.calp1 = t.c;
+ } else {
+ this.azi1 = azi1; this.salp1 = salp1; this.calp1 = calp1;
+ }
t = m.sincosd(m.AngRound(this.lat1)); sbet1 = this._f1 * t.s; cbet1 = t.c;
// norm(sbet1, cbet1);
t = m.hypot(sbet1, cbet1); sbet1 /= t; cbet1 /= t;
@@ -76,10 +88,10 @@
this._dn1 = Math.sqrt(1 + geod._ep2 * m.sq(sbet1));
// Evaluate alp0 from sin(alp1) * cos(bet1) = sin(alp0),
- this._salp0 = this._salp1 * cbet1; // alp0 in [0, pi/2 - |bet1|]
+ this._salp0 = this.salp1 * cbet1; // alp0 in [0, pi/2 - |bet1|]
// Alt: calp0 = hypot(sbet1, calp1 * cbet1). The following
// is slightly better (consider the case salp1 = 0).
- this._calp0 = m.hypot(this._calp1, this._salp1 * sbet1);
+ this._calp0 = m.hypot(this.calp1, this.salp1 * sbet1);
// Evaluate sig with tan(bet1) = tan(sig1) * cos(alp1).
// sig = 0 is nearest northward crossing of equator.
// With bet1 = 0, alp1 = pi/2, we have sig1 = 0 (equatorial line).
@@ -91,7 +103,7 @@
// With alp0 = 0, omg1 = 0 for alp1 = 0, omg1 = pi for alp1 = pi.
this._ssig1 = sbet1; this._somg1 = this._salp0 * sbet1;
this._csig1 = this._comg1 =
- sbet1 !== 0 || this._calp1 !== 0 ? cbet1 * this._calp1 : 1;
+ sbet1 !== 0 || this.calp1 !== 0 ? cbet1 * this.calp1 : 1;
// norm(this._ssig1, this._csig1); // sig1 in (-pi, pi]
t = m.hypot(this._ssig1, this._csig1);
this._ssig1 /= t; this._csig1 /= t;
@@ -100,7 +112,7 @@
this._k2 = m.sq(this._calp0) * geod._ep2;
eps = this._k2 / (2 * (1 + Math.sqrt(1 + this._k2)) + this._k2);
- if (this._caps & g.CAP_C1) {
+ if (this.caps & g.CAP_C1) {
this._A1m1 = g.A1m1f(eps);
this._C1a = new Array(g.nC1_ + 1);
g.C1f(eps, this._C1a);
@@ -113,32 +125,34 @@
// _B11 = -SinCosSeries(true, _stau1, _ctau1, _C1pa);
}
- if (this._caps & g.CAP_C1p) {
+ if (this.caps & g.CAP_C1p) {
this._C1pa = new Array(g.nC1p_ + 1);
g.C1pf(eps, this._C1pa);
}
- if (this._caps & g.CAP_C2) {
+ if (this.caps & g.CAP_C2) {
this._A2m1 = g.A2m1f(eps);
this._C2a = new Array(g.nC2_ + 1);
g.C2f(eps, this._C2a);
this._B21 = g.SinCosSeries(true, this._ssig1, this._csig1, this._C2a);
}
- if (this._caps & g.CAP_C3) {
+ if (this.caps & g.CAP_C3) {
this._C3a = new Array(g.nC3_);
geod.C3f(eps, this._C3a);
this._A3c = -this.f * this._salp0 * geod.A3f(eps);
this._B31 = g.SinCosSeries(true, this._ssig1, this._csig1, this._C3a);
}
- if (this._caps & g.CAP_C4) {
+ if (this.caps & g.CAP_C4) {
this._C4a = new Array(g.nC4_); // all the elements of _C4a are used
geod.C4f(eps, this._C4a);
// Multiplier = a^2 * e^2 * cos(alpha0) * sin(alpha0)
this._A4 = m.sq(this.a) * this._calp0 * this._salp0 * geod._e2;
this._B41 = g.SinCosSeries(false, this._ssig1, this._csig1, this._C4a);
}
+
+ this.a13 = this.s13 = Number.NaN;
};
/**
@@ -160,11 +174,9 @@
sig12, ssig12, csig12, B12, AB1, ssig2, csig2, tau12, s, c, serr,
omg12, lam12, lon12, E, sbet2, cbet2, somg2, comg2, salp2, calp2, dn2,
B22, AB2, J12, t, B42, salp12, calp12;
- if (!outmask)
- outmask = g.STANDARD;
- else if (outmask == g.LONG_UNROLL)
- outmask |= g.STANDARD;
- outmask &= this._caps & g.OUT_MASK;
+ if (!outmask) outmask = g.STANDARD;
+ else if (outmask === g.LONG_UNROLL) outmask |= g.STANDARD;
+ outmask &= this.caps & g.OUT_MASK;
vals.lat1 = this.lat1; vals.azi1 = this.azi1;
vals.lon1 = outmask & g.LONG_UNROLL ?
this.lon1 : m.AngNormalize(this.lon1);
@@ -172,7 +184,7 @@
vals.a12 = s12_a12;
else
vals.s12 = s12_a12;
- if (!( arcmode || (this._caps & g.DISTANCE_IN & g.OUT_MASK) )) {
+ if (!( arcmode || (this.caps & g.DISTANCE_IN & g.OUT_MASK) )) {
// Uninitialized or impossible distance calculation requested
vals.a12 = Number.NaN;
return vals;
@@ -254,7 +266,7 @@
if (outmask & g.LONGITUDE) {
// tan(omg2) = sin(alp0) * tan(sig2)
somg2 = this._salp0 * ssig2; comg2 = csig2; // No need to normalize
- E = this._salp0 < 0 ? -1 : 1;
+ E = m.copysign(1, this._salp0);
// omg12 = omg2 - omg1
omg12 = outmask & g.LONG_UNROLL ?
E * (sig12 -
@@ -300,15 +312,8 @@
B42 = g.SinCosSeries(false, ssig2, csig2, this._C4a);
if (this._calp0 === 0 || this._salp0 === 0) {
// alp12 = alp2 - alp1, used in atan2 so no need to normalize
- salp12 = salp2 * this._calp1 - calp2 * this._salp1;
- calp12 = calp2 * this._calp1 + salp2 * this._salp1;
- // The right thing appears to happen if alp1 = +/-180 and alp2 = 0, viz
- // salp12 = -0 and alp12 = -180. However this depends on the sign being
- // attached to 0 correctly. The following ensures the correct behavior.
- if (salp12 === 0 && calp12 < 0) {
- salp12 = g.tiny_ * this._calp1;
- calp12 = -1;
- }
+ salp12 = salp2 * this.calp1 - calp2 * this.salp1;
+ calp12 = calp2 * this.calp1 + salp2 * this.salp1;
} else {
// tan(alp) = tan(alp0) * sec(sig)
// tan(alp2-alp1) = (tan(alp2) -tan(alp1)) / (tan(alp2)*tan(alp1)+1)
@@ -363,4 +368,45 @@
return this.GenPosition(true, a12, outmask);
};
+ /**
+ * @summary Specify position of point 3 in terms of either distance or arc
+ * length.
+ * @param {bool} arcmode boolean flag determining the meaning of the second
+ * parameter; if arcmode is false, then the GeodesicLine object must have
+ * been constructed with caps |= DISTANCE_IN.
+ * @param {number} s13_a13 if arcmode is false, this is the distance from
+ * point 1 to point 3 (meters); otherwise it is the arc length from
+ * point 1 to point 3 (degrees); it can be negative.
+ **********************************************************************/
+ l.GeodesicLine.prototype.GenSetDistance = function(arcmode, s13_a13) {
+ if (arcmode)
+ this.SetArc(s13_a13);
+ else
+ this.SetDistance(s13_a13);
+ };
+
+ /**
+ * @summary Specify position of point 3 in terms distance.
+ * @param {number} s13 the distance from point 1 to point 3 (meters); it
+ * can be negative.
+ **********************************************************************/
+ l.GeodesicLine.prototype.SetDistance = function(s13) {
+ var r;
+ this.s13 = s13;
+ r = this.GenPosition(false, this.s13, g.ARC);
+ this.a13 = 0 + r.a12; // the 0+ converts undefined into NaN
+ };
+
+ /**
+ * @summary Specify position of point 3 in terms of arc length.
+ * @param {number} a13 the arc length from point 1 to point 3 (degrees);
+ * it can be negative.
+ **********************************************************************/
+ l.GeodesicLine.prototype.SetArc = function(a13) {
+ var r;
+ this.a13 = a13;
+ r = this.GenPosition(true, this.a13, g.DISTANCE);
+ this.s13 = 0 + r.s12; // the 0+ converts undefined into NaN
+ };
+
})(GeographicLib.Geodesic, GeographicLib.GeodesicLine, GeographicLib.Math);
diff --git a/js/src/Math.js b/js/src/Math.js
index 0786b86..019d316 100644
--- a/js/src/Math.js
+++ b/js/src/Math.js
@@ -3,7 +3,7 @@
* Transcription of Math.hpp, Constants.hpp, and Accumulator.hpp into
* JavaScript.
*
- * Copyright (c) Charles Karney (2011-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2011-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
*/
@@ -38,6 +38,7 @@
* {@link module:GeographicLib/Accumulator.Accumulator Accumulator} class)
* for summing the contributions to the area of a polygon.
*/
+"use strict";
var GeographicLib = {};
GeographicLib.Constants = {};
GeographicLib.Math = {};
@@ -49,7 +50,6 @@ GeographicLib.Accumulator = {};
* @description Define constants defining the version and WGS84 parameters.
*/
c) {
- "use strict";
/**
* @constant
@@ -65,12 +65,12 @@ GeographicLib.Accumulator = {};
* @property {number} minor the minor version number.
* @property {number} patch the patch number.
*/
- c.version = { major: 1, minor: 45, patch: 0 };
+ c.version = { major: 1, minor: 46, patch: 0 };
/**
* @constant
* @summary version string
*/
- c.version_string = "1.45";
+ c.version_string = "1.46";
})(GeographicLib.Constants);
(function(
@@ -80,7 +80,6 @@ GeographicLib.Accumulator = {};
* internal use).
*/
m) {
- "use strict";
/**
* @summary The number of digits of precision in floating-point numbers.
@@ -156,6 +155,16 @@ GeographicLib.Accumulator = {};
};
/**
+ * @summary Copy the sign.
+ * @param {number} x gives the magitude of the result.
+ * @param {number} y gives the sign of the result.
+ * @returns {number} value with the magnitude of x and with the sign of y.
+ */
+ m.copysign = function(x, y) {
+ return Math.abs(x) * (y < 0 || (y === 0 && 1/y < 0) ? -1 : 1);
+ };
+
+ /**
* @summary An error-free sum.
* @param {number} u
* @param {number} v
@@ -199,12 +208,14 @@ GeographicLib.Accumulator = {};
// reals = 0.7 pm on the earth if x is an angle in degrees. (This is about
// 1000 times more resolution than we get with angles around 90 degrees.)
// We use this to avoid having to deal with near singular cases when x is
- // non-zero but tiny (e.g., 1.0e-200). This also converts -0 to +0.
+ // non-zero but tiny (e.g., 1.0e-200). This converts -0 to +0; however
+ // tiny negative numbers get converted to -0.
+ if (x === 0) return x;
var z = 1/16,
y = Math.abs(x);
// The compiler mustn't "simplify" z - (z - y) to y
y = y < z ? z - (z - y) : y;
- return x < 0 ? 0 - y : y;
+ return x < 0 ? -y : y;
};
/**
@@ -231,19 +242,22 @@ GeographicLib.Accumulator = {};
};
/**
- * @summary Difference of two angles reduced to [−180°,
+ * @summary The exact difference of two angles reduced to (−180°,
* 180°]
* @param {number} x the first angle in degrees.
* @param {number} y the second angle in degrees.
- * @return {number} y − x, reduced to the range [−180°,
- * 180°].
+ * @return {object} diff the exact difference, y − x.
+ *
+ * This computes z = y − x exactly, reduced to (−180°,
+ * 180°]; and then sets diff.s = d = round(z) and diff.t = e = z −
+ * round(z). If d = −180, then e > 0; If d = 180, then e ≤ 0.
*/
m.AngDiff = function(x, y) {
// Compute y - x and reduce to [-180,180] accurately.
var r = m.sum(m.AngNormalize(x), m.AngNormalize(-y)),
d = - m.AngNormalize(r.s),
t = r.t;
- return (d == 180 && t < 0 ? -180 : d) - t;
+ return m.sum(d === 180 && t < 0 ? -180 : d, -t);
};
/**
@@ -312,7 +326,6 @@ GeographicLib.Accumulator = {};
* (mainly for internal use).
*/
a, m) {
- "use strict";
/**
* @class
diff --git a/js/src/PolygonArea.js b/js/src/PolygonArea.js
index 4cf53f0..40c2506 100644
--- a/js/src/PolygonArea.js
+++ b/js/src/PolygonArea.js
@@ -10,9 +10,9 @@
* Charles F. F. Karney,
* Algorithms for geodesics, J. Geodesy 87, 43-55 (2013);
* https://dx.doi.org/10.1007/s00190-012-0578-z
- * Addenda: http://geographiclib.sf.net/geod-addenda.html
+ * Addenda: http://geographiclib.sourceforge.net/geod-addenda.html
*
- * Copyright (c) Charles Karney (2011-2014) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2011-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
*/
@@ -27,7 +27,6 @@
* class.
*/
p, g, m, a) {
- "use strict";
var transit, transitdirect;
transit = function(lon1, lon2) {
@@ -37,7 +36,7 @@
// Compute lon12 the same way as Geodesic::Inverse.
lon1 = m.AngNormalize(lon1);
lon2 = m.AngNormalize(lon2);
- lon12 = m.AngDiff(lon1, lon2);
+ lon12 = m.AngDiff(lon1, lon2).s;
cross = lon1 < 0 && lon2 >= 0 && lon12 > 0 ? 1 :
(lon2 < 0 && lon1 >= 0 && lon12 < 0 ? -1 : 0);
return cross;
@@ -152,10 +151,14 @@
* counter-clockwise) traversal counts as a positive area.
* @param {bool} sign if true then return a signed result for the area if the
* polygon is traversed in the "wrong" direction instead of returning the
+ * area for the rest of the earth.
* @returns {object} r where r.number is the number of vertices, r.perimeter
* is the perimeter (meters), and r.area (only returned if polyline is
* false) is the area (meters<sup>2</sup>).
- * @description More points can be added to the polygon after this call.
+ * @description If the object is a polygon (and not a polygon), the perimeter
+ * includes the length of a final edge connecting the current point to the
+ * initial point. If the object is a polyline, then area is nan. More
+ * points can be added to the polygon after this call.
*/
p.PolygonArea.prototype.Compute = function(reverse, sign) {
var vals = {number: this.num}, t, tempsum, crossings;
@@ -275,7 +278,7 @@
* @description A new vertex is *not* added to the polygon.
*/
p.PolygonArea.prototype.TestEdge = function(azi, s, reverse, sign) {
- var vals = {number: this.num ? this.num + 1 : 0}, t, tempsump, crossings;
+ var vals = {number: this.num ? this.num + 1 : 0}, t, tempsum, crossings;
if (this.num === 0)
return vals;
vals.perimeter = this._perimetersum.Sum() + s;
@@ -287,8 +290,8 @@
t = this._geod.Direct(this.lat, this.lon, azi, s, this._mask);
tempsum += t.S12;
crossings += transitdirect(this.lon, t.lon2);
- t = this._geod(t.lat2, t.lon2, this._lat0, this._lon0, this._mask);
- perimeter += t.s12;
+ t = this._geod.Inverse(t.lat2, t.lon2, this._lat0, this._lon0, this._mask);
+ vals.perimeter += t.s12;
tempsum += t.S12;
crossings += transit(t.lon2, this._lon0);
diff --git a/js/test/geodesictest.js b/js/test/geodesictest.js
index b1595d4..5e12acd 100644
--- a/js/test/geodesictest.js
+++ b/js/test/geodesictest.js
@@ -204,7 +204,7 @@ describe("GeographicLib", function() {
it("GeodSolve4", function() {
// Check fix for short line bug found 2010-05-21
var geod = g.WGS84,
- inv = geod.Inverse(36.493349428792, 0, 36.49334942879201, .0000008);
+ inv = geod.Inverse(36.493349428792, 0, 36.49334942879201, 0.0000008);
assert.approx(inv.s12, 0.072, 0.5e-3);
});
@@ -408,6 +408,103 @@ describe("GeographicLib", function() {
assert(isNaN(inv.azi2));
assert(isNaN(inv.s12));
});
+
+ it("GeodSolve59", function() {
+ // Check for points close with longitudes close to 180 deg apart.
+ var geod = g.WGS84,
+ inv = geod.Inverse(5, 0.00000000000001, 10, 180);
+ assert.approx(inv.azi1, 0.000000000000035, 1.5e-14);
+ assert.approx(inv.azi2, 179.99999999999996, 1.5e-14);
+ assert.approx(inv.s12, 18345191.174332713, 4e-9);
+ });
+
+ it("GeodSolve61", function() {
+ // Make sure small negative azimuths are west-going
+ var geod = g.WGS84,
+ dir = geod.Direct(45, 0, -0.000000000000000003, 1e7,
+ g.STANDARD | g.LONG_UNROLL),
+ line;
+ assert.approx(dir.lat2, 45.30632, 0.5e-5);
+ assert.approx(dir.lon2, -180, 0.5e-5);
+ assert.approx(dir.azi2, -180, 0.5e-5);
+ line = geod.InverseLine(45, 0, 80, -0.000000000000000003);
+ dir = line.Position(1e7);
+ assert.approx(dir.lat2, 45.30632, 0.5e-5);
+ assert.approx(dir.lon2, -180, 0.5e-5);
+ assert.approx(dir.azi2, -180, 0.5e-5);
+ });
+
+ it("GeodSolve65", function() {
+ // Check for bug in east-going check in GeodesicLine (needed to check for
+ // sign of 0) and sign error in area calculation due to a bogus override
+ // of the code for alp12. Found/fixed on 2015-12-19.
+ var geod = g.WGS84,
+ line = geod.InverseLine(30, -0.000000000000000001, -31, 180,
+ g.ALL),
+ dir = line.Position(1e7, g.ALL | g.LONG_UNROLL);
+ assert.approx(dir.lat1, 30.00000 , 0.5e-5);
+ assert.approx(dir.lon1, -0.00000 , 0.5e-5);
+ assert.approx(dir.azi1, -180.00000, 0.5e-5);
+ assert.approx(dir.lat2, -60.23169 , 0.5e-5);
+ assert.approx(dir.lon2, -0.00000 , 0.5e-5);
+ assert.approx(dir.azi2, -180.00000, 0.5e-5);
+ assert.approx(dir.s12 , 10000000 , 0.5);
+ assert.approx(dir.a12 , 90.06544 , 0.5e-5);
+ assert.approx(dir.m12 , 6363636 , 0.5);
+ assert.approx(dir.M12 , -0.0012834, 0.5e7);
+ assert.approx(dir.M21 , 0.0013749 , 0.5e-7);
+ assert.approx(dir.S12 , 0 , 0.5);
+ dir = line.Position(2e7, g.ALL | g.LONG_UNROLL);
+ assert.approx(dir.lat1, 30.00000 , 0.5e-5);
+ assert.approx(dir.lon1, -0.00000 , 0.5e-5);
+ assert.approx(dir.azi1, -180.00000, 0.5e-5);
+ assert.approx(dir.lat2, -30.03547 , 0.5e-5);
+ assert.approx(dir.lon2, -180.00000, 0.5e-5);
+ assert.approx(dir.azi2, -0.00000 , 0.5e-5);
+ assert.approx(dir.s12 , 20000000 , 0.5);
+ assert.approx(dir.a12 , 179.96459 , 0.5e-5);
+ assert.approx(dir.m12 , 54342 , 0.5);
+ assert.approx(dir.M12 , -1.0045592, 0.5e7);
+ assert.approx(dir.M21 , -0.9954339, 0.5e-7);
+ assert.approx(dir.S12 , 127516405431022.0, 0.5);
+ });
+
+ it("GeodSolve69", function() {
+ // Check for InverseLine if line is slightly west of S and that s13 is
+ // correctly set.
+ var geod = g.WGS84,
+ line = geod.InverseLine(-5, -0.000000000000002, -10, 180),
+ dir = line.Position(2e7, g.LONG_UNROLL);
+ assert.approx(dir.lat2, 4.96445 , 0.5e-5);
+ assert.approx(dir.lon2, -180.00000, 0.5e-5);
+ assert.approx(dir.azi2, -0.00000 , 0.5e-5);
+ dir = line.Position(0.5 * line.s13, g.LONG_UNROLL);
+ assert.approx(dir.lat2, -87.52461 , 0.5e-5);
+ assert.approx(dir.lon2, -0.00000 , 0.5e-5);
+ assert.approx(dir.azi2, -180.00000, 0.5e-5);
+ });
+
+ it("GeodSolve71", function() {
+ // Check that DirectLine sets s13.
+ var geod = g.WGS84,
+ line = geod.DirectLine(1, 2, 45, 1e7),
+ dir = line.Position(0.5 * line.s13, g.LONG_UNROLL);
+ assert.approx(dir.lat2, 30.92625, 0.5e-5);
+ assert.approx(dir.lon2, 37.54640, 0.5e-5);
+ assert.approx(dir.azi2, 55.43104, 0.5e-5);
+ });
+
+ it("GeodSolve73", function() {
+ // Check for backwards from the pole bug reported by Anon on 2016-02-13.
+ // This only affected the Java implementation. It was introduced in Java
+ // version 1.44 and fixed in 1.46-SNAPSHOT on 2016-01-17.
+ var geod = g.WGS84,
+ dir = geod.Direct(90, 10, 180, -1e6);
+ assert.approx(dir.lat2, 81.04623, 0.5e-5);
+ assert.approx(dir.lon2, -170, 0.5e-5);
+ assert.approx(dir.azi2, 0, 0.5e-5);
+ });
+
});
describe("Planimeter", function () {
@@ -424,7 +521,7 @@ describe("GeographicLib", function() {
polygon.AddPoint(points[i][0], points[i][1]);
}
return polygon.Compute(false, true);
- }
+ };
PolyLength = function(points) {
var i;
@@ -433,7 +530,7 @@ describe("GeographicLib", function() {
polyline.AddPoint(points[i][0], points[i][1]);
}
return polyline.Compute(false, true);
- }
+ };
it("Planimeter0", function() {
// Check fix for pole-encircling bug found 2011-03-16
@@ -510,5 +607,13 @@ describe("GeographicLib", function() {
assert.approx(a.area, 32415230256.0, 1);
});
+ it("check TestEdge", function() {
+ // Check fix of bugs found by threepointone, 2015-10-14
+ polygon.Clear();
+ polygon.AddPoint(33, 44);
+ polygon.TestEdge(90, 10e3, false, true);
+ polygon.AddEdge(90, 10e3, false, true);
+ });
+
});
});
diff --git a/legacy/C/00README.txt b/legacy/C/00README.txt
index a288ae4..71bad0e 100644
--- a/legacy/C/00README.txt
+++ b/legacy/C/00README.txt
@@ -4,7 +4,7 @@ This is a C implementation of the geodesic algorithms described in
Algorithms for geodesics,
J. Geodesy 87, 43-55 (2013);
https://dx.doi.org/10.1007/s00190-012-0578-z
- Addenda: http://geographiclib.sf.net/geod-addenda.html
+ Addenda: http://geographiclib.sourceforge.net/geod-addenda.html
For documentation, see
diff --git a/legacy/C/CMakeLists.txt b/legacy/C/CMakeLists.txt
index 5241df4..2c619cb 100644
--- a/legacy/C/CMakeLists.txt
+++ b/legacy/C/CMakeLists.txt
@@ -1,6 +1,6 @@
-cmake_minimum_required (VERSION 2.8.4)
+project (GeographicLib-C C)
-project (GeographicLib-legacy-C C)
+cmake_minimum_required (VERSION 2.8.4)
# Set a default build type for single-configuration cmake generators if
# no build type is set.
@@ -9,7 +9,7 @@ if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
endif ()
# Make the compiler more picky.
-if (WIN32)
+if (MSCV)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
else ()
set (CMAKE_C_FLAGS
@@ -23,7 +23,7 @@ set (TOOLS direct inverse planimeter geodtest)
foreach (TOOL ${TOOLS})
add_executable (${TOOL} ${TOOL}.c geodesic.c geodesic.h)
- if (NOT WIN32)
+ if (NOT MSVC)
target_link_libraries (${TOOL} m)
endif ()
endforeach ()
diff --git a/legacy/C/geodesic.c b/legacy/C/geodesic.c
index 13acba3..8d9c928 100644
--- a/legacy/C/geodesic.c
+++ b/legacy/C/geodesic.c
@@ -14,11 +14,11 @@
* Algorithms for geodesics,
* J. Geodesy <b>87</b>, 43--55 (2013);
* https://dx.doi.org/10.1007/s00190-012-0578-z
- * Addenda: http://geographiclib.sf.net/geod-addenda.html
+ * Addenda: http://geographiclib.sourceforge.net/geod-addenda.html
*
* See the comments in geodesic.h for documentation.
*
- * Copyright (c) Charles Karney (2012-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2012-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
*/
@@ -119,6 +119,10 @@ static real atanhx(real x) {
return x < 0 ? -y : y;
}
+static real copysignx(real x, real y) {
+ return fabs(x) * (y < 0 || (y == 0 && 1/y < 0) ? -1 : 1);
+}
+
static real hypotx(real x, real y)
{ return sqrt(x * x + y * y); }
@@ -133,7 +137,7 @@ static real sumx(real u, real v, real* t) {
volatile real vpp = s - up;
up -= u;
vpp -= v;
- *t = -(up + vpp);
+ if (t) *t = -(up + vpp);
/* error-free sum:
* u + v = s + t
* = round(u + v) + t */
@@ -170,7 +174,7 @@ static real AngNormalize(real x) {
static real LatFix(real x)
{ return fabs(x) > 90 ? NaN : x; }
-static real AngDiff(real x, real y) {
+static real AngDiff(real x, real y, real* e) {
real t, d = - AngNormalize(sumx(AngNormalize(x), AngNormalize(-y), &t));
/* Here y - x = d - t (mod 360), exactly, where d is in (-180,180] and
* abs(t) <= eps (eps = 2^-45 for doubles). The only case where the
@@ -178,15 +182,16 @@ static real AngDiff(real x, real y) {
* and t < 0. The case, d = -180 + eps, t = eps, can't happen, since
* sum would have returned the exact result in such a case (i.e., given t
* = 0). */
- return (d == 180 && t < 0 ? -180 : d) - t;
+ return sumx(d == 180 && t < 0 ? -180 : d, -t, e);
}
static real AngRound(real x) {
const real z = 1/(real)(16);
+ if (x == 0) return 0;
volatile real y = fabs(x);
/* The compiler mustn't "simplify" z - (z - y) to y */
y = y < z ? z - (z - y) : y;
- return x < 0 ? 0 - y : y;
+ return x < 0 ? -y : y;
}
static void sincosdx(real x, real* sinx, real* cosx) {
@@ -250,7 +255,7 @@ static real Astroid(real x, real y);
static real InverseStart(const struct geod_geodesic* g,
real sbet1, real cbet1, real dn1,
real sbet2, real cbet2, real dn2,
- real lam12,
+ real lam12, real slam12, real clam12,
real* psalp1, real* pcalp1,
/* Only updated if return val >= 0 */
real* psalp2, real* pcalp2,
@@ -262,11 +267,13 @@ static real Lambda12(const struct geod_geodesic* g,
real sbet1, real cbet1, real dn1,
real sbet2, real cbet2, real dn2,
real salp1, real calp1,
+ real slam120, real clam120,
real* psalp2, real* pcalp2,
real* psig12,
real* pssig1, real* pcsig1,
real* pssig2, real* pcsig2,
- real* peps, real* pdomg12,
+ real* peps,
+ real* psomg12, real* pcomg12,
boolx diffp, real* pdlam12,
/* Scratch area of the right size */
real Ca[]);
@@ -316,9 +323,11 @@ void geod_init(struct geod_geodesic* g, real a, real f) {
C4coeff(g);
}
-void geod_lineinit(struct geod_geodesicline* l,
- const struct geod_geodesic* g,
- real lat1, real lon1, real azi1, unsigned caps) {
+static void geod_lineinit_int(struct geod_geodesicline* l,
+ const struct geod_geodesic* g,
+ real lat1, real lon1,
+ real azi1, real salp1, real calp1,
+ unsigned caps) {
real cbet1, sbet1, eps;
l->a = g->a;
l->f = g->f;
@@ -332,9 +341,9 @@ void geod_lineinit(struct geod_geodesicline* l,
l->lat1 = LatFix(lat1);
l->lon1 = lon1;
- l->azi1 = AngNormalize(azi1);
- /* Guard against underflow in salp0 */
- sincosdx(AngRound(l->azi1), &l->salp1, &l->calp1);
+ l->azi1 = azi1;
+ l->salp1 = salp1;
+ l->calp1 = calp1;
sincosdx(AngRound(l->lat1), &sbet1, &cbet1); sbet1 *= l->f1;
/* Ensure cbet1 = +epsilon at poles */
@@ -397,6 +406,34 @@ void geod_lineinit(struct geod_geodesicline* l,
l->A4 = sq(l->a) * l->calp0 * l->salp0 * g->e2;
l->B41 = SinCosSeries(FALSE, l->ssig1, l->csig1, l->C4a, nC4);
}
+
+ l->a13 = l->s13 = NaN;
+}
+
+void geod_lineinit(struct geod_geodesicline* l,
+ const struct geod_geodesic* g,
+ real lat1, real lon1, real azi1, unsigned caps) {
+ azi1 = AngNormalize(azi1);
+ real salp1, calp1;
+ /* Guard against underflow in salp0 */
+ sincosdx(AngRound(azi1), &salp1, &calp1);
+ geod_lineinit_int(l, g, lat1, lon1, azi1, salp1, calp1, caps);
+}
+
+void geod_gendirectline(struct geod_geodesicline* l,
+ const struct geod_geodesic* g,
+ real lat1, real lon1, real azi1,
+ unsigned flags, real a12_s12,
+ unsigned caps) {
+ geod_lineinit(l, g, lat1, lon1, azi1, caps);
+ geod_gensetdistance(l, flags, a12_s12);
+}
+
+void geod_directline(struct geod_geodesicline* l,
+ const struct geod_geodesic* g,
+ real lat1, real lon1, real azi1,
+ real s12, unsigned caps) {
+ geod_gendirectline(l, g, lat1, lon1, azi1, GEOD_NOFLAGS, s12, caps);
}
real geod_genposition(const struct geod_geodesicline* l,
@@ -422,7 +459,7 @@ real geod_genposition(const struct geod_geodesicline* l,
outmask &= l->caps & OUT_ALL;
if (!( TRUE /*Init()*/ &&
- (flags & GEOD_ARCMODE || (l->caps & GEOD_DISTANCE_IN & OUT_ALL)) ))
+ (flags & GEOD_ARCMODE || (l->caps & (GEOD_DISTANCE_IN & OUT_ALL))) ))
/* Uninitialized or impossible distance calculation requested */
return NaN;
@@ -465,10 +502,9 @@ real geod_genposition(const struct geod_geodesicline* l,
* 1/20 5376 146e3 10e3
* 1/10 829e3 22e6 1.5e6
* 1/5 157e6 3.8e9 280e6 */
- real
- ssig2 = l->ssig1 * csig12 + l->csig1 * ssig12,
- csig2 = l->csig1 * csig12 - l->ssig1 * ssig12,
- serr;
+ real serr;
+ ssig2 = l->ssig1 * csig12 + l->csig1 * ssig12;
+ csig2 = l->csig1 * csig12 - l->ssig1 * ssig12;
B12 = SinCosSeries(TRUE, ssig2, csig2, l->C1a, nC1);
serr = (1 + l->A1m1) * (sig12 + (B12 - l->B11)) - s12_a12 / l->b;
sig12 = sig12 - serr / sqrt(1 + l->k2 * sq(ssig2));
@@ -500,7 +536,7 @@ real geod_genposition(const struct geod_geodesicline* l,
s12 = flags & GEOD_ARCMODE ? l->b * ((1 + l->A1m1) * sig12 + AB1) : s12_a12;
if (outmask & GEOD_LONGITUDE) {
- int E = l->salp0 < 0 ? -1 : 1; /* east or west going? */
+ real E = copysignx(1, l->salp0); /* east or west going? */
/* tan(omg2) = sin(alp0) * tan(sig2) */
somg2 = l->salp0 * ssig2; comg2 = csig2; /* No need to normalize */
/* omg12 = omg2 - omg1 */
@@ -549,14 +585,6 @@ real geod_genposition(const struct geod_geodesicline* l,
/* alp12 = alp2 - alp1, used in atan2 so no need to normalize */
salp12 = salp2 * l->calp1 - calp2 * l->salp1;
calp12 = calp2 * l->calp1 + salp2 * l->salp1;
- /* The right thing appears to happen if alp1 = +/-180 and alp2 = 0, viz
- * salp12 = -0 and alp12 = -180. However this depends on the sign being
- * attached to 0 correctly. The following ensures the correct
- * behavior. */
- if (salp12 == 0 && calp12 < 0) {
- salp12 = tiny * l->calp1;
- calp12 = -1;
- }
} else {
/* tan(alp) = tan(alp0) * sec(sig)
* tan(alp2-alp1) = (tan(alp2) -tan(alp1)) / (tan(alp2)*tan(alp1)+1)
@@ -594,6 +622,21 @@ real geod_genposition(const struct geod_geodesicline* l,
return flags & GEOD_ARCMODE ? s12_a12 : sig12 / degree;
}
+void geod_setdistance(struct geod_geodesicline* l, real s13) {
+ l->s13 = s13;
+ l->a13 = geod_genposition(l, GEOD_NOFLAGS, l->s13, 0, 0, 0, 0, 0, 0, 0, 0);
+}
+
+static void geod_setarc(struct geod_geodesicline* l, real a13) {
+ l->a13 = a13; l->s13 = NaN;
+ geod_genposition(l, GEOD_ARCMODE, l->a13, 0, 0, 0, &l->s13, 0, 0, 0, 0);
+}
+
+void geod_gensetdistance(struct geod_geodesicline* l,
+ unsigned flags, real s13_a13) {
+ flags & GEOD_ARCMODE ? geod_setarc(l, s13_a13) : geod_setdistance(l, s13_a13);
+}
+
void geod_position(const struct geod_geodesicline* l, real s12,
real* plat2, real* plon2, real* pazi2) {
geod_genposition(l, FALSE, s12, plat2, plon2, pazi2, 0, 0, 0, 0, 0);
@@ -631,23 +674,26 @@ void geod_direct(const struct geod_geodesic* g,
0, 0, 0, 0, 0);
}
-real geod_geninverse(const struct geod_geodesic* g,
- real lat1, real lon1, real lat2, real lon2,
- real* ps12, real* pazi1, real* pazi2,
- real* pm12, real* pM12, real* pM21, real* pS12) {
- real s12 = 0, azi1 = 0, azi2 = 0, m12 = 0, M12 = 0, M21 = 0, S12 = 0;
- real lon12;
+static real geod_geninverse_int(const struct geod_geodesic* g,
+ real lat1, real lon1, real lat2, real lon2,
+ real* ps12,
+ real* psalp1, real* pcalp1,
+ real* psalp2, real* pcalp2,
+ real* pm12, real* pM12, real* pM21,
+ real* pS12) {
+ real s12 = 0, m12 = 0, M12 = 0, M21 = 0, S12 = 0;
+ real lon12, lon12s;
int latsign, lonsign, swapp;
real sbet1, cbet1, sbet2, cbet2, s12x = 0, m12x = 0;
real dn1, dn2, lam12, slam12, clam12;
real a12 = 0, sig12, calp1 = 0, salp1 = 0, calp2 = 0, salp2 = 0;
real Ca[nC];
boolx meridian;
- real omg12 = 0;
+ /* somg12 > 1 marks that it needs to be calculated */
+ real omg12 = 0, somg12 = 2, comg12 = 0;
unsigned outmask =
(ps12 ? GEOD_DISTANCE : 0U) |
- (pazi1 || pazi2 ? GEOD_AZIMUTH : 0U) |
(pm12 ? GEOD_REDUCEDLENGTH : 0U) |
(pM12 || pM21 ? GEOD_GEODESICSCALE : 0U) |
(pS12 ? GEOD_AREA : 0U);
@@ -656,11 +702,19 @@ real geod_geninverse(const struct geod_geodesic* g,
/* Compute longitude difference (AngDiff does this carefully). Result is
* in [-180, 180] but -180 is only for west-going geodesics. 180 is for
* east-going and meridional geodesics. */
- /* If very close to being on the same half-meridian, then make it so. */
- lon12 = AngRound(AngDiff(lon1, lon2));
+ lon12 = AngDiff(lon1, lon2, &lon12s);
/* Make longitude difference positive. */
lonsign = lon12 >= 0 ? 1 : -1;
- lon12 *= lonsign;
+ /* If very close to being on the same half-meridian, then make it so. */
+ lon12 = lonsign * AngRound(lon12);
+ lon12s = AngRound((180 - lon12) - lonsign * lon12s);
+ lam12 = lon12 * degree;
+ if (lon12 > 90) {
+ sincosdx(lon12s, &slam12, &clam12);
+ clam12 = -clam12;
+ } else
+ sincosdx(lon12, &slam12, &clam12);
+
/* If really close to the equator, treat as on equator. */
lat1 = AngRound(LatFix(lat1));
lat2 = AngRound(LatFix(lat2));
@@ -714,9 +768,6 @@ real geod_geninverse(const struct geod_geodesic* g,
dn1 = sqrt(1 + g->ep2 * sq(sbet1));
dn2 = sqrt(1 + g->ep2 * sq(sbet2));
- lam12 = lon12 * degree;
- sincosdx(lon12, &slam12, &clam12);
-
meridian = lat1 == -90 || slam12 == 0;
if (meridian) {
@@ -762,7 +813,7 @@ real geod_geninverse(const struct geod_geodesic* g,
if (!meridian &&
sbet1 == 0 && /* and sbet2 == 0 */
/* Mimic the way Lambda12 works with calp1 = 0 */
- (g->f <= 0 || lam12 <= pi - g->f * pi)) {
+ (g->f <= 0 || lon12s >= g->f * 180)) {
/* Geodesic runs along equator */
calp1 = calp2 = 0; salp1 = salp2 = 1;
@@ -781,7 +832,7 @@ real geod_geninverse(const struct geod_geodesic* g,
/* Figure a starting point for Newton's method */
real dnm = 0;
sig12 = InverseStart(g, sbet1, cbet1, dn1, sbet2, cbet2, dn2,
- lam12,
+ lam12, slam12, clam12,
&salp1, &calp1, &salp2, &calp2, &dnm,
Ca);
@@ -815,13 +866,13 @@ real geod_geninverse(const struct geod_geodesic* g,
/* the WGS84 test set: mean = 1.47, sd = 1.25, max = 16
* WGS84 and random input: mean = 2.85, sd = 0.60 */
real dv = 0,
- v = (Lambda12(g, sbet1, cbet1, dn1, sbet2, cbet2, dn2, salp1, calp1,
+ v = Lambda12(g, sbet1, cbet1, dn1, sbet2, cbet2, dn2, salp1, calp1,
+ slam12, clam12,
&salp2, &calp2, &sig12, &ssig1, &csig1, &ssig2, &csig2,
- &eps, &omg12, numit < maxit1, &dv, Ca)
- - lam12);
+ &eps, &somg12, &comg12, numit < maxit1, &dv, Ca);
/* 2 * tol0 is approximately 1 ulp for a number in [0, pi]. */
/* Reversed test to allow escape with NaNs */
- if (tripb || !(fabs(v) >= (tripn ? 8 : 2) * tol0)) break;
+ if (tripb || !(fabs(v) >= (tripn ? 8 : 1) * tol0)) break;
/* Update bracketing values */
if (v > 0 && (numit > maxit1 || calp1/salp1 > calp1b/salp1b))
{ salp1b = salp1; calp1b = calp1; }
@@ -866,7 +917,6 @@ real geod_geninverse(const struct geod_geodesic* g,
m12x *= g->b;
s12x *= g->b;
a12 = sig12 / degree;
- omg12 = lam12 - omg12;
}
}
@@ -902,15 +952,22 @@ real geod_geninverse(const struct geod_geodesic* g,
/* Avoid problems with indeterminate sig1, sig2 on equator */
S12 = 0;
+ if (!meridian) {
+ if (somg12 > 1) {
+ somg12 = sin(omg12); comg12 = cos(omg12);
+ } else
+ norm2(&somg12, &comg12);
+ }
+
if (!meridian &&
- omg12 < (real)(0.75) * pi && /* Long difference too big */
- sbet2 - sbet1 < (real)(1.75)) { /* Lat difference too big */
+ /* omg12 < 3/4 * pi */
+ comg12 > -(real)(0.7071) && /* Long difference not too big */
+ sbet2 - sbet1 < (real)(1.75)) { /* Lat difference not too big */
/* Use tan(Gamma/2) = tan(omg12/2)
* * (tan(bet1/2)+tan(bet2/2))/(1+tan(bet1/2)*tan(bet2/2))
* with tan(x/2) = sin(x)/(1+cos(x)) */
real
- somg12 = sin(omg12), domg12 = 1 + cos(omg12),
- dbet1 = 1 + cbet1, dbet2 = 1 + cbet2;
+ domg12 = 1 + comg12, dbet1 = 1 + cbet1, dbet2 = 1 + cbet2;
alp12 = 2 * atan2( somg12 * ( sbet1 * dbet2 + sbet2 * dbet1 ),
domg12 * ( sbet1 * sbet2 + dbet1 * dbet2 ) );
} else {
@@ -945,18 +1002,13 @@ real geod_geninverse(const struct geod_geodesic* g,
salp1 *= swapp * lonsign; calp1 *= swapp * latsign;
salp2 *= swapp * lonsign; calp2 *= swapp * latsign;
- if (outmask & GEOD_AZIMUTH) {
- /* minus signs give range [-180, 180). 0- converts -0 to +0. */
- azi1 = atan2dx(salp1, calp1);
- azi2 = atan2dx(salp2, calp2);
- }
+ if (psalp1) *psalp1 = salp1;
+ if (pcalp1) *pcalp1 = calp1;
+ if (psalp2) *psalp2 = salp2;
+ if (pcalp2) *pcalp2 = calp2;
if (outmask & GEOD_DISTANCE)
*ps12 = s12;
- if (outmask & GEOD_AZIMUTH) {
- if (pazi1) *pazi1 = azi1;
- if (pazi2) *pazi2 = azi2;
- }
if (outmask & GEOD_REDUCEDLENGTH)
*pm12 = m12;
if (outmask & GEOD_GEODESICSCALE) {
@@ -970,6 +1022,35 @@ real geod_geninverse(const struct geod_geodesic* g,
return a12;
}
+real geod_geninverse(const struct geod_geodesic* g,
+ real lat1, real lon1, real lat2, real lon2,
+ real* ps12, real* pazi1, real* pazi2,
+ real* pm12, real* pM12, real* pM21, real* pS12) {
+ real salp1, calp1, salp2, calp2,
+ a12 = geod_geninverse_int(g, lat1, lon1, lat2, lon2, ps12,
+ &salp1, &calp1, &salp2, &calp2,
+ pm12, pM12, pM21, pS12);
+ if (pazi1) *pazi1 = atan2dx(salp1, calp1);
+ if (pazi2) *pazi2 = atan2dx(salp2, calp2);
+ return a12;
+}
+
+void geod_inverseline(struct geod_geodesicline* l,
+ const struct geod_geodesic* g,
+ real lat1, real lon1, real lat2, real lon2,
+ unsigned caps) {
+ real salp1, calp1,
+ a12 = geod_geninverse_int(g, lat1, lon1, lat2, lon2, 0,
+ &salp1, &calp1, 0, 0,
+ 0, 0, 0, 0),
+ azi1 = atan2dx(salp1, calp1);
+ caps = caps ? caps : GEOD_DISTANCE_IN | GEOD_LONGITUDE;
+ /* Ensure that a12 can be converted to a distance */
+ if (caps & (OUT_ALL & GEOD_DISTANCE_IN)) caps |= GEOD_DISTANCE;
+ geod_lineinit_int(l, g, lat1, lon1, azi1, salp1, calp1, caps);
+ geod_setarc(l, a12);
+}
+
void geod_inverse(const struct geod_geodesic* g,
real lat1, real lon1, real lat2, real lon2,
real* ps12, real* pazi1, real* pazi2) {
@@ -1114,7 +1195,7 @@ real Astroid(real x, real y) {
real InverseStart(const struct geod_geodesic* g,
real sbet1, real cbet1, real dn1,
real sbet2, real cbet2, real dn2,
- real lam12,
+ real lam12, real slam12, real clam12,
real* psalp1, real* pcalp1,
/* Only updated if return val >= 0 */
real* psalp2, real* pcalp2,
@@ -1135,7 +1216,7 @@ real InverseStart(const struct geod_geodesic* g,
real sbet12a;
boolx shortline = cbet12 >= 0 && sbet12 < (real)(0.5) &&
cbet2 * lam12 < (real)(0.5);
- real omg12 = lam12, somg12, comg12, ssig12, csig12;
+ real somg12, comg12, ssig12, csig12;
#if defined(__GNUC__) && __GNUC__ == 4 && \
(__GNUC_MINOR__ < 6 || defined(__MINGW32__))
/* Volatile declaration needed to fix inverse cases
@@ -1153,14 +1234,16 @@ real InverseStart(const struct geod_geodesic* g,
sbet12a = sbet2 * cbet1 + cbet2 * sbet1;
#endif
if (shortline) {
- real sbetm2 = sq(sbet1 + sbet2);
+ real sbetm2 = sq(sbet1 + sbet2), omg12;
/* sin((bet1+bet2)/2)^2
* = (sbet1 + sbet2)^2 / ((sbet1 + sbet2)^2 + (cbet1 + cbet2)^2) */
sbetm2 /= sbetm2 + sq(cbet1 + cbet2);
dnm = sqrt(1 + g->ep2 * sbetm2);
- omg12 /= g->f1 * dnm;
+ omg12 = lam12 / (g->f1 * dnm);
+ somg12 = sin(omg12); comg12 = cos(omg12);
+ } else {
+ somg12 = slam12; comg12 = clam12;
}
- somg12 = sin(omg12); comg12 = cos(omg12);
salp1 = cbet2 * somg12;
calp1 = comg12 >= 0 ?
@@ -1190,6 +1273,7 @@ real InverseStart(const struct geod_geodesic* g,
* 56.320923501171 0 -56.320923501171 179.664747671772880215
* which otherwise fails with g++ 4.4.4 x86 -O3 */
volatile real x;
+ real lam12x = atan2(-slam12, -clam12); /* lam12 - pi */
if (g->f >= 0) { /* In fact f == 0 does not get here */
/* x = dlong, y = dlat */
{
@@ -1200,7 +1284,7 @@ real InverseStart(const struct geod_geodesic* g,
}
betscale = lamscale * cbet1;
- x = (lam12 - pi) / lamscale;
+ x = lam12x / lamscale;
y = sbet12a / betscale;
} else { /* f < 0 */
/* x = dlat, y = dlong */
@@ -1217,7 +1301,7 @@ real InverseStart(const struct geod_geodesic* g,
betscale = x < -(real)(0.01) ? sbet12a / x :
-g->f * sq(cbet1) * pi;
lamscale = betscale / cbet1;
- y = (lam12 - pi) / lamscale;
+ y = lam12x / lamscale;
}
if (y > -tol1 && x > -1 - xthresh) {
@@ -1294,19 +1378,22 @@ real Lambda12(const struct geod_geodesic* g,
real sbet1, real cbet1, real dn1,
real sbet2, real cbet2, real dn2,
real salp1, real calp1,
+ real slam120, real clam120,
real* psalp2, real* pcalp2,
real* psig12,
real* pssig1, real* pcsig1,
real* pssig2, real* pcsig2,
- real* peps, real* pdomg12,
+ real* peps,
+ real* psomg12, real* pcomg12,
boolx diffp, real* pdlam12,
/* Scratch area of the right size */
real Ca[]) {
real salp2 = 0, calp2 = 0, sig12 = 0,
- ssig1 = 0, csig1 = 0, ssig2 = 0, csig2 = 0, eps = 0, domg12 = 0, dlam12 = 0;
+ ssig1 = 0, csig1 = 0, ssig2 = 0, csig2 = 0, eps = 0,
+ somg12 = 0, comg12 = 0, dlam12 = 0;
real salp0, calp0;
- real somg1, comg1, somg2, comg2, omg12, lam12;
- real B312, h0, k2;
+ real somg1, comg1, somg2, comg2, lam12;
+ real B312, eta, k2;
if (sbet1 == 0 && calp1 == 0)
/* Break degeneracy of equatorial line. This case has already been
@@ -1351,16 +1438,17 @@ real Lambda12(const struct geod_geodesic* g,
csig1 * csig2 + ssig1 * ssig2);
/* omg12 = omg2 - omg1, limit to [0, pi] */
- omg12 = atan2(maxx((real)(0), comg1 * somg2 - somg1 * comg2),
- comg1 * comg2 + somg1 * somg2);
+ somg12 = maxx((real)(0), comg1 * somg2 - somg1 * comg2);
+ comg12 = comg1 * comg2 + somg1 * somg2;
+ /* eta = omg12 - lam120 */
+ eta = atan2(somg12 * clam120 - comg12 * slam120,
+ comg12 * clam120 + somg12 * slam120);
k2 = sq(calp0) * g->ep2;
eps = k2 / (2 * (1 + sqrt(1 + k2)) + k2);
C3f(g, eps, Ca);
B312 = (SinCosSeries(TRUE, ssig2, csig2, Ca, nC3-1) -
SinCosSeries(TRUE, ssig1, csig1, Ca, nC3-1));
- h0 = -g->f * A3f(g, eps);
- domg12 = salp0 * h0 * (sig12 + B312);
- lam12 = omg12 + domg12;
+ lam12 = eta - g->f * A3f(g, eps) * salp0 * (sig12 + B312);
if (diffp) {
if (calp2 == 0)
@@ -1380,7 +1468,8 @@ real Lambda12(const struct geod_geodesic* g,
*pssig2 = ssig2;
*pcsig2 = csig2;
*peps = eps;
- *pdomg12 = domg12;
+ *psomg12 = somg12;
+ *pcomg12 = comg12;
if (diffp)
*pdlam12 = dlam12;
@@ -1655,7 +1744,7 @@ int transit(real lon1, real lon2) {
/* Compute lon12 the same way as Geodesic::Inverse. */
lon1 = AngNormalize(lon1);
lon2 = AngNormalize(lon2);
- lon12 = AngDiff(lon1, lon2);
+ lon12 = AngDiff(lon1, lon2, 0);
return lon1 < 0 && lon2 >= 0 && lon12 > 0 ? 1 :
(lon2 < 0 && lon1 >= 0 && lon12 < 0 ? -1 : 0);
}
diff --git a/legacy/C/geodesic.h b/legacy/C/geodesic.h
index 7340dd5..80ffac9 100644
--- a/legacy/C/geodesic.h
+++ b/legacy/C/geodesic.h
@@ -1,6 +1,6 @@
/**
* \file geodesic.h
- * \brief Header for the geodesic routines in C
+ * \brief API for the geodesic routines in C
*
* This an implementation in C of the geodesic algorithms described in
* - C. F. F. Karney,
@@ -9,7 +9,7 @@
* J. Geodesy <b>87</b>, 43--55 (2013);
* DOI: <a href="https://dx.doi.org/10.1007/s00190-012-0578-z">
* 10.1007/s00190-012-0578-z</a>;
- * addenda: <a href="http://geographiclib.sf.net/geod-addenda.html">
+ * addenda: <a href="http://geographiclib.sourceforge.net/geod-addenda.html">
* geod-addenda.html</a>.
* .
* The principal advantages of these algorithms over previous ones (e.g.,
@@ -96,8 +96,8 @@
* [\e d, \e d], for arbitrary \e d.
*
* These routines are a simple transcription of the corresponding C++ classes
- * in <a href="http://geographiclib.sf.net"> GeographicLib</a>. The "class
- * data" is represented by the structs geod_geodesic, geod_geodesicline,
+ * in <a href="http://geographiclib.sourceforge.net"> GeographicLib</a>. The
+ * "class data" is represented by the structs geod_geodesic, geod_geodesicline,
* geod_polygon and pointers to these objects are passed as initial arguments
* to the member functions. Most of the internal comments have been retained.
* However, in the process of transcription some documentation has been lost
@@ -107,12 +107,12 @@
* twice about restructuring the internals of the C code since this may make
* porting fixes from the C++ code more difficult.
*
- * Copyright (c) Charles Karney (2012-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2012-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
*
* This library was distributed with
- * <a href="../index.html">GeographicLib</a> 1.45.
+ * <a href="../index.html">GeographicLib</a> 1.46.
**********************************************************************/
#if !defined(GEODESIC_H)
@@ -127,7 +127,7 @@
* The minor version of the geodesic library. (This tracks the version of
* GeographicLib.)
**********************************************************************/
-#define GEODESIC_VERSION_MINOR 45
+#define GEODESIC_VERSION_MINOR 46
/**
* The patch level of the geodesic library. (This tracks the version of
* GeographicLib.)
@@ -176,7 +176,8 @@ extern "C" {
/**
* The struct containing information about a single geodesic. This must be
- * initialized by geod_lineinit() before use.
+ * initialized by geod_lineinit(), geod_directline(), geod_gendirectline(),
+ * or geod_inverseline() before use.
**********************************************************************/
struct geod_geodesicline {
double lat1; /**< the starting latitude */
@@ -184,9 +185,13 @@ extern "C" {
double azi1; /**< the starting azimuth */
double a; /**< the equatorial radius */
double f; /**< the flattening */
+ double salp1; /**< sine of \e azi1 */
+ double calp1; /**< cosine of \e azi1 */
+ double a13; /**< arc length to reference point */
+ double s13; /**< distance to reference point */
/**< @cond SKIP */
double b, c2, f1, salp0, calp0, k2,
- salp1, calp1, ssig1, csig1, dn1, stau1, ctau1, somg1, comg1,
+ ssig1, csig1, dn1, stau1, ctau1, somg1, comg1,
A1m1, A2m1, A3c, B11, B21, B31, A4, B41;
double C1a[6+1], C1pa[6+1], C2a[6+1], C3a[6], C4a[6];
/**< @endcond */
@@ -222,46 +227,6 @@ extern "C" {
void geod_init(struct geod_geodesic* g, double a, double f);
/**
- * Initialize a geod_geodesicline object.
- *
- * @param[out] l a pointer to the object to be initialized.
- * @param[in] g a pointer to the geod_geodesic object specifying the
- * ellipsoid.
- * @param[in] lat1 latitude of point 1 (degrees).
- * @param[in] lon1 longitude of point 1 (degrees).
- * @param[in] azi1 azimuth at point 1 (degrees).
- * @param[in] caps bitor'ed combination of geod_mask() values specifying the
- * capabilities the geod_geodesicline object should possess, i.e., which
- * quantities can be returned in calls to geod_position() and
- * geod_genposition().
- *
- * \e g must have been initialized with a call to geod_init(). \e lat1
- * should be in the range [−90°, 90°].
- *
- * The geod_mask values are [see geod_mask()]:
- * - \e caps |= GEOD_LATITUDE for the latitude \e lat2; this is
- * added automatically,
- * - \e caps |= GEOD_LONGITUDE for the latitude \e lon2,
- * - \e caps |= GEOD_AZIMUTH for the latitude \e azi2; this is
- * added automatically,
- * - \e caps |= GEOD_DISTANCE for the distance \e s12,
- * - \e caps |= GEOD_REDUCEDLENGTH for the reduced length \e m12,
- * - \e caps |= GEOD_GEODESICSCALE for the geodesic scales \e M12
- * and \e M21,
- * - \e caps |= GEOD_AREA for the area \e S12,
- * - \e caps |= GEOD_DISTANCE_IN permits the length of the
- * geodesic to be given in terms of \e s12; without this capability the
- * length can only be specified in terms of arc length.
- * .
- * A value of \e caps = 0 is treated as GEOD_LATITUDE | GEOD_LONGITUDE |
- * GEOD_AZIMUTH | GEOD_DISTANCE_IN (to support the solution of the "standard"
- * direct problem).
- **********************************************************************/
- void geod_lineinit(struct geod_geodesicline* l,
- const struct geod_geodesic* g,
- double lat1, double lon1, double azi1, unsigned caps);
-
- /**
* Solve the direct geodesic problem.
*
* @param[in] g a pointer to the geod_geodesic object specifying the
@@ -269,7 +234,7 @@ extern "C" {
* @param[in] lat1 latitude of point 1 (degrees).
* @param[in] lon1 longitude of point 1 (degrees).
* @param[in] azi1 azimuth at point 1 (degrees).
- * @param[in] s12 distance between point 1 and point 2 (meters); it can be
+ * @param[in] s12 distance from point 1 to point 2 (meters); it can be
* negative.
* @param[out] plat2 pointer to the latitude of point 2 (degrees).
* @param[out] plon2 pointer to the longitude of point 2 (degrees).
@@ -302,6 +267,51 @@ extern "C" {
double* plat2, double* plon2, double* pazi2);
/**
+ * The general direct geodesic problem.
+ *
+ * @param[in] g a pointer to the geod_geodesic object specifying the
+ * ellipsoid.
+ * @param[in] lat1 latitude of point 1 (degrees).
+ * @param[in] lon1 longitude of point 1 (degrees).
+ * @param[in] azi1 azimuth at point 1 (degrees).
+ * @param[in] flags bitor'ed combination of geod_flags(); \e flags &
+ * GEOD_ARCMODE determines the meaning of \e s12_a12 and \e flags &
+ * GEOD_LONG_UNROLL "unrolls" \e lon2.
+ * @param[in] s12_a12 if \e flags & GEOD_ARCMODE is 0, this is the distance
+ * from point 1 to point 2 (meters); otherwise it is the arc length
+ * from point 1 to point 2 (degrees); it can be negative.
+ * @param[out] plat2 pointer to the latitude of point 2 (degrees).
+ * @param[out] plon2 pointer to the longitude of point 2 (degrees).
+ * @param[out] pazi2 pointer to the (forward) azimuth at point 2 (degrees).
+ * @param[out] ps12 pointer to the distance from point 1 to point 2
+ * (meters).
+ * @param[out] pm12 pointer to the reduced length of geodesic (meters).
+ * @param[out] pM12 pointer to the geodesic scale of point 2 relative to
+ * point 1 (dimensionless).
+ * @param[out] pM21 pointer to the geodesic scale of point 1 relative to
+ * point 2 (dimensionless).
+ * @param[out] pS12 pointer to the area under the geodesic
+ * (meters<sup>2</sup>).
+ * @return \e a12 arc length from point 1 to point 2 (degrees).
+ *
+ * \e g must have been initialized with a call to geod_init(). \e lat1
+ * should be in the range [−90°, 90°]. The function value \e
+ * a12 equals \e s12_a12 if \e flags & GEOD_ARCMODE. Any of the "return"
+ * arguments, \e plat2, etc., may be replaced by 0, if you do not need some
+ * quantities computed.
+ *
+ * With \e flags & GEOD_LONG_UNROLL bit set, the longitude is "unrolled" so
+ * that the quantity \e lon2 − \e lon1 indicates how many times and in
+ * what sense the geodesic encircles the ellipsoid.
+ **********************************************************************/
+ double geod_gendirect(const struct geod_geodesic* g,
+ double lat1, double lon1, double azi1,
+ unsigned flags, double s12_a12,
+ double* plat2, double* plon2, double* pazi2,
+ double* ps12, double* pm12, double* pM12, double* pM21,
+ double* pS12);
+
+ /**
* Solve the inverse geodesic problem.
*
* @param[in] g a pointer to the geod_geodesic object specifying the
@@ -310,7 +320,7 @@ extern "C" {
* @param[in] lon1 longitude of point 1 (degrees).
* @param[in] lat2 latitude of point 2 (degrees).
* @param[in] lon2 longitude of point 2 (degrees).
- * @param[out] ps12 pointer to the distance between point 1 and point 2
+ * @param[out] ps12 pointer to the distance from point 1 to point 2
* (meters).
* @param[out] pazi1 pointer to the azimuth at point 1 (degrees).
* @param[out] pazi2 pointer to the (forward) azimuth at point 2 (degrees).
@@ -344,22 +354,180 @@ extern "C" {
double* ps12, double* pazi1, double* pazi2);
/**
+ * The general inverse geodesic calculation.
+ *
+ * @param[in] g a pointer to the geod_geodesic object specifying the
+ * ellipsoid.
+ * @param[in] lat1 latitude of point 1 (degrees).
+ * @param[in] lon1 longitude of point 1 (degrees).
+ * @param[in] lat2 latitude of point 2 (degrees).
+ * @param[in] lon2 longitude of point 2 (degrees).
+ * @param[out] ps12 pointer to the distance from point 1 to point 2
+ * (meters).
+ * @param[out] pazi1 pointer to the azimuth at point 1 (degrees).
+ * @param[out] pazi2 pointer to the (forward) azimuth at point 2 (degrees).
+ * @param[out] pm12 pointer to the reduced length of geodesic (meters).
+ * @param[out] pM12 pointer to the geodesic scale of point 2 relative to
+ * point 1 (dimensionless).
+ * @param[out] pM21 pointer to the geodesic scale of point 1 relative to
+ * point 2 (dimensionless).
+ * @param[out] pS12 pointer to the area under the geodesic
+ * (meters<sup>2</sup>).
+ * @return \e a12 arc length from point 1 to point 2 (degrees).
+ *
+ * \e g must have been initialized with a call to geod_init(). \e lat1 and
+ * \e lat2 should be in the range [−90°, 90°]. Any of the
+ * "return" arguments \e ps12, etc., may be replaced by 0, if you do not need
+ * some quantities computed.
+ **********************************************************************/
+ double geod_geninverse(const struct geod_geodesic* g,
+ double lat1, double lon1, double lat2, double lon2,
+ double* ps12, double* pazi1, double* pazi2,
+ double* pm12, double* pM12, double* pM21,
+ double* pS12);
+
+ /**
+ * Initialize a geod_geodesicline object.
+ *
+ * @param[out] l a pointer to the object to be initialized.
+ * @param[in] g a pointer to the geod_geodesic object specifying the
+ * ellipsoid.
+ * @param[in] lat1 latitude of point 1 (degrees).
+ * @param[in] lon1 longitude of point 1 (degrees).
+ * @param[in] azi1 azimuth at point 1 (degrees).
+ * @param[in] caps bitor'ed combination of geod_mask() values specifying the
+ * capabilities the geod_geodesicline object should possess, i.e., which
+ * quantities can be returned in calls to geod_position() and
+ * geod_genposition().
+ *
+ * \e g must have been initialized with a call to geod_init(). \e lat1
+ * should be in the range [−90°, 90°].
+ *
+ * The geod_mask values are [see geod_mask()]:
+ * - \e caps |= GEOD_LATITUDE for the latitude \e lat2; this is
+ * added automatically,
+ * - \e caps |= GEOD_LONGITUDE for the latitude \e lon2,
+ * - \e caps |= GEOD_AZIMUTH for the latitude \e azi2; this is
+ * added automatically,
+ * - \e caps |= GEOD_DISTANCE for the distance \e s12,
+ * - \e caps |= GEOD_REDUCEDLENGTH for the reduced length \e m12,
+ * - \e caps |= GEOD_GEODESICSCALE for the geodesic scales \e M12
+ * and \e M21,
+ * - \e caps |= GEOD_AREA for the area \e S12,
+ * - \e caps |= GEOD_DISTANCE_IN permits the length of the
+ * geodesic to be given in terms of \e s12; without this capability the
+ * length can only be specified in terms of arc length.
+ * .
+ * A value of \e caps = 0 is treated as GEOD_LATITUDE | GEOD_LONGITUDE |
+ * GEOD_AZIMUTH | GEOD_DISTANCE_IN (to support the solution of the "standard"
+ * direct problem).
+ *
+ * When initialized by this function, point 3 is undefined (l->s13 = l->a13 =
+ * NaN).
+ **********************************************************************/
+ void geod_lineinit(struct geod_geodesicline* l,
+ const struct geod_geodesic* g,
+ double lat1, double lon1, double azi1, unsigned caps);
+
+ /**
+ * Initialize a geod_geodesicline object in terms of the direct geodesic
+ * problem.
+ *
+ * @param[out] l a pointer to the object to be initialized.
+ * @param[in] g a pointer to the geod_geodesic object specifying the
+ * ellipsoid.
+ * @param[in] lat1 latitude of point 1 (degrees).
+ * @param[in] lon1 longitude of point 1 (degrees).
+ * @param[in] azi1 azimuth at point 1 (degrees).
+ * @param[in] s12 distance from point 1 to point 2 (meters); it can be
+ * negative.
+ * @param[in] caps bitor'ed combination of geod_mask() values specifying the
+ * capabilities the geod_geodesicline object should possess, i.e., which
+ * quantities can be returned in calls to geod_position() and
+ * geod_genposition().
+ *
+ * This function sets point 3 of the geod_geodesicline to correspond to point
+ * 2 of the direct geodesic problem. See geod_lineinit() for more
+ * informaion.
+ **********************************************************************/
+ void geod_directline(struct geod_geodesicline* l,
+ const struct geod_geodesic* g,
+ double lat1, double lon1, double azi1, double s12,
+ unsigned caps);
+
+ /**
+ * Initialize a geod_geodesicline object in terms of the direct geodesic
+ * problem spacified in terms of either distance or arc length.
+ *
+ * @param[out] l a pointer to the object to be initialized.
+ * @param[in] g a pointer to the geod_geodesic object specifying the
+ * ellipsoid.
+ * @param[in] lat1 latitude of point 1 (degrees).
+ * @param[in] lon1 longitude of point 1 (degrees).
+ * @param[in] azi1 azimuth at point 1 (degrees).
+ * @param[in] flags either GEOD_NOFLAGS or GEOD_ARCMODE to determining the
+ * meaning of the \e s12_a12.
+ * @param[in] s12_a12 if \e flags = GEOD_NOFLAGS, this is the distance
+ * from point 1 to point 2 (meters); if \e flags = GEOD_ARCMODE, it is
+ * the arc length from point 1 to point 2 (degrees); it can be
+ * negative.
+ * @param[in] caps bitor'ed combination of geod_mask() values specifying the
+ * capabilities the geod_geodesicline object should possess, i.e., which
+ * quantities can be returned in calls to geod_position() and
+ * geod_genposition().
+ *
+ * This function sets point 3 of the geod_geodesicline to correspond to point
+ * 2 of the direct geodesic problem. See geod_lineinit() for more
+ * informaion.
+ **********************************************************************/
+ void geod_gendirectline(struct geod_geodesicline* l,
+ const struct geod_geodesic* g,
+ double lat1, double lon1, double azi1,
+ unsigned flags, double s12_a12,
+ unsigned caps);
+
+ /**
+ * Initialize a geod_geodesicline object in terms of the inverse geodesic
+ * problem.
+ *
+ * @param[out] l a pointer to the object to be initialized.
+ * @param[in] g a pointer to the geod_geodesic object specifying the
+ * ellipsoid.
+ * @param[in] lat1 latitude of point 1 (degrees).
+ * @param[in] lon1 longitude of point 1 (degrees).
+ * @param[in] lat2 latitude of point 2 (degrees).
+ * @param[in] lon2 longitude of point 2 (degrees).
+ * @param[in] caps bitor'ed combination of geod_mask() values specifying the
+ * capabilities the geod_geodesicline object should possess, i.e., which
+ * quantities can be returned in calls to geod_position() and
+ * geod_genposition().
+ *
+ * This function sets point 3 of the geod_geodesicline to correspond to point
+ * 2 of the inverse geodesic problem. See geod_lineinit() for more
+ * informaion.
+ **********************************************************************/
+ void geod_inverseline(struct geod_geodesicline* l,
+ const struct geod_geodesic* g,
+ double lat1, double lon1, double lat2, double lon2,
+ unsigned caps);
+
+ /**
* Compute the position along a geod_geodesicline.
*
* @param[in] l a pointer to the geod_geodesicline object specifying the
* geodesic line.
- * @param[in] s12 distance between point 1 and point 2 (meters); it can be
+ * @param[in] s12 distance from point 1 to point 2 (meters); it can be
* negative.
* @param[out] plat2 pointer to the latitude of point 2 (degrees).
* @param[out] plon2 pointer to the longitude of point 2 (degrees); requires
* that \e l was initialized with \e caps |= GEOD_LONGITUDE.
* @param[out] pazi2 pointer to the (forward) azimuth at point 2 (degrees).
*
- * \e l must have been initialized with a call to geod_lineinit() with \e
- * caps |= GEOD_DISTANCE_IN. The values of \e lon2 and \e azi2 returned are
- * in the range [−180°, 180°). Any of the "return" arguments
- * \e plat2, etc., may be replaced by 0, if you do not need some quantities
- * computed.
+ * \e l must have been initialized with a call, e.g., to geod_lineinit(),
+ * with \e caps |= GEOD_DISTANCE_IN. The values of \e lon2 and \e azi2
+ * returned are in the range [−180°, 180°). Any of the
+ * "return" arguments \e plat2, etc., may be replaced by 0, if you do not
+ * need some quantities computed.
*
* Example, compute way points between JFK and Singapore Changi Airport
* the "obvious" way using geod_direct():
@@ -378,13 +546,12 @@ extern "C" {
@code{.c}
struct geod_geodesic g;
struct geod_geodesicline l;
- double s12, azi1, lat[101],lon[101];
+ double lat[101],lon[101];
int i;
geod_init(&g, 6378137, 1/298.257223563);
- geod_inverse(&g, 40.64, -73.78, 1.36, 103.99, &s12, &azi1, 0);
- geod_lineinit(&l, &g, 40.64, -73.78, azi1, 0);
- for (i = 0; i < 101; ++i) {
- geod_position(&l, i * s12 * 0.01, lat + i, lon + i, 0);
+ geod_inverseline(&l, &g, 40.64, -73.78, 1.36, 103.99, 0);
+ for (i = 0; i <= 100; ++i) {
+ geod_position(&l, i * l.s13 * 0.01, lat + i, lon + i, 0);
printf("%.5f %.5f\n", lat[i], lon[i]);
}
@endcode
@@ -393,84 +560,6 @@ extern "C" {
double* plat2, double* plon2, double* pazi2);
/**
- * The general direct geodesic problem.
- *
- * @param[in] g a pointer to the geod_geodesic object specifying the
- * ellipsoid.
- * @param[in] lat1 latitude of point 1 (degrees).
- * @param[in] lon1 longitude of point 1 (degrees).
- * @param[in] azi1 azimuth at point 1 (degrees).
- * @param[in] flags bitor'ed combination of geod_flags(); \e flags &
- * GEOD_ARCMODE determines the meaning of \e s12_a12 and \e flags &
- * GEOD_LONG_UNROLL "unrolls" \e lon2.
- * @param[in] s12_a12 if \e flags & GEOD_ARCMODE is 0, this is the distance
- * between point 1 and point 2 (meters); otherwise it is the arc length
- * between point 1 and point 2 (degrees); it can be negative.
- * @param[out] plat2 pointer to the latitude of point 2 (degrees).
- * @param[out] plon2 pointer to the longitude of point 2 (degrees).
- * @param[out] pazi2 pointer to the (forward) azimuth at point 2 (degrees).
- * @param[out] ps12 pointer to the distance between point 1 and point 2
- * (meters).
- * @param[out] pm12 pointer to the reduced length of geodesic (meters).
- * @param[out] pM12 pointer to the geodesic scale of point 2 relative to
- * point 1 (dimensionless).
- * @param[out] pM21 pointer to the geodesic scale of point 1 relative to
- * point 2 (dimensionless).
- * @param[out] pS12 pointer to the area under the geodesic
- * (meters<sup>2</sup>).
- * @return \e a12 arc length of between point 1 and point 2 (degrees).
- *
- * \e g must have been initialized with a call to geod_init(). \e lat1
- * should be in the range [−90°, 90°]. The function value \e
- * a12 equals \e s12_a12 if \e flags & GEOD_ARCMODE. Any of the "return"
- * arguments, \e plat2, etc., may be replaced by 0, if you do not need some
- * quantities computed.
- *
- * With \e flags & GEOD_LONG_UNROLL bit set, the longitude is "unrolled" so
- * that the quantity \e lon2 − \e lon1 indicates how many times and in
- * what sense the geodesic encircles the ellipsoid.
- **********************************************************************/
- double geod_gendirect(const struct geod_geodesic* g,
- double lat1, double lon1, double azi1,
- unsigned flags, double s12_a12,
- double* plat2, double* plon2, double* pazi2,
- double* ps12, double* pm12, double* pM12, double* pM21,
- double* pS12);
-
- /**
- * The general inverse geodesic calculation.
- *
- * @param[in] g a pointer to the geod_geodesic object specifying the
- * ellipsoid.
- * @param[in] lat1 latitude of point 1 (degrees).
- * @param[in] lon1 longitude of point 1 (degrees).
- * @param[in] lat2 latitude of point 2 (degrees).
- * @param[in] lon2 longitude of point 2 (degrees).
- * @param[out] ps12 pointer to the distance between point 1 and point 2
- * (meters).
- * @param[out] pazi1 pointer to the azimuth at point 1 (degrees).
- * @param[out] pazi2 pointer to the (forward) azimuth at point 2 (degrees).
- * @param[out] pm12 pointer to the reduced length of geodesic (meters).
- * @param[out] pM12 pointer to the geodesic scale of point 2 relative to
- * point 1 (dimensionless).
- * @param[out] pM21 pointer to the geodesic scale of point 1 relative to
- * point 2 (dimensionless).
- * @param[out] pS12 pointer to the area under the geodesic
- * (meters<sup>2</sup>).
- * @return \e a12 arc length of between point 1 and point 2 (degrees).
- *
- * \e g must have been initialized with a call to geod_init(). \e lat1 and
- * \e lat2 should be in the range [−90°, 90°]. Any of the
- * "return" arguments \e ps12, etc., may be replaced by 0, if you do not need
- * some quantities computed.
- **********************************************************************/
- double geod_geninverse(const struct geod_geodesic* g,
- double lat1, double lon1, double lat2, double lon2,
- double* ps12, double* pazi1, double* pazi2,
- double* pm12, double* pM12, double* pM21,
- double* pS12);
-
- /**
* The general position function.
*
* @param[in] l a pointer to the geod_geodesicline object specifying the
@@ -480,14 +569,14 @@ extern "C" {
* GEOD_LONG_UNROLL "unrolls" \e lon2; if \e flags & GEOD_ARCMODE is 0,
* then \e l must have been initialized with \e caps |= GEOD_DISTANCE_IN.
* @param[in] s12_a12 if \e flags & GEOD_ARCMODE is 0, this is the
- * distance between point 1 and point 2 (meters); otherwise it is the
- * arc length between point 1 and point 2 (degrees); it can be
+ * distance from point 1 to point 2 (meters); otherwise it is the
+ * arc length from point 1 to point 2 (degrees); it can be
* negative.
* @param[out] plat2 pointer to the latitude of point 2 (degrees).
* @param[out] plon2 pointer to the longitude of point 2 (degrees); requires
* that \e l was initialized with \e caps |= GEOD_LONGITUDE.
* @param[out] pazi2 pointer to the (forward) azimuth at point 2 (degrees).
- * @param[out] ps12 pointer to the distance between point 1 and point 2
+ * @param[out] ps12 pointer to the distance from point 1 to point 2
* (meters); requires that \e l was initialized with \e caps |=
* GEOD_DISTANCE.
* @param[out] pm12 pointer to the reduced length of geodesic (meters);
@@ -501,7 +590,7 @@ extern "C" {
* @param[out] pS12 pointer to the area under the geodesic
* (meters<sup>2</sup>); requires that \e l was initialized with \e caps |=
* GEOD_AREA.
- * @return \e a12 arc length of between point 1 and point 2 (degrees).
+ * @return \e a12 arc length from point 1 to point 2 (degrees).
*
* \e l must have been initialized with a call to geod_lineinit() with \e
* caps |= GEOD_DISTANCE_IN. The value \e azi2 returned is in the range
@@ -514,22 +603,21 @@ extern "C" {
* that the quantity \e lon2 − \e lon1 indicates how many times and in
* what sense the geodesic encircles the ellipsoid.
*
- * Example, compute way points between JFK and Singapore Changi Airport
- * using geod_genposition(). In this example, the points are evenly space in
- * arc length (and so only approximately equally space in distance). This is
- * faster than using geod_position() would be appropriate if drawing the path
- * on a map.
+ * Example, compute way points between JFK and Singapore Changi Airport using
+ * geod_genposition(). In this example, the points are evenly space in arc
+ * length (and so only approximately equally spaced in distance). This is
+ * faster than using geod_position() and would be appropriate if drawing the
+ * path on a map.
@code{.c}
struct geod_geodesic g;
struct geod_geodesicline l;
- double a12, azi1, lat[101], lon[101];
+ double lat[101], lon[101];
int i;
geod_init(&g, 6378137, 1/298.257223563);
- a12 = geod_geninverse(&g, 40.64, -73.78, 1.36, 103.99,
- 0, &azi1, 0, 0, 0, 0, 0);
- geod_lineinit(&l, &g, 40.64, -73.78, azi1, GEOD_LATITUDE | GEOD_LONGITUDE);
- for (i = 0; i < 101; ++i) {
- geod_genposition(&l, 1, i * a12 * 0.01,
+ geod_inverseline(&l, &g, 40.64, -73.78, 1.36, 103.99,
+ GEOD_LATITUDE | GEOD_LONGITUDE);
+ for (i = 0; i <= 100; ++i) {
+ geod_genposition(&l, GEOD_ARCMODE, i * l.a13 * 0.01,
lat + i, lon + i, 0, 0, 0, 0, 0, 0);
printf("%.5f %.5f\n", lat[i], lon[i]);
}
@@ -543,6 +631,36 @@ extern "C" {
double* pS12);
/**
+ * Specify position of point 3 in terms of distance.
+ *
+ * @param[inout] l a pointer to the geod_geodesicline object.
+ * @param[in] s13 the distance from point 1 to point 3 (meters); it
+ * can be negative.
+ *
+ * This is only useful if the geod_geodesicline object has been constructed
+ * with \e caps |= GEOD_DISTANCE_IN.
+ **********************************************************************/
+ void geod_setdistance(struct geod_geodesicline* l, double s13);
+
+ /**
+ * Specify position of point 3 in terms of either distance or arc length.
+ *
+ * @param[inout] l a pointer to the geod_geodesicline object.
+ * @param[in] flags either GEOD_NOFLAGS or GEOD_ARCMODE to determining the
+ * meaning of the \e s13_a13.
+ * @param[in] s13_a13 if \e flags = GEOD_NOFLAGS, this is the distance
+ * from point 1 to point 3 (meters); if \e flags = GEOD_ARCMODE, it is
+ * the arc length from point 1 to point 3 (degrees); it can be
+ * negative.
+ *
+ * If flags = GEOD_NOFLAGS, this calls geod_setdistance(). If flags =
+ * GEOD_ARCMODE, the \e s13 is only set if the geod_geodesicline object has
+ * been constructed with \e caps |= GEOD_DISTANCE.
+ **********************************************************************/
+ void geod_gensetdistance(struct geod_geodesicline* l,
+ unsigned flags, double s13_a13);
+
+ /**
* Initialize a geod_polygon object.
*
* @param[out] p a pointer to the object to be initialized.
@@ -782,10 +900,7 @@ extern "C" {
enum geod_flags {
GEOD_NOFLAGS = 0U, /**< No flags */
GEOD_ARCMODE = 1U<<0, /**< Position given in terms of arc distance */
- GEOD_LONG_UNROLL = 1U<<15, /**< Unroll the longitude */
- /**< @cond SKIP */
- GEOD_LONG_NOWRAP = GEOD_LONG_UNROLL /* For backward compatibility only */
- /**< @endcond */
+ GEOD_LONG_UNROLL = 1U<<15 /**< Unroll the longitude */
};
#if defined(__cplusplus)
diff --git a/legacy/C/geodtest.c b/legacy/C/geodtest.c
index 7500961..990a213 100644
--- a/legacy/C/geodtest.c
+++ b/legacy/C/geodtest.c
@@ -4,8 +4,8 @@
*
* Run these tests by configuring with cmake and running "make test".
*
- * Copyright (c) Charles Karney (2015) <charles at karney.com> and licensed under
- * the MIT/X11 License. For more information, see
+ * Copyright (c) Charles Karney (2015-2016) <charles at karney.com> and licensed
+ * under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
**********************************************************************/
@@ -15,6 +15,11 @@
#include <stdio.h>
#include <math.h>
+#if defined(_MSC_VER)
+// Squelch warnings about assignment within conditional expression
+# pragma warning (disable: 4706)
+#endif
+
double wgs84_a = 6378137, wgs84_f = 1/298.257223563; /* WGS84 */
int assertEquals(double x, double y, double d) {
@@ -483,6 +488,128 @@ int GeodSolve55() {
return result;
}
+int GeodSolve59() {
+ /* Check for points close with longitudes close to 180 deg apart. */
+ double azi1, azi2, s12;
+ struct geod_geodesic g;
+ int result = 0;
+ geod_init(&g, wgs84_a, wgs84_f);
+ geod_inverse(&g, 5, 0.00000000000001, 10, 180, &s12, &azi1, &azi2);
+ result += assertEquals(azi1, 0.000000000000035, 1.5e-14);
+ result += assertEquals(azi2, 179.99999999999996, 1.5e-14);
+ result += assertEquals(s12, 18345191.174332713, 2.5e-9);
+ return result;
+}
+
+int GeodSolve61() {
+ /* Make sure small negative azimuths are west-going */
+ double lat2, lon2, azi2;
+ struct geod_geodesic g;
+ struct geod_geodesicline l;
+ int result = 0;
+ unsigned flags = GEOD_LONG_UNROLL;
+ geod_init(&g, wgs84_a, wgs84_f);
+ geod_gendirect(&g, 45, 0, -0.000000000000000003, flags, 1e7,
+ &lat2, &lon2, &azi2, 0, 0, 0, 0, 0);
+ result += assertEquals(lat2, 45.30632, 0.5e-5);
+ result += assertEquals(lon2, -180, 0.5e-5);
+ result += assertEquals(azi2, -180, 0.5e-5);
+ geod_inverseline(&l, &g, 45, 0, 80, -0.000000000000000003, 0);
+ geod_genposition(&l, flags, 1e7, &lat2, &lon2, &azi2, 0, 0, 0, 0, 0);
+ result += assertEquals(lat2, 45.30632, 0.5e-5);
+ result += assertEquals(lon2, -180, 0.5e-5);
+ result += assertEquals(azi2, -180, 0.5e-5);
+ return result;
+}
+
+int GeodSolve65() {
+ /* Check for bug in east-going check in GeodesicLine (needed to check for
+ * sign of 0) and sign error in area calculation due to a bogus override of
+ * the code for alp12. Found/fixed on 2015-12-19. */
+ double lat2, lon2, azi2, s12, a12, m12, M12, M21, S12;
+ struct geod_geodesic g;
+ struct geod_geodesicline l;
+ int result = 0;
+ unsigned flags = GEOD_LONG_UNROLL, caps = GEOD_ALL;
+ geod_init(&g, wgs84_a, wgs84_f);
+ geod_inverseline(&l, &g, 30, -0.000000000000000001, -31, 180, caps);
+ a12 = geod_genposition(&l, flags, 1e7,
+ &lat2, &lon2, &azi2, &s12, &m12, &M12, &M21, &S12);
+ result += assertEquals(lat2, -60.23169, 0.5e-5);
+ result += assertEquals(lon2, -0.00000, 0.5e-5);
+ result += assertEquals(azi2, -180.00000, 0.5e-5);
+ result += assertEquals(s12, 10000000, 0.5);
+ result += assertEquals(a12, 90.06544, 0.5e-5);
+ result += assertEquals(m12, 6363636, 0.5);
+ result += assertEquals(M12, -0.0012834, 0.5e-7);
+ result += assertEquals(M21, 0.0013749, 0.5e-7);
+ result += assertEquals(S12, 0, 0.5);
+ a12 = geod_genposition(&l, flags, 2e7,
+ &lat2, &lon2, &azi2, &s12, &m12, &M12, &M21, &S12);
+ result += assertEquals(lat2, -30.03547, 0.5e-5);
+ result += assertEquals(lon2, -180.00000, 0.5e-5);
+ result += assertEquals(azi2, -0.00000, 0.5e-5);
+ result += assertEquals(s12, 20000000, 0.5);
+ result += assertEquals(a12, 179.96459, 0.5e-5);
+ result += assertEquals(m12, 54342, 0.5);
+ result += assertEquals(M12, -1.0045592, 0.5e-7);
+ result += assertEquals(M21, -0.9954339, 0.5e-7);
+ result += assertEquals(S12, 127516405431022.0, 0.5);
+ return result;
+}
+
+int GeodSolve67() {
+ /* Check for InverseLine if line is slightly west of S and that s13 is
+ correctly set. */
+ double lat2, lon2, azi2;
+ struct geod_geodesic g;
+ struct geod_geodesicline l;
+ int result = 0;
+ unsigned flags = GEOD_LONG_UNROLL;
+ geod_init(&g, wgs84_a, wgs84_f);
+ geod_inverseline(&l, &g, -5, -0.000000000000002, -10, 180, 0);
+ geod_genposition(&l, flags, 2e7, &lat2, &lon2, &azi2, 0, 0, 0, 0, 0);
+ result += assertEquals(lat2, 4.96445, 0.5e-5);
+ result += assertEquals(lon2, -180.00000, 0.5e-5);
+ result += assertEquals(azi2, -0.00000, 0.5e-5);
+ geod_genposition(&l, flags, 0.5 * l.s13, &lat2, &lon2, &azi2, 0, 0, 0, 0, 0);
+ result += assertEquals(lat2, -87.52461, 0.5e-5);
+ result += assertEquals(lon2, -0.00000, 0.5e-5);
+ result += assertEquals(azi2, -180.00000, 0.5e-5);
+ return result;
+}
+
+int GeodSolve71() {
+ /* Check that DirectLine sets s13. */
+ double lat2, lon2, azi2;
+ struct geod_geodesic g;
+ struct geod_geodesicline l;
+ int result = 0;
+ geod_init(&g, wgs84_a, wgs84_f);
+ geod_directline(&l, &g, 1, 2, 45, 1e7, 0);
+ geod_position(&l, 0.5 * l.s13, &lat2, &lon2, &azi2);
+ result += assertEquals(lat2, 30.92625, 0.5e-5);
+ result += assertEquals(lon2, 37.54640, 0.5e-5);
+ result += assertEquals(azi2, 55.43104, 0.5e-5);
+ return result;
+}
+
+int GeodSolve73() {
+ /* Check for backwards from the pole bug reported by Anon on 2016-02-13.
+ * This only affected the Java implementation. It was introduced in Java
+ * version 1.44 and fixed in 1.46-SNAPSHOT on 2016-01-17. */
+ double lat2, lon2, azi2;
+ struct geod_geodesic g;
+ int result = 0;
+ geod_init(&g, wgs84_a, wgs84_f);
+ geod_direct(&g, 90, 10, 180, -1e6,
+ &lat2, &lon2, &azi2);
+ result += assertEquals(lat2, 81.04623, 0.5e-5);
+ result += assertEquals(lon2, -170, 0.5e-5);
+ result += assertEquals(azi2, 0, 0.5e-5);
+ return result;
+}
+
void planimeter(const struct geod_geodesic* g, double points[][2], int N,
double* perimeter, double* area) {
struct geod_polygon p;
@@ -624,6 +751,12 @@ int main() {
if ((i = GeodSolve28())) {++n; printf("GeodSolve28 fail: %d\n", i);}
if ((i = GeodSolve33())) {++n; printf("GeodSolve33 fail: %d\n", i);}
if ((i = GeodSolve55())) {++n; printf("GeodSolve55 fail: %d\n", i);}
+ if ((i = GeodSolve59())) {++n; printf("GeodSolve59 fail: %d\n", i);}
+ if ((i = GeodSolve61())) {++n; printf("GeodSolve61 fail: %d\n", i);}
+ if ((i = GeodSolve65())) {++n; printf("GeodSolve65 fail: %d\n", i);}
+ if ((i = GeodSolve67())) {++n; printf("GeodSolve67 fail: %d\n", i);}
+ if ((i = GeodSolve71())) {++n; printf("GeodSolve71 fail: %d\n", i);}
+ if ((i = GeodSolve73())) {++n; printf("GeodSolve73 fail: %d\n", i);}
if ((i = Planimeter0())) {++n; printf("Planimeter0 fail: %d\n", i);}
if ((i = Planimeter5())) {++n; printf("Planimeter5 fail: %d\n", i);}
if ((i = Planimeter6())) {++n; printf("Planimeter6 fail: %d\n", i);}
diff --git a/legacy/Fortran/00README.txt b/legacy/Fortran/00README.txt
index 537c7ab..c56c5a5 100644
--- a/legacy/Fortran/00README.txt
+++ b/legacy/Fortran/00README.txt
@@ -4,7 +4,7 @@ This is a Fortran implementation of the geodesic algorithms described in
Algorithms for geodesics,
J. Geodesy 87, 43-55 (2013);
https://dx.doi.org/10.1007/s00190-012-0578-z
- Addenda: http://geographiclib.sf.net/geod-addenda.html
+ Addenda: http://geographiclib.sourceforge.net/geod-addenda.html
For documentation, see
diff --git a/legacy/Fortran/CMakeLists.txt b/legacy/Fortran/CMakeLists.txt
index 83d5164..fcf2664 100644
--- a/legacy/Fortran/CMakeLists.txt
+++ b/legacy/Fortran/CMakeLists.txt
@@ -1,6 +1,6 @@
-cmake_minimum_required (VERSION 2.8.4)
+project (GeographicLib-Fortran Fortran)
-project (GeographicLib-legacy-Fortran Fortran)
+cmake_minimum_required (VERSION 2.8.4)
# Set a default build type for single-configuration cmake generators if
# no build type is set.
diff --git a/legacy/Fortran/geodesic.for b/legacy/Fortran/geodesic.for
index 27f3791..186243f 100644
--- a/legacy/Fortran/geodesic.for
+++ b/legacy/Fortran/geodesic.for
@@ -12,7 +12,7 @@
*! J. Geodesy <b>87</b>, 43--55 (2013);
*! DOI: <a href="https://dx.doi.org/10.1007/s00190-012-0578-z">
*! 10.1007/s00190-012-0578-z</a>;
-*! addenda: <a href="http://geographiclib.sf.net/geod-addenda.html">
+*! addenda: <a href="http://geographiclib.sourceforge.net/geod-addenda.html">
*! geod-addenda.html</a>.
*! .
*! The principal advantages of these algorithms over previous ones
@@ -101,7 +101,7 @@
*! → [\e azi1, \e azi2] + [\e d, \e d], for arbitrary \e d.
*!
*! These routines are a simple transcription of the corresponding C++
-*! classes in <a href="http://geographiclib.sf.net"> GeographicLib</a>.
+*! classes in <a href="http://geographiclib.sourceforge.net"> GeographicLib</a>.
*! Because of the limitations of Fortran 77, the classes have been
*! replaced by simple subroutines with no attempt to save "state" across
*! subroutine calls. Most of the internal comments have been retained.
@@ -113,12 +113,12 @@
*! restructuring the internals of the Fortran code since this may make
*! porting fixes from the C++ code more difficult.
*!
-*! Copyright (c) Charles Karney (2012-2015) <charles at karney.com> and
+*! Copyright (c) Charles Karney (2012-2016) <charles at karney.com> and
*! licensed under the MIT/X11 License. For more information, see
*! http://geographiclib.sourceforge.net/
*!
*! This library was distributed with
-*! <a href="../index.html">GeographicLib</a> 1.45.
+*! <a href="../index.html">GeographicLib</a> 1.46.
*> Solve the direct geodesic problem
*!
@@ -129,8 +129,8 @@
*! @param[in] lon1 longitude of point 1 (degrees).
*! @param[in] azi1 azimuth at point 1 (degrees).
*! @param[in] s12a12 if \e arcmode is not set, this is the distance
-*! between point 1 and point 2 (meters); otherwise it is the arc
-*! length between point 1 and point 2 (degrees); it can be negative.
+*! from point 1 to point 2 (meters); otherwise it is the arc
+*! length from point 1 to point 2 (degrees); it can be negative.
*! @param[in] flags a bitor'ed combination of the \e arcmode and \e
*! unroll flags.
*! @param[out] lat2 latitude of point 2 (degrees).
@@ -139,8 +139,8 @@
*! @param[in] omask a bitor'ed combination of mask values
*! specifying which of the following parameters should be set.
*! @param[out] a12s12 if \e arcmode is not set, this is the arc length
-*! between point 1 and point 2 (degrees); otherwise it is the distance
-*! between point 1 and point 2 (meters).
+*! from point 1 to point 2 (degrees); otherwise it is the distance
+*! from point 1 to point 2 (meters).
*! @param[out] m12 reduced length of geodesic (meters).
*! @param[out] MM12 geodesic scale of point 2 relative to point 1
*! (dimensionless).
@@ -448,13 +448,6 @@
* alp12 = alp2 - alp1, used in atan2 so no need to normalize
salp12 = salp2 * calp1 - calp2 * salp1
calp12 = calp2 * calp1 + salp2 * salp1
-* The right thing appears to happen if alp1 = +/-180 and alp2 = 0, viz
-* salp12 = -0 and alp12 = -180. However this depends on the sign being
-* attached to 0 correctly. The following ensures the correct behavior.
- if (salp12 .eq. 0 .and. calp12 .lt. 0) then
- salp12 = tiny * calp1
- calp12 = -1
- end if
else
* tan(alp) = tan(alp0) * sec(sig)
* tan(alp2-alp1) = (tan(alp2) -tan(alp1)) / (tan(alp2)*tan(alp1)+1)
@@ -495,12 +488,12 @@
*! @param[in] lon1 longitude of point 1 (degrees).
*! @param[in] lat2 latitude of point 2 (degrees).
*! @param[in] lon2 longitude of point 2 (degrees).
-*! @param[out] s12 distance between point 1 and point 2 (meters).
+*! @param[out] s12 distance from point 1 to point 2 (meters).
*! @param[out] azi1 azimuth at point 1 (degrees).
*! @param[out] azi2 (forward) azimuth at point 2 (degrees).
*! @param[in] omask a bitor'ed combination of mask values
*! specifying which of the following parameters should be set.
-*! @param[out] a12 arc length of between point 1 and point 2 (degrees).
+*! @param[out] a12 arc length from point 1 to point 2 (degrees).
*! @param[out] m12 reduced length of geodesic (meters).
*! @param[out] MM12 geodesic scale of point 2 relative to point 1
*! (dimensionless).
@@ -558,9 +551,9 @@
+ lat1x, lat2x, salp0, calp0, k2, eps,
+ salp1, calp1, ssig1, csig1, cbet1, sbet1, dbet1, dn1,
+ salp2, calp2, ssig2, csig2, sbet2, cbet2, dbet2, dn2,
- + slam12, clam12, salp12, calp12, omg12, lam12, lon12,
+ + slam12, clam12, salp12, calp12, omg12, lam12, lon12, lon12s,
+ salp1a, calp1a, salp1b, calp1b,
- + dalp1, sdalp1, cdalp1, nsalp1, alp12, somg12, domg12,
+ + dalp1, sdalp1, cdalp1, nsalp1, alp12, somg12, comg12, domg12,
+ sig12, v, dv, dnm, dummy,
+ A4, B41, B42, s12x, m12x, a12x
@@ -608,14 +601,23 @@
* in [-180, 180] but -180 is only for west-going geodesics. 180 is for
* east-going and meridional geodesics.
* If very close to being on the same half-meridian, then make it so.
- lon12 = AngRnd(AngDif(lon1, lon2))
+ lon12 = AngDif(lon1, lon2, lon12s)
* Make longitude difference positive.
if (lon12 .ge. 0) then
lonsgn = 1
else
lonsgn = -1
end if
- lon12 = lon12 * lonsgn
+ lon12 = lonsgn * AngRnd(lon12)
+ lon12s = AngRnd((180 - lon12) - lonsgn * lon12s)
+ lam12 = lon12 * degree
+ if (lon12 .gt. 90) then
+ call sncsdx(lon12s, slam12, clam12)
+ clam12 = -clam12
+ else
+ call sncsdx(lon12, slam12, clam12)
+ end if
+
* If really close to the equator, treat as on equator.
lat1x = AngRnd(LatFix(lat1))
lat2x = AngRnd(LatFix(lat2))
@@ -680,9 +682,6 @@
dn1 = sqrt(1 + ep2 * sbet1**2)
dn2 = sqrt(1 + ep2 * sbet2**2)
- lam12 = lon12 * degree
- call sncsdx(lon12, slam12, clam12)
-
* Suppress bogus warnings about unitialized variables
a12x = 0
merid = lat1x .eq. -90 .or. slam12 .eq. 0
@@ -734,9 +733,11 @@
end if
end if
-* Mimic the way Lambda12 works with calp1 = 0
+ omg12 = 0
+* somg12 > 1 marks that it needs to be calculated
+ somg12 = 2
if (.not. merid .and. sbet1 .eq. 0 .and.
- + (f .le. 0 .or. lam12 .le. pi - f * pi)) then
+ + (f .le. 0 .or. lon12s .ge. f * 180)) then
* Geodesic runs along equator
calp1 = 0
@@ -758,7 +759,7 @@
* Figure a starting point for Newton's method
sig12 = InvSta(sbet1, cbet1, dn1, sbet2, cbet2, dn2, lam12,
- + f, A3x, salp1, calp1, salp2, calp2, dnm, Ca)
+ + slam12, clam12, f, A3x, salp1, calp1, salp2, calp2, dnm, Ca)
if (sig12 .ge. 0) then
* Short lines (InvSta sets salp2, calp2, dnm)
@@ -795,16 +796,14 @@
* the WGS84 test set: mean = 1.47, sd = 1.25, max = 16
* WGS84 and random input: mean = 2.85, sd = 0.60
v = Lam12f(sbet1, cbet1, dn1, sbet2, cbet2, dn2,
- + salp1, calp1, f, A3x, C3x, salp2, calp2, sig12,
- + ssig1, csig1, ssig2, csig2,
- + eps, omg12, numit .lt. maxit1, dv,
- + Ca) - lam12
-* 2 * tol0 is approximately 1 ulp for a number in [0, pi].
+ + salp1, calp1, slam12, clam12, f, A3x, C3x, salp2, calp2,
+ + sig12, ssig1, csig1, ssig2, csig2,
+ + eps, somg12, comg12, numit .lt. maxit1, dv, Ca)
* Reversed test to allow escape with NaNs
if (tripn) then
dummy = 8
else
- dummy = 2
+ dummy = 1
end if
if (tripb .or. .not. (abs(v) .ge. dummy * tol0))
+ go to 20
@@ -856,7 +855,6 @@
m12x = m12x * b
s12x = s12x * b
a12x = sig12 / degree
- omg12 = lam12 - omg12
end if
end if
@@ -889,13 +887,21 @@
SS12 = 0
end if
- if (.not. merid .and. omg12 .lt. 0.75d0 * pi
+ if (.not. merid) then
+ if (somg12 .gt. 1) then
+ somg12 = sin(omg12)
+ comg12 = cos(omg12)
+ else
+ call norm2(somg12, comg12)
+ end if
+ end if
+
+ if (.not. merid .and. comg12 .ge. 0.7071d0
+ .and. sbet2 - sbet1 .lt. 1.75d0) then
* Use tan(Gamma/2) = tan(omg12/2)
* * (tan(bet1/2)+tan(bet2/2))/(1+tan(bet1/2)*tan(bet2/2))
* with tan(x/2) = sin(x)/(1+cos(x))
- somg12 = sin(omg12)
- domg12 = 1 + cos(omg12)
+ domg12 = 1 + comg12
dbet1 = 1 + cbet1
dbet2 = 1 + cbet2
alp12 = 2 * atan2(somg12 * (sbet1 * dbet2 + sbet2 * dbet1),
@@ -1030,7 +1036,7 @@
integer major, minor, patch
major = 1
- minor = 45
+ minor = 46
patch = 0
return
@@ -1238,15 +1244,15 @@
end
double precision function InvSta(sbet1, cbet1, dn1,
- + sbet2, cbet2, dn2, lam12, f, A3x,
+ + sbet2, cbet2, dn2, lam12, slam12, clam12, f, A3x,
+ salp1, calp1, salp2, calp2, dnm,
+ Ca)
* Return a starting point for Newton's method in salp1 and calp1
* (function value is -1). If Newton's method doesn't need to be used,
* return also salp2, calp2, and dnm and function value is sig12.
* input
- double precision sbet1, cbet1, dn1, sbet2, cbet2, dn2, lam12,
- + f, A3x(*)
+ double precision sbet1, cbet1, dn1, sbet2, cbet2, dn2,
+ + lam12, slam12, clam12, f, A3x(*)
* output
double precision salp1, calp1, salp2, calp2, dnm
* temporary
@@ -1257,7 +1263,7 @@
double precision f1, e2, ep2, n, etol2, k2, eps, sig12,
+ sbet12, cbet12, sbt12a, omg12, somg12, comg12, ssig12, csig12,
+ x, y, lamscl, betscl, cbt12a, bt12a, m12b, m0, dummy,
- + k, omg12a, sbetm2
+ + k, omg12a, sbetm2, lam12x
double precision dblmin, dbleps, pi, degree, tiny,
+ tol0, tol1, tol2, tolb, xthrsh
@@ -1293,17 +1299,19 @@
shortp = cbet12 .ge. 0 .and. sbet12 .lt. 0.5d0 .and.
+ cbet2 * lam12 .lt. 0.5d0
- omg12 = lam12
if (shortp) then
sbetm2 = (sbet1 + sbet2)**2
* sin((bet1+bet2)/2)^2
* = (sbet1 + sbet2)^2 / ((sbet1 + sbet2)^2 + (cbet1 + cbet2)^2)
sbetm2 = sbetm2 / (sbetm2 + (cbet1 + cbet2)**2)
dnm = sqrt(1 + ep2 * sbetm2)
- omg12 = omg12 / (f1 * dnm)
+ omg12 = lam12 / (f1 * dnm)
+ somg12 = sin(omg12)
+ comg12 = cos(omg12)
+ else
+ somg12 = slam12
+ comg12 = clam12
end if
- somg12 = sin(omg12)
- comg12 = cos(omg12)
salp1 = cbet2 * somg12
if (comg12 .ge. 0) then
@@ -1332,6 +1340,8 @@
* Nothing to do, zeroth order spherical approximation is OK
continue
else
+* lam12 - pi
+ lam12x = atan2(-slam12, -clam12)
* Scale lam12 and bet2 to x, y coordinate system where antipodal point
* is at origin and singular point is at y = 0, x = -1.
if (f .ge. 0) then
@@ -1340,7 +1350,7 @@
eps = k2 / (2 * (1 + sqrt(1 + k2)) + k2)
lamscl = f * cbet1 * A3f(eps, A3x) * pi
betscl = lamscl * cbet1
- x = (lam12 - pi) / lamscl
+ x = lam12x / lamscl
y = sbt12a / betscl
else
* f < 0: x = dlat, y = dlong
@@ -1358,7 +1368,7 @@
betscl = -f * cbet1**2 * pi
end if
lamscl = betscl / cbet1
- y = (lam12 - pi) / lamscl
+ y = lam12x / lamscl
end if
if (y .gt. -tol1 .and. x .gt. -1 - xthrsh) then
@@ -1437,16 +1447,16 @@
end
double precision function Lam12f(sbet1, cbet1, dn1,
- + sbet2, cbet2, dn2, salp1, calp1, f, A3x, C3x, salp2, calp2,
- + sig12, ssig1, csig1, ssig2, csig2, eps, domg12, diffp, dlam12,
- + Ca)
+ + sbet2, cbet2, dn2, salp1, calp1, slm120, clm120, f, A3x, C3x,
+ + salp2, calp2, sig12, ssig1, csig1, ssig2, csig2, eps,
+ + somg12, comg12, diffp, dlam12, Ca)
* input
double precision sbet1, cbet1, dn1, sbet2, cbet2, dn2,
- + salp1, calp1, f, A3x(*), C3x(*)
+ + salp1, calp1, slm120, clm120, f, A3x(*), C3x(*)
logical diffp
* output
double precision salp2, calp2, sig12, ssig1, csig1, ssig2, csig2,
- + eps, domg12
+ + eps, somg12, comg12
* optional output
double precision dlam12
* temporary
@@ -1458,7 +1468,7 @@
double precision hypotx, A3f, TrgSum
double precision f1, e2, ep2, salp0, calp0,
- + somg1, comg1, somg2, comg2, omg12, lam12, B312, h0, k2, dummy
+ + somg1, comg1, somg2, comg2, lam12, eta, B312, k2, dummy
double precision dblmin, dbleps, pi, degree, tiny,
+ tol0, tol1, tol2, tolb, xthrsh
@@ -1525,16 +1535,17 @@
+ csig1 * csig2 + ssig1 * ssig2)
* omg12 = omg2 - omg1, limit to [0, pi]
- omg12 = atan2(0d0 + max(0d0, comg1 * somg2 - somg1 * comg2),
- + comg1 * comg2 + somg1 * somg2)
+ somg12 = 0d0 + max(0d0, comg1 * somg2 - somg1 * comg2)
+ comg12 = comg1 * comg2 + somg1 * somg2
+* eta = omg12 - lam120
+ eta = atan2(somg12 * clm120 - comg12 * slm120,
+ + comg12 * clm120 + somg12 * slm120);
k2 = calp0**2 * ep2
eps = k2 / (2 * (1 + sqrt(1 + k2)) + k2)
call C3f(eps, C3x, Ca)
B312 = (TrgSum(.true., ssig2, csig2, Ca, nC3-1) -
+ TrgSum(.true., ssig1, csig1, Ca, nC3-1))
- h0 = -f * A3f(eps, A3x)
- domg12 = salp0 * h0 * (sig12 + B312)
- lam12 = omg12 + domg12
+ lam12 = eta - f * A3f(eps, A3x) * salp0 * (sig12 + B312)
if (diffp) then
if (calp2 .eq. 0) then
@@ -1918,20 +1929,23 @@
return
end
- double precision function AngDif(x, y)
+ double precision function AngDif(x, y, e)
* Compute y - x. x and y must both lie in [-180, 180]. The result is
* equivalent to computing the difference exactly, reducing it to (-180,
* 180] and rounding the result. Note that this prescription allows -180
-* to be returned (e.g., if x is tiny and negative and y = 180).
+* to be returned (e.g., if x is tiny and negative and y = 180). The
+* error in the difference is returned in e
* input
double precision x, y
+* output
+ double precision e
double precision d, t, sumx, AngNm
d = - AngNm(sumx(AngNm(x), AngNm(-y), t))
if (d .eq. 180 .and. t .lt. 0) then
d = -180
end if
- AngDif = d - t
+ AngDif = sumx(d, -t, e)
return
end
@@ -1951,7 +1965,8 @@
y = abs(x)
* The compiler mustn't "simplify" z - (z - y) to y
if (y .lt. z) y = z - (z - y)
- AngRnd = 0 + sign(y, x)
+ AngRnd = sign(y, x)
+ if (x .eq. 0) AngRnd = 0
return
end
@@ -2072,10 +2087,10 @@
* input
double precision lon1, lon2
- double precision lon1x, lon2x, lon12, AngNm, AngDif
+ double precision lon1x, lon2x, lon12, AngNm, AngDif, e
lon1x = AngNm(lon1)
lon2x = AngNm(lon2)
- lon12 = AngDif(lon1x, lon2x)
+ lon12 = AngDif(lon1x, lon2x, e)
trnsit = 0
if (lon1x .lt. 0 .and. lon2x .ge. 0 .and. lon12 .gt. 0) then
trnsit = 1
@@ -2136,6 +2151,8 @@
q = nint(r / 90)
r = (r - 90 * q) * degree
s = sin(r)
+* sin(-0) isn't reliably -0, so...
+ if (x .eq. 0) s = x
c = cos(r)
q = mod(q + 4, 4)
if (q .eq. 0) then
diff --git a/legacy/Fortran/geodtest.for b/legacy/Fortran/geodtest.for
index 321258f..bf461df 100644
--- a/legacy/Fortran/geodtest.for
+++ b/legacy/Fortran/geodtest.for
@@ -3,8 +3,8 @@
*!
*! Run these tests by configuring with cmake and running "make test".
*!
-*! Copyright (c) Charles Karney (2015) <charles at karney.com> and licensed under
-*! the MIT/X11 License. For more information, see
+*! Copyright (c) Charles Karney (2015-2016) <charles at karney.com> and
+*! licensed under the MIT/X11 License. For more information, see
*! http://geographiclib.sourceforge.net/
*> @cond SKIP
@@ -604,7 +604,7 @@
* WGS84 values
a = 6378137d0
f = 1/298.257223563d0
- omask = 8
+ omask = 0
flags = 2
r = 0
call direct(a, f, 40d0, -75d0, -10d0, 2d7,
@@ -767,6 +767,75 @@
return
end
+ integer function tstg59()
+* Check for points close with longitudes close to 180 deg apart.
+ double precision azi1, azi2, s12, a12, m12, MM12, MM21, SS12
+ double precision a, f
+ integer r, assert, omask
+ include 'geodesic.inc'
+
+* WGS84 values
+ a = 6378137d0
+ f = 1/298.257223563d0
+ omask = 0
+ r = 0
+ call invers(a, f, 5d0, 0.00000000000001d0, 10d0, 180d0,
+ + s12, azi1, azi2, omask, a12, m12, MM12, MM21, SS12)
+ r = r + assert(azi1, 0.000000000000035d0, 1.5d-14);
+ r = r + assert(azi2, 179.99999999999996d0, 1.5d-14);
+ r = r + assert(s12, 18345191.174332713d0, 2.5d-9);
+ tstg59 = r
+ return
+ end
+
+ integer function tstg61()
+* Make sure small negative azimuths are west-going
+ double precision lat2, lon2, azi2, a12, m12, MM12, MM21, SS12
+ double precision a, f
+ integer r, assert, omask, flags
+ include 'geodesic.inc'
+
+* WGS84 values
+ a = 6378137d0
+ f = 1/298.257223563d0
+ omask = 0
+ flags = 2
+ r = 0
+ call direct(a, f, 45d0, 0d0, -0.000000000000000003d0, 1d7,
+ + flags, lat2, lon2, azi2, omask, a12, m12, MM12, MM21, SS12)
+ r = r + assert(lat2, 45.30632d0, 0.5d-5)
+ r = r + assert(lon2, -180d0, 0.5d-5)
+ r = r + assert(azi2, -180d0, 0.5d-5)
+
+ tstg61 = r
+ return
+ end
+
+ integer function tstg73()
+* Check for backwards from the pole bug reported by Anon on 2016-02-13.
+* This only affected the Java implementation. It was introduced in Java
+* version 1.44 and fixed in 1.46-SNAPSHOT on 2016-01-17.
+ double precision lat2, lon2, azi2, a12, m12, MM12, MM21, SS12
+ double precision a, f
+ integer r, assert, omask, flags
+ include 'geodesic.inc'
+
+* WGS84 values
+ a = 6378137d0
+ f = 1/298.257223563d0
+ omask = 0
+ flags = 0
+ r = 0
+ call direct(a, f, 90d0, 10d0, 180d0, -1d6,
+ + flags, lat2, lon2, azi2, omask, a12, m12, MM12, MM21, SS12)
+ r = r + assert(lat2, 81.04623d0, 0.5d-5)
+ r = r + assert(lon2, -170d0, 0.5d-5)
+ r = r + assert(azi2, 0d0, 0.5d-5)
+
+ tstg73 = r
+ return
+ end
+
integer function tstp0()
* Check fix for pole-encircling bug found 2011-03-16
double precision lata(4), lona(4)
@@ -912,7 +981,8 @@
integer tstinv, tstdir, tstarc,
+ tstg0, tstg1, tstg2, tstg5, tstg6, tstg9, tstg10, tstg11,
+ tstg12, tstg14, tstg15, tstg17, tstg26, tstg28, tstg33,
- + tstg55, tstp0, tstp5, tstp6, tstp12, tstp13
+ + tstg55, tstg59, tstg61, tstg73,
+ + tstp0, tstp5, tstp6, tstp12, tstp13
n = 0
i = tstinv()
@@ -1010,6 +1080,21 @@
n = n + 1
print *, 'tstg55 fail:', i
end if
+ i = tstg59()
+ if (i .gt. 0) then
+ n = n + 1
+ print *, 'tstg59 fail:', i
+ end if
+ i = tstg61()
+ if (i .gt. 0) then
+ n = n + 1
+ print *, 'tstg61 fail:', i
+ end if
+ i = tstg73()
+ if (i .gt. 0) then
+ n = n + 1
+ print *, 'tstg73 fail:', i
+ end if
i = tstp0()
if (i .gt. 0) then
n = n + 1
diff --git a/ltmain.sh b/ltmain.sh
index 63ae69d..0f0a2da 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,9 +1,12 @@
+#! /bin/sh
+## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
+## by inline-source v2014-01-03.01
-# libtool (GNU libtool) 2.4.2
+# libtool (GNU libtool) 2.4.6
+# Provide generalized library-building support services.
# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2015 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -23,881 +26,2112 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Usage: $progname [OPTION]... [MODE-ARG]...
-#
-# Provide generalized library-building support services.
-#
-# --config show all configuration variables
-# --debug enable verbose shell tracing
-# -n, --dry-run display commands without modifying any files
-# --features display basic configuration information and exit
-# --mode=MODE use operation mode MODE
-# --preserve-dup-deps don't remove duplicate dependency libraries
-# --quiet, --silent don't print informational messages
-# --no-quiet, --no-silent
-# print informational messages (default)
-# --no-warn don't display warning messages
-# --tag=TAG use configuration variables from tag TAG
-# -v, --verbose print more informational messages than default
-# --no-verbose don't print the extra informational messages
-# --version print version information
-# -h, --help, --help-all print short, long, or detailed help message
-#
-# MODE must be one of the following:
-#
-# clean remove files from the build directory
-# compile compile a source file into a libtool object
-# execute automatically set library path, then run a program
-# finish complete the installation of libtool libraries
-# install install libraries or executables
-# link create a library or an executable
-# uninstall remove libraries from an installed directory
-#
-# MODE-ARGS vary depending on the MODE. When passed as first option,
-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-#
-# When reporting a bug, please describe a test case to reproduce it and
-# include the following information:
-#
-# host-triplet: $host
-# shell: $SHELL
-# compiler: $LTCC
-# compiler flags: $LTCFLAGS
-# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4.2
-# automake: $automake_version
-# autoconf: $autoconf_version
-#
-# Report bugs to <bug-libtool at gnu.org>.
-# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
-# General help using GNU software: <http://www.gnu.org/gethelp/>.
PROGRAM=libtool
PACKAGE=libtool
-VERSION=2.4.2
-TIMESTAMP=""
-package_revision=1.3337
+VERSION=2.4.6
+package_revision=2.4.6
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Run './libtool --help' for help with using this script from the
+# command line.
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# After configure completes, it has a better idea of some of the
+# shell tools we need than the defaults used by the functions shared
+# with bootstrap, so set those here where they can still be over-
+# ridden by the user, but otherwise take precedence.
+
+: ${AUTOCONF="autoconf"}
+: ${AUTOMAKE="automake"}
+
+
+## -------------------------- ##
+## Source external libraries. ##
+## -------------------------- ##
+
+# Much of our low-level functionality needs to be sourced from external
+# libraries, which are installed to $pkgauxdir.
+
+# Set a version string for this script.
+scriptversion=2015-01-20.17; # UTC
+
+# General shell script boiler plate, and helper functions.
+# Written by Gary V. Vaughan, 2004
+
+# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# As a special exception to the GNU General Public License, if you distribute
+# this file as part of a program or library that is built using GNU Libtool,
+# you may include this file under the same distribution terms that you use
+# for the rest of that program.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary at gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Evaluate this file near the top of your script to gain access to
+# the functions and variables defined here:
+#
+# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
+#
+# If you need to override any of the default environment variable
+# settings, do that before evaluating this file.
+
+
+## -------------------- ##
+## Shell normalisation. ##
+## -------------------- ##
+
+# Some shells need a little help to be as Bourne compatible as possible.
+# Before doing anything else, make sure all that help has been provided!
+
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
- eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
-# NLS nuisances: We save the old values to restore during execute mode.
-lt_user_locale=
-lt_safe_locale=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+# NLS nuisances: We save the old values in case they are required later.
+_G_user_locale=
+_G_safe_locale=
+for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
do
- eval "if test \"\${$lt_var+set}\" = set; then
- save_$lt_var=\$$lt_var
- $lt_var=C
- export $lt_var
- lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
- lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+ eval "if test set = \"\${$_G_var+set}\"; then
+ save_$_G_var=\$$_G_var
+ $_G_var=C
+ export $_G_var
+ _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
+ _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
fi"
done
-LC_ALL=C
-LANGUAGE=C
-export LANGUAGE LC_ALL
-$lt_unset CDPATH
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Make sure IFS has a sensible default
+sp=' '
+nl='
+'
+IFS="$sp $nl"
+
+# There are apparently some retarded systems that use ';' as a PATH separator!
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
+fi
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
+## ------------------------- ##
+## Locate command utilities. ##
+## ------------------------- ##
+
+
+# func_executable_p FILE
+# ----------------------
+# Check that FILE is an executable regular file.
+func_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+}
+
+
+# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
+# --------------------------------------------
+# Search for either a program that responds to --version with output
+# containing "GNU", or else returned by CHECK_FUNC otherwise, by
+# trying all the directories in PATH with each of the elements of
+# PROGS_LIST.
+#
+# CHECK_FUNC should accept the path to a candidate program, and
+# set $func_check_prog_result if it truncates its output less than
+# $_G_path_prog_max characters.
+func_path_progs ()
+{
+ _G_progs_list=$1
+ _G_check_func=$2
+ _G_PATH=${3-"$PATH"}
+
+ _G_path_prog_max=0
+ _G_path_prog_found=false
+ _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
+ for _G_dir in $_G_PATH; do
+ IFS=$_G_save_IFS
+ test -z "$_G_dir" && _G_dir=.
+ for _G_prog_name in $_G_progs_list; do
+ for _exeext in '' .EXE; do
+ _G_path_prog=$_G_dir/$_G_prog_name$_exeext
+ func_executable_p "$_G_path_prog" || continue
+ case `"$_G_path_prog" --version 2>&1` in
+ *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
+ *) $_G_check_func $_G_path_prog
+ func_path_progs_result=$func_check_prog_result
+ ;;
+ esac
+ $_G_path_prog_found && break 3
+ done
+ done
+ done
+ IFS=$_G_save_IFS
+ test -z "$func_path_progs_result" && {
+ echo "no acceptable sed could be found in \$PATH" >&2
+ exit 1
+ }
+}
+
+
+# We want to be able to use the functions in this file before configure
+# has figured out where the best binaries are kept, which means we have
+# to search for them ourselves - except when the results are already set
+# where we skip the searches.
+
+# Unless the user overrides by setting SED, search the path for either GNU
+# sed, or the sed that truncates its output the least.
+test -z "$SED" && {
+ _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for _G_i in 1 2 3 4 5 6 7; do
+ _G_sed_script=$_G_sed_script$nl$_G_sed_script
+ done
+ echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
+ _G_sed_script=
+
+ func_check_prog_sed ()
+ {
+ _G_path_prog=$1
+
+ _G_count=0
+ printf 0123456789 >conftest.in
+ while :
+ do
+ cat conftest.in conftest.in >conftest.tmp
+ mv conftest.tmp conftest.in
+ cp conftest.in conftest.nl
+ echo '' >> conftest.nl
+ "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
+ diff conftest.out conftest.nl >/dev/null 2>&1 || break
+ _G_count=`expr $_G_count + 1`
+ if test "$_G_count" -gt "$_G_path_prog_max"; then
+ # Best one so far, save it but keep looking for a better one
+ func_check_prog_result=$_G_path_prog
+ _G_path_prog_max=$_G_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test 10 -lt "$_G_count" && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out
+ }
+
+ func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+ rm -f conftest.sed
+ SED=$func_path_progs_result
+}
+
+
+# Unless the user overrides by setting GREP, search the path for either GNU
+# grep, or the grep that truncates its output the least.
+test -z "$GREP" && {
+ func_check_prog_grep ()
+ {
+ _G_path_prog=$1
+
+ _G_count=0
+ _G_path_prog_max=0
+ printf 0123456789 >conftest.in
+ while :
+ do
+ cat conftest.in conftest.in >conftest.tmp
+ mv conftest.tmp conftest.in
+ cp conftest.in conftest.nl
+ echo 'GREP' >> conftest.nl
+ "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
+ diff conftest.out conftest.nl >/dev/null 2>&1 || break
+ _G_count=`expr $_G_count + 1`
+ if test "$_G_count" -gt "$_G_path_prog_max"; then
+ # Best one so far, save it but keep looking for a better one
+ func_check_prog_result=$_G_path_prog
+ _G_path_prog_max=$_G_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test 10 -lt "$_G_count" && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out
+ }
+
+ func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+ GREP=$func_path_progs_result
+}
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# All uppercase variable names are used for environment variables. These
+# variables can be overridden by the user before calling a script that
+# uses them if a suitable command of that name is not already available
+# in the command search PATH.
: ${CP="cp -f"}
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${ECHO="printf %s\n"}
+: ${EGREP="$GREP -E"}
+: ${FGREP="$GREP -F"}
+: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e 1s/^X//"}
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
-
-exit_status=$EXIT_SUCCESS
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" $lt_nl"
-dirname="s,/[^/]*$,,"
-basename="s,^.*/,,"
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
-} # func_dirname may be replaced by extended shell implementation
+## -------------------- ##
+## Useful sed snippets. ##
+## -------------------- ##
+sed_dirname='s|/[^/]*$||'
+sed_basename='s|^.*/||'
-# func_basename file
-func_basename ()
-{
- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-} # func_basename may be replaced by extended shell implementation
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
+# Same as above, but do not quote variable references.
+sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-# dirname: Compute the dirname of FILE. If nonempty,
-# add APPEND to the result, otherwise set result
-# to NONDIR_REPLACEMENT.
-# value returned in "$func_dirname_result"
-# basename: Compute filename of FILE.
-# value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
- # Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-} # func_dirname_and_basename may be replaced by extended shell implementation
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
+# Sed substitution that converts a w32 file name or path
+# that contains forward slashes, into one that contains
+# (escaped) backslashes. A very naive implementation.
+sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
+# Re-'\' parameter expansions in output of sed_double_quote_subst that
+# were '\'-ed in input to the same. If an odd number of '\' preceded a
+# '$' in input to sed_double_quote_subst, that '$' was protected from
+# expansion. Since each input '\' is now two '\'s, look for any number
+# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'.
+_G_bs='\\'
+_G_bs2='\\\\'
+_G_bs4='\\\\\\\\'
+_G_dollar='\$'
+sed_double_backslash="\
+ s/$_G_bs4/&\\
+/g
+ s/^$_G_bs2$_G_dollar/$_G_bs&/
+ s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
+ s/\n//g"
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- esac
-} # func_stripname may be replaced by extended shell implementation
+## ----------------- ##
+## Global variables. ##
+## ----------------- ##
-# These SED scripts presuppose an absolute path with a trailing slash.
-pathcar='s,^/\([^/]*\).*$,\1,'
-pathcdr='s,^/[^/]*,,'
-removedotparts=':dotsl
- s@/\./@/@g
- t dotsl
- s,/\.$,/,'
-collapseslashes='s@/\{1,\}@/@g'
-finalslash='s,/*$,/,'
+# Except for the global variables explicitly listed below, the following
+# functions in the '^func_' namespace, and the '^require_' namespace
+# variables initialised in the 'Resource management' section, sourcing
+# this file will not pollute your global namespace with anything
+# else. There's no portable way to scope variables in Bourne shell
+# though, so actually running these functions will sometimes place
+# results into a variable named after the function, and often use
+# temporary variables in the '^_G_' namespace. If you are careful to
+# avoid using those namespaces casually in your sourcing script, things
+# should continue to work as you expect. And, of course, you can freely
+# overwrite any of the functions or variables defined here before
+# calling anything to customize them.
-# func_normal_abspath PATH
-# Remove doubled-up and trailing slashes, "." path components,
-# and cancel out any ".." path components in PATH after making
-# it an absolute path.
-# value returned in "$func_normal_abspath_result"
-func_normal_abspath ()
-{
- # Start from root dir and reassemble the path.
- func_normal_abspath_result=
- func_normal_abspath_tpath=$1
- func_normal_abspath_altnamespace=
- case $func_normal_abspath_tpath in
- "")
- # Empty path, that just means $cwd.
- func_stripname '' '/' "`pwd`"
- func_normal_abspath_result=$func_stripname_result
- return
- ;;
- # The next three entries are used to spot a run of precisely
- # two leading slashes without using negated character classes;
- # we take advantage of case's first-match behaviour.
- ///*)
- # Unusual form of absolute path, do nothing.
- ;;
- //*)
- # Not necessarily an ordinary path; POSIX reserves leading '//'
- # and for example Cygwin uses it to access remote file shares
- # over CIFS/SMB, so we conserve a leading double slash if found.
- func_normal_abspath_altnamespace=/
- ;;
- /*)
- # Absolute path, do nothing.
- ;;
- *)
- # Relative path, prepend $cwd.
- func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
- ;;
- esac
- # Cancel out all the simple stuff to save iterations. We also want
- # the path to end with a slash for ease of parsing, so make sure
- # there is one (and only one) here.
- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
- while :; do
- # Processed it all yet?
- if test "$func_normal_abspath_tpath" = / ; then
- # If we ascended to the root using ".." the result may be empty now.
- if test -z "$func_normal_abspath_result" ; then
- func_normal_abspath_result=/
- fi
- break
- fi
- func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$pathcar"`
- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$pathcdr"`
- # Figure out what to do with it
- case $func_normal_abspath_tcomponent in
- "")
- # Trailing empty path component, ignore it.
- ;;
- ..)
- # Parent dir; strip last assembled component from result.
- func_dirname "$func_normal_abspath_result"
- func_normal_abspath_result=$func_dirname_result
- ;;
- *)
- # Actual path component, append it.
- func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
- ;;
- esac
- done
- # Restore leading double-slash if one was found on entry.
- func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
-}
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
-# func_relative_path SRCDIR DSTDIR
-# generates a relative path from SRCDIR to DSTDIR, with a trailing
-# slash if non-empty, suitable for immediately appending a filename
-# without needing to append a separator.
-# value returned in "$func_relative_path_result"
-func_relative_path ()
-{
- func_relative_path_result=
- func_normal_abspath "$1"
- func_relative_path_tlibdir=$func_normal_abspath_result
- func_normal_abspath "$2"
- func_relative_path_tbindir=$func_normal_abspath_result
-
- # Ascend the tree starting from libdir
- while :; do
- # check if we have found a prefix of bindir
- case $func_relative_path_tbindir in
- $func_relative_path_tlibdir)
- # found an exact match
- func_relative_path_tcancelled=
- break
- ;;
- $func_relative_path_tlibdir*)
- # found a matching prefix
- func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
- func_relative_path_tcancelled=$func_stripname_result
- if test -z "$func_relative_path_result"; then
- func_relative_path_result=.
- fi
- break
- ;;
- *)
- func_dirname $func_relative_path_tlibdir
- func_relative_path_tlibdir=${func_dirname_result}
- if test "x$func_relative_path_tlibdir" = x ; then
- # Have to descend all the way to the root!
- func_relative_path_result=../$func_relative_path_result
- func_relative_path_tcancelled=$func_relative_path_tbindir
- break
- fi
- func_relative_path_result=../$func_relative_path_result
- ;;
- esac
- done
+# Allow overriding, eg assuming that you follow the convention of
+# putting '$debug_cmd' at the start of all your functions, you can get
+# bash to show function call trace with:
+#
+# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
+debug_cmd=${debug_cmd-":"}
+exit_cmd=:
- # Now calculate path; take care to avoid doubling-up slashes.
- func_stripname '' '/' "$func_relative_path_result"
- func_relative_path_result=$func_stripname_result
- func_stripname '/' '/' "$func_relative_path_tcancelled"
- if test "x$func_stripname_result" != x ; then
- func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
- fi
+# By convention, finish your script with:
+#
+# exit $exit_status
+#
+# so that you can set exit_status to non-zero if you want to indicate
+# something went wrong during execution without actually bailing out at
+# the point of failure.
+exit_status=$EXIT_SUCCESS
- # Normalisation. If bindir is libdir, return empty string,
- # else relative path ending with a slash; either way, target
- # file name can be directly appended.
- if test ! -z "$func_relative_path_result"; then
- func_stripname './' '' "$func_relative_path_result/"
- func_relative_path_result=$func_stripname_result
- fi
-}
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath=$0
-# The name of this program:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
+# The name of this program.
+progname=`$ECHO "$progpath" |$SED "$sed_basename"`
-# Make sure we have an absolute path for reexecution:
+# Make sure we have an absolute progpath for reexecution:
case $progpath in
[\\/]*|[A-Za-z]:\\*) ;;
*[\\/]*)
- progdir=$func_dirname_result
+ progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
progdir=`cd "$progdir" && pwd`
- progpath="$progdir/$progname"
+ progpath=$progdir/$progname
;;
*)
- save_IFS="$IFS"
+ _G_IFS=$IFS
IFS=${PATH_SEPARATOR-:}
for progdir in $PATH; do
- IFS="$save_IFS"
+ IFS=$_G_IFS
test -x "$progdir/$progname" && break
done
- IFS="$save_IFS"
+ IFS=$_G_IFS
test -n "$progdir" || progdir=`pwd`
- progpath="$progdir/$progname"
+ progpath=$progdir/$progname
;;
esac
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-# Sed substitution that turns a string into a regex matching for the
-# string literally.
-sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
+## ----------------- ##
+## Standard options. ##
+## ----------------- ##
-# Sed substitution that converts a w32 file name or path
-# which contains forward slashes, into one that contains
-# (escaped) backslashes. A very naive implementation.
-lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-
-# Re-`\' parameter expansions in output of double_quote_subst that were
-# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
-# in input to double_quote_subst, that '$' was protected from expansion.
-# Since each input `\' is now two `\'s, look for any number of runs of
-# four `\'s followed by two `\'s and then a '$'. `\' that '$'.
-bs='\\'
-bs2='\\\\'
-bs4='\\\\\\\\'
-dollar='\$'
-sed_double_backslash="\
- s/$bs4/&\\
-/g
- s/^$bs2$dollar/$bs&/
- s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
- s/\n//g"
+# The following options affect the operation of the functions defined
+# below, and should be set appropriately depending on run-time para-
+# meters passed on the command line.
-# Standard options:
opt_dry_run=false
-opt_help=false
opt_quiet=false
opt_verbose=false
-opt_warning=:
-# func_echo arg...
-# Echo program name prefixed message, along with the current mode
-# name if it has been set yet.
-func_echo ()
-{
- $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
-}
+# Categories 'all' and 'none' are always available. Append any others
+# you will pass as the first argument to func_warning from your own
+# code.
+warning_categories=
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
-{
- $opt_verbose && func_echo ${1+"$@"}
+# By default, display warnings according to 'opt_warning_types'. Set
+# 'warning_func' to ':' to elide all warnings, or func_fatal_error to
+# treat the next displayed warning as a fatal error.
+warning_func=func_warn_and_continue
- # A bug in bash halts the script if the last line of a function
- # fails when set -e is in force, so we need another command to
- # work around that:
- :
-}
+# Set to 'all' to display all warnings, 'none' to suppress all
+# warnings, or a space delimited list of some subset of
+# 'warning_categories' to display only the listed warnings.
+opt_warning_types=all
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
- $ECHO "$*"
-}
-# func_error arg...
-# Echo program name prefixed message to standard error.
-func_error ()
-{
- $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
-}
+## -------------------- ##
+## Resource management. ##
+## -------------------- ##
-# func_warning arg...
-# Echo program name prefixed warning message to standard error.
-func_warning ()
-{
- $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+# This section contains definitions for functions that each ensure a
+# particular resource (a file, or a non-empty configuration variable for
+# example) is available, and if appropriate to extract default values
+# from pertinent package files. Call them using their associated
+# 'require_*' variable to ensure that they are executed, at most, once.
+#
+# It's entirely deliberate that calling these functions can set
+# variables that don't obey the namespace limitations obeyed by the rest
+# of this file, in order that that they be as useful as possible to
+# callers.
- # bash bug again:
- :
-}
-# func_fatal_error arg...
-# Echo program name prefixed message to standard error, and exit.
-func_fatal_error ()
+# require_term_colors
+# -------------------
+# Allow display of bold text on terminals that support it.
+require_term_colors=func_require_term_colors
+func_require_term_colors ()
{
- func_error ${1+"$@"}
- exit $EXIT_FAILURE
-}
+ $debug_cmd
+
+ test -t 1 && {
+ # COLORTERM and USE_ANSI_COLORS environment variables take
+ # precedence, because most terminfo databases neglect to describe
+ # whether color sequences are supported.
+ test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
+
+ if test 1 = "$USE_ANSI_COLORS"; then
+ # Standard ANSI escape sequences
+ tc_reset='[0m'
+ tc_bold='[1m'; tc_standout='[7m'
+ tc_red='[31m'; tc_green='[32m'
+ tc_blue='[34m'; tc_cyan='[36m'
+ else
+ # Otherwise trust the terminfo database after all.
+ test -n "`tput sgr0 2>/dev/null`" && {
+ tc_reset=`tput sgr0`
+ test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
+ tc_standout=$tc_bold
+ test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
+ test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
+ test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
+ test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
+ test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
+ }
+ fi
+ }
-# func_fatal_help arg...
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
- func_error ${1+"$@"}
- func_fatal_error "$help"
+ require_term_colors=:
}
-help="Try \`$progname --help' for more information." ## default
-# func_grep expression filename
+## ----------------- ##
+## Function library. ##
+## ----------------- ##
+
+# This section contains a variety of useful functions to call in your
+# scripts. Take note of the portable wrappers for features provided by
+# some modern shells, which will fall back to slower equivalents on
+# less featureful shells.
+
+
+# func_append VAR VALUE
+# ---------------------
+# Append VALUE onto the existing contents of VAR.
+
+ # We should try to minimise forks, especially on Windows where they are
+ # unreasonably slow, so skip the feature probes when bash or zsh are
+ # being used:
+ if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
+ : ${_G_HAVE_ARITH_OP="yes"}
+ : ${_G_HAVE_XSI_OPS="yes"}
+ # The += operator was introduced in bash 3.1
+ case $BASH_VERSION in
+ [12].* | 3.0 | 3.0*) ;;
+ *)
+ : ${_G_HAVE_PLUSEQ_OP="yes"}
+ ;;
+ esac
+ fi
+
+ # _G_HAVE_PLUSEQ_OP
+ # Can be empty, in which case the shell is probed, "yes" if += is
+ # useable or anything else if it does not work.
+ test -z "$_G_HAVE_PLUSEQ_OP" \
+ && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
+ && _G_HAVE_PLUSEQ_OP=yes
+
+if test yes = "$_G_HAVE_PLUSEQ_OP"
+then
+ # This is an XSI compatible shell, allowing a faster implementation...
+ eval 'func_append ()
+ {
+ $debug_cmd
+
+ eval "$1+=\$2"
+ }'
+else
+ # ...otherwise fall back to using expr, which is often a shell builtin.
+ func_append ()
+ {
+ $debug_cmd
+
+ eval "$1=\$$1\$2"
+ }
+fi
+
+
+# func_append_quoted VAR VALUE
+# ----------------------------
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+if test yes = "$_G_HAVE_PLUSEQ_OP"; then
+ eval 'func_append_quoted ()
+ {
+ $debug_cmd
+
+ func_quote_for_eval "$2"
+ eval "$1+=\\ \$func_quote_for_eval_result"
+ }'
+else
+ func_append_quoted ()
+ {
+ $debug_cmd
+
+ func_quote_for_eval "$2"
+ eval "$1=\$$1\\ \$func_quote_for_eval_result"
+ }
+fi
+
+
+# func_append_uniq VAR VALUE
+# --------------------------
+# Append unique VALUE onto the existing contents of VAR, assuming
+# entries are delimited by the first character of VALUE. For example:
+#
+# func_append_uniq options " --another-option option-argument"
+#
+# will only append to $options if " --another-option option-argument "
+# is not already present somewhere in $options already (note spaces at
+# each end implied by leading space in second argument).
+func_append_uniq ()
+{
+ $debug_cmd
+
+ eval _G_current_value='`$ECHO $'$1'`'
+ _G_delim=`expr "$2" : '\(.\)'`
+
+ case $_G_delim$_G_current_value$_G_delim in
+ *"$2$_G_delim"*) ;;
+ *) func_append "$@" ;;
+ esac
+}
+
+
+# func_arith TERM...
+# ------------------
+# Set func_arith_result to the result of evaluating TERMs.
+ test -z "$_G_HAVE_ARITH_OP" \
+ && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
+ && _G_HAVE_ARITH_OP=yes
+
+if test yes = "$_G_HAVE_ARITH_OP"; then
+ eval 'func_arith ()
+ {
+ $debug_cmd
+
+ func_arith_result=$(( $* ))
+ }'
+else
+ func_arith ()
+ {
+ $debug_cmd
+
+ func_arith_result=`expr "$@"`
+ }
+fi
+
+
+# func_basename FILE
+# ------------------
+# Set func_basename_result to FILE with everything up to and including
+# the last / stripped.
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ # If this shell supports suffix pattern removal, then use it to avoid
+ # forking. Hide the definitions single quotes in case the shell chokes
+ # on unsupported syntax...
+ _b='func_basename_result=${1##*/}'
+ _d='case $1 in
+ */*) func_dirname_result=${1%/*}$2 ;;
+ * ) func_dirname_result=$3 ;;
+ esac'
+
+else
+ # ...otherwise fall back to using sed.
+ _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
+ _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"`
+ if test "X$func_dirname_result" = "X$1"; then
+ func_dirname_result=$3
+ else
+ func_append func_dirname_result "$2"
+ fi'
+fi
+
+eval 'func_basename ()
+{
+ $debug_cmd
+
+ '"$_b"'
+}'
+
+
+# func_dirname FILE APPEND NONDIR_REPLACEMENT
+# -------------------------------------------
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+eval 'func_dirname ()
+{
+ $debug_cmd
+
+ '"$_d"'
+}'
+
+
+# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT
+# --------------------------------------------------------
+# Perform func_basename and func_dirname in a single function
+# call:
+# dirname: Compute the dirname of FILE. If nonempty,
+# add APPEND to the result, otherwise set result
+# to NONDIR_REPLACEMENT.
+# value returned in "$func_dirname_result"
+# basename: Compute filename of FILE.
+# value retuned in "$func_basename_result"
+# For efficiency, we do not delegate to the functions above but instead
+# duplicate the functionality here.
+eval 'func_dirname_and_basename ()
+{
+ $debug_cmd
+
+ '"$_b"'
+ '"$_d"'
+}'
+
+
+# func_echo ARG...
+# ----------------
+# Echo program name prefixed message.
+func_echo ()
+{
+ $debug_cmd
+
+ _G_message=$*
+
+ func_echo_IFS=$IFS
+ IFS=$nl
+ for _G_line in $_G_message; do
+ IFS=$func_echo_IFS
+ $ECHO "$progname: $_G_line"
+ done
+ IFS=$func_echo_IFS
+}
+
+
+# func_echo_all ARG...
+# --------------------
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+ $ECHO "$*"
+}
+
+
+# func_echo_infix_1 INFIX ARG...
+# ------------------------------
+# Echo program name, followed by INFIX on the first line, with any
+# additional lines not showing INFIX.
+func_echo_infix_1 ()
+{
+ $debug_cmd
+
+ $require_term_colors
+
+ _G_infix=$1; shift
+ _G_indent=$_G_infix
+ _G_prefix="$progname: $_G_infix: "
+ _G_message=$*
+
+ # Strip color escape sequences before counting printable length
+ for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
+ do
+ test -n "$_G_tc" && {
+ _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
+ _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
+ }
+ done
+ _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes
+
+ func_echo_infix_1_IFS=$IFS
+ IFS=$nl
+ for _G_line in $_G_message; do
+ IFS=$func_echo_infix_1_IFS
+ $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
+ _G_prefix=$_G_indent
+ done
+ IFS=$func_echo_infix_1_IFS
+}
+
+
+# func_error ARG...
+# -----------------
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+ $debug_cmd
+
+ $require_term_colors
+
+ func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2
+}
+
+
+# func_fatal_error ARG...
+# -----------------------
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+ $debug_cmd
+
+ func_error "$*"
+ exit $EXIT_FAILURE
+}
+
+
+# func_grep EXPRESSION FILENAME
+# -----------------------------
# Check whether EXPRESSION matches any line of FILENAME, without output.
func_grep ()
{
+ $debug_cmd
+
$GREP "$1" "$2" >/dev/null 2>&1
}
-# func_mkdir_p directory-path
+# func_len STRING
+# ---------------
+# Set func_len_result to the length of STRING. STRING may not
+# start with a hyphen.
+ test -z "$_G_HAVE_XSI_OPS" \
+ && (eval 'x=a/b/c;
+ test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+ && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ eval 'func_len ()
+ {
+ $debug_cmd
+
+ func_len_result=${#1}
+ }'
+else
+ func_len ()
+ {
+ $debug_cmd
+
+ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+ }
+fi
+
+
+# func_mkdir_p DIRECTORY-PATH
+# ---------------------------
# Make sure the entire path to DIRECTORY-PATH is available.
func_mkdir_p ()
{
- my_directory_path="$1"
- my_dir_list=
+ $debug_cmd
- if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+ _G_directory_path=$1
+ _G_dir_list=
- # Protect directory names starting with `-'
- case $my_directory_path in
- -*) my_directory_path="./$my_directory_path" ;;
+ if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
+
+ # Protect directory names starting with '-'
+ case $_G_directory_path in
+ -*) _G_directory_path=./$_G_directory_path ;;
esac
# While some portion of DIR does not yet exist...
- while test ! -d "$my_directory_path"; do
+ while test ! -d "$_G_directory_path"; do
# ...make a list in topmost first order. Use a colon delimited
# list incase some portion of path contains whitespace.
- my_dir_list="$my_directory_path:$my_dir_list"
+ _G_dir_list=$_G_directory_path:$_G_dir_list
# If the last portion added has no slash in it, the list is done
- case $my_directory_path in */*) ;; *) break ;; esac
+ case $_G_directory_path in */*) ;; *) break ;; esac
# ...otherwise throw away the child directory and loop
- my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
+ _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
done
- my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+ _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
- save_mkdir_p_IFS="$IFS"; IFS=':'
- for my_dir in $my_dir_list; do
- IFS="$save_mkdir_p_IFS"
- # mkdir can fail with a `File exist' error if two processes
+ func_mkdir_p_IFS=$IFS; IFS=:
+ for _G_dir in $_G_dir_list; do
+ IFS=$func_mkdir_p_IFS
+ # mkdir can fail with a 'File exist' error if two processes
# try to create one of the directories concurrently. Don't
# stop in that case!
- $MKDIR "$my_dir" 2>/dev/null || :
+ $MKDIR "$_G_dir" 2>/dev/null || :
done
- IFS="$save_mkdir_p_IFS"
+ IFS=$func_mkdir_p_IFS
# Bail out if we (or some other process) failed to create a directory.
- test -d "$my_directory_path" || \
- func_fatal_error "Failed to create \`$1'"
+ test -d "$_G_directory_path" || \
+ func_fatal_error "Failed to create '$1'"
fi
}
-# func_mktempdir [string]
+# func_mktempdir [BASENAME]
+# -------------------------
# Make a temporary directory that won't clash with other running
# libtool processes, and avoids race conditions if possible. If
-# given, STRING is the basename for that directory.
+# given, BASENAME is the basename for that directory.
func_mktempdir ()
{
- my_template="${TMPDIR-/tmp}/${1-$progname}"
+ $debug_cmd
+
+ _G_template=${TMPDIR-/tmp}/${1-$progname}
- if test "$opt_dry_run" = ":"; then
+ if test : = "$opt_dry_run"; then
# Return a directory name, but don't create it in dry-run mode
- my_tmpdir="${my_template}-$$"
+ _G_tmpdir=$_G_template-$$
else
# If mktemp works, use that first and foremost
- my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+ _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
- if test ! -d "$my_tmpdir"; then
+ if test ! -d "$_G_tmpdir"; then
# Failing that, at least try and use $RANDOM to avoid a race
- my_tmpdir="${my_template}-${RANDOM-0}$$"
+ _G_tmpdir=$_G_template-${RANDOM-0}$$
- save_mktempdir_umask=`umask`
+ func_mktempdir_umask=`umask`
umask 0077
- $MKDIR "$my_tmpdir"
- umask $save_mktempdir_umask
+ $MKDIR "$_G_tmpdir"
+ umask $func_mktempdir_umask
fi
# If we're not in dry-run mode, bomb out on failure
- test -d "$my_tmpdir" || \
- func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+ test -d "$_G_tmpdir" || \
+ func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
+ fi
+
+ $ECHO "$_G_tmpdir"
+}
+
+
+# func_normal_abspath PATH
+# ------------------------
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+func_normal_abspath ()
+{
+ $debug_cmd
+
+ # These SED scripts presuppose an absolute path with a trailing slash.
+ _G_pathcar='s|^/\([^/]*\).*$|\1|'
+ _G_pathcdr='s|^/[^/]*||'
+ _G_removedotparts=':dotsl
+ s|/\./|/|g
+ t dotsl
+ s|/\.$|/|'
+ _G_collapseslashes='s|/\{1,\}|/|g'
+ _G_finalslash='s|/*$|/|'
+
+ # Start from root dir and reassemble the path.
+ func_normal_abspath_result=
+ func_normal_abspath_tpath=$1
+ func_normal_abspath_altnamespace=
+ case $func_normal_abspath_tpath in
+ "")
+ # Empty path, that just means $cwd.
+ func_stripname '' '/' "`pwd`"
+ func_normal_abspath_result=$func_stripname_result
+ return
+ ;;
+ # The next three entries are used to spot a run of precisely
+ # two leading slashes without using negated character classes;
+ # we take advantage of case's first-match behaviour.
+ ///*)
+ # Unusual form of absolute path, do nothing.
+ ;;
+ //*)
+ # Not necessarily an ordinary path; POSIX reserves leading '//'
+ # and for example Cygwin uses it to access remote file shares
+ # over CIFS/SMB, so we conserve a leading double slash if found.
+ func_normal_abspath_altnamespace=/
+ ;;
+ /*)
+ # Absolute path, do nothing.
+ ;;
+ *)
+ # Relative path, prepend $cwd.
+ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+ ;;
+ esac
+
+ # Cancel out all the simple stuff to save iterations. We also want
+ # the path to end with a slash for ease of parsing, so make sure
+ # there is one (and only one) here.
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
+ while :; do
+ # Processed it all yet?
+ if test / = "$func_normal_abspath_tpath"; then
+ # If we ascended to the root using ".." the result may be empty now.
+ if test -z "$func_normal_abspath_result"; then
+ func_normal_abspath_result=/
+ fi
+ break
+ fi
+ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$_G_pathcar"`
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$_G_pathcdr"`
+ # Figure out what to do with it
+ case $func_normal_abspath_tcomponent in
+ "")
+ # Trailing empty path component, ignore it.
+ ;;
+ ..)
+ # Parent dir; strip last assembled component from result.
+ func_dirname "$func_normal_abspath_result"
+ func_normal_abspath_result=$func_dirname_result
+ ;;
+ *)
+ # Actual path component, append it.
+ func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
+ ;;
+ esac
+ done
+ # Restore leading double-slash if one was found on entry.
+ func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+
+# func_notquiet ARG...
+# --------------------
+# Echo program name prefixed message only when not in quiet mode.
+func_notquiet ()
+{
+ $debug_cmd
+
+ $opt_quiet || func_echo ${1+"$@"}
+
+ # A bug in bash halts the script if the last line of a function
+ # fails when set -e is in force, so we need another command to
+ # work around that:
+ :
+}
+
+
+# func_relative_path SRCDIR DSTDIR
+# --------------------------------
+# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
+func_relative_path ()
+{
+ $debug_cmd
+
+ func_relative_path_result=
+ func_normal_abspath "$1"
+ func_relative_path_tlibdir=$func_normal_abspath_result
+ func_normal_abspath "$2"
+ func_relative_path_tbindir=$func_normal_abspath_result
+
+ # Ascend the tree starting from libdir
+ while :; do
+ # check if we have found a prefix of bindir
+ case $func_relative_path_tbindir in
+ $func_relative_path_tlibdir)
+ # found an exact match
+ func_relative_path_tcancelled=
+ break
+ ;;
+ $func_relative_path_tlibdir*)
+ # found a matching prefix
+ func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+ func_relative_path_tcancelled=$func_stripname_result
+ if test -z "$func_relative_path_result"; then
+ func_relative_path_result=.
+ fi
+ break
+ ;;
+ *)
+ func_dirname $func_relative_path_tlibdir
+ func_relative_path_tlibdir=$func_dirname_result
+ if test -z "$func_relative_path_tlibdir"; then
+ # Have to descend all the way to the root!
+ func_relative_path_result=../$func_relative_path_result
+ func_relative_path_tcancelled=$func_relative_path_tbindir
+ break
+ fi
+ func_relative_path_result=../$func_relative_path_result
+ ;;
+ esac
+ done
+
+ # Now calculate path; take care to avoid doubling-up slashes.
+ func_stripname '' '/' "$func_relative_path_result"
+ func_relative_path_result=$func_stripname_result
+ func_stripname '/' '/' "$func_relative_path_tcancelled"
+ if test -n "$func_stripname_result"; then
+ func_append func_relative_path_result "/$func_stripname_result"
+ fi
+
+ # Normalisation. If bindir is libdir, return '.' else relative path.
+ if test -n "$func_relative_path_result"; then
+ func_stripname './' '' "$func_relative_path_result"
+ func_relative_path_result=$func_stripname_result
fi
- $ECHO "$my_tmpdir"
+ test -n "$func_relative_path_result" || func_relative_path_result=.
+
+ :
+}
+
+
+# func_quote_for_eval ARG...
+# --------------------------
+# Aesthetically quote ARGs to be evaled later.
+# This function returns two values:
+# i) func_quote_for_eval_result
+# double-quoted, suitable for a subsequent eval
+# ii) func_quote_for_eval_unquoted_result
+# has all characters that are still active within double
+# quotes backslashified.
+func_quote_for_eval ()
+{
+ $debug_cmd
+
+ func_quote_for_eval_unquoted_result=
+ func_quote_for_eval_result=
+ while test 0 -lt $#; do
+ case $1 in
+ *[\\\`\"\$]*)
+ _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
+ *)
+ _G_unquoted_arg=$1 ;;
+ esac
+ if test -n "$func_quote_for_eval_unquoted_result"; then
+ func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
+ else
+ func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+ fi
+
+ case $_G_unquoted_arg in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting, command substitution and variable expansion
+ # for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ _G_quoted_arg=\"$_G_unquoted_arg\"
+ ;;
+ *)
+ _G_quoted_arg=$_G_unquoted_arg
+ ;;
+ esac
+
+ if test -n "$func_quote_for_eval_result"; then
+ func_append func_quote_for_eval_result " $_G_quoted_arg"
+ else
+ func_append func_quote_for_eval_result "$_G_quoted_arg"
+ fi
+ shift
+ done
+}
+
+
+# func_quote_for_expand ARG
+# -------------------------
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
+{
+ $debug_cmd
+
+ case $1 in
+ *[\\\`\"]*)
+ _G_arg=`$ECHO "$1" | $SED \
+ -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
+ *)
+ _G_arg=$1 ;;
+ esac
+
+ case $_G_arg in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting and command substitution for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ _G_arg=\"$_G_arg\"
+ ;;
+ esac
+
+ func_quote_for_expand_result=$_G_arg
+}
+
+
+# func_stripname PREFIX SUFFIX NAME
+# ---------------------------------
+# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ eval 'func_stripname ()
+ {
+ $debug_cmd
+
+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+ # positional parameters, so assign one to ordinary variable first.
+ func_stripname_result=$3
+ func_stripname_result=${func_stripname_result#"$1"}
+ func_stripname_result=${func_stripname_result%"$2"}
+ }'
+else
+ func_stripname ()
+ {
+ $debug_cmd
+
+ case $2 in
+ .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
+ *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
+ esac
+ }
+fi
+
+
+# func_show_eval CMD [FAIL_EXP]
+# -----------------------------
+# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is
+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
+{
+ $debug_cmd
+
+ _G_cmd=$1
+ _G_fail_exp=${2-':'}
+
+ func_quote_for_expand "$_G_cmd"
+ eval "func_notquiet $func_quote_for_expand_result"
+
+ $opt_dry_run || {
+ eval "$_G_cmd"
+ _G_status=$?
+ if test 0 -ne "$_G_status"; then
+ eval "(exit $_G_status); $_G_fail_exp"
+ fi
+ }
+}
+
+
+# func_show_eval_locale CMD [FAIL_EXP]
+# ------------------------------------
+# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is
+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it. Use the saved locale for evaluation.
+func_show_eval_locale ()
+{
+ $debug_cmd
+
+ _G_cmd=$1
+ _G_fail_exp=${2-':'}
+
+ $opt_quiet || {
+ func_quote_for_expand "$_G_cmd"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+
+ $opt_dry_run || {
+ eval "$_G_user_locale
+ $_G_cmd"
+ _G_status=$?
+ eval "$_G_safe_locale"
+ if test 0 -ne "$_G_status"; then
+ eval "(exit $_G_status); $_G_fail_exp"
+ fi
+ }
+}
+
+
+# func_tr_sh
+# ----------
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result. All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+ $debug_cmd
+
+ case $1 in
+ [0-9]* | *[!a-zA-Z0-9_]*)
+ func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'`
+ ;;
+ * )
+ func_tr_sh_result=$1
+ ;;
+ esac
+}
+
+
+# func_verbose ARG...
+# -------------------
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+ $debug_cmd
+
+ $opt_verbose && func_echo "$*"
+
+ :
+}
+
+
+# func_warn_and_continue ARG...
+# -----------------------------
+# Echo program name prefixed warning message to standard error.
+func_warn_and_continue ()
+{
+ $debug_cmd
+
+ $require_term_colors
+
+ func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
+}
+
+
+# func_warning CATEGORY ARG...
+# ----------------------------
+# Echo program name prefixed warning message to standard error. Warning
+# messages can be filtered according to CATEGORY, where this function
+# elides messages where CATEGORY is not listed in the global variable
+# 'opt_warning_types'.
+func_warning ()
+{
+ $debug_cmd
+
+ # CATEGORY must be in the warning_categories list!
+ case " $warning_categories " in
+ *" $1 "*) ;;
+ *) func_internal_error "invalid warning category '$1'" ;;
+ esac
+
+ _G_category=$1
+ shift
+
+ case " $opt_warning_types " in
+ *" $_G_category "*) $warning_func ${1+"$@"} ;;
+ esac
+}
+
+
+# func_sort_ver VER1 VER2
+# -----------------------
+# 'sort -V' is not generally available.
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+func_sort_ver ()
+{
+ $debug_cmd
+
+ printf '%s\n%s\n' "$1" "$2" \
+ | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
+}
+
+# func_lt_ver PREV CURR
+# ---------------------
+# Return true if PREV and CURR are in the correct order according to
+# func_sort_ver, otherwise false. Use it like this:
+#
+# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
+func_lt_ver ()
+{
+ $debug_cmd
+
+ test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+#! /bin/sh
+
+# Set a version string for this script.
+scriptversion=2014-01-07.03; # UTC
+
+# A portable, pluggable option parser for Bourne shell.
+# Written by Gary V. Vaughan, 2010
+
+# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary at gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# This file is a library for parsing options in your shell scripts along
+# with assorted other useful supporting features that you can make use
+# of too.
+#
+# For the simplest scripts you might need only:
+#
+# #!/bin/sh
+# . relative/path/to/funclib.sh
+# . relative/path/to/options-parser
+# scriptversion=1.0
+# func_options ${1+"$@"}
+# eval set dummy "$func_options_result"; shift
+# ...rest of your script...
+#
+# In order for the '--version' option to work, you will need to have a
+# suitably formatted comment like the one at the top of this file
+# starting with '# Written by ' and ending with '# warranty; '.
+#
+# For '-h' and '--help' to work, you will also need a one line
+# description of your script's purpose in a comment directly above the
+# '# Written by ' line, like the one at the top of this file.
+#
+# The default options also support '--debug', which will turn on shell
+# execution tracing (see the comment above debug_cmd below for another
+# use), and '--verbose' and the func_verbose function to allow your script
+# to display verbose messages only when your user has specified
+# '--verbose'.
+#
+# After sourcing this file, you can plug processing for additional
+# options by amending the variables from the 'Configuration' section
+# below, and following the instructions in the 'Option parsing'
+# section further down.
+
+## -------------- ##
+## Configuration. ##
+## -------------- ##
+
+# You should override these variables in your script after sourcing this
+# file so that they reflect the customisations you have added to the
+# option parser.
+
+# The usage line for option parsing errors and the start of '-h' and
+# '--help' output messages. You can embed shell variables for delayed
+# expansion at the time the message is displayed, but you will need to
+# quote other shell meta-characters carefully to prevent them being
+# expanded when the contents are evaled.
+usage='$progpath [OPTION]...'
+
+# Short help message in response to '-h' and '--help'. Add to this or
+# override it after sourcing this library to reflect the full set of
+# options your script accepts.
+usage_message="\
+ --debug enable verbose shell tracing
+ -W, --warnings=CATEGORY
+ report the warnings falling in CATEGORY [all]
+ -v, --verbose verbosely report processing
+ --version print version information and exit
+ -h, --help print short or long help message and exit
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+long_help_message="
+Warning categories include:
+ 'all' show all warnings
+ 'none' turn off all the warnings
+ 'error' warnings are treated as fatal errors"
+
+# Help message printed before fatal option parsing errors.
+fatal_help="Try '\$progname --help' for more information."
+
+
+
+## ------------------------- ##
+## Hook function management. ##
+## ------------------------- ##
+
+# This section contains functions for adding, removing, and running hooks
+# to the main code. A hook is just a named list of of function, that can
+# be run in order later on.
+
+# func_hookable FUNC_NAME
+# -----------------------
+# Declare that FUNC_NAME will run hooks added with
+# 'func_add_hook FUNC_NAME ...'.
+func_hookable ()
+{
+ $debug_cmd
+
+ func_append hookable_fns " $1"
+}
+
+
+# func_add_hook FUNC_NAME HOOK_FUNC
+# ---------------------------------
+# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must
+# first have been declared "hookable" by a call to 'func_hookable'.
+func_add_hook ()
+{
+ $debug_cmd
+
+ case " $hookable_fns " in
+ *" $1 "*) ;;
+ *) func_fatal_error "'$1' does not accept hook functions." ;;
+ esac
+
+ eval func_append ${1}_hooks '" $2"'
+}
+
+
+# func_remove_hook FUNC_NAME HOOK_FUNC
+# ------------------------------------
+# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
+func_remove_hook ()
+{
+ $debug_cmd
+
+ eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
+}
+
+
+# func_run_hooks FUNC_NAME [ARG]...
+# ---------------------------------
+# Run all hook functions registered to FUNC_NAME.
+# It is assumed that the list of hook functions contains nothing more
+# than a whitespace-delimited list of legal shell function names, and
+# no effort is wasted trying to catch shell meta-characters or preserve
+# whitespace.
+func_run_hooks ()
+{
+ $debug_cmd
+
+ case " $hookable_fns " in
+ *" $1 "*) ;;
+ *) func_fatal_error "'$1' does not support hook funcions.n" ;;
+ esac
+
+ eval _G_hook_fns=\$$1_hooks; shift
+
+ for _G_hook in $_G_hook_fns; do
+ eval $_G_hook '"$@"'
+
+ # store returned options list back into positional
+ # parameters for next 'cmd' execution.
+ eval _G_hook_result=\$${_G_hook}_result
+ eval set dummy "$_G_hook_result"; shift
+ done
+
+ func_quote_for_eval ${1+"$@"}
+ func_run_hooks_result=$func_quote_for_eval_result
+}
+
+
+
+## --------------- ##
+## Option parsing. ##
+## --------------- ##
+
+# In order to add your own option parsing hooks, you must accept the
+# full positional parameter list in your hook function, remove any
+# options that you action, and then pass back the remaining unprocessed
+# options in '<hooked_function_name>_result', escaped suitably for
+# 'eval'. Like this:
+#
+# my_options_prep ()
+# {
+# $debug_cmd
+#
+# # Extend the existing usage message.
+# usage_message=$usage_message'
+# -s, --silent don'\''t print informational messages
+# '
+#
+# func_quote_for_eval ${1+"$@"}
+# my_options_prep_result=$func_quote_for_eval_result
+# }
+# func_add_hook func_options_prep my_options_prep
+#
+#
+# my_silent_option ()
+# {
+# $debug_cmd
+#
+# # Note that for efficiency, we parse as many options as we can
+# # recognise in a loop before passing the remainder back to the
+# # caller on the first unrecognised argument we encounter.
+# while test $# -gt 0; do
+# opt=$1; shift
+# case $opt in
+# --silent|-s) opt_silent=: ;;
+# # Separate non-argument short options:
+# -s*) func_split_short_opt "$_G_opt"
+# set dummy "$func_split_short_opt_name" \
+# "-$func_split_short_opt_arg" ${1+"$@"}
+# shift
+# ;;
+# *) set dummy "$_G_opt" "$*"; shift; break ;;
+# esac
+# done
+#
+# func_quote_for_eval ${1+"$@"}
+# my_silent_option_result=$func_quote_for_eval_result
+# }
+# func_add_hook func_parse_options my_silent_option
+#
+#
+# my_option_validation ()
+# {
+# $debug_cmd
+#
+# $opt_silent && $opt_verbose && func_fatal_help "\
+# '--silent' and '--verbose' options are mutually exclusive."
+#
+# func_quote_for_eval ${1+"$@"}
+# my_option_validation_result=$func_quote_for_eval_result
+# }
+# func_add_hook func_validate_options my_option_validation
+#
+# You'll alse need to manually amend $usage_message to reflect the extra
+# options you parse. It's preferable to append if you can, so that
+# multiple option parsing hooks can be added safely.
+
+
+# func_options [ARG]...
+# ---------------------
+# All the functions called inside func_options are hookable. See the
+# individual implementations for details.
+func_hookable func_options
+func_options ()
+{
+ $debug_cmd
+
+ func_options_prep ${1+"$@"}
+ eval func_parse_options \
+ ${func_options_prep_result+"$func_options_prep_result"}
+ eval func_validate_options \
+ ${func_parse_options_result+"$func_parse_options_result"}
+
+ eval func_run_hooks func_options \
+ ${func_validate_options_result+"$func_validate_options_result"}
+
+ # save modified positional parameters for caller
+ func_options_result=$func_run_hooks_result
}
-# func_quote_for_eval arg
-# Aesthetically quote ARG to be evaled later.
-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-# is double-quoted, suitable for a subsequent eval, whereas
-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-# which are still active within double quotes backslashified.
-func_quote_for_eval ()
+# func_options_prep [ARG]...
+# --------------------------
+# All initialisations required before starting the option parse loop.
+# Note that when calling hook functions, we pass through the list of
+# positional parameters. If a hook function modifies that list, and
+# needs to propogate that back to rest of this script, then the complete
+# modified list must be put in 'func_run_hooks_result' before
+# returning.
+func_hookable func_options_prep
+func_options_prep ()
{
- case $1 in
- *[\\\`\"\$]*)
- func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
- *)
- func_quote_for_eval_unquoted_result="$1" ;;
- esac
+ $debug_cmd
- case $func_quote_for_eval_unquoted_result in
- # Double-quote args containing shell metacharacters to delay
- # word splitting, command substitution and and variable
- # expansion for a subsequent eval.
- # Many Bourne shells cannot handle close brackets correctly
- # in scan sets, so we specify it separately.
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
- ;;
- *)
- func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
- esac
+ # Option defaults:
+ opt_verbose=false
+ opt_warning_types=
+
+ func_run_hooks func_options_prep ${1+"$@"}
+
+ # save modified positional parameters for caller
+ func_options_prep_result=$func_run_hooks_result
}
-# func_quote_for_expand arg
-# Aesthetically quote ARG to be evaled later; same as above,
-# but do not quote variable references.
-func_quote_for_expand ()
+# func_parse_options [ARG]...
+# ---------------------------
+# The main option parsing loop.
+func_hookable func_parse_options
+func_parse_options ()
{
- case $1 in
- *[\\\`\"]*)
- my_arg=`$ECHO "$1" | $SED \
- -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
- *)
- my_arg="$1" ;;
- esac
+ $debug_cmd
- case $my_arg in
- # Double-quote args containing shell metacharacters to delay
- # word splitting and command substitution for a subsequent eval.
- # Many Bourne shells cannot handle close brackets correctly
- # in scan sets, so we specify it separately.
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- my_arg="\"$my_arg\""
- ;;
- esac
+ func_parse_options_result=
- func_quote_for_expand_result="$my_arg"
-}
+ # this just eases exit handling
+ while test $# -gt 0; do
+ # Defer to hook functions for initial option parsing, so they
+ # get priority in the event of reusing an option name.
+ func_run_hooks func_parse_options ${1+"$@"}
+ # Adjust func_parse_options positional parameters to match
+ eval set dummy "$func_run_hooks_result"; shift
-# func_show_eval cmd [fail_exp]
-# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
-# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.
-func_show_eval ()
-{
- my_cmd="$1"
- my_fail_exp="${2-:}"
+ # Break out of the loop if we already parsed every option.
+ test $# -gt 0 || break
- ${opt_silent-false} || {
- func_quote_for_expand "$my_cmd"
- eval "func_echo $func_quote_for_expand_result"
- }
+ _G_opt=$1
+ shift
+ case $_G_opt in
+ --debug|-x) debug_cmd='set -x'
+ func_echo "enabling shell trace mode"
+ $debug_cmd
+ ;;
+
+ --no-warnings|--no-warning|--no-warn)
+ set dummy --warnings none ${1+"$@"}
+ shift
+ ;;
- if ${opt_dry_run-false}; then :; else
- eval "$my_cmd"
- my_status=$?
- if test "$my_status" -eq 0; then :; else
- eval "(exit $my_status); $my_fail_exp"
- fi
- fi
+ --warnings|--warning|-W)
+ test $# = 0 && func_missing_arg $_G_opt && break
+ case " $warning_categories $1" in
+ *" $1 "*)
+ # trailing space prevents matching last $1 above
+ func_append_uniq opt_warning_types " $1"
+ ;;
+ *all)
+ opt_warning_types=$warning_categories
+ ;;
+ *none)
+ opt_warning_types=none
+ warning_func=:
+ ;;
+ *error)
+ opt_warning_types=$warning_categories
+ warning_func=func_fatal_error
+ ;;
+ *)
+ func_fatal_error \
+ "unsupported warning category: '$1'"
+ ;;
+ esac
+ shift
+ ;;
+
+ --verbose|-v) opt_verbose=: ;;
+ --version) func_version ;;
+ -\?|-h) func_usage ;;
+ --help) func_help ;;
+
+ # Separate optargs to long options (plugins may need this):
+ --*=*) func_split_equals "$_G_opt"
+ set dummy "$func_split_equals_lhs" \
+ "$func_split_equals_rhs" ${1+"$@"}
+ shift
+ ;;
+
+ # Separate optargs to short options:
+ -W*)
+ func_split_short_opt "$_G_opt"
+ set dummy "$func_split_short_opt_name" \
+ "$func_split_short_opt_arg" ${1+"$@"}
+ shift
+ ;;
+
+ # Separate non-argument short options:
+ -\?*|-h*|-v*|-x*)
+ func_split_short_opt "$_G_opt"
+ set dummy "$func_split_short_opt_name" \
+ "-$func_split_short_opt_arg" ${1+"$@"}
+ shift
+ ;;
+
+ --) break ;;
+ -*) func_fatal_help "unrecognised option: '$_G_opt'" ;;
+ *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+ esac
+ done
+
+ # save modified positional parameters for caller
+ func_quote_for_eval ${1+"$@"}
+ func_parse_options_result=$func_quote_for_eval_result
}
-# func_show_eval_locale cmd [fail_exp]
-# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
-# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it. Use the saved locale for evaluation.
-func_show_eval_locale ()
+# func_validate_options [ARG]...
+# ------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+func_hookable func_validate_options
+func_validate_options ()
{
- my_cmd="$1"
- my_fail_exp="${2-:}"
+ $debug_cmd
- ${opt_silent-false} || {
- func_quote_for_expand "$my_cmd"
- eval "func_echo $func_quote_for_expand_result"
- }
+ # Display all warnings if -W was not given.
+ test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
- if ${opt_dry_run-false}; then :; else
- eval "$lt_user_locale
- $my_cmd"
- my_status=$?
- eval "$lt_safe_locale"
- if test "$my_status" -eq 0; then :; else
- eval "(exit $my_status); $my_fail_exp"
- fi
- fi
-}
+ func_run_hooks func_validate_options ${1+"$@"}
-# func_tr_sh
-# Turn $1 into a string suitable for a shell variable name.
-# Result is stored in $func_tr_sh_result. All characters
-# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
-# if $1 begins with a digit, a '_' is prepended as well.
-func_tr_sh ()
-{
- case $1 in
- [0-9]* | *[!a-zA-Z0-9_]*)
- func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
- ;;
- * )
- func_tr_sh_result=$1
- ;;
- esac
+ # Bail if the options were screwed!
+ $exit_cmd $EXIT_FAILURE
+
+ # save modified positional parameters for caller
+ func_validate_options_result=$func_run_hooks_result
}
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
-{
- $opt_debug
- $SED -n '/(C)/!b go
- :more
- /\./!{
- N
- s/\n# / /
- b more
- }
- :go
- /^# '$PROGRAM' (GNU /,/# warranty; / {
- s/^# //
- s/^# *$//
- s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
- p
- }' < "$progpath"
- exit $?
-}
+## ----------------- ##
+## Helper functions. ##
+## ----------------- ##
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
+# This section contains the helper functions used by the rest of the
+# hookable option parser framework in ascii-betical order.
+
+
+# func_fatal_help ARG...
+# ----------------------
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
{
- $opt_debug
+ $debug_cmd
- $SED -n '/^# Usage:/,/^# *.*--help/ {
- s/^# //
- s/^# *$//
- s/\$progname/'$progname'/
- p
- }' < "$progpath"
- echo
- $ECHO "run \`$progname --help | more' for full usage"
- exit $?
+ eval \$ECHO \""Usage: $usage"\"
+ eval \$ECHO \""$fatal_help"\"
+ func_error ${1+"$@"}
+ exit $EXIT_FAILURE
}
-# func_help [NOEXIT]
-# Echo long help message to standard output and exit,
-# unless 'noexit' is passed as argument.
+
+# func_help
+# ---------
+# Echo long help message to standard output and exit.
func_help ()
{
- $opt_debug
-
- $SED -n '/^# Usage:/,/# Report bugs to/ {
- :print
- s/^# //
- s/^# *$//
- s*\$progname*'$progname'*
- s*\$host*'"$host"'*
- s*\$SHELL*'"$SHELL"'*
- s*\$LTCC*'"$LTCC"'*
- s*\$LTCFLAGS*'"$LTCFLAGS"'*
- s*\$LD*'"$LD"'*
- s/\$with_gnu_ld/'"$with_gnu_ld"'/
- s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
- s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
- p
- d
- }
- /^# .* home page:/b print
- /^# General help using/b print
- ' < "$progpath"
- ret=$?
- if test -z "$1"; then
- exit $ret
- fi
+ $debug_cmd
+
+ func_usage_message
+ $ECHO "$long_help_message"
+ exit 0
}
-# func_missing_arg argname
+
+# func_missing_arg ARGNAME
+# ------------------------
# Echo program name prefixed message to standard error and set global
# exit_cmd.
func_missing_arg ()
{
- $opt_debug
+ $debug_cmd
- func_error "missing argument for $1."
+ func_error "Missing argument for '$1'."
exit_cmd=exit
}
-# func_split_short_opt shortopt
+# func_split_equals STRING
+# ------------------------
+# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
+# splitting STRING at the '=' sign.
+test -z "$_G_HAVE_XSI_OPS" \
+ && (eval 'x=a/b/c;
+ test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+ && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+ # This is an XSI compatible shell, allowing a faster implementation...
+ eval 'func_split_equals ()
+ {
+ $debug_cmd
+
+ func_split_equals_lhs=${1%%=*}
+ func_split_equals_rhs=${1#*=}
+ test "x$func_split_equals_lhs" = "x$1" \
+ && func_split_equals_rhs=
+ }'
+else
+ # ...otherwise fall back to using expr, which is often a shell builtin.
+ func_split_equals ()
+ {
+ $debug_cmd
+
+ func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
+ func_split_equals_rhs=
+ test "x$func_split_equals_lhs" = "x$1" \
+ || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
+ }
+fi #func_split_equals
+
+
+# func_split_short_opt SHORTOPT
+# -----------------------------
# Set func_split_short_opt_name and func_split_short_opt_arg shell
# variables after splitting SHORTOPT after the 2nd character.
-func_split_short_opt ()
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+ # This is an XSI compatible shell, allowing a faster implementation...
+ eval 'func_split_short_opt ()
+ {
+ $debug_cmd
+
+ func_split_short_opt_arg=${1#??}
+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
+ }'
+else
+ # ...otherwise fall back to using expr, which is often a shell builtin.
+ func_split_short_opt ()
+ {
+ $debug_cmd
+
+ func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'`
+ func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
+ }
+fi #func_split_short_opt
+
+
+# func_usage
+# ----------
+# Echo short help message to standard output and exit.
+func_usage ()
{
- my_sed_short_opt='1s/^\(..\).*$/\1/;q'
- my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+ $debug_cmd
- func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
- func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-} # func_split_short_opt may be replaced by extended shell implementation
+ func_usage_message
+ $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
+ exit 0
+}
-# func_split_long_opt longopt
-# Set func_split_long_opt_name and func_split_long_opt_arg shell
-# variables after splitting LONGOPT at the `=' sign.
-func_split_long_opt ()
+# func_usage_message
+# ------------------
+# Echo short help message to standard output.
+func_usage_message ()
{
- my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
- my_sed_long_arg='1s/^--[^=]*=//'
+ $debug_cmd
- func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
- func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-} # func_split_long_opt may be replaced by extended shell implementation
+ eval \$ECHO \""Usage: $usage"\"
+ echo
+ $SED -n 's|^# ||
+ /^Written by/{
+ x;p;x
+ }
+ h
+ /^Written by/q' < "$progpath"
+ echo
+ eval \$ECHO \""$usage_message"\"
+}
-exit_cmd=:
+# func_version
+# ------------
+# Echo version message to standard output and exit.
+func_version ()
+{
+ $debug_cmd
+ printf '%s\n' "$progname $scriptversion"
+ $SED -n '
+ /(C)/!b go
+ :more
+ /\./!{
+ N
+ s|\n# | |
+ b more
+ }
+ :go
+ /^# Written by /,/# warranty; / {
+ s|^# ||
+ s|^# *$||
+ s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
+ p
+ }
+ /^# Written by / {
+ s|^# ||
+ p
+ }
+ /^warranty; /q' < "$progpath"
+ exit $?
+}
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
-# Global variables.
-nonopt=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
+# Set a version string.
+scriptversion='(GNU libtool) 2.4.6'
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end. This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
+# func_echo ARG...
+# ----------------
+# Libtool also displays the current mode in messages, so override
+# funclib.sh func_echo with this custom definition.
+func_echo ()
{
- eval "${1}=\$${1}\${2}"
-} # func_append may be replaced by extended shell implementation
+ $debug_cmd
-# func_append_quoted var value
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-func_append_quoted ()
-{
- func_quote_for_eval "${2}"
- eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-} # func_append_quoted may be replaced by extended shell implementation
+ _G_message=$*
+ func_echo_IFS=$IFS
+ IFS=$nl
+ for _G_line in $_G_message; do
+ IFS=$func_echo_IFS
+ $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
+ done
+ IFS=$func_echo_IFS
+}
-# func_arith arithmetic-term...
-func_arith ()
+
+# func_warning ARG...
+# -------------------
+# Libtool warnings are not categorized, so override funclib.sh
+# func_warning with this simpler definition.
+func_warning ()
{
- func_arith_result=`expr "${@}"`
-} # func_arith may be replaced by extended shell implementation
+ $debug_cmd
+ $warning_func ${1+"$@"}
+}
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-} # func_len may be replaced by extended shell implementation
+## ---------------- ##
+## Options parsing. ##
+## ---------------- ##
+
+# Hook in the functions to make sure our own options are parsed during
+# the option parsing loop.
+
+usage='$progpath [OPTION]... [MODE-ARG]...'
+
+# Short help message in response to '-h'.
+usage_message="Options:
+ --config show all configuration variables
+ --debug enable verbose shell tracing
+ -n, --dry-run display commands without modifying any files
+ --features display basic configuration information and exit
+ --mode=MODE use operation mode MODE
+ --no-warnings equivalent to '-Wnone'
+ --preserve-dup-deps don't remove duplicate dependency libraries
+ --quiet, --silent don't print informational messages
+ --tag=TAG use configuration variables from tag TAG
+ -v, --verbose print more informational messages than default
+ --version print version information
+ -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all]
+ -h, --help, --help-all print short, long, or detailed help message
+"
-# func_lo2o object
-func_lo2o ()
+# Additional text appended to 'usage_message' in response to '--help'.
+func_help ()
{
- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-} # func_lo2o may be replaced by extended shell implementation
+ $debug_cmd
+
+ func_usage_message
+ $ECHO "$long_help_message
+
+MODE must be one of the following:
+
+ clean remove files from the build directory
+ compile compile a source file into a libtool object
+ execute automatically set library path, then run a program
+ finish complete the installation of libtool libraries
+ install install libraries or executables
+ link create a library or an executable
+ uninstall remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE. When passed as first option,
+'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
+Try '$progname --help --mode=MODE' for a more detailed description of MODE.
+
+When reporting a bug, please describe a test case to reproduce it and
+include the following information:
+
+ host-triplet: $host
+ shell: $SHELL
+ compiler: $LTCC
+ compiler flags: $LTCFLAGS
+ linker: $LD (gnu? $with_gnu_ld)
+ version: $progname (GNU libtool) 2.4.6
+ automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
+ autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
+
+Report bugs to <bug-libtool at gnu.org>.
+GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+General help using GNU software: <http://www.gnu.org/gethelp/>."
+ exit 0
+}
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-} # func_xform may be replaced by extended shell implementation
+# func_lo2o OBJECT-NAME
+# ---------------------
+# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
+# object suffix.
+
+lo2o=s/\\.lo\$/.$objext/
+o2lo=s/\\.$objext\$/.lo/
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ eval 'func_lo2o ()
+ {
+ case $1 in
+ *.lo) func_lo2o_result=${1%.lo}.$objext ;;
+ * ) func_lo2o_result=$1 ;;
+ esac
+ }'
+
+ # func_xform LIBOBJ-OR-SOURCE
+ # ---------------------------
+ # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
+ # suffix to a '.lo' libtool-object suffix.
+ eval 'func_xform ()
+ {
+ func_xform_result=${1%.*}.lo
+ }'
+else
+ # ...otherwise fall back to using sed.
+ func_lo2o ()
+ {
+ func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
+ }
+
+ func_xform ()
+ {
+ func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'`
+ }
+fi
-# func_fatal_configuration arg...
+# func_fatal_configuration ARG...
+# -------------------------------
# Echo program name prefixed message to standard error, followed by
# a configuration failure hint, and exit.
func_fatal_configuration ()
{
- func_error ${1+"$@"}
- func_error "See the $PACKAGE documentation for more information."
- func_fatal_error "Fatal configuration error."
+ func__fatal_error ${1+"$@"} \
+ "See the $PACKAGE documentation for more information." \
+ "Fatal configuration error."
}
# func_config
+# -----------
# Display the configuration for all the tags in this script.
func_config ()
{
@@ -915,17 +2149,19 @@ func_config ()
exit $?
}
+
# func_features
+# -------------
# Display the features supported by this script.
func_features ()
{
echo "host: $host"
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
echo "enable shared libraries"
else
echo "disable shared libraries"
fi
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
echo "enable static libraries"
else
echo "disable static libraries"
@@ -934,314 +2170,350 @@ func_features ()
exit $?
}
-# func_enable_tag tagname
+
+# func_enable_tag TAGNAME
+# -----------------------
# Verify that TAGNAME is valid, and either flag an error and exit, or
# enable the TAGNAME tag. We also add TAGNAME to the global $taglist
# variable here.
func_enable_tag ()
{
- # Global variable:
- tagname="$1"
+ # Global variable:
+ tagname=$1
- re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
- re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
- sed_extractcf="/$re_begincf/,/$re_endcf/p"
+ re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+ re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+ sed_extractcf=/$re_begincf/,/$re_endcf/p
- # Validate tagname.
- case $tagname in
- *[!-_A-Za-z0-9,/]*)
- func_fatal_error "invalid tag name: $tagname"
- ;;
- esac
+ # Validate tagname.
+ case $tagname in
+ *[!-_A-Za-z0-9,/]*)
+ func_fatal_error "invalid tag name: $tagname"
+ ;;
+ esac
- # Don't test for the "default" C tag, as we know it's
- # there but not specially marked.
- case $tagname in
- CC) ;;
+ # Don't test for the "default" C tag, as we know it's
+ # there but not specially marked.
+ case $tagname in
+ CC) ;;
*)
- if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
- taglist="$taglist $tagname"
-
- # Evaluate the configuration. Be careful to quote the path
- # and the sed script, to avoid splitting on whitespace, but
- # also don't use non-portable quotes within backquotes within
- # quotes we have to do it in 2 steps:
- extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
- eval "$extractedcf"
- else
- func_error "ignoring unknown tag $tagname"
- fi
- ;;
- esac
+ if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+ taglist="$taglist $tagname"
+
+ # Evaluate the configuration. Be careful to quote the path
+ # and the sed script, to avoid splitting on whitespace, but
+ # also don't use non-portable quotes within backquotes within
+ # quotes we have to do it in 2 steps:
+ extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+ eval "$extractedcf"
+ else
+ func_error "ignoring unknown tag $tagname"
+ fi
+ ;;
+ esac
}
+
# func_check_version_match
+# ------------------------
# Ensure that we are using m4 macros, and libtool script from the same
# release of libtool.
func_check_version_match ()
{
- if test "$package_revision" != "$macro_revision"; then
- if test "$VERSION" != "$macro_version"; then
- if test -z "$macro_version"; then
- cat >&2 <<_LT_EOF
+ if test "$package_revision" != "$macro_revision"; then
+ if test "$VERSION" != "$macro_version"; then
+ if test -z "$macro_version"; then
+ cat >&2 <<_LT_EOF
$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
$progname: definition of this LT_INIT comes from an older release.
$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
$progname: and run autoconf again.
_LT_EOF
- else
- cat >&2 <<_LT_EOF
+ else
+ cat >&2 <<_LT_EOF
$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
$progname: and run autoconf again.
_LT_EOF
- fi
- else
- cat >&2 <<_LT_EOF
+ fi
+ else
+ cat >&2 <<_LT_EOF
$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
$progname: but the definition of this LT_INIT comes from revision $macro_revision.
$progname: You should recreate aclocal.m4 with macros from revision $package_revision
$progname: of $PACKAGE $VERSION and run autoconf again.
_LT_EOF
- fi
+ fi
- exit $EXIT_MISMATCH
- fi
+ exit $EXIT_MISMATCH
+ fi
}
-# Shorthand for --mode=foo, only valid as the first argument
-case $1 in
-clean|clea|cle|cl)
- shift; set dummy --mode clean ${1+"$@"}; shift
- ;;
-compile|compil|compi|comp|com|co|c)
- shift; set dummy --mode compile ${1+"$@"}; shift
- ;;
-execute|execut|execu|exec|exe|ex|e)
- shift; set dummy --mode execute ${1+"$@"}; shift
- ;;
-finish|finis|fini|fin|fi|f)
- shift; set dummy --mode finish ${1+"$@"}; shift
- ;;
-install|instal|insta|inst|ins|in|i)
- shift; set dummy --mode install ${1+"$@"}; shift
- ;;
-link|lin|li|l)
- shift; set dummy --mode link ${1+"$@"}; shift
- ;;
-uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
- shift; set dummy --mode uninstall ${1+"$@"}; shift
- ;;
-esac
+# libtool_options_prep [ARG]...
+# -----------------------------
+# Preparation for options parsed by libtool.
+libtool_options_prep ()
+{
+ $debug_mode
+ # Option defaults:
+ opt_config=false
+ opt_dlopen=
+ opt_dry_run=false
+ opt_help=false
+ opt_mode=
+ opt_preserve_dup_deps=false
+ opt_quiet=false
+ nonopt=
+ preserve_args=
-# Option defaults:
-opt_debug=:
-opt_dry_run=false
-opt_config=false
-opt_preserve_dup_deps=false
-opt_features=false
-opt_finish=false
-opt_help=false
-opt_help_all=false
-opt_silent=:
-opt_warning=:
-opt_verbose=:
-opt_silent=false
-opt_verbose=false
+ # Shorthand for --mode=foo, only valid as the first argument
+ case $1 in
+ clean|clea|cle|cl)
+ shift; set dummy --mode clean ${1+"$@"}; shift
+ ;;
+ compile|compil|compi|comp|com|co|c)
+ shift; set dummy --mode compile ${1+"$@"}; shift
+ ;;
+ execute|execut|execu|exec|exe|ex|e)
+ shift; set dummy --mode execute ${1+"$@"}; shift
+ ;;
+ finish|finis|fini|fin|fi|f)
+ shift; set dummy --mode finish ${1+"$@"}; shift
+ ;;
+ install|instal|insta|inst|ins|in|i)
+ shift; set dummy --mode install ${1+"$@"}; shift
+ ;;
+ link|lin|li|l)
+ shift; set dummy --mode link ${1+"$@"}; shift
+ ;;
+ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+ shift; set dummy --mode uninstall ${1+"$@"}; shift
+ ;;
+ esac
+
+ # Pass back the list of options.
+ func_quote_for_eval ${1+"$@"}
+ libtool_options_prep_result=$func_quote_for_eval_result
+}
+func_add_hook func_options_prep libtool_options_prep
-# Parse options once, thoroughly. This comes as soon as possible in the
-# script to make things like `--version' happen as quickly as we can.
+# libtool_parse_options [ARG]...
+# ---------------------------------
+# Provide handling for libtool specific options.
+libtool_parse_options ()
{
- # this just eases exit handling
- while test $# -gt 0; do
- opt="$1"
- shift
- case $opt in
- --debug|-x) opt_debug='set -x'
- func_echo "enabling shell trace mode"
- $opt_debug
- ;;
- --dry-run|--dryrun|-n)
- opt_dry_run=:
- ;;
- --config)
- opt_config=:
-func_config
- ;;
- --dlopen|-dlopen)
- optarg="$1"
- opt_dlopen="${opt_dlopen+$opt_dlopen
-}$optarg"
- shift
- ;;
- --preserve-dup-deps)
- opt_preserve_dup_deps=:
- ;;
- --features)
- opt_features=:
-func_features
- ;;
- --finish)
- opt_finish=:
-set dummy --mode finish ${1+"$@"}; shift
- ;;
- --help)
- opt_help=:
- ;;
- --help-all)
- opt_help_all=:
-opt_help=': help-all'
- ;;
- --mode)
- test $# = 0 && func_missing_arg $opt && break
- optarg="$1"
- opt_mode="$optarg"
-case $optarg in
- # Valid mode arguments:
- clean|compile|execute|finish|install|link|relink|uninstall) ;;
-
- # Catch anything else as an error
- *) func_error "invalid argument for $opt"
- exit_cmd=exit
- break
- ;;
-esac
- shift
- ;;
- --no-silent|--no-quiet)
- opt_silent=false
-func_append preserve_args " $opt"
- ;;
- --no-warning|--no-warn)
- opt_warning=false
-func_append preserve_args " $opt"
- ;;
- --no-verbose)
- opt_verbose=false
-func_append preserve_args " $opt"
- ;;
- --silent|--quiet)
- opt_silent=:
-func_append preserve_args " $opt"
- opt_verbose=false
- ;;
- --verbose|-v)
- opt_verbose=:
-func_append preserve_args " $opt"
-opt_silent=false
- ;;
- --tag)
- test $# = 0 && func_missing_arg $opt && break
- optarg="$1"
- opt_tag="$optarg"
-func_append preserve_args " $opt $optarg"
-func_enable_tag "$optarg"
- shift
- ;;
-
- -\?|-h) func_usage ;;
- --help) func_help ;;
- --version) func_version ;;
-
- # Separate optargs to long options:
- --*=*)
- func_split_long_opt "$opt"
- set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
- shift
- ;;
-
- # Separate non-argument short options:
- -\?*|-h*|-n*|-v*)
- func_split_short_opt "$opt"
- set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
- shift
- ;;
-
- --) break ;;
- -*) func_fatal_help "unrecognized option \`$opt'" ;;
- *) set dummy "$opt" ${1+"$@"}; shift; break ;;
- esac
- done
+ $debug_cmd
- # Validate options:
+ # Perform our own loop to consume as many options as possible in
+ # each iteration.
+ while test $# -gt 0; do
+ _G_opt=$1
+ shift
+ case $_G_opt in
+ --dry-run|--dryrun|-n)
+ opt_dry_run=:
+ ;;
+
+ --config) func_config ;;
+
+ --dlopen|-dlopen)
+ opt_dlopen="${opt_dlopen+$opt_dlopen
+}$1"
+ shift
+ ;;
+
+ --preserve-dup-deps)
+ opt_preserve_dup_deps=: ;;
+
+ --features) func_features ;;
+
+ --finish) set dummy --mode finish ${1+"$@"}; shift ;;
+
+ --help) opt_help=: ;;
+
+ --help-all) opt_help=': help-all' ;;
+
+ --mode) test $# = 0 && func_missing_arg $_G_opt && break
+ opt_mode=$1
+ case $1 in
+ # Valid mode arguments:
+ clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+ # Catch anything else as an error
+ *) func_error "invalid argument for $_G_opt"
+ exit_cmd=exit
+ break
+ ;;
+ esac
+ shift
+ ;;
+
+ --no-silent|--no-quiet)
+ opt_quiet=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --no-warnings|--no-warning|--no-warn)
+ opt_warning=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --no-verbose)
+ opt_verbose=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --silent|--quiet)
+ opt_quiet=:
+ opt_verbose=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --tag) test $# = 0 && func_missing_arg $_G_opt && break
+ opt_tag=$1
+ func_append preserve_args " $_G_opt $1"
+ func_enable_tag "$1"
+ shift
+ ;;
+
+ --verbose|-v) opt_quiet=false
+ opt_verbose=:
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ # An option not handled by this hook function:
+ *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+ esac
+ done
- # save first non-option argument
- if test "$#" -gt 0; then
- nonopt="$opt"
- shift
- fi
- # preserve --debug
- test "$opt_debug" = : || func_append preserve_args " --debug"
+ # save modified positional parameters for caller
+ func_quote_for_eval ${1+"$@"}
+ libtool_parse_options_result=$func_quote_for_eval_result
+}
+func_add_hook func_parse_options libtool_parse_options
- case $host in
- *cygwin* | *mingw* | *pw32* | *cegcc*)
- # don't eliminate duplications in $postdeps and $predeps
- opt_duplicate_compiler_generated_deps=:
- ;;
- *)
- opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
- ;;
- esac
- $opt_help || {
- # Sanity checks first:
- func_check_version_match
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
- func_fatal_configuration "not configured to build any kind of library"
+# libtool_validate_options [ARG]...
+# ---------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+libtool_validate_options ()
+{
+ # save first non-option argument
+ if test 0 -lt $#; then
+ nonopt=$1
+ shift
fi
- # Darwin sucks
- eval std_shrext=\"$shrext_cmds\"
+ # preserve --debug
+ test : = "$debug_cmd" || func_append preserve_args " --debug"
- # Only execute mode is allowed to have -dlopen flags.
- if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
- func_error "unrecognized option \`-dlopen'"
- $ECHO "$help" 1>&2
- exit $EXIT_FAILURE
- fi
+ case $host in
+ # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
+ # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
+ *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
+ # don't eliminate duplications in $postdeps and $predeps
+ opt_duplicate_compiler_generated_deps=:
+ ;;
+ *)
+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+ ;;
+ esac
- # Change the help message to a mode-specific one.
- generic_help="$help"
- help="Try \`$progname --help --mode=$opt_mode' for more information."
- }
+ $opt_help || {
+ # Sanity checks first:
+ func_check_version_match
+
+ test yes != "$build_libtool_libs" \
+ && test yes != "$build_old_libs" \
+ && func_fatal_configuration "not configured to build any kind of library"
+
+ # Darwin sucks
+ eval std_shrext=\"$shrext_cmds\"
+
+ # Only execute mode is allowed to have -dlopen flags.
+ if test -n "$opt_dlopen" && test execute != "$opt_mode"; then
+ func_error "unrecognized option '-dlopen'"
+ $ECHO "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ # Change the help message to a mode-specific one.
+ generic_help=$help
+ help="Try '$progname --help --mode=$opt_mode' for more information."
+ }
- # Bail if the options were screwed
- $exit_cmd $EXIT_FAILURE
+ # Pass back the unparsed argument list
+ func_quote_for_eval ${1+"$@"}
+ libtool_validate_options_result=$func_quote_for_eval_result
}
+func_add_hook func_validate_options libtool_validate_options
+# Process options as early as possible so that --help and --version
+# can return quickly.
+func_options ${1+"$@"}
+eval set dummy "$func_options_result"; shift
+
## ----------- ##
## Main. ##
## ----------- ##
+magic='%%%MAGIC variable%%%'
+magic_exe='%%%MAGIC EXE variable%%%'
+
+# Global variables.
+extracted_archives=
+extracted_serial=0
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end. This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# func_generated_by_libtool
+# True iff stdin has been generated by Libtool. This function is only
+# a basic sanity check; it will hardly flush out determined imposters.
+func_generated_by_libtool_p ()
+{
+ $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
# func_lalib_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
# This function is only a basic sanity check; it will hardly flush out
# determined imposters.
func_lalib_p ()
{
test -f "$1" &&
- $SED -e 4q "$1" 2>/dev/null \
- | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+ $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
}
# func_lalib_unsafe_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
# This function implements the same check as func_lalib_p without
# resorting to external programs. To this end, it redirects stdin and
# closes it afterwards, without saving the original file descriptor.
# As a safety measure, use it only where a negative result would be
-# fatal anyway. Works if `file' does not exist.
+# fatal anyway. Works if 'file' does not exist.
func_lalib_unsafe_p ()
{
lalib_p=no
@@ -1249,13 +2521,13 @@ func_lalib_unsafe_p ()
for lalib_p_l in 1 2 3 4
do
read lalib_p_line
- case "$lalib_p_line" in
+ case $lalib_p_line in
\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
esac
done
exec 0<&5 5<&-
fi
- test "$lalib_p" = yes
+ test yes = "$lalib_p"
}
# func_ltwrapper_script_p file
@@ -1264,7 +2536,8 @@ func_lalib_unsafe_p ()
# determined imposters.
func_ltwrapper_script_p ()
{
- func_lalib_p "$1"
+ test -f "$1" &&
+ $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
}
# func_ltwrapper_executable_p file
@@ -1289,7 +2562,7 @@ func_ltwrapper_scriptname ()
{
func_dirname_and_basename "$1" "" "."
func_stripname '' '.exe' "$func_basename_result"
- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+ func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
}
# func_ltwrapper_p file
@@ -1308,11 +2581,13 @@ func_ltwrapper_p ()
# FAIL_CMD may read-access the current command in variable CMD!
func_execute_cmds ()
{
- $opt_debug
+ $debug_cmd
+
save_ifs=$IFS; IFS='~'
for cmd in $1; do
- IFS=$save_ifs
+ IFS=$sp$nl
eval cmd=\"$cmd\"
+ IFS=$save_ifs
func_show_eval "$cmd" "${2-:}"
done
IFS=$save_ifs
@@ -1324,10 +2599,11 @@ func_execute_cmds ()
# Note that it is not necessary on cygwin/mingw to append a dot to
# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
# behavior happens only for exec(3), not for open(2)! Also, sourcing
-# `FILE.' does not work on cygwin managed mounts.
+# 'FILE.' does not work on cygwin managed mounts.
func_source ()
{
- $opt_debug
+ $debug_cmd
+
case $1 in
*/* | *\\*) . "$1" ;;
*) . "./$1" ;;
@@ -1354,10 +2630,10 @@ func_resolve_sysroot ()
# store the result into func_replace_sysroot_result.
func_replace_sysroot ()
{
- case "$lt_sysroot:$1" in
+ case $lt_sysroot:$1 in
?*:"$lt_sysroot"*)
func_stripname "$lt_sysroot" '' "$1"
- func_replace_sysroot_result="=$func_stripname_result"
+ func_replace_sysroot_result='='$func_stripname_result
;;
*)
# Including no sysroot.
@@ -1374,7 +2650,8 @@ func_replace_sysroot ()
# arg is usually of the form 'gcc ...'
func_infer_tag ()
{
- $opt_debug
+ $debug_cmd
+
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
@@ -1393,7 +2670,7 @@ func_infer_tag ()
for z in $available_tags; do
if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
# Evaluate the configuration.
- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+ eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
CC_quoted=
for arg in $CC; do
# Double-quote args containing other shell metacharacters.
@@ -1418,7 +2695,7 @@ func_infer_tag ()
# line option must be used.
if test -z "$tagname"; then
func_echo "unable to infer tagged configuration"
- func_fatal_error "specify a tag with \`--tag'"
+ func_fatal_error "specify a tag with '--tag'"
# else
# func_verbose "using $tagname tagged configuration"
fi
@@ -1434,15 +2711,15 @@ func_infer_tag ()
# but don't create it if we're doing a dry run.
func_write_libtool_object ()
{
- write_libobj=${1}
- if test "$build_libtool_libs" = yes; then
- write_lobj=\'${2}\'
+ write_libobj=$1
+ if test yes = "$build_libtool_libs"; then
+ write_lobj=\'$2\'
else
write_lobj=none
fi
- if test "$build_old_libs" = yes; then
- write_oldobj=\'${3}\'
+ if test yes = "$build_old_libs"; then
+ write_oldobj=\'$3\'
else
write_oldobj=none
fi
@@ -1450,7 +2727,7 @@ func_write_libtool_object ()
$opt_dry_run || {
cat >${write_libobj}T <<EOF
# $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
@@ -1462,7 +2739,7 @@ pic_object=$write_lobj
non_pic_object=$write_oldobj
EOF
- $MV "${write_libobj}T" "${write_libobj}"
+ $MV "${write_libobj}T" "$write_libobj"
}
}
@@ -1482,8 +2759,9 @@ EOF
# be empty on error (or when ARG is empty)
func_convert_core_file_wine_to_w32 ()
{
- $opt_debug
- func_convert_core_file_wine_to_w32_result="$1"
+ $debug_cmd
+
+ func_convert_core_file_wine_to_w32_result=$1
if test -n "$1"; then
# Unfortunately, winepath does not exit with a non-zero error code, so we
# are forced to check the contents of stdout. On the other hand, if the
@@ -1491,9 +2769,9 @@ func_convert_core_file_wine_to_w32 ()
# *an error message* to stdout. So we must check for both error code of
# zero AND non-empty stdout, which explains the odd construction:
func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
- if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+ if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
- $SED -e "$lt_sed_naive_backslashify"`
+ $SED -e "$sed_naive_backslashify"`
else
func_convert_core_file_wine_to_w32_result=
fi
@@ -1514,18 +2792,19 @@ func_convert_core_file_wine_to_w32 ()
# are convertible, then the result may be empty.
func_convert_core_path_wine_to_w32 ()
{
- $opt_debug
+ $debug_cmd
+
# unfortunately, winepath doesn't convert paths, only file names
- func_convert_core_path_wine_to_w32_result=""
+ func_convert_core_path_wine_to_w32_result=
if test -n "$1"; then
oldIFS=$IFS
IFS=:
for func_convert_core_path_wine_to_w32_f in $1; do
IFS=$oldIFS
func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
- if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+ if test -n "$func_convert_core_file_wine_to_w32_result"; then
if test -z "$func_convert_core_path_wine_to_w32_result"; then
- func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+ func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
else
func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
fi
@@ -1554,7 +2833,8 @@ func_convert_core_path_wine_to_w32 ()
# environment variable; do not put it in $PATH.
func_cygpath ()
{
- $opt_debug
+ $debug_cmd
+
if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
if test "$?" -ne 0; then
@@ -1563,7 +2843,7 @@ func_cygpath ()
fi
else
func_cygpath_result=
- func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+ func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
fi
}
#end: func_cygpath
@@ -1574,10 +2854,11 @@ func_cygpath ()
# result in func_convert_core_msys_to_w32_result.
func_convert_core_msys_to_w32 ()
{
- $opt_debug
+ $debug_cmd
+
# awkward: cmd appends spaces to result
func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+ $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
}
#end: func_convert_core_msys_to_w32
@@ -1588,13 +2869,14 @@ func_convert_core_msys_to_w32 ()
# func_to_host_file_result to ARG1).
func_convert_file_check ()
{
- $opt_debug
- if test -z "$2" && test -n "$1" ; then
+ $debug_cmd
+
+ if test -z "$2" && test -n "$1"; then
func_error "Could not determine host file name corresponding to"
- func_error " \`$1'"
+ func_error " '$1'"
func_error "Continuing, but uninstalled executables may not work."
# Fallback:
- func_to_host_file_result="$1"
+ func_to_host_file_result=$1
fi
}
# end func_convert_file_check
@@ -1606,10 +2888,11 @@ func_convert_file_check ()
# func_to_host_file_result to a simplistic fallback value (see below).
func_convert_path_check ()
{
- $opt_debug
+ $debug_cmd
+
if test -z "$4" && test -n "$3"; then
func_error "Could not determine the host path corresponding to"
- func_error " \`$3'"
+ func_error " '$3'"
func_error "Continuing, but uninstalled executables may not work."
# Fallback. This is a deliberately simplistic "conversion" and
# should not be "improved". See libtool.info.
@@ -1618,7 +2901,7 @@ func_convert_path_check ()
func_to_host_path_result=`echo "$3" |
$SED -e "$lt_replace_pathsep_chars"`
else
- func_to_host_path_result="$3"
+ func_to_host_path_result=$3
fi
fi
}
@@ -1630,9 +2913,10 @@ func_convert_path_check ()
# and appending REPL if ORIG matches BACKPAT.
func_convert_path_front_back_pathsep ()
{
- $opt_debug
+ $debug_cmd
+
case $4 in
- $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+ $1 ) func_to_host_path_result=$3$func_to_host_path_result
;;
esac
case $4 in
@@ -1646,7 +2930,7 @@ func_convert_path_front_back_pathsep ()
##################################################
# $build to $host FILE NAME CONVERSION FUNCTIONS #
##################################################
-# invoked via `$to_host_file_cmd ARG'
+# invoked via '$to_host_file_cmd ARG'
#
# In each case, ARG is the path to be converted from $build to $host format.
# Result will be available in $func_to_host_file_result.
@@ -1657,7 +2941,8 @@ func_convert_path_front_back_pathsep ()
# in func_to_host_file_result.
func_to_host_file ()
{
- $opt_debug
+ $debug_cmd
+
$to_host_file_cmd "$1"
}
# end func_to_host_file
@@ -1669,7 +2954,8 @@ func_to_host_file ()
# in (the comma separated) LAZY, no conversion takes place.
func_to_tool_file ()
{
- $opt_debug
+ $debug_cmd
+
case ,$2, in
*,"$to_tool_file_cmd",*)
func_to_tool_file_result=$1
@@ -1687,7 +2973,7 @@ func_to_tool_file ()
# Copy ARG to func_to_host_file_result.
func_convert_file_noop ()
{
- func_to_host_file_result="$1"
+ func_to_host_file_result=$1
}
# end func_convert_file_noop
@@ -1698,11 +2984,12 @@ func_convert_file_noop ()
# func_to_host_file_result.
func_convert_file_msys_to_w32 ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
func_convert_core_msys_to_w32 "$1"
- func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+ func_to_host_file_result=$func_convert_core_msys_to_w32_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1714,8 +3001,9 @@ func_convert_file_msys_to_w32 ()
# func_to_host_file_result.
func_convert_file_cygwin_to_w32 ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
# because $build is cygwin, we call "the" cygpath in $PATH; no need to use
# LT_CYGPATH in this case.
@@ -1731,11 +3019,12 @@ func_convert_file_cygwin_to_w32 ()
# and a working winepath. Returns result in func_to_host_file_result.
func_convert_file_nix_to_w32 ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
func_convert_core_file_wine_to_w32 "$1"
- func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+ func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1747,12 +3036,13 @@ func_convert_file_nix_to_w32 ()
# Returns result in func_to_host_file_result.
func_convert_file_msys_to_cygwin ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
func_convert_core_msys_to_w32 "$1"
func_cygpath -u "$func_convert_core_msys_to_w32_result"
- func_to_host_file_result="$func_cygpath_result"
+ func_to_host_file_result=$func_cygpath_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1765,13 +3055,14 @@ func_convert_file_msys_to_cygwin ()
# in func_to_host_file_result.
func_convert_file_nix_to_cygwin ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
# convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
func_convert_core_file_wine_to_w32 "$1"
func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
- func_to_host_file_result="$func_cygpath_result"
+ func_to_host_file_result=$func_cygpath_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1781,7 +3072,7 @@ func_convert_file_nix_to_cygwin ()
#############################################
# $build to $host PATH CONVERSION FUNCTIONS #
#############################################
-# invoked via `$to_host_path_cmd ARG'
+# invoked via '$to_host_path_cmd ARG'
#
# In each case, ARG is the path to be converted from $build to $host format.
# The result will be available in $func_to_host_path_result.
@@ -1805,10 +3096,11 @@ func_convert_file_nix_to_cygwin ()
to_host_path_cmd=
func_init_to_host_path_cmd ()
{
- $opt_debug
+ $debug_cmd
+
if test -z "$to_host_path_cmd"; then
func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
- to_host_path_cmd="func_convert_path_${func_stripname_result}"
+ to_host_path_cmd=func_convert_path_$func_stripname_result
fi
}
@@ -1818,7 +3110,8 @@ func_init_to_host_path_cmd ()
# in func_to_host_path_result.
func_to_host_path ()
{
- $opt_debug
+ $debug_cmd
+
func_init_to_host_path_cmd
$to_host_path_cmd "$1"
}
@@ -1829,7 +3122,7 @@ func_to_host_path ()
# Copy ARG to func_to_host_path_result.
func_convert_path_noop ()
{
- func_to_host_path_result="$1"
+ func_to_host_path_result=$1
}
# end func_convert_path_noop
@@ -1840,8 +3133,9 @@ func_convert_path_noop ()
# func_to_host_path_result.
func_convert_path_msys_to_w32 ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# Remove leading and trailing path separator characters from ARG. MSYS
# behavior is inconsistent here; cygpath turns them into '.;' and ';.';
@@ -1849,7 +3143,7 @@ func_convert_path_msys_to_w32 ()
func_stripname : : "$1"
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
- func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+ func_to_host_path_result=$func_convert_core_msys_to_w32_result
func_convert_path_check : ";" \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -1863,8 +3157,9 @@ func_convert_path_msys_to_w32 ()
# func_to_host_file_result.
func_convert_path_cygwin_to_w32 ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# See func_convert_path_msys_to_w32:
func_stripname : : "$1"
@@ -1883,14 +3178,15 @@ func_convert_path_cygwin_to_w32 ()
# a working winepath. Returns result in func_to_host_file_result.
func_convert_path_nix_to_w32 ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# See func_convert_path_msys_to_w32:
func_stripname : : "$1"
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
- func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+ func_to_host_path_result=$func_convert_core_path_wine_to_w32_result
func_convert_path_check : ";" \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -1904,15 +3200,16 @@ func_convert_path_nix_to_w32 ()
# Returns result in func_to_host_file_result.
func_convert_path_msys_to_cygwin ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# See func_convert_path_msys_to_w32:
func_stripname : : "$1"
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
- func_to_host_path_result="$func_cygpath_result"
+ func_to_host_path_result=$func_cygpath_result
func_convert_path_check : : \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" : "$1"
@@ -1927,8 +3224,9 @@ func_convert_path_msys_to_cygwin ()
# func_to_host_file_result.
func_convert_path_nix_to_cygwin ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# Remove leading and trailing path separator characters from
# ARG. msys behavior is inconsistent here, cygpath turns them
@@ -1937,7 +3235,7 @@ func_convert_path_nix_to_cygwin ()
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
- func_to_host_path_result="$func_cygpath_result"
+ func_to_host_path_result=$func_cygpath_result
func_convert_path_check : : \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" : "$1"
@@ -1946,13 +3244,31 @@ func_convert_path_nix_to_cygwin ()
# end func_convert_path_nix_to_cygwin
+# func_dll_def_p FILE
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with _LT_DLL_DEF_P in libtool.m4
+func_dll_def_p ()
+{
+ $debug_cmd
+
+ func_dll_def_p_tmp=`$SED -n \
+ -e 's/^[ ]*//' \
+ -e '/^\(;.*\)*$/d' \
+ -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \
+ -e q \
+ "$1"`
+ test DEF = "$func_dll_def_p_tmp"
+}
+
+
# func_mode_compile arg...
func_mode_compile ()
{
- $opt_debug
+ $debug_cmd
+
# Get the compilation command and the source file.
base_compile=
- srcfile="$nonopt" # always keep a non-empty value in "srcfile"
+ srcfile=$nonopt # always keep a non-empty value in "srcfile"
suppress_opt=yes
suppress_output=
arg_mode=normal
@@ -1965,12 +3281,12 @@ func_mode_compile ()
case $arg_mode in
arg )
# do not "continue". Instead, add this to base_compile
- lastarg="$arg"
+ lastarg=$arg
arg_mode=normal
;;
target )
- libobj="$arg"
+ libobj=$arg
arg_mode=normal
continue
;;
@@ -1980,7 +3296,7 @@ func_mode_compile ()
case $arg in
-o)
test -n "$libobj" && \
- func_fatal_error "you cannot specify \`-o' more than once"
+ func_fatal_error "you cannot specify '-o' more than once"
arg_mode=target
continue
;;
@@ -2009,12 +3325,12 @@ func_mode_compile ()
func_stripname '-Wc,' '' "$arg"
args=$func_stripname_result
lastarg=
- save_ifs="$IFS"; IFS=','
+ save_ifs=$IFS; IFS=,
for arg in $args; do
- IFS="$save_ifs"
+ IFS=$save_ifs
func_append_quoted lastarg "$arg"
done
- IFS="$save_ifs"
+ IFS=$save_ifs
func_stripname ' ' '' "$lastarg"
lastarg=$func_stripname_result
@@ -2027,8 +3343,8 @@ func_mode_compile ()
# Accept the current argument as the source file.
# The previous "srcfile" becomes the current argument.
#
- lastarg="$srcfile"
- srcfile="$arg"
+ lastarg=$srcfile
+ srcfile=$arg
;;
esac # case $arg
;;
@@ -2043,13 +3359,13 @@ func_mode_compile ()
func_fatal_error "you must specify an argument for -Xcompile"
;;
target)
- func_fatal_error "you must specify a target with \`-o'"
+ func_fatal_error "you must specify a target with '-o'"
;;
*)
# Get the name of the library object.
test -z "$libobj" && {
func_basename "$srcfile"
- libobj="$func_basename_result"
+ libobj=$func_basename_result
}
;;
esac
@@ -2069,7 +3385,7 @@ func_mode_compile ()
case $libobj in
*.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
*)
- func_fatal_error "cannot determine name of library object from \`$libobj'"
+ func_fatal_error "cannot determine name of library object from '$libobj'"
;;
esac
@@ -2078,8 +3394,8 @@ func_mode_compile ()
for arg in $later; do
case $arg in
-shared)
- test "$build_libtool_libs" != yes && \
- func_fatal_configuration "can not build a shared library"
+ test yes = "$build_libtool_libs" \
+ || func_fatal_configuration "cannot build a shared library"
build_old_libs=no
continue
;;
@@ -2105,17 +3421,17 @@ func_mode_compile ()
func_quote_for_eval "$libobj"
test "X$libobj" != "X$func_quote_for_eval_result" \
&& $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \
- && func_warning "libobj name \`$libobj' may not contain shell special characters."
+ && func_warning "libobj name '$libobj' may not contain shell special characters."
func_dirname_and_basename "$obj" "/" ""
- objname="$func_basename_result"
- xdir="$func_dirname_result"
- lobj=${xdir}$objdir/$objname
+ objname=$func_basename_result
+ xdir=$func_dirname_result
+ lobj=$xdir$objdir/$objname
test -z "$base_compile" && \
func_fatal_help "you must specify a compilation command"
# Delete any leftover library objects.
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
removelist="$obj $lobj $libobj ${libobj}T"
else
removelist="$lobj $libobj ${libobj}T"
@@ -2127,16 +3443,16 @@ func_mode_compile ()
pic_mode=default
;;
esac
- if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+ if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
# non-PIC code in shared libraries is not supported
pic_mode=default
fi
# Calculate the filename of the output object if compiler does
# not support -o with -c
- if test "$compiler_c_o" = no; then
- output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
- lockfile="$output_obj.lock"
+ if test no = "$compiler_c_o"; then
+ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
+ lockfile=$output_obj.lock
else
output_obj=
need_locks=no
@@ -2145,12 +3461,12 @@ func_mode_compile ()
# Lock this critical section if it is needed
# We use this script file to make the link, it avoids creating a new file
- if test "$need_locks" = yes; then
+ if test yes = "$need_locks"; then
until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
func_echo "Waiting for $lockfile to be removed"
sleep 2
done
- elif test "$need_locks" = warn; then
+ elif test warn = "$need_locks"; then
if test -f "$lockfile"; then
$ECHO "\
*** ERROR, $lockfile exists and contains:
@@ -2158,7 +3474,7 @@ func_mode_compile ()
This indicates that another process is trying to use the same
temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
+your compiler does not support '-c' and '-o' together. If you
repeat this compilation, it may succeed, by chance, but you had better
avoid parallel builds (make -j) in this platform, or get a better
compiler."
@@ -2180,11 +3496,11 @@ compiler."
qsrcfile=$func_quote_for_eval_result
# Only build a PIC object if we are building libtool libraries.
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
# Without this assignment, base_compile gets emptied.
fbsd_hideous_sh_bug=$base_compile
- if test "$pic_mode" != no; then
+ if test no != "$pic_mode"; then
command="$base_compile $qsrcfile $pic_flag"
else
# Don't build PIC code
@@ -2201,7 +3517,7 @@ compiler."
func_show_eval_locale "$command" \
'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
- if test "$need_locks" = warn &&
+ if test warn = "$need_locks" &&
test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
$ECHO "\
*** ERROR, $lockfile contains:
@@ -2212,7 +3528,7 @@ $srcfile
This indicates that another process is trying to use the same
temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
+your compiler does not support '-c' and '-o' together. If you
repeat this compilation, it may succeed, by chance, but you had better
avoid parallel builds (make -j) in this platform, or get a better
compiler."
@@ -2228,20 +3544,20 @@ compiler."
fi
# Allow error messages only from the first compilation.
- if test "$suppress_opt" = yes; then
+ if test yes = "$suppress_opt"; then
suppress_output=' >/dev/null 2>&1'
fi
fi
# Only build a position-dependent object if we build old libraries.
- if test "$build_old_libs" = yes; then
- if test "$pic_mode" != yes; then
+ if test yes = "$build_old_libs"; then
+ if test yes != "$pic_mode"; then
# Don't build PIC code
command="$base_compile $qsrcfile$pie_flag"
else
command="$base_compile $qsrcfile $pic_flag"
fi
- if test "$compiler_c_o" = yes; then
+ if test yes = "$compiler_c_o"; then
func_append command " -o $obj"
fi
@@ -2250,7 +3566,7 @@ compiler."
func_show_eval_locale "$command" \
'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
- if test "$need_locks" = warn &&
+ if test warn = "$need_locks" &&
test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
$ECHO "\
*** ERROR, $lockfile contains:
@@ -2261,7 +3577,7 @@ $srcfile
This indicates that another process is trying to use the same
temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
+your compiler does not support '-c' and '-o' together. If you
repeat this compilation, it may succeed, by chance, but you had better
avoid parallel builds (make -j) in this platform, or get a better
compiler."
@@ -2281,7 +3597,7 @@ compiler."
func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
# Unlock the critical section if it was locked
- if test "$need_locks" != no; then
+ if test no != "$need_locks"; then
removelist=$lockfile
$RM "$lockfile"
fi
@@ -2291,7 +3607,7 @@ compiler."
}
$opt_help || {
- test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+ test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
}
func_mode_help ()
@@ -2311,7 +3627,7 @@ func_mode_help ()
Remove files from the build directory.
RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed
to RM.
If FILE is a libtool library, object or program, all the files associated
@@ -2330,16 +3646,16 @@ This mode accepts the following additional options:
-no-suppress do not suppress compiler output for multiple passes
-prefer-pic try to build PIC objects only
-prefer-non-pic try to build non-PIC objects only
- -shared do not build a \`.o' file suitable for static linking
- -static only build a \`.o' file suitable for static linking
+ -shared do not build a '.o' file suitable for static linking
+ -static only build a '.o' file suitable for static linking
-Wc,FLAG pass FLAG directly to the compiler
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+COMPILE-COMMAND is a command to be used in creating a 'standard' object file
from the given SOURCEFILE.
The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
+SOURCEFILE, then substituting the C source code suffix '.c' with the
+library object suffix, '.lo'."
;;
execute)
@@ -2352,7 +3668,7 @@ This mode accepts the following additional options:
-dlopen FILE add the directory containing FILE to the library path
-This mode sets the library path environment variable according to \`-dlopen'
+This mode sets the library path environment variable according to '-dlopen'
flags.
If any of the ARGS are libtool executable wrappers, then they are translated
@@ -2371,7 +3687,7 @@ Complete the installation of libtool libraries.
Each LIBDIR is a directory that contains libtool libraries.
The commands that this mode executes may require superuser privileges. Use
-the \`--dry-run' option if you just want to see what would be executed."
+the '--dry-run' option if you just want to see what would be executed."
;;
install)
@@ -2381,7 +3697,7 @@ the \`--dry-run' option if you just want to see what would be executed."
Install executables or libraries.
INSTALL-COMMAND is the installation command. The first component should be
-either the \`install' or \`cp' program.
+either the 'install' or 'cp' program.
The following components of INSTALL-COMMAND are treated specially:
@@ -2407,7 +3723,7 @@ The following components of LINK-COMMAND are treated specially:
-avoid-version do not add a version suffix if possible
-bindir BINDIR specify path to binaries directory (for systems where
libraries must be found in the PATH setting at runtime)
- -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
+ -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
@@ -2421,7 +3737,8 @@ The following components of LINK-COMMAND are treated specially:
-no-install link a not-installable executable
-no-undefined declare that a library does not refer to external symbols
-o OUTPUT-FILE create OUTPUT-FILE from the specified objects
- -objectlist FILE Use a list of object files found in FILE to specify objects
+ -objectlist FILE use a list of object files found in FILE to specify objects
+ -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes)
-precious-files-regex REGEX
don't remove output files matching REGEX
-release RELEASE specify package release information
@@ -2441,20 +3758,20 @@ The following components of LINK-COMMAND are treated specially:
-Xlinker FLAG pass linker-specific FLAG directly to the linker
-XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
-All other options (arguments beginning with \`-') are ignored.
+All other options (arguments beginning with '-') are ignored.
-Every other argument is treated as a filename. Files ending in \`.la' are
+Every other argument is treated as a filename. Files ending in '.la' are
treated as uninstalled libtool libraries, other files are standard or library
object files.
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
+If the OUTPUT-FILE ends in '.la', then a libtool library is created,
+only library objects ('.lo' files) may be specified, and '-rpath' is
required, except when creating a convenience library.
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
+If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
+using 'ar' and 'ranlib', or on Windows using 'lib'.
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
is created, otherwise an executable program is created."
;;
@@ -2465,7 +3782,7 @@ is created, otherwise an executable program is created."
Remove libraries from an installation directory.
RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed
to RM.
If FILE is a libtool library, all the files associated with it are deleted.
@@ -2473,17 +3790,17 @@ Otherwise, only FILE itself is deleted using RM."
;;
*)
- func_fatal_help "invalid operation mode \`$opt_mode'"
+ func_fatal_help "invalid operation mode '$opt_mode'"
;;
esac
echo
- $ECHO "Try \`$progname --help' for more information about other modes."
+ $ECHO "Try '$progname --help' for more information about other modes."
}
# Now that we've collected a possible --mode arg, show help if necessary
if $opt_help; then
- if test "$opt_help" = :; then
+ if test : = "$opt_help"; then
func_mode_help
else
{
@@ -2491,7 +3808,7 @@ if $opt_help; then
for opt_mode in compile link execute install finish uninstall clean; do
func_mode_help
done
- } | sed -n '1p; 2,$s/^Usage:/ or: /p'
+ } | $SED -n '1p; 2,$s/^Usage:/ or: /p'
{
func_help noexit
for opt_mode in compile link execute install finish uninstall clean; do
@@ -2499,7 +3816,7 @@ if $opt_help; then
func_mode_help
done
} |
- sed '1d
+ $SED '1d
/^When reporting/,/^Report/{
H
d
@@ -2516,16 +3833,17 @@ fi
# func_mode_execute arg...
func_mode_execute ()
{
- $opt_debug
+ $debug_cmd
+
# The first argument is the command name.
- cmd="$nonopt"
+ cmd=$nonopt
test -z "$cmd" && \
func_fatal_help "you must specify a COMMAND"
# Handle -dlopen flags immediately.
for file in $opt_dlopen; do
test -f "$file" \
- || func_fatal_help "\`$file' is not a file"
+ || func_fatal_help "'$file' is not a file"
dir=
case $file in
@@ -2535,7 +3853,7 @@ func_mode_execute ()
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
- || func_fatal_help "\`$lib' is not a valid libtool archive"
+ || func_fatal_help "'$lib' is not a valid libtool archive"
# Read the libtool library.
dlname=
@@ -2546,18 +3864,18 @@ func_mode_execute ()
if test -z "$dlname"; then
# Warn if it was a shared library.
test -n "$library_names" && \
- func_warning "\`$file' was not linked with \`-export-dynamic'"
+ func_warning "'$file' was not linked with '-export-dynamic'"
continue
fi
func_dirname "$file" "" "."
- dir="$func_dirname_result"
+ dir=$func_dirname_result
if test -f "$dir/$objdir/$dlname"; then
func_append dir "/$objdir"
else
if test ! -f "$dir/$dlname"; then
- func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+ func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
fi
fi
;;
@@ -2565,18 +3883,18 @@ func_mode_execute ()
*.lo)
# Just add the directory containing the .lo file.
func_dirname "$file" "" "."
- dir="$func_dirname_result"
+ dir=$func_dirname_result
;;
*)
- func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+ func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
continue
;;
esac
# Get the absolute pathname.
absdir=`cd "$dir" && pwd`
- test -n "$absdir" && dir="$absdir"
+ test -n "$absdir" && dir=$absdir
# Now add the directory to shlibpath_var.
if eval "test -z \"\$$shlibpath_var\""; then
@@ -2588,7 +3906,7 @@ func_mode_execute ()
# This variable tells wrapper scripts just to set shlibpath_var
# rather than running their programs.
- libtool_execute_magic="$magic"
+ libtool_execute_magic=$magic
# Check if any of the arguments is a wrapper script.
args=
@@ -2601,12 +3919,12 @@ func_mode_execute ()
if func_ltwrapper_script_p "$file"; then
func_source "$file"
# Transform arg to wrapped name.
- file="$progdir/$program"
+ file=$progdir/$program
elif func_ltwrapper_executable_p "$file"; then
func_ltwrapper_scriptname "$file"
func_source "$func_ltwrapper_scriptname_result"
# Transform arg to wrapped name.
- file="$progdir/$program"
+ file=$progdir/$program
fi
;;
esac
@@ -2614,7 +3932,15 @@ func_mode_execute ()
func_append_quoted args "$file"
done
- if test "X$opt_dry_run" = Xfalse; then
+ if $opt_dry_run; then
+ # Display what would be done.
+ if test -n "$shlibpath_var"; then
+ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+ echo "export $shlibpath_var"
+ fi
+ $ECHO "$cmd$args"
+ exit $EXIT_SUCCESS
+ else
if test -n "$shlibpath_var"; then
# Export the shlibpath_var.
eval "export $shlibpath_var"
@@ -2631,25 +3957,18 @@ func_mode_execute ()
done
# Now prepare to actually exec the command.
- exec_cmd="\$cmd$args"
- else
- # Display what would be done.
- if test -n "$shlibpath_var"; then
- eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
- echo "export $shlibpath_var"
- fi
- $ECHO "$cmd$args"
- exit $EXIT_SUCCESS
+ exec_cmd=\$cmd$args
fi
}
-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
# func_mode_finish arg...
func_mode_finish ()
{
- $opt_debug
+ $debug_cmd
+
libs=
libdirs=
admincmds=
@@ -2663,11 +3982,11 @@ func_mode_finish ()
if func_lalib_unsafe_p "$opt"; then
func_append libs " $opt"
else
- func_warning "\`$opt' is not a valid libtool archive"
+ func_warning "'$opt' is not a valid libtool archive"
fi
else
- func_fatal_error "invalid argument \`$opt'"
+ func_fatal_error "invalid argument '$opt'"
fi
done
@@ -2682,12 +4001,12 @@ func_mode_finish ()
# Remove sysroot references
if $opt_dry_run; then
for lib in $libs; do
- echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+ echo "removing references to $lt_sysroot and '=' prefixes from $lib"
done
else
tmpdir=`func_mktempdir`
for lib in $libs; do
- sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+ $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
> $tmpdir/tmp-la
mv -f $tmpdir/tmp-la $lib
done
@@ -2712,7 +4031,7 @@ func_mode_finish ()
fi
# Exit here if they wanted silent mode.
- $opt_silent && exit $EXIT_SUCCESS
+ $opt_quiet && exit $EXIT_SUCCESS
if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
echo "----------------------------------------------------------------------"
@@ -2723,27 +4042,27 @@ func_mode_finish ()
echo
echo "If you ever happen to want to link against installed libraries"
echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+ echo "specify the full pathname of the library, or use the '-LLIBDIR'"
echo "flag during linking and do at least one of the following:"
if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
+ echo " - add LIBDIR to the '$shlibpath_var' environment variable"
echo " during execution"
fi
if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
+ echo " - add LIBDIR to the '$runpath_var' environment variable"
echo " during linking"
fi
if test -n "$hardcode_libdir_flag_spec"; then
libdir=LIBDIR
eval flag=\"$hardcode_libdir_flag_spec\"
- $ECHO " - use the \`$flag' linker flag"
+ $ECHO " - use the '$flag' linker flag"
fi
if test -n "$admincmds"; then
$ECHO " - have your system administrator run these commands:$admincmds"
fi
if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+ echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
fi
echo
@@ -2762,18 +4081,20 @@ func_mode_finish ()
exit $EXIT_SUCCESS
}
-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
# func_mode_install arg...
func_mode_install ()
{
- $opt_debug
+ $debug_cmd
+
# There may be an optional sh(1) argument at the beginning of
# install_prog (especially on Windows NT).
- if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
# Allow the use of GNU shtool's install command.
- case $nonopt in *shtool*) :;; *) false;; esac; then
+ case $nonopt in *shtool*) :;; *) false;; esac
+ then
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
@@ -2800,7 +4121,7 @@ func_mode_install ()
opts=
prev=
install_type=
- isdir=no
+ isdir=false
stripme=
no_mode=:
for arg
@@ -2813,7 +4134,7 @@ func_mode_install ()
fi
case $arg in
- -d) isdir=yes ;;
+ -d) isdir=: ;;
-f)
if $install_cp; then :; else
prev=$arg
@@ -2831,7 +4152,7 @@ func_mode_install ()
*)
# If the previous option needed an argument, then skip it.
if test -n "$prev"; then
- if test "x$prev" = x-m && test -n "$install_override_mode"; then
+ if test X-m = "X$prev" && test -n "$install_override_mode"; then
arg2=$install_override_mode
no_mode=false
fi
@@ -2856,7 +4177,7 @@ func_mode_install ()
func_fatal_help "you must specify an install program"
test -n "$prev" && \
- func_fatal_help "the \`$prev' option requires an argument"
+ func_fatal_help "the '$prev' option requires an argument"
if test -n "$install_override_mode" && $no_mode; then
if $install_cp; then :; else
@@ -2878,19 +4199,19 @@ func_mode_install ()
dest=$func_stripname_result
# Check to see that the destination is a directory.
- test -d "$dest" && isdir=yes
- if test "$isdir" = yes; then
- destdir="$dest"
+ test -d "$dest" && isdir=:
+ if $isdir; then
+ destdir=$dest
destname=
else
func_dirname_and_basename "$dest" "" "."
- destdir="$func_dirname_result"
- destname="$func_basename_result"
+ destdir=$func_dirname_result
+ destname=$func_basename_result
# Not a directory, so check to see that there is only one file specified.
set dummy $files; shift
test "$#" -gt 1 && \
- func_fatal_help "\`$dest' is not a directory"
+ func_fatal_help "'$dest' is not a directory"
fi
case $destdir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -2899,7 +4220,7 @@ func_mode_install ()
case $file in
*.lo) ;;
*)
- func_fatal_help "\`$destdir' must be an absolute directory name"
+ func_fatal_help "'$destdir' must be an absolute directory name"
;;
esac
done
@@ -2908,7 +4229,7 @@ func_mode_install ()
# This variable tells wrapper scripts just to set variables rather
# than running their programs.
- libtool_install_magic="$magic"
+ libtool_install_magic=$magic
staticlibs=
future_libdirs=
@@ -2928,7 +4249,7 @@ func_mode_install ()
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
- || func_fatal_help "\`$file' is not a valid libtool archive"
+ || func_fatal_help "'$file' is not a valid libtool archive"
library_names=
old_library=
@@ -2950,7 +4271,7 @@ func_mode_install ()
fi
func_dirname "$file" "/" ""
- dir="$func_dirname_result"
+ dir=$func_dirname_result
func_append dir "$objdir"
if test -n "$relink_command"; then
@@ -2964,7 +4285,7 @@ func_mode_install ()
# are installed into $libdir/../bin (currently, that works fine)
# but it's something to keep an eye on.
test "$inst_prefix_dir" = "$destdir" && \
- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+ func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
@@ -2973,29 +4294,36 @@ func_mode_install ()
relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
fi
- func_warning "relinking \`$file'"
+ func_warning "relinking '$file'"
func_show_eval "$relink_command" \
- 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+ 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
fi
# See the names of the shared library.
set dummy $library_names; shift
if test -n "$1"; then
- realname="$1"
+ realname=$1
shift
- srcname="$realname"
- test -n "$relink_command" && srcname="$realname"T
+ srcname=$realname
+ test -n "$relink_command" && srcname=${realname}T
# Install the shared library and build the symlinks.
func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
'exit $?'
- tstripme="$stripme"
+ tstripme=$stripme
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
case $realname in
*.dll.a)
- tstripme=""
+ tstripme=
+ ;;
+ esac
+ ;;
+ os2*)
+ case $realname in
+ *_dll.a)
+ tstripme=
;;
esac
;;
@@ -3006,7 +4334,7 @@ func_mode_install ()
if test "$#" -gt 0; then
# Delete the old symlinks, and create new ones.
- # Try `ln -sf' first, because the `ln' binary might depend on
+ # Try 'ln -sf' first, because the 'ln' binary might depend on
# the symlink we replace! Solaris /bin/ln does not understand -f,
# so we also need to try rm && ln -s.
for linkname
@@ -3017,14 +4345,14 @@ func_mode_install ()
fi
# Do each command in the postinstall commands.
- lib="$destdir/$realname"
+ lib=$destdir/$realname
func_execute_cmds "$postinstall_cmds" 'exit $?'
fi
# Install the pseudo-library for information purposes.
func_basename "$file"
- name="$func_basename_result"
- instname="$dir/$name"i
+ name=$func_basename_result
+ instname=$dir/${name}i
func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
# Maybe install the static library, too.
@@ -3036,11 +4364,11 @@ func_mode_install ()
# Figure out destination file name, if it wasn't already specified.
if test -n "$destname"; then
- destfile="$destdir/$destname"
+ destfile=$destdir/$destname
else
func_basename "$file"
- destfile="$func_basename_result"
- destfile="$destdir/$destfile"
+ destfile=$func_basename_result
+ destfile=$destdir/$destfile
fi
# Deduce the name of the destination old-style object file.
@@ -3050,11 +4378,11 @@ func_mode_install ()
staticdest=$func_lo2o_result
;;
*.$objext)
- staticdest="$destfile"
+ staticdest=$destfile
destfile=
;;
*)
- func_fatal_help "cannot copy a libtool object to \`$destfile'"
+ func_fatal_help "cannot copy a libtool object to '$destfile'"
;;
esac
@@ -3063,7 +4391,7 @@ func_mode_install ()
func_show_eval "$install_prog $file $destfile" 'exit $?'
# Install the old object if enabled.
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
# Deduce the name of the old-style object file.
func_lo2o "$file"
staticobj=$func_lo2o_result
@@ -3075,23 +4403,23 @@ func_mode_install ()
*)
# Figure out destination file name, if it wasn't already specified.
if test -n "$destname"; then
- destfile="$destdir/$destname"
+ destfile=$destdir/$destname
else
func_basename "$file"
- destfile="$func_basename_result"
- destfile="$destdir/$destfile"
+ destfile=$func_basename_result
+ destfile=$destdir/$destfile
fi
# If the file is missing, and there is a .exe on the end, strip it
# because it is most likely a libtool script we actually want to
# install
- stripped_ext=""
+ stripped_ext=
case $file in
*.exe)
if test ! -f "$file"; then
func_stripname '' '.exe' "$file"
file=$func_stripname_result
- stripped_ext=".exe"
+ stripped_ext=.exe
fi
;;
esac
@@ -3119,19 +4447,19 @@ func_mode_install ()
# Check the variables that should have been set.
test -z "$generated_by_libtool_version" && \
- func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+ func_fatal_error "invalid libtool wrapper script '$wrapper'"
- finalize=yes
+ finalize=:
for lib in $notinst_deplibs; do
# Check to see that each library is installed.
libdir=
if test -f "$lib"; then
func_source "$lib"
fi
- libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
if test -n "$libdir" && test ! -f "$libfile"; then
- func_warning "\`$lib' has not been installed in \`$libdir'"
- finalize=no
+ func_warning "'$lib' has not been installed in '$libdir'"
+ finalize=false
fi
done
@@ -3139,29 +4467,29 @@ func_mode_install ()
func_source "$wrapper"
outputname=
- if test "$fast_install" = no && test -n "$relink_command"; then
+ if test no = "$fast_install" && test -n "$relink_command"; then
$opt_dry_run || {
- if test "$finalize" = yes; then
+ if $finalize; then
tmpdir=`func_mktempdir`
func_basename "$file$stripped_ext"
- file="$func_basename_result"
- outputname="$tmpdir/$file"
+ file=$func_basename_result
+ outputname=$tmpdir/$file
# Replace the output file specification.
relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
- $opt_silent || {
+ $opt_quiet || {
func_quote_for_expand "$relink_command"
eval "func_echo $func_quote_for_expand_result"
}
if eval "$relink_command"; then :
else
- func_error "error: relink \`$file' with the above command before installing it"
+ func_error "error: relink '$file' with the above command before installing it"
$opt_dry_run || ${RM}r "$tmpdir"
continue
fi
- file="$outputname"
+ file=$outputname
else
- func_warning "cannot relink \`$file'"
+ func_warning "cannot relink '$file'"
fi
}
else
@@ -3198,10 +4526,10 @@ func_mode_install ()
for file in $staticlibs; do
func_basename "$file"
- name="$func_basename_result"
+ name=$func_basename_result
# Set up the ranlib parameters.
- oldlib="$destdir/$name"
+ oldlib=$destdir/$name
func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
tool_oldlib=$func_to_tool_file_result
@@ -3216,18 +4544,18 @@ func_mode_install ()
done
test -n "$future_libdirs" && \
- func_warning "remember to run \`$progname --finish$future_libdirs'"
+ func_warning "remember to run '$progname --finish$future_libdirs'"
if test -n "$current_libdirs"; then
# Maybe just do a dry run.
$opt_dry_run && current_libdirs=" -n$current_libdirs"
- exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+ exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs'
else
exit $EXIT_SUCCESS
fi
}
-test "$opt_mode" = install && func_mode_install ${1+"$@"}
+test install = "$opt_mode" && func_mode_install ${1+"$@"}
# func_generate_dlsyms outputname originator pic_p
@@ -3235,16 +4563,17 @@ test "$opt_mode" = install && func_mode_install ${1+"$@"}
# a dlpreopen symbol table.
func_generate_dlsyms ()
{
- $opt_debug
- my_outputname="$1"
- my_originator="$2"
- my_pic_p="${3-no}"
- my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+ $debug_cmd
+
+ my_outputname=$1
+ my_originator=$2
+ my_pic_p=${3-false}
+ my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
my_dlsyms=
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
if test -n "$NM" && test -n "$global_symbol_pipe"; then
- my_dlsyms="${my_outputname}S.c"
+ my_dlsyms=${my_outputname}S.c
else
func_error "not configured to extract global symbols from dlpreopened files"
fi
@@ -3255,7 +4584,7 @@ func_generate_dlsyms ()
"") ;;
*.c)
# Discover the nlist of each of the dlfiles.
- nlist="$output_objdir/${my_outputname}.nm"
+ nlist=$output_objdir/$my_outputname.nm
func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
@@ -3263,34 +4592,36 @@ func_generate_dlsyms ()
func_verbose "creating $output_objdir/$my_dlsyms"
$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
#ifdef __cplusplus
extern \"C\" {
#endif
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
#endif
/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
relocations are performed -- see ld's documentation on pseudo-relocs. */
# define LT_DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
/* This system does not cope well with relocations in const data. */
# define LT_DLSYM_CONST
#else
# define LT_DLSYM_CONST const
#endif
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
/* External symbol declarations for the compiler. */\
"
- if test "$dlself" = yes; then
- func_verbose "generating symbol list for \`$output'"
+ if test yes = "$dlself"; then
+ func_verbose "generating symbol list for '$output'"
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
@@ -3298,7 +4629,7 @@ extern \"C\" {
progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
for progfile in $progfiles; do
func_to_tool_file "$progfile" func_convert_file_msys_to_w32
- func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
+ func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
$opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
done
@@ -3318,10 +4649,10 @@ extern \"C\" {
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
- export_symbols="$output_objdir/$outputname.exp"
+ export_symbols=$output_objdir/$outputname.exp
$opt_dry_run || {
$RM $export_symbols
- eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
case $host in
*cygwin* | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
@@ -3331,7 +4662,7 @@ extern \"C\" {
}
else
$opt_dry_run || {
- eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+ eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
@@ -3345,22 +4676,22 @@ extern \"C\" {
fi
for dlprefile in $dlprefiles; do
- func_verbose "extracting global C symbols from \`$dlprefile'"
+ func_verbose "extracting global C symbols from '$dlprefile'"
func_basename "$dlprefile"
- name="$func_basename_result"
+ name=$func_basename_result
case $host in
*cygwin* | *mingw* | *cegcc* )
# if an import library, we need to obtain dlname
if func_win32_import_lib_p "$dlprefile"; then
func_tr_sh "$dlprefile"
eval "curr_lafile=\$libfile_$func_tr_sh_result"
- dlprefile_dlbasename=""
+ dlprefile_dlbasename=
if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
# Use subshell, to avoid clobbering current variable values
dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
- if test -n "$dlprefile_dlname" ; then
+ if test -n "$dlprefile_dlname"; then
func_basename "$dlprefile_dlname"
- dlprefile_dlbasename="$func_basename_result"
+ dlprefile_dlbasename=$func_basename_result
else
# no lafile. user explicitly requested -dlpreopen <import library>.
$sharedlib_from_linklib_cmd "$dlprefile"
@@ -3368,7 +4699,7 @@ extern \"C\" {
fi
fi
$opt_dry_run || {
- if test -n "$dlprefile_dlbasename" ; then
+ if test -n "$dlprefile_dlbasename"; then
eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
else
func_warning "Could not compute DLL name from $name"
@@ -3424,6 +4755,11 @@ extern \"C\" {
echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
fi
+ func_show_eval '$RM "${nlist}I"'
+ if test -n "$global_symbol_to_import"; then
+ eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
+ fi
+
echo >> "$output_objdir/$my_dlsyms" "\
/* The mapping between symbol names and symbols. */
@@ -3432,11 +4768,30 @@ typedef struct {
void *address;
} lt_dlsymlist;
extern LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];
+lt_${my_prefix}_LTX_preloaded_symbols[];\
+"
+
+ if test -s "$nlist"I; then
+ echo >> "$output_objdir/$my_dlsyms" "\
+static void lt_syminit(void)
+{
+ LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
+ for (; symbol->name; ++symbol)
+ {"
+ $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
+ echo >> "$output_objdir/$my_dlsyms" "\
+ }
+}"
+ fi
+ echo >> "$output_objdir/$my_dlsyms" "\
LT_DLSYM_CONST lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[] =
-{\
- { \"$my_originator\", (void *) 0 },"
+{ {\"$my_originator\", (void *) 0},"
+
+ if test -s "$nlist"I; then
+ echo >> "$output_objdir/$my_dlsyms" "\
+ {\"@INIT@\", (void *) <_syminit},"
+ fi
case $need_lib_prefix in
no)
@@ -3478,9 +4833,7 @@ static const void *lt_preloaded_setup() {
*-*-hpux*)
pic_flag_for_symtable=" $pic_flag" ;;
*)
- if test "X$my_pic_p" != Xno; then
- pic_flag_for_symtable=" $pic_flag"
- fi
+ $my_pic_p && pic_flag_for_symtable=" $pic_flag"
;;
esac
;;
@@ -3497,10 +4850,10 @@ static const void *lt_preloaded_setup() {
func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
# Clean up the generated files.
- func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+ func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
# Transform the symbol file into the correct name.
- symfileobj="$output_objdir/${my_outputname}S.$objext"
+ symfileobj=$output_objdir/${my_outputname}S.$objext
case $host in
*cygwin* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
@@ -3518,7 +4871,7 @@ static const void *lt_preloaded_setup() {
esac
;;
*)
- func_fatal_error "unknown suffix for \`$my_dlsyms'"
+ func_fatal_error "unknown suffix for '$my_dlsyms'"
;;
esac
else
@@ -3532,6 +4885,32 @@ static const void *lt_preloaded_setup() {
fi
}
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+ $debug_cmd
+
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+ test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+ $debug_cmd
+
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+ test -n "$func_cygming_ms_implib_tmp"
+}
+
# func_win32_libid arg
# return the library type of file 'arg'
#
@@ -3541,8 +4920,9 @@ static const void *lt_preloaded_setup() {
# Despite the name, also deal with 64 bit binaries.
func_win32_libid ()
{
- $opt_debug
- win32_libid_type="unknown"
+ $debug_cmd
+
+ win32_libid_type=unknown
win32_fileres=`file -L $1 2>/dev/null`
case $win32_fileres in
*ar\ archive\ import\ library*) # definitely import
@@ -3552,16 +4932,29 @@ func_win32_libid ()
# Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
$EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
- $SED -n -e '
+ case $nm_interface in
+ "MS dumpbin")
+ if func_cygming_ms_implib_p "$1" ||
+ func_cygming_gnu_implib_p "$1"
+ then
+ win32_nmres=import
+ else
+ win32_nmres=
+ fi
+ ;;
+ *)
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+ $SED -n -e '
1,100{
/ I /{
- s,.*,import,
+ s|.*|import|
p
q
}
}'`
+ ;;
+ esac
case $win32_nmres in
import*) win32_libid_type="x86 archive import";;
*) win32_libid_type="x86 archive static";;
@@ -3593,7 +4986,8 @@ func_win32_libid ()
# $sharedlib_from_linklib_result
func_cygming_dll_for_implib ()
{
- $opt_debug
+ $debug_cmd
+
sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
}
@@ -3610,7 +5004,8 @@ func_cygming_dll_for_implib ()
# specified import library.
func_cygming_dll_for_implib_fallback_core ()
{
- $opt_debug
+ $debug_cmd
+
match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
$OBJDUMP -s --section "$1" "$2" 2>/dev/null |
$SED '/^Contents of section '"$match_literal"':/{
@@ -3646,8 +5041,8 @@ func_cygming_dll_for_implib_fallback_core ()
/./p' |
# we now have a list, one entry per line, of the stringified
# contents of the appropriate section of all members of the
- # archive which possess that section. Heuristic: eliminate
- # all those which have a first or second character that is
+ # archive that possess that section. Heuristic: eliminate
+ # all those that have a first or second character that is
# a '.' (that is, objdump's representation of an unprintable
# character.) This should work for all archives with less than
# 0x302f exports -- but will fail for DLLs whose name actually
@@ -3658,30 +5053,6 @@ func_cygming_dll_for_implib_fallback_core ()
$SED -e '/^\./d;/^.\./d;q'
}
-# func_cygming_gnu_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is a GNU/binutils-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_gnu_implib_p ()
-{
- $opt_debug
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
- test -n "$func_cygming_gnu_implib_tmp"
-}
-
-# func_cygming_ms_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is an MS-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_ms_implib_p ()
-{
- $opt_debug
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
- test -n "$func_cygming_ms_implib_tmp"
-}
-
# func_cygming_dll_for_implib_fallback ARG
# Platform-specific function to extract the
# name of the DLL associated with the specified
@@ -3695,16 +5066,17 @@ func_cygming_ms_implib_p ()
# $sharedlib_from_linklib_result
func_cygming_dll_for_implib_fallback ()
{
- $opt_debug
- if func_cygming_gnu_implib_p "$1" ; then
+ $debug_cmd
+
+ if func_cygming_gnu_implib_p "$1"; then
# binutils import library
sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
- elif func_cygming_ms_implib_p "$1" ; then
+ elif func_cygming_ms_implib_p "$1"; then
# ms-generated import library
sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
else
# unknown
- sharedlib_from_linklib_result=""
+ sharedlib_from_linklib_result=
fi
}
@@ -3712,10 +5084,11 @@ func_cygming_dll_for_implib_fallback ()
# func_extract_an_archive dir oldlib
func_extract_an_archive ()
{
- $opt_debug
- f_ex_an_ar_dir="$1"; shift
- f_ex_an_ar_oldlib="$1"
- if test "$lock_old_archive_extraction" = yes; then
+ $debug_cmd
+
+ f_ex_an_ar_dir=$1; shift
+ f_ex_an_ar_oldlib=$1
+ if test yes = "$lock_old_archive_extraction"; then
lockfile=$f_ex_an_ar_oldlib.lock
until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
func_echo "Waiting for $lockfile to be removed"
@@ -3724,7 +5097,7 @@ func_extract_an_archive ()
fi
func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
'stat=$?; rm -f "$lockfile"; exit $stat'
- if test "$lock_old_archive_extraction" = yes; then
+ if test yes = "$lock_old_archive_extraction"; then
$opt_dry_run || rm -f "$lockfile"
fi
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
@@ -3738,22 +5111,23 @@ func_extract_an_archive ()
# func_extract_archives gentop oldlib ...
func_extract_archives ()
{
- $opt_debug
- my_gentop="$1"; shift
+ $debug_cmd
+
+ my_gentop=$1; shift
my_oldlibs=${1+"$@"}
- my_oldobjs=""
- my_xlib=""
- my_xabs=""
- my_xdir=""
+ my_oldobjs=
+ my_xlib=
+ my_xabs=
+ my_xdir=
for my_xlib in $my_oldlibs; do
# Extract the objects.
case $my_xlib in
- [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;;
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
func_basename "$my_xlib"
- my_xlib="$func_basename_result"
+ my_xlib=$func_basename_result
my_xlib_u=$my_xlib
while :; do
case " $extracted_archives " in
@@ -3765,7 +5139,7 @@ func_extract_archives ()
esac
done
extracted_archives="$extracted_archives $my_xlib_u"
- my_xdir="$my_gentop/$my_xlib_u"
+ my_xdir=$my_gentop/$my_xlib_u
func_mkdir_p "$my_xdir"
@@ -3778,22 +5152,23 @@ func_extract_archives ()
cd $my_xdir || exit $?
darwin_archive=$my_xabs
darwin_curdir=`pwd`
- darwin_base_archive=`basename "$darwin_archive"`
+ func_basename "$darwin_archive"
+ darwin_base_archive=$func_basename_result
darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
if test -n "$darwin_arches"; then
darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
darwin_arch=
func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
- for darwin_arch in $darwin_arches ; do
- func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
- $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
- cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
- func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+ for darwin_arch in $darwin_arches; do
+ func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
+ $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
+ cd "unfat-$$/$darwin_base_archive-$darwin_arch"
+ func_extract_an_archive "`pwd`" "$darwin_base_archive"
cd "$darwin_curdir"
- $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+ $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
done # $darwin_arches
## Okay now we've a bunch of thin objects, gotta fatten them up :)
- darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
@@ -3815,7 +5190,7 @@ func_extract_archives ()
my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
done
- func_extract_archives_result="$my_oldobjs"
+ func_extract_archives_result=$my_oldobjs
}
@@ -3830,7 +5205,7 @@ func_extract_archives ()
#
# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
# variable will take. If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
+# will assume that the directory where it is stored is
# the $objdir directory. This is a cygwin/mingw-specific
# behavior.
func_emit_wrapper ()
@@ -3841,7 +5216,7 @@ func_emit_wrapper ()
#! $SHELL
# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
#
# The $output program cannot be directly executed until all the libtool
# libraries that it depends on are installed.
@@ -3898,9 +5273,9 @@ _LTECHO_EOF'
# Very basic option parsing. These options are (a) specific to
# the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ which is used only on
+# /script/ and the wrapper /executable/ that is used only on
# windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options which match
+# (application programs are unlikely to have options that match
# this pattern).
#
# There are only two supported options: --lt-debug and
@@ -3933,7 +5308,7 @@ func_parse_lt_options ()
# Print the debug banner immediately:
if test -n \"\$lt_option_debug\"; then
- echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+ echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
fi
}
@@ -3944,7 +5319,7 @@ func_lt_dump_args ()
lt_dump_args_N=1;
for lt_arg
do
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+ \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
done
}
@@ -3958,7 +5333,7 @@ func_exec_program_core ()
*-*-mingw | *-*-os2* | *-cegcc*)
$ECHO "\
if test -n \"\$lt_option_debug\"; then
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+ \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
func_lt_dump_args \${1+\"\$@\"} 1>&2
fi
exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
@@ -3968,7 +5343,7 @@ func_exec_program_core ()
*)
$ECHO "\
if test -n \"\$lt_option_debug\"; then
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+ \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
func_lt_dump_args \${1+\"\$@\"} 1>&2
fi
exec \"\$progdir/\$program\" \${1+\"\$@\"}
@@ -4043,13 +5418,13 @@ func_exec_program ()
test -n \"\$absdir\" && thisdir=\"\$absdir\"
"
- if test "$fast_install" = yes; then
+ if test yes = "$fast_install"; then
$ECHO "\
program=lt-'$outputname'$exeext
progdir=\"\$thisdir/$objdir\"
if test ! -f \"\$progdir/\$program\" ||
- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
test \"X\$file\" != \"X\$progdir/\$program\"; }; then
file=\"\$\$-\$program\"
@@ -4066,7 +5441,7 @@ func_exec_program ()
if test -n \"\$relink_command\"; then
if relink_command_output=\`eval \$relink_command 2>&1\`; then :
else
- $ECHO \"\$relink_command_output\" >&2
+ \$ECHO \"\$relink_command_output\" >&2
$RM \"\$progdir/\$file\"
exit 1
fi
@@ -4101,7 +5476,7 @@ func_exec_program ()
fi
# Export our shlibpath_var if we have one.
- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
$ECHO "\
# Add our own library path to $shlibpath_var
$shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
@@ -4121,7 +5496,7 @@ func_exec_program ()
fi
else
# The program doesn't exist.
- \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+ \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2
\$ECHO \"This script is just a wrapper for \$program.\" 1>&2
\$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
exit 1
@@ -4140,7 +5515,7 @@ func_emit_cwrapperexe_src ()
cat <<EOF
/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
- Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+ Generated by $PROGRAM (GNU $PACKAGE) $VERSION
The $output program cannot be directly executed until all the libtool
libraries that it depends on are installed.
@@ -4175,47 +5550,45 @@ EOF
#include <fcntl.h>
#include <sys/stat.h>
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
/* declarations of non-ANSI functions */
-#if defined(__MINGW32__)
+#if defined __MINGW32__
# ifdef __STRICT_ANSI__
int _putenv (const char *);
# endif
-#elif defined(__CYGWIN__)
+#elif defined __CYGWIN__
# ifdef __STRICT_ANSI__
char *realpath (const char *, char *);
int putenv (char *);
int setenv (const char *, const char *, int);
# endif
-/* #elif defined (other platforms) ... */
+/* #elif defined other_platform || defined ... */
#endif
/* portability defines, excluding path handling macros */
-#if defined(_MSC_VER)
+#if defined _MSC_VER
# define setmode _setmode
# define stat _stat
# define chmod _chmod
# define getcwd _getcwd
# define putenv _putenv
# define S_IXUSR _S_IEXEC
-# ifndef _INTPTR_T_DEFINED
-# define _INTPTR_T_DEFINED
-# define intptr_t int
-# endif
-#elif defined(__MINGW32__)
+#elif defined __MINGW32__
# define setmode _setmode
# define stat _stat
# define chmod _chmod
# define getcwd _getcwd
# define putenv _putenv
-#elif defined(__CYGWIN__)
+#elif defined __CYGWIN__
# define HAVE_SETENV
# define FOPEN_WB "wb"
-/* #elif defined (other platforms) ... */
+/* #elif defined other platforms ... */
#endif
-#if defined(PATH_MAX)
+#if defined PATH_MAX
# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
+#elif defined MAXPATHLEN
# define LT_PATHMAX MAXPATHLEN
#else
# define LT_PATHMAX 1024
@@ -4234,8 +5607,8 @@ int setenv (const char *, const char *, int);
# define PATH_SEPARATOR ':'
#endif
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
- defined (__OS2__)
+#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
+ defined __OS2__
# define HAVE_DOS_BASED_FILE_SYSTEM
# define FOPEN_WB "wb"
# ifndef DIR_SEPARATOR_2
@@ -4268,10 +5641,10 @@ int setenv (const char *, const char *, int);
#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
#define XFREE(stale) do { \
- if (stale) { free ((void *) stale); stale = 0; } \
+ if (stale) { free (stale); stale = 0; } \
} while (0)
-#if defined(LT_DEBUGWRAPPER)
+#if defined LT_DEBUGWRAPPER
static int lt_debug = 1;
#else
static int lt_debug = 0;
@@ -4300,11 +5673,16 @@ void lt_dump_script (FILE *f);
EOF
cat <<EOF
-volatile const char * MAGIC_EXE = "$magic_exe";
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+# define externally_visible volatile
+#else
+# define externally_visible __attribute__((externally_visible)) volatile
+#endif
+externally_visible const char * MAGIC_EXE = "$magic_exe";
const char * LIB_PATH_VARNAME = "$shlibpath_var";
EOF
- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
func_to_host_path "$temp_rpath"
cat <<EOF
const char * LIB_PATH_VALUE = "$func_to_host_path_result";
@@ -4328,7 +5706,7 @@ const char * EXE_PATH_VALUE = "";
EOF
fi
- if test "$fast_install" = yes; then
+ if test yes = "$fast_install"; then
cat <<EOF
const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
EOF
@@ -4357,12 +5735,12 @@ main (int argc, char *argv[])
char *actual_cwrapper_name;
char *target_name;
char *lt_argv_zero;
- intptr_t rval = 127;
+ int rval = 127;
int i;
program_name = (char *) xstrdup (base_name (argv[0]));
- newargz = XMALLOC (char *, argc + 1);
+ newargz = XMALLOC (char *, (size_t) argc + 1);
/* very simple arg parsing; don't want to rely on getopt
* also, copy all non cwrapper options to newargz, except
@@ -4371,10 +5749,10 @@ main (int argc, char *argv[])
newargc=0;
for (i = 1; i < argc; i++)
{
- if (strcmp (argv[i], dumpscript_opt) == 0)
+ if (STREQ (argv[i], dumpscript_opt))
{
EOF
- case "$host" in
+ case $host in
*mingw* | *cygwin* )
# make stdout use "unix" line endings
echo " setmode(1,_O_BINARY);"
@@ -4385,12 +5763,12 @@ EOF
lt_dump_script (stdout);
return 0;
}
- if (strcmp (argv[i], debug_opt) == 0)
+ if (STREQ (argv[i], debug_opt))
{
lt_debug = 1;
continue;
}
- if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+ if (STREQ (argv[i], ltwrapper_option_prefix))
{
/* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
namespace, but it is not one of the ones we know about and
@@ -4413,7 +5791,7 @@ EOF
EOF
cat <<EOF
/* The GNU banner must be the first non-error debug message */
- lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
EOF
cat <<"EOF"
lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
@@ -4524,7 +5902,7 @@ EOF
cat <<"EOF"
/* execv doesn't actually work on mingw as expected on unix */
newargz = prepare_spawn (newargz);
- rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+ rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
if (rval == -1)
{
/* failed to start process */
@@ -4569,7 +5947,7 @@ base_name (const char *name)
{
const char *base;
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
/* Skip over the disk name in MSDOS pathnames. */
if (isalpha ((unsigned char) name[0]) && name[1] == ':')
name += 2;
@@ -4628,7 +6006,7 @@ find_executable (const char *wrapper)
const char *p_next;
/* static buffer for getcwd */
char tmp[LT_PATHMAX + 1];
- int tmp_len;
+ size_t tmp_len;
char *concat_name;
lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
@@ -4638,7 +6016,7 @@ find_executable (const char *wrapper)
return NULL;
/* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
{
concat_name = xstrdup (wrapper);
@@ -4656,7 +6034,7 @@ find_executable (const char *wrapper)
return concat_name;
XFREE (concat_name);
}
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
}
#endif
@@ -4679,7 +6057,7 @@ find_executable (const char *wrapper)
for (q = p; *q; q++)
if (IS_PATH_SEPARATOR (*q))
break;
- p_len = q - p;
+ p_len = (size_t) (q - p);
p_next = (*q == '\0' ? q : q + 1);
if (p_len == 0)
{
@@ -4798,7 +6176,7 @@ strendzap (char *str, const char *pat)
if (patlen <= len)
{
str += len - patlen;
- if (strcmp (str, pat) == 0)
+ if (STREQ (str, pat))
*str = '\0';
}
return str;
@@ -4863,7 +6241,7 @@ lt_setenv (const char *name, const char *value)
char *str = xstrdup (value);
setenv (name, str, 1);
#else
- int len = strlen (name) + 1 + strlen (value) + 1;
+ size_t len = strlen (name) + 1 + strlen (value) + 1;
char *str = XMALLOC (char, len);
sprintf (str, "%s=%s", name, value);
if (putenv (str) != EXIT_SUCCESS)
@@ -4880,8 +6258,8 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
char *new_value;
if (orig_value && *orig_value)
{
- int orig_value_len = strlen (orig_value);
- int add_len = strlen (add);
+ size_t orig_value_len = strlen (orig_value);
+ size_t add_len = strlen (add);
new_value = XMALLOC (char, add_len + orig_value_len + 1);
if (to_end)
{
@@ -4912,10 +6290,10 @@ lt_update_exe_path (const char *name, const char *value)
{
char *new_value = lt_extend_str (getenv (name), value, 0);
/* some systems can't cope with a ':'-terminated path #' */
- int len = strlen (new_value);
- while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+ size_t len = strlen (new_value);
+ while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
{
- new_value[len-1] = '\0';
+ new_value[--len] = '\0';
}
lt_setenv (name, new_value);
XFREE (new_value);
@@ -5082,27 +6460,47 @@ EOF
# True if ARG is an import lib, as indicated by $file_magic_cmd
func_win32_import_lib_p ()
{
- $opt_debug
+ $debug_cmd
+
case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
*import*) : ;;
*) false ;;
esac
}
+# func_suncc_cstd_abi
+# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
+# Several compiler flags select an ABI that is incompatible with the
+# Cstd library. Avoid specifying it if any are in CXXFLAGS.
+func_suncc_cstd_abi ()
+{
+ $debug_cmd
+
+ case " $compile_command " in
+ *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
+ suncc_use_cstd_abi=no
+ ;;
+ *)
+ suncc_use_cstd_abi=yes
+ ;;
+ esac
+}
+
# func_mode_link arg...
func_mode_link ()
{
- $opt_debug
+ $debug_cmd
+
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
# It is impossible to link a dll without this setting, and
# we shouldn't force the makefile maintainer to figure out
- # which system we are compiling for in order to pass an extra
+ # what system we are compiling for in order to pass an extra
# flag for every libtool invocation.
# allow_undefined=no
# FIXME: Unfortunately, there are problems with the above when trying
- # to make a dll which has undefined symbols, in which case not
+ # to make a dll that has undefined symbols, in which case not
# even a static library is built. For now, we need to specify
# -no-undefined on the libtool link line when we can be certain
# that all symbols are satisfied, otherwise we get a static library.
@@ -5146,10 +6544,11 @@ func_mode_link ()
module=no
no_install=no
objs=
+ os2dllname=
non_pic_objects=
precious_files_regex=
prefer_static_libs=no
- preload=no
+ preload=false
prev=
prevarg=
release=
@@ -5161,7 +6560,7 @@ func_mode_link ()
vinfo=
vinfo_number=no
weak_libs=
- single_module="${wl}-single_module"
+ single_module=$wl-single_module
func_infer_tag $base_compile
# We need to know -static, to get the right output filenames.
@@ -5169,15 +6568,15 @@ func_mode_link ()
do
case $arg in
-shared)
- test "$build_libtool_libs" != yes && \
- func_fatal_configuration "can not build a shared library"
+ test yes != "$build_libtool_libs" \
+ && func_fatal_configuration "cannot build a shared library"
build_old_libs=no
break
;;
-all-static | -static | -static-libtool-libs)
case $arg in
-all-static)
- if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
func_warning "complete static linking is impossible in this configuration"
fi
if test -n "$link_static_flag"; then
@@ -5210,7 +6609,7 @@ func_mode_link ()
# Go through the arguments, transforming them on the way.
while test "$#" -gt 0; do
- arg="$1"
+ arg=$1
shift
func_quote_for_eval "$arg"
qarg=$func_quote_for_eval_unquoted_result
@@ -5227,21 +6626,21 @@ func_mode_link ()
case $prev in
bindir)
- bindir="$arg"
+ bindir=$arg
prev=
continue
;;
dlfiles|dlprefiles)
- if test "$preload" = no; then
+ $preload || {
# Add the symbol object into the linking commands.
func_append compile_command " @SYMFILE@"
func_append finalize_command " @SYMFILE@"
- preload=yes
- fi
+ preload=:
+ }
case $arg in
*.la | *.lo) ;; # We handle these cases below.
force)
- if test "$dlself" = no; then
+ if test no = "$dlself"; then
dlself=needless
export_dynamic=yes
fi
@@ -5249,9 +6648,9 @@ func_mode_link ()
continue
;;
self)
- if test "$prev" = dlprefiles; then
+ if test dlprefiles = "$prev"; then
dlself=yes
- elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+ elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
dlself=yes
else
dlself=needless
@@ -5261,7 +6660,7 @@ func_mode_link ()
continue
;;
*)
- if test "$prev" = dlfiles; then
+ if test dlfiles = "$prev"; then
func_append dlfiles " $arg"
else
func_append dlprefiles " $arg"
@@ -5272,14 +6671,14 @@ func_mode_link ()
esac
;;
expsyms)
- export_symbols="$arg"
+ export_symbols=$arg
test -f "$arg" \
- || func_fatal_error "symbol file \`$arg' does not exist"
+ || func_fatal_error "symbol file '$arg' does not exist"
prev=
continue
;;
expsyms_regex)
- export_symbols_regex="$arg"
+ export_symbols_regex=$arg
prev=
continue
;;
@@ -5297,7 +6696,13 @@ func_mode_link ()
continue
;;
inst_prefix)
- inst_prefix_dir="$arg"
+ inst_prefix_dir=$arg
+ prev=
+ continue
+ ;;
+ mllvm)
+ # Clang does not use LLVM to link, so we can simply discard any
+ # '-mllvm $arg' options when doing the link step.
prev=
continue
;;
@@ -5321,21 +6726,21 @@ func_mode_link ()
if test -z "$pic_object" ||
test -z "$non_pic_object" ||
- test "$pic_object" = none &&
- test "$non_pic_object" = none; then
- func_fatal_error "cannot find name of object for \`$arg'"
+ test none = "$pic_object" &&
+ test none = "$non_pic_object"; then
+ func_fatal_error "cannot find name of object for '$arg'"
fi
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
- if test "$pic_object" != none; then
+ if test none != "$pic_object"; then
# Prepend the subdirectory the object is found in.
- pic_object="$xdir$pic_object"
+ pic_object=$xdir$pic_object
- if test "$prev" = dlfiles; then
- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ if test dlfiles = "$prev"; then
+ if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
func_append dlfiles " $pic_object"
prev=
continue
@@ -5346,7 +6751,7 @@ func_mode_link ()
fi
# CHECK ME: I think I busted this. -Ossama
- if test "$prev" = dlprefiles; then
+ if test dlprefiles = "$prev"; then
# Preload the old-style object.
func_append dlprefiles " $pic_object"
prev=
@@ -5354,23 +6759,23 @@ func_mode_link ()
# A PIC object.
func_append libobjs " $pic_object"
- arg="$pic_object"
+ arg=$pic_object
fi
# Non-PIC object.
- if test "$non_pic_object" != none; then
+ if test none != "$non_pic_object"; then
# Prepend the subdirectory the object is found in.
- non_pic_object="$xdir$non_pic_object"
+ non_pic_object=$xdir$non_pic_object
# A standard non-PIC object
func_append non_pic_objects " $non_pic_object"
- if test -z "$pic_object" || test "$pic_object" = none ; then
- arg="$non_pic_object"
+ if test -z "$pic_object" || test none = "$pic_object"; then
+ arg=$non_pic_object
fi
else
# If the PIC object exists, use it instead.
# $xdir was prepended to $pic_object above.
- non_pic_object="$pic_object"
+ non_pic_object=$pic_object
func_append non_pic_objects " $non_pic_object"
fi
else
@@ -5378,7 +6783,7 @@ func_mode_link ()
if $opt_dry_run; then
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
func_lo2o "$arg"
pic_object=$xdir$objdir/$func_lo2o_result
@@ -5386,24 +6791,29 @@ func_mode_link ()
func_append libobjs " $pic_object"
func_append non_pic_objects " $non_pic_object"
else
- func_fatal_error "\`$arg' is not a valid libtool object"
+ func_fatal_error "'$arg' is not a valid libtool object"
fi
fi
done
else
- func_fatal_error "link input file \`$arg' does not exist"
+ func_fatal_error "link input file '$arg' does not exist"
fi
arg=$save_arg
prev=
continue
;;
+ os2dllname)
+ os2dllname=$arg
+ prev=
+ continue
+ ;;
precious_regex)
- precious_files_regex="$arg"
+ precious_files_regex=$arg
prev=
continue
;;
release)
- release="-$arg"
+ release=-$arg
prev=
continue
;;
@@ -5415,7 +6825,7 @@ func_mode_link ()
func_fatal_error "only absolute run-paths are allowed"
;;
esac
- if test "$prev" = rpath; then
+ if test rpath = "$prev"; then
case "$rpath " in
*" $arg "*) ;;
*) func_append rpath " $arg" ;;
@@ -5430,7 +6840,7 @@ func_mode_link ()
continue
;;
shrext)
- shrext_cmds="$arg"
+ shrext_cmds=$arg
prev=
continue
;;
@@ -5470,7 +6880,7 @@ func_mode_link ()
esac
fi # test -n "$prev"
- prevarg="$arg"
+ prevarg=$arg
case $arg in
-all-static)
@@ -5484,7 +6894,7 @@ func_mode_link ()
-allow-undefined)
# FIXME: remove this flag sometime in the future.
- func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+ func_fatal_error "'-allow-undefined' must not be used because it is the default"
;;
-avoid-version)
@@ -5516,7 +6926,7 @@ func_mode_link ()
if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
func_fatal_error "more than one -exported-symbols argument is not allowed"
fi
- if test "X$arg" = "X-export-symbols"; then
+ if test X-export-symbols = "X$arg"; then
prev=expsyms
else
prev=expsyms_regex
@@ -5550,9 +6960,9 @@ func_mode_link ()
func_stripname "-L" '' "$arg"
if test -z "$func_stripname_result"; then
if test "$#" -gt 0; then
- func_fatal_error "require no space between \`-L' and \`$1'"
+ func_fatal_error "require no space between '-L' and '$1'"
else
- func_fatal_error "need path for \`-L' option"
+ func_fatal_error "need path for '-L' option"
fi
fi
func_resolve_sysroot "$func_stripname_result"
@@ -5563,8 +6973,8 @@ func_mode_link ()
*)
absdir=`cd "$dir" && pwd`
test -z "$absdir" && \
- func_fatal_error "cannot determine absolute directory name of \`$dir'"
- dir="$absdir"
+ func_fatal_error "cannot determine absolute directory name of '$dir'"
+ dir=$absdir
;;
esac
case "$deplibs " in
@@ -5599,7 +7009,7 @@ func_mode_link ()
;;
-l*)
- if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ if test X-lc = "X$arg" || test X-lm = "X$arg"; then
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
# These systems don't actually have a C or math library (as such)
@@ -5607,11 +7017,11 @@ func_mode_link ()
;;
*-*-os2*)
# These systems don't actually have a C library (as such)
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
# Do not include libc due to us having libc/libc_r.
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
@@ -5620,16 +7030,16 @@ func_mode_link ()
;;
*-*-sco3.2v5* | *-*-sco5v6*)
# Causes problems with __ctype
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
*-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
# Compiler inserts libc in the correct place for threads to work
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
esac
- elif test "X$arg" = "X-lc_r"; then
+ elif test X-lc_r = "X$arg"; then
case $host in
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
# Do not include libc_r directly, use -pthread flag.
continue
;;
@@ -5639,6 +7049,11 @@ func_mode_link ()
continue
;;
+ -mllvm)
+ prev=mllvm
+ continue
+ ;;
+
-module)
module=yes
continue
@@ -5668,7 +7083,7 @@ func_mode_link ()
;;
-multi_module)
- single_module="${wl}-multi_module"
+ single_module=$wl-multi_module
continue
;;
@@ -5682,8 +7097,8 @@ func_mode_link ()
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
# The PATH hackery in wrapper scripts is required on Windows
# and Darwin in order for the loader to find any dlls it needs.
- func_warning "\`-no-install' is ignored for $host"
- func_warning "assuming \`-no-fast-install' instead"
+ func_warning "'-no-install' is ignored for $host"
+ func_warning "assuming '-no-fast-install' instead"
fast_install=no
;;
*) no_install=yes ;;
@@ -5701,6 +7116,11 @@ func_mode_link ()
continue
;;
+ -os2dllname)
+ prev=os2dllname
+ continue
+ ;;
+
-o) prev=output ;;
-precious-files-regex)
@@ -5788,14 +7208,14 @@ func_mode_link ()
func_stripname '-Wc,' '' "$arg"
args=$func_stripname_result
arg=
- save_ifs="$IFS"; IFS=','
+ save_ifs=$IFS; IFS=,
for flag in $args; do
- IFS="$save_ifs"
+ IFS=$save_ifs
func_quote_for_eval "$flag"
func_append arg " $func_quote_for_eval_result"
func_append compiler_flags " $func_quote_for_eval_result"
done
- IFS="$save_ifs"
+ IFS=$save_ifs
func_stripname ' ' '' "$arg"
arg=$func_stripname_result
;;
@@ -5804,15 +7224,15 @@ func_mode_link ()
func_stripname '-Wl,' '' "$arg"
args=$func_stripname_result
arg=
- save_ifs="$IFS"; IFS=','
+ save_ifs=$IFS; IFS=,
for flag in $args; do
- IFS="$save_ifs"
+ IFS=$save_ifs
func_quote_for_eval "$flag"
func_append arg " $wl$func_quote_for_eval_result"
func_append compiler_flags " $wl$func_quote_for_eval_result"
func_append linker_flags " $func_quote_for_eval_result"
done
- IFS="$save_ifs"
+ IFS=$save_ifs
func_stripname ' ' '' "$arg"
arg=$func_stripname_result
;;
@@ -5835,7 +7255,7 @@ func_mode_link ()
# -msg_* for osf cc
-msg_*)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
;;
# Flags to be passed through unchanged, with rationale:
@@ -5847,25 +7267,46 @@ func_mode_link ()
# -m*, -t[45]*, -txscale* architecture-specific flags for GCC
# -F/path path to uninstalled frameworks, gcc on darwin
# -p, -pg, --coverage, -fprofile-* profiling flags for GCC
+ # -fstack-protector* stack protector flags for GCC
# @file GCC response files
# -tp=* Portland pgcc target processor selection
# --sysroot=* for sysroot support
- # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ # -stdlib=* select c++ std lib with clang
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
func_append compile_command " $arg"
func_append finalize_command " $arg"
func_append compiler_flags " $arg"
continue
;;
+ -Z*)
+ if test os2 = "`expr $host : '.*\(os2\)'`"; then
+ # OS/2 uses -Zxxx to specify OS/2-specific options
+ compiler_flags="$compiler_flags $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+ case $arg in
+ -Zlinker | -Zstack)
+ prev=xcompiler
+ ;;
+ esac
+ continue
+ else
+ # Otherwise treat like 'Some other compiler flag' below
+ func_quote_for_eval "$arg"
+ arg=$func_quote_for_eval_result
+ fi
+ ;;
+
# Some other compiler flag.
-* | +*)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
;;
*.$objext)
@@ -5886,21 +7327,21 @@ func_mode_link ()
if test -z "$pic_object" ||
test -z "$non_pic_object" ||
- test "$pic_object" = none &&
- test "$non_pic_object" = none; then
- func_fatal_error "cannot find name of object for \`$arg'"
+ test none = "$pic_object" &&
+ test none = "$non_pic_object"; then
+ func_fatal_error "cannot find name of object for '$arg'"
fi
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
- if test "$pic_object" != none; then
+ test none = "$pic_object" || {
# Prepend the subdirectory the object is found in.
- pic_object="$xdir$pic_object"
+ pic_object=$xdir$pic_object
- if test "$prev" = dlfiles; then
- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ if test dlfiles = "$prev"; then
+ if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
func_append dlfiles " $pic_object"
prev=
continue
@@ -5911,7 +7352,7 @@ func_mode_link ()
fi
# CHECK ME: I think I busted this. -Ossama
- if test "$prev" = dlprefiles; then
+ if test dlprefiles = "$prev"; then
# Preload the old-style object.
func_append dlprefiles " $pic_object"
prev=
@@ -5919,23 +7360,23 @@ func_mode_link ()
# A PIC object.
func_append libobjs " $pic_object"
- arg="$pic_object"
- fi
+ arg=$pic_object
+ }
# Non-PIC object.
- if test "$non_pic_object" != none; then
+ if test none != "$non_pic_object"; then
# Prepend the subdirectory the object is found in.
- non_pic_object="$xdir$non_pic_object"
+ non_pic_object=$xdir$non_pic_object
# A standard non-PIC object
func_append non_pic_objects " $non_pic_object"
- if test -z "$pic_object" || test "$pic_object" = none ; then
- arg="$non_pic_object"
+ if test -z "$pic_object" || test none = "$pic_object"; then
+ arg=$non_pic_object
fi
else
# If the PIC object exists, use it instead.
# $xdir was prepended to $pic_object above.
- non_pic_object="$pic_object"
+ non_pic_object=$pic_object
func_append non_pic_objects " $non_pic_object"
fi
else
@@ -5943,7 +7384,7 @@ func_mode_link ()
if $opt_dry_run; then
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
func_lo2o "$arg"
pic_object=$xdir$objdir/$func_lo2o_result
@@ -5951,7 +7392,7 @@ func_mode_link ()
func_append libobjs " $pic_object"
func_append non_pic_objects " $non_pic_object"
else
- func_fatal_error "\`$arg' is not a valid libtool object"
+ func_fatal_error "'$arg' is not a valid libtool object"
fi
fi
;;
@@ -5967,11 +7408,11 @@ func_mode_link ()
# A libtool-controlled library.
func_resolve_sysroot "$arg"
- if test "$prev" = dlfiles; then
+ if test dlfiles = "$prev"; then
# This library was specified with -dlopen.
func_append dlfiles " $func_resolve_sysroot_result"
prev=
- elif test "$prev" = dlprefiles; then
+ elif test dlprefiles = "$prev"; then
# The library was specified with -dlpreopen.
func_append dlprefiles " $func_resolve_sysroot_result"
prev=
@@ -5986,7 +7427,7 @@ func_mode_link ()
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
;;
esac # arg
@@ -5998,9 +7439,9 @@ func_mode_link ()
done # argument parsing loop
test -n "$prev" && \
- func_fatal_help "the \`$prevarg' option requires an argument"
+ func_fatal_help "the '$prevarg' option requires an argument"
- if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+ if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
eval arg=\"$export_dynamic_flag_spec\"
func_append compile_command " $arg"
func_append finalize_command " $arg"
@@ -6009,20 +7450,23 @@ func_mode_link ()
oldlibs=
# calculate the name of the file, without its directory
func_basename "$output"
- outputname="$func_basename_result"
- libobjs_save="$libobjs"
+ outputname=$func_basename_result
+ libobjs_save=$libobjs
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
- eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
+ eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
else
shlib_search_path=
fi
eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+ # Definition is injected by LT_CONFIG during libtool generation.
+ func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
+
func_dirname "$output" "/" ""
- output_objdir="$func_dirname_result$objdir"
+ output_objdir=$func_dirname_result$objdir
func_to_tool_file "$output_objdir/"
tool_output_objdir=$func_to_tool_file_result
# Create the object directory.
@@ -6045,7 +7489,7 @@ func_mode_link ()
# Find all interdependent deplibs by searching for libraries
# that are linked more than once (e.g. -la -lb -la)
for deplib in $deplibs; do
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
case "$libs " in
*" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
@@ -6053,7 +7497,7 @@ func_mode_link ()
func_append libs " $deplib"
done
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
libs="$predeps $libs $compiler_lib_search_path $postdeps"
# Compute libraries that are listed more than once in $predeps
@@ -6085,7 +7529,7 @@ func_mode_link ()
case $file in
*.la) ;;
*)
- func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+ func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
;;
esac
done
@@ -6093,7 +7537,7 @@ func_mode_link ()
prog)
compile_deplibs=
finalize_deplibs=
- alldeplibs=no
+ alldeplibs=false
newdlfiles=
newdlprefiles=
passes="conv scan dlopen dlpreopen link"
@@ -6105,29 +7549,29 @@ func_mode_link ()
for pass in $passes; do
# The preopen pass in lib mode reverses $deplibs; put it back here
# so that -L comes before libs that need it for instance...
- if test "$linkmode,$pass" = "lib,link"; then
+ if test lib,link = "$linkmode,$pass"; then
## FIXME: Find the place where the list is rebuilt in the wrong
## order, and fix it there properly
tmp_deplibs=
for deplib in $deplibs; do
tmp_deplibs="$deplib $tmp_deplibs"
done
- deplibs="$tmp_deplibs"
+ deplibs=$tmp_deplibs
fi
- if test "$linkmode,$pass" = "lib,link" ||
- test "$linkmode,$pass" = "prog,scan"; then
- libs="$deplibs"
+ if test lib,link = "$linkmode,$pass" ||
+ test prog,scan = "$linkmode,$pass"; then
+ libs=$deplibs
deplibs=
fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
case $pass in
- dlopen) libs="$dlfiles" ;;
- dlpreopen) libs="$dlprefiles" ;;
+ dlopen) libs=$dlfiles ;;
+ dlpreopen) libs=$dlprefiles ;;
link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
esac
fi
- if test "$linkmode,$pass" = "lib,dlpreopen"; then
+ if test lib,dlpreopen = "$linkmode,$pass"; then
# Collect and forward deplibs of preopened libtool libs
for lib in $dlprefiles; do
# Ignore non-libtool-libs
@@ -6148,26 +7592,26 @@ func_mode_link ()
esac
done
done
- libs="$dlprefiles"
+ libs=$dlprefiles
fi
- if test "$pass" = dlopen; then
+ if test dlopen = "$pass"; then
# Collect dlpreopened libraries
- save_deplibs="$deplibs"
+ save_deplibs=$deplibs
deplibs=
fi
for deplib in $libs; do
lib=
- found=no
+ found=false
case $deplib in
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
func_append compiler_flags " $deplib"
- if test "$linkmode" = lib ; then
+ if test lib = "$linkmode"; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
* ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -6177,13 +7621,13 @@ func_mode_link ()
continue
;;
-l*)
- if test "$linkmode" != lib && test "$linkmode" != prog; then
- func_warning "\`-l' is ignored for archives/objects"
+ if test lib != "$linkmode" && test prog != "$linkmode"; then
+ func_warning "'-l' is ignored for archives/objects"
continue
fi
func_stripname '-l' '' "$deplib"
name=$func_stripname_result
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
else
searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
@@ -6191,31 +7635,22 @@ func_mode_link ()
for searchdir in $searchdirs; do
for search_ext in .la $std_shrext .so .a; do
# Search the libtool library
- lib="$searchdir/lib${name}${search_ext}"
+ lib=$searchdir/lib$name$search_ext
if test -f "$lib"; then
- if test "$search_ext" = ".la"; then
- found=yes
+ if test .la = "$search_ext"; then
+ found=:
else
- found=no
+ found=false
fi
break 2
fi
done
done
- if test "$found" != yes; then
- # deplib doesn't seem to be a libtool library
- if test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
- else
- deplibs="$deplib $deplibs"
- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
- fi
- continue
- else # deplib is a libtool library
+ if $found; then
+ # deplib is a libtool library
# If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
# We need to do some special things here, and not later.
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $deplib "*)
if func_lalib_p "$lib"; then
@@ -6223,19 +7658,19 @@ func_mode_link ()
old_library=
func_source "$lib"
for l in $old_library $library_names; do
- ll="$l"
+ ll=$l
done
- if test "X$ll" = "X$old_library" ; then # only static version available
- found=no
+ if test "X$ll" = "X$old_library"; then # only static version available
+ found=false
func_dirname "$lib" "" "."
- ladir="$func_dirname_result"
+ ladir=$func_dirname_result
lib=$ladir/$old_library
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
fi
continue
fi
@@ -6244,15 +7679,25 @@ func_mode_link ()
*) ;;
esac
fi
+ else
+ # deplib doesn't seem to be a libtool library
+ if test prog,link = "$linkmode,$pass"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+ test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+ fi
+ continue
fi
;; # -l
*.ltframework)
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
- if test "$linkmode" = lib ; then
+ if test lib = "$linkmode"; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
* ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -6265,18 +7710,18 @@ func_mode_link ()
case $linkmode in
lib)
deplibs="$deplib $deplibs"
- test "$pass" = conv && continue
+ test conv = "$pass" && continue
newdependency_libs="$deplib $newdependency_libs"
func_stripname '-L' '' "$deplib"
func_resolve_sysroot "$func_stripname_result"
func_append newlib_search_path " $func_resolve_sysroot_result"
;;
prog)
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
deplibs="$deplib $deplibs"
continue
fi
- if test "$pass" = scan; then
+ if test scan = "$pass"; then
deplibs="$deplib $deplibs"
else
compile_deplibs="$deplib $compile_deplibs"
@@ -6287,13 +7732,13 @@ func_mode_link ()
func_append newlib_search_path " $func_resolve_sysroot_result"
;;
*)
- func_warning "\`-L' is ignored for archives/objects"
+ func_warning "'-L' is ignored for archives/objects"
;;
esac # linkmode
continue
;; # -L
-R*)
- if test "$pass" = link; then
+ if test link = "$pass"; then
func_stripname '-R' '' "$deplib"
func_resolve_sysroot "$func_stripname_result"
dir=$func_resolve_sysroot_result
@@ -6311,7 +7756,7 @@ func_mode_link ()
lib=$func_resolve_sysroot_result
;;
*.$libext)
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
deplibs="$deplib $deplibs"
continue
fi
@@ -6322,21 +7767,26 @@ func_mode_link ()
case " $dlpreconveniencelibs " in
*" $deplib "*) ;;
*)
- valid_a_lib=no
+ valid_a_lib=false
case $deplibs_check_method in
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
| $EGREP "$match_pattern_regex" > /dev/null; then
- valid_a_lib=yes
+ valid_a_lib=:
fi
;;
pass_all)
- valid_a_lib=yes
+ valid_a_lib=:
;;
esac
- if test "$valid_a_lib" != yes; then
+ if $valid_a_lib; then
+ echo
+ $ECHO "*** Warning: Linking the shared library $output against the"
+ $ECHO "*** static library $deplib is not portable!"
+ deplibs="$deplib $deplibs"
+ else
echo
$ECHO "*** Warning: Trying to link with static lib archive $deplib."
echo "*** I have the capability to make that library automatically link in when"
@@ -6344,18 +7794,13 @@ func_mode_link ()
echo "*** shared version of the library, which you do not appear to have"
echo "*** because the file extensions .$libext of this argument makes me believe"
echo "*** that it is just a static archive that I should not use here."
- else
- echo
- $ECHO "*** Warning: Linking the shared library $output against the"
- $ECHO "*** static library $deplib is not portable!"
- deplibs="$deplib $deplibs"
fi
;;
esac
continue
;;
prog)
- if test "$pass" != link; then
+ if test link != "$pass"; then
deplibs="$deplib $deplibs"
else
compile_deplibs="$deplib $compile_deplibs"
@@ -6366,10 +7811,10 @@ func_mode_link ()
esac # linkmode
;; # *.$libext
*.lo | *.$objext)
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
deplibs="$deplib $deplibs"
- elif test "$linkmode" = prog; then
- if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+ elif test prog = "$linkmode"; then
+ if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
# If there is no dlopen support or we're linking statically,
# we need to preload.
func_append newdlprefiles " $deplib"
@@ -6382,22 +7827,20 @@ func_mode_link ()
continue
;;
%DEPLIBS%)
- alldeplibs=yes
+ alldeplibs=:
continue
;;
esac # case $deplib
- if test "$found" = yes || test -f "$lib"; then :
- else
- func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
- fi
+ $found || test -f "$lib" \
+ || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$lib" \
- || func_fatal_error "\`$lib' is not a valid libtool archive"
+ || func_fatal_error "'$lib' is not a valid libtool archive"
func_dirname "$lib" "" "."
- ladir="$func_dirname_result"
+ ladir=$func_dirname_result
dlname=
dlopen=
@@ -6427,30 +7870,30 @@ func_mode_link ()
done
fi
dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- if test "$linkmode,$pass" = "lib,link" ||
- test "$linkmode,$pass" = "prog,scan" ||
- { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+ if test lib,link = "$linkmode,$pass" ||
+ test prog,scan = "$linkmode,$pass" ||
+ { test prog != "$linkmode" && test lib != "$linkmode"; }; then
test -n "$dlopen" && func_append dlfiles " $dlopen"
test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
fi
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
# Only check for convenience libraries
deplibs="$lib $deplibs"
if test -z "$libdir"; then
if test -z "$old_library"; then
- func_fatal_error "cannot find name of link library for \`$lib'"
+ func_fatal_error "cannot find name of link library for '$lib'"
fi
# It is a libtool convenience library, so add in its objects.
func_append convenience " $ladir/$objdir/$old_library"
func_append old_convenience " $ladir/$objdir/$old_library"
- elif test "$linkmode" != prog && test "$linkmode" != lib; then
- func_fatal_error "\`$lib' is not a convenience library"
+ elif test prog != "$linkmode" && test lib != "$linkmode"; then
+ func_fatal_error "'$lib' is not a convenience library"
fi
tmp_libs=
for deplib in $dependency_libs; do
deplibs="$deplib $deplibs"
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
case "$tmp_libs " in
*" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
@@ -6464,26 +7907,26 @@ func_mode_link ()
# Get the name of the library we link against.
linklib=
if test -n "$old_library" &&
- { test "$prefer_static_libs" = yes ||
- test "$prefer_static_libs,$installed" = "built,no"; }; then
+ { test yes = "$prefer_static_libs" ||
+ test built,no = "$prefer_static_libs,$installed"; }; then
linklib=$old_library
else
for l in $old_library $library_names; do
- linklib="$l"
+ linklib=$l
done
fi
if test -z "$linklib"; then
- func_fatal_error "cannot find name of link library for \`$lib'"
+ func_fatal_error "cannot find name of link library for '$lib'"
fi
# This library was specified with -dlopen.
- if test "$pass" = dlopen; then
- if test -z "$libdir"; then
- func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
- fi
+ if test dlopen = "$pass"; then
+ test -z "$libdir" \
+ && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
if test -z "$dlname" ||
- test "$dlopen_support" != yes ||
- test "$build_libtool_libs" = no; then
+ test yes != "$dlopen_support" ||
+ test no = "$build_libtool_libs"
+ then
# If there is no dlname, no dlopen support or we're linking
# statically, we need to preload. We also need to preload any
# dependent libraries so libltdl's deplib preloader doesn't
@@ -6497,40 +7940,40 @@ func_mode_link ()
# We need an absolute path.
case $ladir in
- [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;;
*)
abs_ladir=`cd "$ladir" && pwd`
if test -z "$abs_ladir"; then
- func_warning "cannot determine absolute directory name of \`$ladir'"
+ func_warning "cannot determine absolute directory name of '$ladir'"
func_warning "passing it literally to the linker, although it might fail"
- abs_ladir="$ladir"
+ abs_ladir=$ladir
fi
;;
esac
func_basename "$lib"
- laname="$func_basename_result"
+ laname=$func_basename_result
# Find the relevant object directory and library name.
- if test "X$installed" = Xyes; then
+ if test yes = "$installed"; then
if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- func_warning "library \`$lib' was moved."
- dir="$ladir"
- absdir="$abs_ladir"
- libdir="$abs_ladir"
+ func_warning "library '$lib' was moved."
+ dir=$ladir
+ absdir=$abs_ladir
+ libdir=$abs_ladir
else
- dir="$lt_sysroot$libdir"
- absdir="$lt_sysroot$libdir"
+ dir=$lt_sysroot$libdir
+ absdir=$lt_sysroot$libdir
fi
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ test yes = "$hardcode_automatic" && avoidtemprpath=yes
else
if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- dir="$ladir"
- absdir="$abs_ladir"
+ dir=$ladir
+ absdir=$abs_ladir
# Remove this search path later
func_append notinst_path " $abs_ladir"
else
- dir="$ladir/$objdir"
- absdir="$abs_ladir/$objdir"
+ dir=$ladir/$objdir
+ absdir=$abs_ladir/$objdir
# Remove this search path later
func_append notinst_path " $abs_ladir"
fi
@@ -6539,11 +7982,11 @@ func_mode_link ()
name=$func_stripname_result
# This library was specified with -dlpreopen.
- if test "$pass" = dlpreopen; then
- if test -z "$libdir" && test "$linkmode" = prog; then
- func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+ if test dlpreopen = "$pass"; then
+ if test -z "$libdir" && test prog = "$linkmode"; then
+ func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
fi
- case "$host" in
+ case $host in
# special handling for platforms with PE-DLLs.
*cygwin* | *mingw* | *cegcc* )
# Linker will automatically link against shared library if both
@@ -6587,9 +8030,9 @@ func_mode_link ()
if test -z "$libdir"; then
# Link the convenience library
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
deplibs="$dir/$old_library $deplibs"
- elif test "$linkmode,$pass" = "prog,link"; then
+ elif test prog,link = "$linkmode,$pass"; then
compile_deplibs="$dir/$old_library $compile_deplibs"
finalize_deplibs="$dir/$old_library $finalize_deplibs"
else
@@ -6599,14 +8042,14 @@ func_mode_link ()
fi
- if test "$linkmode" = prog && test "$pass" != link; then
+ if test prog = "$linkmode" && test link != "$pass"; then
func_append newlib_search_path " $ladir"
deplibs="$lib $deplibs"
- linkalldeplibs=no
- if test "$link_all_deplibs" != no || test -z "$library_names" ||
- test "$build_libtool_libs" = no; then
- linkalldeplibs=yes
+ linkalldeplibs=false
+ if test no != "$link_all_deplibs" || test -z "$library_names" ||
+ test no = "$build_libtool_libs"; then
+ linkalldeplibs=:
fi
tmp_libs=
@@ -6618,14 +8061,14 @@ func_mode_link ()
;;
esac
# Need to link against all dependency_libs?
- if test "$linkalldeplibs" = yes; then
+ if $linkalldeplibs; then
deplibs="$deplib $deplibs"
else
# Need to hardcode shared library paths
# or/and link against static libraries
newdependency_libs="$deplib $newdependency_libs"
fi
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
case "$tmp_libs " in
*" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
@@ -6635,15 +8078,15 @@ func_mode_link ()
continue
fi # $linkmode = prog...
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
if test -n "$library_names" &&
- { { test "$prefer_static_libs" = no ||
- test "$prefer_static_libs,$installed" = "built,yes"; } ||
+ { { test no = "$prefer_static_libs" ||
+ test built,yes = "$prefer_static_libs,$installed"; } ||
test -z "$old_library"; }; then
# We need to hardcode the library path
- if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
# Make sure the rpath contains only unique directories.
- case "$temp_rpath:" in
+ case $temp_rpath: in
*"$absdir:"*) ;;
*) func_append temp_rpath "$absdir:" ;;
esac
@@ -6672,9 +8115,9 @@ func_mode_link ()
esac
fi # $linkmode,$pass = prog,link...
- if test "$alldeplibs" = yes &&
- { test "$deplibs_check_method" = pass_all ||
- { test "$build_libtool_libs" = yes &&
+ if $alldeplibs &&
+ { test pass_all = "$deplibs_check_method" ||
+ { test yes = "$build_libtool_libs" &&
test -n "$library_names"; }; }; then
# We only need to search for static libraries
continue
@@ -6683,19 +8126,19 @@ func_mode_link ()
link_static=no # Whether the deplib will be linked statically
use_static_libs=$prefer_static_libs
- if test "$use_static_libs" = built && test "$installed" = yes; then
+ if test built = "$use_static_libs" && test yes = "$installed"; then
use_static_libs=no
fi
if test -n "$library_names" &&
- { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ { test no = "$use_static_libs" || test -z "$old_library"; }; then
case $host in
- *cygwin* | *mingw* | *cegcc*)
+ *cygwin* | *mingw* | *cegcc* | *os2*)
# No point in relinking DLLs because paths are not encoded
func_append notinst_deplibs " $lib"
need_relink=no
;;
*)
- if test "$installed" = no; then
+ if test no = "$installed"; then
func_append notinst_deplibs " $lib"
need_relink=yes
fi
@@ -6705,24 +8148,24 @@ func_mode_link ()
# Warn about portability, can't link against -module's on some
# systems (darwin). Don't bleat about dlopened modules though!
- dlopenmodule=""
+ dlopenmodule=
for dlpremoduletest in $dlprefiles; do
if test "X$dlpremoduletest" = "X$lib"; then
- dlopenmodule="$dlpremoduletest"
+ dlopenmodule=$dlpremoduletest
break
fi
done
- if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+ if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
echo
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
$ECHO "*** Warning: Linking the executable $output against the loadable module"
else
$ECHO "*** Warning: Linking the shared library $output against the loadable module"
fi
$ECHO "*** $linklib is not portable!"
fi
- if test "$linkmode" = lib &&
- test "$hardcode_into_libs" = yes; then
+ if test lib = "$linkmode" &&
+ test yes = "$hardcode_into_libs"; then
# Hardcode the library path.
# Skip directories that are in the system default run-time
# search path.
@@ -6750,43 +8193,43 @@ func_mode_link ()
# figure out the soname
set dummy $library_names
shift
- realname="$1"
+ realname=$1
shift
libname=`eval "\\$ECHO \"$libname_spec\""`
# use dlname if we got it. it's perfectly good, no?
if test -n "$dlname"; then
- soname="$dlname"
+ soname=$dlname
elif test -n "$soname_spec"; then
# bleh windows
case $host in
- *cygwin* | mingw* | *cegcc*)
+ *cygwin* | mingw* | *cegcc* | *os2*)
func_arith $current - $age
major=$func_arith_result
- versuffix="-$major"
+ versuffix=-$major
;;
esac
eval soname=\"$soname_spec\"
else
- soname="$realname"
+ soname=$realname
fi
# Make a new name for the extract_expsyms_cmds to use
- soroot="$soname"
+ soroot=$soname
func_basename "$soroot"
- soname="$func_basename_result"
+ soname=$func_basename_result
func_stripname 'lib' '.dll' "$soname"
newlib=libimp-$func_stripname_result.a
# If the library has no export list, then create one now
if test -f "$output_objdir/$soname-def"; then :
else
- func_verbose "extracting exported symbol list from \`$soname'"
+ func_verbose "extracting exported symbol list from '$soname'"
func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
fi
# Create $newlib
if test -f "$output_objdir/$newlib"; then :; else
- func_verbose "generating import library for \`$soname'"
+ func_verbose "generating import library for '$soname'"
func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
fi
# make sure the library variables are pointing to the new library
@@ -6794,58 +8237,58 @@ func_mode_link ()
linklib=$newlib
fi # test -n "$old_archive_from_expsyms_cmds"
- if test "$linkmode" = prog || test "$opt_mode" != relink; then
+ if test prog = "$linkmode" || test relink != "$opt_mode"; then
add_shlibpath=
add_dir=
add=
lib_linked=yes
case $hardcode_action in
immediate | unsupported)
- if test "$hardcode_direct" = no; then
- add="$dir/$linklib"
+ if test no = "$hardcode_direct"; then
+ add=$dir/$linklib
case $host in
- *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
- *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+ *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
+ *-*-sysv4*uw2*) add_dir=-L$dir ;;
*-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
- *-*-unixware7*) add_dir="-L$dir" ;;
+ *-*-unixware7*) add_dir=-L$dir ;;
*-*-darwin* )
- # if the lib is a (non-dlopened) module then we can not
+ # if the lib is a (non-dlopened) module then we cannot
# link against it, someone is ignoring the earlier warnings
if /usr/bin/file -L $add 2> /dev/null |
- $GREP ": [^:]* bundle" >/dev/null ; then
+ $GREP ": [^:]* bundle" >/dev/null; then
if test "X$dlopenmodule" != "X$lib"; then
$ECHO "*** Warning: lib $linklib is a module, not a shared library"
- if test -z "$old_library" ; then
+ if test -z "$old_library"; then
echo
echo "*** And there doesn't seem to be a static archive available"
echo "*** The link will probably fail, sorry"
else
- add="$dir/$old_library"
+ add=$dir/$old_library
fi
elif test -n "$old_library"; then
- add="$dir/$old_library"
+ add=$dir/$old_library
fi
fi
esac
- elif test "$hardcode_minus_L" = no; then
+ elif test no = "$hardcode_minus_L"; then
case $host in
- *-*-sunos*) add_shlibpath="$dir" ;;
+ *-*-sunos*) add_shlibpath=$dir ;;
esac
- add_dir="-L$dir"
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = no; then
- add_shlibpath="$dir"
- add="-l$name"
+ add_dir=-L$dir
+ add=-l$name
+ elif test no = "$hardcode_shlibpath_var"; then
+ add_shlibpath=$dir
+ add=-l$name
else
lib_linked=no
fi
;;
relink)
- if test "$hardcode_direct" = yes &&
- test "$hardcode_direct_absolute" = no; then
- add="$dir/$linklib"
- elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$absdir"
+ if test yes = "$hardcode_direct" &&
+ test no = "$hardcode_direct_absolute"; then
+ add=$dir/$linklib
+ elif test yes = "$hardcode_minus_L"; then
+ add_dir=-L$absdir
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
@@ -6854,10 +8297,10 @@ func_mode_link ()
;;
esac
fi
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = yes; then
- add_shlibpath="$dir"
- add="-l$name"
+ add=-l$name
+ elif test yes = "$hardcode_shlibpath_var"; then
+ add_shlibpath=$dir
+ add=-l$name
else
lib_linked=no
fi
@@ -6865,7 +8308,7 @@ func_mode_link ()
*) lib_linked=no ;;
esac
- if test "$lib_linked" != yes; then
+ if test yes != "$lib_linked"; then
func_fatal_configuration "unsupported hardcode properties"
fi
@@ -6875,15 +8318,15 @@ func_mode_link ()
*) func_append compile_shlibpath "$add_shlibpath:" ;;
esac
fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
test -n "$add" && compile_deplibs="$add $compile_deplibs"
else
test -n "$add_dir" && deplibs="$add_dir $deplibs"
test -n "$add" && deplibs="$add $deplibs"
- if test "$hardcode_direct" != yes &&
- test "$hardcode_minus_L" != yes &&
- test "$hardcode_shlibpath_var" = yes; then
+ if test yes != "$hardcode_direct" &&
+ test yes != "$hardcode_minus_L" &&
+ test yes = "$hardcode_shlibpath_var"; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
*) func_append finalize_shlibpath "$libdir:" ;;
@@ -6892,33 +8335,33 @@ func_mode_link ()
fi
fi
- if test "$linkmode" = prog || test "$opt_mode" = relink; then
+ if test prog = "$linkmode" || test relink = "$opt_mode"; then
add_shlibpath=
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
- if test "$hardcode_direct" = yes &&
- test "$hardcode_direct_absolute" = no; then
- add="$libdir/$linklib"
- elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$libdir"
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = yes; then
+ if test yes = "$hardcode_direct" &&
+ test no = "$hardcode_direct_absolute"; then
+ add=$libdir/$linklib
+ elif test yes = "$hardcode_minus_L"; then
+ add_dir=-L$libdir
+ add=-l$name
+ elif test yes = "$hardcode_shlibpath_var"; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
*) func_append finalize_shlibpath "$libdir:" ;;
esac
- add="-l$name"
- elif test "$hardcode_automatic" = yes; then
+ add=-l$name
+ elif test yes = "$hardcode_automatic"; then
if test -n "$inst_prefix_dir" &&
- test -f "$inst_prefix_dir$libdir/$linklib" ; then
- add="$inst_prefix_dir$libdir/$linklib"
+ test -f "$inst_prefix_dir$libdir/$linklib"; then
+ add=$inst_prefix_dir$libdir/$linklib
else
- add="$libdir/$linklib"
+ add=$libdir/$linklib
fi
else
# We cannot seem to hardcode it, guess we'll fake it.
- add_dir="-L$libdir"
+ add_dir=-L$libdir
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
@@ -6927,10 +8370,10 @@ func_mode_link ()
;;
esac
fi
- add="-l$name"
+ add=-l$name
fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
else
@@ -6938,43 +8381,43 @@ func_mode_link ()
test -n "$add" && deplibs="$add $deplibs"
fi
fi
- elif test "$linkmode" = prog; then
+ elif test prog = "$linkmode"; then
# Here we assume that one of hardcode_direct or hardcode_minus_L
# is not unsupported. This is valid on all known static and
# shared platforms.
- if test "$hardcode_direct" != unsupported; then
- test -n "$old_library" && linklib="$old_library"
+ if test unsupported != "$hardcode_direct"; then
+ test -n "$old_library" && linklib=$old_library
compile_deplibs="$dir/$linklib $compile_deplibs"
finalize_deplibs="$dir/$linklib $finalize_deplibs"
else
compile_deplibs="-l$name -L$dir $compile_deplibs"
finalize_deplibs="-l$name -L$dir $finalize_deplibs"
fi
- elif test "$build_libtool_libs" = yes; then
+ elif test yes = "$build_libtool_libs"; then
# Not a shared library
- if test "$deplibs_check_method" != pass_all; then
+ if test pass_all != "$deplibs_check_method"; then
# We're trying link a shared library against a static one
# but the system doesn't support it.
# Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library.
echo
- $ECHO "*** Warning: This system can not link to static lib archive $lib."
+ $ECHO "*** Warning: This system cannot link to static lib archive $lib."
echo "*** I have the capability to make that library automatically link in when"
echo "*** you link to this library. But I can only do this if you have a"
echo "*** shared version of the library, which you do not appear to have."
- if test "$module" = yes; then
+ if test yes = "$module"; then
echo "*** But as you try to build a module library, libtool will still create "
echo "*** a static module, that should work as long as the dlopening application"
echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
if test -z "$global_symbol_pipe"; then
echo
echo "*** However, this would only work if libtool was able to extract symbol"
- echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
echo "*** not find such a program. So, this module is probably useless."
- echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ echo "*** 'nm' from GNU binutils and a full rebuild may help."
fi
- if test "$build_old_libs" = no; then
+ if test no = "$build_old_libs"; then
build_libtool_libs=module
build_old_libs=yes
else
@@ -6987,11 +8430,11 @@ func_mode_link ()
fi
fi # link shared/static library?
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
if test -n "$dependency_libs" &&
- { test "$hardcode_into_libs" != yes ||
- test "$build_old_libs" = yes ||
- test "$link_static" = yes; }; then
+ { test yes != "$hardcode_into_libs" ||
+ test yes = "$build_old_libs" ||
+ test yes = "$link_static"; }; then
# Extract -R from dependency_libs
temp_deplibs=
for libdir in $dependency_libs; do
@@ -7005,12 +8448,12 @@ func_mode_link ()
*) func_append temp_deplibs " $libdir";;
esac
done
- dependency_libs="$temp_deplibs"
+ dependency_libs=$temp_deplibs
fi
func_append newlib_search_path " $absdir"
# Link against this library
- test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+ test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
# ... and its dependency_libs
tmp_libs=
for deplib in $dependency_libs; do
@@ -7020,7 +8463,7 @@ func_mode_link ()
func_resolve_sysroot "$func_stripname_result";;
*) func_resolve_sysroot "$deplib" ;;
esac
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
case "$tmp_libs " in
*" $func_resolve_sysroot_result "*)
func_append specialdeplibs " $func_resolve_sysroot_result" ;;
@@ -7029,12 +8472,12 @@ func_mode_link ()
func_append tmp_libs " $func_resolve_sysroot_result"
done
- if test "$link_all_deplibs" != no; then
+ if test no != "$link_all_deplibs"; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
path=
case $deplib in
- -L*) path="$deplib" ;;
+ -L*) path=$deplib ;;
*.la)
func_resolve_sysroot "$deplib"
deplib=$func_resolve_sysroot_result
@@ -7042,12 +8485,12 @@ func_mode_link ()
dir=$func_dirname_result
# We need an absolute path.
case $dir in
- [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;;
*)
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
- func_warning "cannot determine absolute directory name of \`$dir'"
- absdir="$dir"
+ func_warning "cannot determine absolute directory name of '$dir'"
+ absdir=$dir
fi
;;
esac
@@ -7055,35 +8498,35 @@ func_mode_link ()
case $host in
*-*-darwin*)
depdepl=
- eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
- if test -n "$deplibrary_names" ; then
- for tmp in $deplibrary_names ; do
+ eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+ if test -n "$deplibrary_names"; then
+ for tmp in $deplibrary_names; do
depdepl=$tmp
done
- if test -f "$absdir/$objdir/$depdepl" ; then
- depdepl="$absdir/$objdir/$depdepl"
- darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ if test -f "$absdir/$objdir/$depdepl"; then
+ depdepl=$absdir/$objdir/$depdepl
+ darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
if test -z "$darwin_install_name"; then
- darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
fi
- func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
- func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
+ func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
+ func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
path=
fi
fi
;;
*)
- path="-L$absdir/$objdir"
+ path=-L$absdir/$objdir
;;
esac
else
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
test -z "$libdir" && \
- func_fatal_error "\`$deplib' is not a valid libtool archive"
+ func_fatal_error "'$deplib' is not a valid libtool archive"
test "$absdir" != "$libdir" && \
- func_warning "\`$deplib' seems to be moved"
+ func_warning "'$deplib' seems to be moved"
- path="-L$absdir"
+ path=-L$absdir
fi
;;
esac
@@ -7095,23 +8538,23 @@ func_mode_link ()
fi # link_all_deplibs != no
fi # linkmode = lib
done # for deplib in $libs
- if test "$pass" = link; then
- if test "$linkmode" = "prog"; then
+ if test link = "$pass"; then
+ if test prog = "$linkmode"; then
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
else
compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
fi
fi
- dependency_libs="$newdependency_libs"
- if test "$pass" = dlpreopen; then
+ dependency_libs=$newdependency_libs
+ if test dlpreopen = "$pass"; then
# Link the dlpreopened libraries before other libraries
for deplib in $save_deplibs; do
deplibs="$deplib $deplibs"
done
fi
- if test "$pass" != dlopen; then
- if test "$pass" != conv; then
+ if test dlopen != "$pass"; then
+ test conv = "$pass" || {
# Make sure lib_search_path contains only unique directories.
lib_search_path=
for dir in $newlib_search_path; do
@@ -7121,12 +8564,12 @@ func_mode_link ()
esac
done
newlib_search_path=
- fi
+ }
- if test "$linkmode,$pass" != "prog,link"; then
- vars="deplibs"
- else
+ if test prog,link = "$linkmode,$pass"; then
vars="compile_deplibs finalize_deplibs"
+ else
+ vars=deplibs
fi
for var in $vars dependency_libs; do
# Add libraries to $var in reverse order
@@ -7184,62 +8627,93 @@ func_mode_link ()
eval $var=\"$tmp_libs\"
done # for var
fi
+
+ # Add Sun CC postdeps if required:
+ test CXX = "$tagname" && {
+ case $host_os in
+ linux*)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C++ 5.9
+ func_suncc_cstd_abi
+
+ if test no != "$suncc_use_cstd_abi"; then
+ func_append postdeps ' -library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+
+ solaris*)
+ func_cc_basename "$CC"
+ case $func_cc_basename_result in
+ CC* | sunCC*)
+ func_suncc_cstd_abi
+
+ if test no != "$suncc_use_cstd_abi"; then
+ func_append postdeps ' -library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+ esac
+ }
+
# Last step: remove runtime libs from dependency_libs
# (they stay in deplibs)
tmp_libs=
- for i in $dependency_libs ; do
+ for i in $dependency_libs; do
case " $predeps $postdeps $compiler_lib_search_path " in
*" $i "*)
- i=""
+ i=
;;
esac
- if test -n "$i" ; then
+ if test -n "$i"; then
func_append tmp_libs " $i"
fi
done
dependency_libs=$tmp_libs
done # for pass
- if test "$linkmode" = prog; then
- dlfiles="$newdlfiles"
+ if test prog = "$linkmode"; then
+ dlfiles=$newdlfiles
fi
- if test "$linkmode" = prog || test "$linkmode" = lib; then
- dlprefiles="$newdlprefiles"
+ if test prog = "$linkmode" || test lib = "$linkmode"; then
+ dlprefiles=$newdlprefiles
fi
case $linkmode in
oldlib)
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- func_warning "\`-dlopen' is ignored for archives"
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+ func_warning "'-dlopen' is ignored for archives"
fi
case " $deplibs" in
*\ -l* | *\ -L*)
- func_warning "\`-l' and \`-L' are ignored for archives" ;;
+ func_warning "'-l' and '-L' are ignored for archives" ;;
esac
test -n "$rpath" && \
- func_warning "\`-rpath' is ignored for archives"
+ func_warning "'-rpath' is ignored for archives"
test -n "$xrpath" && \
- func_warning "\`-R' is ignored for archives"
+ func_warning "'-R' is ignored for archives"
test -n "$vinfo" && \
- func_warning "\`-version-info/-version-number' is ignored for archives"
+ func_warning "'-version-info/-version-number' is ignored for archives"
test -n "$release" && \
- func_warning "\`-release' is ignored for archives"
+ func_warning "'-release' is ignored for archives"
test -n "$export_symbols$export_symbols_regex" && \
- func_warning "\`-export-symbols' is ignored for archives"
+ func_warning "'-export-symbols' is ignored for archives"
# Now set the variables for building old libraries.
build_libtool_libs=no
- oldlibs="$output"
+ oldlibs=$output
func_append objs "$old_deplibs"
;;
lib)
- # Make sure we only generate libraries of the form `libNAME.la'.
+ # Make sure we only generate libraries of the form 'libNAME.la'.
case $outputname in
lib*)
func_stripname 'lib' '.la' "$outputname"
@@ -7248,10 +8722,10 @@ func_mode_link ()
eval libname=\"$libname_spec\"
;;
*)
- test "$module" = no && \
- func_fatal_help "libtool library \`$output' must begin with \`lib'"
+ test no = "$module" \
+ && func_fatal_help "libtool library '$output' must begin with 'lib'"
- if test "$need_lib_prefix" != no; then
+ if test no != "$need_lib_prefix"; then
# Add the "lib" prefix for modules if required
func_stripname '' '.la' "$outputname"
name=$func_stripname_result
@@ -7265,8 +8739,8 @@ func_mode_link ()
esac
if test -n "$objs"; then
- if test "$deplibs_check_method" != pass_all; then
- func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+ if test pass_all != "$deplibs_check_method"; then
+ func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
else
echo
$ECHO "*** Warning: Linking the shared library $output against the non-libtool"
@@ -7275,21 +8749,21 @@ func_mode_link ()
fi
fi
- test "$dlself" != no && \
- func_warning "\`-dlopen self' is ignored for libtool libraries"
+ test no = "$dlself" \
+ || func_warning "'-dlopen self' is ignored for libtool libraries"
set dummy $rpath
shift
- test "$#" -gt 1 && \
- func_warning "ignoring multiple \`-rpath's for a libtool library"
+ test 1 -lt "$#" \
+ && func_warning "ignoring multiple '-rpath's for a libtool library"
- install_libdir="$1"
+ install_libdir=$1
oldlibs=
if test -z "$rpath"; then
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
# Building a libtool convenience library.
- # Some compilers have problems with a `.al' extension so
+ # Some compilers have problems with a '.al' extension so
# convenience libraries should have the same extension an
# archive normally would.
oldlibs="$output_objdir/$libname.$libext $oldlibs"
@@ -7298,20 +8772,20 @@ func_mode_link ()
fi
test -n "$vinfo" && \
- func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+ func_warning "'-version-info/-version-number' is ignored for convenience libraries"
test -n "$release" && \
- func_warning "\`-release' is ignored for convenience libraries"
+ func_warning "'-release' is ignored for convenience libraries"
else
# Parse the version information argument.
- save_ifs="$IFS"; IFS=':'
+ save_ifs=$IFS; IFS=:
set dummy $vinfo 0 0 0
shift
- IFS="$save_ifs"
+ IFS=$save_ifs
test -n "$7" && \
- func_fatal_help "too many parameters to \`-version-info'"
+ func_fatal_help "too many parameters to '-version-info'"
# convert absolute version numbers to libtool ages
# this retains compatibility with .la files and attempts
@@ -7319,42 +8793,42 @@ func_mode_link ()
case $vinfo_number in
yes)
- number_major="$1"
- number_minor="$2"
- number_revision="$3"
+ number_major=$1
+ number_minor=$2
+ number_revision=$3
#
# There are really only two kinds -- those that
# use the current revision as the major version
# and those that subtract age and use age as
# a minor version. But, then there is irix
- # which has an extra 1 added just for fun
+ # that has an extra 1 added just for fun
#
case $version_type in
# correct linux to gnu/linux during the next big refactor
- darwin|linux|osf|windows|none)
+ darwin|freebsd-elf|linux|osf|windows|none)
func_arith $number_major + $number_minor
current=$func_arith_result
- age="$number_minor"
- revision="$number_revision"
+ age=$number_minor
+ revision=$number_revision
;;
- freebsd-aout|freebsd-elf|qnx|sunos)
- current="$number_major"
- revision="$number_minor"
- age="0"
+ freebsd-aout|qnx|sunos)
+ current=$number_major
+ revision=$number_minor
+ age=0
;;
irix|nonstopux)
func_arith $number_major + $number_minor
current=$func_arith_result
- age="$number_minor"
- revision="$number_minor"
+ age=$number_minor
+ revision=$number_minor
lt_irix_increment=no
;;
esac
;;
no)
- current="$1"
- revision="$2"
- age="$3"
+ current=$1
+ revision=$2
+ age=$3
;;
esac
@@ -7362,30 +8836,30 @@ func_mode_link ()
case $current in
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- func_error "CURRENT \`$current' must be a nonnegative integer"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "CURRENT '$current' must be a nonnegative integer"
+ func_fatal_error "'$vinfo' is not valid version information"
;;
esac
case $revision in
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- func_error "REVISION \`$revision' must be a nonnegative integer"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "REVISION '$revision' must be a nonnegative integer"
+ func_fatal_error "'$vinfo' is not valid version information"
;;
esac
case $age in
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- func_error "AGE \`$age' must be a nonnegative integer"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "AGE '$age' must be a nonnegative integer"
+ func_fatal_error "'$vinfo' is not valid version information"
;;
esac
if test "$age" -gt "$current"; then
- func_error "AGE \`$age' is greater than the current interface number \`$current'"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "AGE '$age' is greater than the current interface number '$current'"
+ func_fatal_error "'$vinfo' is not valid version information"
fi
# Calculate the version variables.
@@ -7400,26 +8874,36 @@ func_mode_link ()
# verstring for coding it into the library header
func_arith $current - $age
major=.$func_arith_result
- versuffix="$major.$age.$revision"
+ versuffix=$major.$age.$revision
# Darwin ld doesn't like 0 for these options...
func_arith $current + 1
minor_current=$func_arith_result
- xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ # On Darwin other compilers
+ case $CC in
+ nagfor*)
+ verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+ ;;
+ *)
+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ ;;
+ esac
;;
freebsd-aout)
- major=".$current"
- versuffix=".$current.$revision";
+ major=.$current
+ versuffix=.$current.$revision
;;
freebsd-elf)
- major=".$current"
- versuffix=".$current"
+ func_arith $current - $age
+ major=.$func_arith_result
+ versuffix=$major.$age.$revision
;;
irix | nonstopux)
- if test "X$lt_irix_increment" = "Xno"; then
+ if test no = "$lt_irix_increment"; then
func_arith $current - $age
else
func_arith $current - $age + 1
@@ -7430,69 +8914,74 @@ func_mode_link ()
nonstopux) verstring_prefix=nonstopux ;;
*) verstring_prefix=sgi ;;
esac
- verstring="$verstring_prefix$major.$revision"
+ verstring=$verstring_prefix$major.$revision
# Add in all the interfaces that we are compatible with.
loop=$revision
- while test "$loop" -ne 0; do
+ while test 0 -ne "$loop"; do
func_arith $revision - $loop
iface=$func_arith_result
func_arith $loop - 1
loop=$func_arith_result
- verstring="$verstring_prefix$major.$iface:$verstring"
+ verstring=$verstring_prefix$major.$iface:$verstring
done
- # Before this point, $major must not contain `.'.
+ # Before this point, $major must not contain '.'.
major=.$major
- versuffix="$major.$revision"
+ versuffix=$major.$revision
;;
linux) # correct to gnu/linux during the next big refactor
func_arith $current - $age
major=.$func_arith_result
- versuffix="$major.$age.$revision"
+ versuffix=$major.$age.$revision
;;
osf)
func_arith $current - $age
major=.$func_arith_result
- versuffix=".$current.$age.$revision"
- verstring="$current.$age.$revision"
+ versuffix=.$current.$age.$revision
+ verstring=$current.$age.$revision
# Add in all the interfaces that we are compatible with.
loop=$age
- while test "$loop" -ne 0; do
+ while test 0 -ne "$loop"; do
func_arith $current - $loop
iface=$func_arith_result
func_arith $loop - 1
loop=$func_arith_result
- verstring="$verstring:${iface}.0"
+ verstring=$verstring:$iface.0
done
# Make executables depend on our current version.
- func_append verstring ":${current}.0"
+ func_append verstring ":$current.0"
;;
qnx)
- major=".$current"
- versuffix=".$current"
+ major=.$current
+ versuffix=.$current
+ ;;
+
+ sco)
+ major=.$current
+ versuffix=.$current
;;
sunos)
- major=".$current"
- versuffix=".$current.$revision"
+ major=.$current
+ versuffix=.$current.$revision
;;
windows)
# Use '-' rather than '.', since we only want one
- # extension on DOS 8.3 filesystems.
+ # extension on DOS 8.3 file systems.
func_arith $current - $age
major=$func_arith_result
- versuffix="-$major"
+ versuffix=-$major
;;
*)
- func_fatal_configuration "unknown library version type \`$version_type'"
+ func_fatal_configuration "unknown library version type '$version_type'"
;;
esac
@@ -7506,42 +8995,45 @@ func_mode_link ()
verstring=
;;
*)
- verstring="0.0"
+ verstring=0.0
;;
esac
- if test "$need_version" = no; then
+ if test no = "$need_version"; then
versuffix=
else
- versuffix=".0.0"
+ versuffix=.0.0
fi
fi
# Remove version info from name if versioning should be avoided
- if test "$avoid_version" = yes && test "$need_version" = no; then
+ if test yes,no = "$avoid_version,$need_version"; then
major=
versuffix=
- verstring=""
+ verstring=
fi
# Check to see if the archive will have undefined symbols.
- if test "$allow_undefined" = yes; then
- if test "$allow_undefined_flag" = unsupported; then
- func_warning "undefined symbols not allowed in $host shared libraries"
- build_libtool_libs=no
- build_old_libs=yes
+ if test yes = "$allow_undefined"; then
+ if test unsupported = "$allow_undefined_flag"; then
+ if test yes = "$build_old_libs"; then
+ func_warning "undefined symbols not allowed in $host shared libraries; building static only"
+ build_libtool_libs=no
+ else
+ func_fatal_error "can't build $host shared library unless -no-undefined is specified"
+ fi
fi
else
# Don't allow undefined symbols.
- allow_undefined_flag="$no_undefined_flag"
+ allow_undefined_flag=$no_undefined_flag
fi
fi
- func_generate_dlsyms "$libname" "$libname" "yes"
+ func_generate_dlsyms "$libname" "$libname" :
func_append libobjs " $symfileobj"
- test "X$libobjs" = "X " && libobjs=
+ test " " = "$libobjs" && libobjs=
- if test "$opt_mode" != relink; then
+ if test relink != "$opt_mode"; then
# Remove our outputs, but don't remove object files since they
# may have been created when compiling PIC objects.
removelist=
@@ -7550,8 +9042,8 @@ func_mode_link ()
case $p in
*.$objext | *.gcno)
;;
- $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
- if test "X$precious_files_regex" != "X"; then
+ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
+ if test -n "$precious_files_regex"; then
if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
then
continue
@@ -7567,11 +9059,11 @@ func_mode_link ()
fi
# Now set the variables for building old libraries.
- if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+ if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
func_append oldlibs " $output_objdir/$libname.$libext"
# Transform .lo files to .o files.
- oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
fi
# Eliminate all temporary directories.
@@ -7592,13 +9084,13 @@ func_mode_link ()
*) func_append finalize_rpath " $libdir" ;;
esac
done
- if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
dependency_libs="$temp_xrpath $dependency_libs"
fi
fi
# Make sure dlfiles contains only unique files that won't be dlpreopened
- old_dlfiles="$dlfiles"
+ old_dlfiles=$dlfiles
dlfiles=
for lib in $old_dlfiles; do
case " $dlprefiles $dlfiles " in
@@ -7608,7 +9100,7 @@ func_mode_link ()
done
# Make sure dlprefiles contains only unique files
- old_dlprefiles="$dlprefiles"
+ old_dlprefiles=$dlprefiles
dlprefiles=
for lib in $old_dlprefiles; do
case "$dlprefiles " in
@@ -7617,7 +9109,7 @@ func_mode_link ()
esac
done
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
if test -n "$rpath"; then
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
@@ -7641,7 +9133,7 @@ func_mode_link ()
;;
*)
# Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
+ if test yes = "$build_libtool_need_lc"; then
func_append deplibs " -lc"
fi
;;
@@ -7657,9 +9149,9 @@ func_mode_link ()
# I'm not sure if I'm treating the release correctly. I think
# release should show up in the -l (ie -lgmp5) so we don't want to
# add it in twice. Is that correct?
- release=""
- versuffix=""
- major=""
+ release=
+ versuffix=
+ major=
newdeplibs=
droppeddeps=no
case $deplibs_check_method in
@@ -7688,20 +9180,20 @@ EOF
-l*)
func_stripname -l '' "$i"
name=$func_stripname_result
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $i "*)
func_append newdeplibs " $i"
- i=""
+ i=
;;
esac
fi
- if test -n "$i" ; then
+ if test -n "$i"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
set dummy $deplib_matches; shift
deplib_match=$1
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
func_append newdeplibs " $i"
else
droppeddeps=yes
@@ -7731,20 +9223,20 @@ EOF
$opt_dry_run || $RM conftest
if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $i "*)
func_append newdeplibs " $i"
- i=""
+ i=
;;
esac
fi
- if test -n "$i" ; then
+ if test -n "$i"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
set dummy $deplib_matches; shift
deplib_match=$1
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
func_append newdeplibs " $i"
else
droppeddeps=yes
@@ -7781,24 +9273,24 @@ EOF
-l*)
func_stripname -l '' "$a_deplib"
name=$func_stripname_result
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $a_deplib "*)
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
;;
esac
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
if test -n "$file_magic_glob"; then
libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
else
libnameglob=$libname
fi
- test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
+ test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
- if test "$want_nocaseglob" = yes; then
+ if test yes = "$want_nocaseglob"; then
shopt -s nocaseglob
potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
$nocaseglob
@@ -7816,25 +9308,25 @@ EOF
# We might still enter an endless loop, since a link
# loop can be closed while we follow links,
# but so what?
- potlib="$potent_lib"
+ potlib=$potent_lib
while test -h "$potlib" 2>/dev/null; do
- potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+ potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
case $potliblink in
- [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
- *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+ [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
+ *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";;
esac
done
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
$SED -e 10q |
$EGREP "$file_magic_regex" > /dev/null; then
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
break 2
fi
done
done
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
droppeddeps=yes
echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
@@ -7842,7 +9334,7 @@ EOF
echo "*** you link to this library. But I can only do this if you have a"
echo "*** shared version of the library, which you do not appear to have"
echo "*** because I did check the linker path looking for a file starting"
- if test -z "$potlib" ; then
+ if test -z "$potlib"; then
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
else
$ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -7865,30 +9357,30 @@ EOF
-l*)
func_stripname -l '' "$a_deplib"
name=$func_stripname_result
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $a_deplib "*)
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
;;
esac
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
- potlib="$potent_lib" # see symlink-check above in file_magic test
+ potlib=$potent_lib # see symlink-check above in file_magic test
if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
$EGREP "$match_pattern_regex" > /dev/null; then
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
break 2
fi
done
done
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
droppeddeps=yes
echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
@@ -7896,7 +9388,7 @@ EOF
echo "*** you link to this library. But I can only do this if you have a"
echo "*** shared version of the library, which you do not appear to have"
echo "*** because I did check the linker path looking for a file starting"
- if test -z "$potlib" ; then
+ if test -z "$potlib"; then
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
else
$ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -7912,18 +9404,18 @@ EOF
done # Gone through all deplibs.
;;
none | unknown | *)
- newdeplibs=""
+ newdeplibs=
tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- for i in $predeps $postdeps ; do
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+ for i in $predeps $postdeps; do
# can't use Xsed below, because $i might contain '/'
- tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
done
fi
case $tmp_deplibs in
*[!\ \ ]*)
echo
- if test "X$deplibs_check_method" = "Xnone"; then
+ if test none = "$deplibs_check_method"; then
echo "*** Warning: inter-library dependencies are not supported in this platform."
else
echo "*** Warning: inter-library dependencies are not known to be supported."
@@ -7947,8 +9439,8 @@ EOF
;;
esac
- if test "$droppeddeps" = yes; then
- if test "$module" = yes; then
+ if test yes = "$droppeddeps"; then
+ if test yes = "$module"; then
echo
echo "*** Warning: libtool could not satisfy all declared inter-library"
$ECHO "*** dependencies of module $libname. Therefore, libtool will create"
@@ -7957,12 +9449,12 @@ EOF
if test -z "$global_symbol_pipe"; then
echo
echo "*** However, this would only work if libtool was able to extract symbol"
- echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
echo "*** not find such a program. So, this module is probably useless."
- echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ echo "*** 'nm' from GNU binutils and a full rebuild may help."
fi
- if test "$build_old_libs" = no; then
- oldlibs="$output_objdir/$libname.$libext"
+ if test no = "$build_old_libs"; then
+ oldlibs=$output_objdir/$libname.$libext
build_libtool_libs=module
build_old_libs=yes
else
@@ -7973,14 +9465,14 @@ EOF
echo "*** automatically added whenever a program is linked with this library"
echo "*** or is declared to -dlopen it."
- if test "$allow_undefined" = no; then
+ if test no = "$allow_undefined"; then
echo
echo "*** Since this library must not contain undefined symbols,"
echo "*** because either the platform does not support them or"
echo "*** it was explicitly requested with -no-undefined,"
echo "*** libtool will only create a static version of it."
- if test "$build_old_libs" = no; then
- oldlibs="$output_objdir/$libname.$libext"
+ if test no = "$build_old_libs"; then
+ oldlibs=$output_objdir/$libname.$libext
build_libtool_libs=module
build_old_libs=yes
else
@@ -8026,7 +9518,7 @@ EOF
*) func_append new_libs " $deplib" ;;
esac
done
- deplibs="$new_libs"
+ deplibs=$new_libs
# All the library-specific variables (install_libdir is set above).
library_names=
@@ -8034,25 +9526,25 @@ EOF
dlname=
# Test again, we may have decided not to build it any more
- if test "$build_libtool_libs" = yes; then
- # Remove ${wl} instances when linking with ld.
+ if test yes = "$build_libtool_libs"; then
+ # Remove $wl instances when linking with ld.
# FIXME: should test the right _cmds variable.
case $archive_cmds in
*\$LD\ *) wl= ;;
esac
- if test "$hardcode_into_libs" = yes; then
+ if test yes = "$hardcode_into_libs"; then
# Hardcode the library paths
hardcode_libdirs=
dep_rpath=
- rpath="$finalize_rpath"
- test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+ rpath=$finalize_rpath
+ test relink = "$opt_mode" || rpath=$compile_rpath$rpath
for libdir in $rpath; do
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
func_replace_sysroot "$libdir"
libdir=$func_replace_sysroot_result
if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
+ hardcode_libdirs=$libdir
else
# Just accumulate the unique libdirs.
case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8077,7 +9569,7 @@ EOF
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
+ libdir=$hardcode_libdirs
eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
fi
if test -n "$runpath_var" && test -n "$perm_rpath"; then
@@ -8091,8 +9583,8 @@ EOF
test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
fi
- shlibpath="$finalize_shlibpath"
- test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+ shlibpath=$finalize_shlibpath
+ test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
if test -n "$shlibpath"; then
eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
fi
@@ -8102,19 +9594,19 @@ EOF
eval library_names=\"$library_names_spec\"
set dummy $library_names
shift
- realname="$1"
+ realname=$1
shift
if test -n "$soname_spec"; then
eval soname=\"$soname_spec\"
else
- soname="$realname"
+ soname=$realname
fi
if test -z "$dlname"; then
dlname=$soname
fi
- lib="$output_objdir/$realname"
+ lib=$output_objdir/$realname
linknames=
for link
do
@@ -8128,7 +9620,7 @@ EOF
delfiles=
if test -n "$export_symbols" && test -n "$include_expsyms"; then
$opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
- export_symbols="$output_objdir/$libname.uexp"
+ export_symbols=$output_objdir/$libname.uexp
func_append delfiles " $export_symbols"
fi
@@ -8137,31 +9629,31 @@ EOF
cygwin* | mingw* | cegcc*)
if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
# exporting using user supplied symfile
- if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+ func_dll_def_p "$export_symbols" || {
# and it's NOT already a .def file. Must figure out
# which of the given symbols are data symbols and tag
# them as such. So, trigger use of export_symbols_cmds.
# export_symbols gets reassigned inside the "prepare
# the list of exported symbols" if statement, so the
# include_expsyms logic still works.
- orig_export_symbols="$export_symbols"
+ orig_export_symbols=$export_symbols
export_symbols=
always_export_symbols=yes
- fi
+ }
fi
;;
esac
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
- if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
- func_verbose "generating symbol list for \`$libname.la'"
- export_symbols="$output_objdir/$libname.exp"
+ if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
+ func_verbose "generating symbol list for '$libname.la'"
+ export_symbols=$output_objdir/$libname.exp
$opt_dry_run || $RM $export_symbols
cmds=$export_symbols_cmds
- save_ifs="$IFS"; IFS='~'
+ save_ifs=$IFS; IFS='~'
for cmd1 in $cmds; do
- IFS="$save_ifs"
+ IFS=$save_ifs
# Take the normal branch if the nm_file_list_spec branch
# doesn't work or if tool conversion is not needed.
case $nm_file_list_spec~$to_tool_file_cmd in
@@ -8175,7 +9667,7 @@ EOF
try_normal_branch=no
;;
esac
- if test "$try_normal_branch" = yes \
+ if test yes = "$try_normal_branch" \
&& { test "$len" -lt "$max_cmd_len" \
|| test "$max_cmd_len" -le -1; }
then
@@ -8186,7 +9678,7 @@ EOF
output_la=$func_basename_result
save_libobjs=$libobjs
save_output=$output
- output=${output_objdir}/${output_la}.nm
+ output=$output_objdir/$output_la.nm
func_to_tool_file "$output"
libobjs=$nm_file_list_spec$func_to_tool_file_result
func_append delfiles " $output"
@@ -8209,8 +9701,8 @@ EOF
break
fi
done
- IFS="$save_ifs"
- if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+ IFS=$save_ifs
+ if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
fi
@@ -8218,16 +9710,16 @@ EOF
fi
if test -n "$export_symbols" && test -n "$include_expsyms"; then
- tmp_export_symbols="$export_symbols"
- test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+ tmp_export_symbols=$export_symbols
+ test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
$opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
- if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+ if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
# The given exports_symbols file has to be filtered, so filter it.
- func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+ func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
# FIXME: $output_objdir/$libname.filter potentially contains lots of
- # 's' commands which not all seds can handle. GNU sed should be fine
+ # 's' commands, which not all seds can handle. GNU sed should be fine
# though. Also, the filter scales superlinearly with the number of
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
@@ -8246,11 +9738,11 @@ EOF
;;
esac
done
- deplibs="$tmp_deplibs"
+ deplibs=$tmp_deplibs
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec" &&
- test "$compiler_needs_object" = yes &&
+ test yes = "$compiler_needs_object" &&
test -z "$libobjs"; then
# extract the archives, so we have objects to list.
# TODO: could optimize this to just extract one archive.
@@ -8261,7 +9753,7 @@ EOF
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
test "X$libobjs" = "X " && libobjs=
else
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $convenience
@@ -8270,18 +9762,18 @@ EOF
fi
fi
- if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
func_append linker_flags " $flag"
fi
# Make a backup of the uninstalled library when relinking
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
fi
# Do each of the archive commands.
- if test "$module" = yes && test -n "$module_cmds" ; then
+ if test yes = "$module" && test -n "$module_cmds"; then
if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
eval test_cmds=\"$module_expsym_cmds\"
cmds=$module_expsym_cmds
@@ -8299,7 +9791,7 @@ EOF
fi
fi
- if test "X$skipped_export" != "X:" &&
+ if test : != "$skipped_export" &&
func_len " $test_cmds" &&
len=$func_len_result &&
test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
@@ -8332,8 +9824,8 @@ EOF
last_robj=
k=1
- if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
- output=${output_objdir}/${output_la}.lnkscript
+ if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
+ output=$output_objdir/$output_la.lnkscript
func_verbose "creating GNU ld script: $output"
echo 'INPUT (' > $output
for obj in $save_libobjs
@@ -8345,14 +9837,14 @@ EOF
func_append delfiles " $output"
func_to_tool_file "$output"
output=$func_to_tool_file_result
- elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
- output=${output_objdir}/${output_la}.lnk
+ elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
+ output=$output_objdir/$output_la.lnk
func_verbose "creating linker input file list: $output"
: > $output
set x $save_libobjs
shift
firstobj=
- if test "$compiler_needs_object" = yes; then
+ if test yes = "$compiler_needs_object"; then
firstobj="$1 "
shift
fi
@@ -8367,7 +9859,7 @@ EOF
else
if test -n "$save_libobjs"; then
func_verbose "creating reloadable object files..."
- output=$output_objdir/$output_la-${k}.$objext
+ output=$output_objdir/$output_la-$k.$objext
eval test_cmds=\"$reload_cmds\"
func_len " $test_cmds"
len0=$func_len_result
@@ -8379,13 +9871,13 @@ EOF
func_len " $obj"
func_arith $len + $func_len_result
len=$func_arith_result
- if test "X$objlist" = X ||
+ if test -z "$objlist" ||
test "$len" -lt "$max_cmd_len"; then
func_append objlist " $obj"
else
# The command $test_cmds is almost too long, add a
# command to the queue.
- if test "$k" -eq 1 ; then
+ if test 1 -eq "$k"; then
# The first file doesn't have a previous command to add.
reload_objs=$objlist
eval concat_cmds=\"$reload_cmds\"
@@ -8395,10 +9887,10 @@ EOF
reload_objs="$objlist $last_robj"
eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
fi
- last_robj=$output_objdir/$output_la-${k}.$objext
+ last_robj=$output_objdir/$output_la-$k.$objext
func_arith $k + 1
k=$func_arith_result
- output=$output_objdir/$output_la-${k}.$objext
+ output=$output_objdir/$output_la-$k.$objext
objlist=" $obj"
func_len " $last_robj"
func_arith $len0 + $func_len_result
@@ -8410,9 +9902,9 @@ EOF
# files will link in the last one created.
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
reload_objs="$objlist $last_robj"
- eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+ eval concat_cmds=\"\$concat_cmds$reload_cmds\"
if test -n "$last_robj"; then
- eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
fi
func_append delfiles " $output"
@@ -8420,9 +9912,9 @@ EOF
output=
fi
- if ${skipped_export-false}; then
- func_verbose "generating symbol list for \`$libname.la'"
- export_symbols="$output_objdir/$libname.exp"
+ ${skipped_export-false} && {
+ func_verbose "generating symbol list for '$libname.la'"
+ export_symbols=$output_objdir/$libname.exp
$opt_dry_run || $RM $export_symbols
libobjs=$output
# Append the command to create the export file.
@@ -8431,16 +9923,16 @@ EOF
if test -n "$last_robj"; then
eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
fi
- fi
+ }
test -n "$save_libobjs" &&
func_verbose "creating a temporary reloadable object file: $output"
# Loop through the commands generated above and execute them.
- save_ifs="$IFS"; IFS='~'
+ save_ifs=$IFS; IFS='~'
for cmd in $concat_cmds; do
- IFS="$save_ifs"
- $opt_silent || {
+ IFS=$save_ifs
+ $opt_quiet || {
func_quote_for_expand "$cmd"
eval "func_echo $func_quote_for_expand_result"
}
@@ -8448,7 +9940,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -8457,7 +9949,7 @@ EOF
exit $lt_exit
}
done
- IFS="$save_ifs"
+ IFS=$save_ifs
if test -n "$export_symbols_regex" && ${skipped_export-false}; then
func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
@@ -8465,18 +9957,18 @@ EOF
fi
fi
- if ${skipped_export-false}; then
+ ${skipped_export-false} && {
if test -n "$export_symbols" && test -n "$include_expsyms"; then
- tmp_export_symbols="$export_symbols"
- test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+ tmp_export_symbols=$export_symbols
+ test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
$opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
if test -n "$orig_export_symbols"; then
# The given exports_symbols file has to be filtered, so filter it.
- func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+ func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
# FIXME: $output_objdir/$libname.filter potentially contains lots of
- # 's' commands which not all seds can handle. GNU sed should be fine
+ # 's' commands, which not all seds can handle. GNU sed should be fine
# though. Also, the filter scales superlinearly with the number of
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
@@ -8485,7 +9977,7 @@ EOF
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
- fi
+ }
libobjs=$output
# Restore the value of output.
@@ -8499,7 +9991,7 @@ EOF
# value of $libobjs for piecewise linking.
# Do each of the archive commands.
- if test "$module" = yes && test -n "$module_cmds" ; then
+ if test yes = "$module" && test -n "$module_cmds"; then
if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
cmds=$module_expsym_cmds
else
@@ -8521,7 +10013,7 @@ EOF
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
@@ -8529,11 +10021,12 @@ EOF
test "X$libobjs" = "X " && libobjs=
fi
- save_ifs="$IFS"; IFS='~'
+ save_ifs=$IFS; IFS='~'
for cmd in $cmds; do
- IFS="$save_ifs"
+ IFS=$sp$nl
eval cmd=\"$cmd\"
- $opt_silent || {
+ IFS=$save_ifs
+ $opt_quiet || {
func_quote_for_expand "$cmd"
eval "func_echo $func_quote_for_expand_result"
}
@@ -8541,7 +10034,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -8550,10 +10043,10 @@ EOF
exit $lt_exit
}
done
- IFS="$save_ifs"
+ IFS=$save_ifs
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
if test -n "$convenience"; then
@@ -8573,39 +10066,39 @@ EOF
done
# If -module or -export-dynamic was specified, set the dlname.
- if test "$module" = yes || test "$export_dynamic" = yes; then
+ if test yes = "$module" || test yes = "$export_dynamic"; then
# On all known operating systems, these are identical.
- dlname="$soname"
+ dlname=$soname
fi
fi
;;
obj)
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- func_warning "\`-dlopen' is ignored for objects"
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+ func_warning "'-dlopen' is ignored for objects"
fi
case " $deplibs" in
*\ -l* | *\ -L*)
- func_warning "\`-l' and \`-L' are ignored for objects" ;;
+ func_warning "'-l' and '-L' are ignored for objects" ;;
esac
test -n "$rpath" && \
- func_warning "\`-rpath' is ignored for objects"
+ func_warning "'-rpath' is ignored for objects"
test -n "$xrpath" && \
- func_warning "\`-R' is ignored for objects"
+ func_warning "'-R' is ignored for objects"
test -n "$vinfo" && \
- func_warning "\`-version-info' is ignored for objects"
+ func_warning "'-version-info' is ignored for objects"
test -n "$release" && \
- func_warning "\`-release' is ignored for objects"
+ func_warning "'-release' is ignored for objects"
case $output in
*.lo)
test -n "$objs$old_deplibs" && \
- func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+ func_fatal_error "cannot build library object '$output' from non-libtool objects"
libobj=$output
func_lo2o "$libobj"
@@ -8613,7 +10106,7 @@ EOF
;;
*)
libobj=
- obj="$output"
+ obj=$output
;;
esac
@@ -8626,17 +10119,19 @@ EOF
# the extraction.
reload_conv_objs=
gentop=
- # reload_cmds runs $LD directly, so let us get rid of
- # -Wl from whole_archive_flag_spec and hope we can get by with
- # turning comma into space..
- wl=
-
+ # if reload_cmds runs $LD directly, get rid of -Wl from
+ # whole_archive_flag_spec and hope we can get by with turning comma
+ # into space.
+ case $reload_cmds in
+ *\$LD[\ \$]*) wl= ;;
+ esac
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
- reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+ test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+ reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
else
- gentop="$output_objdir/${obj}x"
+ gentop=$output_objdir/${obj}x
func_append generated " $gentop"
func_extract_archives $gentop $convenience
@@ -8645,12 +10140,12 @@ EOF
fi
# If we're not building shared, we need to use non_pic_objs
- test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+ test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
# Create the old-style object.
- reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
- output="$obj"
+ output=$obj
func_execute_cmds "$reload_cmds" 'exit $?'
# Exit if we aren't doing a library object file.
@@ -8662,7 +10157,7 @@ EOF
exit $EXIT_SUCCESS
fi
- if test "$build_libtool_libs" != yes; then
+ test yes = "$build_libtool_libs" || {
if test -n "$gentop"; then
func_show_eval '${RM}r "$gentop"'
fi
@@ -8672,12 +10167,12 @@ EOF
# $show "echo timestamp > $libobj"
# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
exit $EXIT_SUCCESS
- fi
+ }
- if test -n "$pic_flag" || test "$pic_mode" != default; then
+ if test -n "$pic_flag" || test default != "$pic_mode"; then
# Only do commands if we really have different PIC objects.
reload_objs="$libobjs $reload_conv_objs"
- output="$libobj"
+ output=$libobj
func_execute_cmds "$reload_cmds" 'exit $?'
fi
@@ -8694,16 +10189,14 @@ EOF
output=$func_stripname_result.exe;;
esac
test -n "$vinfo" && \
- func_warning "\`-version-info' is ignored for programs"
+ func_warning "'-version-info' is ignored for programs"
test -n "$release" && \
- func_warning "\`-release' is ignored for programs"
+ func_warning "'-release' is ignored for programs"
- test "$preload" = yes \
- && test "$dlopen_support" = unknown \
- && test "$dlopen_self" = unknown \
- && test "$dlopen_self_static" = unknown && \
- func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
+ $preload \
+ && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
+ && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support."
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
@@ -8717,11 +10210,11 @@ EOF
*-*-darwin*)
# Don't allow lazy linking, it breaks C++ global constructors
# But is supposedly fixed on 10.4 or later (yay!).
- if test "$tagname" = CXX ; then
+ if test CXX = "$tagname"; then
case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
10.[0123])
- func_append compile_command " ${wl}-bind_at_load"
- func_append finalize_command " ${wl}-bind_at_load"
+ func_append compile_command " $wl-bind_at_load"
+ func_append finalize_command " $wl-bind_at_load"
;;
esac
fi
@@ -8757,7 +10250,7 @@ EOF
*) func_append new_libs " $deplib" ;;
esac
done
- compile_deplibs="$new_libs"
+ compile_deplibs=$new_libs
func_append compile_command " $compile_deplibs"
@@ -8781,7 +10274,7 @@ EOF
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
+ hardcode_libdirs=$libdir
else
# Just accumulate the unique libdirs.
case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8804,7 +10297,7 @@ EOF
fi
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+ testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$libdir:"*) ;;
::) dllsearchpath=$libdir;;
@@ -8821,10 +10314,10 @@ EOF
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
+ libdir=$hardcode_libdirs
eval rpath=\" $hardcode_libdir_flag_spec\"
fi
- compile_rpath="$rpath"
+ compile_rpath=$rpath
rpath=
hardcode_libdirs=
@@ -8832,7 +10325,7 @@ EOF
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
+ hardcode_libdirs=$libdir
else
# Just accumulate the unique libdirs.
case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8857,45 +10350,43 @@ EOF
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
+ libdir=$hardcode_libdirs
eval rpath=\" $hardcode_libdir_flag_spec\"
fi
- finalize_rpath="$rpath"
+ finalize_rpath=$rpath
- if test -n "$libobjs" && test "$build_old_libs" = yes; then
+ if test -n "$libobjs" && test yes = "$build_old_libs"; then
# Transform all the library objects into standard objects.
compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
fi
- func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+ func_generate_dlsyms "$outputname" "@PROGRAM@" false
# template prelinking step
if test -n "$prelink_cmds"; then
func_execute_cmds "$prelink_cmds" 'exit $?'
fi
- wrappers_required=yes
+ wrappers_required=:
case $host in
*cegcc* | *mingw32ce*)
# Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
- wrappers_required=no
+ wrappers_required=false
;;
*cygwin* | *mingw* )
- if test "$build_libtool_libs" != yes; then
- wrappers_required=no
- fi
+ test yes = "$build_libtool_libs" || wrappers_required=false
;;
*)
- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
- wrappers_required=no
+ if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
+ wrappers_required=false
fi
;;
esac
- if test "$wrappers_required" = no; then
+ $wrappers_required || {
# Replace the output file specification.
compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
- link_command="$compile_command$compile_rpath"
+ link_command=$compile_command$compile_rpath
# We have no uninstalled library dependencies, so finalize right now.
exit_status=0
@@ -8908,12 +10399,12 @@ EOF
fi
# Delete the generated files.
- if test -f "$output_objdir/${outputname}S.${objext}"; then
- func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+ if test -f "$output_objdir/${outputname}S.$objext"; then
+ func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
fi
exit $exit_status
- fi
+ }
if test -n "$compile_shlibpath$finalize_shlibpath"; then
compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
@@ -8943,9 +10434,9 @@ EOF
fi
fi
- if test "$no_install" = yes; then
+ if test yes = "$no_install"; then
# We don't need to create a wrapper script.
- link_command="$compile_var$compile_command$compile_rpath"
+ link_command=$compile_var$compile_command$compile_rpath
# Replace the output file specification.
link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
# Delete the old output file.
@@ -8962,27 +10453,28 @@ EOF
exit $EXIT_SUCCESS
fi
- if test "$hardcode_action" = relink; then
- # Fast installation is not supported
- link_command="$compile_var$compile_command$compile_rpath"
- relink_command="$finalize_var$finalize_command$finalize_rpath"
+ case $hardcode_action,$fast_install in
+ relink,*)
+ # Fast installation is not supported
+ link_command=$compile_var$compile_command$compile_rpath
+ relink_command=$finalize_var$finalize_command$finalize_rpath
- func_warning "this platform does not like uninstalled shared libraries"
- func_warning "\`$output' will be relinked during installation"
- else
- if test "$fast_install" != no; then
- link_command="$finalize_var$compile_command$finalize_rpath"
- if test "$fast_install" = yes; then
- relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
- else
- # fast_install is set to needless
- relink_command=
- fi
- else
- link_command="$compile_var$compile_command$compile_rpath"
- relink_command="$finalize_var$finalize_command$finalize_rpath"
- fi
- fi
+ func_warning "this platform does not like uninstalled shared libraries"
+ func_warning "'$output' will be relinked during installation"
+ ;;
+ *,yes)
+ link_command=$finalize_var$compile_command$finalize_rpath
+ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+ ;;
+ *,no)
+ link_command=$compile_var$compile_command$compile_rpath
+ relink_command=$finalize_var$finalize_command$finalize_rpath
+ ;;
+ *,needless)
+ link_command=$finalize_var$compile_command$finalize_rpath
+ relink_command=
+ ;;
+ esac
# Replace the output file specification.
link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
@@ -9039,8 +10531,8 @@ EOF
func_dirname_and_basename "$output" "" "."
output_name=$func_basename_result
output_path=$func_dirname_result
- cwrappersource="$output_path/$objdir/lt-$output_name.c"
- cwrapper="$output_path/$output_name.exe"
+ cwrappersource=$output_path/$objdir/lt-$output_name.c
+ cwrapper=$output_path/$output_name.exe
$RM $cwrappersource $cwrapper
trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
@@ -9061,7 +10553,7 @@ EOF
trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
$opt_dry_run || {
# note: this script will not be executed, so do not chmod.
- if test "x$build" = "x$host" ; then
+ if test "x$build" = "x$host"; then
$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
else
func_emit_wrapper no > $func_ltwrapper_scriptname_result
@@ -9084,25 +10576,27 @@ EOF
# See if we need to build an old-fashioned archive.
for oldlib in $oldlibs; do
- if test "$build_libtool_libs" = convenience; then
- oldobjs="$libobjs_save $symfileobj"
- addlibs="$convenience"
- build_libtool_libs=no
- else
- if test "$build_libtool_libs" = module; then
- oldobjs="$libobjs_save"
+ case $build_libtool_libs in
+ convenience)
+ oldobjs="$libobjs_save $symfileobj"
+ addlibs=$convenience
build_libtool_libs=no
- else
+ ;;
+ module)
+ oldobjs=$libobjs_save
+ addlibs=$old_convenience
+ build_libtool_libs=no
+ ;;
+ *)
oldobjs="$old_deplibs $non_pic_objects"
- if test "$preload" = yes && test -f "$symfileobj"; then
- func_append oldobjs " $symfileobj"
- fi
- fi
- addlibs="$old_convenience"
- fi
+ $preload && test -f "$symfileobj" \
+ && func_append oldobjs " $symfileobj"
+ addlibs=$old_convenience
+ ;;
+ esac
if test -n "$addlibs"; then
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $addlibs
@@ -9110,13 +10604,13 @@ EOF
fi
# Do each command in the archive commands.
- if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+ if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
cmds=$old_archive_from_new_cmds
else
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
@@ -9137,7 +10631,7 @@ EOF
:
else
echo "copying selected object files to avoid basename conflicts..."
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_mkdir_p "$gentop"
save_oldobjs=$oldobjs
@@ -9146,7 +10640,7 @@ EOF
for obj in $save_oldobjs
do
func_basename "$obj"
- objbase="$func_basename_result"
+ objbase=$func_basename_result
case " $oldobjs " in
" ") oldobjs=$obj ;;
*[\ /]"$objbase "*)
@@ -9215,18 +10709,18 @@ EOF
else
# the above command should be used before it gets too long
oldobjs=$objlist
- if test "$obj" = "$last_oldobj" ; then
+ if test "$obj" = "$last_oldobj"; then
RANLIB=$save_RANLIB
fi
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
objlist=
len=$len0
fi
done
RANLIB=$save_RANLIB
oldobjs=$objlist
- if test "X$oldobjs" = "X" ; then
+ if test -z "$oldobjs"; then
eval cmds=\"\$concat_cmds\"
else
eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
@@ -9243,7 +10737,7 @@ EOF
case $output in
*.la)
old_library=
- test "$build_old_libs" = yes && old_library="$libname.$libext"
+ test yes = "$build_old_libs" && old_library=$libname.$libext
func_verbose "creating $output"
# Preserve any variables that may affect compiler behavior
@@ -9258,31 +10752,31 @@ EOF
fi
done
# Quote the link command for shipping.
- relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+ relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
- if test "$hardcode_automatic" = yes ; then
+ if test yes = "$hardcode_automatic"; then
relink_command=
fi
# Only create the output if not a dry run.
$opt_dry_run || {
for installed in no yes; do
- if test "$installed" = yes; then
+ if test yes = "$installed"; then
if test -z "$install_libdir"; then
break
fi
- output="$output_objdir/$outputname"i
+ output=$output_objdir/${outputname}i
# Replace all uninstalled libtool libraries with the installed ones
newdependency_libs=
for deplib in $dependency_libs; do
case $deplib in
*.la)
func_basename "$deplib"
- name="$func_basename_result"
+ name=$func_basename_result
func_resolve_sysroot "$deplib"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
test -z "$libdir" && \
- func_fatal_error "\`$deplib' is not a valid libtool archive"
+ func_fatal_error "'$deplib' is not a valid libtool archive"
func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
;;
-L*)
@@ -9298,23 +10792,23 @@ EOF
*) func_append newdependency_libs " $deplib" ;;
esac
done
- dependency_libs="$newdependency_libs"
+ dependency_libs=$newdependency_libs
newdlfiles=
for lib in $dlfiles; do
case $lib in
*.la)
func_basename "$lib"
- name="$func_basename_result"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ name=$func_basename_result
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
- func_fatal_error "\`$lib' is not a valid libtool archive"
+ func_fatal_error "'$lib' is not a valid libtool archive"
func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
;;
*) func_append newdlfiles " $lib" ;;
esac
done
- dlfiles="$newdlfiles"
+ dlfiles=$newdlfiles
newdlprefiles=
for lib in $dlprefiles; do
case $lib in
@@ -9324,34 +10818,34 @@ EOF
# didn't already link the preopened objects directly into
# the library:
func_basename "$lib"
- name="$func_basename_result"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ name=$func_basename_result
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
- func_fatal_error "\`$lib' is not a valid libtool archive"
+ func_fatal_error "'$lib' is not a valid libtool archive"
func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
;;
esac
done
- dlprefiles="$newdlprefiles"
+ dlprefiles=$newdlprefiles
else
newdlfiles=
for lib in $dlfiles; do
case $lib in
- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
*) abs=`pwd`"/$lib" ;;
esac
func_append newdlfiles " $abs"
done
- dlfiles="$newdlfiles"
+ dlfiles=$newdlfiles
newdlprefiles=
for lib in $dlprefiles; do
case $lib in
- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
*) abs=`pwd`"/$lib" ;;
esac
func_append newdlprefiles " $abs"
done
- dlprefiles="$newdlprefiles"
+ dlprefiles=$newdlprefiles
fi
$RM $output
# place dlname in correct position for cygwin
@@ -9367,10 +10861,9 @@ EOF
case $host,$output,$installed,$module,$dlname in
*cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
# If a -bindir argument was supplied, place the dll there.
- if test "x$bindir" != x ;
- then
+ if test -n "$bindir"; then
func_relative_path "$install_libdir" "$bindir"
- tdlname=$func_relative_path_result$dlname
+ tdlname=$func_relative_path_result/$dlname
else
# Otherwise fall back on heuristic.
tdlname=../bin/$dlname
@@ -9379,7 +10872,7 @@ EOF
esac
$ECHO > $output "\
# $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
@@ -9393,7 +10886,7 @@ library_names='$library_names'
# The name of the static archive.
old_library='$old_library'
-# Linker flags that can not go in dependency_libs.
+# Linker flags that cannot go in dependency_libs.
inherited_linker_flags='$new_inherited_linker_flags'
# Libraries that this one depends upon.
@@ -9419,7 +10912,7 @@ dlpreopen='$dlprefiles'
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
- if test "$installed" = no && test "$need_relink" = yes; then
+ if test no,yes = "$installed,$need_relink"; then
$ECHO >> $output "\
relink_command=\"$relink_command\""
fi
@@ -9434,27 +10927,29 @@ relink_command=\"$relink_command\""
exit $EXIT_SUCCESS
}
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
- func_mode_link ${1+"$@"}
+if test link = "$opt_mode" || test relink = "$opt_mode"; then
+ func_mode_link ${1+"$@"}
+fi
# func_mode_uninstall arg...
func_mode_uninstall ()
{
- $opt_debug
- RM="$nonopt"
+ $debug_cmd
+
+ RM=$nonopt
files=
- rmforce=
+ rmforce=false
exit_status=0
# This variable tells wrapper scripts just to set variables rather
# than running their programs.
- libtool_install_magic="$magic"
+ libtool_install_magic=$magic
for arg
do
case $arg in
- -f) func_append RM " $arg"; rmforce=yes ;;
+ -f) func_append RM " $arg"; rmforce=: ;;
-*) func_append RM " $arg" ;;
*) func_append files " $arg" ;;
esac
@@ -9467,18 +10962,18 @@ func_mode_uninstall ()
for file in $files; do
func_dirname "$file" "" "."
- dir="$func_dirname_result"
- if test "X$dir" = X.; then
- odir="$objdir"
+ dir=$func_dirname_result
+ if test . = "$dir"; then
+ odir=$objdir
else
- odir="$dir/$objdir"
+ odir=$dir/$objdir
fi
func_basename "$file"
- name="$func_basename_result"
- test "$opt_mode" = uninstall && odir="$dir"
+ name=$func_basename_result
+ test uninstall = "$opt_mode" && odir=$dir
# Remember odir for removal later, being careful to avoid duplicates
- if test "$opt_mode" = clean; then
+ if test clean = "$opt_mode"; then
case " $rmdirs " in
*" $odir "*) ;;
*) func_append rmdirs " $odir" ;;
@@ -9493,11 +10988,11 @@ func_mode_uninstall ()
elif test -d "$file"; then
exit_status=1
continue
- elif test "$rmforce" = yes; then
+ elif $rmforce; then
continue
fi
- rmfiles="$file"
+ rmfiles=$file
case $name in
*.la)
@@ -9511,7 +11006,7 @@ func_mode_uninstall ()
done
test -n "$old_library" && func_append rmfiles " $odir/$old_library"
- case "$opt_mode" in
+ case $opt_mode in
clean)
case " $library_names " in
*" $dlname "*) ;;
@@ -9522,12 +11017,12 @@ func_mode_uninstall ()
uninstall)
if test -n "$library_names"; then
# Do each command in the postuninstall commands.
- func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+ func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
fi
if test -n "$old_library"; then
# Do each command in the old_postuninstall commands.
- func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+ func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
fi
# FIXME: should reinstall the best remaining shared library.
;;
@@ -9543,21 +11038,19 @@ func_mode_uninstall ()
func_source $dir/$name
# Add PIC object to the list of files to remove.
- if test -n "$pic_object" &&
- test "$pic_object" != none; then
+ if test -n "$pic_object" && test none != "$pic_object"; then
func_append rmfiles " $dir/$pic_object"
fi
# Add non-PIC object to the list of files to remove.
- if test -n "$non_pic_object" &&
- test "$non_pic_object" != none; then
+ if test -n "$non_pic_object" && test none != "$non_pic_object"; then
func_append rmfiles " $dir/$non_pic_object"
fi
fi
;;
*)
- if test "$opt_mode" = clean ; then
+ if test clean = "$opt_mode"; then
noexename=$name
case $file in
*.exe)
@@ -9584,12 +11077,12 @@ func_mode_uninstall ()
# note $name still contains .exe if it was in $file originally
# as does the version of $file that was added into $rmfiles
- func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
- if test "$fast_install" = yes && test -n "$relink_command"; then
+ func_append rmfiles " $odir/$name $odir/${name}S.$objext"
+ if test yes = "$fast_install" && test -n "$relink_command"; then
func_append rmfiles " $odir/lt-$name"
fi
- if test "X$noexename" != "X$name" ; then
- func_append rmfiles " $odir/lt-${noexename}.c"
+ if test "X$noexename" != "X$name"; then
+ func_append rmfiles " $odir/lt-$noexename.c"
fi
fi
fi
@@ -9598,7 +11091,7 @@ func_mode_uninstall ()
func_show_eval "$RM $rmfiles" 'exit_status=1'
done
- # Try to remove the ${objdir}s in the directories where we deleted files
+ # Try to remove the $objdir's in the directories where we deleted files
for dir in $rmdirs; do
if test -d "$dir"; then
func_show_eval "rmdir $dir >/dev/null 2>&1"
@@ -9608,16 +11101,17 @@ func_mode_uninstall ()
exit $exit_status
}
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
- func_mode_uninstall ${1+"$@"}
+if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
+ func_mode_uninstall ${1+"$@"}
+fi
test -z "$opt_mode" && {
- help="$generic_help"
+ help=$generic_help
func_fatal_help "you must specify a MODE"
}
test -z "$exec_cmd" && \
- func_fatal_help "invalid operation mode \`$opt_mode'"
+ func_fatal_help "invalid operation mode '$opt_mode'"
if test -n "$exec_cmd"; then
eval exec "$exec_cmd"
@@ -9628,7 +11122,7 @@ exit $exit_status
# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries. Given conflicting
+# where we disable both kinds of libraries. Given conflicting
# choices, we go for a static library, that is the most portable,
# since we can't tell whether shared libraries were disabled because
# the user asked for that or because the platform doesn't support
@@ -9651,5 +11145,3 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
# mode:shell-script
# sh-indentation:2
# End:
-# vi:sw=2
-
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index f12cfdf..a644432 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1,8 +1,6 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is free software; the Free Software Foundation gives
@@ -10,36 +8,30 @@
# modifications, as long as this notice is preserved.
m4_define([_LT_COPYING], [dnl
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the same
+# distribution terms that you use for the rest of that program.
#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
])
-# serial 57 LT_INIT
+# serial 58 LT_INIT
# LT_PREREQ(VERSION)
@@ -67,7 +59,7 @@ esac
# LT_INIT([OPTIONS])
# ------------------
AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
AC_BEFORE([$0], [LT_LANG])dnl
AC_BEFORE([$0], [LT_OUTPUT])dnl
@@ -91,7 +83,7 @@ dnl Parse OPTIONS
_LT_SET_OPTIONS([$0], [$1])
# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS=$ltmain
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -111,26 +103,43 @@ dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+# _LT_PREPARE_CC_BASENAME
+# -----------------------
+m4_defun([_LT_PREPARE_CC_BASENAME], [
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+ for cc_temp in @S|@*""; do
+ case $cc_temp in
+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+ done
+ func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+])# _LT_PREPARE_CC_BASENAME
+
+
# _LT_CC_BASENAME(CC)
# -------------------
-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
+# but that macro is also expanded into generated libtool script, which
+# arranges for $SED and $ECHO to be set by different means.
m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
- case $cc_temp in
- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+[m4_require([_LT_PREPARE_CC_BASENAME])dnl
+AC_REQUIRE([_LT_DECL_SED])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+func_cc_basename $1
+cc_basename=$func_cc_basename_result
])
# _LT_FILEUTILS_DEFAULTS
# ----------------------
# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
m4_defun([_LT_FILEUTILS_DEFAULTS],
[: ${CP="cp -f"}
: ${MV="mv -f"}
@@ -177,15 +186,16 @@ m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
m4_require([_LT_CMD_OLD_ARCHIVE])dnl
m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
m4_require([_LT_WITH_SYSROOT])dnl
+m4_require([_LT_CMD_TRUNCATE])dnl
_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
+# See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
+if test -n "\${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
])
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
@@ -198,7 +208,7 @@ 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
+ if test set != "${COLLECT_NAMES+set}"; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -209,14 +219,14 @@ esac
ofile=libtool
can_build_shared=yes
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
# which needs '.lib').
libext=a
-with_gnu_ld="$lt_cv_prog_gnu_ld"
+with_gnu_ld=$lt_cv_prog_gnu_ld
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
+old_CC=$CC
+old_CFLAGS=$CFLAGS
# Set sane defaults for various variables
test -z "$CC" && CC=cc
@@ -269,14 +279,14 @@ no_glob_subst='s/\*/\\\*/g'
# _LT_PROG_LTMAIN
# ---------------
-# Note that this code is called both from `configure', and `config.status'
+# Note that this code is called both from 'configure', and 'config.status'
# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# 'config.status' has no value for ac_aux_dir unless we are using Automake,
# so we pass a copy along to make sure it has a sensible value anyway.
m4_defun([_LT_PROG_LTMAIN],
[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
])# _LT_PROG_LTMAIN
@@ -286,7 +296,7 @@ ltmain="$ac_aux_dir/ltmain.sh"
# So that we can recreate a full libtool script including additional
# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
+# in macros and then make a single call at the end using the 'libtool'
# label.
@@ -421,8 +431,8 @@ m4_define([_lt_decl_all_varnames],
# _LT_CONFIG_STATUS_DECLARE([VARNAME])
# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'. VARNAME
+# Quote a variable value, and forward it to 'config.status' so that its
+# declaration there will have the same value as in 'configure'. VARNAME
# must have a single quote delimited value for this to work.
m4_define([_LT_CONFIG_STATUS_DECLARE],
[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
@@ -446,7 +456,7 @@ m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
# Output comment and list of tags supported by the script
m4_defun([_LT_LIBTOOL_TAGS],
[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
+available_tags='_LT_TAGS'dnl
])
@@ -474,7 +484,7 @@ m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
# _LT_LIBTOOL_CONFIG_VARS
# -----------------------
# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
# script. Tagged libtool config variables (even for the LIBTOOL CONFIG
# section) are produced by _LT_LIBTOOL_TAG_VARS.
m4_defun([_LT_LIBTOOL_CONFIG_VARS],
@@ -500,8 +510,8 @@ m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
# variables for single and double quote escaping we saved from calls
# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'. Finally, any additional code accumulated
+# into 'config.status', and then the shell code to quote escape them in
+# for loops in 'config.status'. Finally, any additional code accumulated
# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
m4_defun([_LT_CONFIG_COMMANDS],
[AC_PROVIDE_IFELSE([LT_OUTPUT],
@@ -547,7 +557,7 @@ for var in lt_decl_all_varnames([[ \
]], lt_decl_quote_varnames); do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -560,7 +570,7 @@ for var in lt_decl_all_varnames([[ \
]], lt_decl_dquote_varnames); do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -576,7 +586,7 @@ _LT_OUTPUT_LIBTOOL_INIT
# Generate a child script FILE with all initialization necessary to
# reuse the environment learned by the parent script, and make the
# file executable. If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins. After this
+# '#!' sequence but before initialization text begins. After this
# macro, additional text can be appended to FILE to form the body of
# the child script. The macro ends with non-zero status if the
# file could not be fully written (such as if the disk is full).
@@ -598,7 +608,7 @@ AS_SHELL_SANITIZE
_AS_PREPARE
exec AS_MESSAGE_FD>&1
_ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
+test 0 = "$lt_write_fail" && chmod +x $1[]dnl
m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
# LT_OUTPUT
@@ -621,7 +631,7 @@ exec AS_MESSAGE_LOG_FD>>config.log
} >&AS_MESSAGE_LOG_FD
lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
+'$as_me' creates a local libtool stub from the current configuration,
for use in further configure time tests before the real libtool is
generated.
@@ -643,7 +653,7 @@ Copyright (C) 2011 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
-while test $[#] != 0
+while test 0 != $[#]
do
case $[1] in
--version | --v* | -V )
@@ -656,10 +666,10 @@ do
lt_cl_silent=: ;;
-*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
+Try '$[0] --help' for more information.]) ;;
*) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
+Try '$[0] --help' for more information.]) ;;
esac
shift
done
@@ -685,7 +695,7 @@ chmod +x "$CONFIG_LT"
# open by configure. Here we exec the FD to /dev/null, effectively closing
# config.log, so it can be properly (re)opened and appended to by config.lt.
lt_cl_success=:
-test "$silent" = yes &&
+test yes = "$silent" &&
lt_config_lt_args="$lt_config_lt_args --quiet"
exec AS_MESSAGE_LOG_FD>/dev/null
$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
@@ -705,27 +715,31 @@ m4_defun([_LT_CONFIG],
_LT_CONFIG_SAVE_COMMANDS([
m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
m4_if(_LT_TAG, [C], [
- # See if we are running on zsh, and set the options which allow our
+ # See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
+ if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
- cfgfile="${ofile}T"
+ cfgfile=${ofile}T
trap "$RM \"$cfgfile\"; exit 1" 1 2 15
$RM "$cfgfile"
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Generated automatically by $as_me ($PACKAGE) $VERSION
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
_LT_COPYING
_LT_LIBTOOL_TAGS
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
# ### BEGIN LIBTOOL CONFIG
_LT_LIBTOOL_CONFIG_VARS
_LT_LIBTOOL_TAG_VARS
@@ -733,13 +747,24 @@ _LT_LIBTOOL_TAG_VARS
_LT_EOF
+ cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_PREPARE_MUNGE_PATH_LIST
+_LT_PREPARE_CC_BASENAME
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
case $host_os in
aix3*)
cat <<\_LT_EOF >> "$cfgfile"
# 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
+if test set != "${COLLECT_NAMES+set}"; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -756,8 +781,6 @@ _LT_EOF
sed '$q' "$ltmain" >> "$cfgfile" \
|| (rm -f "$cfgfile"; exit 1)
- _LT_PROG_REPLACE_SHELLFNS
-
mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
@@ -775,7 +798,6 @@ _LT_EOF
[m4_if([$1], [], [
PACKAGE='$PACKAGE'
VERSION='$VERSION'
- TIMESTAMP='$TIMESTAMP'
RM='$RM'
ofile='$ofile'], [])
])dnl /_LT_CONFIG_SAVE_COMMANDS
@@ -974,7 +996,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
[lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
+ if test -z "$LT_MULTI_MODULE"; then
# By default we will add the -single_module flag. You can override
# by either setting the environment variable LT_MULTI_MODULE
# non-empty at configure time, or by adding -multi_module to the
@@ -992,7 +1014,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
cat conftest.err >&AS_MESSAGE_LOG_FD
# Otherwise, if the output was created with a 0 exit code from
# the compiler, it worked.
- elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+ elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
lt_cv_apple_cc_single_mod=yes
else
cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1010,7 +1032,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
[lt_cv_ld_exported_symbols_list=yes],
[lt_cv_ld_exported_symbols_list=no])
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
])
AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
@@ -1032,7 +1054,7 @@ _LT_EOF
_lt_result=$?
if test -s conftest.err && $GREP force_load conftest.err; then
cat conftest.err >&AS_MESSAGE_LOG_FD
- elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+ elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
lt_cv_ld_force_load=yes
else
cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1042,32 +1064,32 @@ _LT_EOF
])
case $host_os in
rhapsody* | darwin1.[[012]])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
darwin*) # darwin 5.x on
# if running on 10.5 or later, the deployment target defaults
# to the OS version, if on x86, and 10.4, the deployment
# target defaults to 10.4. Don't you love it?
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- 10.[[012]]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+ 10.[[012]][[,.]]*)
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
esac
;;
esac
- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ if test yes = "$lt_cv_apple_cc_single_mod"; then
_lt_dar_single_mod='$single_module'
fi
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ if test yes = "$lt_cv_ld_exported_symbols_list"; then
+ _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
else
- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
fi
- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+ if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -1087,29 +1109,29 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- if test "$lt_cv_ld_force_load" = "yes"; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ if test yes = "$lt_cv_ld_force_load"; then
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
[FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
else
_LT_TAGVAR(whole_archive_flag_spec, $1)=''
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+ _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
+ ifort*|nagfor*) _lt_dar_can_shared=yes ;;
*) _lt_dar_can_shared=$GCC ;;
esac
- if test "$_lt_dar_can_shared" = "yes"; then
+ if test yes = "$_lt_dar_can_shared"; then
output_verbose_link_cmd=func_echo_all
- _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
m4_if([$1], [CXX],
-[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
- _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+[ if test yes != "$lt_cv_apple_cc_single_mod"; then
+ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
fi
],[])
else
@@ -1129,7 +1151,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
# Allow to override them for all tags through lt_cv_aix_libpath.
m4_defun([_LT_SYS_MODULE_PATH_AIX],
[m4_require([_LT_DECL_SED])dnl
-if test "${lt_cv_aix_libpath+set}" = set; then
+if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
@@ -1147,7 +1169,7 @@ else
_LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi],[])
if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib
fi
])
aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
@@ -1167,8 +1189,8 @@ m4_define([_LT_SHELL_INIT],
# -----------------------
# Find how we can fake an echo command that does not interpret backslash.
# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
+# of the generated configure script that will find a shell with a builtin
+# printf (that we can use as an echo command).
m4_defun([_LT_PROG_ECHO_BACKSLASH],
[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
@@ -1196,10 +1218,10 @@ fi
# Invoke $ECHO with all args, space-separated.
func_echo_all ()
{
- $ECHO "$*"
+ $ECHO "$*"
}
-case "$ECHO" in
+case $ECHO in
printf*) AC_MSG_RESULT([printf]) ;;
print*) AC_MSG_RESULT([print -r]) ;;
*) AC_MSG_RESULT([cat]) ;;
@@ -1225,16 +1247,17 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
AC_DEFUN([_LT_WITH_SYSROOT],
[AC_MSG_CHECKING([for sysroot])
AC_ARG_WITH([sysroot],
-[ --with-sysroot[=DIR] Search for dependent libraries within DIR
- (or the compiler's sysroot if not specified).],
+[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
+ [Search for dependent libraries within DIR (or the compiler's sysroot
+ if not specified).])],
[], [with_sysroot=no])
dnl lt_sysroot will always be passed unquoted. We quote it here
dnl in case the user passed a directory name.
lt_sysroot=
-case ${with_sysroot} in #(
+case $with_sysroot in #(
yes)
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
fi
;; #(
@@ -1244,14 +1267,14 @@ case ${with_sysroot} in #(
no|'')
;; #(
*)
- AC_MSG_RESULT([${with_sysroot}])
+ AC_MSG_RESULT([$with_sysroot])
AC_MSG_ERROR([The sysroot must be an absolute path.])
;;
esac
AC_MSG_RESULT([${lt_sysroot:-no}])
_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and in which our libraries should be installed.])])
+[dependent libraries, and where our libraries should be installed.])])
# _LT_ENABLE_LOCK
# ---------------
@@ -1259,31 +1282,33 @@ m4_defun([_LT_ENABLE_LOCK],
[AC_ARG_ENABLE([libtool-lock],
[AS_HELP_STRING([--disable-libtool-lock],
[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+test no = "$enable_libtool_lock" || 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.
+ # Find out what ABI is being produced by ac_compile, and set mode
+ # options accordingly.
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"
+ HPUX_IA64_MODE=32
;;
*ELF-64*)
- HPUX_IA64_MODE="64"
+ HPUX_IA64_MODE=64
;;
esac
fi
rm -rf conftest*
;;
*-*-irix6*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
LD="${LD-ld} -melf32bsmip"
@@ -1312,9 +1337,46 @@ ia64-*-hpux*)
rm -rf conftest*
;;
+mips64*-*linux*)
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ emul=elf
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ emul="${emul}32"
+ ;;
+ *64-bit*)
+ emul="${emul}64"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *MSB*)
+ emul="${emul}btsmip"
+ ;;
+ *LSB*)
+ emul="${emul}ltsmip"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *N32*)
+ emul="${emul}n32"
+ ;;
+ esac
+ LD="${LD-ld} -m $emul"
+ fi
+ rm -rf conftest*
+ ;;
+
x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly. Note that the listed cases only cover the
+ # situations where additional linker options are needed (such as when
+ # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+ # vice versa); the common cases where no linker options are needed do
+ # not appear in the list.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.o` in
@@ -1324,7 +1386,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
+ case `/usr/bin/file conftest.o` in
+ *x86-64*)
+ LD="${LD-ld} -m elf32_x86_64"
+ ;;
+ *)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ esac
;;
powerpc64le-*linux*)
LD="${LD-ld} -m elf32lppclinux"
@@ -1369,19 +1438,20 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
*-*-sco3.2v5*)
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
+ 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_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[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
+ if test yes != "$lt_cv_cc_needs_belf"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
+ CFLAGS=$SAVE_CFLAGS
fi
;;
*-*solaris*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.o` in
@@ -1389,7 +1459,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
case $lt_cv_prog_gnu_ld in
yes*)
case $host in
- i?86-*-solaris*)
+ i?86-*-solaris*|x86_64-*-solaris*)
LD="${LD-ld} -m elf_x86_64"
;;
sparc*-*-solaris*)
@@ -1398,7 +1468,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
esac
# GNU ld 2.21 introduced _sol2 emulations. Use them if available.
if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
- LD="${LD-ld}_sol2"
+ LD=${LD-ld}_sol2
fi
;;
*)
@@ -1414,7 +1484,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
;;
esac
-need_locks="$enable_libtool_lock"
+need_locks=$enable_libtool_lock
])# _LT_ENABLE_LOCK
@@ -1433,11 +1503,11 @@ AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
[echo conftest.$ac_objext > conftest.lst
lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
AC_TRY_EVAL([lt_ar_try])
- if test "$ac_status" -eq 0; then
+ if test 0 -eq "$ac_status"; then
# Ensure the archiver fails upon bogus file names.
rm -f conftest.$ac_objext libconftest.a
AC_TRY_EVAL([lt_ar_try])
- if test "$ac_status" -ne 0; then
+ if test 0 -ne "$ac_status"; then
lt_cv_ar_at_file=@
fi
fi
@@ -1445,7 +1515,7 @@ AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
])
])
-if test "x$lt_cv_ar_at_file" = xno; then
+if test no = "$lt_cv_ar_at_file"; then
archiver_list_spec=
else
archiver_list_spec=$lt_cv_ar_at_file
@@ -1476,7 +1546,7 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
case $host_os in
- openbsd*)
+ bitrig* | openbsd*)
old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
;;
*)
@@ -1512,7 +1582,7 @@ AC_CACHE_CHECK([$1], [$2],
[$2=no
m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$3"
+ lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment
# 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
@@ -1539,7 +1609,7 @@ AC_CACHE_CHECK([$1], [$2],
$RM conftest*
])
-if test x"[$]$2" = xyes; then
+if test yes = "[$]$2"; then
m4_if([$5], , :, [$5])
else
m4_if([$6], , :, [$6])
@@ -1561,7 +1631,7 @@ AC_DEFUN([_LT_LINKER_OPTION],
m4_require([_LT_DECL_SED])dnl
AC_CACHE_CHECK([$1], [$2],
[$2=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $3"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -1580,10 +1650,10 @@ AC_CACHE_CHECK([$1], [$2],
fi
fi
$RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
])
-if test x"[$]$2" = xyes; then
+if test yes = "[$]$2"; then
m4_if([$4], , :, [$4])
else
m4_if([$5], , :, [$5])
@@ -1604,7 +1674,7 @@ AC_DEFUN([LT_CMD_MAX_LEN],
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
- teststring="ABCD"
+ teststring=ABCD
case $build_os in
msdosdjgpp*)
@@ -1644,7 +1714,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
lt_cv_sys_max_cmd_len=8192;
;;
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
# This has been around since 386BSD, at least. Likely further.
if test -x /sbin/sysctl; then
lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -1694,22 +1764,23 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len" && \
+ test undefined != "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
# Make teststring a little bigger before we do anything with it.
# a 1K string should be a reasonable start.
- for i in 1 2 3 4 5 6 7 8 ; do
+ for i in 1 2 3 4 5 6 7 8; do
teststring=$teststring$teststring
done
SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
# 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"`env echo "$teststring$teststring" 2>/dev/null` \
+ while { test X`env echo "$teststring$teststring" 2>/dev/null` \
= "X$teststring$teststring"; } >/dev/null 2>&1 &&
- test $i != 17 # 1/2 MB should be enough
+ test 17 != "$i" # 1/2 MB should be enough
do
i=`expr $i + 1`
teststring=$teststring$teststring
@@ -1725,7 +1796,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
;;
esac
])
-if test -n $lt_cv_sys_max_cmd_len ; then
+if test -n "$lt_cv_sys_max_cmd_len"; then
AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
else
AC_MSG_RESULT(none)
@@ -1753,7 +1824,7 @@ m4_defun([_LT_HEADER_DLFCN],
# ----------------------------------------------------------------
m4_defun([_LT_TRY_DLOPEN_SELF],
[m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
+if test yes = "$cross_compiling"; then :
[$4]
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -1800,9 +1871,9 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
#endif
@@ -1828,7 +1899,7 @@ int main ()
return status;
}]
_LT_EOF
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+ if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
(./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -1849,7 +1920,7 @@ rm -fr conftest*
# ------------------
AC_DEFUN([LT_SYS_DLOPEN_SELF],
[m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
+if test yes != "$enable_dlopen"; then
enable_dlopen=unknown
enable_dlopen_self=unknown
enable_dlopen_self_static=unknown
@@ -1859,44 +1930,52 @@ else
case $host_os in
beos*)
- lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen=load_add_on
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
;;
mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen=LoadLibrary
lt_cv_dlopen_libs=
;;
cygwin*)
- lt_cv_dlopen="dlopen"
+ lt_cv_dlopen=dlopen
lt_cv_dlopen_libs=
;;
darwin*)
- # if libdl is installed we need to link against it
+ # 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=dlopen lt_cv_dlopen_libs=-ldl],[
+ lt_cv_dlopen=dyld
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
])
;;
+ tpf*)
+ # Don't try to run any link tests for TPF. We know it's impossible
+ # because TPF is a cross-compiler, and we know how we open DSOs.
+ lt_cv_dlopen=dlopen
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=no
+ ;;
+
*)
AC_CHECK_FUNC([shl_load],
- [lt_cv_dlopen="shl_load"],
+ [lt_cv_dlopen=shl_load],
[AC_CHECK_LIB([dld], [shl_load],
- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+ [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
[AC_CHECK_FUNC([dlopen],
- [lt_cv_dlopen="dlopen"],
+ [lt_cv_dlopen=dlopen],
[AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
[AC_CHECK_LIB([svld], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
[AC_CHECK_LIB([dld], [dld_link],
- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+ [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
])
])
])
@@ -1905,21 +1984,21 @@ else
;;
esac
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
+ if test no = "$lt_cv_dlopen"; then
enable_dlopen=no
+ else
+ enable_dlopen=yes
fi
case $lt_cv_dlopen in
dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ save_CPPFLAGS=$CPPFLAGS
+ test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
- save_LIBS="$LIBS"
+ save_LIBS=$LIBS
LIBS="$lt_cv_dlopen_libs $LIBS"
AC_CACHE_CHECK([whether a program can dlopen itself],
@@ -1929,7 +2008,7 @@ else
lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
])
- if test "x$lt_cv_dlopen_self" = xyes; then
+ if test yes = "$lt_cv_dlopen_self"; then
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
lt_cv_dlopen_self_static, [dnl
@@ -1939,9 +2018,9 @@ else
])
fi
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
+ CPPFLAGS=$save_CPPFLAGS
+ LDFLAGS=$save_LDFLAGS
+ LIBS=$save_LIBS
;;
esac
@@ -2033,8 +2112,8 @@ m4_defun([_LT_COMPILER_FILE_LOCKS],
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
_LT_COMPILER_C_O([$1])
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; 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
@@ -2044,8 +2123,8 @@ if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" !=
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])
+ if test no = "$hard_links"; then
+ AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
need_locks=warn
fi
else
@@ -2072,8 +2151,8 @@ objdir=$lt_cv_objdir
_LT_DECL([], [objdir], [0],
[The name of the directory that contains temporary libtool files])dnl
m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
- [Define to the sub-directory in which libtool stores uninstalled libraries.])
+AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
+ [Define to the sub-directory where libtool stores uninstalled libraries.])
])# _LT_CHECK_OBJDIR
@@ -2085,15 +2164,15 @@ m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
_LT_TAGVAR(hardcode_action, $1)=
if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
test -n "$_LT_TAGVAR(runpath_var, $1)" ||
- test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+ test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
# We can hardcode non-existent directories.
- if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+ if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
# 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_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
- test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
+ test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
# Linking always hardcodes the temporary library directory.
_LT_TAGVAR(hardcode_action, $1)=relink
else
@@ -2107,12 +2186,12 @@ else
fi
AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
- test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
+ test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
# Fast installation is not supported
enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+ test no = "$enable_shared"; then
# Fast installation is not necessary
enable_fast_install=needless
fi
@@ -2136,7 +2215,7 @@ else
# FIXME - insert some real tests, host_os isn't really good enough
case $host_os in
darwin*)
- if test -n "$STRIP" ; then
+ if test -n "$STRIP"; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
AC_MSG_RESULT([yes])
@@ -2154,6 +2233,47 @@ _LT_DECL([], [striplib], [1])
])# _LT_CMD_STRIPLIB
+# _LT_PREPARE_MUNGE_PATH_LIST
+# ---------------------------
+# Make sure func_munge_path_list() is defined correctly.
+m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
+[[# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+# string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+# string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+# "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+# VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+ case x at S|@2 in
+ x)
+ ;;
+ *:)
+ eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+ ;;
+ x:*)
+ eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+ ;;
+ *::*)
+ eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+ eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+ ;;
+ *)
+ eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+ ;;
+ esac
+}
+]])# _LT_PREPARE_PATH_LIST
+
+
# _LT_SYS_DYNAMIC_LINKER([TAG])
# -----------------------------
# PORTME Fill in your ld.so characteristics
@@ -2164,17 +2284,18 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_OBJDUMP])dnl
m4_require([_LT_DECL_SED])dnl
m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
AC_MSG_CHECKING([dynamic linker characteristics])
m4_if([$1],
[], [
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $host_os in
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
- *) lt_awk_arg="/^libraries:/" ;;
+ darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+ *) lt_awk_arg='/^libraries:/' ;;
esac
case $host_os in
- mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
- *) lt_sed_strip_eq="s,=/,/,g" ;;
+ mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
+ *) lt_sed_strip_eq='s|=/|/|g' ;;
esac
lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
case $lt_search_path_spec in
@@ -2190,28 +2311,35 @@ if test "$GCC" = yes; then
;;
esac
# Ok, now we have the path, separated by spaces, we can step through it
- # and add multilib dir if necessary.
+ # and add multilib dir if necessary...
lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ # ...but if some path component already ends with the multilib dir we assume
+ # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+ case "$lt_multi_os_dir; $lt_search_path_spec " in
+ "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+ lt_multi_os_dir=
+ ;;
+ esac
for lt_sys_path in $lt_search_path_spec; do
- if test -d "$lt_sys_path/$lt_multi_os_dir"; then
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
- else
+ if test -d "$lt_sys_path$lt_multi_os_dir"; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+ elif test -n "$lt_multi_os_dir"; then
test -d "$lt_sys_path" && \
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
- lt_foo="";
- lt_count=0;
+BEGIN {RS = " "; FS = "/|\n";} {
+ lt_foo = "";
+ lt_count = 0;
for (lt_i = NF; lt_i > 0; lt_i--) {
if ($lt_i != "" && $lt_i != ".") {
if ($lt_i == "..") {
lt_count++;
} else {
if (lt_count == 0) {
- lt_foo="/" $lt_i lt_foo;
+ lt_foo = "/" $lt_i lt_foo;
} else {
lt_count--;
}
@@ -2225,7 +2353,7 @@ BEGIN {RS=" "; FS="/|\n";} {
# for these hosts.
case $host_os in
mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
- $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+ $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
esac
sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
else
@@ -2234,7 +2362,7 @@ fi])
library_names_spec=
libname_spec='lib$name'
soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
@@ -2251,14 +2379,17 @@ hardcode_into_libs=no
# flags to be left without arguments
need_version=unknown
+AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
+[User-defined run-time library search path.])
+
case $host_os in
aix3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
shlibpath_var=LIBPATH
# AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
+ soname_spec='$libname$release$shared_ext$major'
;;
aix[[4-9]]*)
@@ -2266,41 +2397,91 @@ aix[[4-9]]*)
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
else
# With GCC up to 2.95.x, collect2 would create an import file
# for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
+ # the line '#! .'. This would cause the generated library to
+ # depend on '.', always an invalid library. This was fixed in
# development snapshots of GCC prior to 3.0.
case $host_os in
aix4 | aix4.[[01]] | aix4.[[01]].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
:
else
can_build_shared=no
fi
;;
esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
+ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a[(]lib.so.V[)]'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -2310,18 +2491,18 @@ amigaos*)
powerpc)
# Since July 2007 AmigaOS4 officially supports .so libraries.
# When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
;;
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
;;
esac
;;
beos*)
- library_names_spec='${libname}${shared_ext}'
+ library_names_spec='$libname$shared_ext'
dynamic_linker="$host_os ld.so"
shlibpath_var=LIBRARY_PATH
;;
@@ -2329,8 +2510,8 @@ beos*)
bsdi[[45]]*)
version_type=linux # correct to gnu/linux during the next big refactor
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -2342,7 +2523,7 @@ bsdi[[45]]*)
cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
- shrext_cmds=".dll"
+ shrext_cmds=.dll
need_version=no
need_lib_prefix=no
@@ -2351,8 +2532,8 @@ cygwin* | mingw* | pw32* | cegcc*)
# gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname~
@@ -2368,17 +2549,17 @@ cygwin* | mingw* | pw32* | cegcc*)
case $host_os in
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
m4_if([$1], [],[
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
;;
esac
dynamic_linker='Win32 ld.exe'
@@ -2387,8 +2568,8 @@ m4_if([$1], [],[
*,cl*)
# Native MSVC
libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
+ soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+ library_names_spec='$libname.dll.lib'
case $build_os in
mingw*)
@@ -2415,7 +2596,7 @@ m4_if([$1], [],[
sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
;;
*)
- sys_lib_search_path_spec="$LIB"
+ sys_lib_search_path_spec=$LIB
if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
# It is most probably a Windows format PATH.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -2428,8 +2609,8 @@ m4_if([$1], [],[
esac
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname'
@@ -2442,7 +2623,7 @@ m4_if([$1], [],[
*)
# Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
dynamic_linker='Win32 ld.exe'
;;
esac
@@ -2455,8 +2636,8 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$major$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -2469,8 +2650,8 @@ dgux*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -2488,12 +2669,13 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
need_version=no
need_lib_prefix=no
;;
freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
need_version=yes
;;
esac
@@ -2518,26 +2700,15 @@ freebsd* | dragonfly*)
esac
;;
-gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
dynamic_linker="$host_os runtime_loader"
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
+ shlibpath_overrides_runpath=no
sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
hardcode_into_libs=yes
;;
@@ -2555,14 +2726,15 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ if test 32 = "$HPUX_IA64_MODE"; then
sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux32
else
sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux64
fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
shrext_cmds='.sl'
@@ -2570,8 +2742,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
@@ -2580,8 +2752,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
;;
esac
# HP-UX runs *really* slowly unless shared libraries are mode 555, ...
@@ -2594,8 +2766,8 @@ interix[[3-9]]*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -2606,7 +2778,7 @@ irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
*)
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
version_type=linux # correct to gnu/linux during the next big refactor
else
version_type=irix
@@ -2614,8 +2786,8 @@ irix5* | irix6* | nonstopux*)
esac
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
case $host_os in
irix5* | nonstopux*)
libsuff= shlibsuff=
@@ -2634,8 +2806,8 @@ irix5* | irix6* | nonstopux*)
esac
shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+ sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
hardcode_into_libs=yes
;;
@@ -2644,13 +2816,33 @@ linux*oldld* | linux*aout* | linux*coff*)
dynamic_linker=no
;;
+linux*android*)
+ version_type=none # Android doesn't support versioned libraries.
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext'
+ soname_spec='$libname$release$shared_ext'
+ finish_cmds=
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+ dynamic_linker='Android linker'
+ # Don't embed -rpath directories since the linker doesn't support them.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ ;;
+
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -2678,11 +2870,15 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
# Add ABI-specific directories to the system library path.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
- # Append ld.so.conf contents to the search path
+ # Ideally, we could use ldconfig to report *all* directores which are
+ # searched for libraries, however this is still not possible. Aside from not
+ # being certain /sbin/ldconfig is available, command
+ # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+ # even though it is searched at run-time. Try to do the best guess by
+ # appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2699,12 +2895,12 @@ netbsd*)
need_lib_prefix=no
need_version=no
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='NetBSD ld.elf_so'
fi
shlibpath_var=LD_LIBRARY_PATH
@@ -2714,7 +2910,7 @@ netbsd*)
newsos6)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
;;
@@ -2723,58 +2919,68 @@ newsos6)
version_type=qnx
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='ldqnx.so'
;;
-openbsd*)
+openbsd* | bitrig*)
version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib
need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[[89]] | openbsd2.[[89]].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ need_version=no
else
- shlibpath_overrides_runpath=yes
+ need_version=yes
fi
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
;;
os2*)
libname_spec='$name'
- shrext_cmds=".dll"
+ version_type=windows
+ shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
osf3* | osf4* | osf5*)
version_type=osf
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
rdos*)
@@ -2785,8 +2991,8 @@ solaris*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
@@ -2796,11 +3002,11 @@ solaris*)
sunos4*)
version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
need_lib_prefix=no
fi
need_version=yes
@@ -2808,8 +3014,8 @@ sunos4*)
sysv4 | sysv4.3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
case $host_vendor in
sni)
@@ -2830,24 +3036,24 @@ sysv4 | sysv4.3*)
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
+ library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+ soname_spec='$libname$shared_ext.$major'
shlibpath_var=LD_LIBRARY_PATH
fi
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
else
sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -2865,7 +3071,7 @@ tpf*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -2873,8 +3079,8 @@ tpf*)
uts4*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -2883,20 +3089,30 @@ uts4*)
;;
esac
AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
_LT_DECL([], [variables_saved_for_relink], [1],
[Variables whose values should be saved in libtool wrapper scripts and
restored at link time])
@@ -2929,39 +3145,41 @@ _LT_DECL([], [hardcode_into_libs], [0],
[Whether we should hardcode library paths into libraries])
_LT_DECL([], [sys_lib_search_path_spec], [2],
[Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
- [Run-time system search path for libraries])
+_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
+ [Detected run-time system search path for libraries])
+_LT_DECL([], [configure_time_lt_sys_library_path], [2],
+ [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
])# _LT_SYS_DYNAMIC_LINKER
# _LT_PATH_TOOL_PREFIX(TOOL)
# --------------------------
-# find a file program which can recognize shared library
+# find a file program that can recognize shared library
AC_DEFUN([_LT_PATH_TOOL_PREFIX],
[m4_require([_LT_DECL_EGREP])dnl
AC_MSG_CHECKING([for $1])
AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
[case $MAGIC_CMD in
[[\\/*] | ?:[\\/]*])
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
;;
*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_MAGIC_CMD=$MAGIC_CMD
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
dnl $ac_dummy forces splitting on constant user-supplied paths.
dnl POSIX.2 word splitting is done only on the output of word expansions,
dnl not every word. This closes a longstanding sh security hole.
ac_dummy="m4_if([$2], , $PATH, [$2])"
for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$1; then
- lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+ if test -f "$ac_dir/$1"; then
+ lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
:
@@ -2984,11 +3202,11 @@ _LT_EOF
break
fi
done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
+ IFS=$lt_save_ifs
+ MAGIC_CMD=$lt_save_MAGIC_CMD
;;
esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if test -n "$MAGIC_CMD"; then
AC_MSG_RESULT($MAGIC_CMD)
else
@@ -3006,7 +3224,7 @@ dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
# _LT_PATH_MAGIC
# --------------
-# find a file program which can recognize a shared library
+# find a file program that can recognize a shared library
m4_defun([_LT_PATH_MAGIC],
[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -3033,16 +3251,16 @@ m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
AC_ARG_WITH([gnu-ld],
[AS_HELP_STRING([--with-gnu-ld],
[assume the C compiler uses GNU ld @<:@default=no@:>@])],
- [test "$withval" = no || with_gnu_ld=yes],
+ [test no = "$withval" || with_gnu_ld=yes],
[with_gnu_ld=no])dnl
ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
# Check if gcc -print-prog-name=ld gives a path.
AC_MSG_CHECKING([for ld used by $CC])
case $host in
*-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
+ # gcc leaves a trailing carriage return, which upsets mingw
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
*)
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -3056,7 +3274,7 @@ if test "$GCC" = yes; then
while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
done
- test -z "$LD" && LD="$ac_prog"
+ test -z "$LD" && LD=$ac_prog
;;
"")
# If it fails, then pretend we aren't using GCC.
@@ -3067,37 +3285,37 @@ if test "$GCC" = yes; then
with_gnu_ld=unknown
;;
esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
AC_MSG_CHECKING([for GNU ld])
else
AC_MSG_CHECKING([for non-GNU ld])
fi
AC_CACHE_VAL(lt_cv_path_LD,
[if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
+ lt_cv_path_LD=$ac_dir/$ac_prog
# Check to see if the program is GNU ld. I'd rather use --version,
# but apparently some variants of GNU ld only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
+ test no != "$with_gnu_ld" && break
;;
*)
- test "$with_gnu_ld" != yes && break
+ test yes != "$with_gnu_ld" && break
;;
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ lt_cv_path_LD=$LD # Let the user override the test with a path.
fi])
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
if test -n "$LD"; then
AC_MSG_RESULT($LD)
else
@@ -3151,13 +3369,13 @@ esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
reload_cmds=false
fi
;;
darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ if test yes = "$GCC"; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
else
reload_cmds='$LD$reload_flag -o $output$reload_objs'
fi
@@ -3168,6 +3386,43 @@ _LT_TAGDECL([], [reload_cmds], [2])dnl
])# _LT_CMD_RELOAD
+# _LT_PATH_DD
+# -----------
+# find a working dd
+m4_defun([_LT_PATH_DD],
+[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
+[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi])
+rm -f conftest.i conftest2.i conftest.out])
+])# _LT_PATH_DD
+
+
+# _LT_CMD_TRUNCATE
+# ----------------
+# find command to truncate a binary pipe
+m4_defun([_LT_CMD_TRUNCATE],
+[m4_require([_LT_PATH_DD])
+AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
+_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
+ [Command to truncate a binary pipe])
+])# _LT_CMD_TRUNCATE
+
+
# _LT_CHECK_MAGIC_METHOD
# ----------------------
# how to check for library dependencies
@@ -3183,13 +3438,13 @@ lt_cv_deplibs_check_method='unknown'
# Need to set the preceding variable on all platforms that support
# interlibrary dependencies.
# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
+# 'unknown' -- same as none, but documents that we really don't know.
# 'pass_all' -- all dependencies passed with no checks.
# 'test_compile' -- check by making test program.
# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
case $host_os in
aix[[4-9]]*)
@@ -3216,8 +3471,7 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+ if ( file / ) >/dev/null 2>&1; then
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
@@ -3253,10 +3507,6 @@ freebsd* | dragonfly*)
fi
;;
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3295,7 +3545,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3317,8 +3567,8 @@ newos6*)
lt_cv_deplibs_check_method=pass_all
;;
-openbsd*)
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+openbsd* | bitrig*)
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
else
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
@@ -3371,6 +3621,9 @@ sysv4 | sysv4.3*)
tpf*)
lt_cv_deplibs_check_method=pass_all
;;
+os2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
])
@@ -3411,33 +3664,38 @@ AC_DEFUN([LT_PATH_NM],
AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
[if test -n "$NM"; then
# Let the user override the test.
- lt_cv_path_NM="$NM"
+ lt_cv_path_NM=$NM
else
- lt_nm_to_check="${ac_tool_prefix}nm"
+ lt_nm_to_check=${ac_tool_prefix}nm
if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
lt_nm_to_check="$lt_nm_to_check nm"
fi
for lt_tmp_nm in $lt_nm_to_check; do
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/$lt_tmp_nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+ tmp_nm=$ac_dir/$lt_tmp_nm
+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
# Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # Adding the 'sed 1q' prevents false positives on HP-UX, which says:
# nm: unknown option "B" ignored
# Tru64's nm complains that /dev/null is an invalid object file
- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
- */dev/null* | *'Invalid file or object type'*)
+ # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+ case $build_os in
+ mingw*) lt_bad_file=conftest.nm/nofile ;;
+ *) lt_bad_file=/dev/null ;;
+ esac
+ case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+ *$lt_bad_file* | *'Invalid file or object type'*)
lt_cv_path_NM="$tmp_nm -B"
- break
+ break 2
;;
*)
case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
*/dev/null*)
lt_cv_path_NM="$tmp_nm -p"
- break
+ break 2
;;
*)
lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -3448,21 +3706,21 @@ else
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
done
: ${lt_cv_path_NM=no}
fi])
-if test "$lt_cv_path_NM" != "no"; then
- NM="$lt_cv_path_NM"
+if test no != "$lt_cv_path_NM"; then
+ NM=$lt_cv_path_NM
else
# Didn't find any BSD compatible name lister, look for dumpbin.
if test -n "$DUMPBIN"; then :
# Let the user override the test.
else
AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
*COFF*)
- DUMPBIN="$DUMPBIN -symbols"
+ DUMPBIN="$DUMPBIN -symbols -headers"
;;
*)
DUMPBIN=:
@@ -3470,8 +3728,8 @@ else
esac
fi
AC_SUBST([DUMPBIN])
- if test "$DUMPBIN" != ":"; then
- NM="$DUMPBIN"
+ if test : != "$DUMPBIN"; then
+ NM=$DUMPBIN
fi
fi
test -z "$NM" && NM=nm
@@ -3517,8 +3775,8 @@ lt_cv_sharedlib_from_linklib_cmd,
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- # two different shell functions defined in ltmain.sh
- # decide which to use based on capabilities of $DLLTOOL
+ # two different shell functions defined in ltmain.sh;
+ # decide which one to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in
*--identify-strict*)
lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
@@ -3530,7 +3788,7 @@ cygwin* | mingw* | pw32* | cegcc*)
;;
*)
# fallback: assume linklib IS sharedlib
- lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ lt_cv_sharedlib_from_linklib_cmd=$ECHO
;;
esac
])
@@ -3557,13 +3815,28 @@ AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool
lt_cv_path_mainfest_tool=yes
fi
rm -f conftest*])
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
+if test yes != "$lt_cv_path_mainfest_tool"; then
MANIFEST_TOOL=:
fi
_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
])# _LT_PATH_MANIFEST_TOOL
+# _LT_DLL_DEF_P([FILE])
+# ---------------------
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with func_dll_def_p in the libtool script
+AC_DEFUN([_LT_DLL_DEF_P],
+[dnl
+ test DEF = "`$SED -n dnl
+ -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace
+ -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments
+ -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl
+ -e q dnl Only consider the first "real" line
+ $1`" dnl
+])# _LT_DLL_DEF_P
+
+
# LT_LIB_M
# --------
# check for math library
@@ -3575,11 +3848,11 @@ case $host in
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
;;
*)
- AC_CHECK_LIB(m, cos, LIBM="-lm")
+ AC_CHECK_LIB(m, cos, LIBM=-lm)
;;
esac
AC_SUBST([LIBM])
@@ -3598,7 +3871,7 @@ m4_defun([_LT_COMPILER_NO_RTTI],
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $cc_basename in
nvcc*)
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
@@ -3650,7 +3923,7 @@ cygwin* | mingw* | pw32* | cegcc*)
symcode='[[ABCDGISTW]]'
;;
hpux*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
symcode='[[ABCDEGRST]]'
fi
;;
@@ -3683,14 +3956,44 @@ case `$NM -V 2>&1` in
symcode='[[ABCDGIRSTW]]' ;;
esac
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ # Gets list of data symbols to import.
+ lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+ # Adjust the below global symbol transforms to fixup imported variables.
+ lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+ lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'"
+ lt_c_name_lib_hook="\
+ -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\
+ -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'"
+else
+ # Disable hooks by default.
+ lt_cv_sys_global_symbol_to_import=
+ lt_cdecl_hook=
+ lt_c_name_hook=
+ lt_c_name_lib_hook=
+fi
+
# Transform an extracted symbol line into a proper C declaration.
# Some systems (esp. on ia64) link data and code symbols differently,
# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'"
# Handle CRLF in mingw tool chain
opt_cr=
@@ -3708,21 +4011,24 @@ for ac_symprfx in "" "_"; do
# Write the raw and C identifiers.
if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- # Fake it for dumpbin and say T for any non-static function
- # and D for any global variable.
+ # Fake it for dumpbin and say T for any non-static function,
+ # D for any global variable and I for any imported variable.
# Also find C++ and __fastcall symbols from MSVC++,
# which start with @ or ?.
lt_cv_sys_global_symbol_pipe="$AWK ['"\
" {last_section=section; section=\$ 3};"\
" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
" \$ 0!~/External *\|/{next};"\
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
" {if(hide[section]) next};"\
-" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-" s[1]~/^[@?]/{print s[1], s[1]; next};"\
-" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
" ' prfx=^$ac_symprfx]"
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
@@ -3762,11 +4068,11 @@ _LT_EOF
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
relocations are performed -- see ld's documentation on pseudo-relocs. */
# define LT@&t at _DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
/* This system does not cope well with relocations in const data. */
# define LT@&t at _DLSYM_CONST
#else
@@ -3792,7 +4098,7 @@ lt__PROGRAM__LTX_preloaded_symbols[[]] =
{
{ "@PROGRAM@", (void *) 0 },
_LT_EOF
- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+ $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
cat <<\_LT_EOF >> conftest.$ac_ext
{0, (void *) 0}
};
@@ -3812,9 +4118,9 @@ _LT_EOF
mv conftest.$ac_objext conftstm.$ac_objext
lt_globsym_save_LIBS=$LIBS
lt_globsym_save_CFLAGS=$CFLAGS
- LIBS="conftstm.$ac_objext"
+ LIBS=conftstm.$ac_objext
CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+ if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
pipe_works=yes
fi
LIBS=$lt_globsym_save_LIBS
@@ -3835,7 +4141,7 @@ _LT_EOF
rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
+ if test yes = "$pipe_works"; then
break
else
lt_cv_sys_global_symbol_pipe=
@@ -3862,12 +4168,16 @@ _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
[Take the output of nm and produce a listing of raw symbols and C names])
_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
[Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1],
+ [Transform the output of nm into a list of symbols to manually relocate])
_LT_DECL([global_symbol_to_c_name_address],
[lt_cv_sys_global_symbol_to_c_name_address], [1],
[Transform the output of nm in a C name address pair])
_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
[lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
[Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([nm_interface], [lt_cv_nm_interface], [1],
+ [The name lister interface])
_LT_DECL([], [nm_file_list_spec], [1],
[Specify filename containing input files for $NM])
]) # _LT_CMD_GLOBAL_SYMBOLS
@@ -3883,17 +4193,18 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)=
m4_if([$1], [CXX], [
# C++ specific cases for pic, static, wl, etc.
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
fi
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
amigaos*)
@@ -3904,8 +4215,8 @@ m4_if([$1], [CXX], [
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
esac
@@ -3921,6 +4232,11 @@ m4_if([$1], [CXX], [
# (--disable-auto-import) libraries
m4_if([$1], [GCJ], [],
[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ case $host_os in
+ os2*)
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
# PIC is the default on this platform
@@ -3970,7 +4286,7 @@ m4_if([$1], [CXX], [
case $host_os in
aix[[4-9]]*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
else
@@ -4011,14 +4327,14 @@ m4_if([$1], [CXX], [
case $cc_basename in
CC*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
- if test "$host_cpu" != ia64; then
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+ if test ia64 != "$host_cpu"; then
_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
fi
;;
aCC*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
case $host_cpu in
hppa*64*|ia64*)
# +Z the default
@@ -4047,7 +4363,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -4055,7 +4371,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
ecpc* )
- # old Intel C++ for x86_64 which still supported -KPIC.
+ # old Intel C++ for x86_64, which still supported -KPIC.
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -4200,17 +4516,18 @@ m4_if([$1], [CXX], [
fi
],
[
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
fi
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
amigaos*)
@@ -4221,8 +4538,8 @@ m4_if([$1], [CXX], [
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
esac
@@ -4239,6 +4556,11 @@ m4_if([$1], [CXX], [
# (--disable-auto-import) libraries
m4_if([$1], [GCJ], [],
[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ case $host_os in
+ os2*)
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
@@ -4309,7 +4631,7 @@ m4_if([$1], [CXX], [
case $host_os in
aix*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
else
@@ -4317,11 +4639,30 @@ m4_if([$1], [CXX], [
fi
;;
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ case $cc_basename in
+ nagfor*)
+ # NAG Fortran compiler
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+ esac
+ ;;
+
mingw* | cygwin* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
m4_if([$1], [GCJ], [],
[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ case $host_os in
+ os2*)
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+ ;;
+ esac
;;
hpux9* | hpux10* | hpux11*)
@@ -4337,7 +4678,7 @@ m4_if([$1], [CXX], [
;;
esac
# Is there a better lt_prog_compiler_static that works with the bundled CC?
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
;;
irix5* | irix6* | nonstopux*)
@@ -4346,9 +4687,9 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
+ # old Intel for x86_64, which still supported -KPIC.
ecc*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -4373,6 +4714,12 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
@@ -4470,7 +4817,7 @@ m4_if([$1], [CXX], [
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
fi
@@ -4499,7 +4846,7 @@ m4_if([$1], [CXX], [
fi
])
case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
+ # For platforms that do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -4565,17 +4912,21 @@ m4_if([$1], [CXX], [
case $host_os in
aix[[4-9]]*)
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global defined
- # symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
;;
pw32*)
- _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
;;
cygwin* | mingw* | cegcc*)
case $cc_basename in
@@ -4621,9 +4972,9 @@ m4_if([$1], [CXX], [
# included in the symbol list
_LT_TAGVAR(include_expsyms, $1)=
# exclude_expsyms can be an extended regexp of symbols to exclude
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
+ # it will be wrapped by ' (' and ')$', so one must not match beginning or
+ # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+ # as well as any symbol that contains 'd'.
_LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
@@ -4639,7 +4990,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
with_gnu_ld=no
fi
;;
@@ -4647,7 +4998,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
# we just hope/assume this is gcc and not c89 (= MSVC++)
with_gnu_ld=yes
;;
- openbsd*)
+ openbsd* | bitrig*)
with_gnu_ld=no
;;
esac
@@ -4657,7 +5008,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
# On some targets, GNU ld is compatible enough with the native linker
# that we're better off using the native interface for both.
lt_use_gnu_ld_interface=no
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
case $host_os in
aix*)
# The AIX port of GNU ld has always aspired to compatibility
@@ -4679,24 +5030,24 @@ dnl Note also adjust exclude_expsyms for C++ above.
esac
fi
- if test "$lt_use_gnu_ld_interface" = yes; then
+ if test yes = "$lt_use_gnu_ld_interface"; then
# If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
+ wlarc='$wl'
# Set some defaults for GNU ld with shared library support. These
# are reset later if shared libraries are not supported. Putting them
# here allows them to be overridden if necessary.
runpath_var=LD_RUN_PATH
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
# ancient GNU ld didn't support --whole-archive et. al.
if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
_LT_TAGVAR(whole_archive_flag_spec, $1)=
fi
supports_anon_versioning=no
- case `$LD -v 2>&1` in
+ case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
*GNU\ gold*) supports_anon_versioning=yes ;;
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -4709,7 +5060,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
case $host_os in
aix[[3-9]]*)
# On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
+ if test ia64 != "$host_cpu"; then
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
@@ -4728,7 +5079,7 @@ _LT_EOF
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)=''
;;
m68k)
@@ -4744,7 +5095,7 @@ _LT_EOF
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -4754,7 +5105,7 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -4762,61 +5113,89 @@ _LT_EOF
_LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file, use it as
+ # is; otherwise, prepend EXPORTS...
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
;;
haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
+ os2*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ shrext_cmds=.dll
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
# Instead, shared libraries are loaded at an image base (0x10000000 by
# default) and relocated if they conflict, which is a slow very memory
# consuming and fragmenting process. To avoid this, we pick a random,
# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
# time. Moving up from 0x10000000 also allows more sbrk(2) space.
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
+ if test linux-dietlibc = "$host_os"; then
case $cc_basename in
diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
esac
fi
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
- && test "$tmp_diet" = no
+ && test no = "$tmp_diet"
then
tmp_addflag=' $pic_flag'
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group f77 and f90 compilers
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -4827,42 +5206,47 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
_LT_TAGVAR(whole_archive_flag_spec, $1)=
tmp_sharedflag='--shared' ;;
+ nagfor*) # NAGFOR 5.3
+ tmp_sharedflag='-Wl,-shared' ;;
xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
nvcc*) # Cuda Compiler Driver 2.2
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
tmp_sharedflag='-G' ;;
esac
- _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
case $cc_basename in
+ tcc*)
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
+ ;;
xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
_LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@ -4876,8 +5260,8 @@ _LT_EOF
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
fi
;;
@@ -4895,8 +5279,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -4908,7 +5292,7 @@ _LT_EOF
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
*** reliably create shared libraries on SCO systems. Therefore, libtool
*** is disabling shared libraries support. We urge you to upgrade GNU
*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
@@ -4923,9 +5307,9 @@ _LT_EOF
# DT_RUNPATH tag from executables and libraries. But doing so
# requires that you compile everything twice, which is a pain.
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -4942,15 +5326,15 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
;;
esac
- if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+ if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
runpath_var=
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
_LT_TAGVAR(export_dynamic_flag_spec, $1)=
@@ -4966,7 +5350,7 @@ _LT_EOF
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
_LT_TAGVAR(hardcode_minus_L, $1)=yes
- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
_LT_TAGVAR(hardcode_direct, $1)=unsupported
@@ -4974,34 +5358,57 @@ _LT_EOF
;;
aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
else
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global
- # defined symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
aix_use_runtimelinking=yes
break
fi
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -5020,13 +5427,21 @@ _LT_EOF
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+ _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # traditional, no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ ;;
+ esac
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
case $host_os in aix4.[[012]]|aix4.[[012]].*)
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -5045,61 +5460,80 @@ _LT_EOF
;;
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag="$shared_flag "'$wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to export.
_LT_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
else
- if test "$host_cpu" = ia64; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ if test ia64 = "$host_cpu"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
_LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an
# empty executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
+ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+ if test yes = "$with_gnu_ld"; then
# We only use this code for GNU lds that support --whole-archive.
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
else
# Exported symbols can be pulled into shared objects from archives
_LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds its shared libraries.
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared libraries.
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 3 [...]
+ else
+ # used by -dlpreopen to get the symbols
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -5108,7 +5542,7 @@ _LT_EOF
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)=''
;;
m68k)
@@ -5138,16 +5572,17 @@ _LT_EOF
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -5156,18 +5591,18 @@ _LT_EOF
# Don't use ranlib
_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
+ ;;
+ esac~
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
;;
*)
# Assume MSVC wrapper
@@ -5176,7 +5611,7 @@ _LT_EOF
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
@@ -5226,33 +5661,33 @@ _LT_EOF
;;
hpux9*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
else
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_direct, $1)=yes
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
_LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
;;
hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes,no = "$GCC,$with_gnu_ld"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
- if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
_LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5260,25 +5695,25 @@ _LT_EOF
;;
hpux11*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ if test yes,no = "$GCC,$with_gnu_ld"; then
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
m4_if($1, [], [
@@ -5286,14 +5721,14 @@ _LT_EOF
# (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
_LT_LINKER_OPTION([if $CC understands -b],
_LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
[_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
;;
esac
fi
- if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
@@ -5304,7 +5739,7 @@ _LT_EOF
*)
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
@@ -5315,16 +5750,16 @@ _LT_EOF
;;
irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
# This should be the same for all languages, so no per-tag cache variable.
AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
[lt_cv_irix_exported_symbol],
- [save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ [save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
AC_LINK_IFELSE(
[AC_LANG_SOURCE(
[AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
@@ -5337,21 +5772,31 @@ _LT_EOF
end]])])],
[lt_cv_irix_exported_symbol=yes],
[lt_cv_irix_exported_symbol=no])
- LDFLAGS="$save_LDFLAGS"])
- if test "$lt_cv_irix_exported_symbol" = yes; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ LDFLAGS=$save_LDFLAGS])
+ if test yes = "$lt_cv_irix_exported_symbol"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
fi
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(inherit_rpath, $1)=yes
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
+ linux*)
+ case $cc_basename in
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
@@ -5366,7 +5811,7 @@ _LT_EOF
newsos6)
_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -5374,27 +5819,19 @@ _LT_EOF
*nto* | *qnx*)
;;
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
else
- case $host_os in
- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- ;;
- *)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- ;;
- esac
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
fi
else
_LT_TAGVAR(ld_shlibs, $1)=no
@@ -5405,33 +5842,53 @@ _LT_EOF
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_TAGVAR(hardcode_minus_L, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ shrext_cmds=.dll
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
;;
osf3*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
else
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
;;
osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
else
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
# Both c and cxx compiler support -rpath directly
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -5442,24 +5899,24 @@ _LT_EOF
solaris*)
_LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ wlarc='$wl'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
wlarc=''
- _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
;;
*)
- wlarc='${wl}'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ wlarc='$wl'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
;;
esac
fi
@@ -5469,11 +5926,11 @@ _LT_EOF
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
# The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but understands '-z linker_flag'. GCC discards it without '$wl',
# but is careful enough not to reorder.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- if test "$GCC" = yes; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
else
_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
fi
@@ -5483,10 +5940,10 @@ _LT_EOF
;;
sunos4*)
- if test "x$host_vendor" = xsequent; then
+ if test sequent = "$host_vendor"; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
else
_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
@@ -5535,43 +5992,43 @@ _LT_EOF
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
+ # Note: We CANNOT use -z defs as we might desire, because we do not
# link with -lc, and that would cause any symbols used from libc to
# always be unresolved, which means just about no library would
# ever link correctly. If we're not using GNU ld we use -z text
# though, which does catch some bad symbols but isn't as heavy-handed
# as -z defs.
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+ _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
@@ -5586,17 +6043,17 @@ _LT_EOF
;;
esac
- if test x$host_vendor = xsni; then
+ if test sni = "$host_vendor"; then
case $host in
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
;;
esac
fi
fi
])
AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
@@ -5613,7 +6070,7 @@ x|xyes)
# Assume -lc should be added
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- if test "$enable_shared" = yes && test "$GCC" = yes; then
+ if test yes,yes = "$GCC,$enable_shared"; then
case $_LT_TAGVAR(archive_cmds, $1) in
*'~'*)
# FIXME: we may have to deal with multi-command sequences.
@@ -5693,12 +6150,12 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
_LT_TAGDECL([], [hardcode_libdir_separator], [1],
[Whether we need a single "-rpath" flag with a separated argument])
_LT_TAGDECL([], [hardcode_direct], [0],
- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+ [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
DIR into the resulting binary])
_LT_TAGDECL([], [hardcode_direct_absolute], [0],
- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+ [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
DIR into the resulting binary and the resulting library dependency is
- "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+ "absolute", i.e impossible to change by setting $shlibpath_var if the
library is relocated])
_LT_TAGDECL([], [hardcode_minus_L], [0],
[Set to "yes" if using the -LDIR flag during linking hardcodes DIR
@@ -5739,10 +6196,10 @@ dnl [Compiler flag to generate thread safe objects])
# ------------------------
# Ensure that the configuration variables for a C compiler are suitably
# defined. These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
+# the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_C_CONFIG],
[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
+lt_save_CC=$CC
AC_LANG_PUSH(C)
# Source file extension for C test sources.
@@ -5782,18 +6239,18 @@ if test -n "$compiler"; then
LT_SYS_DLOPEN_SELF
_LT_CMD_STRIPLIB
- # Report which library types will actually be built
+ # Report what library types will actually be built
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
@@ -5801,8 +6258,12 @@ if test -n "$compiler"; then
;;
aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -5810,13 +6271,13 @@ if test -n "$compiler"; then
AC_MSG_CHECKING([whether to build static libraries])
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
AC_MSG_RESULT([$enable_static])
_LT_CONFIG($1)
fi
AC_LANG_POP
-CC="$lt_save_CC"
+CC=$lt_save_CC
])# _LT_LANG_C_CONFIG
@@ -5824,14 +6285,14 @@ CC="$lt_save_CC"
# --------------------------
# Ensure that the configuration variables for a C++ compiler are suitably
# defined. These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
+# the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_CXX_CONFIG],
[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_EGREP])dnl
m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
+if test -n "$CXX" && ( test no != "$CXX" &&
+ ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+ (test g++ != "$CXX"))); then
AC_PROG_CXXCPP
else
_lt_caught_CXX_error=yes
@@ -5873,7 +6334,7 @@ _LT_TAGVAR(objext, $1)=$objext
# the CXX compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
+if test yes != "$_lt_caught_CXX_error"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="int some_variable = 0;"
@@ -5915,35 +6376,35 @@ if test "$_lt_caught_CXX_error" != yes; then
if test -n "$compiler"; then
# We don't want -fno-exception when compiling C++ code, so set the
# no_builtin_flag separately
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
else
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
fi
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
# Set up default GNU C++ configuration
LT_PATH_LD
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
- if test "$with_gnu_ld" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ if test yes = "$with_gnu_ld"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
# If archive_cmds runs LD, not CC, wlarc should be empty
# XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
# investigate it a little bit more. (MM)
- wlarc='${wl}'
+ wlarc='$wl'
# ancient GNU ld didn't support --whole-archive et. al.
if eval "`$CC -print-prog-name=ld` --help 2>&1" |
$GREP 'no-whole-archive' > /dev/null; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
_LT_TAGVAR(whole_archive_flag_spec, $1)=
fi
@@ -5979,18 +6440,30 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=no
;;
aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
else
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
@@ -6000,6 +6473,13 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
esac
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -6018,13 +6498,21 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+ _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ ;;
+ esac
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
case $host_os in aix4.[[012]]|aix4.[[012]].*)
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -6042,64 +6530,84 @@ if test "$_lt_caught_CXX_error" != yes; then
fi
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag=$shared_flag' $wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to
# export.
_LT_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+ # The "-G" linker flag allows undefined symbols.
+ _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
# Determine the default libpath from the value encoded in an empty
# executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
else
- if test "$host_cpu" = ia64; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ if test ia64 = "$host_cpu"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
_LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an
# empty executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
+ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+ if test yes = "$with_gnu_ld"; then
# We only use this code for GNU lds that support --whole-archive.
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
else
# Exported symbols can be pulled into shared objects from archives
_LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds its shared
- # libraries.
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared
+ # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# [...]
+ else
+ # used by -dlpreopen to get the symbols
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -6109,7 +6617,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -6137,57 +6645,58 @@ if test "$_lt_caught_CXX_error" != yes; then
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
# Don't use ranlib
_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- func_to_tool_file "$lt_outputfile"~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
+ ;;
+ esac~
+ func_to_tool_file "$lt_outputfile"~
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
;;
*)
# g++
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file, use it as
+ # is; otherwise, prepend EXPORTS...
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -6198,6 +6707,34 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_DARWIN_LINKER_FEATURES($1)
;;
+ os2*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ shrext_cmds=.dll
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
dgux*)
case $cc_basename in
ec++*)
@@ -6232,18 +6769,15 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
- gnu*)
- ;;
-
haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
hpux9*)
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
# but as the default
@@ -6255,7 +6789,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=no
;;
aCC*)
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -6264,11 +6798,11 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ if test yes = "$GXX"; then
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
else
# FIXME: insert proper C++ library support
_LT_TAGVAR(ld_shlibs, $1)=no
@@ -6278,15 +6812,15 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
hppa*64*|ia64*)
;;
*)
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
;;
esac
fi
@@ -6312,13 +6846,13 @@ if test "$_lt_caught_CXX_error" != yes; then
aCC*)
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
# Commands to make compiler produce verbose output that lists
@@ -6329,20 +6863,20 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes; then
- if test $with_gnu_ld = no; then
+ if test yes = "$GXX"; then
+ if test no = "$with_gnu_ld"; then
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
fi
@@ -6357,22 +6891,22 @@ if test "$_lt_caught_CXX_error" != yes; then
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
# Instead, shared libraries are loaded at an image base (0x10000000 by
# default) and relocated if they conflict, which is a slow very memory
# consuming and fragmenting process. To avoid this, we pick a random,
# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
# time. Moving up from 0x10000000 also allows more sbrk(2) space.
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
irix5* | irix6*)
case $cc_basename in
CC*)
# SGI C++
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
@@ -6381,22 +6915,22 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
;;
*)
- if test "$GXX" = yes; then
- if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GXX"; then
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
fi
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
esac
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -6404,8 +6938,8 @@ if test "$_lt_caught_CXX_error" != yes; then
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -6414,10 +6948,10 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
# Archives containing C++ object files must be created using
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
@@ -6431,59 +6965,59 @@ if test "$_lt_caught_CXX_error" != yes; then
# earlier do not add the objects themselves.
case `$CC -V 2>&1` in
*"Version 7."*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
*) # Version 8.0 or newer
tmp_idyn=
case $host_cpu in
ia64*) tmp_idyn=' -i_dynamic';;
esac
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
esac
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
;;
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
*pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
_LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
- compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
_LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
- $RANLIB $oldlib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+ $RANLIB $oldlib'
_LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
*) # Version 6 and above use weak symbols
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
esac
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
;;
cxx*)
# Compaq C++
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols'
runpath_var=LD_RUN_PATH
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -6497,18 +7031,18 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
;;
xl* | mpixl* | bgxl*)
# IBM XL 8.0 on PPC, with GNU ld
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ if test yes = "$supports_anon_versioning"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
;;
*)
@@ -6516,10 +7050,10 @@ if test "$_lt_caught_CXX_error" != yes; then
*Sun\ C*)
# Sun C++ 5.9
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
# Not sure whether something based on
@@ -6577,22 +7111,17 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
- openbsd2*)
- # C++ shared libraries are fairly broken
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
fi
output_verbose_link_cmd=func_echo_all
else
@@ -6608,9 +7137,9 @@ if test "$_lt_caught_CXX_error" != yes; then
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
# Archives containing C++ object files must be created using
@@ -6628,17 +7157,17 @@ if test "$_lt_caught_CXX_error" != yes; then
cxx*)
case $host in
osf3*)
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
;;
*)
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
- $RM $lib.exp'
+ echo "-hidden">> $lib.exp~
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+ $RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
;;
esac
@@ -6653,21 +7182,21 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ if test yes,no = "$GXX,$with_gnu_ld"; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
case $host in
osf3*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
;;
esac
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
# Commands to make compiler produce verbose output that lists
@@ -6713,9 +7242,9 @@ if test "$_lt_caught_CXX_error" != yes; then
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -6723,7 +7252,7 @@ if test "$_lt_caught_CXX_error" != yes; then
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
# The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'.
+ # but understands '-z linker_flag'.
# Supported since Solaris 2.6 (maybe 2.5.1?)
_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
;;
@@ -6740,30 +7269,30 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
gcx*)
# Green Hills C++ Compiler
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
# The C++ compiler must be used to create the archive.
_LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
;;
*)
# GNU C++ compiler with Solaris linker
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+ if test yes,no = "$GXX,$with_gnu_ld"; then
+ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
if $CC --version | $GREP -v '^2\.7' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
- # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # g++ 2.7 appears to require '-G' NOT '-shared' on this
# platform.
- _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
@@ -6771,11 +7300,11 @@ if test "$_lt_caught_CXX_error" != yes; then
output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
;;
esac
fi
@@ -6784,52 +7313,52 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
runpath_var='LD_RUN_PATH'
case $cc_basename in
CC*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
;;
sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
+ # Note: We CANNOT use -z defs as we might desire, because we do not
# link with -lc, and that would cause any symbols used from libc to
# always be unresolved, which means just about no library would
# ever link correctly. If we're not using GNU ld we use -z text
# though, which does catch some bad symbols but isn't as heavy-handed
# as -z defs.
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+ _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
runpath_var='LD_RUN_PATH'
case $cc_basename in
CC*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
- '"$_LT_TAGVAR(old_archive_cmds, $1)"
+ '"$_LT_TAGVAR(old_archive_cmds, $1)"
_LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
- '"$_LT_TAGVAR(reload_cmds, $1)"
+ '"$_LT_TAGVAR(reload_cmds, $1)"
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
;;
@@ -6860,10 +7389,10 @@ if test "$_lt_caught_CXX_error" != yes; then
esac
AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
- test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
- _LT_TAGVAR(GCC, $1)="$GXX"
- _LT_TAGVAR(LD, $1)="$LD"
+ _LT_TAGVAR(GCC, $1)=$GXX
+ _LT_TAGVAR(LD, $1)=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -6890,7 +7419,7 @@ if test "$_lt_caught_CXX_error" != yes; then
lt_cv_path_LD=$lt_save_path_LD
lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
+fi # test yes != "$_lt_caught_CXX_error"
AC_LANG_POP
])# _LT_LANG_CXX_CONFIG
@@ -6912,13 +7441,14 @@ AC_REQUIRE([_LT_DECL_SED])
AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
func_stripname_cnf ()
{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+ case @S|@2 in
+ .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
+ *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
esac
} # func_stripname_cnf
])# _LT_FUNC_STRIPNAME_CNF
+
# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
# ---------------------------------
# Figure out "hidden" library dependencies from verbose
@@ -7002,13 +7532,13 @@ if AC_TRY_EVAL(ac_compile); then
pre_test_object_deps_done=no
for p in `eval "$output_verbose_link_cmd"`; do
- case ${prev}${p} in
+ case $prev$p in
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
# Remove the space.
- if test $p = "-L" ||
- test $p = "-R"; then
+ if test x-L = "$p" ||
+ test x-R = "$p"; then
prev=$p
continue
fi
@@ -7024,16 +7554,16 @@ if AC_TRY_EVAL(ac_compile); then
case $p in
=*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
esac
- if test "$pre_test_object_deps_done" = no; then
- case ${prev} in
+ if test no = "$pre_test_object_deps_done"; then
+ case $prev in
-L | -R)
# Internal compiler library paths should come after those
# provided the user. The postdeps already come after the
# user supplied libs so there is no need to process them.
if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
- _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+ _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
else
- _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+ _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
fi
;;
# The "-l" case would never come before the object being
@@ -7041,9 +7571,9 @@ if AC_TRY_EVAL(ac_compile); then
esac
else
if test -z "$_LT_TAGVAR(postdeps, $1)"; then
- _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+ _LT_TAGVAR(postdeps, $1)=$prev$p
else
- _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
fi
fi
prev=
@@ -7058,15 +7588,15 @@ if AC_TRY_EVAL(ac_compile); then
continue
fi
- if test "$pre_test_object_deps_done" = no; then
+ if test no = "$pre_test_object_deps_done"; then
if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
- _LT_TAGVAR(predep_objects, $1)="$p"
+ _LT_TAGVAR(predep_objects, $1)=$p
else
_LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
fi
else
if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
- _LT_TAGVAR(postdep_objects, $1)="$p"
+ _LT_TAGVAR(postdep_objects, $1)=$p
else
_LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
fi
@@ -7097,51 +7627,6 @@ interix[[3-9]]*)
_LT_TAGVAR(postdep_objects,$1)=
_LT_TAGVAR(postdeps,$1)=
;;
-
-linux*)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
-
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- if test "$solaris_use_stlport4" != yes; then
- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
-
-solaris*)
- case $cc_basename in
- CC* | sunCC*)
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- # Adding this requires a known-good setup of shared libraries for
- # Sun compiler versions before 5.6, else PIC objects from an old
- # archive will be linked into the output, leading to subtle bugs.
- if test "$solaris_use_stlport4" != yes; then
- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
esac
])
@@ -7150,7 +7635,7 @@ case " $_LT_TAGVAR(postdeps, $1) " in
esac
_LT_TAGVAR(compiler_lib_search_dirs, $1)=
if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
fi
_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
[The directories searched by this compiler when creating a shared library])
@@ -7170,10 +7655,10 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1],
# --------------------------
# Ensure that the configuration variables for a Fortran 77 compiler are
# suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_F77_CONFIG],
[AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test "X$F77" = "Xno"; then
+if test -z "$F77" || test no = "$F77"; then
_lt_disable_F77=yes
fi
@@ -7210,7 +7695,7 @@ _LT_TAGVAR(objext, $1)=$objext
# the F77 compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
+if test yes != "$_lt_disable_F77"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="\
subroutine t
@@ -7232,7 +7717,7 @@ if test "$_lt_disable_F77" != yes; then
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
+ lt_save_CC=$CC
lt_save_GCC=$GCC
lt_save_CFLAGS=$CFLAGS
CC=${F77-"f77"}
@@ -7246,21 +7731,25 @@ if test "$_lt_disable_F77" != yes; then
AC_MSG_RESULT([$can_build_shared])
AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
fi
;;
aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -7268,11 +7757,11 @@ if test "$_lt_disable_F77" != yes; then
AC_MSG_CHECKING([whether to build static libraries])
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
AC_MSG_RESULT([$enable_static])
- _LT_TAGVAR(GCC, $1)="$G77"
- _LT_TAGVAR(LD, $1)="$LD"
+ _LT_TAGVAR(GCC, $1)=$G77
+ _LT_TAGVAR(LD, $1)=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -7289,9 +7778,9 @@ if test "$_lt_disable_F77" != yes; then
fi # test -n "$compiler"
GCC=$lt_save_GCC
- CC="$lt_save_CC"
- CFLAGS="$lt_save_CFLAGS"
-fi # test "$_lt_disable_F77" != yes
+ CC=$lt_save_CC
+ CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_F77"
AC_LANG_POP
])# _LT_LANG_F77_CONFIG
@@ -7301,11 +7790,11 @@ AC_LANG_POP
# -------------------------
# Ensure that the configuration variables for a Fortran compiler are
# suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_FC_CONFIG],
[AC_LANG_PUSH(Fortran)
-if test -z "$FC" || test "X$FC" = "Xno"; then
+if test -z "$FC" || test no = "$FC"; then
_lt_disable_FC=yes
fi
@@ -7342,7 +7831,7 @@ _LT_TAGVAR(objext, $1)=$objext
# the FC compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
+if test yes != "$_lt_disable_FC"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="\
subroutine t
@@ -7364,7 +7853,7 @@ if test "$_lt_disable_FC" != yes; then
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
+ lt_save_CC=$CC
lt_save_GCC=$GCC
lt_save_CFLAGS=$CFLAGS
CC=${FC-"f95"}
@@ -7380,21 +7869,25 @@ if test "$_lt_disable_FC" != yes; then
AC_MSG_RESULT([$can_build_shared])
AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
fi
;;
aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -7402,11 +7895,11 @@ if test "$_lt_disable_FC" != yes; then
AC_MSG_CHECKING([whether to build static libraries])
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
AC_MSG_RESULT([$enable_static])
- _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
- _LT_TAGVAR(LD, $1)="$LD"
+ _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
+ _LT_TAGVAR(LD, $1)=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -7426,7 +7919,7 @@ if test "$_lt_disable_FC" != yes; then
GCC=$lt_save_GCC
CC=$lt_save_CC
CFLAGS=$lt_save_CFLAGS
-fi # test "$_lt_disable_FC" != yes
+fi # test yes != "$_lt_disable_FC"
AC_LANG_POP
])# _LT_LANG_FC_CONFIG
@@ -7436,7 +7929,7 @@ AC_LANG_POP
# --------------------------
# Ensure that the configuration variables for the GNU Java Compiler compiler
# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_GCJ_CONFIG],
[AC_REQUIRE([LT_PROG_GCJ])dnl
AC_LANG_SAVE
@@ -7470,7 +7963,7 @@ CC=${GCJ-"gcj"}
CFLAGS=$GCJFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
+_LT_TAGVAR(LD, $1)=$LD
_LT_CC_BASENAME([$compiler])
# GCJ did not exist at the time GCC didn't implicitly link libc in.
@@ -7507,7 +8000,7 @@ CFLAGS=$lt_save_CFLAGS
# --------------------------
# Ensure that the configuration variables for the GNU Go compiler
# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_GO_CONFIG],
[AC_REQUIRE([LT_PROG_GO])dnl
AC_LANG_SAVE
@@ -7541,7 +8034,7 @@ CC=${GOC-"gccgo"}
CFLAGS=$GOFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
+_LT_TAGVAR(LD, $1)=$LD
_LT_CC_BASENAME([$compiler])
# Go did not exist at the time GCC didn't implicitly link libc in.
@@ -7578,7 +8071,7 @@ CFLAGS=$lt_save_CFLAGS
# -------------------------
# Ensure that the configuration variables for the Windows resource compiler
# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_RC_CONFIG],
[AC_REQUIRE([LT_PROG_RC])dnl
AC_LANG_SAVE
@@ -7594,7 +8087,7 @@ _LT_TAGVAR(objext, $1)=$objext
lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
+lt_simple_link_test_code=$lt_simple_compile_test_code
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_TAG_COMPILER
@@ -7604,7 +8097,7 @@ _LT_COMPILER_BOILERPLATE
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
+lt_save_CC=$CC
lt_save_CFLAGS=$CFLAGS
lt_save_GCC=$GCC
GCC=
@@ -7633,7 +8126,7 @@ AC_DEFUN([LT_PROG_GCJ],
[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
[m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
[AC_CHECK_TOOL(GCJ, gcj,)
- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+ test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
AC_SUBST(GCJFLAGS)])])[]dnl
])
@@ -7744,7 +8237,7 @@ lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.
for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
- test ! -f $lt_ac_sed && continue
+ test ! -f "$lt_ac_sed" && continue
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -7761,9 +8254,9 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
$lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
cmp -s conftest.out conftest.nl || break
# 10000 chars as input seems more than enough
- test $lt_ac_count -gt 10 && break
+ test 10 -lt "$lt_ac_count" && break
lt_ac_count=`expr $lt_ac_count + 1`
- if test $lt_ac_count -gt $lt_ac_max; then
+ if test "$lt_ac_count" -gt "$lt_ac_max"; then
lt_ac_max=$lt_ac_count
lt_cv_path_SED=$lt_ac_sed
fi
@@ -7787,27 +8280,7 @@ dnl AC_DEFUN([LT_AC_PROG_SED], [])
# Find out whether the shell is Bourne or XSI compatible,
# or has some other useful features.
m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,b/c, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
- >/dev/null 2>&1 \
- && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
lt_unset=unset
else
lt_unset=false
@@ -7831,102 +8304,9 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
])# _LT_CHECK_SHELL_FEATURES
-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-# ------------------------------------------------------
-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-m4_defun([_LT_PROG_FUNCTION_REPLACE],
-[dnl {
-sed -e '/^$1 ()$/,/^} # $1 /c\
-$1 ()\
-{\
-m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
-} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-])
-
-
-# _LT_PROG_REPLACE_SHELLFNS
-# -------------------------
-# Replace existing portable implementations of several shell functions with
-# equivalent extended shell implementations where those features are available..
-m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-[if test x"$xsi_shell" = xyes; then
- _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac])
-
- _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
- func_basename_result="${1##*/}"])
-
- _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
- func_basename_result="${1##*/}"])
-
- _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- # positional parameters, so assign one to ordinary parameter first.
- func_stripname_result=${3}
- func_stripname_result=${func_stripname_result#"${1}"}
- func_stripname_result=${func_stripname_result%"${2}"}])
-
- _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
- func_split_long_opt_name=${1%%=*}
- func_split_long_opt_arg=${1#*=}])
-
- _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
- func_split_short_opt_arg=${1#??}
- func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-
- _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
- case ${1} in
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- *) func_lo2o_result=${1} ;;
- esac])
-
- _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
-
- _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
-
- _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
-fi
-
-if test x"$lt_shell_append" = xyes; then
- _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
-
- _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
- func_quote_for_eval "${2}"
-dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
- eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
-
- # Save a `func_append' function call where possible by direct use of '+='
- sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-else
- # Save a `func_append' function call even when '+=' is not available
- sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
- AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-fi
-])
-
# _LT_PATH_CONVERSION_FUNCTIONS
# -----------------------------
-# Determine which file name conversion functions should be used by
+# Determine what file name conversion functions should be used by
# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
# for certain cross-compile configurations and native mingw.
m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
index 5d9acd8..94b0829 100644
--- a/m4/ltoptions.m4
+++ b/m4/ltoptions.m4
@@ -1,14 +1,14 @@
# Helper functions for option handling. -*- Autoconf -*-
#
-# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
+# Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# 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.
-# serial 7 ltoptions.m4
+# serial 8 ltoptions.m4
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -29,7 +29,7 @@ m4_define([_LT_SET_OPTION],
[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
_LT_MANGLE_DEFUN([$1], [$2]),
- [m4_warning([Unknown $1 option `$2'])])[]dnl
+ [m4_warning([Unknown $1 option '$2'])])[]dnl
])
@@ -75,13 +75,15 @@ m4_if([$1],[LT_INIT],[
dnl
dnl If no reference was made to various pairs of opposing options, then
dnl we run the default mode handler for the pair. For example, if neither
- dnl `shared' nor `disable-shared' was passed, we enable building of shared
+ dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
dnl archives by default:
_LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
_LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
_LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
_LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
- [_LT_ENABLE_FAST_INSTALL])
+ [_LT_ENABLE_FAST_INSTALL])
+ _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
+ [_LT_WITH_AIX_SONAME([aix])])
])
])# _LT_SET_OPTIONS
@@ -112,7 +114,7 @@ AU_DEFUN([AC_LIBTOOL_DLOPEN],
[_LT_SET_OPTION([LT_INIT], [dlopen])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
+put the 'dlopen' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@@ -148,7 +150,7 @@ AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
_LT_SET_OPTION([LT_INIT], [win32-dll])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
+put the 'win32-dll' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@@ -157,9 +159,9 @@ dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
# _LT_ENABLE_SHARED([DEFAULT])
# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+# implement the --enable-shared flag, and supports the 'shared' and
+# 'disable-shared' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_SHARED],
[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([shared],
@@ -172,14 +174,14 @@ AC_ARG_ENABLE([shared],
*)
enable_shared=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_shared=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
@@ -211,9 +213,9 @@ dnl AC_DEFUN([AM_DISABLE_SHARED], [])
# _LT_ENABLE_STATIC([DEFAULT])
# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+# implement the --enable-static flag, and support the 'static' and
+# 'disable-static' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_STATIC],
[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([static],
@@ -226,14 +228,14 @@ AC_ARG_ENABLE([static],
*)
enable_static=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_static=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[enable_static=]_LT_ENABLE_STATIC_DEFAULT)
@@ -265,9 +267,9 @@ dnl AC_DEFUN([AM_DISABLE_STATIC], [])
# _LT_ENABLE_FAST_INSTALL([DEFAULT])
# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+# implement the --enable-fast-install flag, and support the 'fast-install'
+# and 'disable-fast-install' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_FAST_INSTALL],
[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([fast-install],
@@ -280,14 +282,14 @@ AC_ARG_ENABLE([fast-install],
*)
enable_fast_install=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_fast_install=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
@@ -304,14 +306,14 @@ AU_DEFUN([AC_ENABLE_FAST_INSTALL],
[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
+the 'fast-install' option into LT_INIT's first parameter.])
])
AU_DEFUN([AC_DISABLE_FAST_INSTALL],
[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
+the 'disable-fast-install' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@@ -319,11 +321,64 @@ dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+# _LT_WITH_AIX_SONAME([DEFAULT])
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'.
+m4_define([_LT_WITH_AIX_SONAME],
+[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
+shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[[5-9]]*,yes)
+ AC_MSG_CHECKING([which variant of shared library versioning to provide])
+ AC_ARG_WITH([aix-soname],
+ [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
+ [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
+ [case $withval in
+ aix|svr4|both)
+ ;;
+ *)
+ AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+ ;;
+ esac
+ lt_cv_with_aix_soname=$with_aix_soname],
+ [AC_CACHE_VAL([lt_cv_with_aix_soname],
+ [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+ with_aix_soname=$lt_cv_with_aix_soname])
+ AC_MSG_RESULT([$with_aix_soname])
+ if test aix != "$with_aix_soname"; then
+ # For the AIX way of multilib, we name the shared archive member
+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+ # the AIX toolchain works better with OBJECT_MODE set (default 32).
+ if test 64 = "${OBJECT_MODE-32}"; then
+ shared_archive_member_spec=shr_64
+ else
+ shared_archive_member_spec=shr
+ fi
+ fi
+ ;;
+*)
+ with_aix_soname=aix
+ ;;
+esac
+
+_LT_DECL([], [shared_archive_member_spec], [0],
+ [Shared archive member basename, for filename based shared library versioning on AIX])dnl
+])# _LT_WITH_AIX_SONAME
+
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
+
+
# _LT_WITH_PIC([MODE])
# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
# LT_INIT options.
-# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
+# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'.
m4_define([_LT_WITH_PIC],
[AC_ARG_WITH([pic],
[AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
@@ -334,19 +389,17 @@ m4_define([_LT_WITH_PIC],
*)
pic_mode=default
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for lt_pkg in $withval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$lt_pkg" = "X$lt_p"; then
pic_mode=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
- [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+ [pic_mode=m4_default([$1], [default])])
_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
])# _LT_WITH_PIC
@@ -359,7 +412,7 @@ AU_DEFUN([AC_LIBTOOL_PICMODE],
[_LT_SET_OPTION([LT_INIT], [pic-only])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
+put the 'pic-only' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
index 9000a05..48bc934 100644
--- a/m4/ltsugar.m4
+++ b/m4/ltsugar.m4
@@ -1,6 +1,7 @@
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
@@ -33,7 +34,7 @@ m4_define([_lt_join],
# ------------
# Manipulate m4 lists.
# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
+# Autoconf-2.59, which quotes differently.
m4_define([lt_car], [[$1]])
m4_define([lt_cdr],
[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
@@ -44,7 +45,7 @@ m4_define([lt_unquote], $1)
# lt_append(MACRO-NAME, STRING, [SEPARATOR])
# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
# Note that neither SEPARATOR nor STRING are expanded; they are appended
# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
# No SEPARATOR is output if MACRO-NAME was previously undefined (different
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
index 07a8602..fa04b52 100644
--- a/m4/ltversion.m4
+++ b/m4/ltversion.m4
@@ -1,6 +1,6 @@
# ltversion.m4 -- version numbers -*- Autoconf -*-
#
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
# Written by Scott James Remnant, 2004
#
# This file is free software; the Free Software Foundation gives
@@ -9,15 +9,15 @@
# @configure_input@
-# serial 3337 ltversion.m4
+# serial 4179 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.4.2])
-m4_define([LT_PACKAGE_REVISION], [1.3337])
+m4_define([LT_PACKAGE_VERSION], [2.4.6])
+m4_define([LT_PACKAGE_REVISION], [2.4.6])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.2'
-macro_revision='1.3337'
+[macro_version='2.4.6'
+macro_revision='2.4.6'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
index c573da9..c6b26f8 100644
--- a/m4/lt~obsolete.m4
+++ b/m4/lt~obsolete.m4
@@ -1,6 +1,7 @@
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
-# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+# Foundation, Inc.
# Written by Scott James Remnant, 2004.
#
# This file is free software; the Free Software Foundation gives
@@ -11,7 +12,7 @@
# These exist entirely to fool aclocal when bootstrapping libtool.
#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
# which have later been changed to m4_define as they aren't part of the
# exported API, or moved to Autoconf or Automake where they belong.
#
@@ -25,7 +26,7 @@
# included after everything else. This provides aclocal with the
# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
#
# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
# Yes, that means every name once taken will need to remain here until
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
index 3f3929f..cfb4de6 100644
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -76,7 +76,7 @@ if (NOT WIN32)
set (SYSMANPAGES ${SYSMANPAGES} ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPT}.8)
configure_file (script.8.in ${SCRIPT}.8 @ONLY)
endforeach ()
-endif()
+endif ()
# Add the extra maintainer tasks into the dependency list. The
# distrib-man target copies the derived documentation files into the
diff --git a/man/CartConvert.1 b/man/CartConvert.1
index d5aca33..768990d 100644
--- a/man/CartConvert.1
+++ b/man/CartConvert.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.31)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "CARTCONVERT 1"
-.TH CARTCONVERT 1 "2015-09-30" "GeographicLib 1.45" "GeographicLib Utilities"
+.TH CARTCONVERT 1 "2016-02-14" "GeographicLib 1.46" "GeographicLib Utilities"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -143,7 +143,7 @@ CartConvert \-\- convert geodetic coordinates to geocentric or local cartesian
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
\&\fBCartConvert\fR [ \fB\-r\fR ] [ \fB\-l\fR \fIlat0\fR \fIlon0\fR \fIh0\fR ]
-[ \fB\-e\fR \fIa\fR \fIf\fR ] [ \fB\-w\fR ] [ \fB\-p\fR prec ]
+[ \fB\-e\fR \fIa\fR \fIf\fR ] [ \fB\-w\fR ] [ \fB\-p\fR \fIprec\fR ]
[ \fB\-\-comment\-delimiter\fR \fIcommentdelim\fR ]
[ \fB\-\-version\fR | \fB\-h\fR | \fB\-\-help\fR ]
[ \fB\-\-input\-file\fR \fIinfile\fR | \fB\-\-input\-string\fR \fIinstring\fR ]
@@ -174,33 +174,34 @@ set of geodetic coordinates, the corresponding cartesian coordinates
perform the reverse projection. \fIx\fR, \fIy\fR, \fIz\fR are given on standard
input and each line of standard output gives \fIlatitude\fR, \fIlongitude\fR,
\&\fIheight\fR.
-.IP "\fB\-l\fR" 4
-.IX Item "-l"
+.IP "\fB\-l\fR \fIlat0\fR \fIlon0\fR \fIh0\fR" 4
+.IX Item "-l lat0 lon0 h0"
specifies conversions to and from a local cartesion coordinate systems
with origin \fIlat0\fR \fIlon0\fR \fIh0\fR, instead of a geocentric coordinate
system. The \fB\-w\fR flag can be used to swap the default order of the 2
geographic coordinates, provided that it appears before \fB\-l\fR.
-.IP "\fB\-e\fR" 4
-.IX Item "-e"
-specify the ellipsoid via \fIa\fR \fIf\fR; the equatorial radius is \fIa\fR and
-the flattening is \fIf\fR. Setting \fIf\fR = 0 results in a sphere. Specify
+.IP "\fB\-e\fR \fIa\fR \fIf\fR" 4
+.IX Item "-e a f"
+specify the ellipsoid via the equatorial radius, \fIa\fR and
+the flattening, \fIf\fR. Setting \fIf\fR = 0 results in a sphere. Specify
\&\fIf\fR < 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297,
is allowed for \fIf\fR. By default, the \s-1WGS84\s0 ellipsoid is used, \fIa\fR =
6378137 m, \fIf\fR = 1/298.257223563.
.IP "\fB\-w\fR" 4
.IX Item "-w"
+toggle the longitude first flag (it starts off); if the flag is on, then
on input and output, longitude precedes latitude (except that, on input,
this can be overridden by a hemisphere designator, \fIN\fR, \fIS\fR, \fIE\fR,
\&\fIW\fR).
-.IP "\fB\-p\fR" 4
-.IX Item "-p"
+.IP "\fB\-p\fR \fIprec\fR" 4
+.IX Item "-p prec"
set the output precision to \fIprec\fR (default 6). \fIprec\fR is the number
of digits after the decimal point for geocentric and local cartesion
coordinates and for the height (in meters). For latitudes and
longitudes (in degrees), the number of digits after the decimal point is
\&\fIprec\fR + 5.
-.IP "\fB\-\-comment\-delimiter\fR" 4
-.IX Item "--comment-delimiter"
+.IP "\fB\-\-comment\-delimiter\fR \fIcommentdelim\fR" 4
+.IX Item "--comment-delimiter commentdelim"
set the comment delimiter to \fIcommentdelim\fR (e.g., \*(L"#\*(R" or \*(L"//\*(R"). If
set, the input lines will be scanned for this delimiter and, if found,
the delimiter and the rest of the line will be removed prior to
@@ -215,21 +216,21 @@ print usage and exit.
.IP "\fB\-\-help\fR" 4
.IX Item "--help"
print full documentation and exit.
-.IP "\fB\-\-input\-file\fR" 4
-.IX Item "--input-file"
+.IP "\fB\-\-input\-file\fR \fIinfile\fR" 4
+.IX Item "--input-file infile"
read input from the file \fIinfile\fR instead of from standard input; a file
name of \*(L"\-\*(R" stands for standard input.
-.IP "\fB\-\-input\-string\fR" 4
-.IX Item "--input-string"
+.IP "\fB\-\-input\-string\fR \fIinstring\fR" 4
+.IX Item "--input-string instring"
read input from the string \fIinstring\fR instead of from standard input.
All occurrences of the line separator character (default is a semicolon)
in \fIinstring\fR are converted to newlines before the reading begins.
-.IP "\fB\-\-line\-separator\fR" 4
-.IX Item "--line-separator"
+.IP "\fB\-\-line\-separator\fR \fIlinesep\fR" 4
+.IX Item "--line-separator linesep"
set the line separator character to \fIlinesep\fR. By default this is a
semicolon.
-.IP "\fB\-\-output\-file\fR" 4
-.IX Item "--output-file"
+.IP "\fB\-\-output\-file\fR \fIoutfile\fR" 4
+.IX Item "--output-file outfile"
write output to the file \fIoutfile\fR instead of to standard output; a
file name of \*(L"\-\*(R" stands for standard output.
.SH "EXAMPLES"
@@ -259,5 +260,5 @@ revolution\fR, Feb. 2011; preprint <http://arxiv.org/abs/1102.1215>.
.SH "HISTORY"
.IX Header "HISTORY"
\&\fBCartConvert\fR was added to GeographicLib,
-<http://geographiclib.sf.net>, in 2009\-02. Prior to 2009\-03 it was
+<http://geographiclib.sourceforge.net>, in 2009\-02. Prior to 2009\-03 it was
called ECEFConvert.
diff --git a/man/CartConvert.1.html b/man/CartConvert.1.html
index 1cea662..8bf014f 100644
--- a/man/CartConvert.1.html
+++ b/man/CartConvert.1.html
@@ -7,7 +7,7 @@
<link rev="made" href="mailto:root at localhost" />
</head>
-<body style="background-color: white">
+<body>
@@ -17,7 +17,7 @@
<h1 id="SYNOPSIS">SYNOPSIS</h1>
-<p><b>CartConvert</b> [ <b>-r</b> ] [ <b>-l</b> <i>lat0</i> <i>lon0</i> <i>h0</i> ] [ <b>-e</b> <i>a</i> <i>f</i> ] [ <b>-w</b> ] [ <b>-p</b> prec ] [ <b>--comment-delimiter</b> <i>commentdelim</i> ] [ <b>--version</b> | <b>-h</b> | <b>--help</b> ] [ <b>--input-file</b> <i>infile</i> | <b>--input-string</b> <i>instring</i> ] [ <b>--line-separator</b> <i>linesep</i> ] [ <b>--output-file</b> <i>outfile</i> ]</p>
+<p><b>CartConvert</b> [ <b>-r</b> ] [ <b>-l</b> <i>lat0</i> <i>lon0</i> <i>h0</i> ] [ <b>-e</b> <i>a</i> <i>f</i> ] [ <b>-w</b> ] [ <b>-p</b> <i>prec</i> ] [ <b>--comment-delimiter</b> <i>commentdelim</i> ] [ <b>--version</b> | <b>-h</b> | <b>--help</b> ] [ <b>--input-file</b> <i>infile</i> | <b>--input-string</b> <i>instring</i> ] [ <b>--line-separator</b> <i>linesep</i> ] [ <b>--output-file</b> <i>outfile</i> ]</p>
<h1 id="DESCRIPTION">DESCRIPTION</h1>
@@ -35,31 +35,31 @@
<p>perform the reverse projection. <i>x</i>, <i>y</i>, <i>z</i> are given on standard input and each line of standard output gives <i>latitude</i>, <i>longitude</i>, <i>height</i>.</p>
</dd>
-<dt id="l"><b>-l</b></dt>
+<dt id="l-lat0-lon0-h0"><b>-l</b> <i>lat0</i> <i>lon0</i> <i>h0</i></dt>
<dd>
<p>specifies conversions to and from a local cartesion coordinate systems with origin <i>lat0</i> <i>lon0</i> <i>h0</i>, instead of a geocentric coordinate system. The <b>-w</b> flag can be used to swap the default order of the 2 geographic coordinates, provided that it appears before <b>-l</b>.</p>
</dd>
-<dt id="e"><b>-e</b></dt>
+<dt id="e-a-f"><b>-e</b> <i>a</i> <i>f</i></dt>
<dd>
-<p>specify the ellipsoid via <i>a</i> <i>f</i>; the equatorial radius is <i>a</i> and the flattening is <i>f</i>. Setting <i>f</i> = 0 results in a sphere. Specify <i>f</i> < 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297, is allowed for <i>f</i>. By default, the WGS84 ellipsoid is used, <i>a</i> = 6378137 m, <i>f</i> = 1/298.257223563.</p>
+<p>specify the ellipsoid via the equatorial radius, <i>a</i> and the flattening, <i>f</i>. Setting <i>f</i> = 0 results in a sphere. Specify <i>f</i> < 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297, is allowed for <i>f</i>. By default, the WGS84 ellipsoid is used, <i>a</i> = 6378137 m, <i>f</i> = 1/298.257223563.</p>
</dd>
<dt id="w"><b>-w</b></dt>
<dd>
-<p>on input and output, longitude precedes latitude (except that, on input, this can be overridden by a hemisphere designator, <i>N</i>, <i>S</i>, <i>E</i>, <i>W</i>).</p>
+<p>toggle the longitude first flag (it starts off); if the flag is on, then on input and output, longitude precedes latitude (except that, on input, this can be overridden by a hemisphere designator, <i>N</i>, <i>S</i>, <i>E</i>, <i>W</i>).</p>
</dd>
-<dt id="p"><b>-p</b></dt>
+<dt id="p-prec"><b>-p</b> <i>prec</i></dt>
<dd>
<p>set the output precision to <i>prec</i> (default 6). <i>prec</i> is the number of digits after the decimal point for geocentric and local cartesion coordinates and for the height (in meters). For latitudes and longitudes (in degrees), the number of digits after the decimal point is <i>prec</i> + 5.</p>
</dd>
-<dt id="comment-delimiter"><b>--comment-delimiter</b></dt>
+<dt id="comment-delimiter-commentdelim"><b>--comment-delimiter</b> <i>commentdelim</i></dt>
<dd>
<p>set the comment delimiter to <i>commentdelim</i> (e.g., "#" or "//"). If set, the input lines will be scanned for this delimiter and, if found, the delimiter and the rest of the line will be removed prior to processing and subsequently appended to the output line (separated by a space).</p>
@@ -83,25 +83,25 @@
<p>print full documentation and exit.</p>
</dd>
-<dt id="input-file"><b>--input-file</b></dt>
+<dt id="input-file-infile"><b>--input-file</b> <i>infile</i></dt>
<dd>
<p>read input from the file <i>infile</i> instead of from standard input; a file name of "-" stands for standard input.</p>
</dd>
-<dt id="input-string"><b>--input-string</b></dt>
+<dt id="input-string-instring"><b>--input-string</b> <i>instring</i></dt>
<dd>
<p>read input from the string <i>instring</i> instead of from standard input. All occurrences of the line separator character (default is a semicolon) in <i>instring</i> are converted to newlines before the reading begins.</p>
</dd>
-<dt id="line-separator"><b>--line-separator</b></dt>
+<dt id="line-separator-linesep"><b>--line-separator</b> <i>linesep</i></dt>
<dd>
<p>set the line separator character to <i>linesep</i>. By default this is a semicolon.</p>
</dd>
-<dt id="output-file"><b>--output-file</b></dt>
+<dt id="output-file-outfile"><b>--output-file</b> <i>outfile</i></dt>
<dd>
<p>write output to the file <i>outfile</i> instead of to standard output; a file name of "-" stands for standard output.</p>
@@ -132,7 +132,7 @@
<h1 id="HISTORY">HISTORY</h1>
-<p><b>CartConvert</b> was added to GeographicLib, <a href="http://geographiclib.sf.net">http://geographiclib.sf.net</a>, in 2009-02. Prior to 2009-03 it was called ECEFConvert.</p>
+<p><b>CartConvert</b> was added to GeographicLib, <a href="http://geographiclib.sourceforge.net">http://geographiclib.sourceforge.net</a>, in 2009-02. Prior to 2009-03 it was called ECEFConvert.</p>
</body>
diff --git a/man/CartConvert.pod b/man/CartConvert.pod
index e80b322..4560a93 100644
--- a/man/CartConvert.pod
+++ b/man/CartConvert.pod
@@ -5,7 +5,7 @@ CartConvert -- convert geodetic coordinates to geocentric or local cartesian
=head1 SYNOPSIS
B<CartConvert> [ B<-r> ] [ B<-l> I<lat0> I<lon0> I<h0> ]
-[ B<-e> I<a> I<f> ] [ B<-w> ] [ B<-p> prec ]
+[ B<-e> I<a> I<f> ] [ B<-w> ] [ B<-p> I<prec> ]
[ B<--comment-delimiter> I<commentdelim> ]
[ B<--version> | B<-h> | B<--help> ]
[ B<--input-file> I<infile> | B<--input-string> I<instring> ]
@@ -41,28 +41,29 @@ perform the reverse projection. I<x>, I<y>, I<z> are given on standard
input and each line of standard output gives I<latitude>, I<longitude>,
I<height>.
-=item B<-l>
+=item B<-l> I<lat0> I<lon0> I<h0>
specifies conversions to and from a local cartesion coordinate systems
with origin I<lat0> I<lon0> I<h0>, instead of a geocentric coordinate
system. The B<-w> flag can be used to swap the default order of the 2
geographic coordinates, provided that it appears before B<-l>.
-=item B<-e>
+=item B<-e> I<a> I<f>
-specify the ellipsoid via I<a> I<f>; the equatorial radius is I<a> and
-the flattening is I<f>. Setting I<f> = 0 results in a sphere. Specify
+specify the ellipsoid via the equatorial radius, I<a> and
+the flattening, I<f>. Setting I<f> = 0 results in a sphere. Specify
I<f> E<lt> 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297,
is allowed for I<f>. By default, the WGS84 ellipsoid is used, I<a> =
6378137 m, I<f> = 1/298.257223563.
=item B<-w>
+toggle the longitude first flag (it starts off); if the flag is on, then
on input and output, longitude precedes latitude (except that, on input,
this can be overridden by a hemisphere designator, I<N>, I<S>, I<E>,
I<W>).
-=item B<-p>
+=item B<-p> I<prec>
set the output precision to I<prec> (default 6). I<prec> is the number
of digits after the decimal point for geocentric and local cartesion
@@ -70,7 +71,7 @@ coordinates and for the height (in meters). For latitudes and
longitudes (in degrees), the number of digits after the decimal point is
I<prec> + 5.
-=item B<--comment-delimiter>
+=item B<--comment-delimiter> I<commentdelim>
set the comment delimiter to I<commentdelim> (e.g., "#" or "//"). If
set, the input lines will be scanned for this delimiter and, if found,
@@ -90,23 +91,23 @@ print usage and exit.
print full documentation and exit.
-=item B<--input-file>
+=item B<--input-file> I<infile>
read input from the file I<infile> instead of from standard input; a file
name of "-" stands for standard input.
-=item B<--input-string>
+=item B<--input-string> I<instring>
read input from the string I<instring> instead of from standard input.
All occurrences of the line separator character (default is a semicolon)
in I<instring> are converted to newlines before the reading begins.
-=item B<--line-separator>
+=item B<--line-separator> I<linesep>
set the line separator character to I<linesep>. By default this is a
semicolon.
-=item B<--output-file>
+=item B<--output-file> I<outfile>
write output to the file I<outfile> instead of to standard output; a
file name of "-" stands for standard output.
@@ -142,5 +143,5 @@ B<CartConvert> was written by Charles Karney.
=head1 HISTORY
B<CartConvert> was added to GeographicLib,
-L<http://geographiclib.sf.net>, in 2009-02. Prior to 2009-03 it was
+L<http://geographiclib.sourceforge.net>, in 2009-02. Prior to 2009-03 it was
called ECEFConvert.
diff --git a/man/CartConvert.usage b/man/CartConvert.usage
index 195e5b6..d2863d9 100644
--- a/man/CartConvert.usage
+++ b/man/CartConvert.usage
@@ -9,7 +9,7 @@ int usage(int retval, bool brief) {
"For full documentation type:\n"
" CartConvert --help\n"
"or visit:\n"
-" http://geographiclib.sf.net/1.45/CartConvert.1.html\n";
+" http://geographiclib.sourceforge.net/1.46/CartConvert.1.html\n";
else
( retval ? std::cerr : std::cout ) << "Man page:\n"
"NAME\n"
@@ -45,29 +45,33 @@ int usage(int retval, bool brief) {
" input and each line of standard output gives latitude, longitude,\n"
" height.\n"
"\n"
-" -l specifies conversions to and from a local cartesion coordinate\n"
+" -l lat0 lon0 h0\n"
+" specifies conversions to and from a local cartesion coordinate\n"
" systems with origin lat0 lon0 h0, instead of a geocentric\n"
" coordinate system. The -w flag can be used to swap the default\n"
" order of the 2 geographic coordinates, provided that it appears\n"
" before -l.\n"
"\n"
-" -e specify the ellipsoid via a f; the equatorial radius is a and the\n"
-" flattening is f. Setting f = 0 results in a sphere. Specify f < 0\n"
+" -e a f\n"
+" specify the ellipsoid via the equatorial radius, a and the\n"
+" flattening, f. Setting f = 0 results in a sphere. Specify f < 0\n"
" for a prolate ellipsoid. A simple fraction, e.g., 1/297, is\n"
" allowed for f. By default, the WGS84 ellipsoid is used, a =\n"
" 6378137 m, f = 1/298.257223563.\n"
"\n"
-" -w on input and output, longitude precedes latitude (except that, on\n"
-" input, this can be overridden by a hemisphere designator, N, S, E,\n"
-" W).\n"
+" -w toggle the longitude first flag (it starts off); if the flag is on,\n"
+" then on input and output, longitude precedes latitude (except that,\n"
+" on input, this can be overridden by a hemisphere designator, N, S,\n"
+" E, W).\n"
"\n"
-" -p set the output precision to prec (default 6). prec is the number\n"
+" -p prec\n"
+" set the output precision to prec (default 6). prec is the number\n"
" of digits after the decimal point for geocentric and local\n"
" cartesion coordinates and for the height (in meters). For\n"
" latitudes and longitudes (in degrees), the number of digits after\n"
" the decimal point is prec + 5.\n"
"\n"
-" --comment-delimiter\n"
+" --comment-delimiter commentdelim\n"
" set the comment delimiter to commentdelim (e.g., \"#\" or \"//\"). If\n"
" set, the input lines will be scanned for this delimiter and, if\n"
" found, the delimiter and the rest of the line will be removed prior\n"
@@ -82,21 +86,21 @@ int usage(int retval, bool brief) {
" --help\n"
" print full documentation and exit.\n"
"\n"
-" --input-file\n"
+" --input-file infile\n"
" read input from the file infile instead of from standard input; a\n"
" file name of \"-\" stands for standard input.\n"
"\n"
-" --input-string\n"
+" --input-string instring\n"
" read input from the string instring instead of from standard input.\n"
" All occurrences of the line separator character (default is a\n"
" semicolon) in instring are converted to newlines before the reading\n"
" begins.\n"
"\n"
-" --line-separator\n"
+" --line-separator linesep\n"
" set the line separator character to linesep. By default this is a\n"
" semicolon.\n"
"\n"
-" --output-file\n"
+" --output-file outfile\n"
" write output to the file outfile instead of to standard output; a\n"
" file name of \"-\" stands for standard output.\n"
"\n"
@@ -123,8 +127,9 @@ int usage(int retval, bool brief) {
" CartConvert was written by Charles Karney.\n"
"\n"
"HISTORY\n"
-" CartConvert was added to GeographicLib, <http://geographiclib.sf.net>,\n"
-" in 2009-02. Prior to 2009-03 it was called ECEFConvert.\n"
+" CartConvert was added to GeographicLib,\n"
+" <http://geographiclib.sourceforge.net>, in 2009-02. Prior to 2009-03\n"
+" it was called ECEFConvert.\n"
;
return retval;
}
diff --git a/man/ConicProj.1 b/man/ConicProj.1
index b9e3f6a..ffddddf 100644
--- a/man/ConicProj.1
+++ b/man/ConicProj.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.31)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "CONICPROJ 1"
-.TH CONICPROJ 1 "2015-09-30" "GeographicLib 1.45" "GeographicLib Utilities"
+.TH CONICPROJ 1 "2016-02-14" "GeographicLib 1.46" "GeographicLib Utilities"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -184,19 +184,19 @@ latitude corresponds to the same pole), and the Lambert equal area conic
projection (one standard parallel is at a pole).
.SH "OPTIONS"
.IX Header "OPTIONS"
-.IP "\fB\-c\fR" 4
-.IX Item "-c"
+.IP "\fB\-c\fR \fIlat1\fR \fIlat2\fR" 4
+.IX Item "-c lat1 lat2"
use the Lambert conformal conic projection with standard parallels
\&\fIlat1\fR and \fIlat2\fR.
-.IP "\fB\-a\fR" 4
-.IX Item "-a"
+.IP "\fB\-a\fR \fIlat1\fR \fIlat2\fR" 4
+.IX Item "-a lat1 lat2"
use the Albers equal area projection with standard parallels \fIlat1\fR and
\&\fIlat2\fR.
-.IP "\fB\-l\fR" 4
-.IX Item "-l"
+.IP "\fB\-l\fR \fIlon0\fR" 4
+.IX Item "-l lon0"
specify the longitude of origin \fIlon0\fR (degrees, default 0).
-.IP "\fB\-k\fR" 4
-.IX Item "-k"
+.IP "\fB\-k\fR \fIk1\fR" 4
+.IX Item "-k k1"
specify the (azimuthal) scale \fIk1\fR on the standard parallels (default
1).
.IP "\fB\-r\fR" 4
@@ -204,27 +204,28 @@ specify the (azimuthal) scale \fIk1\fR on the standard parallels (default
perform the reverse projection. \fIx\fR and \fIy\fR are given on standard
input and each line of standard output gives \fIlatitude\fR, \fIlongitude\fR,
\&\fIgamma\fR, and \fIk\fR.
-.IP "\fB\-e\fR" 4
-.IX Item "-e"
-specify the ellipsoid via \fIa\fR \fIf\fR; the equatorial radius is \fIa\fR and
-the flattening is \fIf\fR. Setting \fIf\fR = 0 results in a sphere. Specify
+.IP "\fB\-e\fR \fIa\fR \fIf\fR" 4
+.IX Item "-e a f"
+specify the ellipsoid via the equatorial radius, \fIa\fR and
+the flattening, \fIf\fR. Setting \fIf\fR = 0 results in a sphere. Specify
\&\fIf\fR < 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297,
is allowed for \fIf\fR. By default, the \s-1WGS84\s0 ellipsoid is used, \fIa\fR =
6378137 m, \fIf\fR = 1/298.257223563.
.IP "\fB\-w\fR" 4
.IX Item "-w"
+toggle the longitude first flag (it starts off); if the flag is on, then
on input and output, longitude precedes latitude (except that, on input,
this can be overridden by a hemisphere designator, \fIN\fR, \fIS\fR, \fIE\fR,
\&\fIW\fR).
-.IP "\fB\-p\fR" 4
-.IX Item "-p"
+.IP "\fB\-p\fR \fIprec\fR" 4
+.IX Item "-p prec"
set the output precision to \fIprec\fR (default 6). \fIprec\fR is the number
of digits after the decimal point for lengths (in meters). For
latitudes and longitudes (in degrees), the number of digits after the
decimal point is \fIprec\fR + 5. For the convergence (in degrees) and
scale, the number of digits after the decimal point is \fIprec\fR + 6.
-.IP "\fB\-\-comment\-delimiter\fR" 4
-.IX Item "--comment-delimiter"
+.IP "\fB\-\-comment\-delimiter\fR \fIcommentdelim\fR" 4
+.IX Item "--comment-delimiter commentdelim"
set the comment delimiter to \fIcommentdelim\fR (e.g., \*(L"#\*(R" or \*(L"//\*(R"). If
set, the input lines will be scanned for this delimiter and, if found,
the delimiter and the rest of the line will be removed prior to
@@ -239,21 +240,21 @@ print usage and exit.
.IP "\fB\-\-help\fR" 4
.IX Item "--help"
print full documentation and exit.
-.IP "\fB\-\-input\-file\fR" 4
-.IX Item "--input-file"
+.IP "\fB\-\-input\-file\fR \fIinfile\fR" 4
+.IX Item "--input-file infile"
read input from the file \fIinfile\fR instead of from standard input; a file
name of \*(L"\-\*(R" stands for standard input.
-.IP "\fB\-\-input\-string\fR" 4
-.IX Item "--input-string"
+.IP "\fB\-\-input\-string\fR \fIinstring\fR" 4
+.IX Item "--input-string instring"
read input from the string \fIinstring\fR instead of from standard input.
All occurrences of the line separator character (default is a semicolon)
in \fIinstring\fR are converted to newlines before the reading begins.
-.IP "\fB\-\-line\-separator\fR" 4
-.IX Item "--line-separator"
+.IP "\fB\-\-line\-separator\fR \fIlinesep\fR" 4
+.IX Item "--line-separator linesep"
set the line separator character to \fIlinesep\fR. By default this is a
semicolon.
-.IP "\fB\-\-output\-file\fR" 4
-.IX Item "--output-file"
+.IP "\fB\-\-output\-file\fR \fIoutfile\fR" 4
+.IX Item "--output-file outfile"
write output to the file \fIoutfile\fR instead of to standard output; a
file name of \*(L"\-\*(R" stands for standard output.
.SH "EXAMPLES"
@@ -275,5 +276,5 @@ terminate; following lines will be converted.
\&\fBConicProj\fR was written by Charles Karney.
.SH "HISTORY"
.IX Header "HISTORY"
-\&\fBConicProj\fR was added to GeographicLib, <http://geographiclib.sf.net>,
+\&\fBConicProj\fR was added to GeographicLib, <http://geographiclib.sourceforge.net>,
in version 1.9.
diff --git a/man/ConicProj.1.html b/man/ConicProj.1.html
index e07e501..b1217d0 100644
--- a/man/ConicProj.1.html
+++ b/man/ConicProj.1.html
@@ -7,7 +7,7 @@
<link rev="made" href="mailto:root at localhost" />
</head>
-<body style="background-color: white">
+<body>
@@ -31,25 +31,25 @@
<dl>
-<dt id="c"><b>-c</b></dt>
+<dt id="c-lat1-lat2"><b>-c</b> <i>lat1</i> <i>lat2</i></dt>
<dd>
<p>use the Lambert conformal conic projection with standard parallels <i>lat1</i> and <i>lat2</i>.</p>
</dd>
-<dt id="a"><b>-a</b></dt>
+<dt id="a-lat1-lat2"><b>-a</b> <i>lat1</i> <i>lat2</i></dt>
<dd>
<p>use the Albers equal area projection with standard parallels <i>lat1</i> and <i>lat2</i>.</p>
</dd>
-<dt id="l"><b>-l</b></dt>
+<dt id="l-lon0"><b>-l</b> <i>lon0</i></dt>
<dd>
<p>specify the longitude of origin <i>lon0</i> (degrees, default 0).</p>
</dd>
-<dt id="k"><b>-k</b></dt>
+<dt id="k-k1"><b>-k</b> <i>k1</i></dt>
<dd>
<p>specify the (azimuthal) scale <i>k1</i> on the standard parallels (default 1).</p>
@@ -61,25 +61,25 @@
<p>perform the reverse projection. <i>x</i> and <i>y</i> are given on standard input and each line of standard output gives <i>latitude</i>, <i>longitude</i>, <i>gamma</i>, and <i>k</i>.</p>
</dd>
-<dt id="e"><b>-e</b></dt>
+<dt id="e-a-f"><b>-e</b> <i>a</i> <i>f</i></dt>
<dd>
-<p>specify the ellipsoid via <i>a</i> <i>f</i>; the equatorial radius is <i>a</i> and the flattening is <i>f</i>. Setting <i>f</i> = 0 results in a sphere. Specify <i>f</i> < 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297, is allowed for <i>f</i>. By default, the WGS84 ellipsoid is used, <i>a</i> = 6378137 m, <i>f</i> = 1/298.257223563.</p>
+<p>specify the ellipsoid via the equatorial radius, <i>a</i> and the flattening, <i>f</i>. Setting <i>f</i> = 0 results in a sphere. Specify <i>f</i> < 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297, is allowed for <i>f</i>. By default, the WGS84 ellipsoid is used, <i>a</i> = 6378137 m, <i>f</i> = 1/298.257223563.</p>
</dd>
<dt id="w"><b>-w</b></dt>
<dd>
-<p>on input and output, longitude precedes latitude (except that, on input, this can be overridden by a hemisphere designator, <i>N</i>, <i>S</i>, <i>E</i>, <i>W</i>).</p>
+<p>toggle the longitude first flag (it starts off); if the flag is on, then on input and output, longitude precedes latitude (except that, on input, this can be overridden by a hemisphere designator, <i>N</i>, <i>S</i>, <i>E</i>, <i>W</i>).</p>
</dd>
-<dt id="p"><b>-p</b></dt>
+<dt id="p-prec"><b>-p</b> <i>prec</i></dt>
<dd>
<p>set the output precision to <i>prec</i> (default 6). <i>prec</i> is the number of digits after the decimal point for lengths (in meters). For latitudes and longitudes (in degrees), the number of digits after the decimal point is <i>prec</i> + 5. For the convergence (in degrees) and scale, the number of digits after the decimal point is <i>prec</i> + 6.</p>
</dd>
-<dt id="comment-delimiter"><b>--comment-delimiter</b></dt>
+<dt id="comment-delimiter-commentdelim"><b>--comment-delimiter</b> <i>commentdelim</i></dt>
<dd>
<p>set the comment delimiter to <i>commentdelim</i> (e.g., "#" or "//"). If set, the input lines will be scanned for this delimiter and, if found, the delimiter and the rest of the line will be removed prior to processing and subsequently appended to the output line (separated by a space).</p>
@@ -103,25 +103,25 @@
<p>print full documentation and exit.</p>
</dd>
-<dt id="input-file"><b>--input-file</b></dt>
+<dt id="input-file-infile"><b>--input-file</b> <i>infile</i></dt>
<dd>
<p>read input from the file <i>infile</i> instead of from standard input; a file name of "-" stands for standard input.</p>
</dd>
-<dt id="input-string"><b>--input-string</b></dt>
+<dt id="input-string-instring"><b>--input-string</b> <i>instring</i></dt>
<dd>
<p>read input from the string <i>instring</i> instead of from standard input. All occurrences of the line separator character (default is a semicolon) in <i>instring</i> are converted to newlines before the reading begins.</p>
</dd>
-<dt id="line-separator"><b>--line-separator</b></dt>
+<dt id="line-separator-linesep"><b>--line-separator</b> <i>linesep</i></dt>
<dd>
<p>set the line separator character to <i>linesep</i>. By default this is a semicolon.</p>
</dd>
-<dt id="output-file"><b>--output-file</b></dt>
+<dt id="output-file-outfile"><b>--output-file</b> <i>outfile</i></dt>
<dd>
<p>write output to the file <i>outfile</i> instead of to standard output; a file name of "-" stands for standard output.</p>
@@ -146,7 +146,7 @@
<h1 id="HISTORY">HISTORY</h1>
-<p><b>ConicProj</b> was added to GeographicLib, <a href="http://geographiclib.sf.net">http://geographiclib.sf.net</a>, in version 1.9.</p>
+<p><b>ConicProj</b> was added to GeographicLib, <a href="http://geographiclib.sourceforge.net">http://geographiclib.sourceforge.net</a>, in version 1.9.</p>
</body>
diff --git a/man/ConicProj.pod b/man/ConicProj.pod
index a59c348..3caa2b2 100644
--- a/man/ConicProj.pod
+++ b/man/ConicProj.pod
@@ -50,21 +50,21 @@ projection (one standard parallel is at a pole).
=over
-=item B<-c>
+=item B<-c> I<lat1> I<lat2>
use the Lambert conformal conic projection with standard parallels
I<lat1> and I<lat2>.
-=item B<-a>
+=item B<-a> I<lat1> I<lat2>
use the Albers equal area projection with standard parallels I<lat1> and
I<lat2>.
-=item B<-l>
+=item B<-l> I<lon0>
specify the longitude of origin I<lon0> (degrees, default 0).
-=item B<-k>
+=item B<-k> I<k1>
specify the (azimuthal) scale I<k1> on the standard parallels (default
1).
@@ -75,21 +75,22 @@ perform the reverse projection. I<x> and I<y> are given on standard
input and each line of standard output gives I<latitude>, I<longitude>,
I<gamma>, and I<k>.
-=item B<-e>
+=item B<-e> I<a> I<f>
-specify the ellipsoid via I<a> I<f>; the equatorial radius is I<a> and
-the flattening is I<f>. Setting I<f> = 0 results in a sphere. Specify
+specify the ellipsoid via the equatorial radius, I<a> and
+the flattening, I<f>. Setting I<f> = 0 results in a sphere. Specify
I<f> E<lt> 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297,
is allowed for I<f>. By default, the WGS84 ellipsoid is used, I<a> =
6378137 m, I<f> = 1/298.257223563.
=item B<-w>
+toggle the longitude first flag (it starts off); if the flag is on, then
on input and output, longitude precedes latitude (except that, on input,
this can be overridden by a hemisphere designator, I<N>, I<S>, I<E>,
I<W>).
-=item B<-p>
+=item B<-p> I<prec>
set the output precision to I<prec> (default 6). I<prec> is the number
of digits after the decimal point for lengths (in meters). For
@@ -97,7 +98,7 @@ latitudes and longitudes (in degrees), the number of digits after the
decimal point is I<prec> + 5. For the convergence (in degrees) and
scale, the number of digits after the decimal point is I<prec> + 6.
-=item B<--comment-delimiter>
+=item B<--comment-delimiter> I<commentdelim>
set the comment delimiter to I<commentdelim> (e.g., "#" or "//"). If
set, the input lines will be scanned for this delimiter and, if found,
@@ -117,23 +118,23 @@ print usage and exit.
print full documentation and exit.
-=item B<--input-file>
+=item B<--input-file> I<infile>
read input from the file I<infile> instead of from standard input; a file
name of "-" stands for standard input.
-=item B<--input-string>
+=item B<--input-string> I<instring>
read input from the string I<instring> instead of from standard input.
All occurrences of the line separator character (default is a semicolon)
in I<instring> are converted to newlines before the reading begins.
-=item B<--line-separator>
+=item B<--line-separator> I<linesep>
set the line separator character to I<linesep>. By default this is a
semicolon.
-=item B<--output-file>
+=item B<--output-file> I<outfile>
write output to the file I<outfile> instead of to standard output; a
file name of "-" stands for standard output.
@@ -160,5 +161,5 @@ B<ConicProj> was written by Charles Karney.
=head1 HISTORY
-B<ConicProj> was added to GeographicLib, L<http://geographiclib.sf.net>,
+B<ConicProj> was added to GeographicLib, L<http://geographiclib.sourceforge.net>,
in version 1.9.
diff --git a/man/ConicProj.usage b/man/ConicProj.usage
index e9ad2e6..dce2fcb 100644
--- a/man/ConicProj.usage
+++ b/man/ConicProj.usage
@@ -9,7 +9,7 @@ int usage(int retval, bool brief) {
"For full documentation type:\n"
" ConicProj --help\n"
"or visit:\n"
-" http://geographiclib.sf.net/1.45/ConicProj.1.html\n";
+" http://geographiclib.sourceforge.net/1.46/ConicProj.1.html\n";
else
( retval ? std::cerr : std::cout ) << "Man page:\n"
"NAME\n"
@@ -54,39 +54,46 @@ int usage(int retval, bool brief) {
" conic projection (one standard parallel is at a pole).\n"
"\n"
"OPTIONS\n"
-" -c use the Lambert conformal conic projection with standard parallels\n"
+" -c lat1 lat2\n"
+" use the Lambert conformal conic projection with standard parallels\n"
" lat1 and lat2.\n"
"\n"
-" -a use the Albers equal area projection with standard parallels lat1\n"
+" -a lat1 lat2\n"
+" use the Albers equal area projection with standard parallels lat1\n"
" and lat2.\n"
"\n"
-" -l specify the longitude of origin lon0 (degrees, default 0).\n"
+" -l lon0\n"
+" specify the longitude of origin lon0 (degrees, default 0).\n"
"\n"
-" -k specify the (azimuthal) scale k1 on the standard parallels (default\n"
+" -k k1\n"
+" specify the (azimuthal) scale k1 on the standard parallels (default\n"
" 1).\n"
"\n"
" -r perform the reverse projection. x and y are given on standard\n"
" input and each line of standard output gives latitude, longitude,\n"
" gamma, and k.\n"
"\n"
-" -e specify the ellipsoid via a f; the equatorial radius is a and the\n"
-" flattening is f. Setting f = 0 results in a sphere. Specify f < 0\n"
+" -e a f\n"
+" specify the ellipsoid via the equatorial radius, a and the\n"
+" flattening, f. Setting f = 0 results in a sphere. Specify f < 0\n"
" for a prolate ellipsoid. A simple fraction, e.g., 1/297, is\n"
" allowed for f. By default, the WGS84 ellipsoid is used, a =\n"
" 6378137 m, f = 1/298.257223563.\n"
"\n"
-" -w on input and output, longitude precedes latitude (except that, on\n"
-" input, this can be overridden by a hemisphere designator, N, S, E,\n"
-" W).\n"
+" -w toggle the longitude first flag (it starts off); if the flag is on,\n"
+" then on input and output, longitude precedes latitude (except that,\n"
+" on input, this can be overridden by a hemisphere designator, N, S,\n"
+" E, W).\n"
"\n"
-" -p set the output precision to prec (default 6). prec is the number\n"
+" -p prec\n"
+" set the output precision to prec (default 6). prec is the number\n"
" of digits after the decimal point for lengths (in meters). For\n"
" latitudes and longitudes (in degrees), the number of digits after\n"
" the decimal point is prec + 5. For the convergence (in degrees)\n"
" and scale, the number of digits after the decimal point is prec +\n"
" 6.\n"
"\n"
-" --comment-delimiter\n"
+" --comment-delimiter commentdelim\n"
" set the comment delimiter to commentdelim (e.g., \"#\" or \"//\"). If\n"
" set, the input lines will be scanned for this delimiter and, if\n"
" found, the delimiter and the rest of the line will be removed prior\n"
@@ -101,21 +108,21 @@ int usage(int retval, bool brief) {
" --help\n"
" print full documentation and exit.\n"
"\n"
-" --input-file\n"
+" --input-file infile\n"
" read input from the file infile instead of from standard input; a\n"
" file name of \"-\" stands for standard input.\n"
"\n"
-" --input-string\n"
+" --input-string instring\n"
" read input from the string instring instead of from standard input.\n"
" All occurrences of the line separator character (default is a\n"
" semicolon) in instring are converted to newlines before the reading\n"
" begins.\n"
"\n"
-" --line-separator\n"
+" --line-separator linesep\n"
" set the line separator character to linesep. By default this is a\n"
" semicolon.\n"
"\n"
-" --output-file\n"
+" --output-file outfile\n"
" write output to the file outfile instead of to standard output; a\n"
" file name of \"-\" stands for standard output.\n"
"\n"
@@ -135,8 +142,8 @@ int usage(int retval, bool brief) {
" ConicProj was written by Charles Karney.\n"
"\n"
"HISTORY\n"
-" ConicProj was added to GeographicLib, <http://geographiclib.sf.net>, in\n"
-" version 1.9.\n"
+" ConicProj was added to GeographicLib,\n"
+" <http://geographiclib.sourceforge.net>, in version 1.9.\n"
;
return retval;
}
diff --git a/man/GeoConvert.1 b/man/GeoConvert.1
index 6d1c914..d97f0d4 100644
--- a/man/GeoConvert.1
+++ b/man/GeoConvert.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.31)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "GEOCONVERT 1"
-.TH GEOCONVERT 1 "2015-09-30" "GeographicLib 1.45" "GeographicLib Utilities"
+.TH GEOCONVERT 1 "2016-02-14" "GeographicLib 1.46" "GeographicLib Utilities"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -143,8 +143,8 @@ GeoConvert \-\- convert geographic coordinates
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
\&\fBGeoConvert\fR [ \fB\-g\fR | \fB\-d\fR | \fB\-:\fR | \fB\-u\fR | \fB\-m\fR | \fB\-c\fR ]
-[ \fB\-z\fR \fIzone\fR | \fB\-s\fR | \fB\-t\fR ] [ \fB\-n\fR ]
-[ \fB\-w\fR ] [ \fB\-p\fR \fIprec\fR ] [ \fB\-l\fR | \fB\-a\fR ]
+[ \fB\-z\fR \fIzone\fR | \fB\-s\fR | \fB\-t\fR | \fB\-S\fR | \fB\-T\fR ]
+[ \fB\-n\fR ] [ \fB\-w\fR ] [ \fB\-p\fR \fIprec\fR ] [ \fB\-l\fR | \fB\-a\fR ]
[ \fB\-\-comment\-delimiter\fR \fIcommentdelim\fR ]
[ \fB\-\-version\fR | \fB\-h\fR | \fB\-\-help\fR ]
[ \fB\-\-input\-file\fR \fIinfile\fR | \fB\-\-input\-string\fR \fIinstring\fR ]
@@ -216,11 +216,11 @@ output \s-1UTM\s0 or \s-1UPS.\s0
output \s-1MGRS.\s0
.IP "\fB\-c\fR" 4
.IX Item "-c"
-output meridian convergence and scale for the corresponding \s-1UTM\s0 or
-\&\s-1UPS\s0 projection. Convergence is the bearing of grid north given as
-degrees clockwise from true north.
-.IP "\fB\-z\fR" 4
-.IX Item "-z"
+output meridian convergence and scale for the corresponding \s-1UTM\s0 or \s-1UPS\s0
+projection. The meridian convergence is the bearing of grid north given
+as degrees clockwise from true north.
+.IP "\fB\-z\fR \fIzone\fR" 4
+.IX Item "-z zone"
set the zone to \fIzone\fR for output. Use either 0 < \fIzone\fR <=
60 for a \s-1UTM\s0 zone or \fIzone\fR = 0 for \s-1UPS. \s0 Alternatively use a
\&\fIzone\fR+\fIhemisphere\fR designation, e.g., 38n. See \*(L"\s-1ZONE\*(R"\s0.
@@ -230,17 +230,24 @@ use the standard \s-1UPS\s0 and \s-1UTM\s0 zones.
.IP "\fB\-t\fR" 4
.IX Item "-t"
similar to \fB\-s\fR but forces \s-1UPS\s0 regions to the closest \s-1UTM\s0 zone.
+.IP "\fB\-S\fR or \fB\-T\fR" 4
+.IX Item "-S or -T"
+behave the same as \fB\-s\fR and \fB\-t\fR, respectively, until the first legal
+conversion is performed. For subsequent points, the zone and hemisphere
+of that conversion are used. This enables a sequence of points to be
+converted into \s-1UTM\s0 or \s-1UPS\s0 using a consistent coordinate system.
.IP "\fB\-n\fR" 4
.IX Item "-n"
on input, \s-1MGRS\s0 coordinates refer to the south-west corner of the \s-1MGRS\s0
square instead of the center; see \*(L"\s-1MGRS\*(R"\s0.
.IP "\fB\-w\fR" 4
.IX Item "-w"
+toggle the longitude first flag (it starts off); if the flag is on, then
on input and output, longitude precedes latitude (except that, on input,
this can be overridden by a hemisphere designator, \fIN\fR, \fIS\fR, \fIE\fR,
\&\fIW\fR).
-.IP "\fB\-p\fR" 4
-.IX Item "-p"
+.IP "\fB\-p\fR \fIprec\fR" 4
+.IX Item "-p prec"
set the output precision to \fIprec\fR (default 0); \fIprec\fR is the
precision relative to 1 m. See \*(L"\s-1PRECISION\*(R"\s0.
.IP "\fB\-l\fR" 4
@@ -252,8 +259,8 @@ designate the hemisphere instead of \fIn\fR or \fIs\fR.
on output, \s-1UTM/UPS\s0 uses the abbreviations \fIn\fR and \fIs\fR to designate the
hemisphere instead of \fInorth\fR or \fIsouth\fR; this is the default
representation.
-.IP "\fB\-\-comment\-delimiter\fR" 4
-.IX Item "--comment-delimiter"
+.IP "\fB\-\-comment\-delimiter\fR \fIcommentdelim\fR" 4
+.IX Item "--comment-delimiter commentdelim"
set the comment delimiter to \fIcommentdelim\fR (e.g., \*(L"#\*(R" or \*(L"//\*(R"). If
set, the input lines will be scanned for this delimiter and, if found,
the delimiter and the rest of the line will be removed prior to
@@ -268,21 +275,21 @@ print usage and exit.
.IP "\fB\-\-help\fR" 4
.IX Item "--help"
print full documentation and exit.
-.IP "\fB\-\-input\-file\fR" 4
-.IX Item "--input-file"
+.IP "\fB\-\-input\-file\fR \fIinfile\fR" 4
+.IX Item "--input-file infile"
read input from the file \fIinfile\fR instead of from standard input; a file
name of \*(L"\-\*(R" stands for standard input.
-.IP "\fB\-\-input\-string\fR" 4
-.IX Item "--input-string"
+.IP "\fB\-\-input\-string\fR \fIinstring\fR" 4
+.IX Item "--input-string instring"
read input from the string \fIinstring\fR instead of from standard input.
All occurrences of the line separator character (default is a semicolon)
in \fIinstring\fR are converted to newlines before the reading begins.
-.IP "\fB\-\-line\-separator\fR" 4
-.IX Item "--line-separator"
+.IP "\fB\-\-line\-separator\fR \fIlinesep\fR" 4
+.IX Item "--line-separator linesep"
set the line separator character to \fIlinesep\fR. By default this is a
semicolon.
-.IP "\fB\-\-output\-file\fR" 4
-.IX Item "--output-file"
+.IP "\fB\-\-output\-file\fR \fIoutfile\fR" 4
+.IX Item "--output-file outfile"
write output to the file \fIoutfile\fR instead of to standard output; a
file name of \*(L"\-\*(R" stands for standard output.
.SH "PRECISION"
@@ -517,4 +524,4 @@ nanometers\fR, J. Geodesy \fB85\fR(8), 475\-485 (Aug. 2011); \s-1DOI
.SH "HISTORY"
.IX Header "HISTORY"
\&\fBGeoConvert\fR was added to GeographicLib,
-<http://geographiclib.sf.net>, in 2009\-01.
+<http://geographiclib.sourceforge.net>, in 2009\-01.
diff --git a/man/GeoConvert.1.html b/man/GeoConvert.1.html
index 7f3357a..f5b1490 100644
--- a/man/GeoConvert.1.html
+++ b/man/GeoConvert.1.html
@@ -7,7 +7,7 @@
<link rev="made" href="mailto:root at localhost" />
</head>
-<body style="background-color: white">
+<body>
@@ -17,7 +17,7 @@
<h1 id="SYNOPSIS">SYNOPSIS</h1>
-<p><b>GeoConvert</b> [ <b>-g</b> | <b>-d</b> | <b>-:</b> | <b>-u</b> | <b>-m</b> | <b>-c</b> ] [ <b>-z</b> <i>zone</i> | <b>-s</b> | <b>-t</b> ] [ <b>-n</b> ] [ <b>-w</b> ] [ <b>-p</b> <i>prec</i> ] [ <b>-l</b> | <b>-a</b> ] [ <b>--comment-delimiter</b> <i>commentdelim</i> ] [ <b>--version</b> | <b>-h</b> | <b>--help</b> ] [ <b>--input-file</b> <i>infile</i> | <b>--input-string</b> <i>instring</i> ] [ <b>--line-separator</b> <i>linesep</i> ] [ <b>--output-file</b> <i>outfile</i> ]</p>
+<p><b>GeoConvert</b> [ <b>-g</b> | <b>-d</b> | <b>-:</b> | <b>-u</b> | <b>-m</b> | <b>-c</b> ] [ <b>-z</b> <i>zone</i> | <b>-s</b> | <b>-t</b> | <b>-S</b> | <b>-T</b> ] [ <b>-n</b> ] [ <b>-w</b> ] [ <b>-p</b> <i>prec</i> ] [ <b>-l</b> | <b>-a</b> ] [ <b>--comment-delimiter</b> <i>commentdelim</i> ] [ <b>--version</b> | <b>-h</b> | <b>--help</b> ] [ <b>--input-file</b> <i>infile</i> | <b>--input-string</b> <i>instring</i> ] [ <b>--line-separator</b> <i>linesep</i> ] [ <b>--output-file</b> [...]
<h1 id="DESCRIPTION">DESCRIPTION</h1>
@@ -96,10 +96,10 @@
<dt id="c"><b>-c</b></dt>
<dd>
-<p>output meridian convergence and scale for the corresponding UTM or UPS projection. Convergence is the bearing of grid north given as degrees clockwise from true north.</p>
+<p>output meridian convergence and scale for the corresponding UTM or UPS projection. The meridian convergence is the bearing of grid north given as degrees clockwise from true north.</p>
</dd>
-<dt id="z"><b>-z</b></dt>
+<dt id="z-zone"><b>-z</b> <i>zone</i></dt>
<dd>
<p>set the zone to <i>zone</i> for output. Use either 0 < <i>zone</i> <= 60 for a UTM zone or <i>zone</i> = 0 for UPS. Alternatively use a <i>zone</i>+<i>hemisphere</i> designation, e.g., 38n. See <a href="#ZONE">"ZONE"</a>.</p>
@@ -117,6 +117,12 @@
<p>similar to <b>-s</b> but forces UPS regions to the closest UTM zone.</p>
</dd>
+<dt id="S-or--T"><b>-S</b> or <b>-T</b></dt>
+<dd>
+
+<p>behave the same as <b>-s</b> and <b>-t</b>, respectively, until the first legal conversion is performed. For subsequent points, the zone and hemisphere of that conversion are used. This enables a sequence of points to be converted into UTM or UPS using a consistent coordinate system.</p>
+
+</dd>
<dt id="n"><b>-n</b></dt>
<dd>
@@ -126,10 +132,10 @@
<dt id="w"><b>-w</b></dt>
<dd>
-<p>on input and output, longitude precedes latitude (except that, on input, this can be overridden by a hemisphere designator, <i>N</i>, <i>S</i>, <i>E</i>, <i>W</i>).</p>
+<p>toggle the longitude first flag (it starts off); if the flag is on, then on input and output, longitude precedes latitude (except that, on input, this can be overridden by a hemisphere designator, <i>N</i>, <i>S</i>, <i>E</i>, <i>W</i>).</p>
</dd>
-<dt id="p"><b>-p</b></dt>
+<dt id="p-prec"><b>-p</b> <i>prec</i></dt>
<dd>
<p>set the output precision to <i>prec</i> (default 0); <i>prec</i> is the precision relative to 1 m. See <a href="#PRECISION">"PRECISION"</a>.</p>
@@ -147,7 +153,7 @@
<p>on output, UTM/UPS uses the abbreviations <i>n</i> and <i>s</i> to designate the hemisphere instead of <i>north</i> or <i>south</i>; this is the default representation.</p>
</dd>
-<dt id="comment-delimiter"><b>--comment-delimiter</b></dt>
+<dt id="comment-delimiter-commentdelim"><b>--comment-delimiter</b> <i>commentdelim</i></dt>
<dd>
<p>set the comment delimiter to <i>commentdelim</i> (e.g., "#" or "//"). If set, the input lines will be scanned for this delimiter and, if found, the delimiter and the rest of the line will be removed prior to processing and subsequently appended to the output line (separated by a space).</p>
@@ -171,25 +177,25 @@
<p>print full documentation and exit.</p>
</dd>
-<dt id="input-file"><b>--input-file</b></dt>
+<dt id="input-file-infile"><b>--input-file</b> <i>infile</i></dt>
<dd>
<p>read input from the file <i>infile</i> instead of from standard input; a file name of "-" stands for standard input.</p>
</dd>
-<dt id="input-string"><b>--input-string</b></dt>
+<dt id="input-string-instring"><b>--input-string</b> <i>instring</i></dt>
<dd>
<p>read input from the string <i>instring</i> instead of from standard input. All occurrences of the line separator character (default is a semicolon) in <i>instring</i> are converted to newlines before the reading begins.</p>
</dd>
-<dt id="line-separator"><b>--line-separator</b></dt>
+<dt id="line-separator-linesep"><b>--line-separator</b> <i>linesep</i></dt>
<dd>
<p>set the line separator character to <i>linesep</i>. By default this is a semicolon.</p>
</dd>
-<dt id="output-file"><b>--output-file</b></dt>
+<dt id="output-file-outfile"><b>--output-file</b> <i>outfile</i></dt>
<dd>
<p>write output to the file <i>outfile</i> instead of to standard output; a file name of "-" stands for standard output.</p>
@@ -363,7 +369,7 @@
<h1 id="HISTORY">HISTORY</h1>
-<p><b>GeoConvert</b> was added to GeographicLib, <a href="http://geographiclib.sf.net">http://geographiclib.sf.net</a>, in 2009-01.</p>
+<p><b>GeoConvert</b> was added to GeographicLib, <a href="http://geographiclib.sourceforge.net">http://geographiclib.sourceforge.net</a>, in 2009-01.</p>
</body>
diff --git a/man/GeoConvert.pod b/man/GeoConvert.pod
index e49d001..18ffaa8 100644
--- a/man/GeoConvert.pod
+++ b/man/GeoConvert.pod
@@ -5,8 +5,8 @@ GeoConvert -- convert geographic coordinates
=head1 SYNOPSIS
B<GeoConvert> [ B<-g> | B<-d> | B<-:> | B<-u> | B<-m> | B<-c> ]
-[ B<-z> I<zone> | B<-s> | B<-t> ] [ B<-n> ]
-[ B<-w> ] [ B<-p> I<prec> ] [ B<-l> | B<-a> ]
+[ B<-z> I<zone> | B<-s> | B<-t> | B<-S> | B<-T> ]
+[ B<-n> ] [ B<-w> ] [ B<-p> I<prec> ] [ B<-l> | B<-a> ]
[ B<--comment-delimiter> I<commentdelim> ]
[ B<--version> | B<-h> | B<--help> ]
[ B<--input-file> I<infile> | B<--input-string> I<instring> ]
@@ -88,11 +88,11 @@ output MGRS.
=item B<-c>
-output meridian convergence and scale for the corresponding UTM or
-UPS projection. Convergence is the bearing of grid north given as
-degrees clockwise from true north.
+output meridian convergence and scale for the corresponding UTM or UPS
+projection. The meridian convergence is the bearing of grid north given
+as degrees clockwise from true north.
-=item B<-z>
+=item B<-z> I<zone>
set the zone to I<zone> for output. Use either 0 E<lt> I<zone> E<lt>=
60 for a UTM zone or I<zone> = 0 for UPS. Alternatively use a
@@ -106,6 +106,13 @@ use the standard UPS and UTM zones.
similar to B<-s> but forces UPS regions to the closest UTM zone.
+=item B<-S> or B<-T>
+
+behave the same as B<-s> and B<-t>, respectively, until the first legal
+conversion is performed. For subsequent points, the zone and hemisphere
+of that conversion are used. This enables a sequence of points to be
+converted into UTM or UPS using a consistent coordinate system.
+
=item B<-n>
on input, MGRS coordinates refer to the south-west corner of the MGRS
@@ -113,11 +120,12 @@ square instead of the center; see L</MGRS>.
=item B<-w>
+toggle the longitude first flag (it starts off); if the flag is on, then
on input and output, longitude precedes latitude (except that, on input,
this can be overridden by a hemisphere designator, I<N>, I<S>, I<E>,
I<W>).
-=item B<-p>
+=item B<-p> I<prec>
set the output precision to I<prec> (default 0); I<prec> is the
precision relative to 1 m. See L</PRECISION>.
@@ -133,7 +141,7 @@ on output, UTM/UPS uses the abbreviations I<n> and I<s> to designate the
hemisphere instead of I<north> or I<south>; this is the default
representation.
-=item B<--comment-delimiter>
+=item B<--comment-delimiter> I<commentdelim>
set the comment delimiter to I<commentdelim> (e.g., "#" or "//"). If
set, the input lines will be scanned for this delimiter and, if found,
@@ -153,23 +161,23 @@ print usage and exit.
print full documentation and exit.
-=item B<--input-file>
+=item B<--input-file> I<infile>
read input from the file I<infile> instead of from standard input; a file
name of "-" stands for standard input.
-=item B<--input-string>
+=item B<--input-string> I<instring>
read input from the string I<instring> instead of from standard input.
All occurrences of the line separator character (default is a semicolon)
in I<instring> are converted to newlines before the reading begins.
-=item B<--line-separator>
+=item B<--line-separator> I<linesep>
set the line separator character to I<linesep>. By default this is a
semicolon.
-=item B<--output-file>
+=item B<--output-file> I<outfile>
write output to the file I<outfile> instead of to standard output; a
file name of "-" stands for standard output.
@@ -408,4 +416,4 @@ B<GeoConvert> was written by Charles Karney.
=head1 HISTORY
B<GeoConvert> was added to GeographicLib,
-L<http://geographiclib.sf.net>, in 2009-01.
+L<http://geographiclib.sourceforge.net>, in 2009-01.
diff --git a/man/GeoConvert.usage b/man/GeoConvert.usage
index 215185a..48c4af4 100644
--- a/man/GeoConvert.usage
+++ b/man/GeoConvert.usage
@@ -1,25 +1,27 @@
int usage(int retval, bool brief) {
if (brief)
( retval ? std::cerr : std::cout ) << "Usage:\n"
-" GeoConvert [ -g | -d | -: | -u | -m | -c ] [ -z zone | -s | -t ] [ -n ]\n"
-" [ -w ] [ -p prec ] [ -l | -a ] [ --comment-delimiter commentdelim ] [\n"
-" --version | -h | --help ] [ --input-file infile | --input-string\n"
-" instring ] [ --line-separator linesep ] [ --output-file outfile ]\n"
+" GeoConvert [ -g | -d | -: | -u | -m | -c ] [ -z zone | -s | -t | -S |\n"
+" -T ] [ -n ] [ -w ] [ -p prec ] [ -l | -a ] [ --comment-delimiter\n"
+" commentdelim ] [ --version | -h | --help ] [ --input-file infile |\n"
+" --input-string instring ] [ --line-separator linesep ] [ --output-file\n"
+" outfile ]\n"
"\n"
"For full documentation type:\n"
" GeoConvert --help\n"
"or visit:\n"
-" http://geographiclib.sf.net/1.45/GeoConvert.1.html\n";
+" http://geographiclib.sourceforge.net/1.46/GeoConvert.1.html\n";
else
( retval ? std::cerr : std::cout ) << "Man page:\n"
"NAME\n"
" GeoConvert -- convert geographic coordinates\n"
"\n"
"SYNOPSIS\n"
-" GeoConvert [ -g | -d | -: | -u | -m | -c ] [ -z zone | -s | -t ] [ -n ]\n"
-" [ -w ] [ -p prec ] [ -l | -a ] [ --comment-delimiter commentdelim ] [\n"
-" --version | -h | --help ] [ --input-file infile | --input-string\n"
-" instring ] [ --line-separator linesep ] [ --output-file outfile ]\n"
+" GeoConvert [ -g | -d | -: | -u | -m | -c ] [ -z zone | -s | -t | -S |\n"
+" -T ] [ -n ] [ -w ] [ -p prec ] [ -l | -a ] [ --comment-delimiter\n"
+" commentdelim ] [ --version | -h | --help ] [ --input-file infile |\n"
+" --input-string instring ] [ --line-separator linesep ] [ --output-file\n"
+" outfile ]\n"
"\n"
"DESCRIPTION\n"
" GeoConvert reads from standard input interpreting each line as a\n"
@@ -76,10 +78,11 @@ int usage(int retval, bool brief) {
" -m output MGRS.\n"
"\n"
" -c output meridian convergence and scale for the corresponding UTM or\n"
-" UPS projection. Convergence is the bearing of grid north given as\n"
-" degrees clockwise from true north.\n"
+" UPS projection. The meridian convergence is the bearing of grid\n"
+" north given as degrees clockwise from true north.\n"
"\n"
-" -z set the zone to zone for output. Use either 0 < zone <= 60 for a\n"
+" -z zone\n"
+" set the zone to zone for output. Use either 0 < zone <= 60 for a\n"
" UTM zone or zone = 0 for UPS. Alternatively use a zone+hemisphere\n"
" designation, e.g., 38n. See \"ZONE\".\n"
"\n"
@@ -87,14 +90,23 @@ int usage(int retval, bool brief) {
"\n"
" -t similar to -s but forces UPS regions to the closest UTM zone.\n"
"\n"
+" -S or -T\n"
+" behave the same as -s and -t, respectively, until the first legal\n"
+" conversion is performed. For subsequent points, the zone and\n"
+" hemisphere of that conversion are used. This enables a sequence of\n"
+" points to be converted into UTM or UPS using a consistent\n"
+" coordinate system.\n"
+"\n"
" -n on input, MGRS coordinates refer to the south-west corner of the\n"
" MGRS square instead of the center; see \"MGRS\".\n"
"\n"
-" -w on input and output, longitude precedes latitude (except that, on\n"
-" input, this can be overridden by a hemisphere designator, N, S, E,\n"
-" W).\n"
+" -w toggle the longitude first flag (it starts off); if the flag is on,\n"
+" then on input and output, longitude precedes latitude (except that,\n"
+" on input, this can be overridden by a hemisphere designator, N, S,\n"
+" E, W).\n"
"\n"
-" -p set the output precision to prec (default 0); prec is the precision\n"
+" -p prec\n"
+" set the output precision to prec (default 0); prec is the precision\n"
" relative to 1 m. See \"PRECISION\".\n"
"\n"
" -l on output, UTM/UPS uses the long forms north and south to designate\n"
@@ -104,7 +116,7 @@ int usage(int retval, bool brief) {
" hemisphere instead of north or south; this is the default\n"
" representation.\n"
"\n"
-" --comment-delimiter\n"
+" --comment-delimiter commentdelim\n"
" set the comment delimiter to commentdelim (e.g., \"#\" or \"//\"). If\n"
" set, the input lines will be scanned for this delimiter and, if\n"
" found, the delimiter and the rest of the line will be removed prior\n"
@@ -119,21 +131,21 @@ int usage(int retval, bool brief) {
" --help\n"
" print full documentation and exit.\n"
"\n"
-" --input-file\n"
+" --input-file infile\n"
" read input from the file infile instead of from standard input; a\n"
" file name of \"-\" stands for standard input.\n"
"\n"
-" --input-string\n"
+" --input-string instring\n"
" read input from the string instring instead of from standard input.\n"
" All occurrences of the line separator character (default is a\n"
" semicolon) in instring are converted to newlines before the reading\n"
" begins.\n"
"\n"
-" --line-separator\n"
+" --line-separator linesep\n"
" set the line separator character to linesep. By default this is a\n"
" semicolon.\n"
"\n"
-" --output-file\n"
+" --output-file outfile\n"
" write output to the file outfile instead of to standard output; a\n"
" file name of \"-\" stands for standard output.\n"
"\n"
@@ -338,8 +350,8 @@ int usage(int retval, bool brief) {
" GeoConvert was written by Charles Karney.\n"
"\n"
"HISTORY\n"
-" GeoConvert was added to GeographicLib, <http://geographiclib.sf.net>,\n"
-" in 2009-01.\n"
+" GeoConvert was added to GeographicLib,\n"
+" <http://geographiclib.sourceforge.net>, in 2009-01.\n"
;
return retval;
}
diff --git a/man/GeodSolve.1 b/man/GeodSolve.1
index be19c70..4032930 100644
--- a/man/GeodSolve.1
+++ b/man/GeodSolve.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.31)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "GEODSOLVE 1"
-.TH GEODSOLVE 1 "2015-09-30" "GeographicLib 1.45" "GeographicLib Utilities"
+.TH GEODSOLVE 1 "2016-02-14" "GeographicLib 1.46" "GeographicLib Utilities"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -142,8 +142,10 @@
GeodSolve \-\- perform geodesic calculations
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
-\&\fBGeodSolve\fR [ \fB\-i\fR | \fB\-l\fR \fIlat1\fR \fIlon1\fR \fIazi1\fR ] [ \fB\-a\fR ]
-[ \fB\-e\fR \fIa\fR \fIf\fR ] \fB\-u\fR ]
+\&\fBGeodSolve\fR
+[ \fB\-i\fR | \fB\-L\fR \fIlat1\fR \fIlon1\fR \fIazi1\fR |
+\&\fB\-D\fR \fIlat1\fR \fIlon1\fR \fIazi1\fR \fIs13\fR | \fB\-I\fR \fIlat1\fR \fIlon1\fR \fIlat3\fR \fIlon3\fR ]
+[ \fB\-a\fR ] [ \fB\-e\fR \fIa\fR \fIf\fR ] [ \fB\-u\fR ] [ \fB\-F\fR ]
[ \fB\-d\fR | \fB\-:\fR ] [ \fB\-w\fR ] [ \fB\-b\fR ] [ \fB\-f\fR ] [ \fB\-p\fR \fIprec\fR ] [ \fB\-E\fR ]
[ \fB\-\-comment\-delimiter\fR \fIcommentdelim\fR ]
[ \fB\-\-version\fR | \fB\-h\fR | \fB\-\-help\fR ]
@@ -163,33 +165,51 @@ By default, \fBGeodSolve\fR accepts lines on the standard input containing
\&\fIlat1\fR \fIlon1\fR \fIazi1\fR \fIs12\fR and prints \fIlat2\fR \fIlon2\fR \fIazi2\fR
on standard output. This is the direct geodesic calculation.
.IP "2." 4
-Command line arguments \fB\-l\fR \fIlat1\fR \fIlon1\fR \fIazi1\fR specify a geodesic
-line. \fBGeodSolve\fR then accepts a sequence of \fIs12\fR values (one per
-line) on standard input and prints \fIlat2\fR \fIlon2\fR \fIazi2\fR for each.
-This generates a sequence of points on a single geodesic.
-.IP "3." 4
With the \fB\-i\fR command line argument, \fBGeodSolve\fR performs the inverse
geodesic calculation. It reads lines containing \fIlat1\fR \fIlon1\fR \fIlat2\fR
\&\fIlon2\fR and prints the corresponding values of \fIazi1\fR \fIazi2\fR \fIs12\fR.
+.IP "3." 4
+Command line arguments \fB\-L\fR \fIlat1\fR \fIlon1\fR \fIazi1\fR specify a geodesic
+line. \fBGeodSolve\fR then accepts a sequence of \fIs12\fR values (one per
+line) on standard input and prints \fIlat2\fR \fIlon2\fR \fIazi2\fR for each.
+This generates a sequence of points on a single geodesic. Command line
+arguments \fB\-D\fR and \fB\-I\fR work similarly with the geodesic line defined
+in terms of a direct or inverse geodesic calculation, respectively.
.SH "OPTIONS"
.IX Header "OPTIONS"
.IP "\fB\-i\fR" 4
.IX Item "-i"
-perform an inverse geodesic calculation (see 3 above).
-.IP "\fB\-l\fR" 4
-.IX Item "-l"
-line mode (see 2 above); generate a sequence of points along the
+perform an inverse geodesic calculation (see 2 above).
+.IP "\fB\-L\fR \fIlat1\fR \fIlon1\fR \fIazi1\fR" 4
+.IX Item "-L lat1 lon1 azi1"
+line mode (see 3 above); generate a sequence of points along the
geodesic specified by \fIlat1\fR \fIlon1\fR \fIazi1\fR. The \fB\-w\fR flag can be
used to swap the default order of the 2 geographic coordinates, provided
-that it appears before \fB\-l\fR.
+that it appears before \fB\-L\fR. (\fB\-l\fR is an alternative, deprecated,
+spelling of this flag.)
+.IP "\fB\-D\fR \fIlat1\fR \fIlon1\fR \fIazi1\fR \fIs13\fR" 4
+.IX Item "-D lat1 lon1 azi1 s13"
+line mode (see 3 above); generate a sequence of points along the
+geodesic specified by \fIlat1\fR \fIlon1\fR \fIazi1\fR \fIs13\fR. The \fB\-w\fR flag
+can be used to swap the default order of the 2 geographic coordinates,
+provided that it appears before \fB\-D\fR. Similarly, the \fB\-a\fR flag can be
+used to change the interpretation of \fIs13\fR to \fIa13\fR, provided that it
+appears before \fB\-D\fR.
+.IP "\fB\-I\fR \fIlat1\fR \fIlon1\fR \fIlat3\fR \fIlon3\fR" 4
+.IX Item "-I lat1 lon1 lat3 lon3"
+line mode (see 3 above); generate a sequence of points along the
+geodesic specified by \fIlat1\fR \fIlon1\fR \fIlat3\fR \fIlon3\fR. The \fB\-w\fR flag
+can be used to swap the default order of the 2 geographic coordinates,
+provided that it appears before \fB\-I\fR.
.IP "\fB\-a\fR" 4
.IX Item "-a"
-arc mode; on input \fIand\fR output \fIs12\fR is replaced by \fIa12\fR the arc
-length (in degrees) on the auxiliary sphere. See \*(L"\s-1AUXILIARY SPHERE\*(R"\s0.
-.IP "\fB\-e\fR" 4
-.IX Item "-e"
-specify the ellipsoid via \fIa\fR \fIf\fR; the equatorial radius is \fIa\fR and
-the flattening is \fIf\fR. Setting \fIf\fR = 0 results in a sphere. Specify
+toggle the arc mode flag (it starts off); if this flag is on, then on
+input \fIand\fR output \fIs12\fR is replaced by \fIa12\fR the arc length (in
+degrees) on the auxiliary sphere. See \*(L"\s-1AUXILIARY SPHERE\*(R"\s0.
+.IP "\fB\-e\fR \fIa\fR \fIf\fR" 4
+.IX Item "-e a f"
+specify the ellipsoid via the equatorial radius, \fIa\fR and
+the flattening, \fIf\fR. Setting \fIf\fR = 0 results in a sphere. Specify
\&\fIf\fR < 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297,
is allowed for \fIf\fR. By default, the \s-1WGS84\s0 ellipsoid is used, \fIa\fR =
6378137 m, \fIf\fR = 1/298.257223563.
@@ -200,6 +220,13 @@ in [\-180deg,180deg). However with this option, the returned longitude
\&\fIlon2\fR is \*(L"unrolled\*(R" so that \fIlon2\fR \- \fIlon1\fR indicates how often and
in what sense the geodesic has encircled the earth. Use the \fB\-f\fR
option, to get both longitudes printed.
+.IP "\fB\-F\fR" 4
+.IX Item "-F"
+fractional mode. This only has any effect with the \fB\-D\fR and \fB\-I\fR
+options (and is otherwise ignored). The values read on standard input
+are interpreted as fractional distances to point 3, i.e., as
+\&\fIs12\fR/\fIs13\fR instead of \fIs12\fR. If arc mode is in effect, then the
+values denote fractional arc length, i.e., \fIa12\fR/\fIa13\fR.
.IP "\fB\-d\fR" 4
.IX Item "-d"
output angles as degrees, minutes, seconds instead of decimal degrees.
@@ -209,6 +236,7 @@ like \fB\-d\fR, except use : as a separator instead of the d, ', and "
delimiters.
.IP "\fB\-w\fR" 4
.IX Item "-w"
+toggle the longitude first flag (it starts off); if the flag is on, then
on input and output, longitude precedes latitude (except that, on input,
this can be overridden by a hemisphere designator, \fIN\fR, \fIS\fR, \fIE\fR,
\&\fIW\fR).
@@ -222,8 +250,8 @@ full output; each line of output consists of 12 quantities: \fIlat1\fR
\&\fIM21\fR \fIS12\fR. \fIa12\fR is described in \*(L"\s-1AUXILIARY SPHERE\*(R"\s0. The four
quantities \fIm12\fR, \fIM12\fR, \fIM21\fR, and \fIS12\fR are described in
\&\*(L"\s-1ADDITIONAL QUANTITIES\*(R"\s0.
-.IP "\fB\-p\fR" 4
-.IX Item "-p"
+.IP "\fB\-p\fR \fIprec\fR" 4
+.IX Item "-p prec"
set the output precision to \fIprec\fR (default 3); \fIprec\fR is the
precision relative to 1 m. See \*(L"\s-1PRECISION\*(R"\s0.
.IP "\fB\-E\fR" 4
@@ -231,8 +259,8 @@ precision relative to 1 m. See \*(L"\s-1PRECISION\*(R"\s0.
use \*(L"exact\*(R" algorithms (based on elliptic integrals) for the geodesic
calculations. These are more accurate than the (default) series
expansions for |\fIf\fR| > 0.02.
-.IP "\fB\-\-comment\-delimiter\fR" 4
-.IX Item "--comment-delimiter"
+.IP "\fB\-\-comment\-delimiter\fR \fIcommentdelim\fR" 4
+.IX Item "--comment-delimiter commentdelim"
set the comment delimiter to \fIcommentdelim\fR (e.g., \*(L"#\*(R" or \*(L"//\*(R"). If
set, the input lines will be scanned for this delimiter and, if found,
the delimiter and the rest of the line will be removed prior to
@@ -247,21 +275,21 @@ print usage and exit.
.IP "\fB\-\-help\fR" 4
.IX Item "--help"
print full documentation and exit.
-.IP "\fB\-\-input\-file\fR" 4
-.IX Item "--input-file"
+.IP "\fB\-\-input\-file\fR \fIinfile\fR" 4
+.IX Item "--input-file infile"
read input from the file \fIinfile\fR instead of from standard input; a file
name of \*(L"\-\*(R" stands for standard input.
-.IP "\fB\-\-input\-string\fR" 4
-.IX Item "--input-string"
+.IP "\fB\-\-input\-string\fR \fIinstring\fR" 4
+.IX Item "--input-string instring"
read input from the string \fIinstring\fR instead of from standard input.
All occurrences of the line separator character (default is a semicolon)
in \fIinstring\fR are converted to newlines before the reading begins.
-.IP "\fB\-\-line\-separator\fR" 4
-.IX Item "--line-separator"
+.IP "\fB\-\-line\-separator\fR \fIlinesep\fR" 4
+.IX Item "--line-separator linesep"
set the line separator character to \fIlinesep\fR. By default this is a
semicolon.
-.IP "\fB\-\-output\-file\fR" 4
-.IX Item "--output-file"
+.IP "\fB\-\-output\-file\fR \fIoutfile\fR" 4
+.IX Item "--output-file outfile"
write output to the file \fIoutfile\fR instead of to standard output; a
file name of \*(L"\-\*(R" stands for standard output.
.SH "INPUT"
@@ -418,21 +446,23 @@ Route from \s-1JFK\s0 Airport to Singapore Changi Airport:
\& 003:18:29.9 177:29:09.2 15347628
.Ve
.PP
-Waypoints on the route at intervals of 2000km:
+Equally spaced waypoints on the route:
.PP
.Vb 2
-\& for ((i = 0; i <= 16; i += 2)); do echo ${i}000000;done |
-\& GeodSolve \-l 40:38:23N 073:46:44W 003:18:29.9 \-: \-p 0
+\& for ((i = 0; i <= 10; ++i)); do echo ${i}e\-1; done |
+\& GeodSolve \-I 40:38:23N 073:46:44W 01:21:33N 103:59:22E \-F \-: \-p 0
\&
\& 40:38:23.0N 073:46:44.0W 003:18:29.9
-\& 58:34:45.1N 071:49:36.7W 004:48:48.8
-\& 76:22:28.4N 065:32:17.8W 010:41:38.4
-\& 84:50:28.0N 075:04:39.2E 150:55:00.9
-\& 67:26:20.3N 098:00:51.2E 173:27:20.3
-\& 49:33:03.2N 101:06:52.6E 176:07:54.3
-\& 31:34:16.5N 102:30:46.3E 177:03:08.4
-\& 13:31:56.0N 103:26:50.7E 177:24:55.0
-\& 04:32:05.7S 104:14:48.7E 177:28:43.6
+\& 54:24:51.3N 072:25:39.6W 004:18:44.1
+\& 68:07:37.7N 069:40:42.9W 006:44:25.4
+\& 81:38:00.4N 058:37:53.9W 017:28:52.7
+\& 83:43:26.0N 080:37:16.9E 156:26:00.4
+\& 70:20:29.2N 097:01:29.4E 172:31:56.4
+\& 56:38:36.0N 100:14:47.6E 175:26:10.5
+\& 42:52:37.1N 101:43:37.2E 176:34:28.6
+\& 29:03:57.0N 102:39:34.8E 177:07:35.2
+\& 15:13:18.6N 103:22:08.0E 177:23:44.7
+\& 01:21:33.0N 103:59:22.0E 177:29:09.2
.Ve
.SH "SEE ALSO"
.IX Header "SEE ALSO"
@@ -444,7 +474,7 @@ An online version of this utility is availbable at
The algorithms are described in C. F. F. Karney,
\&\fIAlgorithms for geodesics\fR, J. Geodesy 87, 43\-55 (2013); \s-1DOI:
\&\s0<https://dx.doi.org/10.1007/s00190\-012\-0578\-z>;
-addenda: <http://geographiclib.sf.net/geod\-addenda.html>.
+addenda: <http://geographiclib.sourceforge.net/geod\-addenda.html>.
.PP
The Wikipedia page, Geodesics on an ellipsoid,
<https://en.wikipedia.org/wiki/Geodesics_on_an_ellipsoid>.
@@ -453,6 +483,7 @@ The Wikipedia page, Geodesics on an ellipsoid,
\&\fBGeodSolve\fR was written by Charles Karney.
.SH "HISTORY"
.IX Header "HISTORY"
-\&\fBGeodSolve\fR was added to GeographicLib, <http://geographiclib.sf.net>,
-in 2009\-03. Prior to version 1.30, it was called \fBGeod\fR. (The name
-was changed to avoid a conflict with the \fBgeod\fR utility in \fIproj.4\fR.)
+\&\fBGeodSolve\fR was added to GeographicLib,
+<http://geographiclib.sourceforge.net>, in 2009\-03. Prior to version
+1.30, it was called \fBGeod\fR. (The name was changed to avoid a conflict
+with the \fBgeod\fR utility in \fIproj.4\fR.)
diff --git a/man/GeodSolve.1.html b/man/GeodSolve.1.html
index fba339a..7ff18d6 100644
--- a/man/GeodSolve.1.html
+++ b/man/GeodSolve.1.html
@@ -7,7 +7,7 @@
<link rev="made" href="mailto:root at localhost" />
</head>
-<body style="background-color: white">
+<body>
@@ -17,7 +17,7 @@
<h1 id="SYNOPSIS">SYNOPSIS</h1>
-<p><b>GeodSolve</b> [ <b>-i</b> | <b>-l</b> <i>lat1</i> <i>lon1</i> <i>azi1</i> ] [ <b>-a</b> ] [ <b>-e</b> <i>a</i> <i>f</i> ] <b>-u</b> ] [ <b>-d</b> | <b>-:</b> ] [ <b>-w</b> ] [ <b>-b</b> ] [ <b>-f</b> ] [ <b>-p</b> <i>prec</i> ] [ <b>-E</b> ] [ <b>--comment-delimiter</b> <i>commentdelim</i> ] [ <b>--version</b> | <b>-h</b> | <b>--help</b> ] [ <b>--input-file</b> <i>infile</i> | <b>--input-string</b> <i>instring</i> ] [ <b>--line-separator</b> <i>linesep</i> ] [ <b>--output-file</b> [...]
+<p><b>GeodSolve</b> [ <b>-i</b> | <b>-L</b> <i>lat1</i> <i>lon1</i> <i>azi1</i> | <b>-D</b> <i>lat1</i> <i>lon1</i> <i>azi1</i> <i>s13</i> | <b>-I</b> <i>lat1</i> <i>lon1</i> <i>lat3</i> <i>lon3</i> ] [ <b>-a</b> ] [ <b>-e</b> <i>a</i> <i>f</i> ] [ <b>-u</b> ] [ <b>-F</b> ] [ <b>-d</b> | <b>-:</b> ] [ <b>-w</b> ] [ <b>-b</b> ] [ <b>-f</b> ] [ <b>-p</b> <i>prec</i> ] [ <b>-E</b> ] [ <b>--comment-delimiter</b> <i>commentdelim</i> ] [ <b>--version</b> | <b>-h</b> | <b>--help</b> ] [ <b>--in [...]
<h1 id="DESCRIPTION">DESCRIPTION</h1>
@@ -30,10 +30,10 @@
<li><p>By default, <b>GeodSolve</b> accepts lines on the standard input containing <i>lat1</i> <i>lon1</i> <i>azi1</i> <i>s12</i> and prints <i>lat2</i> <i>lon2</i> <i>azi2</i> on standard output. This is the direct geodesic calculation.</p>
</li>
-<li><p>Command line arguments <b>-l</b> <i>lat1</i> <i>lon1</i> <i>azi1</i> specify a geodesic line. <b>GeodSolve</b> then accepts a sequence of <i>s12</i> values (one per line) on standard input and prints <i>lat2</i> <i>lon2</i> <i>azi2</i> for each. This generates a sequence of points on a single geodesic.</p>
+<li><p>With the <b>-i</b> command line argument, <b>GeodSolve</b> performs the inverse geodesic calculation. It reads lines containing <i>lat1</i> <i>lon1</i> <i>lat2</i> <i>lon2</i> and prints the corresponding values of <i>azi1</i> <i>azi2</i> <i>s12</i>.</p>
</li>
-<li><p>With the <b>-i</b> command line argument, <b>GeodSolve</b> performs the inverse geodesic calculation. It reads lines containing <i>lat1</i> <i>lon1</i> <i>lat2</i> <i>lon2</i> and prints the corresponding values of <i>azi1</i> <i>azi2</i> <i>s12</i>.</p>
+<li><p>Command line arguments <b>-L</b> <i>lat1</i> <i>lon1</i> <i>azi1</i> specify a geodesic line. <b>GeodSolve</b> then accepts a sequence of <i>s12</i> values (one per line) on standard input and prints <i>lat2</i> <i>lon2</i> <i>azi2</i> for each. This generates a sequence of points on a single geodesic. Command line arguments <b>-D</b> and <b>-I</b> work similarly with the geodesic line defined in terms of a direct or inverse geodesic calculation, respectively.</p>
</li>
</ol>
@@ -45,25 +45,37 @@
<dt id="i"><b>-i</b></dt>
<dd>
-<p>perform an inverse geodesic calculation (see 3 above).</p>
+<p>perform an inverse geodesic calculation (see 2 above).</p>
+
+</dd>
+<dt id="L-lat1-lon1-azi1"><b>-L</b> <i>lat1</i> <i>lon1</i> <i>azi1</i></dt>
+<dd>
+
+<p>line mode (see 3 above); generate a sequence of points along the geodesic specified by <i>lat1</i> <i>lon1</i> <i>azi1</i>. The <b>-w</b> flag can be used to swap the default order of the 2 geographic coordinates, provided that it appears before <b>-L</b>. (<b>-l</b> is an alternative, deprecated, spelling of this flag.)</p>
+
+</dd>
+<dt id="D-lat1-lon1-azi1-s13"><b>-D</b> <i>lat1</i> <i>lon1</i> <i>azi1</i> <i>s13</i></dt>
+<dd>
+
+<p>line mode (see 3 above); generate a sequence of points along the geodesic specified by <i>lat1</i> <i>lon1</i> <i>azi1</i> <i>s13</i>. The <b>-w</b> flag can be used to swap the default order of the 2 geographic coordinates, provided that it appears before <b>-D</b>. Similarly, the <b>-a</b> flag can be used to change the interpretation of <i>s13</i> to <i>a13</i>, provided that it appears before <b>-D</b>.</p>
</dd>
-<dt id="l"><b>-l</b></dt>
+<dt id="I-lat1-lon1-lat3-lon3"><b>-I</b> <i>lat1</i> <i>lon1</i> <i>lat3</i> <i>lon3</i></dt>
<dd>
-<p>line mode (see 2 above); generate a sequence of points along the geodesic specified by <i>lat1</i> <i>lon1</i> <i>azi1</i>. The <b>-w</b> flag can be used to swap the default order of the 2 geographic coordinates, provided that it appears before <b>-l</b>.</p>
+<p>line mode (see 3 above); generate a sequence of points along the geodesic specified by <i>lat1</i> <i>lon1</i> <i>lat3</i> <i>lon3</i>. The <b>-w</b> flag can be used to swap the default order of the 2 geographic coordinates, provided that it appears before <b>-I</b>.</p>
</dd>
<dt id="a"><b>-a</b></dt>
<dd>
-<p>arc mode; on input <i>and</i> output <i>s12</i> is replaced by <i>a12</i> the arc length (in degrees) on the auxiliary sphere. See <a href="#AUXILIARY-SPHERE">"AUXILIARY SPHERE"</a>.</p>
+<p>toggle the arc mode flag (it starts off); if this flag is on, then on input <i>and</i> output <i>s12</i> is replaced by <i>a12</i> the arc length (in degrees) on the auxiliary sphere. See <a href="#AUXILIARY-SPHERE">"AUXILIARY SPHERE"</a>.</p>
</dd>
-<dt id="e"><b>-e</b></dt>
+<dt id="e-a-f"><b>-e</b> <i>a</i> <i>f</i></dt>
<dd>
-<p>specify the ellipsoid via <i>a</i> <i>f</i>; the equatorial radius is <i>a</i> and the flattening is <i>f</i>. Setting <i>f</i> = 0 results in a sphere. Specify <i>f</i> < 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297, is allowed for <i>f</i>. By default, the WGS84 ellipsoid is used, <i>a</i> = 6378137 m, <i>f</i> = 1/298.257223563.</p>
+<p>specify the ellipsoid via the equatorial radius, <i>a</i> and the flattening, <i>f</i>. Setting <i>f</i> = 0 results in a sphere. Specify <i>f</i> < 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297, is allowed for <i>f</i>. By default, the WGS84 ellipsoid is used, <i>a</i> = 6378137 m, <i>f</i> = 1/298.257223563.</p>
</dd>
<dt id="u"><b>-u</b></dt>
@@ -72,6 +84,12 @@
<p>unroll the longitude. Normally, on output longitudes are reduced to lie in [-180deg,180deg). However with this option, the returned longitude <i>lon2</i> is "unrolled" so that <i>lon2</i> - <i>lon1</i> indicates how often and in what sense the geodesic has encircled the earth. Use the <b>-f</b> option, to get both longitudes printed.</p>
</dd>
+<dt id="F"><b>-F</b></dt>
+<dd>
+
+<p>fractional mode. This only has any effect with the <b>-D</b> and <b>-I</b> options (and is otherwise ignored). The values read on standard input are interpreted as fractional distances to point 3, i.e., as <i>s12</i>/<i>s13</i> instead of <i>s12</i>. If arc mode is in effect, then the values denote fractional arc length, i.e., <i>a12</i>/<i>a13</i>.</p>
+
+</dd>
<dt id="d"><b>-d</b></dt>
<dd>
@@ -87,7 +105,7 @@
<dt id="w"><b>-w</b></dt>
<dd>
-<p>on input and output, longitude precedes latitude (except that, on input, this can be overridden by a hemisphere designator, <i>N</i>, <i>S</i>, <i>E</i>, <i>W</i>).</p>
+<p>toggle the longitude first flag (it starts off); if the flag is on, then on input and output, longitude precedes latitude (except that, on input, this can be overridden by a hemisphere designator, <i>N</i>, <i>S</i>, <i>E</i>, <i>W</i>).</p>
</dd>
<dt id="b"><b>-b</b></dt>
@@ -102,7 +120,7 @@
<p>full output; each line of output consists of 12 quantities: <i>lat1</i> <i>lon1</i> <i>azi1</i> <i>lat2</i> <i>lon2</i> <i>azi2</i> <i>s12</i> <i>a12</i> <i>m12</i> <i>M12</i> <i>M21</i> <i>S12</i>. <i>a12</i> is described in <a href="#AUXILIARY-SPHERE">"AUXILIARY SPHERE"</a>. The four quantities <i>m12</i>, <i>M12</i>, <i>M21</i>, and <i>S12</i> are described in <a href="#ADDITIONAL-QUANTITIES">"ADDITIONAL QUANTITIES"</a>.</p>
</dd>
-<dt id="p"><b>-p</b></dt>
+<dt id="p-prec"><b>-p</b> <i>prec</i></dt>
<dd>
<p>set the output precision to <i>prec</i> (default 3); <i>prec</i> is the precision relative to 1 m. See <a href="#PRECISION">"PRECISION"</a>.</p>
@@ -114,7 +132,7 @@
<p>use "exact" algorithms (based on elliptic integrals) for the geodesic calculations. These are more accurate than the (default) series expansions for |<i>f</i>| > 0.02.</p>
</dd>
-<dt id="comment-delimiter"><b>--comment-delimiter</b></dt>
+<dt id="comment-delimiter-commentdelim"><b>--comment-delimiter</b> <i>commentdelim</i></dt>
<dd>
<p>set the comment delimiter to <i>commentdelim</i> (e.g., "#" or "//"). If set, the input lines will be scanned for this delimiter and, if found, the delimiter and the rest of the line will be removed prior to processing and subsequently appended to the output line (separated by a space).</p>
@@ -138,25 +156,25 @@
<p>print full documentation and exit.</p>
</dd>
-<dt id="input-file"><b>--input-file</b></dt>
+<dt id="input-file-infile"><b>--input-file</b> <i>infile</i></dt>
<dd>
<p>read input from the file <i>infile</i> instead of from standard input; a file name of "-" stands for standard input.</p>
</dd>
-<dt id="input-string"><b>--input-string</b></dt>
+<dt id="input-string-instring"><b>--input-string</b> <i>instring</i></dt>
<dd>
<p>read input from the string <i>instring</i> instead of from standard input. All occurrences of the line separator character (default is a semicolon) in <i>instring</i> are converted to newlines before the reading begins.</p>
</dd>
-<dt id="line-separator"><b>--line-separator</b></dt>
+<dt id="line-separator-linesep"><b>--line-separator</b> <i>linesep</i></dt>
<dd>
<p>set the line separator character to <i>linesep</i>. By default this is a semicolon.</p>
</dd>
-<dt id="output-file"><b>--output-file</b></dt>
+<dt id="output-file-outfile"><b>--output-file</b> <i>outfile</i></dt>
<dd>
<p>write output to the file <i>outfile</i> instead of to standard output; a file name of "-" stands for standard output.</p>
@@ -272,20 +290,22 @@
003:18:29.9 177:29:09.2 15347628</code></pre>
-<p>Waypoints on the route at intervals of 2000km:</p>
+<p>Equally spaced waypoints on the route:</p>
-<pre><code> for ((i = 0; i <= 16; i += 2)); do echo ${i}000000;done |
- GeodSolve -l 40:38:23N 073:46:44W 003:18:29.9 -: -p 0
+<pre><code> for ((i = 0; i <= 10; ++i)); do echo ${i}e-1; done |
+ GeodSolve -I 40:38:23N 073:46:44W 01:21:33N 103:59:22E -F -: -p 0
40:38:23.0N 073:46:44.0W 003:18:29.9
- 58:34:45.1N 071:49:36.7W 004:48:48.8
- 76:22:28.4N 065:32:17.8W 010:41:38.4
- 84:50:28.0N 075:04:39.2E 150:55:00.9
- 67:26:20.3N 098:00:51.2E 173:27:20.3
- 49:33:03.2N 101:06:52.6E 176:07:54.3
- 31:34:16.5N 102:30:46.3E 177:03:08.4
- 13:31:56.0N 103:26:50.7E 177:24:55.0
- 04:32:05.7S 104:14:48.7E 177:28:43.6</code></pre>
+ 54:24:51.3N 072:25:39.6W 004:18:44.1
+ 68:07:37.7N 069:40:42.9W 006:44:25.4
+ 81:38:00.4N 058:37:53.9W 017:28:52.7
+ 83:43:26.0N 080:37:16.9E 156:26:00.4
+ 70:20:29.2N 097:01:29.4E 172:31:56.4
+ 56:38:36.0N 100:14:47.6E 175:26:10.5
+ 42:52:37.1N 101:43:37.2E 176:34:28.6
+ 29:03:57.0N 102:39:34.8E 177:07:35.2
+ 15:13:18.6N 103:22:08.0E 177:23:44.7
+ 01:21:33.0N 103:59:22.0E 177:29:09.2</code></pre>
<h1 id="SEE-ALSO">SEE ALSO</h1>
@@ -293,7 +313,7 @@
<p>An online version of this utility is availbable at <a href="http://geographiclib.sourceforge.net/cgi-bin/GeodSolve">http://geographiclib.sourceforge.net/cgi-bin/GeodSolve</a>.</p>
-<p>The algorithms are described in C. F. F. Karney, <i>Algorithms for geodesics</i>, J. Geodesy 87, 43-55 (2013); DOI: <a href="https://dx.doi.org/10.1007/s00190-012-0578-z">https://dx.doi.org/10.1007/s00190-012-0578-z</a>; addenda: <a href="http://geographiclib.sf.net/geod-addenda.html">http://geographiclib.sf.net/geod-addenda.html</a>.</p>
+<p>The algorithms are described in C. F. F. Karney, <i>Algorithms for geodesics</i>, J. Geodesy 87, 43-55 (2013); DOI: <a href="https://dx.doi.org/10.1007/s00190-012-0578-z">https://dx.doi.org/10.1007/s00190-012-0578-z</a>; addenda: <a href="http://geographiclib.sourceforge.net/geod-addenda.html">http://geographiclib.sourceforge.net/geod-addenda.html</a>.</p>
<p>The Wikipedia page, Geodesics on an ellipsoid, <a href="https://en.wikipedia.org/wiki/Geodesics_on_an_ellipsoid">https://en.wikipedia.org/wiki/Geodesics_on_an_ellipsoid</a>.</p>
@@ -303,7 +323,7 @@
<h1 id="HISTORY">HISTORY</h1>
-<p><b>GeodSolve</b> was added to GeographicLib, <a href="http://geographiclib.sf.net">http://geographiclib.sf.net</a>, in 2009-03. Prior to version 1.30, it was called <b>Geod</b>. (The name was changed to avoid a conflict with the <b>geod</b> utility in <i>proj.4</i>.)</p>
+<p><b>GeodSolve</b> was added to GeographicLib, <a href="http://geographiclib.sourceforge.net">http://geographiclib.sourceforge.net</a>, in 2009-03. Prior to version 1.30, it was called <b>Geod</b>. (The name was changed to avoid a conflict with the <b>geod</b> utility in <i>proj.4</i>.)</p>
</body>
diff --git a/man/GeodSolve.pod b/man/GeodSolve.pod
index 02f9929..36bd27e 100644
--- a/man/GeodSolve.pod
+++ b/man/GeodSolve.pod
@@ -4,8 +4,10 @@ GeodSolve -- perform geodesic calculations
=head1 SYNOPSIS
-B<GeodSolve> [ B<-i> | B<-l> I<lat1> I<lon1> I<azi1> ] [ B<-a> ]
-[ B<-e> I<a> I<f> ] B<-u> ]
+B<GeodSolve>
+[ B<-i> | B<-L> I<lat1> I<lon1> I<azi1> |
+B<-D> I<lat1> I<lon1> I<azi1> I<s13> | B<-I> I<lat1> I<lon1> I<lat3> I<lon3> ]
+[ B<-a> ] [ B<-e> I<a> I<f> ] [ B<-u> ] [ B<-F> ]
[ B<-d> | B<-:> ] [ B<-w> ] [ B<-b> ] [ B<-f> ] [ B<-p> I<prec> ] [ B<-E> ]
[ B<--comment-delimiter> I<commentdelim> ]
[ B<--version> | B<-h> | B<--help> ]
@@ -32,17 +34,19 @@ on standard output. This is the direct geodesic calculation.
=item 2.
-Command line arguments B<-l> I<lat1> I<lon1> I<azi1> specify a geodesic
-line. B<GeodSolve> then accepts a sequence of I<s12> values (one per
-line) on standard input and prints I<lat2> I<lon2> I<azi2> for each.
-This generates a sequence of points on a single geodesic.
-
-=item 3.
-
With the B<-i> command line argument, B<GeodSolve> performs the inverse
geodesic calculation. It reads lines containing I<lat1> I<lon1> I<lat2>
I<lon2> and prints the corresponding values of I<azi1> I<azi2> I<s12>.
+=item 3.
+
+Command line arguments B<-L> I<lat1> I<lon1> I<azi1> specify a geodesic
+line. B<GeodSolve> then accepts a sequence of I<s12> values (one per
+line) on standard input and prints I<lat2> I<lon2> I<azi2> for each.
+This generates a sequence of points on a single geodesic. Command line
+arguments B<-D> and B<-I> work similarly with the geodesic line defined
+in terms of a direct or inverse geodesic calculation, respectively.
+
=back
=head1 OPTIONS
@@ -51,24 +55,42 @@ I<lon2> and prints the corresponding values of I<azi1> I<azi2> I<s12>.
=item B<-i>
-perform an inverse geodesic calculation (see 3 above).
+perform an inverse geodesic calculation (see 2 above).
-=item B<-l>
+=item B<-L> I<lat1> I<lon1> I<azi1>
-line mode (see 2 above); generate a sequence of points along the
+line mode (see 3 above); generate a sequence of points along the
geodesic specified by I<lat1> I<lon1> I<azi1>. The B<-w> flag can be
used to swap the default order of the 2 geographic coordinates, provided
-that it appears before B<-l>.
+that it appears before B<-L>. (B<-l> is an alternative, deprecated,
+spelling of this flag.)
+
+=item B<-D> I<lat1> I<lon1> I<azi1> I<s13>
+
+line mode (see 3 above); generate a sequence of points along the
+geodesic specified by I<lat1> I<lon1> I<azi1> I<s13>. The B<-w> flag
+can be used to swap the default order of the 2 geographic coordinates,
+provided that it appears before B<-D>. Similarly, the B<-a> flag can be
+used to change the interpretation of I<s13> to I<a13>, provided that it
+appears before B<-D>.
+
+=item B<-I> I<lat1> I<lon1> I<lat3> I<lon3>
+
+line mode (see 3 above); generate a sequence of points along the
+geodesic specified by I<lat1> I<lon1> I<lat3> I<lon3>. The B<-w> flag
+can be used to swap the default order of the 2 geographic coordinates,
+provided that it appears before B<-I>.
=item B<-a>
-arc mode; on input I<and> output I<s12> is replaced by I<a12> the arc
-length (in degrees) on the auxiliary sphere. See L</AUXILIARY SPHERE>.
+toggle the arc mode flag (it starts off); if this flag is on, then on
+input I<and> output I<s12> is replaced by I<a12> the arc length (in
+degrees) on the auxiliary sphere. See L</AUXILIARY SPHERE>.
-=item B<-e>
+=item B<-e> I<a> I<f>
-specify the ellipsoid via I<a> I<f>; the equatorial radius is I<a> and
-the flattening is I<f>. Setting I<f> = 0 results in a sphere. Specify
+specify the ellipsoid via the equatorial radius, I<a> and
+the flattening, I<f>. Setting I<f> = 0 results in a sphere. Specify
I<f> E<lt> 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297,
is allowed for I<f>. By default, the WGS84 ellipsoid is used, I<a> =
6378137 m, I<f> = 1/298.257223563.
@@ -81,6 +103,14 @@ I<lon2> is "unrolled" so that I<lon2> - I<lon1> indicates how often and
in what sense the geodesic has encircled the earth. Use the B<-f>
option, to get both longitudes printed.
+=item B<-F>
+
+fractional mode. This only has any effect with the B<-D> and B<-I>
+options (and is otherwise ignored). The values read on standard input
+are interpreted as fractional distances to point 3, i.e., as
+I<s12>/I<s13> instead of I<s12>. If arc mode is in effect, then the
+values denote fractional arc length, i.e., I<a12>/I<a13>.
+
=item B<-d>
output angles as degrees, minutes, seconds instead of decimal degrees.
@@ -92,6 +122,7 @@ delimiters.
=item B<-w>
+toggle the longitude first flag (it starts off); if the flag is on, then
on input and output, longitude precedes latitude (except that, on input,
this can be overridden by a hemisphere designator, I<N>, I<S>, I<E>,
I<W>).
@@ -108,7 +139,7 @@ I<M21> I<S12>. I<a12> is described in L</AUXILIARY SPHERE>. The four
quantities I<m12>, I<M12>, I<M21>, and I<S12> are described in
L</ADDITIONAL QUANTITIES>.
-=item B<-p>
+=item B<-p> I<prec>
set the output precision to I<prec> (default 3); I<prec> is the
precision relative to 1 m. See L</PRECISION>.
@@ -119,7 +150,7 @@ use "exact" algorithms (based on elliptic integrals) for the geodesic
calculations. These are more accurate than the (default) series
expansions for |I<f>| E<gt> 0.02.
-=item B<--comment-delimiter>
+=item B<--comment-delimiter> I<commentdelim>
set the comment delimiter to I<commentdelim> (e.g., "#" or "//"). If
set, the input lines will be scanned for this delimiter and, if found,
@@ -139,23 +170,23 @@ print usage and exit.
print full documentation and exit.
-=item B<--input-file>
+=item B<--input-file> I<infile>
read input from the file I<infile> instead of from standard input; a file
name of "-" stands for standard input.
-=item B<--input-string>
+=item B<--input-string> I<instring>
read input from the string I<instring> instead of from standard input.
All occurrences of the line separator character (default is a semicolon)
in I<instring> are converted to newlines before the reading begins.
-=item B<--line-separator>
+=item B<--line-separator> I<linesep>
set the line separator character to I<linesep>. By default this is a
semicolon.
-=item B<--output-file>
+=item B<--output-file> I<outfile>
write output to the file I<outfile> instead of to standard output; a
file name of "-" stands for standard output.
@@ -323,20 +354,22 @@ Route from JFK Airport to Singapore Changi Airport:
003:18:29.9 177:29:09.2 15347628
-Waypoints on the route at intervals of 2000km:
+Equally spaced waypoints on the route:
- for ((i = 0; i <= 16; i += 2)); do echo ${i}000000;done |
- GeodSolve -l 40:38:23N 073:46:44W 003:18:29.9 -: -p 0
+ for ((i = 0; i <= 10; ++i)); do echo ${i}e-1; done |
+ GeodSolve -I 40:38:23N 073:46:44W 01:21:33N 103:59:22E -F -: -p 0
40:38:23.0N 073:46:44.0W 003:18:29.9
- 58:34:45.1N 071:49:36.7W 004:48:48.8
- 76:22:28.4N 065:32:17.8W 010:41:38.4
- 84:50:28.0N 075:04:39.2E 150:55:00.9
- 67:26:20.3N 098:00:51.2E 173:27:20.3
- 49:33:03.2N 101:06:52.6E 176:07:54.3
- 31:34:16.5N 102:30:46.3E 177:03:08.4
- 13:31:56.0N 103:26:50.7E 177:24:55.0
- 04:32:05.7S 104:14:48.7E 177:28:43.6
+ 54:24:51.3N 072:25:39.6W 004:18:44.1
+ 68:07:37.7N 069:40:42.9W 006:44:25.4
+ 81:38:00.4N 058:37:53.9W 017:28:52.7
+ 83:43:26.0N 080:37:16.9E 156:26:00.4
+ 70:20:29.2N 097:01:29.4E 172:31:56.4
+ 56:38:36.0N 100:14:47.6E 175:26:10.5
+ 42:52:37.1N 101:43:37.2E 176:34:28.6
+ 29:03:57.0N 102:39:34.8E 177:07:35.2
+ 15:13:18.6N 103:22:08.0E 177:23:44.7
+ 01:21:33.0N 103:59:22.0E 177:29:09.2
=head1 SEE ALSO
@@ -348,7 +381,7 @@ L<http://geographiclib.sourceforge.net/cgi-bin/GeodSolve>.
The algorithms are described in C. F. F. Karney,
I<Algorithms for geodesics>, J. Geodesy 87, 43-55 (2013); DOI:
L<https://dx.doi.org/10.1007/s00190-012-0578-z>;
-addenda: L<http://geographiclib.sf.net/geod-addenda.html>.
+addenda: L<http://geographiclib.sourceforge.net/geod-addenda.html>.
The Wikipedia page, Geodesics on an ellipsoid,
L<https://en.wikipedia.org/wiki/Geodesics_on_an_ellipsoid>.
@@ -359,6 +392,7 @@ B<GeodSolve> was written by Charles Karney.
=head1 HISTORY
-B<GeodSolve> was added to GeographicLib, L<http://geographiclib.sf.net>,
-in 2009-03. Prior to version 1.30, it was called B<Geod>. (The name
-was changed to avoid a conflict with the B<geod> utility in I<proj.4>.)
+B<GeodSolve> was added to GeographicLib,
+L<http://geographiclib.sourceforge.net>, in 2009-03. Prior to version
+1.30, it was called B<Geod>. (The name was changed to avoid a conflict
+with the B<geod> utility in I<proj.4>.)
diff --git a/man/GeodSolve.usage b/man/GeodSolve.usage
index 7b2143b..df7da00 100644
--- a/man/GeodSolve.usage
+++ b/man/GeodSolve.usage
@@ -1,27 +1,27 @@
int usage(int retval, bool brief) {
if (brief)
( retval ? std::cerr : std::cout ) << "Usage:\n"
-" GeodSolve [ -i | -l lat1 lon1 azi1 ] [ -a ] [ -e a f ] -u ] [ -d | -: ]\n"
-" [ -w ] [ -b ] [ -f ] [ -p prec ] [ -E ] [ --comment-delimiter\n"
-" commentdelim ] [ --version | -h | --help ] [ --input-file infile |\n"
-" --input-string instring ] [ --line-separator linesep ] [ --output-file\n"
-" outfile ]\n"
+" GeodSolve [ -i | -L lat1 lon1 azi1 | -D lat1 lon1 azi1 s13 | -I lat1\n"
+" lon1 lat3 lon3 ] [ -a ] [ -e a f ] [ -u ] [ -F ] [ -d | -: ] [ -w ] [\n"
+" -b ] [ -f ] [ -p prec ] [ -E ] [ --comment-delimiter commentdelim ] [\n"
+" --version | -h | --help ] [ --input-file infile | --input-string\n"
+" instring ] [ --line-separator linesep ] [ --output-file outfile ]\n"
"\n"
"For full documentation type:\n"
" GeodSolve --help\n"
"or visit:\n"
-" http://geographiclib.sf.net/1.45/GeodSolve.1.html\n";
+" http://geographiclib.sourceforge.net/1.46/GeodSolve.1.html\n";
else
( retval ? std::cerr : std::cout ) << "Man page:\n"
"NAME\n"
" GeodSolve -- perform geodesic calculations\n"
"\n"
"SYNOPSIS\n"
-" GeodSolve [ -i | -l lat1 lon1 azi1 ] [ -a ] [ -e a f ] -u ] [ -d | -: ]\n"
-" [ -w ] [ -b ] [ -f ] [ -p prec ] [ -E ] [ --comment-delimiter\n"
-" commentdelim ] [ --version | -h | --help ] [ --input-file infile |\n"
-" --input-string instring ] [ --line-separator linesep ] [ --output-file\n"
-" outfile ]\n"
+" GeodSolve [ -i | -L lat1 lon1 azi1 | -D lat1 lon1 azi1 s13 | -I lat1\n"
+" lon1 lat3 lon3 ] [ -a ] [ -e a f ] [ -u ] [ -F ] [ -d | -: ] [ -w ] [\n"
+" -b ] [ -f ] [ -p prec ] [ -E ] [ --comment-delimiter commentdelim ] [\n"
+" --version | -h | --help ] [ --input-file infile | --input-string\n"
+" instring ] [ --line-separator linesep ] [ --output-file outfile ]\n"
"\n"
"DESCRIPTION\n"
" The shortest path between two points on the ellipsoid at (lat1, lon1)\n"
@@ -35,28 +35,48 @@ int usage(int retval, bool brief) {
" containing lat1 lon1 azi1 s12 and prints lat2 lon2 azi2 on standard\n"
" output. This is the direct geodesic calculation.\n"
"\n"
-" 2. Command line arguments -l lat1 lon1 azi1 specify a geodesic line.\n"
-" GeodSolve then accepts a sequence of s12 values (one per line) on\n"
-" standard input and prints lat2 lon2 azi2 for each. This generates\n"
-" a sequence of points on a single geodesic.\n"
-"\n"
-" 3. With the -i command line argument, GeodSolve performs the inverse\n"
+" 2. With the -i command line argument, GeodSolve performs the inverse\n"
" geodesic calculation. It reads lines containing lat1 lon1 lat2\n"
" lon2 and prints the corresponding values of azi1 azi2 s12.\n"
"\n"
+" 3. Command line arguments -L lat1 lon1 azi1 specify a geodesic line.\n"
+" GeodSolve then accepts a sequence of s12 values (one per line) on\n"
+" standard input and prints lat2 lon2 azi2 for each. This generates\n"
+" a sequence of points on a single geodesic. Command line arguments\n"
+" -D and -I work similarly with the geodesic line defined in terms of\n"
+" a direct or inverse geodesic calculation, respectively.\n"
+"\n"
"OPTIONS\n"
-" -i perform an inverse geodesic calculation (see 3 above).\n"
+" -i perform an inverse geodesic calculation (see 2 above).\n"
"\n"
-" -l line mode (see 2 above); generate a sequence of points along the\n"
+" -L lat1 lon1 azi1\n"
+" line mode (see 3 above); generate a sequence of points along the\n"
" geodesic specified by lat1 lon1 azi1. The -w flag can be used to\n"
" swap the default order of the 2 geographic coordinates, provided\n"
-" that it appears before -l.\n"
-"\n"
-" -a arc mode; on input and output s12 is replaced by a12 the arc length\n"
-" (in degrees) on the auxiliary sphere. See \"AUXILIARY SPHERE\".\n"
-"\n"
-" -e specify the ellipsoid via a f; the equatorial radius is a and the\n"
-" flattening is f. Setting f = 0 results in a sphere. Specify f < 0\n"
+" that it appears before -L. (-l is an alternative, deprecated,\n"
+" spelling of this flag.)\n"
+"\n"
+" -D lat1 lon1 azi1 s13\n"
+" line mode (see 3 above); generate a sequence of points along the\n"
+" geodesic specified by lat1 lon1 azi1 s13. The -w flag can be used\n"
+" to swap the default order of the 2 geographic coordinates, provided\n"
+" that it appears before -D. Similarly, the -a flag can be used to\n"
+" change the interpretation of s13 to a13, provided that it appears\n"
+" before -D.\n"
+"\n"
+" -I lat1 lon1 lat3 lon3\n"
+" line mode (see 3 above); generate a sequence of points along the\n"
+" geodesic specified by lat1 lon1 lat3 lon3. The -w flag can be used\n"
+" to swap the default order of the 2 geographic coordinates, provided\n"
+" that it appears before -I.\n"
+"\n"
+" -a toggle the arc mode flag (it starts off); if this flag is on, then\n"
+" on input and output s12 is replaced by a12 the arc length (in\n"
+" degrees) on the auxiliary sphere. See \"AUXILIARY SPHERE\".\n"
+"\n"
+" -e a f\n"
+" specify the ellipsoid via the equatorial radius, a and the\n"
+" flattening, f. Setting f = 0 results in a sphere. Specify f < 0\n"
" for a prolate ellipsoid. A simple fraction, e.g., 1/297, is\n"
" allowed for f. By default, the WGS84 ellipsoid is used, a =\n"
" 6378137 m, f = 1/298.257223563.\n"
@@ -67,15 +87,22 @@ int usage(int retval, bool brief) {
" often and in what sense the geodesic has encircled the earth. Use\n"
" the -f option, to get both longitudes printed.\n"
"\n"
+" -F fractional mode. This only has any effect with the -D and -I\n"
+" options (and is otherwise ignored). The values read on standard\n"
+" input are interpreted as fractional distances to point 3, i.e., as\n"
+" s12/s13 instead of s12. If arc mode is in effect, then the values\n"
+" denote fractional arc length, i.e., a12/a13.\n"
+"\n"
" -d output angles as degrees, minutes, seconds instead of decimal\n"
" degrees.\n"
"\n"
" -: like -d, except use : as a separator instead of the d, ', and \"\n"
" delimiters.\n"
"\n"
-" -w on input and output, longitude precedes latitude (except that, on\n"
-" input, this can be overridden by a hemisphere designator, N, S, E,\n"
-" W).\n"
+" -w toggle the longitude first flag (it starts off); if the flag is on,\n"
+" then on input and output, longitude precedes latitude (except that,\n"
+" on input, this can be overridden by a hemisphere designator, N, S,\n"
+" E, W).\n"
"\n"
" -b report the back azimuth at point 2 instead of the forward azimuth.\n"
"\n"
@@ -84,14 +111,15 @@ int usage(int retval, bool brief) {
" in \"AUXILIARY SPHERE\". The four quantities m12, M12, M21, and S12\n"
" are described in \"ADDITIONAL QUANTITIES\".\n"
"\n"
-" -p set the output precision to prec (default 3); prec is the precision\n"
+" -p prec\n"
+" set the output precision to prec (default 3); prec is the precision\n"
" relative to 1 m. See \"PRECISION\".\n"
"\n"
" -E use \"exact\" algorithms (based on elliptic integrals) for the\n"
" geodesic calculations. These are more accurate than the (default)\n"
" series expansions for |f| > 0.02.\n"
"\n"
-" --comment-delimiter\n"
+" --comment-delimiter commentdelim\n"
" set the comment delimiter to commentdelim (e.g., \"#\" or \"//\"). If\n"
" set, the input lines will be scanned for this delimiter and, if\n"
" found, the delimiter and the rest of the line will be removed prior\n"
@@ -106,21 +134,21 @@ int usage(int retval, bool brief) {
" --help\n"
" print full documentation and exit.\n"
"\n"
-" --input-file\n"
+" --input-file infile\n"
" read input from the file infile instead of from standard input; a\n"
" file name of \"-\" stands for standard input.\n"
"\n"
-" --input-string\n"
+" --input-string instring\n"
" read input from the string instring instead of from standard input.\n"
" All occurrences of the line separator character (default is a\n"
" semicolon) in instring are converted to newlines before the reading\n"
" begins.\n"
"\n"
-" --line-separator\n"
+" --line-separator linesep\n"
" set the line separator character to linesep. By default this is a\n"
" semicolon.\n"
"\n"
-" --output-file\n"
+" --output-file outfile\n"
" write output to the file outfile instead of to standard output; a\n"
" file name of \"-\" stands for standard output.\n"
"\n"
@@ -265,20 +293,22 @@ int usage(int retval, bool brief) {
"\n"
" 003:18:29.9 177:29:09.2 15347628\n"
"\n"
-" Waypoints on the route at intervals of 2000km:\n"
+" Equally spaced waypoints on the route:\n"
"\n"
-" for ((i = 0; i <= 16; i += 2)); do echo ${i}000000;done |\n"
-" GeodSolve -l 40:38:23N 073:46:44W 003:18:29.9 -: -p 0\n"
+" for ((i = 0; i <= 10; ++i)); do echo ${i}e-1; done |\n"
+" GeodSolve -I 40:38:23N 073:46:44W 01:21:33N 103:59:22E -F -: -p 0\n"
"\n"
" 40:38:23.0N 073:46:44.0W 003:18:29.9\n"
-" 58:34:45.1N 071:49:36.7W 004:48:48.8\n"
-" 76:22:28.4N 065:32:17.8W 010:41:38.4\n"
-" 84:50:28.0N 075:04:39.2E 150:55:00.9\n"
-" 67:26:20.3N 098:00:51.2E 173:27:20.3\n"
-" 49:33:03.2N 101:06:52.6E 176:07:54.3\n"
-" 31:34:16.5N 102:30:46.3E 177:03:08.4\n"
-" 13:31:56.0N 103:26:50.7E 177:24:55.0\n"
-" 04:32:05.7S 104:14:48.7E 177:28:43.6\n"
+" 54:24:51.3N 072:25:39.6W 004:18:44.1\n"
+" 68:07:37.7N 069:40:42.9W 006:44:25.4\n"
+" 81:38:00.4N 058:37:53.9W 017:28:52.7\n"
+" 83:43:26.0N 080:37:16.9E 156:26:00.4\n"
+" 70:20:29.2N 097:01:29.4E 172:31:56.4\n"
+" 56:38:36.0N 100:14:47.6E 175:26:10.5\n"
+" 42:52:37.1N 101:43:37.2E 176:34:28.6\n"
+" 29:03:57.0N 102:39:34.8E 177:07:35.2\n"
+" 15:13:18.6N 103:22:08.0E 177:23:44.7\n"
+" 01:21:33.0N 103:59:22.0E 177:29:09.2\n"
"\n"
"SEE ALSO\n"
" GeoConvert(1).\n"
@@ -289,7 +319,7 @@ int usage(int retval, bool brief) {
" The algorithms are described in C. F. F. Karney, Algorithms for\n"
" geodesics, J. Geodesy 87, 43-55 (2013); DOI:\n"
" <https://dx.doi.org/10.1007/s00190-012-0578-z>; addenda:\n"
-" <http://geographiclib.sf.net/geod-addenda.html>.\n"
+" <http://geographiclib.sourceforge.net/geod-addenda.html>.\n"
"\n"
" The Wikipedia page, Geodesics on an ellipsoid,\n"
" <https://en.wikipedia.org/wiki/Geodesics_on_an_ellipsoid>.\n"
@@ -298,9 +328,10 @@ int usage(int retval, bool brief) {
" GeodSolve was written by Charles Karney.\n"
"\n"
"HISTORY\n"
-" GeodSolve was added to GeographicLib, <http://geographiclib.sf.net>, in\n"
-" 2009-03. Prior to version 1.30, it was called Geod. (The name was\n"
-" changed to avoid a conflict with the geod utility in proj.4.)\n"
+" GeodSolve was added to GeographicLib,\n"
+" <http://geographiclib.sourceforge.net>, in 2009-03. Prior to version\n"
+" 1.30, it was called Geod. (The name was changed to avoid a conflict\n"
+" with the geod utility in proj.4.)\n"
;
return retval;
}
diff --git a/man/GeodesicProj.1 b/man/GeodesicProj.1
index 18a8835..34a6636 100644
--- a/man/GeodesicProj.1
+++ b/man/GeodesicProj.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.31)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "GEODESICPROJ 1"
-.TH GEODESICPROJ 1 "2015-09-30" "GeographicLib 1.45" "GeographicLib Utilities"
+.TH GEODESICPROJ 1 "2016-02-14" "GeographicLib 1.46" "GeographicLib Utilities"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -174,18 +174,18 @@ equidistant and gnomonic, the scales in the radial direction are 1 and
1/\fIrk\fR^2, respectively.
.SH "OPTIONS"
.IX Header "OPTIONS"
-.IP "\fB\-z\fR" 4
-.IX Item "-z"
+.IP "\fB\-z\fR \fIlat0\fR \fIlon0\fR" 4
+.IX Item "-z lat0 lon0"
use the azimuthal equidistant projection centered at latitude = \fIlat0\fR,
longitude = \fIlon0\fR. The \fB\-w\fR flag can be used to swap the default
order of the 2 coordinates, provided that it appears before \fB\-z\fR.
-.IP "\fB\-c\fR" 4
-.IX Item "-c"
+.IP "\fB\-c\fR \fIlat0\fR \fIlon0\fR" 4
+.IX Item "-c lat0 lon0"
use the Cassini-Soldner projection centered at latitude = \fIlat0\fR,
longitude = \fIlon0\fR. The \fB\-w\fR flag can be used to swap the default
order of the 2 coordinates, provided that it appears before \fB\-c\fR.
-.IP "\fB\-g\fR" 4
-.IX Item "-g"
+.IP "\fB\-g\fR \fIlat0\fR \fIlon0\fR" 4
+.IX Item "-g lat0 lon0"
use the ellipsoidal gnomonic projection centered at latitude = \fIlat0\fR,
longitude = \fIlon0\fR. The \fB\-w\fR flag can be used to swap the default
order of the 2 coordinates, provided that it appears before \fB\-g\fR.
@@ -194,27 +194,28 @@ order of the 2 coordinates, provided that it appears before \fB\-g\fR.
perform the reverse projection. \fIx\fR and \fIy\fR are given on standard
input and each line of standard output gives \fIlatitude\fR, \fIlongitude\fR,
\&\fIazi\fR, and \fIrk\fR.
-.IP "\fB\-e\fR" 4
-.IX Item "-e"
-specify the ellipsoid via \fIa\fR \fIf\fR; the equatorial radius is \fIa\fR and
-the flattening is \fIf\fR. Setting \fIf\fR = 0 results in a sphere. Specify
+.IP "\fB\-e\fR \fIa\fR \fIf\fR" 4
+.IX Item "-e a f"
+specify the ellipsoid via the equatorial radius, \fIa\fR and
+the flattening, \fIf\fR. Setting \fIf\fR = 0 results in a sphere. Specify
\&\fIf\fR < 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297,
is allowed for \fIf\fR. By default, the \s-1WGS84\s0 ellipsoid is used, \fIa\fR =
6378137 m, \fIf\fR = 1/298.257223563.
.IP "\fB\-w\fR" 4
.IX Item "-w"
+toggle the longitude first flag (it starts off); if the flag is on, then
on input and output, longitude precedes latitude (except that, on input,
this can be overridden by a hemisphere designator, \fIN\fR, \fIS\fR, \fIE\fR,
\&\fIW\fR).
-.IP "\fB\-p\fR" 4
-.IX Item "-p"
+.IP "\fB\-p\fR \fIprec\fR" 4
+.IX Item "-p prec"
set the output precision to \fIprec\fR (default 6). \fIprec\fR is the number
of digits after the decimal point for lengths (in meters). For
latitudes, longitudes, and azimuths (in degrees), the number of digits
after the decimal point is \fIprec\fR + 5. For the scale, the number of
digits after the decimal point is \fIprec\fR + 6.
-.IP "\fB\-\-comment\-delimiter\fR" 4
-.IX Item "--comment-delimiter"
+.IP "\fB\-\-comment\-delimiter\fR \fIcommentdelim\fR" 4
+.IX Item "--comment-delimiter commentdelim"
set the comment delimiter to \fIcommentdelim\fR (e.g., \*(L"#\*(R" or \*(L"//\*(R"). If
set, the input lines will be scanned for this delimiter and, if found,
the delimiter and the rest of the line will be removed prior to
@@ -229,21 +230,21 @@ print usage and exit.
.IP "\fB\-\-help\fR" 4
.IX Item "--help"
print full documentation and exit.
-.IP "\fB\-\-input\-file\fR" 4
-.IX Item "--input-file"
+.IP "\fB\-\-input\-file\fR \fIinfile\fR" 4
+.IX Item "--input-file infile"
read input from the file \fIinfile\fR instead of from standard input; a file
name of \*(L"\-\*(R" stands for standard input.
-.IP "\fB\-\-input\-string\fR" 4
-.IX Item "--input-string"
+.IP "\fB\-\-input\-string\fR \fIinstring\fR" 4
+.IX Item "--input-string instring"
read input from the string \fIinstring\fR instead of from standard input.
All occurrences of the line separator character (default is a semicolon)
in \fIinstring\fR are converted to newlines before the reading begins.
-.IP "\fB\-\-line\-separator\fR" 4
-.IX Item "--line-separator"
+.IP "\fB\-\-line\-separator\fR \fIlinesep\fR" 4
+.IX Item "--line-separator linesep"
set the line separator character to \fIlinesep\fR. By default this is a
semicolon.
-.IP "\fB\-\-output\-file\fR" 4
-.IX Item "--output-file"
+.IP "\fB\-\-output\-file\fR \fIoutfile\fR" 4
+.IX Item "--output-file outfile"
write output to the file \fIoutfile\fR instead of to standard output; a
file name of \*(L"\-\*(R" stands for standard output.
.SH "EXAMPLES"
@@ -265,12 +266,12 @@ terminate; following lines will be converted.
The ellipsoidal gnomonic projection is derived in Section 8 of
C. F. F. Karney, \fIAlgorithms for geodesics\fR, J. Geodesy 87, 43\-55 (2013); \s-1DOI
\&\s0<https://dx.doi.org/10.1007/s00190\-012\-0578\-z>;
-addenda: <http://geographiclib.sf.net/geod\-addenda.html>.
+addenda: <http://geographiclib.sourceforge.net/geod\-addenda.html>.
.SH "AUTHOR"
.IX Header "AUTHOR"
\&\fBGeodesicProj\fR was written by Charles Karney.
.SH "HISTORY"
.IX Header "HISTORY"
\&\fBGeodesicProj\fR was added to GeographicLib,
-<http://geographiclib.sf.net>, in 2009\-08. Prior to version 1.9 it was
+<http://geographiclib.sourceforge.net>, in 2009\-08. Prior to version 1.9 it was
called EquidistantTest.
diff --git a/man/GeodesicProj.1.html b/man/GeodesicProj.1.html
index b76a0a1..2801adc 100644
--- a/man/GeodesicProj.1.html
+++ b/man/GeodesicProj.1.html
@@ -7,7 +7,7 @@
<link rev="made" href="mailto:root at localhost" />
</head>
-<body style="background-color: white">
+<body>
@@ -29,19 +29,19 @@
<dl>
-<dt id="z"><b>-z</b></dt>
+<dt id="z-lat0-lon0"><b>-z</b> <i>lat0</i> <i>lon0</i></dt>
<dd>
<p>use the azimuthal equidistant projection centered at latitude = <i>lat0</i>, longitude = <i>lon0</i>. The <b>-w</b> flag can be used to swap the default order of the 2 coordinates, provided that it appears before <b>-z</b>.</p>
</dd>
-<dt id="c"><b>-c</b></dt>
+<dt id="c-lat0-lon0"><b>-c</b> <i>lat0</i> <i>lon0</i></dt>
<dd>
<p>use the Cassini-Soldner projection centered at latitude = <i>lat0</i>, longitude = <i>lon0</i>. The <b>-w</b> flag can be used to swap the default order of the 2 coordinates, provided that it appears before <b>-c</b>.</p>
</dd>
-<dt id="g"><b>-g</b></dt>
+<dt id="g-lat0-lon0"><b>-g</b> <i>lat0</i> <i>lon0</i></dt>
<dd>
<p>use the ellipsoidal gnomonic projection centered at latitude = <i>lat0</i>, longitude = <i>lon0</i>. The <b>-w</b> flag can be used to swap the default order of the 2 coordinates, provided that it appears before <b>-g</b>.</p>
@@ -53,25 +53,25 @@
<p>perform the reverse projection. <i>x</i> and <i>y</i> are given on standard input and each line of standard output gives <i>latitude</i>, <i>longitude</i>, <i>azi</i>, and <i>rk</i>.</p>
</dd>
-<dt id="e"><b>-e</b></dt>
+<dt id="e-a-f"><b>-e</b> <i>a</i> <i>f</i></dt>
<dd>
-<p>specify the ellipsoid via <i>a</i> <i>f</i>; the equatorial radius is <i>a</i> and the flattening is <i>f</i>. Setting <i>f</i> = 0 results in a sphere. Specify <i>f</i> < 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297, is allowed for <i>f</i>. By default, the WGS84 ellipsoid is used, <i>a</i> = 6378137 m, <i>f</i> = 1/298.257223563.</p>
+<p>specify the ellipsoid via the equatorial radius, <i>a</i> and the flattening, <i>f</i>. Setting <i>f</i> = 0 results in a sphere. Specify <i>f</i> < 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297, is allowed for <i>f</i>. By default, the WGS84 ellipsoid is used, <i>a</i> = 6378137 m, <i>f</i> = 1/298.257223563.</p>
</dd>
<dt id="w"><b>-w</b></dt>
<dd>
-<p>on input and output, longitude precedes latitude (except that, on input, this can be overridden by a hemisphere designator, <i>N</i>, <i>S</i>, <i>E</i>, <i>W</i>).</p>
+<p>toggle the longitude first flag (it starts off); if the flag is on, then on input and output, longitude precedes latitude (except that, on input, this can be overridden by a hemisphere designator, <i>N</i>, <i>S</i>, <i>E</i>, <i>W</i>).</p>
</dd>
-<dt id="p"><b>-p</b></dt>
+<dt id="p-prec"><b>-p</b> <i>prec</i></dt>
<dd>
<p>set the output precision to <i>prec</i> (default 6). <i>prec</i> is the number of digits after the decimal point for lengths (in meters). For latitudes, longitudes, and azimuths (in degrees), the number of digits after the decimal point is <i>prec</i> + 5. For the scale, the number of digits after the decimal point is <i>prec</i> + 6.</p>
</dd>
-<dt id="comment-delimiter"><b>--comment-delimiter</b></dt>
+<dt id="comment-delimiter-commentdelim"><b>--comment-delimiter</b> <i>commentdelim</i></dt>
<dd>
<p>set the comment delimiter to <i>commentdelim</i> (e.g., "#" or "//"). If set, the input lines will be scanned for this delimiter and, if found, the delimiter and the rest of the line will be removed prior to processing and subsequently appended to the output line (separated by a space).</p>
@@ -95,25 +95,25 @@
<p>print full documentation and exit.</p>
</dd>
-<dt id="input-file"><b>--input-file</b></dt>
+<dt id="input-file-infile"><b>--input-file</b> <i>infile</i></dt>
<dd>
<p>read input from the file <i>infile</i> instead of from standard input; a file name of "-" stands for standard input.</p>
</dd>
-<dt id="input-string"><b>--input-string</b></dt>
+<dt id="input-string-instring"><b>--input-string</b> <i>instring</i></dt>
<dd>
<p>read input from the string <i>instring</i> instead of from standard input. All occurrences of the line separator character (default is a semicolon) in <i>instring</i> are converted to newlines before the reading begins.</p>
</dd>
-<dt id="line-separator"><b>--line-separator</b></dt>
+<dt id="line-separator-linesep"><b>--line-separator</b> <i>linesep</i></dt>
<dd>
<p>set the line separator character to <i>linesep</i>. By default this is a semicolon.</p>
</dd>
-<dt id="output-file"><b>--output-file</b></dt>
+<dt id="output-file-outfile"><b>--output-file</b> <i>outfile</i></dt>
<dd>
<p>write output to the file <i>outfile</i> instead of to standard output; a file name of "-" stands for standard output.</p>
@@ -134,7 +134,7 @@
<h1 id="SEE-ALSO">SEE ALSO</h1>
-<p>The ellipsoidal gnomonic projection is derived in Section 8 of C. F. F. Karney, <i>Algorithms for geodesics</i>, J. Geodesy 87, 43-55 (2013); DOI <a href="https://dx.doi.org/10.1007/s00190-012-0578-z">https://dx.doi.org/10.1007/s00190-012-0578-z</a>; addenda: <a href="http://geographiclib.sf.net/geod-addenda.html">http://geographiclib.sf.net/geod-addenda.html</a>.</p>
+<p>The ellipsoidal gnomonic projection is derived in Section 8 of C. F. F. Karney, <i>Algorithms for geodesics</i>, J. Geodesy 87, 43-55 (2013); DOI <a href="https://dx.doi.org/10.1007/s00190-012-0578-z">https://dx.doi.org/10.1007/s00190-012-0578-z</a>; addenda: <a href="http://geographiclib.sourceforge.net/geod-addenda.html">http://geographiclib.sourceforge.net/geod-addenda.html</a>.</p>
<h1 id="AUTHOR">AUTHOR</h1>
@@ -142,7 +142,7 @@
<h1 id="HISTORY">HISTORY</h1>
-<p><b>GeodesicProj</b> was added to GeographicLib, <a href="http://geographiclib.sf.net">http://geographiclib.sf.net</a>, in 2009-08. Prior to version 1.9 it was called EquidistantTest.</p>
+<p><b>GeodesicProj</b> was added to GeographicLib, <a href="http://geographiclib.sourceforge.net">http://geographiclib.sourceforge.net</a>, in 2009-08. Prior to version 1.9 it was called EquidistantTest.</p>
</body>
diff --git a/man/GeodesicProj.pod b/man/GeodesicProj.pod
index d904966..22011b9 100644
--- a/man/GeodesicProj.pod
+++ b/man/GeodesicProj.pod
@@ -40,19 +40,19 @@ equidistant and gnomonic, the scales in the radial direction are 1 and
=over
-=item B<-z>
+=item B<-z> I<lat0> I<lon0>
use the azimuthal equidistant projection centered at latitude = I<lat0>,
longitude = I<lon0>. The B<-w> flag can be used to swap the default
order of the 2 coordinates, provided that it appears before B<-z>.
-=item B<-c>
+=item B<-c> I<lat0> I<lon0>
use the Cassini-Soldner projection centered at latitude = I<lat0>,
longitude = I<lon0>. The B<-w> flag can be used to swap the default
order of the 2 coordinates, provided that it appears before B<-c>.
-=item B<-g>
+=item B<-g> I<lat0> I<lon0>
use the ellipsoidal gnomonic projection centered at latitude = I<lat0>,
longitude = I<lon0>. The B<-w> flag can be used to swap the default
@@ -64,21 +64,22 @@ perform the reverse projection. I<x> and I<y> are given on standard
input and each line of standard output gives I<latitude>, I<longitude>,
I<azi>, and I<rk>.
-=item B<-e>
+=item B<-e> I<a> I<f>
-specify the ellipsoid via I<a> I<f>; the equatorial radius is I<a> and
-the flattening is I<f>. Setting I<f> = 0 results in a sphere. Specify
+specify the ellipsoid via the equatorial radius, I<a> and
+the flattening, I<f>. Setting I<f> = 0 results in a sphere. Specify
I<f> E<lt> 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297,
is allowed for I<f>. By default, the WGS84 ellipsoid is used, I<a> =
6378137 m, I<f> = 1/298.257223563.
=item B<-w>
+toggle the longitude first flag (it starts off); if the flag is on, then
on input and output, longitude precedes latitude (except that, on input,
this can be overridden by a hemisphere designator, I<N>, I<S>, I<E>,
I<W>).
-=item B<-p>
+=item B<-p> I<prec>
set the output precision to I<prec> (default 6). I<prec> is the number
of digits after the decimal point for lengths (in meters). For
@@ -86,7 +87,7 @@ latitudes, longitudes, and azimuths (in degrees), the number of digits
after the decimal point is I<prec> + 5. For the scale, the number of
digits after the decimal point is I<prec> + 6.
-=item B<--comment-delimiter>
+=item B<--comment-delimiter> I<commentdelim>
set the comment delimiter to I<commentdelim> (e.g., "#" or "//"). If
set, the input lines will be scanned for this delimiter and, if found,
@@ -106,23 +107,23 @@ print usage and exit.
print full documentation and exit.
-=item B<--input-file>
+=item B<--input-file> I<infile>
read input from the file I<infile> instead of from standard input; a file
name of "-" stands for standard input.
-=item B<--input-string>
+=item B<--input-string> I<instring>
read input from the string I<instring> instead of from standard input.
All occurrences of the line separator character (default is a semicolon)
in I<instring> are converted to newlines before the reading begins.
-=item B<--line-separator>
+=item B<--line-separator> I<linesep>
set the line separator character to I<linesep>. By default this is a
semicolon.
-=item B<--output-file>
+=item B<--output-file> I<outfile>
write output to the file I<outfile> instead of to standard output; a
file name of "-" stands for standard output.
@@ -148,7 +149,7 @@ terminate; following lines will be converted.
The ellipsoidal gnomonic projection is derived in Section 8 of
C. F. F. Karney, I<Algorithms for geodesics>, J. Geodesy 87, 43-55 (2013); DOI
L<https://dx.doi.org/10.1007/s00190-012-0578-z>;
-addenda: L<http://geographiclib.sf.net/geod-addenda.html>.
+addenda: L<http://geographiclib.sourceforge.net/geod-addenda.html>.
=head1 AUTHOR
@@ -157,5 +158,5 @@ B<GeodesicProj> was written by Charles Karney.
=head1 HISTORY
B<GeodesicProj> was added to GeographicLib,
-L<http://geographiclib.sf.net>, in 2009-08. Prior to version 1.9 it was
+L<http://geographiclib.sourceforge.net>, in 2009-08. Prior to version 1.9 it was
called EquidistantTest.
diff --git a/man/GeodesicProj.usage b/man/GeodesicProj.usage
index 91e93c4..b577fd2 100644
--- a/man/GeodesicProj.usage
+++ b/man/GeodesicProj.usage
@@ -9,7 +9,7 @@ int usage(int retval, bool brief) {
"For full documentation type:\n"
" GeodesicProj --help\n"
"or visit:\n"
-" http://geographiclib.sf.net/1.45/GeodesicProj.1.html\n";
+" http://geographiclib.sourceforge.net/1.46/GeodesicProj.1.html\n";
else
( retval ? std::cerr : std::cout ) << "Man page:\n"
"NAME\n"
@@ -44,16 +44,19 @@ int usage(int retval, bool brief) {
" in the radial direction are 1 and 1/rk^2, respectively.\n"
"\n"
"OPTIONS\n"
-" -z use the azimuthal equidistant projection centered at latitude =\n"
+" -z lat0 lon0\n"
+" use the azimuthal equidistant projection centered at latitude =\n"
" lat0, longitude = lon0. The -w flag can be used to swap the\n"
" default order of the 2 coordinates, provided that it appears before\n"
" -z.\n"
"\n"
-" -c use the Cassini-Soldner projection centered at latitude = lat0,\n"
+" -c lat0 lon0\n"
+" use the Cassini-Soldner projection centered at latitude = lat0,\n"
" longitude = lon0. The -w flag can be used to swap the default\n"
" order of the 2 coordinates, provided that it appears before -c.\n"
"\n"
-" -g use the ellipsoidal gnomonic projection centered at latitude =\n"
+" -g lat0 lon0\n"
+" use the ellipsoidal gnomonic projection centered at latitude =\n"
" lat0, longitude = lon0. The -w flag can be used to swap the\n"
" default order of the 2 coordinates, provided that it appears before\n"
" -g.\n"
@@ -62,23 +65,26 @@ int usage(int retval, bool brief) {
" input and each line of standard output gives latitude, longitude,\n"
" azi, and rk.\n"
"\n"
-" -e specify the ellipsoid via a f; the equatorial radius is a and the\n"
-" flattening is f. Setting f = 0 results in a sphere. Specify f < 0\n"
+" -e a f\n"
+" specify the ellipsoid via the equatorial radius, a and the\n"
+" flattening, f. Setting f = 0 results in a sphere. Specify f < 0\n"
" for a prolate ellipsoid. A simple fraction, e.g., 1/297, is\n"
" allowed for f. By default, the WGS84 ellipsoid is used, a =\n"
" 6378137 m, f = 1/298.257223563.\n"
"\n"
-" -w on input and output, longitude precedes latitude (except that, on\n"
-" input, this can be overridden by a hemisphere designator, N, S, E,\n"
-" W).\n"
+" -w toggle the longitude first flag (it starts off); if the flag is on,\n"
+" then on input and output, longitude precedes latitude (except that,\n"
+" on input, this can be overridden by a hemisphere designator, N, S,\n"
+" E, W).\n"
"\n"
-" -p set the output precision to prec (default 6). prec is the number\n"
+" -p prec\n"
+" set the output precision to prec (default 6). prec is the number\n"
" of digits after the decimal point for lengths (in meters). For\n"
" latitudes, longitudes, and azimuths (in degrees), the number of\n"
" digits after the decimal point is prec + 5. For the scale, the\n"
" number of digits after the decimal point is prec + 6.\n"
"\n"
-" --comment-delimiter\n"
+" --comment-delimiter commentdelim\n"
" set the comment delimiter to commentdelim (e.g., \"#\" or \"//\"). If\n"
" set, the input lines will be scanned for this delimiter and, if\n"
" found, the delimiter and the rest of the line will be removed prior\n"
@@ -93,21 +99,21 @@ int usage(int retval, bool brief) {
" --help\n"
" print full documentation and exit.\n"
"\n"
-" --input-file\n"
+" --input-file infile\n"
" read input from the file infile instead of from standard input; a\n"
" file name of \"-\" stands for standard input.\n"
"\n"
-" --input-string\n"
+" --input-string instring\n"
" read input from the string instring instead of from standard input.\n"
" All occurrences of the line separator character (default is a\n"
" semicolon) in instring are converted to newlines before the reading\n"
" begins.\n"
"\n"
-" --line-separator\n"
+" --line-separator linesep\n"
" set the line separator character to linesep. By default this is a\n"
" semicolon.\n"
"\n"
-" --output-file\n"
+" --output-file outfile\n"
" write output to the file outfile instead of to standard output; a\n"
" file name of \"-\" stands for standard output.\n"
"\n"
@@ -127,14 +133,15 @@ int usage(int retval, bool brief) {
" The ellipsoidal gnomonic projection is derived in Section 8 of C. F. F.\n"
" Karney, Algorithms for geodesics, J. Geodesy 87, 43-55 (2013); DOI\n"
" <https://dx.doi.org/10.1007/s00190-012-0578-z>; addenda:\n"
-" <http://geographiclib.sf.net/geod-addenda.html>.\n"
+" <http://geographiclib.sourceforge.net/geod-addenda.html>.\n"
"\n"
"AUTHOR\n"
" GeodesicProj was written by Charles Karney.\n"
"\n"
"HISTORY\n"
-" GeodesicProj was added to GeographicLib, <http://geographiclib.sf.net>,\n"
-" in 2009-08. Prior to version 1.9 it was called EquidistantTest.\n"
+" GeodesicProj was added to GeographicLib,\n"
+" <http://geographiclib.sourceforge.net>, in 2009-08. Prior to version\n"
+" 1.9 it was called EquidistantTest.\n"
;
return retval;
}
diff --git a/man/GeoidEval.1 b/man/GeoidEval.1
index c5afa3f..429a426 100644
--- a/man/GeoidEval.1
+++ b/man/GeoidEval.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.31)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "GEOIDEVAL 1"
-.TH GEOIDEVAL 1 "2015-09-30" "GeographicLib 1.45" "GeographicLib Utilities"
+.TH GEOIDEVAL 1 "2016-02-14" "GeographicLib 1.46" "GeographicLib Utilities"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -178,12 +178,12 @@ using the relations
.RE
.SH "OPTIONS"
.IX Header "OPTIONS"
-.IP "\fB\-n\fR" 4
-.IX Item "-n"
+.IP "\fB\-n\fR \fIname\fR" 4
+.IX Item "-n name"
use geoid \fIname\fR instead of the default \f(CW\*(C`egm96\-5\*(C'\fR. See
\&\*(L"\s-1GEOIDS\*(R"\s0.
-.IP "\fB\-d\fR" 4
-.IX Item "-d"
+.IP "\fB\-d\fR \fIdir\fR" 4
+.IX Item "-d dir"
read geoid data from \fIdir\fR instead of the default. See
\&\*(L"\s-1GEOIDS\*(R"\s0.
.IP "\fB\-l\fR" 4
@@ -193,8 +193,8 @@ use bilinear interpolation instead of cubic. See
.IP "\fB\-a\fR" 4
.IX Item "-a"
cache the entire data set in memory. See \*(L"\s-1CACHE\*(R"\s0.
-.IP "\fB\-c\fR" 4
-.IX Item "-c"
+.IP "\fB\-c\fR \fIsouth\fR \fIwest\fR \fInorth\fR \fIeast\fR" 4
+.IX Item "-c south west north east"
cache the data bounded by \fIsouth\fR \fIwest\fR \fInorth\fR \fIeast\fR in memory.
The first two arguments specify the \s-1SW\s0 corner of the cache and the last
two arguments specify the \s-1NE\s0 corner. The \fB\-w\fR flag specifies that
@@ -202,10 +202,11 @@ longitude precedes latitude for these corners, provided that it appears
before \fB\-c\fR. See \*(L"\s-1CACHE\*(R"\s0.
.IP "\fB\-w\fR" 4
.IX Item "-w"
+toggle the longitude first flag (it starts off); if the flag is on, then
when reading geographic coordinates, longitude precedes latitude (this
can be overridden by a hemisphere designator, \fIN\fR, \fIS\fR, \fIE\fR, \fIW\fR).
-.IP "\fB\-z\fR" 4
-.IX Item "-z"
+.IP "\fB\-z\fR \fIzone\fR" 4
+.IX Item "-z zone"
prefix each line of input by \fIzone\fR, e.g., \f(CW\*(C`38n\*(C'\fR. This should be used
when the input consists of \s-1UTM/UPS\s0 eastings and northings.
.IP "\fB\-\-msltohae\fR" 4
@@ -225,8 +226,8 @@ input line with the height converted to height above the geoid (\s-1MSL\s0).
.IX Item "-v"
print information about the geoid on standard error before processing
the input.
-.IP "\fB\-\-comment\-delimiter\fR" 4
-.IX Item "--comment-delimiter"
+.IP "\fB\-\-comment\-delimiter\fR \fIcommentdelim\fR" 4
+.IX Item "--comment-delimiter commentdelim"
set the comment delimiter to \fIcommentdelim\fR (e.g., \*(L"#\*(R" or \*(L"//\*(R"). If
set, the input lines will be scanned for this delimiter and, if found,
the delimiter and the rest of the line will be removed prior to
@@ -241,21 +242,21 @@ print usage, the default geoid path and name, and exit.
.IP "\fB\-\-help\fR" 4
.IX Item "--help"
print full documentation and exit.
-.IP "\fB\-\-input\-file\fR" 4
-.IX Item "--input-file"
+.IP "\fB\-\-input\-file\fR \fIinfile\fR" 4
+.IX Item "--input-file infile"
read input from the file \fIinfile\fR instead of from standard input; a file
name of \*(L"\-\*(R" stands for standard input.
-.IP "\fB\-\-input\-string\fR" 4
-.IX Item "--input-string"
+.IP "\fB\-\-input\-string\fR \fIinstring\fR" 4
+.IX Item "--input-string instring"
read input from the string \fIinstring\fR instead of from standard input.
All occurrences of the line separator character (default is a semicolon)
in \fIinstring\fR are converted to newlines before the reading begins.
-.IP "\fB\-\-line\-separator\fR" 4
-.IX Item "--line-separator"
+.IP "\fB\-\-line\-separator\fR \fIlinesep\fR" 4
+.IX Item "--line-separator linesep"
set the line separator character to \fIlinesep\fR. By default this is a
semicolon.
-.IP "\fB\-\-output\-file\fR" 4
-.IX Item "--output-file"
+.IP "\fB\-\-output\-file\fR \fIoutfile\fR" 4
+.IX Item "--output-file outfile"
write output to the file \fIoutfile\fR instead of to standard output; a
file name of \*(L"\-\*(R" stands for standard output.
.SH "GEOIDS"
@@ -289,7 +290,7 @@ option. The \fB\-h\fR option prints the default geoid path and name. Use
the \fB\-v\fR option to ascertain the full path name of the data file.
.PP
Instructions for downloading and installing geoid data are available at
-<http://geographiclib.sf.net/html/geoid.html#geoidinst>.
+<http://geographiclib.sourceforge.net/html/geoid.html#geoidinst>.
.PP
\&\fB\s-1NOTE\s0\fR: all the geoids above apply to the \s-1WGS84\s0 ellipsoid (\fIa\fR =
6378137 m, \fIf\fR = 1/298.257223563) only.
@@ -411,5 +412,5 @@ An online version of this utility is availbable at
\&\fBGeoidEval\fR was written by Charles Karney.
.SH "HISTORY"
.IX Header "HISTORY"
-\&\fBGeoidEval\fR was added to GeographicLib, <http://geographiclib.sf.net>,
+\&\fBGeoidEval\fR was added to GeographicLib, <http://geographiclib.sourceforge.net>,
in 2009\-09.
diff --git a/man/GeoidEval.1.html b/man/GeoidEval.1.html
index 070e16c..b98d5f0 100644
--- a/man/GeoidEval.1.html
+++ b/man/GeoidEval.1.html
@@ -7,7 +7,7 @@
<link rev="made" href="mailto:root at localhost" />
</head>
-<body style="background-color: white">
+<body>
@@ -39,13 +39,13 @@
<dl>
-<dt id="n"><b>-n</b></dt>
+<dt id="n-name"><b>-n</b> <i>name</i></dt>
<dd>
<p>use geoid <i>name</i> instead of the default <code>egm96-5</code>. See <a href="#GEOIDS">"GEOIDS"</a>.</p>
</dd>
-<dt id="d"><b>-d</b></dt>
+<dt id="d-dir"><b>-d</b> <i>dir</i></dt>
<dd>
<p>read geoid data from <i>dir</i> instead of the default. See <a href="#GEOIDS">"GEOIDS"</a>.</p>
@@ -63,7 +63,7 @@
<p>cache the entire data set in memory. See <a href="#CACHE">"CACHE"</a>.</p>
</dd>
-<dt id="c"><b>-c</b></dt>
+<dt id="c-south-west-north-east"><b>-c</b> <i>south</i> <i>west</i> <i>north</i> <i>east</i></dt>
<dd>
<p>cache the data bounded by <i>south</i> <i>west</i> <i>north</i> <i>east</i> in memory. The first two arguments specify the SW corner of the cache and the last two arguments specify the NE corner. The <b>-w</b> flag specifies that longitude precedes latitude for these corners, provided that it appears before <b>-c</b>. See <a href="#CACHE">"CACHE"</a>.</p>
@@ -72,10 +72,10 @@
<dt id="w"><b>-w</b></dt>
<dd>
-<p>when reading geographic coordinates, longitude precedes latitude (this can be overridden by a hemisphere designator, <i>N</i>, <i>S</i>, <i>E</i>, <i>W</i>).</p>
+<p>toggle the longitude first flag (it starts off); if the flag is on, then when reading geographic coordinates, longitude precedes latitude (this can be overridden by a hemisphere designator, <i>N</i>, <i>S</i>, <i>E</i>, <i>W</i>).</p>
</dd>
-<dt id="z"><b>-z</b></dt>
+<dt id="z-zone"><b>-z</b> <i>zone</i></dt>
<dd>
<p>prefix each line of input by <i>zone</i>, e.g., <code>38n</code>. This should be used when the input consists of UTM/UPS eastings and northings.</p>
@@ -99,7 +99,7 @@
<p>print information about the geoid on standard error before processing the input.</p>
</dd>
-<dt id="comment-delimiter"><b>--comment-delimiter</b></dt>
+<dt id="comment-delimiter-commentdelim"><b>--comment-delimiter</b> <i>commentdelim</i></dt>
<dd>
<p>set the comment delimiter to <i>commentdelim</i> (e.g., "#" or "//"). If set, the input lines will be scanned for this delimiter and, if found, the delimiter and the rest of the line will be removed prior to processing and subsequently appended to the output line (separated by a space).</p>
@@ -123,25 +123,25 @@
<p>print full documentation and exit.</p>
</dd>
-<dt id="input-file"><b>--input-file</b></dt>
+<dt id="input-file-infile"><b>--input-file</b> <i>infile</i></dt>
<dd>
<p>read input from the file <i>infile</i> instead of from standard input; a file name of "-" stands for standard input.</p>
</dd>
-<dt id="input-string"><b>--input-string</b></dt>
+<dt id="input-string-instring"><b>--input-string</b> <i>instring</i></dt>
<dd>
<p>read input from the string <i>instring</i> instead of from standard input. All occurrences of the line separator character (default is a semicolon) in <i>instring</i> are converted to newlines before the reading begins.</p>
</dd>
-<dt id="line-separator"><b>--line-separator</b></dt>
+<dt id="line-separator-linesep"><b>--line-separator</b> <i>linesep</i></dt>
<dd>
<p>set the line separator character to <i>linesep</i>. By default this is a semicolon.</p>
</dd>
-<dt id="output-file"><b>--output-file</b></dt>
+<dt id="output-file-outfile"><b>--output-file</b> <i>outfile</i></dt>
<dd>
<p>write output to the file <i>outfile</i> instead of to standard output; a file name of "-" stands for standard output.</p>
@@ -167,7 +167,7 @@
<p>The geoid data will be loaded from a directory specified at compile time. This may changed by setting the environment variables <code>GEOGRAPHICLIB_GEOID_PATH</code> or <code>GEOGRAPHICLIB_DATA</code>, or with the <b>-d</b> option. The <b>-h</b> option prints the default geoid path and name. Use the <b>-v</b> option to ascertain the full path name of the data file.</p>
-<p>Instructions for downloading and installing geoid data are available at <a href="http://geographiclib.sf.net/html/geoid.html#geoidinst">http://geographiclib.sf.net/html/geoid.html#geoidinst</a>.</p>
+<p>Instructions for downloading and installing geoid data are available at <a href="http://geographiclib.sourceforge.net/html/geoid.html#geoidinst">http://geographiclib.sourceforge.net/html/geoid.html#geoidinst</a>.</p>
<p><b>NOTE</b>: all the geoids above apply to the WGS84 ellipsoid (<i>a</i> = 6378137 m, <i>f</i> = 1/298.257223563) only.</p>
@@ -286,7 +286,7 @@
<h1 id="HISTORY">HISTORY</h1>
-<p><b>GeoidEval</b> was added to GeographicLib, <a href="http://geographiclib.sf.net">http://geographiclib.sf.net</a>, in 2009-09.</p>
+<p><b>GeoidEval</b> was added to GeographicLib, <a href="http://geographiclib.sourceforge.net">http://geographiclib.sourceforge.net</a>, in 2009-09.</p>
</body>
diff --git a/man/GeoidEval.pod b/man/GeoidEval.pod
index 911307b..7e73096 100644
--- a/man/GeoidEval.pod
+++ b/man/GeoidEval.pod
@@ -46,12 +46,12 @@ I<h> = I<N> + I<H>, E<nbsp>E<nbsp>I<H> = -I<N> + I<h>.
=over
-=item B<-n>
+=item B<-n> I<name>
use geoid I<name> instead of the default C<egm96-5>. See
L</GEOIDS>.
-=item B<-d>
+=item B<-d> I<dir>
read geoid data from I<dir> instead of the default. See
L</GEOIDS>.
@@ -65,7 +65,7 @@ L</INTERPOLATION>.
cache the entire data set in memory. See L</CACHE>.
-=item B<-c>
+=item B<-c> I<south> I<west> I<north> I<east>
cache the data bounded by I<south> I<west> I<north> I<east> in memory.
The first two arguments specify the SW corner of the cache and the last
@@ -75,10 +75,11 @@ before B<-c>. See L</CACHE>.
=item B<-w>
+toggle the longitude first flag (it starts off); if the flag is on, then
when reading geographic coordinates, longitude precedes latitude (this
can be overridden by a hemisphere designator, I<N>, I<S>, I<E>, I<W>).
-=item B<-z>
+=item B<-z> I<zone>
prefix each line of input by I<zone>, e.g., C<38n>. This should be used
when the input consists of UTM/UPS eastings and northings.
@@ -103,7 +104,7 @@ input line with the height converted to height above the geoid (MSL).
print information about the geoid on standard error before processing
the input.
-=item B<--comment-delimiter>
+=item B<--comment-delimiter> I<commentdelim>
set the comment delimiter to I<commentdelim> (e.g., "#" or "//"). If
set, the input lines will be scanned for this delimiter and, if found,
@@ -123,23 +124,23 @@ print usage, the default geoid path and name, and exit.
print full documentation and exit.
-=item B<--input-file>
+=item B<--input-file> I<infile>
read input from the file I<infile> instead of from standard input; a file
name of "-" stands for standard input.
-=item B<--input-string>
+=item B<--input-string> I<instring>
read input from the string I<instring> instead of from standard input.
All occurrences of the line separator character (default is a semicolon)
in I<instring> are converted to newlines before the reading begins.
-=item B<--line-separator>
+=item B<--line-separator> I<linesep>
set the line separator character to I<linesep>. By default this is a
semicolon.
-=item B<--output-file>
+=item B<--output-file> I<outfile>
write output to the file I<outfile> instead of to standard output; a
file name of "-" stands for standard output.
@@ -175,7 +176,7 @@ option. The B<-h> option prints the default geoid path and name. Use
the B<-v> option to ascertain the full path name of the data file.
Instructions for downloading and installing geoid data are available at
-L<http://geographiclib.sf.net/html/geoid.html#geoidinst>.
+L<http://geographiclib.sourceforge.net/html/geoid.html#geoidinst>.
B<NOTE>: all the geoids above apply to the WGS84 ellipsoid (I<a> =
6378137 m, I<f> = 1/298.257223563) only.
@@ -316,5 +317,5 @@ B<GeoidEval> was written by Charles Karney.
=head1 HISTORY
-B<GeoidEval> was added to GeographicLib, L<http://geographiclib.sf.net>,
+B<GeoidEval> was added to GeographicLib, L<http://geographiclib.sourceforge.net>,
in 2009-09.
diff --git a/man/GeoidEval.usage b/man/GeoidEval.usage
index 30bdbe2..b811ff7 100644
--- a/man/GeoidEval.usage
+++ b/man/GeoidEval.usage
@@ -10,7 +10,7 @@ int usage(int retval, bool brief) {
"For full documentation type:\n"
" GeoidEval --help\n"
"or visit:\n"
-" http://geographiclib.sf.net/1.45/GeoidEval.1.html\n";
+" http://geographiclib.sourceforge.net/1.46/GeoidEval.1.html\n";
else
( retval ? std::cerr : std::cout ) << "Man page:\n"
"NAME\n"
@@ -47,24 +47,30 @@ int usage(int retval, bool brief) {
" h = N + H, H = -N + h.\n"
"\n"
"OPTIONS\n"
-" -n use geoid name instead of the default \"egm96-5\". See \"GEOIDS\".\n"
+" -n name\n"
+" use geoid name instead of the default \"egm96-5\". See \"GEOIDS\".\n"
"\n"
-" -d read geoid data from dir instead of the default. See \"GEOIDS\".\n"
+" -d dir\n"
+" read geoid data from dir instead of the default. See \"GEOIDS\".\n"
"\n"
" -l use bilinear interpolation instead of cubic. See \"INTERPOLATION\".\n"
"\n"
" -a cache the entire data set in memory. See \"CACHE\".\n"
"\n"
-" -c cache the data bounded by south west north east in memory. The\n"
+" -c south west north east\n"
+" cache the data bounded by south west north east in memory. The\n"
" first two arguments specify the SW corner of the cache and the last\n"
" two arguments specify the NE corner. The -w flag specifies that\n"
" longitude precedes latitude for these corners, provided that it\n"
" appears before -c. See \"CACHE\".\n"
"\n"
-" -w when reading geographic coordinates, longitude precedes latitude\n"
-" (this can be overridden by a hemisphere designator, N, S, E, W).\n"
+" -w toggle the longitude first flag (it starts off); if the flag is on,\n"
+" then when reading geographic coordinates, longitude precedes\n"
+" latitude (this can be overridden by a hemisphere designator, N, S,\n"
+" E, W).\n"
"\n"
-" -z prefix each line of input by zone, e.g., \"38n\". This should be\n"
+" -z zone\n"
+" prefix each line of input by zone, e.g., \"38n\". This should be\n"
" used when the input consists of UTM/UPS eastings and northings.\n"
"\n"
" --msltohae\n"
@@ -84,7 +90,7 @@ int usage(int retval, bool brief) {
" -v print information about the geoid on standard error before\n"
" processing the input.\n"
"\n"
-" --comment-delimiter\n"
+" --comment-delimiter commentdelim\n"
" set the comment delimiter to commentdelim (e.g., \"#\" or \"//\"). If\n"
" set, the input lines will be scanned for this delimiter and, if\n"
" found, the delimiter and the rest of the line will be removed prior\n"
@@ -99,21 +105,21 @@ int usage(int retval, bool brief) {
" --help\n"
" print full documentation and exit.\n"
"\n"
-" --input-file\n"
+" --input-file infile\n"
" read input from the file infile instead of from standard input; a\n"
" file name of \"-\" stands for standard input.\n"
"\n"
-" --input-string\n"
+" --input-string instring\n"
" read input from the string instring instead of from standard input.\n"
" All occurrences of the line separator character (default is a\n"
" semicolon) in instring are converted to newlines before the reading\n"
" begins.\n"
"\n"
-" --line-separator\n"
+" --line-separator linesep\n"
" set the line separator character to linesep. By default this is a\n"
" semicolon.\n"
"\n"
-" --output-file\n"
+" --output-file outfile\n"
" write output to the file outfile instead of to standard output; a\n"
" file name of \"-\" stands for standard output.\n"
"\n"
@@ -145,7 +151,7 @@ int usage(int retval, bool brief) {
" -v option to ascertain the full path name of the data file.\n"
"\n"
" Instructions for downloading and installing geoid data are available at\n"
-" <http://geographiclib.sf.net/html/geoid.html#geoidinst>.\n"
+" <http://geographiclib.sourceforge.net/html/geoid.html#geoidinst>.\n"
"\n"
" NOTE: all the geoids above apply to the WGS84 ellipsoid (a = 6378137 m,\n"
" f = 1/298.257223563) only.\n"
@@ -257,8 +263,8 @@ int usage(int retval, bool brief) {
" GeoidEval was written by Charles Karney.\n"
"\n"
"HISTORY\n"
-" GeoidEval was added to GeographicLib, <http://geographiclib.sf.net>, in\n"
-" 2009-09.\n"
+" GeoidEval was added to GeographicLib,\n"
+" <http://geographiclib.sourceforge.net>, in 2009-09.\n"
;
return retval;
}
diff --git a/man/Gravity.1 b/man/Gravity.1
index a93796b..8b314da 100644
--- a/man/Gravity.1
+++ b/man/Gravity.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.31)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "GRAVITY 1"
-.TH GRAVITY 1 "2015-09-30" "GeographicLib 1.45" "GeographicLib Utilities"
+.TH GRAVITY 1 "2016-02-14" "GeographicLib 1.46" "GeographicLib Utilities"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -172,12 +172,12 @@ reference ellipsoid \fIa\fR = 6378137 m, \fIf\fR = 1/298.257223563, \fIomega\fR
7292115e\-11 rad/s, and \fI\s-1GM\s0\fR = 3986004.418e8 m^3/s^2.
.SH "OPTIONS"
.IX Header "OPTIONS"
-.IP "\fB\-n\fR" 4
-.IX Item "-n"
+.IP "\fB\-n\fR \fIname\fR" 4
+.IX Item "-n name"
use gravity field model \fIname\fR instead of the default \f(CW\*(C`egm96\*(C'\fR. See
\&\*(L"\s-1MODELS\*(R"\s0.
-.IP "\fB\-d\fR" 4
-.IX Item "-d"
+.IP "\fB\-d\fR \fIdir\fR" 4
+.IX Item "-d dir"
read gravity models from \fIdir\fR instead of the default. See
\&\*(L"\s-1MODELS\*(R"\s0.
.IP "\fB\-G\fR" 4
@@ -215,19 +215,20 @@ match the results of the \s-1NGA\s0's synthesis programs. \fIGeoidEval\fR\|(1)
compute geoid heights much more quickly by interpolating on a grid of
precomputed results; however the results from \fIGeoidEval\fR\|(1) are only
accurate to a few millimeters.
-.IP "\fB\-c\fR" 4
-.IX Item "-c"
+.IP "\fB\-c\fR \fIlat\fR \fIh\fR" 4
+.IX Item "-c lat h"
evaluate the field on a circle of latitude given by \fIlat\fR and \fIh\fR
instead of reading these quantities from the input lines. In this case,
\&\fBGravity\fR can calculate the field considerably more quickly. If geoid
heights are being computed (the \fB\-H\fR option), then \fIh\fR must be zero.
.IP "\fB\-w\fR" 4
.IX Item "-w"
-on input and output, longitude precedes latitude (except that on input
+toggle the longitude first flag (it starts off); if the flag is on, then
+on input and output, longitude precedes latitude (except that, on input,
this can be overridden by a hemisphere designator, \fIN\fR, \fIS\fR, \fIE\fR,
\&\fIW\fR).
-.IP "\fB\-p\fR" 4
-.IX Item "-p"
+.IP "\fB\-p\fR \fIprec\fR" 4
+.IX Item "-p prec"
set the output precision to \fIprec\fR. By default \fIprec\fR is 5 for
acceleration due to gravity, 3 for the gravity disturbance and anomaly,
and 4 for the geoid height.
@@ -235,8 +236,8 @@ and 4 for the geoid height.
.IX Item "-v"
print information about the gravity model on standard error before
processing the input.
-.IP "\fB\-\-comment\-delimiter\fR" 4
-.IX Item "--comment-delimiter"
+.IP "\fB\-\-comment\-delimiter\fR \fIcommentdelim\fR" 4
+.IX Item "--comment-delimiter commentdelim"
set the comment delimiter to \fIcommentdelim\fR (e.g., \*(L"#\*(R" or \*(L"//\*(R"). If
set, the input lines will be scanned for this delimiter and, if found,
the delimiter and the rest of the line will be removed prior to
@@ -251,21 +252,21 @@ print usage, the default gravity path and name, and exit.
.IP "\fB\-\-help\fR" 4
.IX Item "--help"
print full documentation and exit.
-.IP "\fB\-\-input\-file\fR" 4
-.IX Item "--input-file"
+.IP "\fB\-\-input\-file\fR \fIinfile\fR" 4
+.IX Item "--input-file infile"
read input from the file \fIinfile\fR instead of from standard input; a file
name of \*(L"\-\*(R" stands for standard input.
-.IP "\fB\-\-input\-string\fR" 4
-.IX Item "--input-string"
+.IP "\fB\-\-input\-string\fR \fIinstring\fR" 4
+.IX Item "--input-string instring"
read input from the string \fIinstring\fR instead of from standard input.
All occurrences of the line separator character (default is a semicolon)
in \fIinstring\fR are converted to newlines before the reading begins.
-.IP "\fB\-\-line\-separator\fR" 4
-.IX Item "--line-separator"
+.IP "\fB\-\-line\-separator\fR \fIlinesep\fR" 4
+.IX Item "--line-separator linesep"
set the line separator character to \fIlinesep\fR. By default this is a
semicolon.
-.IP "\fB\-\-output\-file\fR" 4
-.IX Item "--output-file"
+.IP "\fB\-\-output\-file\fR \fIoutfile\fR" 4
+.IX Item "--output-file outfile"
write output to the file \fIoutfile\fR instead of to standard output; a
file name of \*(L"\-\*(R" stands for standard output.
.SH "MODELS"
@@ -298,7 +299,7 @@ name. Use the \fB\-v\fR option to ascertain the full path name of the data
file.
.PP
Instructions for downloading and installing gravity models are available
-at <http://geographiclib.sf.net/html/gravity.html#gravityinst>.
+at <http://geographiclib.sourceforge.net/html/gravity.html#gravityinst>.
.SH "ENVIRONMENT"
.IX Header "ENVIRONMENT"
.IP "\fB\s-1GEOGRAPHICLIB_GRAVITY_NAME\s0\fR" 4
@@ -342,5 +343,5 @@ The gravity field from \s-1EGM2008\s0 at the top of Mount Everest
\&\fBGravity\fR was written by Charles Karney.
.SH "HISTORY"
.IX Header "HISTORY"
-\&\fBGravity\fR was added to GeographicLib, <http://geographiclib.sf.net>,
+\&\fBGravity\fR was added to GeographicLib, <http://geographiclib.sourceforge.net>,
in version 1.16.
diff --git a/man/Gravity.1.html b/man/Gravity.1.html
index 3b30e47..43fe5c8 100644
--- a/man/Gravity.1.html
+++ b/man/Gravity.1.html
@@ -7,7 +7,7 @@
<link rev="made" href="mailto:root at localhost" />
</head>
-<body style="background-color: white">
+<body>
@@ -31,13 +31,13 @@
<dl>
-<dt id="n"><b>-n</b></dt>
+<dt id="n-name"><b>-n</b> <i>name</i></dt>
<dd>
<p>use gravity field model <i>name</i> instead of the default <code>egm96</code>. See <a href="#MODELS">"MODELS"</a>.</p>
</dd>
-<dt id="d"><b>-d</b></dt>
+<dt id="d-dir"><b>-d</b> <i>dir</i></dt>
<dd>
<p>read gravity models from <i>dir</i> instead of the default. See <a href="#MODELS">"MODELS"</a>.</p>
@@ -67,7 +67,7 @@
<p>compute the height of the geoid above the reference ellipsoid (in meters). In this case, <i>h</i> should be zero. The results accurately match the results of the NGA's synthesis programs. GeoidEval(1) can compute geoid heights much more quickly by interpolating on a grid of precomputed results; however the results from GeoidEval(1) are only accurate to a few millimeters.</p>
</dd>
-<dt id="c"><b>-c</b></dt>
+<dt id="c-lat-h"><b>-c</b> <i>lat</i> <i>h</i></dt>
<dd>
<p>evaluate the field on a circle of latitude given by <i>lat</i> and <i>h</i> instead of reading these quantities from the input lines. In this case, <b>Gravity</b> can calculate the field considerably more quickly. If geoid heights are being computed (the <b>-H</b> option), then <i>h</i> must be zero.</p>
@@ -76,10 +76,10 @@
<dt id="w"><b>-w</b></dt>
<dd>
-<p>on input and output, longitude precedes latitude (except that on input this can be overridden by a hemisphere designator, <i>N</i>, <i>S</i>, <i>E</i>, <i>W</i>).</p>
+<p>toggle the longitude first flag (it starts off); if the flag is on, then on input and output, longitude precedes latitude (except that, on input, this can be overridden by a hemisphere designator, <i>N</i>, <i>S</i>, <i>E</i>, <i>W</i>).</p>
</dd>
-<dt id="p"><b>-p</b></dt>
+<dt id="p-prec"><b>-p</b> <i>prec</i></dt>
<dd>
<p>set the output precision to <i>prec</i>. By default <i>prec</i> is 5 for acceleration due to gravity, 3 for the gravity disturbance and anomaly, and 4 for the geoid height.</p>
@@ -91,7 +91,7 @@
<p>print information about the gravity model on standard error before processing the input.</p>
</dd>
-<dt id="comment-delimiter"><b>--comment-delimiter</b></dt>
+<dt id="comment-delimiter-commentdelim"><b>--comment-delimiter</b> <i>commentdelim</i></dt>
<dd>
<p>set the comment delimiter to <i>commentdelim</i> (e.g., "#" or "//"). If set, the input lines will be scanned for this delimiter and, if found, the delimiter and the rest of the line will be removed prior to processing and subsequently appended to the output line (separated by a space).</p>
@@ -115,25 +115,25 @@
<p>print full documentation and exit.</p>
</dd>
-<dt id="input-file"><b>--input-file</b></dt>
+<dt id="input-file-infile"><b>--input-file</b> <i>infile</i></dt>
<dd>
<p>read input from the file <i>infile</i> instead of from standard input; a file name of "-" stands for standard input.</p>
</dd>
-<dt id="input-string"><b>--input-string</b></dt>
+<dt id="input-string-instring"><b>--input-string</b> <i>instring</i></dt>
<dd>
<p>read input from the string <i>instring</i> instead of from standard input. All occurrences of the line separator character (default is a semicolon) in <i>instring</i> are converted to newlines before the reading begins.</p>
</dd>
-<dt id="line-separator"><b>--line-separator</b></dt>
+<dt id="line-separator-linesep"><b>--line-separator</b> <i>linesep</i></dt>
<dd>
<p>set the line separator character to <i>linesep</i>. By default this is a semicolon.</p>
</dd>
-<dt id="output-file"><b>--output-file</b></dt>
+<dt id="output-file-outfile"><b>--output-file</b> <i>outfile</i></dt>
<dd>
<p>write output to the file <i>outfile</i> instead of to standard output; a file name of "-" stands for standard output.</p>
@@ -160,7 +160,7 @@
<p>The gravity models will be loaded from a directory specified at compile time. This may changed by setting the environment variables <code>GEOGRAPHICLIB_GRAVITY_PATH</code> or <code>GEOGRAPHICLIB_DATA</code>, or with the <b>-d</b> option. The <b>-h</b> option prints the default gravity path and name. Use the <b>-v</b> option to ascertain the full path name of the data file.</p>
-<p>Instructions for downloading and installing gravity models are available at <a href="http://geographiclib.sf.net/html/gravity.html#gravityinst">http://geographiclib.sf.net/html/gravity.html#gravityinst</a>.</p>
+<p>Instructions for downloading and installing gravity models are available at <a href="http://geographiclib.sourceforge.net/html/gravity.html#gravityinst">http://geographiclib.sourceforge.net/html/gravity.html#gravityinst</a>.</p>
<h1 id="ENVIRONMENT">ENVIRONMENT</h1>
@@ -207,7 +207,7 @@
<h1 id="HISTORY">HISTORY</h1>
-<p><b>Gravity</b> was added to GeographicLib, <a href="http://geographiclib.sf.net">http://geographiclib.sf.net</a>, in version 1.16.</p>
+<p><b>Gravity</b> was added to GeographicLib, <a href="http://geographiclib.sourceforge.net">http://geographiclib.sourceforge.net</a>, in version 1.16.</p>
</body>
diff --git a/man/Gravity.pod b/man/Gravity.pod
index 8b1d489..b36df45 100644
--- a/man/Gravity.pod
+++ b/man/Gravity.pod
@@ -38,12 +38,12 @@ reference ellipsoid I<a> = 6378137 m, I<f> = 1/298.257223563, I<omega> =
=over
-=item B<-n>
+=item B<-n> I<name>
use gravity field model I<name> instead of the default C<egm96>. See
L</MODELS>.
-=item B<-d>
+=item B<-d> I<dir>
read gravity models from I<dir> instead of the default. See
L</MODELS>.
@@ -87,7 +87,7 @@ compute geoid heights much more quickly by interpolating on a grid of
precomputed results; however the results from GeoidEval(1) are only
accurate to a few millimeters.
-=item B<-c>
+=item B<-c> I<lat> I<h>
evaluate the field on a circle of latitude given by I<lat> and I<h>
instead of reading these quantities from the input lines. In this case,
@@ -96,11 +96,12 @@ heights are being computed (the B<-H> option), then I<h> must be zero.
=item B<-w>
-on input and output, longitude precedes latitude (except that on input
+toggle the longitude first flag (it starts off); if the flag is on, then
+on input and output, longitude precedes latitude (except that, on input,
this can be overridden by a hemisphere designator, I<N>, I<S>, I<E>,
I<W>).
-=item B<-p>
+=item B<-p> I<prec>
set the output precision to I<prec>. By default I<prec> is 5 for
acceleration due to gravity, 3 for the gravity disturbance and anomaly,
@@ -111,7 +112,7 @@ and 4 for the geoid height.
print information about the gravity model on standard error before
processing the input.
-=item B<--comment-delimiter>
+=item B<--comment-delimiter> I<commentdelim>
set the comment delimiter to I<commentdelim> (e.g., "#" or "//"). If
set, the input lines will be scanned for this delimiter and, if found,
@@ -131,23 +132,23 @@ print usage, the default gravity path and name, and exit.
print full documentation and exit.
-=item B<--input-file>
+=item B<--input-file> I<infile>
read input from the file I<infile> instead of from standard input; a file
name of "-" stands for standard input.
-=item B<--input-string>
+=item B<--input-string> I<instring>
read input from the string I<instring> instead of from standard input.
All occurrences of the line separator character (default is a semicolon)
in I<instring> are converted to newlines before the reading begins.
-=item B<--line-separator>
+=item B<--line-separator> I<linesep>
set the line separator character to I<linesep>. By default this is a
semicolon.
-=item B<--output-file>
+=item B<--output-file> I<outfile>
write output to the file I<outfile> instead of to standard output; a
file name of "-" stands for standard output.
@@ -182,7 +183,7 @@ name. Use the B<-v> option to ascertain the full path name of the data
file.
Instructions for downloading and installing gravity models are available
-at L<http://geographiclib.sf.net/html/gravity.html#gravityinst>.
+at L<http://geographiclib.sourceforge.net/html/gravity.html#gravityinst>.
=head1 ENVIRONMENT
@@ -236,5 +237,5 @@ B<Gravity> was written by Charles Karney.
=head1 HISTORY
-B<Gravity> was added to GeographicLib, L<http://geographiclib.sf.net>,
+B<Gravity> was added to GeographicLib, L<http://geographiclib.sourceforge.net>,
in version 1.16.
diff --git a/man/Gravity.usage b/man/Gravity.usage
index b50f2ab..fccda88 100644
--- a/man/Gravity.usage
+++ b/man/Gravity.usage
@@ -9,7 +9,7 @@ int usage(int retval, bool brief) {
"For full documentation type:\n"
" Gravity --help\n"
"or visit:\n"
-" http://geographiclib.sf.net/1.45/Gravity.1.html\n";
+" http://geographiclib.sourceforge.net/1.46/Gravity.1.html\n";
else
( retval ? std::cerr : std::cout ) << "Man page:\n"
"NAME\n"
@@ -41,10 +41,12 @@ int usage(int retval, bool brief) {
" 7292115e-11 rad/s, and GM = 3986004.418e8 m^3/s^2.\n"
"\n"
"OPTIONS\n"
-" -n use gravity field model name instead of the default \"egm96\". See\n"
+" -n name\n"
+" use gravity field model name instead of the default \"egm96\". See\n"
" \"MODELS\".\n"
"\n"
-" -d read gravity models from dir instead of the default. See \"MODELS\".\n"
+" -d dir\n"
+" read gravity models from dir instead of the default. See \"MODELS\".\n"
"\n"
" -G compute the acceleration due to gravity (including the centrifugal\n"
" acceleration due the the earth's rotation) g. The output consists\n"
@@ -77,24 +79,27 @@ int usage(int retval, bool brief) {
" grid of precomputed results; however the results from GeoidEval(1)\n"
" are only accurate to a few millimeters.\n"
"\n"
-" -c evaluate the field on a circle of latitude given by lat and h\n"
+" -c lat h\n"
+" evaluate the field on a circle of latitude given by lat and h\n"
" instead of reading these quantities from the input lines. In this\n"
" case, Gravity can calculate the field considerably more quickly.\n"
" If geoid heights are being computed (the -H option), then h must be\n"
" zero.\n"
"\n"
-" -w on input and output, longitude precedes latitude (except that on\n"
-" input this can be overridden by a hemisphere designator, N, S, E,\n"
-" W).\n"
+" -w toggle the longitude first flag (it starts off); if the flag is on,\n"
+" then on input and output, longitude precedes latitude (except that,\n"
+" on input, this can be overridden by a hemisphere designator, N, S,\n"
+" E, W).\n"
"\n"
-" -p set the output precision to prec. By default prec is 5 for\n"
+" -p prec\n"
+" set the output precision to prec. By default prec is 5 for\n"
" acceleration due to gravity, 3 for the gravity disturbance and\n"
" anomaly, and 4 for the geoid height.\n"
"\n"
" -v print information about the gravity model on standard error before\n"
" processing the input.\n"
"\n"
-" --comment-delimiter\n"
+" --comment-delimiter commentdelim\n"
" set the comment delimiter to commentdelim (e.g., \"#\" or \"//\"). If\n"
" set, the input lines will be scanned for this delimiter and, if\n"
" found, the delimiter and the rest of the line will be removed prior\n"
@@ -109,21 +114,21 @@ int usage(int retval, bool brief) {
" --help\n"
" print full documentation and exit.\n"
"\n"
-" --input-file\n"
+" --input-file infile\n"
" read input from the file infile instead of from standard input; a\n"
" file name of \"-\" stands for standard input.\n"
"\n"
-" --input-string\n"
+" --input-string instring\n"
" read input from the string instring instead of from standard input.\n"
" All occurrences of the line separator character (default is a\n"
" semicolon) in instring are converted to newlines before the reading\n"
" begins.\n"
"\n"
-" --line-separator\n"
+" --line-separator linesep\n"
" set the line separator character to linesep. By default this is a\n"
" semicolon.\n"
"\n"
-" --output-file\n"
+" --output-file outfile\n"
" write output to the file outfile instead of to standard output; a\n"
" file name of \"-\" stands for standard output.\n"
"\n"
@@ -154,7 +159,7 @@ int usage(int retval, bool brief) {
"\n"
" Instructions for downloading and installing gravity models are\n"
" available at\n"
-" <http://geographiclib.sf.net/html/gravity.html#gravityinst>.\n"
+" <http://geographiclib.sourceforge.net/html/gravity.html#gravityinst>.\n"
"\n"
"ENVIRONMENT\n"
" GEOGRAPHICLIB_GRAVITY_NAME\n"
@@ -195,8 +200,8 @@ int usage(int retval, bool brief) {
" Gravity was written by Charles Karney.\n"
"\n"
"HISTORY\n"
-" Gravity was added to GeographicLib, <http://geographiclib.sf.net>, in\n"
-" version 1.16.\n"
+" Gravity was added to GeographicLib,\n"
+" <http://geographiclib.sourceforge.net>, in version 1.16.\n"
;
return retval;
}
diff --git a/man/MagneticField.1 b/man/MagneticField.1
index 407ee1e..9e548e4 100644
--- a/man/MagneticField.1
+++ b/man/MagneticField.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.31)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "MAGNETICFIELD 1"
-.TH MAGNETICFIELD 1 "2015-09-30" "GeographicLib 1.45" "GeographicLib Utilities"
+.TH MAGNETICFIELD 1 "2016-02-14" "GeographicLib 1.46" "GeographicLib Utilities"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -191,20 +191,20 @@ of change of these quantities in degrees/yr and nT/yr.
The \s-1WGS84\s0 ellipsoid is used, \fIa\fR = 6378137 m, \fIf\fR = 1/298.257223563.
.SH "OPTIONS"
.IX Header "OPTIONS"
-.IP "\fB\-n\fR" 4
-.IX Item "-n"
+.IP "\fB\-n\fR \fIname\fR" 4
+.IX Item "-n name"
use magnetic field model \fIname\fR instead of the default \f(CW\*(C`wmm2015\*(C'\fR. See
\&\*(L"\s-1MODELS\*(R"\s0.
-.IP "\fB\-d\fR" 4
-.IX Item "-d"
+.IP "\fB\-d\fR \fIdir\fR" 4
+.IX Item "-d dir"
read magnetic models from \fIdir\fR instead of the default. See
\&\*(L"\s-1MODELS\*(R"\s0.
-.IP "\fB\-t\fR" 4
-.IX Item "-t"
+.IP "\fB\-t\fR \fItime\fR" 4
+.IX Item "-t time"
evaluate the field at \fItime\fR instead of reading the time from the input
lines.
-.IP "\fB\-c\fR" 4
-.IX Item "-c"
+.IP "\fB\-c\fR \fItime\fR \fIlat\fR \fIh\fR" 4
+.IX Item "-c time lat h"
evaluate the field on a circle of latitude given by \fItime\fR, \fIlat\fR,
\&\fIh\fR instead of reading these quantities from the input lines. In this
case, \fBMagneticField\fR can calculate the field considerably more
@@ -214,19 +214,20 @@ quickly.
toggle whether to report the rates of change of the field.
.IP "\fB\-w\fR" 4
.IX Item "-w"
-on input and output, longitude precedes latitude (except that on input
+toggle the longitude first flag (it starts off); if the flag is on, then
+on input and output, longitude precedes latitude (except that, on input,
this can be overridden by a hemisphere designator, \fIN\fR, \fIS\fR, \fIE\fR,
\&\fIW\fR).
-.IP "\fB\-T\fR" 4
-.IX Item "-T"
+.IP "\fB\-T\fR \fItguard\fR" 4
+.IX Item "-T tguard"
signal an error if \fItime\fR lies \fItguard\fR years (default 50 yr) beyond
the range for the model.
-.IP "\fB\-H\fR" 4
-.IX Item "-H"
+.IP "\fB\-H\fR \fIhguard\fR" 4
+.IX Item "-H hguard"
signal an error if \fIh\fR lies \fIhguard\fR meters (default 500000 m) beyond
the range for the model.
-.IP "\fB\-p\fR" 4
-.IX Item "-p"
+.IP "\fB\-p\fR \fIprec\fR" 4
+.IX Item "-p prec"
set the output precision to \fIprec\fR (default 1). Fields are printed
with precision with \fIprec\fR decimal places; angles use \fIprec\fR + 1
places.
@@ -234,8 +235,8 @@ places.
.IX Item "-v"
print information about the magnetic model on standard error before
processing the input.
-.IP "\fB\-\-comment\-delimiter\fR" 4
-.IX Item "--comment-delimiter"
+.IP "\fB\-\-comment\-delimiter\fR \fIcommentdelim\fR" 4
+.IX Item "--comment-delimiter commentdelim"
set the comment delimiter to \fIcommentdelim\fR (e.g., \*(L"#\*(R" or \*(L"//\*(R"). If
set, the input lines will be scanned for this delimiter and, if found,
the delimiter and the rest of the line will be removed prior to
@@ -250,21 +251,21 @@ print usage, the default magnetic path and name, and exit.
.IP "\fB\-\-help\fR" 4
.IX Item "--help"
print full documentation and exit.
-.IP "\fB\-\-input\-file\fR" 4
-.IX Item "--input-file"
+.IP "\fB\-\-input\-file\fR \fIinfile\fR" 4
+.IX Item "--input-file infile"
read input from the file \fIinfile\fR instead of from standard input; a file
name of \*(L"\-\*(R" stands for standard input.
-.IP "\fB\-\-input\-string\fR" 4
-.IX Item "--input-string"
+.IP "\fB\-\-input\-string\fR \fIinstring\fR" 4
+.IX Item "--input-string instring"
read input from the string \fIinstring\fR instead of from standard input.
All occurrences of the line separator character (default is a semicolon)
in \fIinstring\fR are converted to newlines before the reading begins.
-.IP "\fB\-\-line\-separator\fR" 4
-.IX Item "--line-separator"
+.IP "\fB\-\-line\-separator\fR \fIlinesep\fR" 4
+.IX Item "--line-separator linesep"
set the line separator character to \fIlinesep\fR. By default this is a
semicolon.
-.IP "\fB\-\-output\-file\fR" 4
-.IX Item "--output-file"
+.IP "\fB\-\-output\-file\fR \fIoutfile\fR" 4
+.IX Item "--output-file outfile"
write output to the file \fIoutfile\fR instead of to standard output; a
file name of \*(L"\-\*(R" stands for standard output.
.SH "MODELS"
@@ -313,7 +314,7 @@ file.
.PP
Instructions for downloading and installing magnetic models are
available at
-<http://geographiclib.sf.net/html/magnetic.html#magneticinst>.
+<http://geographiclib.sourceforge.net/html/magnetic.html#magneticinst>.
.SH "ENVIRONMENT"
.IX Header "ENVIRONMENT"
.IP "\fB\s-1GEOGRAPHICLIB_MAGNETIC_NAME\s0\fR" 4
@@ -366,4 +367,4 @@ the field. The second line gives the annual change.
.SH "HISTORY"
.IX Header "HISTORY"
\&\fBMagneticField\fR was added to GeographicLib,
-<http://geographiclib.sf.net>, in version 1.15.
+<http://geographiclib.sourceforge.net>, in version 1.15.
diff --git a/man/MagneticField.1.html b/man/MagneticField.1.html
index 1b188c9..379bd9c 100644
--- a/man/MagneticField.1.html
+++ b/man/MagneticField.1.html
@@ -7,7 +7,7 @@
<link rev="made" href="mailto:root at localhost" />
</head>
-<body style="background-color: white">
+<body>
@@ -45,25 +45,25 @@
<dl>
-<dt id="n"><b>-n</b></dt>
+<dt id="n-name"><b>-n</b> <i>name</i></dt>
<dd>
<p>use magnetic field model <i>name</i> instead of the default <code>wmm2015</code>. See <a href="#MODELS">"MODELS"</a>.</p>
</dd>
-<dt id="d"><b>-d</b></dt>
+<dt id="d-dir"><b>-d</b> <i>dir</i></dt>
<dd>
<p>read magnetic models from <i>dir</i> instead of the default. See <a href="#MODELS">"MODELS"</a>.</p>
</dd>
-<dt id="t"><b>-t</b></dt>
+<dt id="t-time"><b>-t</b> <i>time</i></dt>
<dd>
<p>evaluate the field at <i>time</i> instead of reading the time from the input lines.</p>
</dd>
-<dt id="c"><b>-c</b></dt>
+<dt id="c-time-lat-h"><b>-c</b> <i>time</i> <i>lat</i> <i>h</i></dt>
<dd>
<p>evaluate the field on a circle of latitude given by <i>time</i>, <i>lat</i>, <i>h</i> instead of reading these quantities from the input lines. In this case, <b>MagneticField</b> can calculate the field considerably more quickly.</p>
@@ -78,22 +78,22 @@
<dt id="w"><b>-w</b></dt>
<dd>
-<p>on input and output, longitude precedes latitude (except that on input this can be overridden by a hemisphere designator, <i>N</i>, <i>S</i>, <i>E</i>, <i>W</i>).</p>
+<p>toggle the longitude first flag (it starts off); if the flag is on, then on input and output, longitude precedes latitude (except that, on input, this can be overridden by a hemisphere designator, <i>N</i>, <i>S</i>, <i>E</i>, <i>W</i>).</p>
</dd>
-<dt id="T"><b>-T</b></dt>
+<dt id="T-tguard"><b>-T</b> <i>tguard</i></dt>
<dd>
<p>signal an error if <i>time</i> lies <i>tguard</i> years (default 50 yr) beyond the range for the model.</p>
</dd>
-<dt id="H"><b>-H</b></dt>
+<dt id="H-hguard"><b>-H</b> <i>hguard</i></dt>
<dd>
<p>signal an error if <i>h</i> lies <i>hguard</i> meters (default 500000 m) beyond the range for the model.</p>
</dd>
-<dt id="p"><b>-p</b></dt>
+<dt id="p-prec"><b>-p</b> <i>prec</i></dt>
<dd>
<p>set the output precision to <i>prec</i> (default 1). Fields are printed with precision with <i>prec</i> decimal places; angles use <i>prec</i> + 1 places.</p>
@@ -105,7 +105,7 @@
<p>print information about the magnetic model on standard error before processing the input.</p>
</dd>
-<dt id="comment-delimiter"><b>--comment-delimiter</b></dt>
+<dt id="comment-delimiter-commentdelim"><b>--comment-delimiter</b> <i>commentdelim</i></dt>
<dd>
<p>set the comment delimiter to <i>commentdelim</i> (e.g., "#" or "//"). If set, the input lines will be scanned for this delimiter and, if found, the delimiter and the rest of the line will be removed prior to processing and subsequently appended to the output line (separated by a space).</p>
@@ -129,25 +129,25 @@
<p>print full documentation and exit.</p>
</dd>
-<dt id="input-file"><b>--input-file</b></dt>
+<dt id="input-file-infile"><b>--input-file</b> <i>infile</i></dt>
<dd>
<p>read input from the file <i>infile</i> instead of from standard input; a file name of "-" stands for standard input.</p>
</dd>
-<dt id="input-string"><b>--input-string</b></dt>
+<dt id="input-string-instring"><b>--input-string</b> <i>instring</i></dt>
<dd>
<p>read input from the string <i>instring</i> instead of from standard input. All occurrences of the line separator character (default is a semicolon) in <i>instring</i> are converted to newlines before the reading begins.</p>
</dd>
-<dt id="line-separator"><b>--line-separator</b></dt>
+<dt id="line-separator-linesep"><b>--line-separator</b> <i>linesep</i></dt>
<dd>
<p>set the line separator character to <i>linesep</i>. By default this is a semicolon.</p>
</dd>
-<dt id="output-file"><b>--output-file</b></dt>
+<dt id="output-file-outfile"><b>--output-file</b> <i>outfile</i></dt>
<dd>
<p>write output to the file <i>outfile</i> instead of to standard output; a file name of "-" stands for standard output.</p>
@@ -186,7 +186,7 @@
<p>The magnetic models will be loaded from a directory specified at compile time. This may changed by setting the environment variables <code>GEOGRAPHICLIB_MAGNETIC_PATH</code> or <code>GEOGRAPHICLIB_DATA</code>, or with the <b>-d</b> option. The <b>-h</b> option prints the default magnetic path and name. Use the <b>-v</b> option to ascertain the full path name of the data file.</p>
-<p>Instructions for downloading and installing magnetic models are available at <a href="http://geographiclib.sf.net/html/magnetic.html#magneticinst">http://geographiclib.sf.net/html/magnetic.html#magneticinst</a>.</p>
+<p>Instructions for downloading and installing magnetic models are available at <a href="http://geographiclib.sourceforge.net/html/magnetic.html#magneticinst">http://geographiclib.sourceforge.net/html/magnetic.html#magneticinst</a>.</p>
<h1 id="ENVIRONMENT">ENVIRONMENT</h1>
@@ -236,7 +236,7 @@
<h1 id="HISTORY">HISTORY</h1>
-<p><b>MagneticField</b> was added to GeographicLib, <a href="http://geographiclib.sf.net">http://geographiclib.sf.net</a>, in version 1.15.</p>
+<p><b>MagneticField</b> was added to GeographicLib, <a href="http://geographiclib.sourceforge.net">http://geographiclib.sourceforge.net</a>, in version 1.15.</p>
</body>
diff --git a/man/MagneticField.pod b/man/MagneticField.pod
index 7b2e5bc..c4bd1ad 100644
--- a/man/MagneticField.pod
+++ b/man/MagneticField.pod
@@ -55,22 +55,22 @@ The WGS84 ellipsoid is used, I<a> = 6378137 m, I<f> = 1/298.257223563.
=over
-=item B<-n>
+=item B<-n> I<name>
use magnetic field model I<name> instead of the default C<wmm2015>. See
L</MODELS>.
-=item B<-d>
+=item B<-d> I<dir>
read magnetic models from I<dir> instead of the default. See
L</MODELS>.
-=item B<-t>
+=item B<-t> I<time>
evaluate the field at I<time> instead of reading the time from the input
lines.
-=item B<-c>
+=item B<-c> I<time> I<lat> I<h>
evaluate the field on a circle of latitude given by I<time>, I<lat>,
I<h> instead of reading these quantities from the input lines. In this
@@ -83,21 +83,22 @@ toggle whether to report the rates of change of the field.
=item B<-w>
-on input and output, longitude precedes latitude (except that on input
+toggle the longitude first flag (it starts off); if the flag is on, then
+on input and output, longitude precedes latitude (except that, on input,
this can be overridden by a hemisphere designator, I<N>, I<S>, I<E>,
I<W>).
-=item B<-T>
+=item B<-T> I<tguard>
signal an error if I<time> lies I<tguard> years (default 50 yr) beyond
the range for the model.
-=item B<-H>
+=item B<-H> I<hguard>
signal an error if I<h> lies I<hguard> meters (default 500000 m) beyond
the range for the model.
-=item B<-p>
+=item B<-p> I<prec>
set the output precision to I<prec> (default 1). Fields are printed
with precision with I<prec> decimal places; angles use I<prec> + 1
@@ -108,7 +109,7 @@ places.
print information about the magnetic model on standard error before
processing the input.
-=item B<--comment-delimiter>
+=item B<--comment-delimiter> I<commentdelim>
set the comment delimiter to I<commentdelim> (e.g., "#" or "//"). If
set, the input lines will be scanned for this delimiter and, if found,
@@ -128,23 +129,23 @@ print usage, the default magnetic path and name, and exit.
print full documentation and exit.
-=item B<--input-file>
+=item B<--input-file> I<infile>
read input from the file I<infile> instead of from standard input; a file
name of "-" stands for standard input.
-=item B<--input-string>
+=item B<--input-string> I<instring>
read input from the string I<instring> instead of from standard input.
All occurrences of the line separator character (default is a semicolon)
in I<instring> are converted to newlines before the reading begins.
-=item B<--line-separator>
+=item B<--line-separator> I<linesep>
set the line separator character to I<linesep>. By default this is a
semicolon.
-=item B<--output-file>
+=item B<--output-file> I<outfile>
write output to the file I<outfile> instead of to standard output; a
file name of "-" stands for standard output.
@@ -195,7 +196,7 @@ file.
Instructions for downloading and installing magnetic models are
available at
-L<http://geographiclib.sf.net/html/magnetic.html#magneticinst>.
+L<http://geographiclib.sourceforge.net/html/magnetic.html#magneticinst>.
=head1 ENVIRONMENT
@@ -258,4 +259,4 @@ B<MagneticField> was written by Charles Karney.
=head1 HISTORY
B<MagneticField> was added to GeographicLib,
-L<http://geographiclib.sf.net>, in version 1.15.
+L<http://geographiclib.sourceforge.net>, in version 1.15.
diff --git a/man/MagneticField.usage b/man/MagneticField.usage
index d8e9862..a689cce 100644
--- a/man/MagneticField.usage
+++ b/man/MagneticField.usage
@@ -10,7 +10,7 @@ int usage(int retval, bool brief) {
"For full documentation type:\n"
" MagneticField --help\n"
"or visit:\n"
-" http://geographiclib.sf.net/1.45/MagneticField.1.html\n";
+" http://geographiclib.sourceforge.net/1.46/MagneticField.1.html\n";
else
( retval ? std::cerr : std::cout ) << "Man page:\n"
"NAME\n"
@@ -59,40 +59,48 @@ int usage(int retval, bool brief) {
" The WGS84 ellipsoid is used, a = 6378137 m, f = 1/298.257223563.\n"
"\n"
"OPTIONS\n"
-" -n use magnetic field model name instead of the default \"wmm2015\".\n"
+" -n name\n"
+" use magnetic field model name instead of the default \"wmm2015\".\n"
" See \"MODELS\".\n"
"\n"
-" -d read magnetic models from dir instead of the default. See\n"
+" -d dir\n"
+" read magnetic models from dir instead of the default. See\n"
" \"MODELS\".\n"
"\n"
-" -t evaluate the field at time instead of reading the time from the\n"
+" -t time\n"
+" evaluate the field at time instead of reading the time from the\n"
" input lines.\n"
"\n"
-" -c evaluate the field on a circle of latitude given by time, lat, h\n"
+" -c time lat h\n"
+" evaluate the field on a circle of latitude given by time, lat, h\n"
" instead of reading these quantities from the input lines. In this\n"
" case, MagneticField can calculate the field considerably more\n"
" quickly.\n"
"\n"
" -r toggle whether to report the rates of change of the field.\n"
"\n"
-" -w on input and output, longitude precedes latitude (except that on\n"
-" input this can be overridden by a hemisphere designator, N, S, E,\n"
-" W).\n"
+" -w toggle the longitude first flag (it starts off); if the flag is on,\n"
+" then on input and output, longitude precedes latitude (except that,\n"
+" on input, this can be overridden by a hemisphere designator, N, S,\n"
+" E, W).\n"
"\n"
-" -T signal an error if time lies tguard years (default 50 yr) beyond\n"
+" -T tguard\n"
+" signal an error if time lies tguard years (default 50 yr) beyond\n"
" the range for the model.\n"
"\n"
-" -H signal an error if h lies hguard meters (default 500000 m) beyond\n"
+" -H hguard\n"
+" signal an error if h lies hguard meters (default 500000 m) beyond\n"
" the range for the model.\n"
"\n"
-" -p set the output precision to prec (default 1). Fields are printed\n"
+" -p prec\n"
+" set the output precision to prec (default 1). Fields are printed\n"
" with precision with prec decimal places; angles use prec + 1\n"
" places.\n"
"\n"
" -v print information about the magnetic model on standard error before\n"
" processing the input.\n"
"\n"
-" --comment-delimiter\n"
+" --comment-delimiter commentdelim\n"
" set the comment delimiter to commentdelim (e.g., \"#\" or \"//\"). If\n"
" set, the input lines will be scanned for this delimiter and, if\n"
" found, the delimiter and the rest of the line will be removed prior\n"
@@ -107,21 +115,21 @@ int usage(int retval, bool brief) {
" --help\n"
" print full documentation and exit.\n"
"\n"
-" --input-file\n"
+" --input-file infile\n"
" read input from the file infile instead of from standard input; a\n"
" file name of \"-\" stands for standard input.\n"
"\n"
-" --input-string\n"
+" --input-string instring\n"
" read input from the string instring instead of from standard input.\n"
" All occurrences of the line separator character (default is a\n"
" semicolon) in instring are converted to newlines before the reading\n"
" begins.\n"
"\n"
-" --line-separator\n"
+" --line-separator linesep\n"
" set the line separator character to linesep. By default this is a\n"
" semicolon.\n"
"\n"
-" --output-file\n"
+" --output-file outfile\n"
" write output to the file outfile instead of to standard output; a\n"
" file name of \"-\" stands for standard output.\n"
"\n"
@@ -167,7 +175,7 @@ int usage(int retval, bool brief) {
"\n"
" Instructions for downloading and installing magnetic models are\n"
" available at\n"
-" <http://geographiclib.sf.net/html/magnetic.html#magneticinst>.\n"
+" <http://geographiclib.sourceforge.net/html/magnetic.html#magneticinst>.\n"
"\n"
"ENVIRONMENT\n"
" GEOGRAPHICLIB_MAGNETIC_NAME\n"
@@ -216,7 +224,7 @@ int usage(int retval, bool brief) {
"\n"
"HISTORY\n"
" MagneticField was added to GeographicLib,\n"
-" <http://geographiclib.sf.net>, in version 1.15.\n"
+" <http://geographiclib.sourceforge.net>, in version 1.15.\n"
;
return retval;
}
diff --git a/man/Makefile.in b/man/Makefile.in
index 3b8b8fc..475e720 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -19,7 +19,17 @@
#
# Copyright (C) 2011, Charles Karney <charles at karney.com>
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -84,7 +94,6 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
subdir = man
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -92,6 +101,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/include/GeographicLib/Config-ac.h
CONFIG_CLEAN_FILES =
@@ -148,6 +158,7 @@ man8dir = $(mandir)/man8
NROFF = nroff
MANS = $(man1_MANS) $(man8_MANS)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -200,6 +211,7 @@ LTLIBOBJS = @LTLIBOBJS@
LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@
LT_REVISION = @LT_REVISION@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -373,7 +385,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu man/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -638,6 +649,8 @@ uninstall-man: uninstall-man1 uninstall-man8
tags-am uninstall uninstall-am uninstall-man uninstall-man1 \
uninstall-man8
+.PRECIOUS: Makefile
+
all: man
man: manpages usage htmlman sysmanpages
diff --git a/man/Planimeter.1 b/man/Planimeter.1
index 199a4ab..e8dd102 100644
--- a/man/Planimeter.1
+++ b/man/Planimeter.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.31)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "PLANIMETER 1"
-.TH PLANIMETER 1 "2015-09-30" "GeographicLib 1.45" "GeographicLib Utilities"
+.TH PLANIMETER 1 "2016-02-14" "GeographicLib 1.46" "GeographicLib Utilities"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -202,10 +202,10 @@ toggle whether the vertices represent a polygon (the default) or a
polyline. For a polyline, the number of points and the length of the
path joining them is returned; the path is not closed and the area is
not reported.
-.IP "\fB\-e\fR" 4
-.IX Item "-e"
-specify the ellipsoid via \fIa\fR \fIf\fR; the equatorial radius is \fIa\fR and
-the flattening is \fIf\fR. Setting \fIf\fR = 0 results in a sphere. Specify
+.IP "\fB\-e\fR \fIa\fR \fIf\fR" 4
+.IX Item "-e a f"
+specify the ellipsoid via the equatorial radius, \fIa\fR and
+the flattening, \fIf\fR. Setting \fIf\fR = 0 results in a sphere. Specify
\&\fIf\fR < 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297,
is allowed for \fIf\fR. By default, the \s-1WGS84\s0 ellipsoid is used, \fIa\fR =
6378137 m, \fIf\fR = 1/298.257223563. If entering vertices as \s-1UTM/UPS\s0 or
@@ -214,10 +214,11 @@ these coordinates to latitude and longitude always uses the \s-1WGS84\s0
parameters.
.IP "\fB\-w\fR" 4
.IX Item "-w"
+toggle the longitude first flag (it starts off); if the flag is on, then
when reading geographic coordinates, longitude precedes latitude (this
can be overridden by a hemisphere designator, \fIN\fR, \fIS\fR, \fIE\fR, \fIW\fR).
-.IP "\fB\-p\fR" 4
-.IX Item "-p"
+.IP "\fB\-p\fR \fIprec\fR" 4
+.IX Item "-p prec"
set the output precision to \fIprec\fR (default 6); the perimeter is given
(in meters) with \fIprec\fR digits after the decimal point; the area is
given (in meters^2) with (\fIprec\fR \- 5) digits after the decimal point.
@@ -242,8 +243,8 @@ sufficiently short. The perimeter calculation is not accurate.
.IP "\fB\-R\fR" 4
.IX Item "-R"
The lines joining the vertices are rhumb lines instead of geodesics.
-.IP "\fB\-\-comment\-delimiter\fR" 4
-.IX Item "--comment-delimiter"
+.IP "\fB\-\-comment\-delimiter\fR \fIcommentdelim\fR" 4
+.IX Item "--comment-delimiter commentdelim"
set the comment delimiter to \fIcommentdelim\fR (e.g., \*(L"#\*(R" or \*(L"//\*(R"). If
set, the input lines will be scanned for this delimiter and, if found,
the delimiter and the rest of the line will be removed prior to
@@ -258,21 +259,21 @@ print usage and exit.
.IP "\fB\-\-help\fR" 4
.IX Item "--help"
print full documentation and exit.
-.IP "\fB\-\-input\-file\fR" 4
-.IX Item "--input-file"
+.IP "\fB\-\-input\-file\fR \fIinfile\fR" 4
+.IX Item "--input-file infile"
read input from the file \fIinfile\fR instead of from standard input; a file
name of \*(L"\-\*(R" stands for standard input.
-.IP "\fB\-\-input\-string\fR" 4
-.IX Item "--input-string"
+.IP "\fB\-\-input\-string\fR \fIinstring\fR" 4
+.IX Item "--input-string instring"
read input from the string \fIinstring\fR instead of from standard input.
All occurrences of the line separator character (default is a semicolon)
in \fIinstring\fR are converted to newlines before the reading begins.
-.IP "\fB\-\-line\-separator\fR" 4
-.IX Item "--line-separator"
+.IP "\fB\-\-line\-separator\fR \fIlinesep\fR" 4
+.IX Item "--line-separator linesep"
set the line separator character to \fIlinesep\fR. By default this is a
semicolon.
-.IP "\fB\-\-output\-file\fR" 4
-.IX Item "--output-file"
+.IP "\fB\-\-output\-file\fR \fIoutfile\fR" 4
+.IX Item "--output-file outfile"
write output to the file \fIoutfile\fR instead of to standard output; a
file name of \*(L"\-\*(R" stands for standard output.
.SH "EXAMPLES"
@@ -322,11 +323,11 @@ The algorithm for the area of geodesic polygon is
given in Section 6 of C. F. F. Karney, \fIAlgorithms for geodesics\fR,
J. Geodesy 87, 43\-55 (2013);
\&\s-1DOI \s0<https://dx.doi.org/10.1007/s00190\-012\-0578\-z>;
-addenda: <http://geographiclib.sf.net/geod\-addenda.html>.
+addenda: <http://geographiclib.sourceforge.net/geod\-addenda.html>.
.SH "AUTHOR"
.IX Header "AUTHOR"
\&\fBPlanimeter\fR was written by Charles Karney.
.SH "HISTORY"
.IX Header "HISTORY"
\&\fBPlanimeter\fR was added to GeographicLib,
-<http://geographiclib.sf.net>, in version 1.4.
+<http://geographiclib.sourceforge.net>, in version 1.4.
diff --git a/man/Planimeter.1.html b/man/Planimeter.1.html
index 6c4af45..178c46c 100644
--- a/man/Planimeter.1.html
+++ b/man/Planimeter.1.html
@@ -7,7 +7,7 @@
<link rev="made" href="mailto:root at localhost" />
</head>
-<body style="background-color: white">
+<body>
@@ -53,19 +53,19 @@
<p>toggle whether the vertices represent a polygon (the default) or a polyline. For a polyline, the number of points and the length of the path joining them is returned; the path is not closed and the area is not reported.</p>
</dd>
-<dt id="e"><b>-e</b></dt>
+<dt id="e-a-f"><b>-e</b> <i>a</i> <i>f</i></dt>
<dd>
-<p>specify the ellipsoid via <i>a</i> <i>f</i>; the equatorial radius is <i>a</i> and the flattening is <i>f</i>. Setting <i>f</i> = 0 results in a sphere. Specify <i>f</i> < 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297, is allowed for <i>f</i>. By default, the WGS84 ellipsoid is used, <i>a</i> = 6378137 m, <i>f</i> = 1/298.257223563. If entering vertices as UTM/UPS or MGRS coordinates, use the default ellipsoid, since the conversion of these coordinates to latitude and l [...]
+<p>specify the ellipsoid via the equatorial radius, <i>a</i> and the flattening, <i>f</i>. Setting <i>f</i> = 0 results in a sphere. Specify <i>f</i> < 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297, is allowed for <i>f</i>. By default, the WGS84 ellipsoid is used, <i>a</i> = 6378137 m, <i>f</i> = 1/298.257223563. If entering vertices as UTM/UPS or MGRS coordinates, use the default ellipsoid, since the conversion of these coordinates to latitude and longitude always uses th [...]
</dd>
<dt id="w"><b>-w</b></dt>
<dd>
-<p>when reading geographic coordinates, longitude precedes latitude (this can be overridden by a hemisphere designator, <i>N</i>, <i>S</i>, <i>E</i>, <i>W</i>).</p>
+<p>toggle the longitude first flag (it starts off); if the flag is on, then when reading geographic coordinates, longitude precedes latitude (this can be overridden by a hemisphere designator, <i>N</i>, <i>S</i>, <i>E</i>, <i>W</i>).</p>
</dd>
-<dt id="p"><b>-p</b></dt>
+<dt id="p-prec"><b>-p</b> <i>prec</i></dt>
<dd>
<p>set the output precision to <i>prec</i> (default 6); the perimeter is given (in meters) with <i>prec</i> digits after the decimal point; the area is given (in meters^2) with (<i>prec</i> - 5) digits after the decimal point.</p>
@@ -95,7 +95,7 @@
<p>The lines joining the vertices are rhumb lines instead of geodesics.</p>
</dd>
-<dt id="comment-delimiter"><b>--comment-delimiter</b></dt>
+<dt id="comment-delimiter-commentdelim"><b>--comment-delimiter</b> <i>commentdelim</i></dt>
<dd>
<p>set the comment delimiter to <i>commentdelim</i> (e.g., "#" or "//"). If set, the input lines will be scanned for this delimiter and, if found, the delimiter and the rest of the line will be removed prior to processing. For a given polygon, the last such string found will be appended to the output line (separated by a space).</p>
@@ -119,25 +119,25 @@
<p>print full documentation and exit.</p>
</dd>
-<dt id="input-file"><b>--input-file</b></dt>
+<dt id="input-file-infile"><b>--input-file</b> <i>infile</i></dt>
<dd>
<p>read input from the file <i>infile</i> instead of from standard input; a file name of "-" stands for standard input.</p>
</dd>
-<dt id="input-string"><b>--input-string</b></dt>
+<dt id="input-string-instring"><b>--input-string</b> <i>instring</i></dt>
<dd>
<p>read input from the string <i>instring</i> instead of from standard input. All occurrences of the line separator character (default is a semicolon) in <i>instring</i> are converted to newlines before the reading begins.</p>
</dd>
-<dt id="line-separator"><b>--line-separator</b></dt>
+<dt id="line-separator-linesep"><b>--line-separator</b> <i>linesep</i></dt>
<dd>
<p>set the line separator character to <i>linesep</i>. By default this is a semicolon.</p>
</dd>
-<dt id="output-file"><b>--output-file</b></dt>
+<dt id="output-file-outfile"><b>--output-file</b> <i>outfile</i></dt>
<dd>
<p>write output to the file <i>outfile</i> instead of to standard output; a file name of "-" stands for standard output.</p>
@@ -183,7 +183,7 @@
<p>An online version of this utility is availbable at <a href="http://geographiclib.sourceforge.net/cgi-bin/Planimeter">http://geographiclib.sourceforge.net/cgi-bin/Planimeter</a>.</p>
-<p>The algorithm for the area of geodesic polygon is given in Section 6 of C. F. F. Karney, <i>Algorithms for geodesics</i>, J. Geodesy 87, 43-55 (2013); DOI <a href="https://dx.doi.org/10.1007/s00190-012-0578-z">https://dx.doi.org/10.1007/s00190-012-0578-z</a>; addenda: <a href="http://geographiclib.sf.net/geod-addenda.html">http://geographiclib.sf.net/geod-addenda.html</a>.</p>
+<p>The algorithm for the area of geodesic polygon is given in Section 6 of C. F. F. Karney, <i>Algorithms for geodesics</i>, J. Geodesy 87, 43-55 (2013); DOI <a href="https://dx.doi.org/10.1007/s00190-012-0578-z">https://dx.doi.org/10.1007/s00190-012-0578-z</a>; addenda: <a href="http://geographiclib.sourceforge.net/geod-addenda.html">http://geographiclib.sourceforge.net/geod-addenda.html</a>.</p>
<h1 id="AUTHOR">AUTHOR</h1>
@@ -191,7 +191,7 @@
<h1 id="HISTORY">HISTORY</h1>
-<p><b>Planimeter</b> was added to GeographicLib, <a href="http://geographiclib.sf.net">http://geographiclib.sf.net</a>, in version 1.4.</p>
+<p><b>Planimeter</b> was added to GeographicLib, <a href="http://geographiclib.sourceforge.net">http://geographiclib.sourceforge.net</a>, in version 1.4.</p>
</body>
diff --git a/man/Planimeter.pod b/man/Planimeter.pod
index 7abb3e7..a3d85ca 100644
--- a/man/Planimeter.pod
+++ b/man/Planimeter.pod
@@ -71,10 +71,10 @@ polyline. For a polyline, the number of points and the length of the
path joining them is returned; the path is not closed and the area is
not reported.
-=item B<-e>
+=item B<-e> I<a> I<f>
-specify the ellipsoid via I<a> I<f>; the equatorial radius is I<a> and
-the flattening is I<f>. Setting I<f> = 0 results in a sphere. Specify
+specify the ellipsoid via the equatorial radius, I<a> and
+the flattening, I<f>. Setting I<f> = 0 results in a sphere. Specify
I<f> E<lt> 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297,
is allowed for I<f>. By default, the WGS84 ellipsoid is used, I<a> =
6378137 m, I<f> = 1/298.257223563. If entering vertices as UTM/UPS or
@@ -84,10 +84,11 @@ parameters.
=item B<-w>
+toggle the longitude first flag (it starts off); if the flag is on, then
when reading geographic coordinates, longitude precedes latitude (this
can be overridden by a hemisphere designator, I<N>, I<S>, I<E>, I<W>).
-=item B<-p>
+=item B<-p> I<prec>
set the output precision to I<prec> (default 6); the perimeter is given
(in meters) with I<prec> digits after the decimal point; the area is
@@ -118,7 +119,7 @@ sufficiently short. The perimeter calculation is not accurate.
The lines joining the vertices are rhumb lines instead of geodesics.
-=item B<--comment-delimiter>
+=item B<--comment-delimiter> I<commentdelim>
set the comment delimiter to I<commentdelim> (e.g., "#" or "//"). If
set, the input lines will be scanned for this delimiter and, if found,
@@ -138,23 +139,23 @@ print usage and exit.
print full documentation and exit.
-=item B<--input-file>
+=item B<--input-file> I<infile>
read input from the file I<infile> instead of from standard input; a file
name of "-" stands for standard input.
-=item B<--input-string>
+=item B<--input-string> I<instring>
read input from the string I<instring> instead of from standard input.
All occurrences of the line separator character (default is a semicolon)
in I<instring> are converted to newlines before the reading begins.
-=item B<--line-separator>
+=item B<--line-separator> I<linesep>
set the line separator character to I<linesep>. By default this is a
semicolon.
-=item B<--output-file>
+=item B<--output-file> I<outfile>
write output to the file I<outfile> instead of to standard output; a
file name of "-" stands for standard output.
@@ -205,7 +206,7 @@ The algorithm for the area of geodesic polygon is
given in Section 6 of C. F. F. Karney, I<Algorithms for geodesics>,
J. Geodesy 87, 43-55 (2013);
DOI L<https://dx.doi.org/10.1007/s00190-012-0578-z>;
-addenda: L<http://geographiclib.sf.net/geod-addenda.html>.
+addenda: L<http://geographiclib.sourceforge.net/geod-addenda.html>.
=head1 AUTHOR
@@ -214,4 +215,4 @@ B<Planimeter> was written by Charles Karney.
=head1 HISTORY
B<Planimeter> was added to GeographicLib,
-L<http://geographiclib.sf.net>, in version 1.4.
+L<http://geographiclib.sourceforge.net>, in version 1.4.
diff --git a/man/Planimeter.usage b/man/Planimeter.usage
index adc9e4a..d0bc091 100644
--- a/man/Planimeter.usage
+++ b/man/Planimeter.usage
@@ -9,7 +9,7 @@ int usage(int retval, bool brief) {
"For full documentation type:\n"
" Planimeter --help\n"
"or visit:\n"
-" http://geographiclib.sf.net/1.45/Planimeter.1.html\n";
+" http://geographiclib.sourceforge.net/1.46/Planimeter.1.html\n";
else
( retval ? std::cerr : std::cout ) << "Man page:\n"
"NAME\n"
@@ -70,8 +70,9 @@ int usage(int retval, bool brief) {
" the path joining them is returned; the path is not closed and the\n"
" area is not reported.\n"
"\n"
-" -e specify the ellipsoid via a f; the equatorial radius is a and the\n"
-" flattening is f. Setting f = 0 results in a sphere. Specify f < 0\n"
+" -e a f\n"
+" specify the ellipsoid via the equatorial radius, a and the\n"
+" flattening, f. Setting f = 0 results in a sphere. Specify f < 0\n"
" for a prolate ellipsoid. A simple fraction, e.g., 1/297, is\n"
" allowed for f. By default, the WGS84 ellipsoid is used, a =\n"
" 6378137 m, f = 1/298.257223563. If entering vertices as UTM/UPS or\n"
@@ -79,10 +80,13 @@ int usage(int retval, bool brief) {
" of these coordinates to latitude and longitude always uses the\n"
" WGS84 parameters.\n"
"\n"
-" -w when reading geographic coordinates, longitude precedes latitude\n"
-" (this can be overridden by a hemisphere designator, N, S, E, W).\n"
+" -w toggle the longitude first flag (it starts off); if the flag is on,\n"
+" then when reading geographic coordinates, longitude precedes\n"
+" latitude (this can be overridden by a hemisphere designator, N, S,\n"
+" E, W).\n"
"\n"
-" -p set the output precision to prec (default 6); the perimeter is\n"
+" -p prec\n"
+" set the output precision to prec (default 6); the perimeter is\n"
" given (in meters) with prec digits after the decimal point; the\n"
" area is given (in meters^2) with (prec - 5) digits after the\n"
" decimal point.\n"
@@ -106,7 +110,7 @@ int usage(int retval, bool brief) {
" -R The lines joining the vertices are rhumb lines instead of\n"
" geodesics.\n"
"\n"
-" --comment-delimiter\n"
+" --comment-delimiter commentdelim\n"
" set the comment delimiter to commentdelim (e.g., \"#\" or \"//\"). If\n"
" set, the input lines will be scanned for this delimiter and, if\n"
" found, the delimiter and the rest of the line will be removed prior\n"
@@ -121,21 +125,21 @@ int usage(int retval, bool brief) {
" --help\n"
" print full documentation and exit.\n"
"\n"
-" --input-file\n"
+" --input-file infile\n"
" read input from the file infile instead of from standard input; a\n"
" file name of \"-\" stands for standard input.\n"
"\n"
-" --input-string\n"
+" --input-string instring\n"
" read input from the string instring instead of from standard input.\n"
" All occurrences of the line separator character (default is a\n"
" semicolon) in instring are converted to newlines before the reading\n"
" begins.\n"
"\n"
-" --line-separator\n"
+" --line-separator linesep\n"
" set the line separator character to linesep. By default this is a\n"
" semicolon.\n"
"\n"
-" --output-file\n"
+" --output-file outfile\n"
" write output to the file outfile instead of to standard output; a\n"
" file name of \"-\" stands for standard output.\n"
"\n"
@@ -180,14 +184,14 @@ int usage(int retval, bool brief) {
" The algorithm for the area of geodesic polygon is given in Section 6 of\n"
" C. F. F. Karney, Algorithms for geodesics, J. Geodesy 87, 43-55 (2013);\n"
" DOI <https://dx.doi.org/10.1007/s00190-012-0578-z>; addenda:\n"
-" <http://geographiclib.sf.net/geod-addenda.html>.\n"
+" <http://geographiclib.sourceforge.net/geod-addenda.html>.\n"
"\n"
"AUTHOR\n"
" Planimeter was written by Charles Karney.\n"
"\n"
"HISTORY\n"
-" Planimeter was added to GeographicLib, <http://geographiclib.sf.net>,\n"
-" in version 1.4.\n"
+" Planimeter was added to GeographicLib,\n"
+" <http://geographiclib.sourceforge.net>, in version 1.4.\n"
;
return retval;
}
diff --git a/man/RhumbSolve.1 b/man/RhumbSolve.1
index cbc5fbc..7f81313 100644
--- a/man/RhumbSolve.1
+++ b/man/RhumbSolve.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.31)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "RHUMBSOLVE 1"
-.TH RHUMBSOLVE 1 "2015-09-30" "GeographicLib 1.45" "GeographicLib Utilities"
+.TH RHUMBSOLVE 1 "2016-02-14" "GeographicLib 1.46" "GeographicLib Utilities"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -142,7 +142,7 @@
RhumbSolve \-\- perform rhumb line calculations
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
-\&\fBRhumbSolve\fR [ \fB\-i\fR | \fB\-l\fR \fIlat1\fR \fIlon1\fR \fIazi12\fR ]
+\&\fBRhumbSolve\fR [ \fB\-i\fR | \fB\-L\fR \fIlat1\fR \fIlon1\fR \fIazi12\fR ]
[ \fB\-e\fR \fIa\fR \fIf\fR ]
[ \fB\-d\fR | \fB\-:\fR ] [ \fB\-w\fR ] [ \fB\-p\fR \fIprec\fR ] [ \fB\-s\fR ]
[ \fB\-\-comment\-delimiter\fR \fIcommentdelim\fR ]
@@ -174,31 +174,32 @@ By default, \fBRhumbSolve\fR accepts lines on the standard input containing
\&\fIlat1\fR \fIlon1\fR \fIazi12\fR \fIs12\fR and prints \fIlat2\fR \fIlon2\fR \fIS12\fR on
standard output. This is the direct calculation.
.IP "2." 4
-Command line arguments \fB\-l\fR \fIlat1\fR \fIlon1\fR \fIazi12\fR specify a rhumb
-line. \fBRhumbSolve\fR then accepts a sequence of \fIs12\fR values (one per
-line) on standard input and prints \fIlat2\fR \fIlon2\fR \fIS12\fR for each.
-This generates a sequence of points on a rhumb line.
-.IP "3." 4
With the \fB\-i\fR command line argument, \fBRhumbSolve\fR performs the inverse
calculation. It reads lines containing \fIlat1\fR \fIlon1\fR \fIlat2\fR \fIlon2\fR
and prints the values of \fIazi12\fR \fIs12\fR \fIS12\fR for the corresponding
shortest rhumb lines. If the end points are on opposite meridians,
there are two shortest rhumb lines and the east-going one is chosen.
+.IP "3." 4
+Command line arguments \fB\-L\fR \fIlat1\fR \fIlon1\fR \fIazi12\fR specify a rhumb
+line. \fBRhumbSolve\fR then accepts a sequence of \fIs12\fR values (one per
+line) on standard input and prints \fIlat2\fR \fIlon2\fR \fIS12\fR for each.
+This generates a sequence of points on a rhumb line.
.SH "OPTIONS"
.IX Header "OPTIONS"
.IP "\fB\-i\fR" 4
.IX Item "-i"
-perform an inverse calculation (see 3 above).
-.IP "\fB\-l\fR" 4
-.IX Item "-l"
-line mode (see 2 above); generate a sequence of points along the rhumb
+perform an inverse calculation (see 2 above).
+.IP "\fB\-L\fR \fIlat1\fR \fIlon1\fR \fIazi12\fR" 4
+.IX Item "-L lat1 lon1 azi12"
+line mode (see 3 above); generate a sequence of points along the rhumb
line specified by \fIlat1\fR \fIlon1\fR \fIazi12\fR. The \fB\-w\fR flag can be used
to swap the default order of the 2 geographic coordinates, provided that
-it appears before \fB\-l\fR.
-.IP "\fB\-e\fR" 4
-.IX Item "-e"
-specify the ellipsoid via \fIa\fR \fIf\fR; the equatorial radius is \fIa\fR and
-the flattening is \fIf\fR. Setting \fIf\fR = 0 results in a sphere. Specify
+it appears before \fB\-L\fR. (\fB\-l\fR is an alternative, deprecated, spelling
+of this flag.)
+.IP "\fB\-e\fR \fIa\fR \fIf\fR" 4
+.IX Item "-e a f"
+specify the ellipsoid via the equatorial radius, \fIa\fR and
+the flattening, \fIf\fR. Setting \fIf\fR = 0 results in a sphere. Specify
\&\fIf\fR < 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297,
is allowed for \fIf\fR. By default, the \s-1WGS84\s0 ellipsoid is used, \fIa\fR =
6378137 m, \fIf\fR = 1/298.257223563.
@@ -214,8 +215,8 @@ delimiters.
on input and output, longitude precedes latitude (except that on input
this can be overridden by a hemisphere designator, \fIN\fR, \fIS\fR, \fIE\fR,
\&\fIW\fR).
-.IP "\fB\-p\fR" 4
-.IX Item "-p"
+.IP "\fB\-p\fR \fIprec\fR" 4
+.IX Item "-p prec"
set the output precision to \fIprec\fR (default 3); \fIprec\fR is the
precision relative to 1 m. See \*(L"\s-1PRECISION\*(R"\s0.
.IP "\fB\-s\fR" 4
@@ -227,8 +228,8 @@ isometric and rectifying latitudes. If \fB\-s\fR is supplied this divided
difference is computed using Krueger series for the transverse Mercator
projection which is only accurate for |\fIf\fR| < 0.01. See
\&\*(L"\s-1ACCURACY\*(R"\s0.
-.IP "\fB\-\-comment\-delimiter\fR" 4
-.IX Item "--comment-delimiter"
+.IP "\fB\-\-comment\-delimiter\fR \fIcommentdelim\fR" 4
+.IX Item "--comment-delimiter commentdelim"
set the comment delimiter to \fIcommentdelim\fR (e.g., \*(L"#\*(R" or \*(L"//\*(R"). If
set, the input lines will be scanned for this delimiter and, if found,
the delimiter and the rest of the line will be removed prior to
@@ -243,21 +244,21 @@ print usage and exit.
.IP "\fB\-\-help\fR" 4
.IX Item "--help"
print full documentation and exit.
-.IP "\fB\-\-input\-file\fR" 4
-.IX Item "--input-file"
+.IP "\fB\-\-input\-file\fR \fIinfile\fR" 4
+.IX Item "--input-file infile"
read input from the file \fIinfile\fR instead of from standard input; a file
name of \*(L"\-\*(R" stands for standard input.
-.IP "\fB\-\-input\-string\fR" 4
-.IX Item "--input-string"
+.IP "\fB\-\-input\-string\fR \fIinstring\fR" 4
+.IX Item "--input-string instring"
read input from the string \fIinstring\fR instead of from standard input.
All occurrences of the line separator character (default is a semicolon)
in \fIinstring\fR are converted to newlines before the reading begins.
-.IP "\fB\-\-line\-separator\fR" 4
-.IX Item "--line-separator"
+.IP "\fB\-\-line\-separator\fR \fIlinesep\fR" 4
+.IX Item "--line-separator linesep"
set the line separator character to \fIlinesep\fR. By default this is a
semicolon.
-.IP "\fB\-\-output\-file\fR" 4
-.IX Item "--output-file"
+.IP "\fB\-\-output\-file\fR \fIoutfile\fR" 4
+.IX Item "--output-file outfile"
write output to the file \fIoutfile\fR instead of to standard output; a
file name of \*(L"\-\*(R" stands for standard output.
.SH "INPUT"
@@ -323,7 +324,7 @@ Waypoints on the route at intervals of 2000km:
.PP
.Vb 2
\& for ((i = 0; i <= 20; i += 2)); do echo ${i}000000;done |
-\& RhumbSolve \-l 40:38:23N 073:46:44W 103:34:58.2 \-: \-p 0
+\& RhumbSolve \-L 40:38:23N 073:46:44W 103:34:58.2 \-: \-p 0
\&
\& 40:38:23.0N 073:46:44.0W
\& 36:24:30.3N 051:28:26.4W
@@ -351,5 +352,5 @@ The Wikipedia page, Rhumb line,
\&\fBRhumbSolve\fR was written by Charles Karney.
.SH "HISTORY"
.IX Header "HISTORY"
-\&\fBRhumbSolve\fR was added to GeographicLib, <http://geographiclib.sf.net>,
+\&\fBRhumbSolve\fR was added to GeographicLib, <http://geographiclib.sourceforge.net>,
in version 1.37.
diff --git a/man/RhumbSolve.1.html b/man/RhumbSolve.1.html
index 751992e..1c4ce74 100644
--- a/man/RhumbSolve.1.html
+++ b/man/RhumbSolve.1.html
@@ -7,7 +7,7 @@
<link rev="made" href="mailto:root at localhost" />
</head>
-<body style="background-color: white">
+<body>
@@ -17,7 +17,7 @@
<h1 id="SYNOPSIS">SYNOPSIS</h1>
-<p><b>RhumbSolve</b> [ <b>-i</b> | <b>-l</b> <i>lat1</i> <i>lon1</i> <i>azi12</i> ] [ <b>-e</b> <i>a</i> <i>f</i> ] [ <b>-d</b> | <b>-:</b> ] [ <b>-w</b> ] [ <b>-p</b> <i>prec</i> ] [ <b>-s</b> ] [ <b>--comment-delimiter</b> <i>commentdelim</i> ] [ <b>--version</b> | <b>-h</b> | <b>--help</b> ] [ <b>--input-file</b> <i>infile</i> | <b>--input-string</b> <i>instring</i> ] [ <b>--line-separator</b> <i>linesep</i> ] [ <b>--output-file</b> <i>outfile</i> ]</p>
+<p><b>RhumbSolve</b> [ <b>-i</b> | <b>-L</b> <i>lat1</i> <i>lon1</i> <i>azi12</i> ] [ <b>-e</b> <i>a</i> <i>f</i> ] [ <b>-d</b> | <b>-:</b> ] [ <b>-w</b> ] [ <b>-p</b> <i>prec</i> ] [ <b>-s</b> ] [ <b>--comment-delimiter</b> <i>commentdelim</i> ] [ <b>--version</b> | <b>-h</b> | <b>--help</b> ] [ <b>--input-file</b> <i>infile</i> | <b>--input-string</b> <i>instring</i> ] [ <b>--line-separator</b> <i>linesep</i> ] [ <b>--output-file</b> <i>outfile</i> ]</p>
<h1 id="DESCRIPTION">DESCRIPTION</h1>
@@ -32,10 +32,10 @@
<li><p>By default, <b>RhumbSolve</b> accepts lines on the standard input containing <i>lat1</i> <i>lon1</i> <i>azi12</i> <i>s12</i> and prints <i>lat2</i> <i>lon2</i> <i>S12</i> on standard output. This is the direct calculation.</p>
</li>
-<li><p>Command line arguments <b>-l</b> <i>lat1</i> <i>lon1</i> <i>azi12</i> specify a rhumb line. <b>RhumbSolve</b> then accepts a sequence of <i>s12</i> values (one per line) on standard input and prints <i>lat2</i> <i>lon2</i> <i>S12</i> for each. This generates a sequence of points on a rhumb line.</p>
+<li><p>With the <b>-i</b> command line argument, <b>RhumbSolve</b> performs the inverse calculation. It reads lines containing <i>lat1</i> <i>lon1</i> <i>lat2</i> <i>lon2</i> and prints the values of <i>azi12</i> <i>s12</i> <i>S12</i> for the corresponding shortest rhumb lines. If the end points are on opposite meridians, there are two shortest rhumb lines and the east-going one is chosen.</p>
</li>
-<li><p>With the <b>-i</b> command line argument, <b>RhumbSolve</b> performs the inverse calculation. It reads lines containing <i>lat1</i> <i>lon1</i> <i>lat2</i> <i>lon2</i> and prints the values of <i>azi12</i> <i>s12</i> <i>S12</i> for the corresponding shortest rhumb lines. If the end points are on opposite meridians, there are two shortest rhumb lines and the east-going one is chosen.</p>
+<li><p>Command line arguments <b>-L</b> <i>lat1</i> <i>lon1</i> <i>azi12</i> specify a rhumb line. <b>RhumbSolve</b> then accepts a sequence of <i>s12</i> values (one per line) on standard input and prints <i>lat2</i> <i>lon2</i> <i>S12</i> for each. This generates a sequence of points on a rhumb line.</p>
</li>
</ol>
@@ -47,19 +47,19 @@
<dt id="i"><b>-i</b></dt>
<dd>
-<p>perform an inverse calculation (see 3 above).</p>
+<p>perform an inverse calculation (see 2 above).</p>
</dd>
-<dt id="l"><b>-l</b></dt>
+<dt id="L-lat1-lon1-azi12"><b>-L</b> <i>lat1</i> <i>lon1</i> <i>azi12</i></dt>
<dd>
-<p>line mode (see 2 above); generate a sequence of points along the rhumb line specified by <i>lat1</i> <i>lon1</i> <i>azi12</i>. The <b>-w</b> flag can be used to swap the default order of the 2 geographic coordinates, provided that it appears before <b>-l</b>.</p>
+<p>line mode (see 3 above); generate a sequence of points along the rhumb line specified by <i>lat1</i> <i>lon1</i> <i>azi12</i>. The <b>-w</b> flag can be used to swap the default order of the 2 geographic coordinates, provided that it appears before <b>-L</b>. (<b>-l</b> is an alternative, deprecated, spelling of this flag.)</p>
</dd>
-<dt id="e"><b>-e</b></dt>
+<dt id="e-a-f"><b>-e</b> <i>a</i> <i>f</i></dt>
<dd>
-<p>specify the ellipsoid via <i>a</i> <i>f</i>; the equatorial radius is <i>a</i> and the flattening is <i>f</i>. Setting <i>f</i> = 0 results in a sphere. Specify <i>f</i> < 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297, is allowed for <i>f</i>. By default, the WGS84 ellipsoid is used, <i>a</i> = 6378137 m, <i>f</i> = 1/298.257223563.</p>
+<p>specify the ellipsoid via the equatorial radius, <i>a</i> and the flattening, <i>f</i>. Setting <i>f</i> = 0 results in a sphere. Specify <i>f</i> < 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297, is allowed for <i>f</i>. By default, the WGS84 ellipsoid is used, <i>a</i> = 6378137 m, <i>f</i> = 1/298.257223563.</p>
</dd>
<dt id="d"><b>-d</b></dt>
@@ -80,7 +80,7 @@
<p>on input and output, longitude precedes latitude (except that on input this can be overridden by a hemisphere designator, <i>N</i>, <i>S</i>, <i>E</i>, <i>W</i>).</p>
</dd>
-<dt id="p"><b>-p</b></dt>
+<dt id="p-prec"><b>-p</b> <i>prec</i></dt>
<dd>
<p>set the output precision to <i>prec</i> (default 3); <i>prec</i> is the precision relative to 1 m. See <a href="#PRECISION">"PRECISION"</a>.</p>
@@ -92,7 +92,7 @@
<p>By default, the rhumb line calculations are carried out exactly in terms of elliptic integrals. This includes the use of the addition theorem for elliptic integrals to compute the divided difference of the isometric and rectifying latitudes. If <b>-s</b> is supplied this divided difference is computed using Krueger series for the transverse Mercator projection which is only accurate for |<i>f</i>| < 0.01. See <a href="#ACCURACY">"ACCURACY"</a>.</p>
</dd>
-<dt id="comment-delimiter"><b>--comment-delimiter</b></dt>
+<dt id="comment-delimiter-commentdelim"><b>--comment-delimiter</b> <i>commentdelim</i></dt>
<dd>
<p>set the comment delimiter to <i>commentdelim</i> (e.g., "#" or "//"). If set, the input lines will be scanned for this delimiter and, if found, the delimiter and the rest of the line will be removed prior to processing and subsequently appended to the output line (separated by a space).</p>
@@ -116,25 +116,25 @@
<p>print full documentation and exit.</p>
</dd>
-<dt id="input-file"><b>--input-file</b></dt>
+<dt id="input-file-infile"><b>--input-file</b> <i>infile</i></dt>
<dd>
<p>read input from the file <i>infile</i> instead of from standard input; a file name of "-" stands for standard input.</p>
</dd>
-<dt id="input-string"><b>--input-string</b></dt>
+<dt id="input-string-instring"><b>--input-string</b> <i>instring</i></dt>
<dd>
<p>read input from the string <i>instring</i> instead of from standard input. All occurrences of the line separator character (default is a semicolon) in <i>instring</i> are converted to newlines before the reading begins.</p>
</dd>
-<dt id="line-separator"><b>--line-separator</b></dt>
+<dt id="line-separator-linesep"><b>--line-separator</b> <i>linesep</i></dt>
<dd>
<p>set the line separator character to <i>linesep</i>. By default this is a semicolon.</p>
</dd>
-<dt id="output-file"><b>--output-file</b></dt>
+<dt id="output-file-outfile"><b>--output-file</b> <i>outfile</i></dt>
<dd>
<p>write output to the file <i>outfile</i> instead of to standard output; a file name of "-" stands for standard output.</p>
@@ -174,7 +174,7 @@
<p>Waypoints on the route at intervals of 2000km:</p>
<pre><code> for ((i = 0; i <= 20; i += 2)); do echo ${i}000000;done |
- RhumbSolve -l 40:38:23N 073:46:44W 103:34:58.2 -: -p 0
+ RhumbSolve -L 40:38:23N 073:46:44W 103:34:58.2 -: -p 0
40:38:23.0N 073:46:44.0W
36:24:30.3N 051:28:26.4W
@@ -202,7 +202,7 @@
<h1 id="HISTORY">HISTORY</h1>
-<p><b>RhumbSolve</b> was added to GeographicLib, <a href="http://geographiclib.sf.net">http://geographiclib.sf.net</a>, in version 1.37.</p>
+<p><b>RhumbSolve</b> was added to GeographicLib, <a href="http://geographiclib.sourceforge.net">http://geographiclib.sourceforge.net</a>, in version 1.37.</p>
</body>
diff --git a/man/RhumbSolve.pod b/man/RhumbSolve.pod
index 94ce957..c59c001 100644
--- a/man/RhumbSolve.pod
+++ b/man/RhumbSolve.pod
@@ -4,7 +4,7 @@ RhumbSolve -- perform rhumb line calculations
=head1 SYNOPSIS
-B<RhumbSolve> [ B<-i> | B<-l> I<lat1> I<lon1> I<azi12> ]
+B<RhumbSolve> [ B<-i> | B<-L> I<lat1> I<lon1> I<azi12> ]
[ B<-e> I<a> I<f> ]
[ B<-d> | B<-:> ] [ B<-w> ] [ B<-p> I<prec> ] [ B<-s> ]
[ B<--comment-delimiter> I<commentdelim> ]
@@ -43,19 +43,19 @@ standard output. This is the direct calculation.
=item 2.
-Command line arguments B<-l> I<lat1> I<lon1> I<azi12> specify a rhumb
-line. B<RhumbSolve> then accepts a sequence of I<s12> values (one per
-line) on standard input and prints I<lat2> I<lon2> I<S12> for each.
-This generates a sequence of points on a rhumb line.
-
-=item 3.
-
With the B<-i> command line argument, B<RhumbSolve> performs the inverse
calculation. It reads lines containing I<lat1> I<lon1> I<lat2> I<lon2>
and prints the values of I<azi12> I<s12> I<S12> for the corresponding
shortest rhumb lines. If the end points are on opposite meridians,
there are two shortest rhumb lines and the east-going one is chosen.
+=item 3.
+
+Command line arguments B<-L> I<lat1> I<lon1> I<azi12> specify a rhumb
+line. B<RhumbSolve> then accepts a sequence of I<s12> values (one per
+line) on standard input and prints I<lat2> I<lon2> I<S12> for each.
+This generates a sequence of points on a rhumb line.
+
=back
=head1 OPTIONS
@@ -64,19 +64,20 @@ there are two shortest rhumb lines and the east-going one is chosen.
=item B<-i>
-perform an inverse calculation (see 3 above).
+perform an inverse calculation (see 2 above).
-=item B<-l>
+=item B<-L> I<lat1> I<lon1> I<azi12>
-line mode (see 2 above); generate a sequence of points along the rhumb
+line mode (see 3 above); generate a sequence of points along the rhumb
line specified by I<lat1> I<lon1> I<azi12>. The B<-w> flag can be used
to swap the default order of the 2 geographic coordinates, provided that
-it appears before B<-l>.
+it appears before B<-L>. (B<-l> is an alternative, deprecated, spelling
+of this flag.)
-=item B<-e>
+=item B<-e> I<a> I<f>
-specify the ellipsoid via I<a> I<f>; the equatorial radius is I<a> and
-the flattening is I<f>. Setting I<f> = 0 results in a sphere. Specify
+specify the ellipsoid via the equatorial radius, I<a> and
+the flattening, I<f>. Setting I<f> = 0 results in a sphere. Specify
I<f> E<lt> 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297,
is allowed for I<f>. By default, the WGS84 ellipsoid is used, I<a> =
6378137 m, I<f> = 1/298.257223563.
@@ -96,7 +97,7 @@ on input and output, longitude precedes latitude (except that on input
this can be overridden by a hemisphere designator, I<N>, I<S>, I<E>,
I<W>).
-=item B<-p>
+=item B<-p> I<prec>
set the output precision to I<prec> (default 3); I<prec> is the
precision relative to 1 m. See L</PRECISION>.
@@ -111,7 +112,7 @@ difference is computed using Krueger series for the transverse Mercator
projection which is only accurate for |I<f>| E<lt> 0.01. See
L</ACCURACY>.
-=item B<--comment-delimiter>
+=item B<--comment-delimiter> I<commentdelim>
set the comment delimiter to I<commentdelim> (e.g., "#" or "//"). If
set, the input lines will be scanned for this delimiter and, if found,
@@ -131,23 +132,23 @@ print usage and exit.
print full documentation and exit.
-=item B<--input-file>
+=item B<--input-file> I<infile>
read input from the file I<infile> instead of from standard input; a file
name of "-" stands for standard input.
-=item B<--input-string>
+=item B<--input-string> I<instring>
read input from the string I<instring> instead of from standard input.
All occurrences of the line separator character (default is a semicolon)
in I<instring> are converted to newlines before the reading begins.
-=item B<--line-separator>
+=item B<--line-separator> I<linesep>
set the line separator character to I<linesep>. By default this is a
semicolon.
-=item B<--output-file>
+=item B<--output-file> I<outfile>
write output to the file I<outfile> instead of to standard output; a
file name of "-" stands for standard output.
@@ -218,7 +219,7 @@ considerably longer than the geodesic given by GeodSolve(1).
Waypoints on the route at intervals of 2000km:
for ((i = 0; i <= 20; i += 2)); do echo ${i}000000;done |
- RhumbSolve -l 40:38:23N 073:46:44W 103:34:58.2 -: -p 0
+ RhumbSolve -L 40:38:23N 073:46:44W 103:34:58.2 -: -p 0
40:38:23.0N 073:46:44.0W
36:24:30.3N 051:28:26.4W
@@ -248,5 +249,5 @@ B<RhumbSolve> was written by Charles Karney.
=head1 HISTORY
-B<RhumbSolve> was added to GeographicLib, L<http://geographiclib.sf.net>,
+B<RhumbSolve> was added to GeographicLib, L<http://geographiclib.sourceforge.net>,
in version 1.37.
diff --git a/man/RhumbSolve.usage b/man/RhumbSolve.usage
index d72eaab..7a078a5 100644
--- a/man/RhumbSolve.usage
+++ b/man/RhumbSolve.usage
@@ -1,7 +1,7 @@
int usage(int retval, bool brief) {
if (brief)
( retval ? std::cerr : std::cout ) << "Usage:\n"
-" RhumbSolve [ -i | -l lat1 lon1 azi12 ] [ -e a f ] [ -d | -: ] [ -w ] [\n"
+" RhumbSolve [ -i | -L lat1 lon1 azi12 ] [ -e a f ] [ -d | -: ] [ -w ] [\n"
" -p prec ] [ -s ] [ --comment-delimiter commentdelim ] [ --version | -h\n"
" | --help ] [ --input-file infile | --input-string instring ] [\n"
" --line-separator linesep ] [ --output-file outfile ]\n"
@@ -9,14 +9,14 @@ int usage(int retval, bool brief) {
"For full documentation type:\n"
" RhumbSolve --help\n"
"or visit:\n"
-" http://geographiclib.sf.net/1.45/RhumbSolve.1.html\n";
+" http://geographiclib.sourceforge.net/1.46/RhumbSolve.1.html\n";
else
( retval ? std::cerr : std::cout ) << "Man page:\n"
"NAME\n"
" RhumbSolve -- perform rhumb line calculations\n"
"\n"
"SYNOPSIS\n"
-" RhumbSolve [ -i | -l lat1 lon1 azi12 ] [ -e a f ] [ -d | -: ] [ -w ] [\n"
+" RhumbSolve [ -i | -L lat1 lon1 azi12 ] [ -e a f ] [ -d | -: ] [ -w ] [\n"
" -p prec ] [ -s ] [ --comment-delimiter commentdelim ] [ --version | -h\n"
" | --help ] [ --input-file infile | --input-string instring ] [\n"
" --line-separator linesep ] [ --output-file outfile ]\n"
@@ -43,27 +43,30 @@ int usage(int retval, bool brief) {
" containing lat1 lon1 azi12 s12 and prints lat2 lon2 S12 on standard\n"
" output. This is the direct calculation.\n"
"\n"
-" 2. Command line arguments -l lat1 lon1 azi12 specify a rhumb line.\n"
-" RhumbSolve then accepts a sequence of s12 values (one per line) on\n"
-" standard input and prints lat2 lon2 S12 for each. This generates a\n"
-" sequence of points on a rhumb line.\n"
-"\n"
-" 3. With the -i command line argument, RhumbSolve performs the inverse\n"
+" 2. With the -i command line argument, RhumbSolve performs the inverse\n"
" calculation. It reads lines containing lat1 lon1 lat2 lon2 and\n"
" prints the values of azi12 s12 S12 for the corresponding shortest\n"
" rhumb lines. If the end points are on opposite meridians, there\n"
" are two shortest rhumb lines and the east-going one is chosen.\n"
"\n"
+" 3. Command line arguments -L lat1 lon1 azi12 specify a rhumb line.\n"
+" RhumbSolve then accepts a sequence of s12 values (one per line) on\n"
+" standard input and prints lat2 lon2 S12 for each. This generates a\n"
+" sequence of points on a rhumb line.\n"
+"\n"
"OPTIONS\n"
-" -i perform an inverse calculation (see 3 above).\n"
+" -i perform an inverse calculation (see 2 above).\n"
"\n"
-" -l line mode (see 2 above); generate a sequence of points along the\n"
+" -L lat1 lon1 azi12\n"
+" line mode (see 3 above); generate a sequence of points along the\n"
" rhumb line specified by lat1 lon1 azi12. The -w flag can be used\n"
" to swap the default order of the 2 geographic coordinates, provided\n"
-" that it appears before -l.\n"
+" that it appears before -L. (-l is an alternative, deprecated,\n"
+" spelling of this flag.)\n"
"\n"
-" -e specify the ellipsoid via a f; the equatorial radius is a and the\n"
-" flattening is f. Setting f = 0 results in a sphere. Specify f < 0\n"
+" -e a f\n"
+" specify the ellipsoid via the equatorial radius, a and the\n"
+" flattening, f. Setting f = 0 results in a sphere. Specify f < 0\n"
" for a prolate ellipsoid. A simple fraction, e.g., 1/297, is\n"
" allowed for f. By default, the WGS84 ellipsoid is used, a =\n"
" 6378137 m, f = 1/298.257223563.\n"
@@ -78,7 +81,8 @@ int usage(int retval, bool brief) {
" input this can be overridden by a hemisphere designator, N, S, E,\n"
" W).\n"
"\n"
-" -p set the output precision to prec (default 3); prec is the precision\n"
+" -p prec\n"
+" set the output precision to prec (default 3); prec is the precision\n"
" relative to 1 m. See \"PRECISION\".\n"
"\n"
" -s By default, the rhumb line calculations are carried out exactly in\n"
@@ -89,7 +93,7 @@ int usage(int retval, bool brief) {
" transverse Mercator projection which is only accurate for |f| <\n"
" 0.01. See \"ACCURACY\".\n"
"\n"
-" --comment-delimiter\n"
+" --comment-delimiter commentdelim\n"
" set the comment delimiter to commentdelim (e.g., \"#\" or \"//\"). If\n"
" set, the input lines will be scanned for this delimiter and, if\n"
" found, the delimiter and the rest of the line will be removed prior\n"
@@ -104,21 +108,21 @@ int usage(int retval, bool brief) {
" --help\n"
" print full documentation and exit.\n"
"\n"
-" --input-file\n"
+" --input-file infile\n"
" read input from the file infile instead of from standard input; a\n"
" file name of \"-\" stands for standard input.\n"
"\n"
-" --input-string\n"
+" --input-string instring\n"
" read input from the string instring instead of from standard input.\n"
" All occurrences of the line separator character (default is a\n"
" semicolon) in instring are converted to newlines before the reading\n"
" begins.\n"
"\n"
-" --line-separator\n"
+" --line-separator linesep\n"
" set the line separator character to linesep. By default this is a\n"
" semicolon.\n"
"\n"
-" --output-file\n"
+" --output-file outfile\n"
" write output to the file outfile instead of to standard output; a\n"
" file name of \"-\" stands for standard output.\n"
"\n"
@@ -179,7 +183,7 @@ int usage(int retval, bool brief) {
" Waypoints on the route at intervals of 2000km:\n"
"\n"
" for ((i = 0; i <= 20; i += 2)); do echo ${i}000000;done |\n"
-" RhumbSolve -l 40:38:23N 073:46:44W 103:34:58.2 -: -p 0\n"
+" RhumbSolve -L 40:38:23N 073:46:44W 103:34:58.2 -: -p 0\n"
"\n"
" 40:38:23.0N 073:46:44.0W\n"
" 36:24:30.3N 051:28:26.4W\n"
@@ -206,8 +210,8 @@ int usage(int retval, bool brief) {
" RhumbSolve was written by Charles Karney.\n"
"\n"
"HISTORY\n"
-" RhumbSolve was added to GeographicLib, <http://geographiclib.sf.net>,\n"
-" in version 1.37.\n"
+" RhumbSolve was added to GeographicLib,\n"
+" <http://geographiclib.sourceforge.net>, in version 1.37.\n"
;
return retval;
}
diff --git a/man/TransverseMercatorProj.1 b/man/TransverseMercatorProj.1
index ae70524..651b861 100644
--- a/man/TransverseMercatorProj.1
+++ b/man/TransverseMercatorProj.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.31)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "TRANSVERSEMERCATORPROJ 1"
-.TH TRANSVERSEMERCATORPROJ 1 "2015-09-30" "GeographicLib 1.45" "GeographicLib Utilities"
+.TH TRANSVERSEMERCATORPROJ 1 "2016-02-14" "GeographicLib 1.46" "GeographicLib Utilities"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -176,21 +176,21 @@ Mercator projection instead of the exact projection.
.IP "\fB\-t\fR" 4
.IX Item "-t"
use the exact algorithm with the \*(L"\s-1EXTENDED DOMAIN\*(R"\s0.
-.IP "\fB\-l\fR" 4
-.IX Item "-l"
+.IP "\fB\-l\fR \fIlon0\fR" 4
+.IX Item "-l lon0"
specify the longitude of origin \fIlon0\fR (degrees, default 0).
-.IP "\fB\-k\fR" 4
-.IX Item "-k"
+.IP "\fB\-k\fR \fIk0\fR" 4
+.IX Item "-k k0"
specify the scale \fIk0\fR on the central meridian (default 0.9996).
.IP "\fB\-r\fR" 4
.IX Item "-r"
perform the reverse projection. \fIx\fR and \fIy\fR are given on standard
input and each line of standard output gives \fIlatitude\fR, \fIlongitude\fR,
\&\fIgamma\fR, and \fIk\fR.
-.IP "\fB\-e\fR" 4
-.IX Item "-e"
-specify the ellipsoid via \fIa\fR \fIf\fR; the equatorial radius is \fIa\fR and
-the flattening is \fIf\fR. Setting \fIf\fR = 0 results in a sphere. Specify
+.IP "\fB\-e\fR \fIa\fR \fIf\fR" 4
+.IX Item "-e a f"
+specify the ellipsoid via the equatorial radius, \fIa\fR and
+the flattening, \fIf\fR. Setting \fIf\fR = 0 results in a sphere. Specify
\&\fIf\fR < 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297,
is allowed for \fIf\fR. By default, the \s-1WGS84\s0 ellipsoid is used, \fIa\fR =
6378137 m, \fIf\fR = 1/298.257223563. If the exact algorithm is used, \fIf\fR
@@ -200,15 +200,15 @@ must be positive.
on input and output, longitude precedes latitude (except that on input
this can be overridden by a hemisphere designator, \fIN\fR, \fIS\fR, \fIE\fR,
\&\fIW\fR).
-.IP "\fB\-p\fR" 4
-.IX Item "-p"
+.IP "\fB\-p\fR \fIprec\fR" 4
+.IX Item "-p prec"
set the output precision to \fIprec\fR (default 6). \fIprec\fR is the number
of digits after the decimal point for lengths (in meters). For
latitudes and longitudes (in degrees), the number of digits after the
decimal point is \fIprec\fR + 5. For the convergence (in degrees) and
scale, the number of digits after the decimal point is \fIprec\fR + 6.
-.IP "\fB\-\-comment\-delimiter\fR" 4
-.IX Item "--comment-delimiter"
+.IP "\fB\-\-comment\-delimiter\fR \fIcommentdelim\fR" 4
+.IX Item "--comment-delimiter commentdelim"
set the comment delimiter to \fIcommentdelim\fR (e.g., \*(L"#\*(R" or \*(L"//\*(R"). If
set, the input lines will be scanned for this delimiter and, if found,
the delimiter and the rest of the line will be removed prior to
@@ -223,21 +223,21 @@ print usage and exit.
.IP "\fB\-\-help\fR" 4
.IX Item "--help"
print full documentation and exit.
-.IP "\fB\-\-input\-file\fR" 4
-.IX Item "--input-file"
+.IP "\fB\-\-input\-file\fR \fIinfile\fR" 4
+.IX Item "--input-file infile"
read input from the file \fIinfile\fR instead of from standard input; a file
name of \*(L"\-\*(R" stands for standard input.
-.IP "\fB\-\-input\-string\fR" 4
-.IX Item "--input-string"
+.IP "\fB\-\-input\-string\fR \fIinstring\fR" 4
+.IX Item "--input-string instring"
read input from the string \fIinstring\fR instead of from standard input.
All occurrences of the line separator character (default is a semicolon)
in \fIinstring\fR are converted to newlines before the reading begins.
-.IP "\fB\-\-line\-separator\fR" 4
-.IX Item "--line-separator"
+.IP "\fB\-\-line\-separator\fR \fIlinesep\fR" 4
+.IX Item "--line-separator linesep"
set the line separator character to \fIlinesep\fR. By default this is a
semicolon.
-.IP "\fB\-\-output\-file\fR" 4
-.IX Item "--output-file"
+.IP "\fB\-\-output\-file\fR \fIoutfile\fR" 4
+.IX Item "--output-file outfile"
write output to the file \fIoutfile\fR instead of to standard output; a
file name of \*(L"\-\*(R" stands for standard output.
.SH "EXTENDED DOMAIN"
@@ -279,6 +279,6 @@ this paper.
.SH "HISTORY"
.IX Header "HISTORY"
\&\fBTransverseMercatorProj\fR was added to GeographicLib,
-<http://geographiclib.sf.net>, in 2009\-01. Prior to version 1.9 it was
+<http://geographiclib.sourceforge.net>, in 2009\-01. Prior to version 1.9 it was
called TransverseMercatorTest (and its interface was slightly
different).
diff --git a/man/TransverseMercatorProj.1.html b/man/TransverseMercatorProj.1.html
index 3923e09..18535a3 100644
--- a/man/TransverseMercatorProj.1.html
+++ b/man/TransverseMercatorProj.1.html
@@ -7,7 +7,7 @@
<link rev="made" href="mailto:root at localhost" />
</head>
-<body style="background-color: white">
+<body>
@@ -41,13 +41,13 @@
<p>use the exact algorithm with the <a href="#EXTENDED-DOMAIN">"EXTENDED DOMAIN"</a>.</p>
</dd>
-<dt id="l"><b>-l</b></dt>
+<dt id="l-lon0"><b>-l</b> <i>lon0</i></dt>
<dd>
<p>specify the longitude of origin <i>lon0</i> (degrees, default 0).</p>
</dd>
-<dt id="k"><b>-k</b></dt>
+<dt id="k-k0"><b>-k</b> <i>k0</i></dt>
<dd>
<p>specify the scale <i>k0</i> on the central meridian (default 0.9996).</p>
@@ -59,10 +59,10 @@
<p>perform the reverse projection. <i>x</i> and <i>y</i> are given on standard input and each line of standard output gives <i>latitude</i>, <i>longitude</i>, <i>gamma</i>, and <i>k</i>.</p>
</dd>
-<dt id="e"><b>-e</b></dt>
+<dt id="e-a-f"><b>-e</b> <i>a</i> <i>f</i></dt>
<dd>
-<p>specify the ellipsoid via <i>a</i> <i>f</i>; the equatorial radius is <i>a</i> and the flattening is <i>f</i>. Setting <i>f</i> = 0 results in a sphere. Specify <i>f</i> < 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297, is allowed for <i>f</i>. By default, the WGS84 ellipsoid is used, <i>a</i> = 6378137 m, <i>f</i> = 1/298.257223563. If the exact algorithm is used, <i>f</i> must be positive.</p>
+<p>specify the ellipsoid via the equatorial radius, <i>a</i> and the flattening, <i>f</i>. Setting <i>f</i> = 0 results in a sphere. Specify <i>f</i> < 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297, is allowed for <i>f</i>. By default, the WGS84 ellipsoid is used, <i>a</i> = 6378137 m, <i>f</i> = 1/298.257223563. If the exact algorithm is used, <i>f</i> must be positive.</p>
</dd>
<dt id="w"><b>-w</b></dt>
@@ -71,13 +71,13 @@
<p>on input and output, longitude precedes latitude (except that on input this can be overridden by a hemisphere designator, <i>N</i>, <i>S</i>, <i>E</i>, <i>W</i>).</p>
</dd>
-<dt id="p"><b>-p</b></dt>
+<dt id="p-prec"><b>-p</b> <i>prec</i></dt>
<dd>
<p>set the output precision to <i>prec</i> (default 6). <i>prec</i> is the number of digits after the decimal point for lengths (in meters). For latitudes and longitudes (in degrees), the number of digits after the decimal point is <i>prec</i> + 5. For the convergence (in degrees) and scale, the number of digits after the decimal point is <i>prec</i> + 6.</p>
</dd>
-<dt id="comment-delimiter"><b>--comment-delimiter</b></dt>
+<dt id="comment-delimiter-commentdelim"><b>--comment-delimiter</b> <i>commentdelim</i></dt>
<dd>
<p>set the comment delimiter to <i>commentdelim</i> (e.g., "#" or "//"). If set, the input lines will be scanned for this delimiter and, if found, the delimiter and the rest of the line will be removed prior to processing and subsequently appended to the output line (separated by a space).</p>
@@ -101,25 +101,25 @@
<p>print full documentation and exit.</p>
</dd>
-<dt id="input-file"><b>--input-file</b></dt>
+<dt id="input-file-infile"><b>--input-file</b> <i>infile</i></dt>
<dd>
<p>read input from the file <i>infile</i> instead of from standard input; a file name of "-" stands for standard input.</p>
</dd>
-<dt id="input-string"><b>--input-string</b></dt>
+<dt id="input-string-instring"><b>--input-string</b> <i>instring</i></dt>
<dd>
<p>read input from the string <i>instring</i> instead of from standard input. All occurrences of the line separator character (default is a semicolon) in <i>instring</i> are converted to newlines before the reading begins.</p>
</dd>
-<dt id="line-separator"><b>--line-separator</b></dt>
+<dt id="line-separator-linesep"><b>--line-separator</b> <i>linesep</i></dt>
<dd>
<p>set the line separator character to <i>linesep</i>. By default this is a semicolon.</p>
</dd>
-<dt id="output-file"><b>--output-file</b></dt>
+<dt id="output-file-outfile"><b>--output-file</b> <i>outfile</i></dt>
<dd>
<p>write output to the file <i>outfile</i> instead of to standard output; a file name of "-" stands for standard output.</p>
@@ -152,7 +152,7 @@
<h1 id="HISTORY">HISTORY</h1>
-<p><b>TransverseMercatorProj</b> was added to GeographicLib, <a href="http://geographiclib.sf.net">http://geographiclib.sf.net</a>, in 2009-01. Prior to version 1.9 it was called TransverseMercatorTest (and its interface was slightly different).</p>
+<p><b>TransverseMercatorProj</b> was added to GeographicLib, <a href="http://geographiclib.sourceforge.net">http://geographiclib.sourceforge.net</a>, in 2009-01. Prior to version 1.9 it was called TransverseMercatorTest (and its interface was slightly different).</p>
</body>
diff --git a/man/TransverseMercatorProj.pod b/man/TransverseMercatorProj.pod
index 9662bb9..d14e2c7 100644
--- a/man/TransverseMercatorProj.pod
+++ b/man/TransverseMercatorProj.pod
@@ -44,11 +44,11 @@ Mercator projection instead of the exact projection.
use the exact algorithm with the L</EXTENDED DOMAIN>.
-=item B<-l>
+=item B<-l> I<lon0>
specify the longitude of origin I<lon0> (degrees, default 0).
-=item B<-k>
+=item B<-k> I<k0>
specify the scale I<k0> on the central meridian (default 0.9996).
@@ -58,10 +58,10 @@ perform the reverse projection. I<x> and I<y> are given on standard
input and each line of standard output gives I<latitude>, I<longitude>,
I<gamma>, and I<k>.
-=item B<-e>
+=item B<-e> I<a> I<f>
-specify the ellipsoid via I<a> I<f>; the equatorial radius is I<a> and
-the flattening is I<f>. Setting I<f> = 0 results in a sphere. Specify
+specify the ellipsoid via the equatorial radius, I<a> and
+the flattening, I<f>. Setting I<f> = 0 results in a sphere. Specify
I<f> E<lt> 0 for a prolate ellipsoid. A simple fraction, e.g., 1/297,
is allowed for I<f>. By default, the WGS84 ellipsoid is used, I<a> =
6378137 m, I<f> = 1/298.257223563. If the exact algorithm is used, I<f>
@@ -73,7 +73,7 @@ on input and output, longitude precedes latitude (except that on input
this can be overridden by a hemisphere designator, I<N>, I<S>, I<E>,
I<W>).
-=item B<-p>
+=item B<-p> I<prec>
set the output precision to I<prec> (default 6). I<prec> is the number
of digits after the decimal point for lengths (in meters). For
@@ -81,7 +81,7 @@ latitudes and longitudes (in degrees), the number of digits after the
decimal point is I<prec> + 5. For the convergence (in degrees) and
scale, the number of digits after the decimal point is I<prec> + 6.
-=item B<--comment-delimiter>
+=item B<--comment-delimiter> I<commentdelim>
set the comment delimiter to I<commentdelim> (e.g., "#" or "//"). If
set, the input lines will be scanned for this delimiter and, if found,
@@ -101,23 +101,23 @@ print usage and exit.
print full documentation and exit.
-=item B<--input-file>
+=item B<--input-file> I<infile>
read input from the file I<infile> instead of from standard input; a file
name of "-" stands for standard input.
-=item B<--input-string>
+=item B<--input-string> I<instring>
read input from the string I<instring> instead of from standard input.
All occurrences of the line separator character (default is a semicolon)
in I<instring> are converted to newlines before the reading begins.
-=item B<--line-separator>
+=item B<--line-separator> I<linesep>
set the line separator character to I<linesep>. By default this is a
semicolon.
-=item B<--output-file>
+=item B<--output-file> I<outfile>
write output to the file I<outfile> instead of to standard output; a
file name of "-" stands for standard output.
@@ -166,6 +166,6 @@ this paper.
=head1 HISTORY
B<TransverseMercatorProj> was added to GeographicLib,
-L<http://geographiclib.sf.net>, in 2009-01. Prior to version 1.9 it was
+L<http://geographiclib.sourceforge.net>, in 2009-01. Prior to version 1.9 it was
called TransverseMercatorTest (and its interface was slightly
different).
diff --git a/man/TransverseMercatorProj.usage b/man/TransverseMercatorProj.usage
index 5906472..ed45ce5 100644
--- a/man/TransverseMercatorProj.usage
+++ b/man/TransverseMercatorProj.usage
@@ -9,7 +9,7 @@ int usage(int retval, bool brief) {
"For full documentation type:\n"
" TransverseMercatorProj --help\n"
"or visit:\n"
-" http://geographiclib.sf.net/1.45/TransverseMercatorProj.1.html\n";
+" http://geographiclib.sourceforge.net/1.46/TransverseMercatorProj.1.html\n";
else
( retval ? std::cerr : std::cout ) << "Man page:\n"
"NAME\n"
@@ -44,16 +44,19 @@ int usage(int retval, bool brief) {
"\n"
" -t use the exact algorithm with the \"EXTENDED DOMAIN\".\n"
"\n"
-" -l specify the longitude of origin lon0 (degrees, default 0).\n"
+" -l lon0\n"
+" specify the longitude of origin lon0 (degrees, default 0).\n"
"\n"
-" -k specify the scale k0 on the central meridian (default 0.9996).\n"
+" -k k0\n"
+" specify the scale k0 on the central meridian (default 0.9996).\n"
"\n"
" -r perform the reverse projection. x and y are given on standard\n"
" input and each line of standard output gives latitude, longitude,\n"
" gamma, and k.\n"
"\n"
-" -e specify the ellipsoid via a f; the equatorial radius is a and the\n"
-" flattening is f. Setting f = 0 results in a sphere. Specify f < 0\n"
+" -e a f\n"
+" specify the ellipsoid via the equatorial radius, a and the\n"
+" flattening, f. Setting f = 0 results in a sphere. Specify f < 0\n"
" for a prolate ellipsoid. A simple fraction, e.g., 1/297, is\n"
" allowed for f. By default, the WGS84 ellipsoid is used, a =\n"
" 6378137 m, f = 1/298.257223563. If the exact algorithm is used, f\n"
@@ -63,14 +66,15 @@ int usage(int retval, bool brief) {
" input this can be overridden by a hemisphere designator, N, S, E,\n"
" W).\n"
"\n"
-" -p set the output precision to prec (default 6). prec is the number\n"
+" -p prec\n"
+" set the output precision to prec (default 6). prec is the number\n"
" of digits after the decimal point for lengths (in meters). For\n"
" latitudes and longitudes (in degrees), the number of digits after\n"
" the decimal point is prec + 5. For the convergence (in degrees)\n"
" and scale, the number of digits after the decimal point is prec +\n"
" 6.\n"
"\n"
-" --comment-delimiter\n"
+" --comment-delimiter commentdelim\n"
" set the comment delimiter to commentdelim (e.g., \"#\" or \"//\"). If\n"
" set, the input lines will be scanned for this delimiter and, if\n"
" found, the delimiter and the rest of the line will be removed prior\n"
@@ -85,21 +89,21 @@ int usage(int retval, bool brief) {
" --help\n"
" print full documentation and exit.\n"
"\n"
-" --input-file\n"
+" --input-file infile\n"
" read input from the file infile instead of from standard input; a\n"
" file name of \"-\" stands for standard input.\n"
"\n"
-" --input-string\n"
+" --input-string instring\n"
" read input from the string instring instead of from standard input.\n"
" All occurrences of the line separator character (default is a\n"
" semicolon) in instring are converted to newlines before the reading\n"
" begins.\n"
"\n"
-" --line-separator\n"
+" --line-separator linesep\n"
" set the line separator character to linesep. By default this is a\n"
" semicolon.\n"
"\n"
-" --output-file\n"
+" --output-file outfile\n"
" write output to the file outfile instead of to standard output; a\n"
" file name of \"-\" stands for standard output.\n"
"\n"
@@ -139,9 +143,9 @@ int usage(int retval, bool brief) {
"\n"
"HISTORY\n"
" TransverseMercatorProj was added to GeographicLib,\n"
-" <http://geographiclib.sf.net>, in 2009-01. Prior to version 1.9 it was\n"
-" called TransverseMercatorTest (and its interface was slightly\n"
-" different).\n"
+" <http://geographiclib.sourceforge.net>, in 2009-01. Prior to version\n"
+" 1.9 it was called TransverseMercatorTest (and its interface was\n"
+" slightly different).\n"
;
return retval;
}
diff --git a/man/dummy.1.in b/man/dummy.1.in
index 8b6884d..10ed436 100644
--- a/man/dummy.1.in
+++ b/man/dummy.1.in
@@ -3,7 +3,7 @@
@TOOL@ \-\- a GeographicLib utility
.SH DESCRIPTION
.B @TOOL@
-is part of GeographicLib, <http://geographiclib.sf.net>. For
+is part of GeographicLib, <http://geographiclib.sourceforge.net>. For
documentation, see
.PP
- http://geographiclib.sf.net/@PROJECT_VERSION@/@TOOL@.1.html
+ http://geographiclib.sourceforge.net/@PROJECT_VERSION@/@TOOL@.1.html
diff --git a/man/dummy.usage.in b/man/dummy.usage.in
index 24ef2dd..16f0a83 100644
--- a/man/dummy.usage.in
+++ b/man/dummy.usage.in
@@ -3,6 +3,6 @@
int usage(int retval, bool /* brief */) {
( retval ? std::cerr : std::cout )
<< "For full documentation on @TOOL@, see\n"
- << " http://geographiclib.sf.net/@PROJECT_VERSION@/@TOOL@.1.html\n";
+ << " http://geographiclib.sourceforge.net/@PROJECT_VERSION@/@TOOL@.1.html\n";
return retval;
}
diff --git a/man/makeusage.sh b/man/makeusage.sh
index 5547c8a..314a0e6 100644
--- a/man/makeusage.sh
+++ b/man/makeusage.sh
@@ -20,7 +20,7 @@ cat <<EOF
For full documentation type:\n\\
$NAME --help\n\\
or visit:\n\\
- http://geographiclib.sf.net/$VERSION/$NAME.1.html\n";
+ http://geographiclib.sourceforge.net/$VERSION/$NAME.1.html\n";
else
( retval ? std::cerr : std::cout ) << "Man page:\n\\
EOF
diff --git a/man/script.8.in b/man/script.8.in
index 201af1f..0040f8d 100644
--- a/man/script.8.in
+++ b/man/script.8.in
@@ -4,11 +4,11 @@
.SH DESCRIPTION
.B @SCRIPT@
downloads and installs the @DATA@ datasets used by GeographicLib,
-<http://geographiclib.sf.net>. For documentation, supply the
-.B -h
+<http://geographiclib.sourceforge.net>. For documentation, supply the
+.B \-h
option:
.PP
- @SCRIPT@ -h
+ @SCRIPT@ \-h
.PP
By default, the datasets are installed in
.I @GEOGRAPHICLIB_DATA@/@DATA@
diff --git a/matlab/CMakeLists.txt b/matlab/CMakeLists.txt
index cad60bc..881eb8c 100644
--- a/matlab/CMakeLists.txt
+++ b/matlab/CMakeLists.txt
@@ -12,7 +12,6 @@ file (GLOB PRIVATE_MATLAB_FILES geographiclib/private/[A-Za-z]*.m)
install (FILES ${PRIVATE_MATLAB_FILES}
DESTINATION ${INSTALL_MATLAB_DIR}/geographiclib/private)
# Install "legacy" functions
-file (GLOB LEGACY_FILES
- geographiclib-legacy/[A-Za-z]*.m geographiclib-legacy/[A-Za-z]*.cpp)
+file (GLOB LEGACY_FILES geographiclib-legacy/[A-Za-z]*.m)
install (FILES ${LEGACY_FILES}
DESTINATION ${INSTALL_MATLAB_DIR}/geographiclib-legacy)
diff --git a/matlab/Makefile.am b/matlab/Makefile.am
index e0626d9..f9f44a1 100644
--- a/matlab/Makefile.am
+++ b/matlab/Makefile.am
@@ -1,109 +1,93 @@
#
# Makefile.am
#
-# Copyright (C) 2011, Charles Karney <charles at karney.com>
+# Copyright (c) Charles Karney (2011-2016) <charles at karney.com>
MATLAB_FILES = \
-$(srcdir)/geographiclib/Contents.m \
-$(srcdir)/geographiclib/geographiclib_test.m \
-$(srcdir)/geographiclib/cassini_fwd.m \
-$(srcdir)/geographiclib/cassini_inv.m \
-$(srcdir)/geographiclib/defaultellipsoid.m \
-$(srcdir)/geographiclib/ecc2flat.m \
-$(srcdir)/geographiclib/eqdazim_fwd.m \
-$(srcdir)/geographiclib/eqdazim_inv.m \
-$(srcdir)/geographiclib/flat2ecc.m \
-$(srcdir)/geographiclib/gedistance.m \
-$(srcdir)/geographiclib/gedoc.m \
-$(srcdir)/geographiclib/geocent_fwd.m \
-$(srcdir)/geographiclib/geocent_inv.m \
-$(srcdir)/geographiclib/geodarea.m \
-$(srcdir)/geographiclib/geoddistance.m \
-$(srcdir)/geographiclib/geoddoc.m \
-$(srcdir)/geographiclib/geodreckon.m \
-$(srcdir)/geographiclib/geoid_height.m \
-$(srcdir)/geographiclib/geoid_load.m \
-$(srcdir)/geographiclib/gereckon.m \
-$(srcdir)/geographiclib/gnomonic_fwd.m \
-$(srcdir)/geographiclib/gnomonic_inv.m \
-$(srcdir)/geographiclib/loccart_fwd.m \
-$(srcdir)/geographiclib/loccart_inv.m \
-$(srcdir)/geographiclib/mgrs_fwd.m \
-$(srcdir)/geographiclib/mgrs_inv.m \
-$(srcdir)/geographiclib/polarst_fwd.m \
-$(srcdir)/geographiclib/polarst_inv.m \
-$(srcdir)/geographiclib/projdoc.m \
-$(srcdir)/geographiclib/tranmerc_fwd.m \
-$(srcdir)/geographiclib/tranmerc_inv.m \
-$(srcdir)/geographiclib/utmups_fwd.m \
-$(srcdir)/geographiclib/utmups_inv.m
+ $(srcdir)/geographiclib/Contents.m \
+ $(srcdir)/geographiclib/geographiclib_test.m \
+ $(srcdir)/geographiclib/cassini_fwd.m \
+ $(srcdir)/geographiclib/cassini_inv.m \
+ $(srcdir)/geographiclib/defaultellipsoid.m \
+ $(srcdir)/geographiclib/ecc2flat.m \
+ $(srcdir)/geographiclib/eqdazim_fwd.m \
+ $(srcdir)/geographiclib/eqdazim_inv.m \
+ $(srcdir)/geographiclib/flat2ecc.m \
+ $(srcdir)/geographiclib/gedistance.m \
+ $(srcdir)/geographiclib/gedoc.m \
+ $(srcdir)/geographiclib/geocent_fwd.m \
+ $(srcdir)/geographiclib/geocent_inv.m \
+ $(srcdir)/geographiclib/geodarea.m \
+ $(srcdir)/geographiclib/geoddistance.m \
+ $(srcdir)/geographiclib/geoddoc.m \
+ $(srcdir)/geographiclib/geodreckon.m \
+ $(srcdir)/geographiclib/geoid_height.m \
+ $(srcdir)/geographiclib/geoid_load.m \
+ $(srcdir)/geographiclib/gereckon.m \
+ $(srcdir)/geographiclib/gnomonic_fwd.m \
+ $(srcdir)/geographiclib/gnomonic_inv.m \
+ $(srcdir)/geographiclib/loccart_fwd.m \
+ $(srcdir)/geographiclib/loccart_inv.m \
+ $(srcdir)/geographiclib/mgrs_fwd.m \
+ $(srcdir)/geographiclib/mgrs_inv.m \
+ $(srcdir)/geographiclib/polarst_fwd.m \
+ $(srcdir)/geographiclib/polarst_inv.m \
+ $(srcdir)/geographiclib/projdoc.m \
+ $(srcdir)/geographiclib/tranmerc_fwd.m \
+ $(srcdir)/geographiclib/tranmerc_inv.m \
+ $(srcdir)/geographiclib/utmups_fwd.m \
+ $(srcdir)/geographiclib/utmups_inv.m
MATLAB_PRIVATE = \
-$(srcdir)/geographiclib/private/A1m1f.m \
-$(srcdir)/geographiclib/private/A2m1f.m \
-$(srcdir)/geographiclib/private/A3coeff.m \
-$(srcdir)/geographiclib/private/A3f.m \
-$(srcdir)/geographiclib/private/AngDiff.m \
-$(srcdir)/geographiclib/private/AngNormalize.m \
-$(srcdir)/geographiclib/private/AngRound.m \
-$(srcdir)/geographiclib/private/C1f.m \
-$(srcdir)/geographiclib/private/C1pf.m \
-$(srcdir)/geographiclib/private/C2f.m \
-$(srcdir)/geographiclib/private/C3coeff.m \
-$(srcdir)/geographiclib/private/C3f.m \
-$(srcdir)/geographiclib/private/C4coeff.m \
-$(srcdir)/geographiclib/private/C4f.m \
-$(srcdir)/geographiclib/private/G4coeff.m \
-$(srcdir)/geographiclib/private/GeoRotation.m \
-$(srcdir)/geographiclib/private/LatFix.m \
-$(srcdir)/geographiclib/private/SinCosSeries.m \
-$(srcdir)/geographiclib/private/atan2dx.m \
-$(srcdir)/geographiclib/private/cbrtx.m \
-$(srcdir)/geographiclib/private/cvmgt.m \
-$(srcdir)/geographiclib/private/eatanhe.m \
-$(srcdir)/geographiclib/private/geoid_file.m \
-$(srcdir)/geographiclib/private/geoid_load_file.m \
-$(srcdir)/geographiclib/private/norm2.m \
-$(srcdir)/geographiclib/private/sincosdx.m \
-$(srcdir)/geographiclib/private/sumx.m \
-$(srcdir)/geographiclib/private/swap.m \
-$(srcdir)/geographiclib/private/tauf.m \
-$(srcdir)/geographiclib/private/taupf.m
+ $(srcdir)/geographiclib/private/A1m1f.m \
+ $(srcdir)/geographiclib/private/A2m1f.m \
+ $(srcdir)/geographiclib/private/A3coeff.m \
+ $(srcdir)/geographiclib/private/A3f.m \
+ $(srcdir)/geographiclib/private/AngDiff.m \
+ $(srcdir)/geographiclib/private/AngNormalize.m \
+ $(srcdir)/geographiclib/private/AngRound.m \
+ $(srcdir)/geographiclib/private/C1f.m \
+ $(srcdir)/geographiclib/private/C1pf.m \
+ $(srcdir)/geographiclib/private/C2f.m \
+ $(srcdir)/geographiclib/private/C3coeff.m \
+ $(srcdir)/geographiclib/private/C3f.m \
+ $(srcdir)/geographiclib/private/C4coeff.m \
+ $(srcdir)/geographiclib/private/C4f.m \
+ $(srcdir)/geographiclib/private/G4coeff.m \
+ $(srcdir)/geographiclib/private/GeoRotation.m \
+ $(srcdir)/geographiclib/private/LatFix.m \
+ $(srcdir)/geographiclib/private/SinCosSeries.m \
+ $(srcdir)/geographiclib/private/atan2dx.m \
+ $(srcdir)/geographiclib/private/cbrtx.m \
+ $(srcdir)/geographiclib/private/copysignx.m \
+ $(srcdir)/geographiclib/private/cvmgt.m \
+ $(srcdir)/geographiclib/private/eatanhe.m \
+ $(srcdir)/geographiclib/private/geoid_file.m \
+ $(srcdir)/geographiclib/private/geoid_load_file.m \
+ $(srcdir)/geographiclib/private/norm2.m \
+ $(srcdir)/geographiclib/private/sincosdx.m \
+ $(srcdir)/geographiclib/private/sumx.m \
+ $(srcdir)/geographiclib/private/swap.m \
+ $(srcdir)/geographiclib/private/tauf.m \
+ $(srcdir)/geographiclib/private/taupf.m
MATLAB_LEGACY = \
-$(srcdir)/geographiclib-legacy/Contents.m \
-$(srcdir)/geographiclib-legacy/geocentricforward.m \
-$(srcdir)/geographiclib-legacy/geocentricreverse.m \
-$(srcdir)/geographiclib-legacy/geodesicdirect.m \
-$(srcdir)/geographiclib-legacy/geodesicinverse.m \
-$(srcdir)/geographiclib-legacy/geodesicline.m \
-$(srcdir)/geographiclib-legacy/geoidheight.m \
-$(srcdir)/geographiclib-legacy/localcartesianforward.m \
-$(srcdir)/geographiclib-legacy/localcartesianreverse.m \
-$(srcdir)/geographiclib-legacy/mgrsforward.m \
-$(srcdir)/geographiclib-legacy/mgrsreverse.m \
-$(srcdir)/geographiclib-legacy/polygonarea.m \
-$(srcdir)/geographiclib-legacy/utmupsforward.m \
-$(srcdir)/geographiclib-legacy/utmupsreverse.m
-
-MATLAB_INTERFACE = \
-$(srcdir)/geographiclib-legacy/geographiclibinterface.m \
-$(srcdir)/geographiclib-legacy/geocentricforward.cpp \
-$(srcdir)/geographiclib-legacy/geocentricreverse.cpp \
-$(srcdir)/geographiclib-legacy/geodesicdirect.cpp \
-$(srcdir)/geographiclib-legacy/geodesicinverse.cpp \
-$(srcdir)/geographiclib-legacy/geodesicline.cpp \
-$(srcdir)/geographiclib-legacy/geoidheight.cpp \
-$(srcdir)/geographiclib-legacy/localcartesianforward.cpp \
-$(srcdir)/geographiclib-legacy/localcartesianreverse.cpp \
-$(srcdir)/geographiclib-legacy/mgrsforward.cpp \
-$(srcdir)/geographiclib-legacy/mgrsreverse.cpp \
-$(srcdir)/geographiclib-legacy/polygonarea.cpp \
-$(srcdir)/geographiclib-legacy/utmupsforward.cpp \
-$(srcdir)/geographiclib-legacy/utmupsreverse.cpp
+ $(srcdir)/geographiclib-legacy/Contents.m \
+ $(srcdir)/geographiclib-legacy/geocentricforward.m \
+ $(srcdir)/geographiclib-legacy/geocentricreverse.m \
+ $(srcdir)/geographiclib-legacy/geodesicdirect.m \
+ $(srcdir)/geographiclib-legacy/geodesicinverse.m \
+ $(srcdir)/geographiclib-legacy/geodesicline.m \
+ $(srcdir)/geographiclib-legacy/geoidheight.m \
+ $(srcdir)/geographiclib-legacy/localcartesianforward.m \
+ $(srcdir)/geographiclib-legacy/localcartesianreverse.m \
+ $(srcdir)/geographiclib-legacy/mgrsforward.m \
+ $(srcdir)/geographiclib-legacy/mgrsreverse.m \
+ $(srcdir)/geographiclib-legacy/polygonarea.m \
+ $(srcdir)/geographiclib-legacy/utmupsforward.m \
+ $(srcdir)/geographiclib-legacy/utmupsreverse.m
MATLAB_ALL = $(MATLAB_FILES) $(MATLAB_PRIVATE)
-MATLAB_LEGACY_ALL = $(MATLAB_LEGACY) $(MATLAB_INTERFACE)
matlabdir=$(DESTDIR)$(datadir)/matlab
@@ -112,9 +96,9 @@ install:
$(INSTALL) -d $(matlabdir)/geographiclib-legacy
$(INSTALL) -m 644 $(MATLAB_FILES) $(matlabdir)/geographiclib
$(INSTALL) -m 644 $(MATLAB_PRIVATE) $(matlabdir)/geographiclib/private
- $(INSTALL) -m 644 $(MATLAB_LEGACY_ALL) $(matlabdir)/geographiclib-legacy
+ $(INSTALL) -m 644 $(MATLAB_LEGACY) $(matlabdir)/geographiclib-legacy
clean-local:
rm -rf *.mex* *.oct
-EXTRA_DIST = Makefile.mk CMakeLists.txt $(MATLAB_ALL) $(MATLAB_LEGACY_ALL)
+EXTRA_DIST = Makefile.mk CMakeLists.txt $(MATLAB_ALL) $(MATLAB_LEGACY)
diff --git a/matlab/Makefile.in b/matlab/Makefile.in
index 2d7ac0a..53ba6a4 100644
--- a/matlab/Makefile.in
+++ b/matlab/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -17,9 +17,19 @@
#
# Makefile.am
#
-# Copyright (C) 2011, Charles Karney <charles at karney.com>
+# Copyright (c) Charles Karney (2011-2016) <charles at karney.com>
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -84,7 +94,6 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
subdir = matlab
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -92,6 +101,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/include/GeographicLib/Config-ac.h
CONFIG_CLEAN_FILES =
@@ -116,6 +126,7 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -168,6 +179,7 @@ LTLIBOBJS = @LTLIBOBJS@
LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@
LT_REVISION = @LT_REVISION@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -252,108 +264,92 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
MATLAB_FILES = \
-$(srcdir)/geographiclib/Contents.m \
-$(srcdir)/geographiclib/geographiclib_test.m \
-$(srcdir)/geographiclib/cassini_fwd.m \
-$(srcdir)/geographiclib/cassini_inv.m \
-$(srcdir)/geographiclib/defaultellipsoid.m \
-$(srcdir)/geographiclib/ecc2flat.m \
-$(srcdir)/geographiclib/eqdazim_fwd.m \
-$(srcdir)/geographiclib/eqdazim_inv.m \
-$(srcdir)/geographiclib/flat2ecc.m \
-$(srcdir)/geographiclib/gedistance.m \
-$(srcdir)/geographiclib/gedoc.m \
-$(srcdir)/geographiclib/geocent_fwd.m \
-$(srcdir)/geographiclib/geocent_inv.m \
-$(srcdir)/geographiclib/geodarea.m \
-$(srcdir)/geographiclib/geoddistance.m \
-$(srcdir)/geographiclib/geoddoc.m \
-$(srcdir)/geographiclib/geodreckon.m \
-$(srcdir)/geographiclib/geoid_height.m \
-$(srcdir)/geographiclib/geoid_load.m \
-$(srcdir)/geographiclib/gereckon.m \
-$(srcdir)/geographiclib/gnomonic_fwd.m \
-$(srcdir)/geographiclib/gnomonic_inv.m \
-$(srcdir)/geographiclib/loccart_fwd.m \
-$(srcdir)/geographiclib/loccart_inv.m \
-$(srcdir)/geographiclib/mgrs_fwd.m \
-$(srcdir)/geographiclib/mgrs_inv.m \
-$(srcdir)/geographiclib/polarst_fwd.m \
-$(srcdir)/geographiclib/polarst_inv.m \
-$(srcdir)/geographiclib/projdoc.m \
-$(srcdir)/geographiclib/tranmerc_fwd.m \
-$(srcdir)/geographiclib/tranmerc_inv.m \
-$(srcdir)/geographiclib/utmups_fwd.m \
-$(srcdir)/geographiclib/utmups_inv.m
+ $(srcdir)/geographiclib/Contents.m \
+ $(srcdir)/geographiclib/geographiclib_test.m \
+ $(srcdir)/geographiclib/cassini_fwd.m \
+ $(srcdir)/geographiclib/cassini_inv.m \
+ $(srcdir)/geographiclib/defaultellipsoid.m \
+ $(srcdir)/geographiclib/ecc2flat.m \
+ $(srcdir)/geographiclib/eqdazim_fwd.m \
+ $(srcdir)/geographiclib/eqdazim_inv.m \
+ $(srcdir)/geographiclib/flat2ecc.m \
+ $(srcdir)/geographiclib/gedistance.m \
+ $(srcdir)/geographiclib/gedoc.m \
+ $(srcdir)/geographiclib/geocent_fwd.m \
+ $(srcdir)/geographiclib/geocent_inv.m \
+ $(srcdir)/geographiclib/geodarea.m \
+ $(srcdir)/geographiclib/geoddistance.m \
+ $(srcdir)/geographiclib/geoddoc.m \
+ $(srcdir)/geographiclib/geodreckon.m \
+ $(srcdir)/geographiclib/geoid_height.m \
+ $(srcdir)/geographiclib/geoid_load.m \
+ $(srcdir)/geographiclib/gereckon.m \
+ $(srcdir)/geographiclib/gnomonic_fwd.m \
+ $(srcdir)/geographiclib/gnomonic_inv.m \
+ $(srcdir)/geographiclib/loccart_fwd.m \
+ $(srcdir)/geographiclib/loccart_inv.m \
+ $(srcdir)/geographiclib/mgrs_fwd.m \
+ $(srcdir)/geographiclib/mgrs_inv.m \
+ $(srcdir)/geographiclib/polarst_fwd.m \
+ $(srcdir)/geographiclib/polarst_inv.m \
+ $(srcdir)/geographiclib/projdoc.m \
+ $(srcdir)/geographiclib/tranmerc_fwd.m \
+ $(srcdir)/geographiclib/tranmerc_inv.m \
+ $(srcdir)/geographiclib/utmups_fwd.m \
+ $(srcdir)/geographiclib/utmups_inv.m
MATLAB_PRIVATE = \
-$(srcdir)/geographiclib/private/A1m1f.m \
-$(srcdir)/geographiclib/private/A2m1f.m \
-$(srcdir)/geographiclib/private/A3coeff.m \
-$(srcdir)/geographiclib/private/A3f.m \
-$(srcdir)/geographiclib/private/AngDiff.m \
-$(srcdir)/geographiclib/private/AngNormalize.m \
-$(srcdir)/geographiclib/private/AngRound.m \
-$(srcdir)/geographiclib/private/C1f.m \
-$(srcdir)/geographiclib/private/C1pf.m \
-$(srcdir)/geographiclib/private/C2f.m \
-$(srcdir)/geographiclib/private/C3coeff.m \
-$(srcdir)/geographiclib/private/C3f.m \
-$(srcdir)/geographiclib/private/C4coeff.m \
-$(srcdir)/geographiclib/private/C4f.m \
-$(srcdir)/geographiclib/private/G4coeff.m \
-$(srcdir)/geographiclib/private/GeoRotation.m \
-$(srcdir)/geographiclib/private/LatFix.m \
-$(srcdir)/geographiclib/private/SinCosSeries.m \
-$(srcdir)/geographiclib/private/atan2dx.m \
-$(srcdir)/geographiclib/private/cbrtx.m \
-$(srcdir)/geographiclib/private/cvmgt.m \
-$(srcdir)/geographiclib/private/eatanhe.m \
-$(srcdir)/geographiclib/private/geoid_file.m \
-$(srcdir)/geographiclib/private/geoid_load_file.m \
-$(srcdir)/geographiclib/private/norm2.m \
-$(srcdir)/geographiclib/private/sincosdx.m \
-$(srcdir)/geographiclib/private/sumx.m \
-$(srcdir)/geographiclib/private/swap.m \
-$(srcdir)/geographiclib/private/tauf.m \
-$(srcdir)/geographiclib/private/taupf.m
+ $(srcdir)/geographiclib/private/A1m1f.m \
+ $(srcdir)/geographiclib/private/A2m1f.m \
+ $(srcdir)/geographiclib/private/A3coeff.m \
+ $(srcdir)/geographiclib/private/A3f.m \
+ $(srcdir)/geographiclib/private/AngDiff.m \
+ $(srcdir)/geographiclib/private/AngNormalize.m \
+ $(srcdir)/geographiclib/private/AngRound.m \
+ $(srcdir)/geographiclib/private/C1f.m \
+ $(srcdir)/geographiclib/private/C1pf.m \
+ $(srcdir)/geographiclib/private/C2f.m \
+ $(srcdir)/geographiclib/private/C3coeff.m \
+ $(srcdir)/geographiclib/private/C3f.m \
+ $(srcdir)/geographiclib/private/C4coeff.m \
+ $(srcdir)/geographiclib/private/C4f.m \
+ $(srcdir)/geographiclib/private/G4coeff.m \
+ $(srcdir)/geographiclib/private/GeoRotation.m \
+ $(srcdir)/geographiclib/private/LatFix.m \
+ $(srcdir)/geographiclib/private/SinCosSeries.m \
+ $(srcdir)/geographiclib/private/atan2dx.m \
+ $(srcdir)/geographiclib/private/cbrtx.m \
+ $(srcdir)/geographiclib/private/copysignx.m \
+ $(srcdir)/geographiclib/private/cvmgt.m \
+ $(srcdir)/geographiclib/private/eatanhe.m \
+ $(srcdir)/geographiclib/private/geoid_file.m \
+ $(srcdir)/geographiclib/private/geoid_load_file.m \
+ $(srcdir)/geographiclib/private/norm2.m \
+ $(srcdir)/geographiclib/private/sincosdx.m \
+ $(srcdir)/geographiclib/private/sumx.m \
+ $(srcdir)/geographiclib/private/swap.m \
+ $(srcdir)/geographiclib/private/tauf.m \
+ $(srcdir)/geographiclib/private/taupf.m
MATLAB_LEGACY = \
-$(srcdir)/geographiclib-legacy/Contents.m \
-$(srcdir)/geographiclib-legacy/geocentricforward.m \
-$(srcdir)/geographiclib-legacy/geocentricreverse.m \
-$(srcdir)/geographiclib-legacy/geodesicdirect.m \
-$(srcdir)/geographiclib-legacy/geodesicinverse.m \
-$(srcdir)/geographiclib-legacy/geodesicline.m \
-$(srcdir)/geographiclib-legacy/geoidheight.m \
-$(srcdir)/geographiclib-legacy/localcartesianforward.m \
-$(srcdir)/geographiclib-legacy/localcartesianreverse.m \
-$(srcdir)/geographiclib-legacy/mgrsforward.m \
-$(srcdir)/geographiclib-legacy/mgrsreverse.m \
-$(srcdir)/geographiclib-legacy/polygonarea.m \
-$(srcdir)/geographiclib-legacy/utmupsforward.m \
-$(srcdir)/geographiclib-legacy/utmupsreverse.m
-
-MATLAB_INTERFACE = \
-$(srcdir)/geographiclib-legacy/geographiclibinterface.m \
-$(srcdir)/geographiclib-legacy/geocentricforward.cpp \
-$(srcdir)/geographiclib-legacy/geocentricreverse.cpp \
-$(srcdir)/geographiclib-legacy/geodesicdirect.cpp \
-$(srcdir)/geographiclib-legacy/geodesicinverse.cpp \
-$(srcdir)/geographiclib-legacy/geodesicline.cpp \
-$(srcdir)/geographiclib-legacy/geoidheight.cpp \
-$(srcdir)/geographiclib-legacy/localcartesianforward.cpp \
-$(srcdir)/geographiclib-legacy/localcartesianreverse.cpp \
-$(srcdir)/geographiclib-legacy/mgrsforward.cpp \
-$(srcdir)/geographiclib-legacy/mgrsreverse.cpp \
-$(srcdir)/geographiclib-legacy/polygonarea.cpp \
-$(srcdir)/geographiclib-legacy/utmupsforward.cpp \
-$(srcdir)/geographiclib-legacy/utmupsreverse.cpp
+ $(srcdir)/geographiclib-legacy/Contents.m \
+ $(srcdir)/geographiclib-legacy/geocentricforward.m \
+ $(srcdir)/geographiclib-legacy/geocentricreverse.m \
+ $(srcdir)/geographiclib-legacy/geodesicdirect.m \
+ $(srcdir)/geographiclib-legacy/geodesicinverse.m \
+ $(srcdir)/geographiclib-legacy/geodesicline.m \
+ $(srcdir)/geographiclib-legacy/geoidheight.m \
+ $(srcdir)/geographiclib-legacy/localcartesianforward.m \
+ $(srcdir)/geographiclib-legacy/localcartesianreverse.m \
+ $(srcdir)/geographiclib-legacy/mgrsforward.m \
+ $(srcdir)/geographiclib-legacy/mgrsreverse.m \
+ $(srcdir)/geographiclib-legacy/polygonarea.m \
+ $(srcdir)/geographiclib-legacy/utmupsforward.m \
+ $(srcdir)/geographiclib-legacy/utmupsreverse.m
MATLAB_ALL = $(MATLAB_FILES) $(MATLAB_PRIVATE)
-MATLAB_LEGACY_ALL = $(MATLAB_LEGACY) $(MATLAB_INTERFACE)
matlabdir = $(DESTDIR)$(datadir)/matlab
-EXTRA_DIST = Makefile.mk CMakeLists.txt $(MATLAB_ALL) $(MATLAB_LEGACY_ALL)
+EXTRA_DIST = Makefile.mk CMakeLists.txt $(MATLAB_ALL) $(MATLAB_LEGACY)
all: all-am
.SUFFIXES:
@@ -369,7 +365,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu matlab/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu matlab/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -543,13 +538,15 @@ uninstall-am:
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
install:
$(INSTALL) -d $(matlabdir)/geographiclib/private
$(INSTALL) -d $(matlabdir)/geographiclib-legacy
$(INSTALL) -m 644 $(MATLAB_FILES) $(matlabdir)/geographiclib
$(INSTALL) -m 644 $(MATLAB_PRIVATE) $(matlabdir)/geographiclib/private
- $(INSTALL) -m 644 $(MATLAB_LEGACY_ALL) $(matlabdir)/geographiclib-legacy
+ $(INSTALL) -m 644 $(MATLAB_LEGACY) $(matlabdir)/geographiclib-legacy
clean-local:
rm -rf *.mex* *.oct
diff --git a/matlab/Makefile.mk b/matlab/Makefile.mk
index af33546..5aadba9 100644
--- a/matlab/Makefile.mk
+++ b/matlab/Makefile.mk
@@ -1,7 +1,6 @@
MATLAB_FILES = $(wildcard geographiclib/*.m)
MATLAB_PRIVATE = $(wildcard geographiclib/private/*.m)
-MATLAB_LEGACY = $(wildcard geographiclib-legacy/*.m) \
- $(wildcard geographiclib-legacy/*.cpp)
+MATLAB_LEGACY = $(wildcard geographiclib-legacy/*.m)
DEST = $(PREFIX)/share/matlab
INSTALL = install -b
diff --git a/matlab/geographiclib-legacy/Contents.m b/matlab/geographiclib-legacy/Contents.m
index 89230c1..d48811f 100644
--- a/matlab/geographiclib-legacy/Contents.m
+++ b/matlab/geographiclib-legacy/Contents.m
@@ -29,8 +29,5 @@
% geocentricreverse - Wrapper for geocent_inv
% localcartesianforward - Wrapper for loccart_fwd
% localcartesianreverse - Wrapper for loccart_inv
-%
-% Deprecated
-% geographiclibinterface - Compile interface code (DEPRECATED)
% Copyright (c) Charles Karney (2015) <charles at karney.com>.
diff --git a/matlab/geographiclib-legacy/geocentricforward.cpp b/matlab/geographiclib-legacy/geocentricforward.cpp
deleted file mode 100644
index 8baf909..0000000
--- a/matlab/geographiclib-legacy/geocentricforward.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * \file geocentricforward.cpp
- * \brief Matlab mex file for geographic to UTM/UPS conversions
- *
- * Copyright (c) Charles Karney (2011) <charles at karney.com> and licensed under
- * the MIT/X11 License. For more information, see
- * http://geographiclib.sourceforge.net/
- **********************************************************************/
-
-// Compile in Matlab with
-// [Unix]
-// mex -I/usr/local/include -L/usr/local/lib -Wl,-rpath=/usr/local/lib
-// -lGeographic geocentricforward.cpp
-// [Windows]
-// mex -I../include -L../windows/Release
-// -lGeographic geocentricforward.cpp
-
-#include <algorithm>
-#include <GeographicLib/Geocentric.hpp>
-#include <mex.h>
-
-using namespace std;
-using namespace GeographicLib;
-
-void mexFunction( int nlhs, mxArray* plhs[],
- int nrhs, const mxArray* prhs[] ) {
-
- if (nrhs < 1)
- mexErrMsgTxt("One input argument required.");
- else if (nrhs > 3)
- mexErrMsgTxt("More than three input arguments specified.");
- else if (nrhs == 2)
- mexErrMsgTxt("Must specify flattening with the major radius.");
- else if (nlhs > 2)
- mexErrMsgTxt("More than two output arguments specified.");
-
- if (!( mxIsDouble(prhs[0]) && !mxIsComplex(prhs[0]) ))
- mexErrMsgTxt("geodetic coordinates are not of type double.");
-
- if (!(mxGetN(prhs[0]) == 3 || mxGetN(prhs[0]) == 2))
- mexErrMsgTxt("geodetic coordinates must be an M x 3 or M x 2 matrix.");
-
- double a = Constants::WGS84_a<double>(), f = Constants::WGS84_f<double>();
- if (nrhs == 3) {
- if (!( mxIsDouble(prhs[1]) && !mxIsComplex(prhs[1]) &&
- mxGetNumberOfElements(prhs[1]) == 1 ))
- mexErrMsgTxt("Major radius is not a real scalar.");
- a = mxGetScalar(prhs[1]);
- if (!( mxIsDouble(prhs[2]) && !mxIsComplex(prhs[2]) &&
- mxGetNumberOfElements(prhs[2]) == 1 ))
- mexErrMsgTxt("Flattening is not a real scalar.");
- f = mxGetScalar(prhs[2]);
- }
-
- mwSize m = mxGetM(prhs[0]);
-
- double* lat = mxGetPr(prhs[0]);
- double* lon = lat + m;
- bool haveh = mxGetN(prhs[0]) == 3;
- double* h = haveh ? lat + 2*m : NULL;
-
- plhs[0] = mxCreateDoubleMatrix(m, 3, mxREAL);
- double* x = mxGetPr(plhs[0]);
- std::fill(x, x + 3*m, Math::NaN<double>());
- double* y = x + m;
- double* z = x + 2*m;
- double* rot = NULL;
- bool rotp = nlhs == 2;
-
- if (rotp) {
- plhs[1] = mxCreateDoubleMatrix(m, 9, mxREAL);
- rot = mxGetPr(plhs[1]);
- std::fill(rot, rot + 9*m, Math::NaN<double>());
- }
-
- try {
- std::vector<double> rotv(rotp ? 9 : 0);
- const Geocentric c(a, f);
- for (mwIndex i = 0; i < m; ++i) {
- if (abs(lat[i]) <= 90 && lon[i] >= -540 && lon[i] < 540) {
- c.Forward(lat[i], lon[i], haveh ? h[i] : 0.0, x[i], y[i], z[i], rotv);
- if (rotp) {
- for (mwIndex k = 0; k < 9; ++k)
- rot[m * k + i] = rotv[k];
- }
- }
- }
- }
- catch (const std::exception& e) {
- mexErrMsgTxt(e.what());
- }
-}
diff --git a/matlab/geographiclib-legacy/geocentricreverse.cpp b/matlab/geographiclib-legacy/geocentricreverse.cpp
deleted file mode 100644
index a8f21a7..0000000
--- a/matlab/geographiclib-legacy/geocentricreverse.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * \file geocentricreverse.cpp
- * \brief Matlab mex file for UTM/UPS to geographic conversions
- *
- * Copyright (c) Charles Karney (2011) <charles at karney.com> and licensed under
- * the MIT/X11 License. For more information, see
- * http://geographiclib.sourceforge.net/
- **********************************************************************/
-
-// Compile in Matlab with
-// [Unix]
-// mex -I/usr/local/include -L/usr/local/lib -Wl,-rpath=/usr/local/lib
-// -lGeographic geocentricreverse.cpp
-// [Windows]
-// mex -I../include -L../windows/Release
-// -lGeographic geocentricreverse.cpp
-
-#include <GeographicLib/Geocentric.hpp>
-#include <mex.h>
-
-using namespace std;
-using namespace GeographicLib;
-
-void mexFunction( int nlhs, mxArray* plhs[],
- int nrhs, const mxArray* prhs[] ) {
-
- if (nrhs < 1)
- mexErrMsgTxt("One input argument required.");
- else if (nrhs > 3)
- mexErrMsgTxt("More than three input arguments specified.");
- else if (nrhs == 2)
- mexErrMsgTxt("Must specify flattening with the major radius.");
- else if (nlhs > 2)
- mexErrMsgTxt("More than two output arguments specified.");
-
- if (!( mxIsDouble(prhs[0]) && !mxIsComplex(prhs[0]) ))
- mexErrMsgTxt("geocentric coordinates are not of type double.");
-
- if (mxGetN(prhs[0]) != 3)
- mexErrMsgTxt("geocentric coordinates must be M x 3 matrix.");
-
- double a = Constants::WGS84_a<double>(), f = Constants::WGS84_f<double>();
- if (nrhs == 3) {
- if (!( mxIsDouble(prhs[1]) && !mxIsComplex(prhs[1]) &&
- mxGetNumberOfElements(prhs[1]) == 1 ))
- mexErrMsgTxt("Major radius is not a real scalar.");
- a = mxGetScalar(prhs[1]);
- if (!( mxIsDouble(prhs[2]) && !mxIsComplex(prhs[2]) &&
- mxGetNumberOfElements(prhs[2]) == 1 ))
- mexErrMsgTxt("Flattening is not a real scalar.");
- f = mxGetScalar(prhs[2]);
- }
-
- mwSize m = mxGetM(prhs[0]);
-
- double* x = mxGetPr(prhs[0]);
- double* y = x + m;
- double* z = x + 2*m;
-
- plhs[0] = mxCreateDoubleMatrix(m, 3, mxREAL);
- double* lat = mxGetPr(plhs[0]);
- double* lon = lat + m;
- double* h = lat + 2*m;
- double* rot = NULL;
- bool rotp = nlhs == 2;
-
- if (rotp) {
- plhs[1] = mxCreateDoubleMatrix(m, 9, mxREAL);
- rot = mxGetPr(plhs[1]);
- }
-
- try {
- std::vector<double> rotv(rotp ? 9 : 0);
- const Geocentric c(a, f);
- for (mwIndex i = 0; i < m; ++i) {
- c.Reverse(x[i], y[i], z[i], lat[i], lon[i], h[i], rotv);
- if (rotp) {
- for (mwIndex k = 0; k < 9; ++k)
- rot[m * k + i] = rotv[k];
- }
- }
- }
- catch (const std::exception& e) {
- mexErrMsgTxt(e.what());
- }
-}
diff --git a/matlab/geographiclib-legacy/geodesicdirect.cpp b/matlab/geographiclib-legacy/geodesicdirect.cpp
deleted file mode 100644
index 06a35e6..0000000
--- a/matlab/geographiclib-legacy/geodesicdirect.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * \file geodesicdirect.cpp
- * \brief Matlab mex file for geographic to UTM/UPS conversions
- *
- * Copyright (c) Charles Karney (2010-2013) <charles at karney.com> and licensed
- * under the MIT/X11 License. For more information, see
- * http://geographiclib.sourceforge.net/
- **********************************************************************/
-
-// Compile in Matlab with
-// [Unix]
-// mex -I/usr/local/include -L/usr/local/lib -Wl,-rpath=/usr/local/lib
-// -lGeographic geodesicdirect.cpp
-// [Windows]
-// mex -I../include -L../windows/Release
-// -lGeographic geodesicdirect.cpp
-
-#include <algorithm>
-#include <GeographicLib/Geodesic.hpp>
-#include <GeographicLib/GeodesicExact.hpp>
-#include <mex.h>
-
-using namespace std;
-using namespace GeographicLib;
-
-template<class G> void
-compute(double a, double f, mwSize m, const double* geodesic,
- double* latlong, double* aux) {
- const double* lat1 = geodesic;
- const double* lon1 = geodesic + m;
- const double* azi1 = geodesic + 2*m;
- const double* s12 = geodesic + 3*m;
- double* lat2 = latlong;
- double* lon2 = latlong + m;
- double* azi2 = latlong + 2*m;
- double* a12 = NULL;
- double* m12 = NULL;
- double* M12 = NULL;
- double* M21 = NULL;
- double* S12 = NULL;
- if (aux) {
- a12 = aux;
- m12 = aux + m;
- M12 = aux + 2*m;
- M21 = aux + 3*m;
- S12 = aux + 4*m;
- }
-
- const G g(a, f);
- for (mwIndex i = 0; i < m; ++i) {
- if (abs(lat1[i]) <= 90 &&
- lon1[i] >= -540 && lon1[i] < 540 &&
- azi1[i] >= -540 && azi1[i] < 540) {
- if (aux)
- a12[i] = g.Direct(lat1[i], lon1[i], azi1[i], s12[i],
- lat2[i], lon2[i], azi2[i],
- m12[i], M12[i], M21[i], S12[i]);
- else
- g.Direct(lat1[i], lon1[i], azi1[i], s12[i],
- lat2[i], lon2[i], azi2[i]);
- }
- }
-}
-
-void mexFunction( int nlhs, mxArray* plhs[],
- int nrhs, const mxArray* prhs[] ) {
-
- if (nrhs < 1)
- mexErrMsgTxt("One input argument required.");
- else if (nrhs > 3)
- mexErrMsgTxt("More than three input arguments specified.");
- else if (nrhs == 2)
- mexErrMsgTxt("Must specify flattening with the major radius.");
- else if (nlhs > 2)
- mexErrMsgTxt("More than two output arguments specified.");
-
- if (!( mxIsDouble(prhs[0]) && !mxIsComplex(prhs[0]) ))
- mexErrMsgTxt("geodesic coordinates are not of type double.");
-
- if (mxGetN(prhs[0]) != 4)
- mexErrMsgTxt("geodesic coordinates must be M x 4 matrix.");
-
- double a = Constants::WGS84_a<double>(), f = Constants::WGS84_f<double>();
- if (nrhs == 3) {
- if (!( mxIsDouble(prhs[1]) && !mxIsComplex(prhs[1]) &&
- mxGetNumberOfElements(prhs[1]) == 1 ))
- mexErrMsgTxt("Major radius is not a real scalar.");
- a = mxGetScalar(prhs[1]);
- if (!( mxIsDouble(prhs[2]) && !mxIsComplex(prhs[2]) &&
- mxGetNumberOfElements(prhs[2]) == 1 ))
- mexErrMsgTxt("Flattening is not a real scalar.");
- f = mxGetScalar(prhs[2]);
- }
-
- mwSize m = mxGetM(prhs[0]);
-
- const double* geodesic = mxGetPr(prhs[0]);
-
- double* latlong = mxGetPr(plhs[0] = mxCreateDoubleMatrix(m, 3, mxREAL));
- std::fill(latlong, latlong + 3*m, Math::NaN<double>());
-
- double* aux =
- nlhs == 2 ? mxGetPr(plhs[1] = mxCreateDoubleMatrix(m, 5, mxREAL)) :
- NULL;
- if (aux)
- std::fill(aux, aux + 5*m, Math::NaN<double>());
-
- try {
- if (std::abs(f) <= 0.02)
- compute<Geodesic>(a, f, m, geodesic, latlong, aux);
- else
- compute<GeodesicExact>(a, f, m, geodesic, latlong, aux);
- }
- catch (const std::exception& e) {
- mexErrMsgTxt(e.what());
- }
-}
diff --git a/matlab/geographiclib-legacy/geodesicline.cpp b/matlab/geographiclib-legacy/geodesicline.cpp
deleted file mode 100644
index 7382cc0..0000000
--- a/matlab/geographiclib-legacy/geodesicline.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * \file geodesicline.cpp
- * \brief Matlab mex file for geographic to UTM/UPS conversions
- *
- * Copyright (c) Charles Karney (2010-2013) <charles at karney.com> and licensed
- * under the MIT/X11 License. For more information, see
- * http://geographiclib.sourceforge.net/
- **********************************************************************/
-
-// Compile in Matlab with
-// [Unix]
-// mex -I/usr/local/include -L/usr/local/lib -Wl,-rpath=/usr/local/lib
-// -lGeographic geodesicline.cpp
-// [Windows]
-// mex -I../include -L../windows/Release
-// -lGeographic geodesicline.cpp
-
-#include <GeographicLib/GeodesicLine.hpp>
-#include <GeographicLib/GeodesicLineExact.hpp>
-#include <mex.h>
-
-using namespace std;
-using namespace GeographicLib;
-
-template<class G, class L> void
-compute(double a, double f, double lat1, double lon1, double azi1,
- mwSize m, const double* s12, double* latlong, double* aux) {
- double* lat2 = latlong;
- double* lon2 = latlong + m;
- double* azi2 = latlong + 2*m;
- double* a12 = NULL;
- double* m12 = NULL;
- double* M12 = NULL;
- double* M21 = NULL;
- double* S12 = NULL;
- if (aux) {
- a12 = aux;
- m12 = aux + m;
- M12 = aux + 2*m;
- M21 = aux + 3*m;
- S12 = aux + 4*m;
- }
- const G g(a, f);
- const L l(g, lat1, lon1, azi1);
- for (mwIndex i = 0; i < m; ++i)
- if (aux)
- a12[i] = l.Position(s12[i], lat2[i], lon2[i], azi2[i],
- m12[i], M12[i], M21[i], S12[i]);
- else
- l.Position(s12[i], lat2[i], lon2[i], azi2[i]);
-}
-
-void mexFunction( int nlhs, mxArray* plhs[],
- int nrhs, const mxArray* prhs[] ) {
-
- if (nrhs < 4)
- mexErrMsgTxt("Four input arguments required.");
- else if (nrhs > 6)
- mexErrMsgTxt("More than three input arguments specified.");
- else if (nrhs == 5)
- mexErrMsgTxt("Must specify flattening with the major radius.");
- else if (nlhs > 2)
- mexErrMsgTxt("More than two output arguments specified.");
-
- if (!( mxIsDouble(prhs[0]) && !mxIsComplex(prhs[0]) &&
- mxGetNumberOfElements(prhs[0]) == 1 ))
- mexErrMsgTxt("lat1 is not a real scalar.");
- double lat1 = mxGetScalar(prhs[0]);
-
- if (!( mxIsDouble(prhs[1]) && !mxIsComplex(prhs[1]) &&
- mxGetNumberOfElements(prhs[1]) == 1 ))
- mexErrMsgTxt("lon1 is not a real scalar.");
- double lon1 = mxGetScalar(prhs[1]);
-
- if (!( mxIsDouble(prhs[2]) && !mxIsComplex(prhs[2]) &&
- mxGetNumberOfElements(prhs[2]) == 1 ))
- mexErrMsgTxt("azi1 is not a real scalar.");
- double azi1 = mxGetScalar(prhs[2]);
-
- if (!( mxIsDouble(prhs[3]) && !mxIsComplex(prhs[3]) ))
- mexErrMsgTxt("distances are not of type double.");
-
- if (mxGetN(prhs[3]) != 1)
- mexErrMsgTxt("distances must be M x 1 matrix.");
-
- double a = Constants::WGS84_a<double>(), f = Constants::WGS84_f<double>();
- if (nrhs == 6) {
- if (!( mxIsDouble(prhs[4]) && !mxIsComplex(prhs[4]) &&
- mxGetNumberOfElements(prhs[4]) == 1 ))
- mexErrMsgTxt("Major radius is not a real scalar.");
- a = mxGetScalar(prhs[4]);
- if (!( mxIsDouble(prhs[5]) && !mxIsComplex(prhs[5]) &&
- mxGetNumberOfElements(prhs[5]) == 1 ))
- mexErrMsgTxt("Flattening is not a real scalar.");
- f = mxGetScalar(prhs[5]);
- }
-
- mwSize m = mxGetM(prhs[3]);
-
- double* s12 = mxGetPr(prhs[3]);
-
- double* latlong = mxGetPr(plhs[0] = mxCreateDoubleMatrix(m, 3, mxREAL));
- double* aux =
- nlhs == 2 ? mxGetPr(plhs[1] = mxCreateDoubleMatrix(m, 5, mxREAL)) :
- NULL;
-
- try {
- if (!(abs(lat1) <= 90))
- throw GeographicErr("Invalid latitude");
- if (!(lon1 >= -540 || lon1 < 540))
- throw GeographicErr("Invalid longitude");
- if (!(azi1 >= -540 || azi1 < 540))
- throw GeographicErr("Invalid azimuth");
- if (std::abs(f) <= 0.02)
- compute<Geodesic, GeodesicLine>
- (a, f, lat1, lon1, azi1, m, s12, latlong, aux);
- else
- compute<GeodesicExact, GeodesicLineExact>
- (a, f, lat1, lon1, azi1, m, s12, latlong, aux);
- }
- catch (const std::exception& e) {
- mexErrMsgTxt(e.what());
- }
-}
diff --git a/matlab/geographiclib-legacy/geographiclibinterface.m b/matlab/geographiclib-legacy/geographiclibinterface.m
deleted file mode 100644
index fa98c3c..0000000
--- a/matlab/geographiclib-legacy/geographiclibinterface.m
+++ /dev/null
@@ -1,83 +0,0 @@
-function geographiclibinterface(incdir, libdir)
-%GEOGRAPHICLIBINTERFACE Compile interface code (DEPRECATED)
-%
-% GEOGRAPHICLIBINTERFACE
-% GEOGRAPHICLIBINTERFACE(installdir)
-% GEOGRAPHICLIBINTERFACE(incdir, libdir)
-%
-% This function is DEPRECATED because native Matlab implementations are
-% available for all the functions. It and the associated C++ wrapper
-% code will be removed at some point in 2016.
-%
-% With one argument GEOGRAPHICLIBINTERFACE looks for the compiled library
-% in installdir/lib and the include files in installdir/include.
-%
-% With no arguments, installdir is taked to be '/usr/local', on Unix and
-% Linux systems, and 'C:/Program Files/GeographicLib', on Windows systems
-%
-% With two arguments, the library is looked for in libdir and the include
-% files in incdir.
-%
-% This has been tested with
-%
-% Octave 3.2.3 and g++ 4.4.4 under Linux
-% Octave 3.6.4 and g++ 4.8.3 under Linux
-% Matlab 2007a and Visual Studio 2005 under Windows
-% Matlab 2008a and Visual Studio 2005 under Windows
-% Matlab 2008a and Visual Studio 2008 under Windows (*)
-% Matlab 2010b and Visual Studio 2005 under Windows
-% Matlab 2010b and Visual Studio 2008 under Windows (*)
-% Matlab 2010b and Visual Studio 2010 under Windows
-% Matlab 2013b and Visual Studio 2012 under Windows
-% Matlab 2014b and Mac OSX 10.10 (Yosemite)
-%
-% Run 'mex -setup' to configure the C++ compiler for Matlab to use.
-
-% Copyright (c) Charles Karney (2010-2014) <charles at karney.com> and
-% licensed under the MIT/X11 License. For more information, see
-% http://geographiclib.sf.net/html/other.html#matlab
-
- funs = {'geodesicdirect', 'geodesicinverse', 'geodesicline', ...
- 'geoidheight', ...
- 'utmupsforward', 'utmupsreverse', ...
- 'mgrsforward', 'mgrsreverse', ...
- 'geocentricforward', 'geocentricreverse', ...
- 'localcartesianforward', 'localcartesianreverse', ...
- 'polygonarea'};
- lib='Geographic';
- if (ispc && ...
- strcmp(mex.getCompilerConfigurations().Manufacturer, 'Microsoft') && ...
- strcmp(mex.getCompilerConfigurations().Version, '9.0'))
- warning(['geoidheight compiled with Visual Studio 2008 ',...
- 'causes Matlab to CRASH']);
- end
- if (nargin < 2)
- if (nargin == 0)
- if ispc
- installdir = 'C:/Program Files/GeographicLib';
- else
- installdir = '/usr/local';
- end
- else
- installdir = incdir;
- end
- incdir=[installdir '/include'];
- libdir=[installdir '/lib'];
- end
- testheader = [incdir '/GeographicLib/Constants.hpp'];
- if (~ exist(testheader, 'file'))
- error(['Cannot find ' testheader]);
- end
- fprintf('Compiling Matlab interface to GeographicLib\n');
- fprintf('Include directory: %s\nLibrary directory: %s\n', incdir, libdir);
- for i=1:size(funs,2)
- fprintf('Compiling %s...', funs{i});
- if ispc || ismac
- mex( ['-I' incdir], ['-L' libdir], ['-l' lib], [funs{i} '.cpp'] );
- else
- mex( ['-I' incdir], ['-L' libdir], ['-l' lib], ['-Wl,-rpath=' libdir], ...
- [funs{i} '.cpp'] );
- end
- fprintf(' done.\n');
- end
-end
diff --git a/matlab/geographiclib-legacy/geoidheight.cpp b/matlab/geographiclib-legacy/geoidheight.cpp
deleted file mode 100644
index e1825e0..0000000
--- a/matlab/geographiclib-legacy/geoidheight.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * \file geoidheight.cpp
- * \brief Matlab mex file for geographic to UTM/UPS conversions
- *
- * Copyright (c) Charles Karney (2010) <charles at karney.com> and licensed under
- * the MIT/X11 License. For more information, see
- * http://geographiclib.sourceforge.net/
- **********************************************************************/
-
-// Compile in Matlab with
-// [Unix]
-// mex -I/usr/local/include -L/usr/local/lib -Wl,-rpath=/usr/local/lib
-// -lGeographic geoidheight.cpp
-// [Windows]
-// mex -I../include -L../windows/Release
-// -lGeographic geoidheight.cpp
-
-#include <string>
-#include <algorithm>
-#include <GeographicLib/Geoid.hpp>
-#include <mex.h>
-
-using namespace std;
-using namespace GeographicLib;
-
-void mexFunction( int nlhs, mxArray* plhs[],
- int nrhs, const mxArray* prhs[] ) {
-
- if (nrhs < 1)
- mexErrMsgTxt("One input argument required.");
- else if (nrhs > 3)
- mexErrMsgTxt("More than three input arguments specified.");
- else if (nlhs > 2)
- mexErrMsgTxt("More than two output arguments specified.");
-
- if (!( mxIsDouble(prhs[0]) && !mxIsComplex(prhs[0]) ))
- mexErrMsgTxt("latlong coordinates are not of type double.");
-
- if (mxGetN(prhs[0]) != 2)
- mexErrMsgTxt("latlong coordinates must be M x 2 matrix.");
-
- mwSize m = mxGetM(prhs[0]);
-
- double* lat = mxGetPr(prhs[0]);
- double* lon = lat + m;
-
- plhs[0] = mxCreateDoubleMatrix(m, 1, mxREAL);
- double* h = mxGetPr(plhs[0]);
- std::fill(h, h + m, Math::NaN<double>());
- double* gradn = NULL;
- double* grade = NULL;
- bool gradient = nlhs == 2;
-
- if (gradient) {
- plhs[1] = mxCreateDoubleMatrix(m, 2, mxREAL);
- gradn = mxGetPr(plhs[1]);
- std::fill(gradn, gradn + 2*m, Math::NaN<double>());
- grade = gradn + m;
- }
-
- string geoidname("egm96-5");
- if (nrhs > 1) {
- if (!mxIsChar(prhs[1]))
- mexErrMsgTxt("geoid name must be a string.");
- if (mxGetM(prhs[1]) == 0)
- mexErrMsgTxt("geoid name cannot be empty.");
- if (mxGetM(prhs[1]) != 1)
- mexErrMsgTxt("geoid name cannot be a vector of strings.");
- mwSize n = mxGetN(prhs[1]);
- if (n < 1)
- mexErrMsgTxt("geoid name cannot be empty.");
- mxChar* ptr = mxGetChars(prhs[1]);
- geoidname.resize(n);
- for (mwIndex i = 0; i < n; ++i)
- geoidname[i] = ptr[i];
- }
- string geoiddir("");
- if (nrhs > 2) {
- if (!mxIsChar(prhs[2]))
- mexErrMsgTxt("geoid directory must be a string.");
- if (mxGetM(prhs[2]) > 1)
- mexErrMsgTxt("geoid directory cannot be a vector of strings.");
- mwSize n = mxGetN(prhs[2]);
- if (n > 0 && mxGetM(prhs[2]) == 1) {
- mxChar* ptr = mxGetChars(prhs[2]);
- geoiddir.resize(n);
- for (mwIndex i = 0; i < n; ++i)
- geoiddir[i] = ptr[i];
- } // else string is empty and do nothing
- }
-
- try {
- const Geoid g(geoidname, geoiddir);
- for (mwIndex i = 0; i < m; ++i) {
- if (abs(lat[i]) <= 90 && lon[i] >= -540 && lon[i] < 540) {
- // g() can throw an exception, e.g., because of an I/O failure. Treat
- // this as fatal.
- if (gradient)
- h[i] = g(lat[i], lon[i], gradn[i], grade[i]);
- else
- h[i] = g(lat[i], lon[i]);
- }
- }
- }
- catch (const std::exception& e) {
- mexErrMsgTxt(e.what());
- }
-}
diff --git a/matlab/geographiclib-legacy/geoidheight.m b/matlab/geographiclib-legacy/geoidheight.m
index 0d1acfa..8280951 100644
--- a/matlab/geographiclib-legacy/geoidheight.m
+++ b/matlab/geographiclib-legacy/geoidheight.m
@@ -6,9 +6,7 @@ function height = geoidheight(latlong, geoidname, geoiddir)
%
% This is a legacy function to replace a compiled interface function of
% the same name. This now calls geoid_height which is implemented as
-% native Matlab code. (Note that, unlike the compiled interface, this
-% wrapper function does not return the gradient of the geoid height; this
-% is now a deprecated feature of the Geoid class.)
+% native Matlab code.
%
% latlong is an M x 2 matrix
% latitude = latlong(:,1) in degrees
@@ -25,7 +23,7 @@ function height = geoidheight(latlong, geoidname, geoiddir)
%
% See also GEOID_HEIGHT.
-% Copyright (c) Charles Karney (2015) <charles at karney.com>.
+% Copyright (c) Charles Karney (2015-2016) <charles at karney.com>.
if nargin < 2
geoidname = '';
diff --git a/matlab/geographiclib-legacy/localcartesianforward.cpp b/matlab/geographiclib-legacy/localcartesianforward.cpp
deleted file mode 100644
index f247b62..0000000
--- a/matlab/geographiclib-legacy/localcartesianforward.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * \file localcartesianforward.cpp
- * \brief Matlab mex file for geographic to UTM/UPS conversions
- *
- * Copyright (c) Charles Karney (2011) <charles at karney.com> and licensed under
- * the MIT/X11 License. For more information, see
- * http://geographiclib.sourceforge.net/
- **********************************************************************/
-
-// Compile in Matlab with
-// [Unix]
-// mex -I/usr/local/include -L/usr/local/lib -Wl,-rpath=/usr/local/lib
-// -lGeographic localcartesianforward.cpp
-// [Windows]
-// mex -I../include -L../windows/Release
-// -lGeographic localcartesianforward.cpp
-
-#include <algorithm>
-#include <GeographicLib/LocalCartesian.hpp>
-#include <mex.h>
-
-using namespace std;
-using namespace GeographicLib;
-
-void mexFunction( int nlhs, mxArray* plhs[],
- int nrhs, const mxArray* prhs[] ) {
-
- if (nrhs < 2)
- mexErrMsgTxt("Two input arguments required.");
- else if (nrhs > 4)
- mexErrMsgTxt("More than four input arguments specified.");
- else if (nrhs == 3)
- mexErrMsgTxt("Must specify flattening with the major radius.");
- else if (nlhs > 2)
- mexErrMsgTxt("More than two output arguments specified.");
-
- if (!( mxIsDouble(prhs[0]) && !mxIsComplex(prhs[0]) ))
- mexErrMsgTxt("origin is not of type double.");
- if (!( mxGetM(prhs[0]) == 1 &&
- (mxGetN(prhs[0]) == 2 || mxGetN(prhs[0]) == 3) ))
- mexErrMsgTxt("origin be 1 x 3 or 1 x 2 matrix.");
-
- double* origin = mxGetPr(prhs[0]);
- double lat0 = origin[0], lon0 = origin[1],
- h0 = mxGetN(prhs[0]) == 3 ? origin[2] : 0;
-
- if (!( mxIsDouble(prhs[1]) && !mxIsComplex(prhs[1]) ))
- mexErrMsgTxt("geodetic coordinates are not of type double.");
-
- if (!(mxGetN(prhs[1]) == 3 || mxGetN(prhs[1]) == 2))
- mexErrMsgTxt("geodetic coordinates must be an M x 3 or M x 2 matrix.");
-
- double a = Constants::WGS84_a<double>(), f = Constants::WGS84_f<double>();
- if (nrhs == 4) {
- if (!( mxIsDouble(prhs[2]) && !mxIsComplex(prhs[2]) &&
- mxGetNumberOfElements(prhs[2]) == 1 ))
- mexErrMsgTxt("Major radius is not a real scalar.");
- a = mxGetScalar(prhs[2]);
- if (!( mxIsDouble(prhs[3]) && !mxIsComplex(prhs[3]) &&
- mxGetNumberOfElements(prhs[3]) == 1 ))
- mexErrMsgTxt("Flattening is not a real scalar.");
- f = mxGetScalar(prhs[3]);
- }
-
- mwSize m = mxGetM(prhs[1]);
-
- double* lat = mxGetPr(prhs[1]);
- double* lon = lat + m;
- bool haveh = mxGetN(prhs[1]) == 3;
- double* h = haveh ? lat + 2*m : NULL;
-
- plhs[0] = mxCreateDoubleMatrix(m, 3, mxREAL);
- double* x = mxGetPr(plhs[0]);
- std::fill(x, x + 3*m, Math::NaN<double>());
- double* y = x + m;
- double* z = x + 2*m;
- double* rot = NULL;
- bool rotp = nlhs == 2;
-
- if (rotp) {
- plhs[1] = mxCreateDoubleMatrix(m, 9, mxREAL);
- rot = mxGetPr(plhs[1]);
- std::fill(rot, rot + 9*m, Math::NaN<double>());
- }
-
- try {
- std::vector<double> rotv(rotp ? 9 : 0);
- const Geocentric c(a, f);
- if (!(abs(lat0) <= 90))
- throw GeographicErr("Invalid latitude");
- if (!(lon0 >= -540 || lon0 < 540))
- throw GeographicErr("Invalid longitude");
- const LocalCartesian l(lat0, lon0, h0, c);
- for (mwIndex i = 0; i < m; ++i) {
- if (abs(lat[i]) <= 90 && lon[i] >= -540 && lon[i] < 540) {
- l.Forward(lat[i], lon[i], haveh ? h[i] : 0.0, x[i], y[i], z[i], rotv);
- if (rotp) {
- for (mwIndex k = 0; k < 9; ++k)
- rot[m * k + i] = rotv[k];
- }
- }
- }
- }
- catch (const std::exception& e) {
- mexErrMsgTxt(e.what());
- }
-}
diff --git a/matlab/geographiclib-legacy/localcartesianreverse.cpp b/matlab/geographiclib-legacy/localcartesianreverse.cpp
deleted file mode 100644
index 6541822..0000000
--- a/matlab/geographiclib-legacy/localcartesianreverse.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * \file localcartesianreverse.cpp
- * \brief Matlab mex file for UTM/UPS to geographic conversions
- *
- * Copyright (c) Charles Karney (2011) <charles at karney.com> and licensed under
- * the MIT/X11 License. For more information, see
- * http://geographiclib.sourceforge.net/
- **********************************************************************/
-
-// Compile in Matlab with
-// [Unix]
-// mex -I/usr/local/include -L/usr/local/lib -Wl,-rpath=/usr/local/lib
-// -lGeographic localcartesianreverse.cpp
-// [Windows]
-// mex -I../include -L../windows/Release
-// -lGeographic localcartesianreverse.cpp
-
-#include <GeographicLib/LocalCartesian.hpp>
-#include <mex.h>
-
-using namespace std;
-using namespace GeographicLib;
-
-void mexFunction( int nlhs, mxArray* plhs[],
- int nrhs, const mxArray* prhs[] ) {
-
- if (nrhs < 2)
- mexErrMsgTxt("Two input arguments required.");
- else if (nrhs > 4)
- mexErrMsgTxt("More than four input arguments specified.");
- else if (nrhs == 3)
- mexErrMsgTxt("Must specify flattening with the major radius.");
- else if (nlhs > 2)
- mexErrMsgTxt("More than two output arguments specified.");
-
- if (!( mxIsDouble(prhs[0]) && !mxIsComplex(prhs[0]) ))
- mexErrMsgTxt("origin is not of type double.");
- if (!( mxGetM(prhs[0]) == 1 &&
- (mxGetN(prhs[0]) == 2 || mxGetN(prhs[0]) == 3) ))
- mexErrMsgTxt("origin be 1 x 3 or 1 x 2 matrix.");
-
- double* origin = mxGetPr(prhs[0]);
- double lat0 = origin[0], lon0 = origin[1],
- h0 = mxGetN(prhs[0]) == 3 ? origin[2] : 0;
-
- if (!( mxIsDouble(prhs[1]) && !mxIsComplex(prhs[1]) ))
- mexErrMsgTxt("local cartesian coordinates are not of type double.");
-
- if (mxGetN(prhs[1]) != 3)
- mexErrMsgTxt("local cartesian coordinates must be M x 3 matrix.");
-
- double a = Constants::WGS84_a<double>(), f = Constants::WGS84_f<double>();
- if (nrhs == 4) {
- if (!( mxIsDouble(prhs[2]) && !mxIsComplex(prhs[2]) &&
- mxGetNumberOfElements(prhs[2]) == 1 ))
- mexErrMsgTxt("Major radius is not a real scalar.");
- a = mxGetScalar(prhs[2]);
- if (!( mxIsDouble(prhs[3]) && !mxIsComplex(prhs[3]) &&
- mxGetNumberOfElements(prhs[3]) == 1 ))
- mexErrMsgTxt("Flattening is not a real scalar.");
- f = mxGetScalar(prhs[3]);
- }
-
- mwSize m = mxGetM(prhs[1]);
-
- double* x = mxGetPr(prhs[1]);
- double* y = x + m;
- double* z = x + 2*m;
-
- plhs[0] = mxCreateDoubleMatrix(m, 3, mxREAL);
- double* lat = mxGetPr(plhs[0]);
- double* lon = lat + m;
- double* h = lat + 2*m;
- double* rot = NULL;
- bool rotp = nlhs == 2;
-
- if (rotp) {
- plhs[1] = mxCreateDoubleMatrix(m, 9, mxREAL);
- rot = mxGetPr(plhs[1]);
- }
-
- try {
- std::vector<double> rotv(rotp ? 9 : 0);
- const Geocentric c(a, f);
- if (!(abs(lat0) <= 90))
- throw GeographicErr("Invalid latitude");
- if (!(lon0 >= -540 || lon0 < 540))
- throw GeographicErr("Invalid longitude");
- const LocalCartesian l(lat0, lon0, h0, c);
- for (mwIndex i = 0; i < m; ++i) {
- l.Reverse(x[i], y[i], z[i], lat[i], lon[i], h[i], rotv);
- if (rotp) {
- for (mwIndex k = 0; k < 9; ++k)
- rot[m * k + i] = rotv[k];
- }
- }
- }
- catch (const std::exception& e) {
- mexErrMsgTxt(e.what());
- }
-}
diff --git a/matlab/geographiclib-legacy/mgrsforward.cpp b/matlab/geographiclib-legacy/mgrsforward.cpp
deleted file mode 100644
index a307ef5..0000000
--- a/matlab/geographiclib-legacy/mgrsforward.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * \file mgrsforward.cpp
- * \brief Matlab mex file for UTM/UPS to MGRS conversions
- *
- * Copyright (c) Charles Karney (2010) <charles at karney.com> and licensed under
- * the MIT/X11 License. For more information, see
- * http://geographiclib.sourceforge.net/
- **********************************************************************/
-
-// Compile in Matlab with
-// [Unix]
-// mex -I/usr/local/include -L/usr/local/lib -Wl,-rpath=/usr/local/lib
-// -lGeographic mgrsforward.cpp
-// [Windows]
-// mex -I../include -L../windows/Release
-// -lGeographic mgrsforward.cpp
-
-#include <GeographicLib/MGRS.hpp>
-#include <mex.h>
-
-using namespace std;
-using namespace GeographicLib;
-
-void mexFunction( int nlhs, mxArray* plhs[],
- int nrhs, const mxArray* prhs[] ) {
-
- if (nrhs < 1)
- mexErrMsgTxt("One input argument required.");
- else if (nrhs > 2)
- mexErrMsgTxt("More than two input arguments specified.");
- else if (nlhs > 1)
- mexErrMsgTxt("Only one output argument can be specified.");
-
- if (!mxIsDouble(prhs[0]))
- mexErrMsgTxt("utmups coordinates are not of type double.");
-
- if (mxGetN(prhs[0]) != 4)
- mexErrMsgTxt("utmups coordinates must be M x 4 matrix.");
-
- int prec;
- if (nrhs == 1)
- prec = 5;
- else {
- if (!( mxIsDouble(prhs[1]) && !mxIsComplex(prhs[1]) &&
- mxGetNumberOfElements(prhs[1]) == 1 ))
- mexErrMsgTxt("Precision is not an integer.");
- double rprec = mxGetScalar(prhs[1]);
- prec = int(rprec);
- if (double(prec) != rprec)
- mexErrMsgTxt("Precision is not an integer.");
- if (prec < -1 || prec > 11)
- mexErrMsgTxt("Precision outside the legal range [-1, 11].");
- }
-
- mwSize m = mxGetM(prhs[0]);
-
- double* x = mxGetPr(prhs[0]);
- double* y = x + m;
- double* zone = x + 2*m;
- double* hemi = x + 3*m;
-
- string mgrsstr;
- plhs[0] = mxCreateCellArray(1, &m);
- mxArray* mgrs = plhs[0];
-
- for (mwIndex i = 0; i < m; ++i) {
- try {
- mgrsstr = "INVALID";
- int ZONE = int(zone[i]);
- if (double(ZONE) != zone[i])
- throw GeographicErr("Zone is not an integer");
- bool HEMI = (hemi[i] != 0);
- if (HEMI && (hemi[i] != 1))
- throw GeographicErr("Hemisphere is not 0 or 1");
- MGRS::Forward(ZONE, HEMI, x[i], y[i], prec, mgrsstr);
- }
- catch (const std::exception& e) {
- mexWarnMsgTxt(e.what());
- }
- mxSetCell(mgrs, i, mxCreateString(mgrsstr.c_str()));
- }
-}
diff --git a/matlab/geographiclib-legacy/mgrsreverse.cpp b/matlab/geographiclib-legacy/mgrsreverse.cpp
deleted file mode 100644
index 93c2555..0000000
--- a/matlab/geographiclib-legacy/mgrsreverse.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * \file mgrsreverse.cpp
- * \brief Matlab mex file for UTM/UPS to MGRS conversions
- *
- * Copyright (c) Charles Karney (2010) <charles at karney.com> and licensed under
- * the MIT/X11 License. For more information, see
- * http://geographiclib.sourceforge.net/
- **********************************************************************/
-
-// Compile in Matlab with
-// [Unix]
-// mex -I/usr/local/include -L/usr/local/lib -Wl,-rpath=/usr/local/lib
-// -lGeographic mgrsreverse.cpp
-// [Windows]
-// mex -I../include -L../windows/Release
-// -lGeographic mgrsreverse.cpp
-
-#include <GeographicLib/MGRS.hpp>
-#include <mex.h>
-
-using namespace std;
-using namespace GeographicLib;
-
-void mexFunction( int nlhs, mxArray* plhs[],
- int nrhs, const mxArray* prhs[] ) {
-
- if (nrhs != 1)
- mexErrMsgTxt("One input argument required.");
- else if (nlhs > 2)
- mexErrMsgTxt("More than two output arguments specified.");
-
- if (!mxIsCell(prhs[0]) || mxGetN(prhs[0]) != 1)
- mexErrMsgTxt("mgrs coordinates should be in a M x 1 cell array.");
-
- mwSize m = mxGetM(prhs[0]);
-
- plhs[0] = mxCreateDoubleMatrix(m, 4, mxREAL);
- double* x = mxGetPr(plhs[0]);
- double* y = x + m;
- double* zone = x + 2*m;
- double* hemi = x + 3*m;
- double* prec = NULL;
- bool precp = nlhs == 2;
-
- if (precp) {
- plhs[1] = mxCreateDoubleMatrix(m, 1, mxREAL);
- prec = mxGetPr(plhs[1]);
- }
-
- string mgrsstr;
- for (mwIndex i = 0; i < m; ++i) {
- try {
- mxArray* mgrs = mxGetCell(prhs[0], i);
- if (!mxIsChar(mgrs) || mxGetM(mgrs) != 1)
- throw GeographicErr("Cell element not a string");
- mwSize n = mxGetN(mgrs);
- mxChar* mgrschar = mxGetChars(mgrs);
- mgrsstr.resize(n);
- for (mwIndex k = 0; k < n; ++k)
- mgrsstr[k] = mgrschar[k];
- int ZONE, PREC;
- bool HEMI;
- MGRS::Reverse(mgrsstr, ZONE, HEMI, x[i], y[i], PREC);
- zone[i] = ZONE;
- hemi[i] = HEMI ? 1 : 0;
- if (precp)
- prec[i] = PREC;
- }
- catch (const std::exception& e) {
- mexWarnMsgTxt(e.what());
- x[i] = y[i] = Math::NaN<double>();
- zone[i] = UTMUPS::INVALID; hemi[i] = 0;
- if (precp) prec[i] = -2;
- }
- }
-}
diff --git a/matlab/geographiclib-legacy/polygonarea.cpp b/matlab/geographiclib-legacy/polygonarea.cpp
deleted file mode 100644
index dbfa6e5..0000000
--- a/matlab/geographiclib-legacy/polygonarea.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * \file polygonarea.cpp
- * \brief Matlab mex file for computing the area of a geodesicpolygon
- *
- * Copyright (c) Charles Karney (2011) <charles at karney.com> and licensed
- * under the MIT/X11 License. For more information, see
- * http://geographiclib.sourceforge.net/
- **********************************************************************/
-
-// Compile in Matlab with
-// [Unix]
-// mex -I/usr/local/include -L/usr/local/lib -Wl,-rpath=/usr/local/lib
-// -lGeographic polygonarea.cpp
-// [Windows]
-// mex -I../include -L../windows/Release
-// -lGeographic polygonarea.cpp
-
-#include <algorithm>
-#include <GeographicLib/PolygonArea.hpp>
-#include <mex.h>
-
-using namespace std;
-using namespace GeographicLib;
-
-void mexFunction( int nlhs, mxArray* plhs[],
- int nrhs, const mxArray* prhs[] ) {
-
- if (nrhs < 1)
- mexErrMsgTxt("One input argument required.");
- else if (nrhs > 3)
- mexErrMsgTxt("More than three input arguments specified.");
- else if (nrhs == 2)
- mexErrMsgTxt("Must specify flattening with the major radius.");
- else if (nlhs > 2)
- mexErrMsgTxt("More than two output arguments specified.");
-
- if (!( mxIsDouble(prhs[0]) && !mxIsComplex(prhs[0]) ))
- mexErrMsgTxt("latlong coordinates are not of type double.");
-
- if (mxGetN(prhs[0]) != 2)
- mexErrMsgTxt("latlong coordinates must be M x 2 matrix.");
-
- double a = Constants::WGS84_a<double>(), f = Constants::WGS84_f<double>();
- if (nrhs == 3) {
- if (!( mxIsDouble(prhs[1]) && !mxIsComplex(prhs[1]) &&
- mxGetNumberOfElements(prhs[1]) == 1 ))
- mexErrMsgTxt("Major radius is not a real scalar.");
- a = mxGetScalar(prhs[1]);
- if (!( mxIsDouble(prhs[2]) && !mxIsComplex(prhs[2]) &&
- mxGetNumberOfElements(prhs[2]) == 1 ))
- mexErrMsgTxt("Flattening is not a real scalar.");
- f = mxGetScalar(prhs[2]);
- }
-
- mwSize m = mxGetM(prhs[0]);
-
- double* lat = mxGetPr(prhs[0]);
- double* lon = lat + m;
-
- plhs[0] = mxCreateDoubleMatrix(1, 1, mxREAL);
- double* area = mxGetPr(plhs[0]);
- double* perimeter = NULL;
- bool perimeterp = nlhs == 2;
-
- if (perimeterp) {
- plhs[1] = mxCreateDoubleMatrix(1, 1, mxREAL);
- perimeter = mxGetPr(plhs[1]);
- }
-
- try {
- const Geodesic g(a, f);
- PolygonArea p(g, false);
- for (mwIndex i = 0; i < m; ++i) {
- if (!(abs(lat[i]) <= 90))
- throw GeographicErr("Invalid latitude");
- if (!(lon[i] >= -540 || lon[i] < 540))
- throw GeographicErr("Invalid longitude");
- p.AddPoint(lat[i], lon[i]);
- }
- double tp, ta;
- p.Compute(false, true, tp, ta);
- *area = ta;
- if (perimeterp) *perimeter = tp;
- }
- catch (const std::exception& e) {
- mexErrMsgTxt(e.what());
- }
-}
diff --git a/matlab/geographiclib-legacy/utmupsforward.cpp b/matlab/geographiclib-legacy/utmupsforward.cpp
deleted file mode 100644
index b76905e..0000000
--- a/matlab/geographiclib-legacy/utmupsforward.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * \file utmupsforward.cpp
- * \brief Matlab mex file for geographic to UTM/UPS conversions
- *
- * Copyright (c) Charles Karney (2010) <charles at karney.com> and licensed under
- * the MIT/X11 License. For more information, see
- * http://geographiclib.sourceforge.net/
- **********************************************************************/
-
-// Compile in Matlab with
-// [Unix]
-// mex -I/usr/local/include -L/usr/local/lib -Wl,-rpath=/usr/local/lib
-// -lGeographic utmupsforward.cpp
-// [Windows]
-// mex -I../include -L../windows/Release
-// -lGeographic utmupsforward.cpp
-
-#include <GeographicLib/UTMUPS.hpp>
-#include <mex.h>
-
-using namespace std;
-using namespace GeographicLib;
-
-void mexFunction( int nlhs, mxArray* plhs[],
- int nrhs, const mxArray* prhs[] ) {
-
- if (nrhs < 1)
- mexErrMsgTxt("One input argument required.");
- else if (nrhs > 2)
- mexErrMsgTxt("More than two input arguments specified.");
- else if (nlhs > 2)
- mexErrMsgTxt("More than two output arguments specified.");
-
- if (!( mxIsDouble(prhs[0]) && !mxIsComplex(prhs[0]) ))
- mexErrMsgTxt("latlong coordinates are not of type double.");
-
- if (mxGetN(prhs[0]) != 2)
- mexErrMsgTxt("latlong coordinates must be M x 2 matrix.");
-
- int setzone;
- if (nrhs == 1)
- setzone = UTMUPS::STANDARD;
- else {
- if (!( mxIsDouble(prhs[1]) && !mxIsComplex(prhs[1]) &&
- mxGetNumberOfElements(prhs[1]) == 1 ))
- mexErrMsgTxt("setzone is not an integer.");
- double rzone = mxGetScalar(prhs[1]);
- setzone = int(rzone);
- if (double(setzone) != rzone)
- mexErrMsgTxt("setzone is not an integer.");
- if (setzone < UTMUPS::MINPSEUDOZONE || setzone > UTMUPS::MAXZONE)
- mexErrMsgTxt("setzone outside the legal range.");
- }
-
- mwSize m = mxGetM(prhs[0]);
-
- double* lat = mxGetPr(prhs[0]);
- double* lon = lat + m;
-
- plhs[0] = mxCreateDoubleMatrix(m, 4, mxREAL);
- double* x = mxGetPr(plhs[0]);
- double* y = x + m;
- double* zone = x + 2*m;
- double* hemi = x + 3*m;
- double* gamma = NULL;
- double* k = NULL;
- bool scale = nlhs == 2;
-
- if (scale) {
- plhs[1] = mxCreateDoubleMatrix(m, 2, mxREAL);
- gamma = mxGetPr(plhs[1]);
- k = gamma + m;
- }
-
- for (mwIndex i = 0; i < m; ++i) {
- int ZONE;
- bool HEMI;
- try {
- if (scale)
- UTMUPS::Forward(lat[i], lon[i], ZONE, HEMI, x[i], y[i], gamma[i], k[i],
- setzone);
- else
- UTMUPS::Forward(lat[i], lon[i], ZONE, HEMI, x[i], y[i], setzone);
- zone[i] = ZONE;
- hemi[i] = HEMI ? 1 : 0;
- }
- catch (const std::exception& e) {
- mexWarnMsgTxt(e.what());
- x[i] = y[i] = Math::NaN<double>();
- if (scale) gamma[i] = k[i] = Math::NaN<double>();
- zone[i] = UTMUPS::INVALID; hemi[i] = 0;
- }
- }
-}
diff --git a/matlab/geographiclib-legacy/utmupsreverse.cpp b/matlab/geographiclib-legacy/utmupsreverse.cpp
deleted file mode 100644
index 56d3643..0000000
--- a/matlab/geographiclib-legacy/utmupsreverse.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * \file utmupsreverse.cpp
- * \brief Matlab mex file for UTM/UPS to geographic conversions
- *
- * Copyright (c) Charles Karney (2010) <charles at karney.com> and licensed under
- * the MIT/X11 License. For more information, see
- * http://geographiclib.sourceforge.net/
- **********************************************************************/
-
-// Compile in Matlab with
-// [Unix]
-// mex -I/usr/local/include -L/usr/local/lib -Wl,-rpath=/usr/local/lib
-// -lGeographic utmupsreverse.cpp
-// [Windows]
-// mex -I../include -L../windows/Release
-// -lGeographic utmupsreverse.cpp
-
-#include <GeographicLib/UTMUPS.hpp>
-#include <mex.h>
-
-using namespace std;
-using namespace GeographicLib;
-
-void mexFunction( int nlhs, mxArray* plhs[],
- int nrhs, const mxArray* prhs[] ) {
-
- if (nrhs != 1)
- mexErrMsgTxt("One input argument required.");
- else if (nlhs > 2)
- mexErrMsgTxt("More than two output arguments specified.");
-
- if (!( mxIsDouble(prhs[0]) && !mxIsComplex(prhs[0]) ))
- mexErrMsgTxt("utmups coordinates are not of type double.");
-
- if (mxGetN(prhs[0]) != 4)
- mexErrMsgTxt("utmups coordinates must be M x 4 matrix.");
-
- mwSize m = mxGetM(prhs[0]);
-
- double* x = mxGetPr(prhs[0]);
- double* y = x + m;
- double* zone = x + 2*m;
- double* hemi = x + 3*m;
-
- plhs[0] = mxCreateDoubleMatrix(m, 2, mxREAL);
- double* lat = mxGetPr(plhs[0]);
- double* lon = lat + m;
- double* gamma = NULL;
- double* k = NULL;
- bool scale = nlhs == 2;
-
- if (scale) {
- plhs[1] = mxCreateDoubleMatrix(m, 2, mxREAL);
- gamma = mxGetPr(plhs[1]);
- k = gamma + m;
- }
-
- for (mwIndex i = 0; i < m; ++i) {
- try {
- int ZONE = int(zone[i]);
- if (double(ZONE) != zone[i])
- throw GeographicErr("Zone is not an integer");
- bool HEMI = (hemi[i] != 0);
- if (HEMI && (hemi[i] != 1))
- throw GeographicErr("Hemisphere is not 0 or 1");
- if (scale)
- UTMUPS::Reverse(ZONE, HEMI, x[i], y[i], lat[i], lon[i], gamma[i], k[i]);
- else
- UTMUPS::Reverse(ZONE, HEMI, x[i], y[i], lat[i], lon[i]);
- }
- catch (const std::exception& e) {
- mexWarnMsgTxt(e.what());
- lat[i] = lon[i] = Math::NaN<double>();
- if (scale) gamma[i] = k[i] = Math::NaN<double>();
- }
- }
-}
diff --git a/matlab/geographiclib/Contents.m b/matlab/geographiclib/Contents.m
index c42d3a6..a5f82b6 100644
--- a/matlab/geographiclib/Contents.m
+++ b/matlab/geographiclib/Contents.m
@@ -1,5 +1,5 @@
% GeographicLib toolbox
-% Version 1.45 2015-09-30
+% Version 1.46 2016-02-15
%
% This toolbox provides native MATLAB implementations of a subset of the
% C++ library, GeographicLib. Key components of this toolbox are
@@ -16,7 +16,7 @@
% available in the documentation for the GeographicLib, which is
% available at
%
-% http://geographiclib.sf.net/html
+% http://geographiclib.sourceforge.net/html
%
% Some common features of these functions:
% * Angles (latitude, longitude, azimuth, meridian convergence) are
@@ -90,4 +90,4 @@
% projdoc - Projections for an ellipsoid
% gedoc - Great ellipses on an ellipsoid of revolution
-% Copyright (c) Charles Karney (2015) <charles at karney.com>.
+% Copyright (c) Charles Karney (2015-2016) <charles at karney.com>.
diff --git a/matlab/geographiclib/ecc2flat.m b/matlab/geographiclib/ecc2flat.m
index 8bdfb65..60e3f9b 100644
--- a/matlab/geographiclib/ecc2flat.m
+++ b/matlab/geographiclib/ecc2flat.m
@@ -7,6 +7,6 @@ function f = ecc2flat(e)
%
% See also FLAT2ECC.
- e2 = e.^2;
+ e2 = real(e.^2);
f = e2 ./ (1 + sqrt(1 - e2));
end
diff --git a/matlab/geographiclib/eqdazim_fwd.m b/matlab/geographiclib/eqdazim_fwd.m
index a67bd75..4d945cb 100644
--- a/matlab/geographiclib/eqdazim_fwd.m
+++ b/matlab/geographiclib/eqdazim_fwd.m
@@ -27,7 +27,7 @@ function [x, y, azi, rk] = eqdazim_fwd(lat0, lon0, lat, lon, ellipsoid)
%
% C. F. F. Karney, Geodesics on an ellipsoid of revolution (2011),
% http://arxiv.org/abs/1102.1215
-% Errata: http://geographiclib.sf.net/geod-addenda.html#geod-errata
+% Errata: http://geographiclib.sourceforge.net/geod-addenda.html#geod-errata
%
% describes how to use this projection in the determination of maritime
% boundaries (finding the median line).
diff --git a/matlab/geographiclib/eqdazim_inv.m b/matlab/geographiclib/eqdazim_inv.m
index 6e7579e..41f3360 100644
--- a/matlab/geographiclib/eqdazim_inv.m
+++ b/matlab/geographiclib/eqdazim_inv.m
@@ -27,7 +27,7 @@ function [lat, lon, azi, rk] = eqdazim_inv(lat0, lon0, x, y, ellipsoid)
%
% C. F. F. Karney, Geodesics on an ellipsoid of revolution (2011),
% http://arxiv.org/abs/1102.1215
-% Errata: http://geographiclib.sf.net/geod-addenda.html#geod-errata
+% Errata: http://geographiclib.sourceforge.net/geod-addenda.html#geod-errata
%
% describes how to use this projection in the determination of maritime
% boundaries (finding the median line).
diff --git a/matlab/geographiclib/gedistance.m b/matlab/geographiclib/gedistance.m
index eafd043..d1e47c6 100644
--- a/matlab/geographiclib/gedistance.m
+++ b/matlab/geographiclib/gedistance.m
@@ -45,7 +45,7 @@ function [s12, azi1, azi2, S12] = gedistance(lat1, lon1, lat2, lon2, ellipsoid)
tiny = sqrt(realmin);
a = ellipsoid(1);
- e2 = ellipsoid(2)^2;
+ e2 = real(ellipsoid(2)^2);
f = e2 / (1 + sqrt(1 - e2));
f1 = 1 - f;
diff --git a/matlab/geographiclib/gedoc.m b/matlab/geographiclib/gedoc.m
index 78cb600..dbdcb28 100644
--- a/matlab/geographiclib/gedoc.m
+++ b/matlab/geographiclib/gedoc.m
@@ -5,21 +5,21 @@ function gedoc
% problems for great ellipses on the surface of an ellipsoid of
% revolution. For more information, see
%
-% http://geographiclib.sf.net/html/greatellipse.html
+% http://geographiclib.sourceforge.net/html/greatellipse.html
%
% Great ellipses are sometimes proposed as alternatives to computing
% ellipsoidal geodesics. However geodesic calculations are easy to
% perform using geoddistance and geodreckon, and these should normally be
% used instead of gedistance and gereckon. For a discussion, see
%
-% http://geographiclib.sf.net/html/greatellipse.html#gevsgeodesic
+% http://geographiclib.sourceforge.net/html/greatellipse.html#gevsgeodesic
%
% The method involves stretching the ellipse along the axis until it
% becomes a sphere, solving the corresponding great circle problem on the
% sphere and mapping the results back to the ellipsoid. For details,
% see
%
-% http://geographiclib.sf.net/html/greatellipse.html#geformulation
+% http://geographiclib.sourceforge.net/html/greatellipse.html#geformulation
%
% Consider two points on the ellipsoid at (lat1, lon1) and (lat2, lon2).
% The plane containing these points and the center of the ellipsoid
diff --git a/matlab/geographiclib/geocent_fwd.m b/matlab/geographiclib/geocent_fwd.m
index e585abb..b188ba2 100644
--- a/matlab/geographiclib/geocent_fwd.m
+++ b/matlab/geographiclib/geocent_fwd.m
@@ -36,7 +36,7 @@ function [X, Y, Z, M] = geocent_fwd(lat, lon, h, ellipsoid)
lat = LatFix(lat) + z; lon = lon + z; h = h + z;
a = ellipsoid(1);
- e2 = ellipsoid(2)^2;
+ e2 = real(ellipsoid(2)^2);
e2m = 1 - e2;
[slam, clam] = sincosdx(lon);
diff --git a/matlab/geographiclib/geocent_inv.m b/matlab/geographiclib/geocent_inv.m
index 2208e50..1d47ead 100644
--- a/matlab/geographiclib/geocent_inv.m
+++ b/matlab/geographiclib/geocent_inv.m
@@ -33,7 +33,7 @@ function [lat, lon, h, M] = geocent_inv(X, Y, Z, ellipsoid)
X = X + z; Y = Y + z; Z = Z + z;
a = ellipsoid(1);
- e2 = ellipsoid(2)^2;
+ e2 = real(ellipsoid(2)^2);
e2m = 1 - e2;
e2a = abs(e2);
e4a = e2^2;
diff --git a/matlab/geographiclib/geodarea.m b/matlab/geographiclib/geodarea.m
index 4d53559..3ffebc3 100644
--- a/matlab/geographiclib/geodarea.m
+++ b/matlab/geographiclib/geodarea.m
@@ -28,7 +28,7 @@ function [A, P, N] = geodarea(lats, lons, ellipsoid)
% C. F. F. Karney, Algorithms for geodesics,
% J. Geodesy 87, 43-55 (2013);
% https://dx.doi.org/10.1007/s00190-012-0578-z
-% Addenda: http://geographiclib.sf.net/geod-addenda.html
+% Addenda: http://geographiclib.sourceforge.net/geod-addenda.html
%
% See also GEODDOC, GEODDISTANCE, GEODRECKON, POLYGONAREA,
% DEFAULTELLIPSOID.
@@ -62,7 +62,7 @@ function [A, P, N] = geodarea(lats, lons, ellipsoid)
lat2(m1) = lat1(m0); lon2(m1) = lon1(m0);
a = ellipsoid(1);
- e2 = ellipsoid(2)^2;
+ e2 = real(ellipsoid(2)^2);
f = e2 / (1 + sqrt(1 - e2));
b = (1 - f) * a;
diff --git a/matlab/geographiclib/geoddistance.m b/matlab/geographiclib/geoddistance.m
index 2a5ac48..0417728 100644
--- a/matlab/geographiclib/geoddistance.m
+++ b/matlab/geographiclib/geoddistance.m
@@ -27,7 +27,7 @@ function [s12, azi1, azi2, S12, m12, M12, M21, a12] = geoddistance ...
% C. F. F. Karney, Algorithms for geodesics,
% J. Geodesy 87, 43-55 (2013);
% https://dx.doi.org/10.1007/s00190-012-0578-z
-% Addenda: http://geographiclib.sf.net/geod-addenda.html
+% Addenda: http://geographiclib.sourceforge.net/geod-addenda.html
%
% This function duplicates some of the functionality of the distance
% function in the MATLAB mapping toolbox. Differences are
@@ -42,7 +42,7 @@ function [s12, azi1, azi2, S12, m12, M12, M21, a12] = geoddistance ...
% See also GEODDOC, GEODRECKON, GEODAREA, GEODESICINVERSE,
% DEFAULTELLIPSOID.
-% Copyright (c) Charles Karney (2012-2015) <charles at karney.com>.
+% Copyright (c) Charles Karney (2012-2016) <charles at karney.com>.
%
% This is a straightforward transcription of the C++ implementation in
% GeographicLib and the C++ source should be consulted for additional
@@ -74,7 +74,7 @@ function [s12, azi1, azi2, S12, m12, M12, M21, a12] = geoddistance ...
maxit2 = maxit1 + (-log2(eps) + 1) + 10;
a = ellipsoid(1);
- e2 = ellipsoid(2)^2;
+ e2 = real(ellipsoid(2)^2);
f = e2 / (1 + sqrt(1 - e2));
f1 = 1 - f;
@@ -98,9 +98,15 @@ function [s12, azi1, azi2, S12, m12, M12, M21, a12] = geoddistance ...
A3x = A3coeff(n);
C3x = C3coeff(n);
- lon12 = AngRound(AngDiff(lon1(:), lon2(:)));
+ [lon12, lon12s] = AngDiff(lon1(:), lon2(:));
lonsign = 2 * (lon12 >= 0) - 1;
- lon12 = lonsign .* lon12;
+ lon12 = lonsign .* AngRound(lon12);
+ lon12s = AngRound((180 -lon12) - lonsign .* lon12s);
+ lam12 = lon12 * degree; slam12 = Z; clam12 = Z;
+ l = lon12 > 90;
+ [slam12( l), clam12( l)] = sincosdx(lon12s(l)); clam12(l) = -clam12(l);
+ [slam12(~l), clam12(~l)] = sincosdx(lon12(~l));
+
lat1 = AngRound(LatFix(lat1(:)));
lat2 = AngRound(LatFix(lat2(:)));
swapp = 2 * ~(abs(lat1) < abs(lat2)) - 1;
@@ -124,12 +130,10 @@ function [s12, azi1, azi2, S12, m12, M12, M21, a12] = geoddistance ...
dn1 = sqrt(1 + ep2 * sbet1.^2);
dn2 = sqrt(1 + ep2 * sbet2.^2);
- lam12 = lon12 * degree;
- [slam12, clam12] = sincosdx(lon12);
sig12 = Z; ssig1 = Z; csig1 = Z; ssig2 = Z; csig2 = Z;
calp1 = Z; salp1 = Z; calp2 = Z; salp2 = Z;
- s12 = Z; m12 = Z; M12 = Z; M21 = Z; omg12 = Z;
+ s12 = Z; m12 = Z; M12 = Z; M21 = Z; omg12 = Z; somg12 = 2+Z; comg12 = Z;
m = lat1 == -90 | slam12 == 0;
@@ -157,7 +161,7 @@ function [s12, azi1, azi2, S12, m12, M12, M21, a12] = geoddistance ...
eq = ~m & sbet1 == 0;
if f > 0
- eq = eq & lam12 < pi - f * pi;
+ eq = eq & lon12s >= f * 180;
end
calp1(eq) = 0; calp2(eq) = 0; salp1(eq) = 1; salp2(eq) = 1;
s12(eq) = a * lam12(eq); sig12(eq) = lam12(eq) / f1; omg12(eq) = sig12(eq);
@@ -169,7 +173,7 @@ function [s12, azi1, azi2, S12, m12, M12, M21, a12] = geoddistance ...
dnm = Z;
[sig12(g), salp1(g), calp1(g), salp2(g), calp2(g), dnm(g)] = ...
InverseStart(sbet1(g), cbet1(g), dn1(g), sbet2(g), cbet2(g), dn2(g), ...
- lam12(g), f, A3x);
+ lam12(g), slam12(g), clam12(g), f, A3x);
s = g & sig12 >= 0;
s12(s) = b * sig12(s) .* dnm(s);
@@ -195,12 +199,12 @@ function [s12, azi1, azi2, S12, m12, M12, M21, a12] = geoddistance ...
numit(g) = k;
[v(g), dv(g), ...
salp2(g), calp2(g), sig12(g), ...
- ssig1(g), csig1(g), ssig2(g), csig2(g), epsi(g), omg12(g)] = ...
+ ssig1(g), csig1(g), ssig2(g), csig2(g), epsi(g), ...
+ somg12(g), comg12(g)] = ...
Lambda12(sbet1(g), cbet1(g), dn1(g), ...
sbet2(g), cbet2(g), dn2(g), ...
- salp1(g), calp1(g), f, A3x, C3x);
- v = v - lam12;
- g = g & ~(tripb | ~(abs(v) >= ((tripn * 6) + 2) * tol0));
+ salp1(g), calp1(g), slam12(g), clam12(g), f, A3x, C3x);
+ g = g & ~(tripb | ~(abs(v) >= ((tripn * 7) + 1) * tol0));
if ~any(g), break, end
c = g & v > 0;
@@ -250,7 +254,6 @@ function [s12, azi1, azi2, S12, m12, M12, M21, a12] = geoddistance ...
m12(g) = m12(g) * b;
s12(g) = s12(g) * b;
- omg12(g) = lam12(g) - omg12(g);
end
end
@@ -273,12 +276,17 @@ function [s12, azi1, azi2, S12, m12, M12, M21, a12] = geoddistance ...
S12 = A4 .* (B42 - B41);
S12(calp0 == 0 | salp0 == 0) = 0;
- l = ~m & omg12 < 0.75 * pi & sbet2 - sbet1 < 1.75;
+ l = ~m & somg12 > 1;
+ [somg12, comg12] = norm2(somg12, comg12);
+ somg12(l) = sin(omg12(l)); comg12(l) = cos(omg12(l));
+
+ l = ~m & comg12 > -0.7071 & sbet2 - sbet1 < 1.75;
alp12 = Z;
- somg12 = sin(omg12(l)); domg12 = 1 + cos(omg12(l));
+ domg12 = 1 + comg12(l);
dbet1 = 1 + cbet1(l); dbet2 = 1 + cbet2(l);
- alp12(l) = 2 * atan2(somg12 .* (sbet1(l) .* dbet2 + sbet2(l) .* dbet1), ...
- domg12 .* (sbet1(l) .* sbet2(l) + dbet1 .* dbet2));
+ alp12(l) = 2 * ...
+ atan2(somg12(l) .* (sbet1(l) .* dbet2 + sbet2(l) .* dbet1), ...
+ domg12 .* (sbet1(l) .* sbet2(l) + dbet1 .* dbet2));
l = ~l;
salp12 = salp2(l) .* calp1(l) - calp2(l) .* salp1(l);
calp12 = calp2(l) .* calp1(l) + salp2(l) .* salp1(l);
@@ -319,7 +327,8 @@ function [s12, azi1, azi2, S12, m12, M12, M21, a12] = geoddistance ...
end
function [sig12, salp1, calp1, salp2, calp2, dnm] = ...
- InverseStart(sbet1, cbet1, dn1, sbet2, cbet2, dn2, lam12, f, A3x)
+ InverseStart(sbet1, cbet1, dn1, sbet2, cbet2, dn2, ...
+ lam12, slam12, clam12, f, A3x)
%INVERSESTART Compute a starting point for Newton's method
N = length(sbet1);
@@ -344,7 +353,8 @@ function [sig12, salp1, calp1, salp2, calp2, dnm] = ...
sbetm2 = sbetm2 ./ (sbetm2 + (cbet1(s) + cbet2(s)).^2);
dnm(s) = sqrt(1 + ep2 * sbetm2);
omg12(s) = omg12(s) ./ (f1 * dnm(s));
- somg12 = sin(omg12); comg12 = cos(omg12);
+ somg12 = slam12; comg12 = clam12;
+ somg12(s) = sin(omg12(s)); comg12(s) = cos(omg12(s));
salp1 = cbet2 .* somg12;
t = cbet2 .* sbet1 .* somg12.^2;
@@ -366,12 +376,13 @@ function [sig12, salp1, calp1, salp2, calp2, dnm] = ...
s = ~(s | abs(n) > 0.1 | csig12 >= 0 | ssig12 >= 6 * abs(n) * pi * cbet1.^2);
if any(s)
+ lam12x = atan2(-slam12(s), -clam12(s));
if f >= 0
k2 = sbet1(s).^2 * ep2;
epsi = k2 ./ (2 * (1 + sqrt(1 + k2)) + k2);
lamscale = f * cbet1(s) .* A3f(epsi, A3x) * pi;
betscale = lamscale .* cbet1(s);
- x = (lam12(s) - pi) ./ lamscale;
+ x = lam12x ./ lamscale;
y = sbet12a(s) ./ betscale;
else
cbet12a = cbet2(s) .* cbet1(s) - sbet2(s) .* sbet1(s);
@@ -384,7 +395,7 @@ function [sig12, salp1, calp1, salp2, calp2, dnm] = ...
betscale = cvmgt(sbet12a(s) ./ min(-0.01, x), - f * cbet1(s).^2 * pi, ...
x < -0.01);
lamscale = betscale ./ cbet1(s);
- y = (lam12(s) - pi) ./ lamscale;
+ y = lam12x ./ lamscale;
end
k = Astroid(x, y);
str = y > -tol1 & x > -1 - xthresh;
@@ -455,8 +466,10 @@ function k = Astroid(x, y)
end
function [lam12, dlam12, ...
- salp2, calp2, sig12, ssig1, csig1, ssig2, csig2, epsi, domg12] = ...
- Lambda12(sbet1, cbet1, dn1, sbet2, cbet2, dn2, salp1, calp1, f, A3x, C3x)
+ salp2, calp2, sig12, ssig1, csig1, ssig2, csig2, epsi, ...
+ somg12, comg12] = ...
+ Lambda12(sbet1, cbet1, dn1, sbet2, cbet2, dn2, salp1, calp1, ...
+ slam120, clam120, f, A3x, C3x)
%LAMBDA12 Solve the hybrid problem
tiny = sqrt(realmin);
@@ -486,16 +499,16 @@ function [lam12, dlam12, ...
sig12 = atan2(0 + max(0, csig1 .* ssig2 - ssig1 .* csig2), ...
csig1 .* csig2 + ssig1 .* ssig2);
- omg12 = atan2(0 + max(0, comg1 .* somg2 - somg1 .* comg2), ...
- comg1 .* comg2 + somg1 .* somg2);
+ somg12 = 0 + max(0, comg1 .* somg2 - somg1 .* comg2);
+ comg12 = comg1 .* comg2 + somg1 .* somg2;
+ eta = atan2(somg12 .* clam120 - comg12 .* slam120, ...
+ comg12 .* clam120 + somg12 .* slam120);
k2 = calp0.^2 * ep2;
epsi = k2 ./ (2 * (1 + sqrt(1 + k2)) + k2);
Ca = C3f(epsi, C3x);
B312 = SinCosSeries(true, ssig2, csig2, Ca) - ...
SinCosSeries(true, ssig1, csig1, Ca);
- h0 = -f * A3f(epsi, A3x);
- domg12 = salp0 .* h0 .* (sig12 + B312);
- lam12 = omg12 + domg12;
+ lam12 = eta - f * A3f(epsi, A3x) .* salp0 .* (sig12 + B312);
[~, dlam12] = ...
Lengths(epsi, sig12, ...
diff --git a/matlab/geographiclib/geoddoc.m b/matlab/geographiclib/geoddoc.m
index 182dd8c..4e70889 100644
--- a/matlab/geographiclib/geoddoc.m
+++ b/matlab/geographiclib/geoddoc.m
@@ -8,14 +8,14 @@ function geoddoc
% C. F. F. Karney, Algorithms for geodesics,
% J. Geodesy 87, 43-55 (2013);
% https://dx.doi.org/10.1007/s00190-012-0578-z
-% Addenda: http://geographiclib.sf.net/geod-addenda.html
+% Addenda: http://geographiclib.sourceforge.net/geod-addenda.html
%
% which, in turn, is based on the classic solution of the geodesic
% problems pioneered by Legendre (1806), Bessel (1825), and Helmert
% (1880). Links for these and other original papers on geodesics are
% given in
%
-% http://geographiclib.sf.net/geodesic-papers/biblio.html
+% http://geographiclib.sourceforge.net/geodesic-papers/biblio.html
%
% The shortest path between two points on the ellipsoid at (lat1, lon1)
% and (lat2, lon2) is called the geodesic. Its length is s12 and the
diff --git a/matlab/geographiclib/geodreckon.m b/matlab/geographiclib/geodreckon.m
index b196dbd..635ef6f 100644
--- a/matlab/geographiclib/geodreckon.m
+++ b/matlab/geographiclib/geodreckon.m
@@ -51,7 +51,7 @@ function [lat2, lon2, azi2, S12, m12, M12, M21, a12_s12] = geodreckon ...
% C. F. F. Karney, Algorithms for geodesics,
% J. Geodesy 87, 43-55 (2013);
% https://dx.doi.org/10.1007/s00190-012-0578-z
-% Addenda: http://geographiclib.sf.net/geod-addenda.html
+% Addenda: http://geographiclib.sourceforge.net/geod-addenda.html
%
% This function duplicates some of the functionality of the RECKON
% function in the MATLAB mapping toolbox. Differences are
@@ -67,7 +67,7 @@ function [lat2, lon2, azi2, S12, m12, M12, M21, a12_s12] = geodreckon ...
% See also GEODDOC, GEODDISTANCE, GEODAREA, GEODESICDIRECT, GEODESICLINE,
% DEFAULTELLIPSOID.
-% Copyright (c) Charles Karney (2012-2015) <charles at karney.com>.
+% Copyright (c) Charles Karney (2012-2016) <charles at karney.com>.
%
% This is a straightforward transcription of the C++ implementation in
% GeographicLib and the C++ source should be consulted for additional
@@ -113,7 +113,7 @@ function [lat2, lon2, azi2, S12, m12, M12, M21, a12_s12] = geodreckon ...
tiny = sqrt(realmin);
a = ellipsoid(1);
- e2 = ellipsoid(2)^2;
+ e2 = real(ellipsoid(2)^2);
f = e2 / (1 + sqrt(1 - e2));
f1 = 1 - f;
ep2 = e2 / (1 - e2);
@@ -191,7 +191,7 @@ function [lat2, lon2, azi2, S12, m12, M12, M21, a12_s12] = geodreckon ...
somg2 = salp0 .* ssig2; comg2 = csig2;
salp2 = salp0; calp2 = calp0 .* csig2;
if long_unroll
- E = 1 - 2*(salp0 < 0);
+ E = copysignx(1, salp0);
omg12 = E .* (sig12 ...
- (atan2( ssig2, csig2) - atan2( ssig1, csig1)) ...
+ (atan2(E.*somg2, comg2) - atan2(E.*somg1, comg1)));
@@ -253,8 +253,6 @@ function [lat2, lon2, azi2, S12, m12, M12, M21, a12_s12] = geodreckon ...
s = calp0 == 0 | salp0 == 0;
salp12(s) = salp2(s) .* calp1(s) - calp2(s) .* salp1(s);
calp12(s) = calp2(s) .* calp1(s) + salp2(s) .* salp1(s);
- s = s & salp12 == 0 & calp12 < 0;
- salp12(s) = tiny * calp1(s); calp12(s) = -1;
if e2 ~= 0
c2 = (a^2 + b^2 * eatanhe(1, e2) / e2) / 2;
else
diff --git a/matlab/geographiclib/geographiclib_test.m b/matlab/geographiclib/geographiclib_test.m
index c975738..f1b3b43 100644
--- a/matlab/geographiclib/geographiclib_test.m
+++ b/matlab/geographiclib/geographiclib_test.m
@@ -24,6 +24,9 @@ function geographiclib_test
i = GeodSolve28; if i, n=n+1; fprintf('GeodSolve28 fail: %d\n', i); end
i = GeodSolve33; if i, n=n+1; fprintf('GeodSolve33 fail: %d\n', i); end
i = GeodSolve55; if i, n=n+1; fprintf('GeodSolve55 fail: %d\n', i); end
+ i = GeodSolve59; if i, n=n+1; fprintf('GeodSolve59 fail: %d\n', i); end
+ i = GeodSolve61; if i, n=n+1; fprintf('GeodSolve61 fail: %d\n', i); end
+ i = GeodSolve73; if i, n=n+1; fprintf('GeodSolve73 fail: %d\n', i); end
i = Planimeter0; if i, n=n+1; fprintf('Planimeter0 fail: %d\n', i); end
i = Planimeter5; if i, n=n+1; fprintf('Planimeter5 fail: %d\n', i); end
i = Planimeter6; if i, n=n+1; fprintf('Planimeter6 fail: %d\n', i); end
@@ -401,6 +404,35 @@ function n = GeodSolve55
n = n + assertNaN(s12);
end
+function n = GeodSolve59
+% Check for points close with longitudes close to 180 deg apart.
+ n = 0;
+ [s12, azi1, azi2] = geoddistance(5, 0.00000000000001, 10, 180);
+ n = n + assertEquals(azi1, 0.000000000000035, 1.5e-14);
+ n = n + assertEquals(azi2, 179.99999999999996, 1.5e-14);
+ n = n + assertEquals(s12, 18345191.174332713, 2.5e-9);
+end
+
+function n = GeodSolve61
+% Make sure small negative azimuths are west-going
+ n = 0;
+ [lat2, lon2, azi2] = geodreckon(45, 0, 1e7, -0.000000000000000003, 2);
+ n = n + assertEquals(lat2, 45.30632, 0.5e-5);
+ n = n + assertEquals(lon2, -180, 0.5e-5);
+ n = n + assertEquals(azi2, -180, 0.5e-5);
+end
+
+function n = GeodSolve73
+% Check for backwards from the pole bug reported by Anon on 2016-02-13.
+% This only affected the Java implementation. It was introduced in Java
+% version 1.44 and fixed in 1.46-SNAPSHOT on 2016-01-17.
+ n = 0;
+ [lat2, lon2, azi2] = geodreckon(90, 10, -1e6, 180);
+ n = n + assertEquals(lat2, 81.04623, 0.5e-5);
+ n = n + assertEquals(lon2, -170, 0.5e-5);
+ n = n + assertEquals(azi2, 0, 0.5e-5);
+end
+
function n = Planimeter0
% Check fix for pole-encircling bug found 2011-03-16
n = 0;
diff --git a/matlab/geographiclib/geoid_height.m b/matlab/geographiclib/geoid_height.m
index d495b40..fb395c4 100644
--- a/matlab/geographiclib/geoid_height.m
+++ b/matlab/geographiclib/geoid_height.m
@@ -52,7 +52,7 @@ function N = geoid_height(lat, lon, geoidname, geoiddir)
% Information on downloading and installing the data for the supported
% geoid models is available at
%
-% http://geographiclib.sf.net/html/geoid.html#geoidinst
+% http://geographiclib.sourceforge.net/html/geoid.html#geoidinst
%
% GEOID_HEIGHT uses cubic interpolation on gridded data that has been
% quantized at a resolution of 3mm.
diff --git a/matlab/geographiclib/geoid_load.m b/matlab/geographiclib/geoid_load.m
index 7c05622..cc1a72e 100644
--- a/matlab/geographiclib/geoid_load.m
+++ b/matlab/geographiclib/geoid_load.m
@@ -48,7 +48,7 @@ function geoid = geoid_load(name, dir)
% Information on downloading and installing the data for the supported
% geoid models is available at
%
-% http://geographiclib.sf.net/html/geoid.html#geoidinst
+% http://geographiclib.sourceforge.net/html/geoid.html#geoidinst
%
% See also GEOID_HEIGHT.
diff --git a/matlab/geographiclib/gereckon.m b/matlab/geographiclib/gereckon.m
index 554c663..c373180 100644
--- a/matlab/geographiclib/gereckon.m
+++ b/matlab/geographiclib/gereckon.m
@@ -47,7 +47,7 @@ function [lat2, lon2, azi2, S12] = gereckon(lat1, lon1, s12, azi1, ellipsoid)
Z = zeros(prod(S),1);
a = ellipsoid(1);
- e2 = ellipsoid(2)^2;
+ e2 = real(ellipsoid(2)^2);
f = e2 / (1 + sqrt(1 - e2));
f1 = 1 - f;
diff --git a/matlab/geographiclib/gnomonic_fwd.m b/matlab/geographiclib/gnomonic_fwd.m
index 9bcee75..85226ed 100644
--- a/matlab/geographiclib/gnomonic_fwd.m
+++ b/matlab/geographiclib/gnomonic_fwd.m
@@ -35,7 +35,7 @@ function [x, y, azi, rk] = gnomonic_fwd(lat0, lon0, lat, lon, ellipsoid)
% C. F. F. Karney, Algorithms for geodesics,
% J. Geodesy 87, 43-55 (2013);
% https://dx.doi.org/10.1007/s00190-012-0578-z
-% Addenda: http://geographiclib.sf.net/geod-addenda.html
+% Addenda: http://geographiclib.sourceforge.net/geod-addenda.html
%
% which also includes methods for solving the "intersection" and
% "interception" problems using the gnomonic projection.
diff --git a/matlab/geographiclib/gnomonic_inv.m b/matlab/geographiclib/gnomonic_inv.m
index 11cff3a..cf76983 100644
--- a/matlab/geographiclib/gnomonic_inv.m
+++ b/matlab/geographiclib/gnomonic_inv.m
@@ -36,7 +36,7 @@ function [lat, lon, azi, rk] = gnomonic_inv(lat0, lon0, x, y, ellipsoid)
% C. F. F. Karney, Algorithms for geodesics,
% J. Geodesy 87, 43-55 (2013);
% https://dx.doi.org/10.1007/s00190-012-0578-z
-% Addenda: http://geographiclib.sf.net/geod-addenda.html
+% Addenda: http://geographiclib.sourceforge.net/geod-addenda.html
%
% which also includes methods for solving the "intersection" and
% "interception" problems using the gnomonic projection.
diff --git a/matlab/geographiclib/polarst_fwd.m b/matlab/geographiclib/polarst_fwd.m
index 30c6ab3..8045a31 100644
--- a/matlab/geographiclib/polarst_fwd.m
+++ b/matlab/geographiclib/polarst_fwd.m
@@ -39,7 +39,7 @@ function [x, y, gam, k] = polarst_fwd(isnorth, lat, lon, ellipsoid)
overflow = 1/eps^2;
a = ellipsoid(1);
- e2 = ellipsoid(2)^2;
+ e2 = real(ellipsoid(2)^2);
e2m = 1 - e2;
c = sqrt(e2m) * exp(eatanhe(1, e2));
diff --git a/matlab/geographiclib/polarst_inv.m b/matlab/geographiclib/polarst_inv.m
index d4d1729..dbf271b 100644
--- a/matlab/geographiclib/polarst_inv.m
+++ b/matlab/geographiclib/polarst_inv.m
@@ -38,7 +38,7 @@ function [lat, lon, gam, k] = polarst_inv(isnorth, x, y, ellipsoid)
end
a = ellipsoid(1);
- e2 = ellipsoid(2)^2;
+ e2 = real(ellipsoid(2)^2);
e2m = 1 - e2;
c = sqrt(e2m) * exp(eatanhe(1, e2));
diff --git a/matlab/geographiclib/private/AngDiff.m b/matlab/geographiclib/private/AngDiff.m
index 6b2c420..9f9b6a9 100644
--- a/matlab/geographiclib/private/AngDiff.m
+++ b/matlab/geographiclib/private/AngDiff.m
@@ -1,12 +1,11 @@
-function d = AngDiff(x, y)
+function [d, e] = AngDiff(x, y)
%ANGDIFF Compute angle difference accurately
%
-% d = ANGDIFF(x, y) computes y - x, reduces the result to (-180,180] and
-% rounds the result. x and y must be in [-180,180]. x and y can be any
-% compatible shapes.
+% [d, e] = ANGDIFF(x, y) computes z = y - x, reduced to (-180,180]. d =
+% round(z) and e = z - round(z). x and y can be any compatible shapes.
[d, t] = sumx(AngNormalize(x), AngNormalize(-y));
d = - AngNormalize(d);
d(d == 180 & t < 0) = -180;
- d = d - t;
+ [d, e] = sumx(d, -t);
end
diff --git a/matlab/geographiclib/private/AngRound.m b/matlab/geographiclib/private/AngRound.m
index 4ce7aa3..8f76deb 100644
--- a/matlab/geographiclib/private/AngRound.m
+++ b/matlab/geographiclib/private/AngRound.m
@@ -7,5 +7,6 @@ function y = AngRound(x)
z = 1/16;
y = abs(x);
y(y < z) = z - (z - y(y < z));
- y(x < 0) = 0 - y(x < 0);
+ y(x < 0) = -y(x < 0);
+ y(x == 0) = 0;
end
diff --git a/matlab/geographiclib/private/cbrtx.m b/matlab/geographiclib/private/cbrtx.m
index e15c0ed..143457a 100644
--- a/matlab/geographiclib/private/cbrtx.m
+++ b/matlab/geographiclib/private/cbrtx.m
@@ -4,6 +4,14 @@ function y = cbrtx(x)
% CBRTX(x) is the real cube root of x (assuming x is real). x
% can be any shape.
- y = abs(x).^(1/3);
- y(x < 0) = -y(x < 0);
+ persistent octavep
+ if isempty(octavep)
+ octavep = exist('OCTAVE_VERSION', 'builtin') ~= 0;
+ end
+ if octavep
+ y = cbrt(x);
+ else
+ y = abs(x).^(1/3);
+ y(x < 0) = -y(x < 0);
+ end
end
diff --git a/matlab/geographiclib/private/copysignx.m b/matlab/geographiclib/private/copysignx.m
new file mode 100644
index 0000000..6fa27a0
--- /dev/null
+++ b/matlab/geographiclib/private/copysignx.m
@@ -0,0 +1,18 @@
+function z = copysignx(x, y)
+%COPYSIGNX Copy the sign
+%
+% COPYSIGNX(x,y) returns the magnitude of x with the sign of y. x and y
+% can be any compatible shapes.
+
+ persistent octavep
+ if isempty(octavep)
+ octavep = exist('OCTAVE_VERSION', 'builtin') ~= 0;
+ end
+ if octavep
+ z = abs(x) .* (1 - 2 * signbit(y));
+ else
+ z = abs(x);
+ l = y < 0 | (y == 0 & 1/y < 0);
+ z(l) = -z(l);
+ end
+end
diff --git a/matlab/geographiclib/projdoc.m b/matlab/geographiclib/projdoc.m
index e79e3eb..c3b0776 100644
--- a/matlab/geographiclib/projdoc.m
+++ b/matlab/geographiclib/projdoc.m
@@ -27,7 +27,7 @@ function projdoc
% C. F. F. Karney, Algorithms for geodesics,
% J. Geodesy 87, 43-55 (2013);
% https://dx.doi.org/10.1007/s00190-012-0578-z
-% Addenda: http://geographiclib.sf.net/geod-addenda.html
+% Addenda: http://geographiclib.sourceforge.net/geod-addenda.html
%
% The parameters of the ellipsoid are specified by the optional ellipsoid
% argument to the routines. This is a two-element vector of the form
diff --git a/matlab/geographiclib/tranmerc_fwd.m b/matlab/geographiclib/tranmerc_fwd.m
index 6930c7b..b81e5e7 100644
--- a/matlab/geographiclib/tranmerc_fwd.m
+++ b/matlab/geographiclib/tranmerc_fwd.m
@@ -27,7 +27,7 @@ function [x, y, gam, k] = tranmerc_fwd(lat0, lon0, lat, lon, ellipsoid)
%
% C. F. F. Karney, Transverse Mercator with an accuracy of a few
% nanometers, J. Geodesy 85(8), 475-485 (Aug. 2011);
-% Addenda: http://geographiclib.sf.net/tm-addenda.html
+% Addenda: http://geographiclib.sourceforge.net/tm-addenda.html
%
% This extends the series given by Krueger (1912) to sixth order in the
% flattening. This is a substantially better series than that used by
@@ -56,8 +56,8 @@ function [x, y, gam, k] = tranmerc_fwd(lat0, lon0, lat, lon, ellipsoid)
maxpow = 6;
a = ellipsoid(1);
- f = ecc2flat(ellipsoid(2));
- e2 = f * (2 - f);
+ e2 = real(ellipsoid(2)^2);
+ f = e2 / (1 + sqrt(1 - e2));
e2m = 1 - e2;
cc = sqrt(e2m) * exp(eatanhe(1, e2));
n = f / (2 -f);
diff --git a/matlab/geographiclib/tranmerc_inv.m b/matlab/geographiclib/tranmerc_inv.m
index b08653e..6ca0abb 100644
--- a/matlab/geographiclib/tranmerc_inv.m
+++ b/matlab/geographiclib/tranmerc_inv.m
@@ -27,7 +27,7 @@ function [lat, lon, gam, k] = tranmerc_inv(lat0, lon0, x, y, ellipsoid)
%
% C. F. F. Karney, Transverse Mercator with an accuracy of a few
% nanometers, J. Geodesy 85(8), 475-485 (Aug. 2011);
-% Addenda: http://geographiclib.sf.net/tm-addenda.html
+% Addenda: http://geographiclib.sourceforge.net/tm-addenda.html
%
% This extends the series given by Krueger (1912) to sixth order in the
% flattening. This is a substantially better series than that used by
@@ -56,8 +56,8 @@ function [lat, lon, gam, k] = tranmerc_inv(lat0, lon0, x, y, ellipsoid)
maxpow = 6;
a = ellipsoid(1);
- f = ecc2flat(ellipsoid(2));
- e2 = f * (2 - f);
+ e2 = real(ellipsoid(2)^2);
+ f = e2 / (1 + sqrt(1 - e2));
e2m = 1 - e2;
cc = sqrt(e2m) * exp(eatanhe(1, e2));
n = f / (2 -f);
diff --git a/matlab/geographiclib/utmups_fwd.m b/matlab/geographiclib/utmups_fwd.m
index 22a0358..7f10db7 100644
--- a/matlab/geographiclib/utmups_fwd.m
+++ b/matlab/geographiclib/utmups_fwd.m
@@ -34,7 +34,7 @@ function [x, y, zone, isnorth, gam, k] = utmups_fwd(lat, lon, setzone)
% UPS: x and y in [1200 km, 2800 km] for northern hemisphere
% x and y in [700 km, 3300 km] for southern hemisphere
%
-% The ranges are 100 km more restrictive than for mgrs_fwd.
+% The ranges are 100 km less restrictive than for mgrs_fwd.
%
% UTMUPS_FWD checks its arguments and requires that lat is in
% [-90deg,90deg] and that (x,y) lie in the limits given above. If these
@@ -43,7 +43,7 @@ function [x, y, zone, isnorth, gam, k] = utmups_fwd(lat, lon, setzone)
%
% See also UTMUPS_INV, TRANMERC_FWD, POLARST_FWD, MGRS_FWD.
-% Copyright (c) Charles Karney (2015) <charles at karney.com>.
+% Copyright (c) Charles Karney (2015-2016) <charles at karney.com>.
narginchk(2, 3)
if nargin < 3, setzone = -1; end
diff --git a/matlab/geographiclib/utmups_inv.m b/matlab/geographiclib/utmups_inv.m
index 550ab79..36fc0a6 100644
--- a/matlab/geographiclib/utmups_inv.m
+++ b/matlab/geographiclib/utmups_inv.m
@@ -29,12 +29,14 @@ function [lat, lon, gam, k] = utmups_inv(x, y, zone, isnorth)
% UPS: x and y in [1200 km, 2800 km] for northern hemisphere
% x and y in [700 km, 3300 km] for southern hemisphere
%
+% The ranges are 100 km less restrictive than for mgrs_fwd.
+%
% UTMUPS_INV checks that (x,y) lie in the limits given above. If these
% conditions don't hold (lat,lon), gam, k are converted to NaN.
%
% See also UTMUPS_FWD, TRANMERC_INV, POLARST_INV, MGRS_INV.
-% Copyright (c) Charles Karney (2015) <charles at karney.com>.
+% Copyright (c) Charles Karney (2015-2016) <charles at karney.com>.
narginchk(4, 4)
try
diff --git a/maxima/geod.mac b/maxima/geod.mac
index 64a8565..5cd8325 100644
--- a/maxima/geod.mac
+++ b/maxima/geod.mac
@@ -10,7 +10,7 @@ References:
Charles F. F. Karney,
Algorithms for geodesics, J. Geodesy 87, 43-55 (2013),
https://dx.doi.org/10.1007/s00190-012-0578-z
- Addenda: http://geographiclib.sf.net/geod-addenda.html
+ Addenda: http://geographiclib.sourceforge.net/geod-addenda.html
There are 4 sections in this file
diff --git a/maxima/geodesic.mac b/maxima/geodesic.mac
index a5da9d7..5ec2fe5 100644
--- a/maxima/geodesic.mac
+++ b/maxima/geodesic.mac
@@ -1,7 +1,7 @@
/*
Solve the direct and inverse geodesic problems accurately.
-Copyright (c) Charles Karney (2013-2015) <charles at karney.com> and
+Copyright (c) Charles Karney (2013-2016) <charles at karney.com> and
licensed under the MIT/X11 License. For more information, see
http://geographiclib.sourceforge.net/
@@ -10,7 +10,7 @@ References:
Charles F. F. Karney,
Algorithms for geodesics, J. Geodesy 87, 43-55 (2013),
https://dx.doi.org/10.1007/s00190-012-0578-z
- Addenda: http://geographiclib.sf.net/geod-addenda.html
+ Addenda: http://geographiclib.sourceforge.net/geod-addenda.html
This program solves the geodesic problem either using series expansions
(exact : false) or using elliptic integrals (exact : true). Elliptic
@@ -101,7 +101,7 @@ documented at
*/
/* The corresponding version of GeographicLib */
-geod_version:[1,45,0]$
+geod_version:[1,46,0]$
/* Load series created by geod.mac (NEED TO UNCOMMENT THE LAST LINE OF
geod.mac TO GENERATE THIS FILE). */
@@ -173,20 +173,9 @@ C4coeff(n):=
NaN : 'nan )$
sq(x):=x^2$
-/*
-log1px(x):=block([y,z],
- y : 1 + x,
- z : y - 1,
- if z = 0b0 then x else x * log(y) / z)$
-
-atanhx(x):=block([y:abs(x)],
- y : log1px(2 * y/(1 - y))/2,
- if x < 0b0 then -y else y)$
-*/
-atanhx(x):=atanh(x)$
-hypotx(x, y):= sqrt(x * x + y * y)$
-atan2x(y,x) := -atan2(-y, x)$ /* fix atan2(0b0,-1b0) = -pi */
-
+hypotx(x, y):=sqrt(x * x + y * y)$
+copysign(x, y):=abs(x) *
+(if y < 0b0 or (y == 0b0 and atan2(y, -1b0) < 0b0) then -1 else 1)$
/*
pow(x,y):=x^y$
cbrtx(x) := block([y:pow(abs(x), 1/3b0)],
@@ -212,11 +201,12 @@ AngNormalize(x):=block([y:x-360b0*floor(x/360b0+0.5)],
AngDiff(x, y) := block([t,d,r:sumx(AngNormalize(x),AngNormalize(-y))],
d:-AngNormalize(r[1]), t:r[2],
- (if d = 180b0 and t < 0b0 then -180b0 else d) - t)$
+ sumx(if d = 180b0 and t < 0b0 then -180b0 else d, -t))$
AngRound(x) := block([z:1/16b0, y:abs(x)],
+ if x = 0b0 then return(x),
y : if y < z then z - (z - y) else y,
- if x < 0b0 then 0b0-y else y)$
+ if x < 0b0 then -y else y)$
sincosdx(x):=block([r,q:floor(x/90b0 + 0.5),s,c],
r:(x-q*90b0)*degree,
@@ -248,7 +238,7 @@ geod_init(a, f):= (a:bfloat(a),f:bfloat(f),
f1:1-f, e2:f*(2-f), ep2:e2/f1^2, n:f/(2-f), b:a*f1,
c2 : (sq(a) + sq(b) *
(if e2 = 0b0 then 1b0 else
- (if e2 > 0b0 then atanhx(sqrt(e2)) else atan(sqrt(-e2))) /
+ (if e2 > 0b0 then atanh(sqrt(e2)) else atan(sqrt(-e2))) /
sqrt(abs(e2))))/2, /* authalic radius squared */
/* The sig12 threshold for "really short". Using the auxiliary sphere
solution with dnm computed at (bet1 + bet2) / 2, the relative error in
@@ -472,12 +462,12 @@ geod_genposition(l, arcmode, s12_a12):=block(
somg2 : l[l_salp0] * ssig2, comg2 : csig2), /* No need to normalize */
/* tan(alp0) = cos(sig2)*tan(alp2) */
salp2 : l[l_salp0], calp2 : l[l_calp0] * csig2, /* No need to normalize */
- E : if l[l_salp0] < 0b0 then -1 else 1,
+ E : copysign(1b0, l[l_salp0]),
if not exact then
/* omg12 = omg2 - omg1 */
omg12 : E * (sig12
- - (atan2x( ssig2, csig2) - atan2x( l[l_ssig1], l[l_csig1]))
- + (atan2x(E*somg2, comg2) - atan2x(E*l[l_somg1], l[l_comg1]))),
+ - (atan2( ssig2, csig2) - atan2( l[l_ssig1], l[l_csig1]))
+ + (atan2(E*somg2, comg2) - atan2(E*l[l_somg1], l[l_comg1]))),
s12 : if arcmode then l[l_b] *
((if exact then l[l_E0] else (1 + l[l_A1m1])) * sig12 + AB1) else s12_a12,
if exact then block([somg2:l[l_salp0] * ssig2,
@@ -486,8 +476,8 @@ geod_genposition(l, arcmode, s12_a12):=block(
/* Without normalization we have schi2 = somg2. */
cchi2 : l[l_f1] * dn2 * comg2,
lam12 : E * (sig12
- - (atan2x( ssig2, csig2) - atan2x( l[l_ssig1], l[l_csig1]))
- + (atan2x(E*somg2, cchi2) - atan2x(E*l[l_somg1], l[l_cchi1]))) -
+ - (atan2( ssig2, csig2) - atan2( l[l_ssig1], l[l_csig1]))
+ + (atan2(E*somg2, cchi2) - atan2(E*l[l_somg1], l[l_cchi1]))) -
l[l_e2]/l[l_f1] * l[l_salp0] * l[l_H0] *
(sig12 + deltah(ssig2, csig2, dn2,
l[l_E][e_k2], l[l_E][e_alpha2], l[l_E][e_hc]) - l[l_H1] ) )
@@ -518,14 +508,7 @@ geod_genposition(l, arcmode, s12_a12):=block(
if l[l_calp0] = 0b0 or l[l_salp0] = 0b0 then (
/* alp12 = alp2 - alp1, used in atan2 so no need to normalize */
salp12 : salp2 * l[l_calp1] - calp2 * l[l_salp1],
- calp12 : calp2 * l[l_calp1] + salp2 * l[l_salp1],
- /* The right thing appears to happen if alp1 = +/-180 and alp2 = 0, viz
- salp12 = -0 and alp12 = -180. However this depends on the sign being
- attached to 0 correctly. The following ensures the correct
- behavior. */
- if salp12 = 0b0 and calp12 < 0b0 then (
- salp12 : tiny * l[l_calp1],
- calp12 : -1))
+ calp12 : calp2 * l[l_calp1] + salp2 * l[l_salp1])
else (
/* tan(alp) = tan(alp0) * sec(sig)
tan(alp2-alp1) = (tan(alp2) -tan(alp1)) / (tan(alp2)*tan(alp1)+1)
@@ -539,7 +522,7 @@ geod_genposition(l, arcmode, s12_a12):=block(
( if csig12 <= 0b0 then l[l_csig1] * (1 - csig12) + ssig12 * l[l_ssig1]
else ssig12 * (l[l_csig1] * ssig12 / (1 + csig12) + l[l_ssig1])),
calp12 : sq(l[l_salp0]) + sq(l[l_calp0]) * l[l_csig1] * csig2),
- S12 : l[l_c2] * atan2x(salp12, calp12) + l[l_A4] * (B42 - l[l_B41])),
+ S12 : l[l_c2] * atan2(salp12, calp12) + l[l_A4] * (B42 - l[l_B41])),
[if arcmode then s12_a12 else sig12 / degree,
lat2, lon2, azi2, s12, m12, M12, M21, S12])$
@@ -556,11 +539,11 @@ geod_direct(g, lat1, lon1, azi1, s12):=
geod_geninverse(g, lat1, lon1, lat2, lon2):=block(
[s12 : 0b0, azi1 : 0b0, azi2 : 0b0,
m12 : 0b0, M12 : 0b0, M21 : 0b0, S12 : 0b0,
- lon12, latsign, lonsign, swapp,
+ lon12, lon12s, latsign, lonsign, swapp,
sbet1, cbet1, sbet2, cbet2, s12x : 0b0, m12x : 0b0,
dn1, dn2, lam12, slam12, clam12,
a12 : 0b0, sig12, calp1 : 0b0, salp1 : 0b0, calp2 : 0b0, salp2 : 0b0,
- meridian, omg12 : 0b0,
+ meridian, omg12 : 0b0, somg12 : 2b0, comg12,
/* Initialize for the meridian. No longitude calculation is done in this
case to let the parameter default to 0. */
E : Ef(-g[g_ep2], 0b0)],
@@ -569,12 +552,15 @@ geod_geninverse(g, lat1, lon1, lat2, lon2):=block(
/* Compute longitude difference (AngDiff does this carefully). Result is
in [-180, 180] but -180 is only for west-going geodesics. 180 is for
east-going and meridional geodesics. */
- lon12 : AngDiff(lon1, lon2),
- /* If very close to being on the same half-meridian, then make it so. */
- lon12 : AngRound(lon12),
+ lon12 : AngDiff(lon1, lon2), lon12s:lon12[2], lon12:lon12[1],
/* Make longitude difference positive. */
lonsign : if lon12 >= 0b0 then 1 else -1,
- lon12 : lon12 * lonsign,
+ /* If very close to being on the same half-meridian, then make it so. */
+ lon12 : lonsign * AngRound(lon12),
+ lon12s : AngRound((180 - lon12) - lonsign * lon12s),
+ lam12 : lon12 * degree,
+ if lon12 > 90 then block([t:sincosdx(lon12s)], slam12:t[1], clam12:-t[2])
+ else block([t:sincosdx(lon12)], slam12:t[1], clam12:t[2]),
/* If really close to the equator, treat as on equator. */
lat1 : AngRound(lat1),
lat2 : AngRound(lat2),
@@ -615,8 +601,6 @@ geod_geninverse(g, lat1, lon1, lat2, lon2):=block(
else ( if abs(sbet2) = -sbet1 then cbet2 : cbet1 ),
dn1 : sqrt(1 + g[g_ep2] * sq(sbet1)),
dn2 : sqrt(1 + g[g_ep2] * sq(sbet2)),
- lam12 : lon12 * degree,
- block([t:sincosdx(lon12)], slam12:t[1], clam12:t[2]),
meridian : is(lat1 = -90b0 or slam12 = 0b0),
if meridian then block(
/* Endpoints are on a single full meridian, so the geodesic might lie on
@@ -628,7 +612,7 @@ geod_geninverse(g, lat1, lon1, lat2, lon2):=block(
ssig1 : sbet1, csig1 : calp1 * cbet1,
ssig2 : sbet2, csig2 : calp2 * cbet2,
/* sig12 = sig2 - sig1 */
- sig12 : atan2x(0b0 + max(0b0, csig1 * ssig2 - ssig1 * csig2),
+ sig12 : atan2(0b0 + max(0b0, csig1 * ssig2 - ssig1 * csig2),
csig1 * csig2 + ssig1 * ssig2),
block([r],
r:Lengths(g, g[g_n], E, sig12, ssig1, csig1, dn1, ssig2, csig2, dn2,
@@ -650,7 +634,7 @@ geod_geninverse(g, lat1, lon1, lat2, lon2):=block(
if not meridian and
sbet1 = 0b0 and /* and sbet2 == 0 */
/* Mimic the way Lambda12 works with calp1 = 0 */
- (g[g_f] <= 0b0 or lam12 <= pi - g[g_f] * pi) then (
+ (g[g_f] <= 0b0 or lon12s >= g[g_f] * 180) then (
/* Geodesic runs along equator */
calp1 : calp2 : 0b0, salp1 : salp2 : 1b0,
s12x : g[g_a] * lam12,
@@ -663,7 +647,8 @@ geod_geninverse(g, lat1, lon1, lat2, lon2):=block(
meridian and geodesic is neither meridional or equatorial.
Figure a starting point for Newton's method */
block([r],
- r : InverseStart(g, sbet1, cbet1, dn1, sbet2, cbet2, dn2, lam12),
+ r : InverseStart(g, sbet1, cbet1, dn1, sbet2, cbet2, dn2,
+ lam12, slam12, clam12),
sig12:r[1], salp1:r[2], calp1:r[3], salp2:r[4], calp2:r[5],
dnm:r[6]),
if sig12 >= 0b0 then (
@@ -697,14 +682,15 @@ geod_geninverse(g, lat1, lon1, lat2, lon2):=block(
WGS84 and random input: mean = 2.85, sd = 0.60 */
block([r],
r : Lambda12(g, sbet1, cbet1, dn1, sbet2, cbet2, dn2, salp1, calp1,
- is(numit < maxit1)),
- v : r[1] - lam12,
+ slam12, clam12, is(numit < maxit1)),
+ v : r[1],
salp2:r[2], calp2:r[3], sig12:r[4],
ssig1:r[5], csig1:r[6], ssig2:r[7], csig2:r[8],
- if exact then E:r[9] else eps:r[9], omg12:r[10], dv:r[11]),
+ if exact then E:r[9] else eps:r[9], somg12:r[10], comg12:r[11],
+ dv:r[12]),
/* 2 * tol0 is approximately 1 ulp for a number in [0, pi]. */
/* Reversed test to allow escape with NaNs */
- if tripb or not(abs(v) >= (if tripn then 8 else 2) * tol0) then
+ if tripb or not(abs(v) >= (if tripn then 8 else 1) * tol0) then
return(true),
/* Update bracketing values */
if v > 0b0 and (numit > maxit1 or calp1/salp1 > calp1b/salp1b)
@@ -746,10 +732,9 @@ geod_geninverse(g, lat1, lon1, lat2, lon2):=block(
s12x:r[1], m12x:r[2], M12:r[4], M21:r[5]),
m12x : m12x * g[g_b],
s12x : s12x * g[g_b],
- a12 : sig12 / degree,
- if not exact then omg12 : lam12 - omg12 ) ),
+ a12 : sig12 / degree ) ),
s12 : 0b0 + s12x, /* Convert -0 to 0 */
- m12 : 0b0 + m12x, /* Convert -0 to 0 */
+ m12 : 0b0 + m12x, /* Convert -0 to 0 */
block(
/* From Lambda12: sin(alp1) * cos(bet1) = sin(alp0) */
[ salp0 : salp1 * cbet1,
@@ -771,15 +756,18 @@ geod_geninverse(g, lat1, lon1, lat2, lon2):=block(
B42 : SinCosSeries(false, ssig2, csig2, Ca),
S12 : A4 * (B42 - B41))
else S12 : 0, /* Avoid problems with indeterminate sig1, sig2 on equator */
+ if not meridian then (
+ if somg12 > 1 then (somg12 : sin(omg12), comg12 : cos(omg12))
+ else block([t:norm2(somg12, comg12)], somg12:t[1], comg12:t[2])),
if not meridian and
- omg12 < 0.75b0 * pi and /* Long difference too big */
- sbet2 - sbet1 < 1.75b0 then block( /* Lat difference too big */
+ /* omg12 < 3/4 * pi */
+ comg12 > -0.7071b0 and /* Long difference not too big */
+ sbet2 - sbet1 < 1.75b0 then block( /* Lat difference not too big */
/* Use tan(Gamma/2) = tan(omg12/2)
* (tan(bet1/2)+tan(bet2/2))/(1+tan(bet1/2)*tan(bet2/2))
with tan(x/2) = sin(x)/(1+cos(x)) */
- [somg12 : sin(omg12), domg12 : 1 + cos(omg12),
- dbet1 : 1 + cbet1, dbet2 : 1 + cbet2],
- alp12 : 2 * atan2x( somg12 * ( sbet1 * dbet2 + sbet2 * dbet1 ),
+ [domg12 : 1 + comg12, dbet1 : 1 + cbet1, dbet2 : 1 + cbet2],
+ alp12 : 2 * atan2( somg12 * ( sbet1 * dbet2 + sbet2 * dbet1 ),
domg12 * ( sbet1 * sbet2 + dbet1 * dbet2 ) ))
else block(
/* alp12 = alp2 - alp1, used in atan2 so no need to normalize */
@@ -792,7 +780,7 @@ geod_geninverse(g, lat1, lon1, lat2, lon2):=block(
if salp12 = 0b0 and calp12 < 0b0 then (
salp12 : tiny * calp1,
calp12 : -1b0),
- alp12 : atan2x(salp12, calp12) ),
+ alp12 : atan2(salp12, calp12) ),
S12 : S12 + g[g_c2] * alp12,
S12 : S12 * swapp * lonsign * latsign,
/* Convert -0 to 0 */
@@ -899,7 +887,7 @@ Astroid(x, y):= block(
u : u + T + (if T # 0b0 then r2 / T else 0b0))
else block(
/* T is complex, but the way u is defined the result is real. */
- [ang : atan2x(sqrt(-disc), -(S + r3))],
+ [ang : atan2(sqrt(-disc), -(S + r3))],
/* There are three possible cube roots. We choose the root which
avoids cancellation. Note that disc < 0 implies that r < 0. */
u : u + 2 * r * cos(ang / 3)),
@@ -917,7 +905,8 @@ Astroid(x, y):= block(
k)$
/* Return [sig12, salp1, calp1, salp2, calp2, dnm] */
-InverseStart(g, sbet1, cbet1, dn1, sbet2, cbet2, dn2, lam12):=block(
+InverseStart(g, sbet1, cbet1, dn1, sbet2, cbet2, dn2,
+ lam12, slam12, clam12):=block(
[ salp1 : 0b0, calp1 : 0b0, salp2 : 0b0, calp2 : 0b0, dnm : 0b0,
/* Return a starting point for Newton's method in salp1 and calp1 (function
value is -1). If Newton's method doesn't need to be used, return also
@@ -927,16 +916,16 @@ InverseStart(g, sbet1, cbet1, dn1, sbet2, cbet2, dn2, lam12):=block(
sbet12 : sbet2 * cbet1 - cbet2 * sbet1,
cbet12 : cbet2 * cbet1 + sbet2 * sbet1,
sbet12a : sbet2 * cbet1 + cbet2 * sbet1,
- shortline, omg12, somg12, comg12, ssig12, csig12, E:[]],
+ shortline, somg12, comg12, ssig12, csig12, E:[]],
shortline : is(cbet12 >= 0b0 and sbet12 < 0.5b0 and cbet2 * lam12 < 0.5b0),
- omg12 : lam12,
- if shortline then block([sbetm2 : sq(sbet1 + sbet2)],
+ if shortline then block([sbetm2 : sq(sbet1 + sbet2), omg12],
/* sin((bet1+bet2)/2)^2
* = (sbet1 + sbet2)^2 / ((sbet1 + sbet2)^2 + (cbet1 + cbet2)^2) */
sbetm2 : sbetm2 / (sbetm2 + sq(cbet1 + cbet2)),
dnm : sqrt(1 + g[g_ep2] * sbetm2),
- omg12 : omg12 / (g[g_f1] * dnm)),
- somg12 : sin(omg12), comg12 : cos(omg12),
+ omg12 : lam12 / (g[g_f1] * dnm),
+ somg12 : sin(omg12), comg12 : cos(omg12))
+ else (somg12 : slam12, comg12 : clam12),
salp1 : cbet2 * somg12,
calp1 : if comg12 >= 0b0
then sbet12 + cbet2 * sbet1 * sq(somg12) / (1 + comg12)
@@ -950,7 +939,7 @@ InverseStart(g, sbet1, cbet1, dn1, sbet2, cbet2, dn2, lam12):=block(
(if comg12 >= 0 then sq(somg12) / (1 + comg12) else 1 - comg12),
block([t:norm2(salp2, calp2)], salp2:t[1], calp2:t[2]),
/* Set return value */
- sig12 : atan2x(ssig12, csig12))
+ sig12 : atan2(ssig12, csig12))
else if abs(g[g_n]) > 0.1b0 or /* No astroid calc if too eccentric */
csig12 >= 0 or
ssig12 >= 6 * abs(g[g_n]) * pi * sq(cbet1) then true
@@ -958,7 +947,8 @@ InverseStart(g, sbet1, cbet1, dn1, sbet2, cbet2, dn2, lam12):=block(
else block(
/* Scale lam12 and bet2 to x, y coordinate system where antipodal point
is at origin and singular point is at y = 0, x = -1. */
- [y, lamscale, betscale,x],
+ [y, lamscale, betscale,x, lam12x],
+ lam12x : atan2(-slam12, -clam12), /* lam12 - pi */
if g[g_f] >= 0 then ( /* In fact f == 0 does not get here */
/* x = dlong, y = dlat */
if exact then block([k2 : sq(sbet1) * g[g_ep2]],
@@ -968,12 +958,12 @@ InverseStart(g, sbet1, cbet1, dn1, sbet2, cbet2, dn2, lam12):=block(
eps : k2 / (2 * (1 + sqrt(1 + k2)) + k2),
lamscale : g[g_f] * cbet1 * A3f(g, eps) * pi),
betscale : lamscale * cbet1,
- x : (lam12 - pi) / lamscale,
+ x : lam12x / lamscale,
y : sbet12a / betscale)
else block( /* f < 0 */
/* x = dlat, y = dlong */
[cbet12a : cbet2 * cbet1 - sbet2 * sbet1,bet12a,m12b, m0],
- bet12a : atan2x(sbet12a, cbet12a),
+ bet12a : atan2(sbet12a, cbet12a),
/* In the case of lon12 = 180, this repeats a calculation made in
* Inverse. */
block([r],
@@ -985,7 +975,7 @@ InverseStart(g, sbet1, cbet1, dn1, sbet2, cbet2, dn2, lam12):=block(
betscale : if x < -0.01b0 then sbet12a / x else
-g[g_f] * sq(cbet1) * pi,
lamscale : betscale / cbet1,
- y : (lam12 - pi) / lamscale),
+ y : lam12x / lamscale),
if y > -tol1 and x > -1 - xthresh then (
/* strip near cut */
if g[g_f] >= 0b0 then (
@@ -1038,13 +1028,14 @@ InverseStart(g, sbet1, cbet1, dn1, sbet2, cbet2, dn2, lam12):=block(
/* Return [lam12, salp2, calp2, sig12, ssig1, csig1, ssig2, csig2,
(E or eps), (omg12 or domg12), dlam12]
*/
-Lambda12(g, sbet1, cbet1, dn1, sbet2, cbet2, dn2, salp1, calp1, diffp):=
+Lambda12(g, sbet1, cbet1, dn1, sbet2, cbet2, dn2, salp1, calp1,
+ slam120, clam120, diffp):=
block([salp2 : 0b0, calp2 : 0b0, sig12 : 0b0,
ssig1 : 0b0, csig1 : 0b0, ssig2 : 0b0, csig2 : 0b0, eps : 0b0, E : [],
- domg12 : 0b0, dlam12 : 0b0,
+ somg12 : 0b0, comg12 : 0b0, dlam12 : 0b0,
salp0, calp0,
- somg1, comg1, somg2, comg2, cchi1, cchi2, omg12:0, lam12,
- B312, h0, k2, Ca],
+ somg1, comg1, somg2, comg2, cchi1, cchi2, lam12,
+ B312, k2, Ca, eta],
if sbet1 = 0b0 and calp1 = 0b0 then
/* Break degeneracy of equatorial line. This case has already been
handled. */
@@ -1084,27 +1075,31 @@ block([salp2 : 0b0, calp2 : 0b0, sig12 : 0b0,
block([t:norm2(ssig2, csig2)], ssig2:t[1], csig2:t[2]),
/* norm2(&somg2, &comg2); -- don't need to normalize! */
/* sig12 = sig2 - sig1, limit to [0, pi] */
- sig12 : atan2x(0b0 + max(0b0, csig1 * ssig2 - ssig1 * csig2),
+ sig12 : atan2(0b0 + max(0b0, csig1 * ssig2 - ssig1 * csig2),
csig1 * csig2 + ssig1 * ssig2),
/* omg12 = omg2 - omg1, limit to [0, pi] */
- omg12 : atan2x(0b0 + max(0b0, comg1 * somg2 - somg1 * comg2),
- comg1 * comg2 + somg1 * somg2),
+ somg12 : 0b0 + max(0b0, comg1 * somg2 - somg1 * comg2),
+ comg12 : comg1 * comg2 + somg1 * somg2,
k2 : sq(calp0) * g[g_ep2],
- if exact then block([chi12],
+ if exact then block([schi12,cchi12],
E : Ef(-k2, -g[g_ep2]),
- chi12 : atan2x(0b0 + max(0b0, cchi1 * somg2 - somg1 * cchi2),
- cchi1 * cchi2 + somg1 * somg2),
- lam12 : chi12 -
+ schi12 : 0b0 + max(0b0, cchi1 * somg2 - somg1 * cchi2),
+ cchi12 : cchi1 * cchi2 + somg1 * somg2,
+ /* eta = chi12 - lam120 */
+ eta : atan2(schi12 * clam120 - cchi12 * slam120,
+ cchi12 * clam120 + schi12 * slam120),
+ lam12 : eta -
g[g_e2]/g[g_f1] * salp0 * E[e_hc] / (pi/2) *
(sig12 + deltah(ssig2, csig2, dn2, E[e_k2], E[e_alpha2], E[e_hc]) -
deltah(ssig1, csig1, dn1, E[e_k2], E[e_alpha2], E[e_hc]) ) )
- else (eps : k2 / (2 * (1 + sqrt(1 + k2)) + k2),
+ else ( /* eta = omg12 - lam120 */
+ eta : atan2(somg12 * clam120 - comg12 * slam120,
+ comg12 * clam120 + somg12 * slam120),
+ eps : k2 / (2 * (1 + sqrt(1 + k2)) + k2),
Ca : C3f(g, eps),
B312 : (SinCosSeries(true, ssig2, csig2, Ca) -
SinCosSeries(true, ssig1, csig1, Ca)),
- h0 : -g[g_f] * A3f(g, eps),
- domg12 : salp0 * h0 * (sig12 + B312),
- lam12 : omg12 + domg12),
+ lam12 : eta - g[g_f] * A3f(g, eps) * salp0 * (sig12 + B312)),
if diffp then (
if calp2 = 0b0 then
dlam12 : - 2 * g[g_f1] * dn1 / sbet1
@@ -1114,7 +1109,7 @@ block([salp2 : 0b0, calp2 : 0b0, sig12 : 0b0,
dlam12:r[2]),
dlam12 : dlam12 * g[g_f1] / (calp2 * cbet2))),
[lam12, salp2, calp2, sig12, ssig1, csig1, ssig2, csig2,
- if exact then E else eps, if exact then omg12 else domg12, dlam12])$
+ if exact then E else eps, somg12, comg12, dlam12])$
A3f(g, eps):=block(
/* Evaluate sum(A3x[k] * eps^k, k, 0, nA3x-1) by Horner's method */
@@ -1161,7 +1156,7 @@ transit(lon1, lon2):=block([lon12],
/* Compute lon12 the same way as Geodesic::Inverse. */
lon1 : AngNormalize(lon1),
lon2 : AngNormalize(lon2),
- lon12 : AngDiff(lon1, lon2),
+ lon12 : AngDiff(lon1, lon2)[1],
if lon1 < 0b0 and lon2 >= 0b0 and lon12 > 0b0 then 1 else
(if lon2 < 0b0 and lon1 >= 0b0 and lon12 < 0b0 then -1 else 0))$
diff --git a/maxima/tm.mac b/maxima/tm.mac
index a6487c0..037f4cd 100644
--- a/maxima/tm.mac
+++ b/maxima/tm.mac
@@ -13,7 +13,7 @@ Reference:
J. Geodesy 85(8), 475-485 (Aug. 2011).
DOI 10.1007/s00190-011-0445-3
preprint http://arxiv.org/abs/1002.1417
- resource page http://geographiclib.sf.net/tm.html
+ resource page http://geographiclib.sourceforge.net/tm.html
The parameters for the transformation are set by
diff --git a/maxima/tmseries.mac b/maxima/tmseries.mac
index 3cf4edc..fae4a55 100644
--- a/maxima/tmseries.mac
+++ b/maxima/tmseries.mac
@@ -12,7 +12,7 @@ Reference:
J. Geodesy 85(8), 475-485 (Aug. 2011).
DOI 10.1007/s00190-011-0445-3
preprint http://arxiv.org/abs/1002.1417
- resource page http://geographiclib.sf.net/tm.html
+ resource page http://geographiclib.sourceforge.net/tm.html
Compute coefficient for forward and inverse trigonometric series for
conversion from conformal latitude to rectifying latitude. This prints
diff --git a/missing b/missing
index db98974..f62bbae 100755
--- a/missing
+++ b/missing
@@ -3,7 +3,7 @@
scriptversion=2013-10-28.13; # UTC
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 1790516..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>com.sri.vt.majic</groupId>
- <artifactId>majic-parent</artifactId>
- <version>0.2.3</version>
- </parent>
-
- <groupId>com.sri.vt</groupId>
- <artifactId>geographiclib</artifactId>
- <version>1.45-SNAPSHOT</version>
- <packaging>majic-cmake</packaging>
- <name>GeographicLib</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>com.sri.vt.majic</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>default-cmake-configure</id>
- <configuration>
- <options>
- <GEOGRAPHICLIB_LIB_TYPE>BOTH</GEOGRAPHICLIB_LIB_TYPE>
- <GEOGRAPHICLIB_DOCUMENTATION>OFF</GEOGRAPHICLIB_DOCUMENTATION>
- <BUILD_NETGEOGRAPHICLIB>OFF</BUILD_NETGEOGRAPHICLIB>
- </options>
- </configuration>
- </execution>
- <execution>
- <id>default-cmake-test</id>
- <configuration>
- <configs>
- <config>Release</config>
- </configs>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/python/Makefile.am b/python/Makefile.am
index 278a43b..174c8ce 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -1,7 +1,7 @@
#
# Makefile.am
#
-# Copyright (C) 2011, Charles Karney <charles at karney.com>
+# Copyright (c) Charles Karney (2011-2016) <charles at karney.com>
PACKAGE=geographiclib
PYTHON_FILES = \
@@ -13,12 +13,24 @@ PYTHON_FILES = \
$(srcdir)/$(PACKAGE)/geodesic.py \
$(srcdir)/$(PACKAGE)/geodesicline.py \
$(srcdir)/$(PACKAGE)/polygonarea.py
+TEST_FILES = \
+ $(srcdir)/$(PACKAGE)/test/__init__.py \
+ $(srcdir)/$(PACKAGE)/test/test_geodesic.py
+DOC_FILES = \
+ $(srcdir)/doc/conf.py \
+ $(srcdir)/doc/code.rst \
+ $(srcdir)/doc/examples.rst \
+ $(srcdir)/doc/geodesics.rst \
+ $(srcdir)/doc/index.rst \
+ $(srcdir)/doc/interface.rst
pythondir=$(libdir)/python/site-packages/$(PACKAGE)
install:
$(INSTALL) -d $(DESTDIR)$(pythondir)
$(INSTALL) -m 644 $(PYTHON_FILES) $(DESTDIR)$(pythondir)
+ $(INSTALL) -d $(DESTDIR)$(pythondir)/test
+ $(INSTALL) -m 644 $(TEST_FILES) $(DESTDIR)$(pythondir)/test
# Don't install setup.py because it ends up in e.g.,
# /usr/local/lib/python/site-packages/setup.py
@@ -27,5 +39,5 @@ install:
clean-local:
rm -rf *.pyc $(PACKAGE)/*.pyc
-EXTRA_DIST = Makefile.mk $(PACKAGE)/CMakeLists.txt $(PYTHON_FILES) setup.py \
- MANIFEST.in README.txt test/__init__.py test/test_geodesic.py
+EXTRA_DIST = Makefile.mk $(PACKAGE)/CMakeLists.txt $(PYTHON_FILES) \
+ $(TEST_FILES) $(DOC_FILES) setup.py MANIFEST.in README.rst
diff --git a/python/Makefile.in b/python/Makefile.in
index 0f3bfc3..2318dd5 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -17,9 +17,19 @@
#
# Makefile.am
#
-# Copyright (C) 2011, Charles Karney <charles at karney.com>
+# Copyright (c) Charles Karney (2011-2016) <charles at karney.com>
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -84,7 +94,6 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
subdir = python
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -92,6 +101,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/include/GeographicLib/Config-ac.h
CONFIG_CLEAN_FILES =
@@ -116,6 +126,7 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -168,6 +179,7 @@ LTLIBOBJS = @LTLIBOBJS@
LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@
LT_REVISION = @LT_REVISION@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -261,9 +273,21 @@ PYTHON_FILES = \
$(srcdir)/$(PACKAGE)/geodesicline.py \
$(srcdir)/$(PACKAGE)/polygonarea.py
+TEST_FILES = \
+ $(srcdir)/$(PACKAGE)/test/__init__.py \
+ $(srcdir)/$(PACKAGE)/test/test_geodesic.py
+
+DOC_FILES = \
+ $(srcdir)/doc/conf.py \
+ $(srcdir)/doc/code.rst \
+ $(srcdir)/doc/examples.rst \
+ $(srcdir)/doc/geodesics.rst \
+ $(srcdir)/doc/index.rst \
+ $(srcdir)/doc/interface.rst
+
pythondir = $(libdir)/python/site-packages/$(PACKAGE)
-EXTRA_DIST = Makefile.mk $(PACKAGE)/CMakeLists.txt $(PYTHON_FILES) setup.py \
- MANIFEST.in README.txt test/__init__.py test/test_geodesic.py
+EXTRA_DIST = Makefile.mk $(PACKAGE)/CMakeLists.txt $(PYTHON_FILES) \
+ $(TEST_FILES) $(DOC_FILES) setup.py MANIFEST.in README.rst
all: all-am
@@ -280,7 +304,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu python/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu python/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -454,10 +477,14 @@ uninstall-am:
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
install:
$(INSTALL) -d $(DESTDIR)$(pythondir)
$(INSTALL) -m 644 $(PYTHON_FILES) $(DESTDIR)$(pythondir)
+ $(INSTALL) -d $(DESTDIR)$(pythondir)/test
+ $(INSTALL) -m 644 $(TEST_FILES) $(DESTDIR)$(pythondir)/test
# Don't install setup.py because it ends up in e.g.,
# /usr/local/lib/python/site-packages/setup.py
diff --git a/python/Makefile.mk b/python/Makefile.mk
index e758c2d..02f75d9 100644
--- a/python/Makefile.mk
+++ b/python/Makefile.mk
@@ -2,6 +2,7 @@ MODULES = __init__ geomath constants accumulator geodesiccapability \
geodesic geodesicline polygonarea
PACKAGE = geographiclib
PYTHON_FILES = $(patsubst %,$(PACKAGE)/%.py,$(MODULES))
+TEST_FILES = $(PACKAGE)/test/__init__.py $(PACKAGE)/test/test_geodesic.py
DEST = $(PREFIX)/lib/python/site-packages/$(PACKAGE)
INSTALL = install -b
@@ -10,8 +11,9 @@ all:
@:
install:
- test -d $(DEST) || mkdir -p $(DEST)
+ test -d $(DEST)/test || mkdir -p $(DEST)/test
$(INSTALL) -m 644 $(PYTHON_FILES) $(DEST)/
+ $(INSTALL) -m 644 $(TEST_FILES) $(DEST)/test/
# Don't install setup.py because it ends up in e.g.,
# /usr/local/lib/python/site-packages/setup.py
diff --git a/python/README.rst b/python/README.rst
new file mode 100644
index 0000000..77db72b
--- /dev/null
+++ b/python/README.rst
@@ -0,0 +1,7 @@
+This implements
+`algorithms for geodesics <https://dx.doi.org/10.1007/s00190-012-0578-z>`_
+(Karney, 2013) for solving the direct and inverse problems for an
+ellipsoid of revolution.
+
+Documentation is available at
+`<http://geographiclib.sourceforge.net/1.46/python/>`_.
diff --git a/python/README.txt b/python/README.txt
deleted file mode 100644
index 28a18e8..0000000
--- a/python/README.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-This is a python implementation of the geodesic routines from
-GeographicLib. This contains implementations of the classes
-
-- GeographicLib::Math
-- GeographicLib::Accumulator
-- GeographicLib::Geodesic
-- GeographicLib::GeodesicLine
-- GeographicLib::PolygonAreaT<Geodesic>
-
-For more information on GeographicLib, see
-
- http://geographiclib.sf.net
diff --git a/python/doc/code.rst b/python/doc/code.rst
new file mode 100644
index 0000000..3e036a7
--- /dev/null
+++ b/python/doc/code.rst
@@ -0,0 +1,30 @@
+GeographicLib API
+=================
+
+geographiclib
+-------------
+.. automodule:: geographiclib
+ :members: __version_info__, __version__
+
+geographiclib.geodesic
+----------------------
+.. automodule:: geographiclib.geodesic
+ :members:
+
+ .. data:: Geodesic.WGS84
+ :annotation: = Instantiation for the WGS84 ellipsoid
+
+geographiclib.geodesicline
+--------------------------
+.. automodule:: geographiclib.geodesicline
+ :members:
+
+geographiclib.polygonarea
+-------------------------
+.. automodule:: geographiclib.polygonarea
+ :members:
+
+geographiclib.constants
+-----------------------
+.. automodule:: geographiclib.constants
+ :members:
diff --git a/python/doc/conf.py b/python/doc/conf.py
new file mode 100644
index 0000000..b6accde
--- /dev/null
+++ b/python/doc/conf.py
@@ -0,0 +1,270 @@
+# -*- coding: utf-8 -*-
+#
+# geographiclib documentation build configuration file, created by
+# sphinx-quickstart on Sat Oct 24 17:14:00 2015.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys
+import os
+sys.path.insert(0, os.path.abspath('..'))
+import geographiclib
+import geographiclib.geodesic
+import geographiclib.geodesicline
+import geographiclib.polygonarea
+import geographiclib.geodesiccapability
+import geographiclib.geomath
+import geographiclib.constants
+import geographiclib.accumulator
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+ 'sphinx.ext.autodoc',
+ 'sphinx.ext.viewcode',
+]
+
+# Add any paths that contain templates here, relative to this directory.
+#templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'geographiclib'
+copyright = u'2015, Charles Karney'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = geographiclib.__version__
+# The full version, including alpha/beta/rc tags.
+release = version
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+#exclude_patterns = ['_build']
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+#keep_warnings = False
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages. See the documentation for
+# a list of builtin themes.
+html_theme = 'default'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further. For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents. If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar. Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+#html_static_path = ['_static']
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#html_extra_path = []
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it. The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'geographiclibdoc'
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+# author, documentclass [howto, manual, or own class]).
+latex_documents = [
+ ('index', 'geographiclib.tex', u'geographiclib Documentation',
+ u'Charles Karney', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+ ('index', 'geographiclib', u'geographiclib Documentation',
+ [u'Charles Karney'], 1)
+]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+# dir menu entry, description, category)
+texinfo_documents = [
+ ('index', 'geographiclib', u'geographiclib Documentation',
+ u'Charles Karney', 'geographiclib', 'One line description of project.',
+ 'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
+
+# If true, do not generate a @detailmenu in the "Top" node's menu.
+#texinfo_no_detailmenu = False
+
+autodoc_member_order = 'bysource'
+
+autoclass_content = 'both'
diff --git a/python/doc/examples.rst b/python/doc/examples.rst
new file mode 100644
index 0000000..be538e1
--- /dev/null
+++ b/python/doc/examples.rst
@@ -0,0 +1,142 @@
+Examples
+========
+
+Initializing
+------------
+
+The following examples all assume that the following commands have been
+carried out:
+
+ >>> from geographiclib.geodesic import Geodesic
+ >>> import math
+ >>> geod = Geodesic.WGS84 # define the WGS84 ellipsoid
+
+You can determine the ellipsoid parameters with the *a* and *f* member
+variables, for example,
+
+ >>> geod.a, 1/geod.f
+ (6378137.0, 298.257223563)
+
+If you need to use a different ellipsoid, construct one by, for example
+
+ >>> geod = Geodesic(6378388, 1/297.0) # the international ellipsoid
+
+Basic geodesic calculations
+---------------------------
+
+The distance from Wellington, NZ (41.32S, 174.81E) to Salamanca, Spain
+(40.96N, 5.50W) using :meth:`~geographiclib.geodesic.Geodesic.Inverse`:
+
+ >>> g = geod.Inverse(-41.32, 174.81, 40.96, -5.50)
+ >>> print "The distance is {:.3f} m.".format(g['s12'])
+ The distance is 19959679.267 m.
+
+The point the point 20000 km SW of Perth, Australia (32.06S, 115.74E)
+using :meth:`~geographiclib.geodesic.Geodesic.Direct`:
+
+ >>> g = geod.Direct(-32.06, 115.74, 225, 20000e3)
+ >>> print "The position is ({:.8f}, {:.8f}).".format(g['lat2'],g['lon2'])
+ The position is (32.11195529, -63.95925278).
+
+The area between the geodesic from JFK Airport (40.6N, 73.8W) to LHR
+Airport (51.6N, 0.5W) and the equator. This is an example of setting the
+the :ref:`output mask <outmask>` parameter.
+
+ >>> g = geod.Inverse(40.6, -73.8, 51.6, -0.5, Geodesic.AREA)
+ >>> print "The area is {:.1f} m^2".format(g['S12'])
+ The area is 40041368848742.5 m^2
+
+Computing waypoints
+-------------------
+
+Consider the geodesic between Beijing Airport (40.1N, 116.6E) and San
+Fransisco Airport (37.6N, 122.4W). Compute waypoints and azimuths at
+intervals of 1000 km using
+:meth:`Geodesic.Line <geographiclib.geodesic.Geodesic.Line>` and
+:meth:`GeodesicLine.Position
+<geographiclib.geodesicline.GeodesicLine.Position>`:
+
+ >>> l = geod.InverseLine(40.1, 116.6, 37.6, -122.4)
+ >>> ds = 1000e3; n = int(math.ceil(l.s13 / ds))
+ >>> for i in range(n + 1):
+ ... if i == 0:
+ ... print "distance latitude longitude azimuth"
+ ... s = min(ds * i, l.s13)
+ ... g = l.Position(s, Geodesic.STANDARD | Geodesic.LONG_UNROLL)
+ ... print "{:.0f} {:.5f} {:.5f} {:.5f}".format(
+ ... g['s12'], g['lat2'], g['lon2'], g['azi2'])
+ ...
+ distance latitude longitude azimuth
+ 0 40.10000 116.60000 42.91642
+ 1000000 46.37321 125.44903 48.99365
+ 2000000 51.78786 136.40751 57.29433
+ 3000000 55.92437 149.93825 68.24573
+ 4000000 58.27452 165.90776 81.68242
+ 5000000 58.43499 183.03167 96.29014
+ 6000000 56.37430 199.26948 109.99924
+ 7000000 52.45769 213.17327 121.33210
+ 8000000 47.19436 224.47209 129.98619
+ 9000000 41.02145 233.58294 136.34359
+ 9513998 37.60000 237.60000 138.89027
+
+The inclusion of Geodesic.LONG_UNROLL in the call to
+GeodesicLine.Position ensures that the longitude does not jump on
+crossing the international dateline.
+
+If the purpose of computing the waypoints is to plot a smooth geodesic,
+then it's not important that they be exactly equally spaced. In this
+case, it's faster to parameterize the line in terms of the spherical arc
+length with :meth:`GeodesicLine.ArcPosition
+<geographiclib.geodesicline.GeodesicLine.ArcPosition>`. Here the
+spacing is about 1° of arc which means that the distance between the
+waypoints will be about 60 NM.
+
+ >>> l = geod.InverseLine(40.1, 116.6, 37.6, -122.4,
+ ... Geodesic.LATITUDE | Geodesic.LONGITUDE)
+ >>> da = 1; n = int(math.ceil(l.a13 / da)); da = l.a13 / n
+ >>> for i in range(n + 1):
+ ... if i == 0:
+ ... print "latitude longitude"
+ ... a = da * i
+ ... g = l.ArcPosition(a, Geodesic.LATITUDE |
+ ... Geodesic.LONGITUDE | Geodesic.LONG_UNROLL)
+ ... print "{:.5f} {:.5f}".format(g['lat2'], g['lon2'])
+ ...
+ latitude longitude
+ 40.10000 116.60000
+ 40.82573 117.49243
+ 41.54435 118.40447
+ 42.25551 119.33686
+ 42.95886 120.29036
+ 43.65403 121.26575
+ 44.34062 122.26380
+ ...
+ 39.82385 235.05331
+ 39.08884 235.91990
+ 38.34746 236.76857
+ 37.60000 237.60000
+
+The variation in the distance between these waypoints is on the order of
+1/*f*.
+
+Measuring areas
+---------------
+
+Measure the area of Antarctica using
+:meth:`Geodesic.Polygon <geographiclib.geodesic.Geodesic.Polygon>` and the
+:class:`~geographiclib.polygonarea.PolygonArea` class:
+
+ >>> p = geod.Polygon()
+ >>> antarctica = [
+ ... [-63.1, -58], [-72.9, -74], [-71.9,-102], [-74.9,-102], [-74.3,-131],
+ ... [-77.5,-163], [-77.4, 163], [-71.7, 172], [-65.9, 140], [-65.7, 113],
+ ... [-66.6, 88], [-66.9, 59], [-69.8, 25], [-70.0, -4], [-71.0, -14],
+ ... [-77.3, -33], [-77.9, -46], [-74.7, -61]
+ ... ]
+ >>> for pnt in antarctica:
+ ... p.AddPoint(pnt[0], pnt[1])
+ ...
+ >>> num, perim, area = p.Compute()
+ >>> print "Perimeter/area of Antarctica are {:.3f} m / {:.1f} m^2".format(
+ ... perim, area)
+ Perimeter/area of Antarctica are 16831067.893 m / 13662703680020.1 m^2
diff --git a/python/doc/geodesics.rst b/python/doc/geodesics.rst
new file mode 100644
index 0000000..f4ed55c
--- /dev/null
+++ b/python/doc/geodesics.rst
@@ -0,0 +1,204 @@
+Geodesics on an ellipsoid
+=========================
+
+Jump to
+
+* :ref:`intro`
+* :ref:`additional`
+* :ref:`multiple`
+* :ref:`background`
+* :ref:`references`
+
+.. _intro:
+
+Introduction
+------------
+
+Consider a ellipsoid of revolution with equatorial radius *a*, polar
+semi-axis *b*, and flattening *f* = (*a* − *b*)/*a* . Points on
+the surface of the ellipsoid are characterized by their latitude φ
+and longitude λ. (Note that latitude here means the
+*geographical latitude*, the angle between the normal to the ellipsoid
+and the equatorial plane).
+
+The shortest path between two points on the ellipsoid at
+(φ\ :sub:`1`, λ\ :sub:`1`) and (φ\ :sub:`2`,
+λ\ :sub:`2`) is called the geodesic. Its length is
+*s*\ :sub:`12` and the geodesic from point 1 to point 2 has forward
+azimuths α\ :sub:`1` and α\ :sub:`2` at the two end
+points. In this figure, we have λ\ :sub:`12` =
+λ\ :sub:`2` − λ\ :sub:`1`.
+
+ .. raw:: html
+
+ <center>
+ <img src="http://upload.wikimedia.org/wikipedia/commons/c/cb/Geodesic_problem_on_an_ellipsoid.svg"
+ alt="Figure from wikipedia"
+ width="250">
+ </center>
+
+A geodesic can be extended indefinitely by requiring that any
+sufficiently small segment is a shortest path; geodesics are also the
+straightest curves on the surface.
+
+Traditionally two geodesic problems are considered:
+
+* the direct problem — given φ\ :sub:`1`,
+ λ\ :sub:`1`, α\ :sub:`1`, *s*\ :sub:`12`,
+ determine φ\ :sub:`2`, λ\ :sub:`2`, and
+ α\ :sub:`2`; this is solved by
+ :meth:`Geodesic.Direct <geographiclib.geodesic.Geodesic.Direct>`.
+
+* the inverse problem — given φ\ :sub:`1`,
+ λ\ :sub:`1`, φ\ :sub:`2`, λ\ :sub:`2`,
+ determine *s*\ :sub:`12`, α\ :sub:`1`, and
+ α\ :sub:`2`; this is solved by
+ :meth:`Geodesic.Inverse <geographiclib.geodesic.Geodesic.Inverse>`.
+
+.. _additional:
+
+Additional properties
+---------------------
+
+The routines also calculate several other quantities of interest
+
+* *S*\ :sub:`12` is the area between the geodesic from point 1 to
+ point 2 and the equator; i.e., it is the area, measured
+ counter-clockwise, of the quadrilateral with corners
+ (φ\ :sub:`1`,λ\ :sub:`1`), (0,λ\ :sub:`1`),
+ (0,λ\ :sub:`2`), and
+ (φ\ :sub:`2`,λ\ :sub:`2`). It is given in
+ meters\ :sup:`2`.
+* *m*\ :sub:`12`, the reduced length of the geodesic is defined such
+ that if the initial azimuth is perturbed by *d*\ α\ :sub:`1`
+ (radians) then the second point is displaced by *m*\ :sub:`12`
+ *d*\ α\ :sub:`1` in the direction perpendicular to the
+ geodesic. *m*\ :sub:`12` is given in meters. On a curved surface
+ the reduced length obeys a symmetry relation, *m*\ :sub:`12` +
+ *m*\ :sub:`21` = 0. On a flat surface, we have *m*\ :sub:`12` =
+ *s*\ :sub:`12`.
+* *M*\ :sub:`12` and *M*\ :sub:`21` are geodesic scales. If two
+ geodesics are parallel at point 1 and separated by a small distance
+ *dt*, then they are separated by a distance *M*\ :sub:`12` *dt* at
+ point 2. *M*\ :sub:`21` is defined similarly (with the geodesics
+ being parallel to one another at point 2). *M*\ :sub:`12` and
+ *M*\ :sub:`21` are dimensionless quantities. On a flat surface,
+ we have *M*\ :sub:`12` = *M*\ :sub:`21` = 1.
+* σ\ :sub:`12` is the arc length on the auxiliary sphere.
+ This is a construct for converting the problem to one in spherical
+ trigonometry. The spherical arc length from one equator crossing to
+ the next is always 180°.
+
+If points 1, 2, and 3 lie on a single geodesic, then the following
+addition rules hold:
+
+* *s*\ :sub:`13` = *s*\ :sub:`12` + *s*\ :sub:`23`
+* σ\ :sub:`13` = σ\ :sub:`12` + σ\ :sub:`23`
+* *S*\ :sub:`13` = *S*\ :sub:`12` + *S*\ :sub:`23`
+* *m*\ :sub:`13` = *m*\ :sub:`12`\ *M*\ :sub:`23` +
+ *m*\ :sub:`23`\ *M*\ :sub:`21`
+* *M*\ :sub:`13` = *M*\ :sub:`12`\ *M*\ :sub:`23` −
+ (1 − *M*\ :sub:`12`\ *M*\ :sub:`21`)
+ *m*\ :sub:`23`/*m*\ :sub:`12`
+* *M*\ :sub:`31` = *M*\ :sub:`32`\ *M*\ :sub:`21` −
+ (1 − *M*\ :sub:`23`\ *M*\ :sub:`32`)
+ *m*\ :sub:`12`/*m*\ :sub:`23`
+
+.. _multiple:
+
+Multiple shortest geodesics
+---------------------------
+
+The shortest distance found by solving the inverse problem is
+(obviously) uniquely defined. However, in a few special cases there are
+multiple azimuths which yield the same shortest distance. Here is a
+catalog of those cases:
+
+* φ\ :sub:`1` = −φ\ :sub:`2` (with neither point at
+ a pole). If α\ :sub:`1` = α\ :sub:`2`, the geodesic
+ is unique. Otherwise there are two geodesics and the second one is
+ obtained by setting [α\ :sub:`1`,α\ :sub:`2`] ←
+ [α\ :sub:`2`,α\ :sub:`1`],
+ [*M*\ :sub:`12`,\ *M*\ :sub:`21`] ←
+ [*M*\ :sub:`21`,\ *M*\ :sub:`12`], *S*\ :sub:`12` ←
+ −\ *S*\ :sub:`12`. (This occurs when the longitude difference
+ is near ±180° for oblate ellipsoids.)
+* λ\ :sub:`2` = λ\ :sub:`1` ± 180° (with
+ neither point at a pole). If α\ :sub:`1` = 0° or
+ ±180°, the geodesic is unique. Otherwise there are two
+ geodesics and the second one is obtained by setting
+ [α\ :sub:`1`,α\ :sub:`2`] ←
+ [−α\ :sub:`1`,−α\ :sub:`2`],
+ *S*\ :sub:`12` ← −\ *S*\ :sub:`12`. (This occurs when
+ φ\ :sub:`2` is near −φ\ :sub:`1` for prolate
+ ellipsoids.)
+* Points 1 and 2 at opposite poles. There are infinitely many
+ geodesics which can be generated by setting
+ [α\ :sub:`1`,α\ :sub:`2`] ←
+ [α\ :sub:`1`,α\ :sub:`2`] +
+ [δ,−δ], for arbitrary δ. (For spheres, this
+ prescription applies when points 1 and 2 are antipodal.)
+* *s*\ :sub:`12` = 0 (coincident points). There are infinitely many
+ geodesics which can be generated by setting
+ [α\ :sub:`1`,α\ :sub:`2`] ←
+ [α\ :sub:`1`,α\ :sub:`2`] + [δ,δ], for
+ arbitrary δ.
+
+.. _background:
+
+Background
+----------
+
+The algorithms implemented by this package are given in Karney (2013)
+and are based on Bessel (1825) and Helmert (1880); the algorithm for
+areas is based on Danielsen (1989). These improve on the work of
+Vincenty (1975) in the following respects:
+
+* The results are accurate to round-off for terrestrial ellipsoids (the
+ error in the distance is less then 15 nanometers, compared to 0.1 mm
+ for Vincenty).
+* The solution of the inverse problem is always found. (Vincenty's
+ method fails to converge for nearly antipodal points.)
+* The routines calculate differential and integral properties of a
+ geodesic. This allows, for example, the area of a geodesic polygon to
+ be computed.
+
+.. _references:
+
+References
+----------
+
+* F. W. Bessel,
+ `The calculation of longitude and latitude from geodesic measurements (1825)
+ <http://arxiv.org/abs/0908.1824>`_,
+ Astron. Nachr. **331**\ (8), 852–861 (2010),
+ translated by C. F. F. Karney and R. E. Deakin.
+* F. R. Helmert,
+ `Mathematical and Physical Theories of Higher Geodesy, Vol 1
+ <https://dx.doi.org/10.5281/zenodo.32050>`_,
+ (Teubner, Leipzig, 1880), Chaps. 5–7.
+* T. Vincenty,
+ `Direct and inverse solutions of geodesics on the ellipsoid with
+ application of nested equations
+ <http://www.ngs.noaa.gov/PUBS_LIB/inverse.pdf>`_,
+ Survey Review **23**\ (176), 88–93 (1975).
+* J. Danielsen,
+ `The area under the geodesic
+ <https://dx.doi.org/10.1179/003962689791474267>`_,
+ Survey Review **30**\ (232), 61–66 (1989).
+* C. F. F. Karney,
+ `Algorithms for geodesics
+ <https://dx.doi.org/10.1007/s00190-012-0578-z>`_,
+ J. Geodesy **87**\ (1) 43–55 (2013);
+ `addenda <http://geographiclib.sourceforge.net/geod-addenda.html>`_.
+* C. F. F. Karney,
+ `Geodesics on an ellipsoid of revolution
+ <http://arxiv.org/abs/1102.1215v1>`_,
+ Feb. 2011;
+ `errata
+ <http://geographiclib.sourceforge.net/geod-addenda.html#geod-errata>`_.
+* `A geodesic bibliography
+ <http://geographiclib.sourceforge.net/geodesic-papers/biblio.html>`_.
+* The wikipedia page,
+ `Geodesics on an ellipsoid
+ <https://en.wikipedia.org/wiki/Geodesics_on_an_ellipsoid>`_.
diff --git a/python/doc/index.rst b/python/doc/index.rst
new file mode 100644
index 0000000..2e2c11b
--- /dev/null
+++ b/python/doc/index.rst
@@ -0,0 +1,116 @@
+.. geographiclib documentation master file, created by
+ sphinx-quickstart on Sat Oct 24 17:14:00 2015.
+ You can adapt this file completely to your liking, but it should at least
+ contain the root `toctree` directive.
+
+geographiclib
+=============
+
+Author: Charles F. F. Karney (charles at karney.com)
+
+Version: |version|
+
+The documentation for other versions is available at
+``http://geographiclib.sourceforge.net/m.nn/python/`` for versions numbers
+``m.nn`` ≥ 1.46.
+
+Licensed under the MIT/X11 License; see
+`LICENSE.txt <http://geographiclib.sourceforge.net/html/LICENSE.txt>`_.
+
+Introduction
+============
+
+This is a python implementation of the geodesic routines in
+`GeographicLib <http://geographiclib.sourceforge.net>`_.
+
+Although it is maintained in conjunction with the larger C++ library,
+this python package can be used independently.
+
+Installation
+------------
+
+The full `Geographic <http://geographiclib.sourceforge.net>`_ package
+can be downloaded from
+`sourceforge <http://sourceforge.net/projects/geographiclib/files/distrib>`_.
+However the python implementation is available as a stand-alone package.
+To install this, run
+
+.. code-block:: sh
+
+ pip install geographiclib
+
+Alternatively downloaded the package directly from
+`Python Package Index <http://pypi.python.org/pypi/geographiclib>`_
+and install it with
+
+.. code-block:: sh
+
+ tar xpfz geographiclib-1.46.tar.gz
+ cd geographiclib-1.46
+ python setup.py install
+
+It's a good idea to run the unit tests to verify that the installation
+worked OK by running
+
+.. code-block:: sh
+
+ python -m unittest geographiclib.test.test_geodesic
+
+Contents
+--------
+
+.. toctree::
+ :maxdepth: 2
+
+ geodesics
+ interface
+ code
+ examples
+
+GeographicLib in various languages
+----------------------------------
+
+* C++ (complete library):
+ `documentation <../index.html>`__,
+ `download <https://sourceforge.net/projects/geographiclib/files/distrib>`_
+* C (geodesic routines):
+ `documentation <../C/index.html>`__,
+ also included with recent versions of
+ `proj.4 <https://github.com/OSGeo/proj.4/wiki>`_
+* Fortran (geodesic routines):
+ `documentation <../Fortran/index.html>`__
+* Java (geodesic routines):
+ `Maven Central package <http://repo1.maven.org/maven2/net/sf/geographiclib/GeographicLib-Java/>`_,
+ `documentation <../java/index.html>`__
+* JavaScript (geodesic routines):
+ `npm package <https://www.npmjs.com/package/geographiclib>`_,
+ `documentation <../js/index.html>`__
+* Python (geodesic routines):
+ `PyPI package <http://pypi.python.org/pypi/geographiclib>`_,
+ `documentation <../python/index.html>`__
+* Matlab/Octave (geodesic and some other routines):
+ `Matlab Central package <http://www.mathworks.com/matlabcentral/fileexchange/50605>`_,
+ `documentation
+ <http://www.mathworks.com/matlabcentral/fileexchange/50605/content/Contents.m>`__
+* C# (.NET wrapper for complete C++ library):
+ `documentation <../NET/index.html>`__
+
+Change log
+----------
+
+* Version 1.46 (released 2016-02-15)
+
+ * Add Geodesic.DirectLine, Geodesic.ArcDirectLine,
+ Geodesic.InverseLine, GeodesicLine.SetDistance, GeodesicLine.SetArc,
+ GeodesicLine.s13, GeodesicLine.a13.
+ * More accurate inverse solution when longitude difference is close to
+ 180°.
+ * Remove unnecessary functions, CheckPosition, CheckAzimuth,
+ CheckDistance.
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
diff --git a/python/doc/interface.rst b/python/doc/interface.rst
new file mode 100644
index 0000000..6a912c0
--- /dev/null
+++ b/python/doc/interface.rst
@@ -0,0 +1,130 @@
+The library interface
+=====================
+
+Jump to
+
+* :ref:`units`
+* :ref:`dict`
+* :ref:`outmask`
+* :ref:`restrictions`
+
+.. _units:
+
+The units
+---------
+
+All angles (latitude, longitude, azimuth, arc length) are measured in
+degrees with latitudes increasing northwards, longitudes increasing
+eastwards, and azimuths measured clockwise from north. For a point at a
+pole, the azimuth is defined by keeping the longitude fixed, writing φ =
+±(90° − ε), and taking the limit ε → 0+
+
+.. _dict:
+
+Geodesic dictionary
+-------------------
+
+The results returned by
+:meth:`Geodesic.Direct <geographiclib.geodesic.Geodesic.Direct>`,
+:meth:`Geodesic.Inverse <geographiclib.geodesic.Geodesic.Inverse>`,
+:meth:`GeodesicLine.Position <geographiclib.geodesicline.GeodesicLine.Position>`,
+etc., return a dictionary with some of the following 12 fields set:
+
+* *lat1* = φ\ :sub:`1`, latitude of point 1 (degrees)
+* *lon1* = λ\ :sub:`1`, longitude of point 1 (degrees)
+* *azi1* = α\ :sub:`1`, azimuth of line at point 1 (degrees)
+* *lat2* = φ\ :sub:`2`, latitude of point 2 (degrees)
+* *lon2* = λ\ :sub:`2`, longitude of point 2 (degrees)
+* *azi2* = α\ :sub:`2`, (forward) azimuth of line at point 2 (degrees)
+* *s12* = *s*\ :sub:`12`, distance from 1 to 2 (meters)
+* *a12* = σ\ :sub:`12`, arc length on auxiliary sphere from 1 to 2 (degrees)
+* *m12* = *m*\ :sub:`12`, reduced length of geodesic (meters)
+* *M12* = *M*\ :sub:`12`, geodesic scale at 2 relative to 1 (dimensionless)
+* *M21* = *M*\ :sub:`21`, geodesic scale at 1 relative to 2 (dimensionless)
+* *S12* = *S*\ :sub:`12`, area between geodesic and equator (meters\ :sup:`2`)
+
+.. _outmask:
+
+*outmask* and *caps*
+--------------------
+
+By default, the geodesic routines return the 7 basic quantities: *lat1*,
+*lon1*, *azi1*, *lat2*, *lon2*, *azi2*, *s12*, together with the arc
+length *a12*. The optional output mask parameter, *outmask*, can be
+used to tailor which quantities to calculate. In addition, when a
+:class:`~geographiclib.geodesicline.GeodesicLine` is constructed it can
+be provided with the optional capabilities parameter, *caps*, which
+specifies what quantities can be returned from the resulting object.
+
+Both *outmask* and *caps* are obtained by or'ing together the following
+values
+
+* :data:`~geographiclib.geodesic.Geodesic.EMPTY`, no capabilities, no output
+* :data:`~geographiclib.geodesic.Geodesic.LATITUDE`, compute latitude, *lat2*
+* :data:`~geographiclib.geodesic.Geodesic.LONGITUDE`,
+ compute longitude, *lon2*
+* :data:`~geographiclib.geodesic.Geodesic.AZIMUTH`,
+ compute azimuths, *azi1* and *azi2*
+* :data:`~geographiclib.geodesic.Geodesic.DISTANCE`, compute distance, *s12*
+* :data:`~geographiclib.geodesic.Geodesic.STANDARD`, all of the above
+* :data:`~geographiclib.geodesic.Geodesic.DISTANCE_IN`,
+ allow *s12* to be used as input in the direct problem
+* :data:`~geographiclib.geodesic.Geodesic.REDUCEDLENGTH`,
+ compute reduced length, *m12*
+* :data:`~geographiclib.geodesic.Geodesic.GEODESICSCALE`,
+ compute geodesic scales, *M12* and *M21*
+* :data:`~geographiclib.geodesic.Geodesic.AREA`, compute area, *S12*
+* :data:`~geographiclib.geodesic.Geodesic.ALL`, all of the above;
+* :data:`~geographiclib.geodesic.Geodesic.LONG_UNROLL`, unroll longitudes
+
+DISTANCE_IN is a capability provided to the GeodesicLine constructor. It
+allows the position on the line to specified in terms of
+distance. (Without this, the position can only be specified in terms of
+the arc length.) This only makes sense in the *caps* parameter.
+
+LONG_UNROLL controls the treatment of longitude. If it is not set then
+the *lon1* and *lon2* fields are both reduced to the range [−180°,
+180°). If it is set, then *lon1* is as given in the function call and
+(*lon2* − *lon1*) determines how many times and in what sense the
+geodesic has encircled the ellipsoid. This only makes sense in the
+*outmask* parameter.
+
+Note that *a12* is always included in the result.
+
+.. _restrictions:
+
+Restrictions on the parameters
+------------------------------
+
+* Latitudes must lie in [−90°, 90°]. Latitudes outside this range are
+ replaced by NaNs.
+* The distance *s12* is unrestricted. This allows geodesics to wrap
+ around the ellipsoid. Such geodesics are no longer shortest
+ paths. However they retain the property that they are the straightest
+ curves on the surface.
+* Similarly, the spherical arc length *a12* is unrestricted.
+* Longitudes and azimuths are unrestricted; internally these are
+ exactly reduced to the range [−180°, 180°); but see also the
+ LONG_UNROLL bit.
+* The equatorial radius a and the polar semi-axis b must both be
+ positive and finite (this implies that −∞ < *f* < 1).
+* The flattening *f* should satisfy *f* ∈ [−1/50,1/50] in order to retain
+ full accuracy. This condition holds for most applications in geodesy.
+
+Reasonably accurate results can be obtained for −0.2 ≤ *f* ≤ 0.2. Here
+is a table of the approximate maximum error (expressed as a distance)
+for an ellipsoid with the same major radius as the WGS84 ellipsoid and
+different values of the flattening.
+
+======== =======
+abs(*f*) error
+-------- -------
+0.003 15 nm
+0.01 25 nm
+0.02 30 nm
+0.05 10 μm
+0.1 1.5 mm
+0.2 300 mm
+======== =======
+
+Here 1 nm = 1 nanometer = 10\ :sup:`−9` m (*not* 1 nautical mile!)
diff --git a/python/geographiclib/CMakeLists.txt b/python/geographiclib/CMakeLists.txt
index eb5db69..a9bb545 100644
--- a/python/geographiclib/CMakeLists.txt
+++ b/python/geographiclib/CMakeLists.txt
@@ -2,6 +2,7 @@
# Probably full-time python users should install the python package from
# http://pypi.python.org/pypi/geographiclib
file (GLOB PYTHON_FILES [A-Za-z_]*.py)
+file (GLOB TEST_FILES test/[A-Za-z_]*.py)
if (COMMON_INSTALL_PATH)
set (INSTALL_PYTHON_DIR "lib${LIB_SUFFIX}/python/site-packages")
else ()
@@ -10,6 +11,8 @@ endif ()
install (FILES ${PYTHON_FILES}
DESTINATION ${INSTALL_PYTHON_DIR}/geographiclib)
+install (FILES ${TEST_FILES}
+ DESTINATION ${INSTALL_PYTHON_DIR}/geographiclib/test)
# Only install setup.py under Windows because the installation tree is,
# e.g., c:/Program Files/GeographicLib/${INSTALL_PYTHON_PATH}. Don't
diff --git a/python/geographiclib/__init__.py b/python/geographiclib/__init__.py
index 66849cb..4e3507b 100644
--- a/python/geographiclib/__init__.py
+++ b/python/geographiclib/__init__.py
@@ -1,4 +1,7 @@
"""geographiclib: geodesic routines from GeographicLib"""
-__version_info__ = (1, 45, 0)
-__version__ = "1.45"
+__version_info__ = (1, 46, 0)
+"""GeographicLib version as a tuple"""
+
+__version__ = "1.46"
+"""GeographicLib version as a string"""
diff --git a/python/geographiclib/accumulator.py b/python/geographiclib/accumulator.py
index 9f6a2f2..7d6aaca 100644
--- a/python/geographiclib/accumulator.py
+++ b/python/geographiclib/accumulator.py
@@ -25,6 +25,7 @@ class Accumulator(object):
self._s, self._t = float(y), 0.0
def __init__(self, y = 0.0):
+ """Constructor"""
self.Set(y)
def Add(self, y):
diff --git a/python/geographiclib/constants.py b/python/geographiclib/constants.py
index 1434efb..70d6d1a 100644
--- a/python/geographiclib/constants.py
+++ b/python/geographiclib/constants.py
@@ -1,4 +1,4 @@
-"""constants.py: transcription of GeographicLib::Constants class."""
+"""Define the WGS84 ellipsoid"""
# constants.py
#
# This is a translation of the GeographicLib::Constants class to python. See
@@ -6,17 +6,17 @@
#
# http://geographiclib.sourceforge.net/html/annotated.html
#
-# Copyright (c) Charles Karney (2011) <charles at karney.com> and licensed under
-# the MIT/X11 License. For more information, see
+# Copyright (c) Charles Karney (2011-2016) <charles at karney.com> and
+# licensed under the MIT/X11 License. For more information, see
# http://geographiclib.sourceforge.net/
######################################################################
class Constants(object):
"""
- WGS84 constants:
- WGS84_a, the equatorial radius in meters
- WGS84_f, the flattening of the ellipsoid
+ Constants describing the WGS84 ellipsoid
"""
WGS84_a = 6378137.0 # meters
+ """the equatorial radius in meters of the WGS84 ellipsoid in meters"""
WGS84_f = 1/298.257223563
+ """the flattening of the WGS84 ellipsoid, 1/298.257223563"""
diff --git a/python/geographiclib/geodesic.py b/python/geographiclib/geodesic.py
index 10ce9d3..1034d96 100644
--- a/python/geographiclib/geodesic.py
+++ b/python/geographiclib/geodesic.py
@@ -1,4 +1,63 @@
-"""geodesic.py: transcription of GeographicLib::Geodesic class."""
+"""Define the :class:`~geographiclib.geodesic.Geodesic` class
+
+The ellipsoid parameters are defined by the constructor. The direct and
+inverse geodesic problems are solved by
+
+ * :meth:`~geographiclib.geodesic.Geodesic.Inverse` Solve the inverse
+ geodesic problem
+ * :meth:`~geographiclib.geodesic.Geodesic.Direct` Solve the direct
+ geodesic problem
+ * :meth:`~geographiclib.geodesic.Geodesic.ArcDirect` Solve the direct
+ geodesic problem in terms of spherical arc length
+
+:class:`~geographiclib.geodesicline.GeodesicLine` objects can be created
+with
+
+ * :meth:`~geographiclib.geodesic.Geodesic.Line`
+ * :meth:`~geographiclib.geodesic.Geodesic.DirectLine`
+ * :meth:`~geographiclib.geodesic.Geodesic.ArcDirectLine`
+ * :meth:`~geographiclib.geodesic.Geodesic.InverseLine`
+
+:class:`~geographiclib.polygonarea.PolygonArea` objects can be created
+with
+
+ * :meth:`~geographiclib.geodesic.Geodesic.Polygon`
+
+The public attributes for this class are
+
+ * :attr:`~geographiclib.geodesic.Geodesic.a`
+ :attr:`~geographiclib.geodesic.Geodesic.f`
+
+*outmask* and *caps* bit masks are
+
+ * :const:`~geographiclib.geodesic.Geodesic.EMPTY`
+ * :const:`~geographiclib.geodesic.Geodesic.LATITUDE`
+ * :const:`~geographiclib.geodesic.Geodesic.LONGITUDE`
+ * :const:`~geographiclib.geodesic.Geodesic.AZIMUTH`
+ * :const:`~geographiclib.geodesic.Geodesic.DISTANCE`
+ * :const:`~geographiclib.geodesic.Geodesic.STANDARD`
+ * :const:`~geographiclib.geodesic.Geodesic.DISTANCE_IN`
+ * :const:`~geographiclib.geodesic.Geodesic.REDUCEDLENGTH`
+ * :const:`~geographiclib.geodesic.Geodesic.GEODESICSCALE`
+ * :const:`~geographiclib.geodesic.Geodesic.AREA`
+ * :const:`~geographiclib.geodesic.Geodesic.ALL`
+ * :const:`~geographiclib.geodesic.Geodesic.LONG_UNROLL`
+
+:Example:
+
+ >>> from geographiclib.geodesic import Geodesic
+ >>> # The geodesic inverse problem
+ ... Geodesic.WGS84.Inverse(-41.32, 174.81, 40.96, -5.50)
+ {'lat1': -41.32,
+ 'a12': 179.6197069334283,
+ 's12': 19959679.26735382,
+ 'lat2': 40.96,
+ 'azi2': 18.825195123248392,
+ 'azi1': 161.06766998615882,
+ 'lon1': 174.81,
+ 'lon2': -5.5}
+
+"""
# geodesic.py
#
# This is a rather literal translation of the GeographicLib::Geodesic class to
@@ -11,9 +70,9 @@
# Charles F. F. Karney,
# Algorithms for geodesics, J. Geodesy 87, 43-55 (2013),
# https://dx.doi.org/10.1007/s00190-012-0578-z
-# Addenda: http://geographiclib.sf.net/geod-addenda.html
+# Addenda: http://geographiclib.sourceforge.net/geod-addenda.html
#
-# Copyright (c) Charles Karney (2011-2015) <charles at karney.com> and licensed
+# Copyright (c) Charles Karney (2011-2016) <charles at karney.com> and licensed
# under the MIT/X11 License. For more information, see
# http://geographiclib.sourceforge.net/
######################################################################
@@ -24,43 +83,7 @@ from geographiclib.constants import Constants
from geographiclib.geodesiccapability import GeodesicCapability
class Geodesic(object):
- """Solve geodesic problems. The following illustrates its use
-
- import sys
- sys.path.append("/usr/local/lib/python/site-packages")
- from geographiclib.geodesic import Geodesic
-
- # The geodesic inverse problem
- Geodesic.WGS84.Inverse(-41.32, 174.81, 40.96, -5.50)
-
- # The geodesic direct problem
- Geodesic.WGS84.Direct(40.6, -73.8, 45, 10000e3)
-
- # How to obtain several points along a geodesic
- line = Geodesic.WGS84.Line(40.6, -73.8, 45)
- line.Position( 5000e3)
- line.Position(10000e3)
-
- # Computing the area of a geodesic polygon
- def p(lat,lon): return {'lat': lat, 'lon': lon}
-
- Geodesic.WGS84.Area([p(0, 0), p(0, 90), p(90, 0)])
-
- Documentation on these routines is available via
-
- help(Geodesic.__init__)
- help(Geodesic.Inverse)
- help(Geodesic.Direct)
- help(Geodesic.Line)
- help(line.Position)
- help(Geodesic.Area)
-
- All angles (latitudes, longitudes, azimuths, spherical arc lengths)
- are measured in degrees. Latitudes must lie in [-90,90]. All lengths
- (distance, reduced length) are measured in meters. Areas are measures
- in square meters.
-
- """
+ """Solve geodesic problems"""
GEOGRAPHICLIB_GEODESIC_ORDER = 6
nA1_ = GEOGRAPHICLIB_GEODESIC_ORDER
@@ -94,21 +117,8 @@ class Geodesic(object):
CAP_MASK = GeodesicCapability.CAP_MASK
OUT_ALL = GeodesicCapability.OUT_ALL
OUT_MASK = GeodesicCapability.OUT_MASK
- EMPTY = GeodesicCapability.EMPTY
- LATITUDE = GeodesicCapability.LATITUDE
- LONGITUDE = GeodesicCapability.LONGITUDE
- AZIMUTH = GeodesicCapability.AZIMUTH
- DISTANCE = GeodesicCapability.DISTANCE
- STANDARD = GeodesicCapability.STANDARD
- DISTANCE_IN = GeodesicCapability.DISTANCE_IN
- REDUCEDLENGTH = GeodesicCapability.REDUCEDLENGTH
- GEODESICSCALE = GeodesicCapability.GEODESICSCALE
- AREA = GeodesicCapability.AREA
- LONG_UNROLL = GeodesicCapability.LONG_UNROLL
- LONG_NOWRAP = GeodesicCapability.LONG_UNROLL
- ALL = GeodesicCapability.ALL
- def SinCosSeries(sinp, sinx, cosx, c):
+ def _SinCosSeries(sinp, sinx, cosx, c):
"""Private: Evaluate a trig series using Clenshaw summation."""
# Evaluate
# y = sinp ? sum(c[i] * sin( 2*i * x), i, 1, n) :
@@ -132,9 +142,9 @@ class Geodesic(object):
k -= 1; y0 = ar * y1 - y0 + c[k]
return ( 2 * sinx * cosx * y0 if sinp # sin(2 * x) * y0
else cosx * (y0 - y1) ) # cos(x) * (y0 - y1)
- SinCosSeries = staticmethod(SinCosSeries)
+ _SinCosSeries = staticmethod(_SinCosSeries)
- def Astroid(x, y):
+ def _Astroid(x, y):
"""Private: solve astroid equation."""
# Solve k^4+2*k^3-(x^2+y^2-1)*k^2-2*y^2*k-y^2 = 0 for positive root k.
# This solution is adapted from Geocentric::Reverse.
@@ -179,9 +189,9 @@ class Geodesic(object):
# for y small, positive root is k = abs(y)/sqrt(1-x^2)
k = 0
return k
- Astroid = staticmethod(Astroid)
+ _Astroid = staticmethod(_Astroid)
- def A1m1f(eps):
+ def _A1m1f(eps):
"""Private: return A1-1."""
coeff = [
1, 4, 64, 0, 256,
@@ -189,9 +199,9 @@ class Geodesic(object):
m = Geodesic.nA1_//2
t = Math.polyval(m, coeff, 0, Math.sq(eps)) / coeff[m + 1]
return (t + eps) / (1 - eps)
- A1m1f = staticmethod(A1m1f)
+ _A1m1f = staticmethod(_A1m1f)
- def C1f(eps, c):
+ def _C1f(eps, c):
"""Private: return C1."""
coeff = [
-1, 6, -16, 32,
@@ -209,9 +219,9 @@ class Geodesic(object):
c[l] = d * Math.polyval(m, coeff, o, eps2) / coeff[o + m + 1]
o += m + 2
d *= eps
- C1f = staticmethod(C1f)
+ _C1f = staticmethod(_C1f)
- def C1pf(eps, c):
+ def _C1pf(eps, c):
"""Private: return C1'"""
coeff = [
205, -432, 768, 1536,
@@ -229,9 +239,9 @@ class Geodesic(object):
c[l] = d * Math.polyval(m, coeff, o, eps2) / coeff[o + m + 1]
o += m + 2
d *= eps
- C1pf = staticmethod(C1pf)
+ _C1pf = staticmethod(_C1pf)
- def A2m1f(eps):
+ def _A2m1f(eps):
"""Private: return A2-1"""
coeff = [
-11, -28, -192, 0, 256,
@@ -239,9 +249,9 @@ class Geodesic(object):
m = Geodesic.nA2_//2
t = Math.polyval(m, coeff, 0, Math.sq(eps)) / coeff[m + 1]
return (t - eps) / (1 + eps)
- A2m1f = staticmethod(A2m1f)
+ _A2m1f = staticmethod(_A2m1f)
- def C2f(eps, c):
+ def _C2f(eps, c):
"""Private: return C2"""
coeff = [
1, 2, 16, 32,
@@ -259,23 +269,30 @@ class Geodesic(object):
c[l] = d * Math.polyval(m, coeff, o, eps2) / coeff[o + m + 1]
o += m + 2
d *= eps
- C2f = staticmethod(C2f)
+ _C2f = staticmethod(_C2f)
def __init__(self, a, f):
- """Construct a Geodesic object for ellipsoid with major radius a and
- flattening f.
+ """Construct a Geodesic object
+
+ :param a: the equatorial radius of the ellipsoid in meters
+ :param f: the flattening of the ellipsoid
+
+ An exception is thrown if *a* or the polar semi-axis *b* = *a* (1 -
+ *f*) is not a finite positive quantity.
"""
- self._a = float(a)
- self._f = float(f)
- self._f1 = 1 - self._f
- self._e2 = self._f * (2 - self._f)
+ self.a = float(a)
+ """The equatorial radius in meters (readonly)"""
+ self.f = float(f)
+ """The flattening (readonly)"""
+ self._f1 = 1 - self.f
+ self._e2 = self.f * (2 - self.f)
self._ep2 = self._e2 / Math.sq(self._f1) # e2 / (1 - e2)
- self._n = self._f / ( 2 - self._f)
- self._b = self._a * self._f1
+ self._n = self.f / ( 2 - self.f)
+ self._b = self.a * self._f1
# authalic radius squared
- self._c2 = (Math.sq(self._a) + Math.sq(self._b) *
+ self._c2 = (Math.sq(self.a) + Math.sq(self._b) *
(1 if self._e2 == 0 else
(Math.atanh(math.sqrt(self._e2)) if self._e2 > 0 else
math.atan(math.sqrt(-self._e2))) /
@@ -289,20 +306,20 @@ class Geodesic(object):
# by a factor of 2.) Setting this equal to epsilon gives sig12 = etol2.
# Here 0.1 is a safety factor (error decreased by 100) and max(0.001,
# abs(f)) stops etol2 getting too large in the nearly spherical case.
- self._etol2 = 0.1 * Geodesic.tol2_ / math.sqrt( max(0.001, abs(self._f)) *
- min(1.0, 1-self._f/2) / 2 )
- if not(Math.isfinite(self._a) and self._a > 0):
+ self._etol2 = 0.1 * Geodesic.tol2_ / math.sqrt( max(0.001, abs(self.f)) *
+ min(1.0, 1-self.f/2) / 2 )
+ if not(Math.isfinite(self.a) and self.a > 0):
raise ValueError("Major radius is not positive")
if not(Math.isfinite(self._b) and self._b > 0):
raise ValueError("Minor radius is not positive")
self._A3x = list(range(Geodesic.nA3x_))
self._C3x = list(range(Geodesic.nC3x_))
self._C4x = list(range(Geodesic.nC4x_))
- self.A3coeff()
- self.C3coeff()
- self.C4coeff()
+ self._A3coeff()
+ self._C3coeff()
+ self._C4coeff()
- def A3coeff(self):
+ def _A3coeff(self):
"""Private: return coefficients for A3"""
coeff = [
-3, 128,
@@ -319,7 +336,7 @@ class Geodesic(object):
k += 1
o += m + 2
- def C3coeff(self):
+ def _C3coeff(self):
"""Private: return coefficients for C3"""
coeff = [
3, 128,
@@ -346,7 +363,7 @@ class Geodesic(object):
k += 1
o += m + 2
- def C4coeff(self):
+ def _C4coeff(self):
"""Private: return coefficients for C4"""
coeff = [
97, 15015,
@@ -379,12 +396,12 @@ class Geodesic(object):
k += 1
o += m + 2
- def A3f(self, eps):
+ def _A3f(self, eps):
"""Private: return A3"""
# Evaluate A3
return Math.polyval(Geodesic.nA3_ - 1, self._A3x, 0, eps)
- def C3f(self, eps, c):
+ def _C3f(self, eps, c):
"""Private: return C3"""
# Evaluate C3
# Elements c[1] thru c[nC3_ - 1] are set
@@ -396,7 +413,7 @@ class Geodesic(object):
c[l] = mult * Math.polyval(m, self._C3x, o, eps)
o += m + 1
- def C4f(self, eps, c):
+ def _C4f(self, eps, c):
"""Private: return C4"""
# Evaluate C4 coeffs by Horner's method
# Elements c[0] thru c[nC4_ - 1] are set
@@ -409,7 +426,7 @@ class Geodesic(object):
mult *= eps
# return s12b, m12b, m0, M12, M21
- def Lengths(self, eps, sig12,
+ def _Lengths(self, eps, sig12,
ssig1, csig1, dn1, ssig2, csig2, dn2, cbet1, cbet2, outmask,
# Scratch areas of the right size
C1a, C2a):
@@ -425,29 +442,29 @@ class Geodesic(object):
s12b = m12b = m0 = M12 = M21 = Math.nan
if outmask & (Geodesic.DISTANCE | Geodesic.REDUCEDLENGTH |
Geodesic.GEODESICSCALE):
- A1 = Geodesic.A1m1f(eps)
- Geodesic.C1f(eps, C1a)
+ A1 = Geodesic._A1m1f(eps)
+ Geodesic._C1f(eps, C1a)
if outmask & (Geodesic.REDUCEDLENGTH | Geodesic.GEODESICSCALE):
- A2 = Geodesic.A2m1f(eps)
- Geodesic.C2f(eps, C2a)
+ A2 = Geodesic._A2m1f(eps)
+ Geodesic._C2f(eps, C2a)
m0x = A1 - A2
A2 = 1 + A2
A1 = 1 + A1
if outmask & Geodesic.DISTANCE:
- B1 = (Geodesic.SinCosSeries(True, ssig2, csig2, C1a) -
- Geodesic.SinCosSeries(True, ssig1, csig1, C1a))
+ B1 = (Geodesic._SinCosSeries(True, ssig2, csig2, C1a) -
+ Geodesic._SinCosSeries(True, ssig1, csig1, C1a))
# Missing a factor of _b
s12b = A1 * (sig12 + B1)
if outmask & (Geodesic.REDUCEDLENGTH | Geodesic.GEODESICSCALE):
- B2 = (Geodesic.SinCosSeries(True, ssig2, csig2, C2a) -
- Geodesic.SinCosSeries(True, ssig1, csig1, C2a))
+ B2 = (Geodesic._SinCosSeries(True, ssig2, csig2, C2a) -
+ Geodesic._SinCosSeries(True, ssig1, csig1, C2a))
J12 = m0x * sig12 + (A1 * B1 - A2 * B2)
elif outmask & (Geodesic.REDUCEDLENGTH | Geodesic.GEODESICSCALE):
# Assume here that nC1_ >= nC2_
for l in range(1, Geodesic.nC2_):
C2a[l] = A1 * C1a[l] - A2 * C2a[l]
- J12 = m0x * sig12 + (Geodesic.SinCosSeries(True, ssig2, csig2, C2a) -
- Geodesic.SinCosSeries(True, ssig1, csig1, C2a))
+ J12 = m0x * sig12 + (Geodesic._SinCosSeries(True, ssig2, csig2, C2a) -
+ Geodesic._SinCosSeries(True, ssig1, csig1, C2a))
if outmask & Geodesic.REDUCEDLENGTH:
m0 = m0x
# Missing a factor of _b.
@@ -463,7 +480,8 @@ class Geodesic(object):
return s12b, m12b, m0, M12, M21
# return sig12, salp1, calp1, salp2, calp2, dnm
- def InverseStart(self, sbet1, cbet1, dn1, sbet2, cbet2, dn2, lam12,
+ def _InverseStart(self, sbet1, cbet1, dn1, sbet2, cbet2, dn2,
+ lam12, slam12, clam12,
# Scratch areas of the right size
C1a, C2a):
"""Private: Find a starting value for Newton's method."""
@@ -483,15 +501,16 @@ class Geodesic(object):
sbet12a += cbet2 * sbet1
shortline = cbet12 >= 0 and sbet12 < 0.5 and cbet2 * lam12 < 0.5
- omg12 = lam12
if shortline:
sbetm2 = Math.sq(sbet1 + sbet2)
# sin((bet1+bet2)/2)^2
# = (sbet1 + sbet2)^2 / ((sbet1 + sbet2)^2 + (cbet1 + cbet2)^2)
sbetm2 /= sbetm2 + Math.sq(cbet1 + cbet2)
dnm = math.sqrt(1 + self._ep2 * sbetm2)
- omg12 /= self._f1 * dnm
- somg12 = math.sin(omg12); comg12 = math.cos(omg12)
+ omg12 = lam12 / (self._f1 * dnm)
+ somg12 = math.sin(omg12); comg12 = math.cos(omg12)
+ else:
+ somg12 = slam12; comg12 = clam12
salp1 = cbet2 * somg12
calp1 = (
@@ -522,13 +541,14 @@ class Geodesic(object):
# 56.320923501171 0 -56.320923501171 179.664747671772880215
# which otherwise fails with g++ 4.4.4 x86 -O3
# volatile real x
- if self._f >= 0: # In fact f == 0 does not get here
+ lam12x = math.atan2(-slam12, -clam12)
+ if self.f >= 0: # In fact f == 0 does not get here
# x = dlong, y = dlat
k2 = Math.sq(sbet1) * self._ep2
eps = k2 / (2 * (1 + math.sqrt(1 + k2)) + k2)
- lamscale = self._f * cbet1 * self.A3f(eps) * math.pi
+ lamscale = self.f * cbet1 * self._A3f(eps) * math.pi
betscale = lamscale * cbet1
- x = (lam12 - math.pi) / lamscale
+ x = lam12x / lamscale
y = sbet12a / betscale
else: # _f < 0
# x = dlat, y = dlong
@@ -537,18 +557,18 @@ class Geodesic(object):
# real m12b, m0, dummy
# In the case of lon12 = 180, this repeats a calculation made in
# Inverse.
- dummy, m12b, m0, dummy, dummy = self.Lengths(
+ dummy, m12b, m0, dummy, dummy = self._Lengths(
self._n, math.pi + bet12a, sbet1, -cbet1, dn1, sbet2, cbet2, dn2,
cbet1, cbet2, Geodesic.REDUCEDLENGTH, C1a, C2a)
x = -1 + m12b / (cbet1 * cbet2 * m0 * math.pi)
betscale = (sbet12a / x if x < -0.01
- else -self._f * Math.sq(cbet1) * math.pi)
+ else -self.f * Math.sq(cbet1) * math.pi)
lamscale = betscale / cbet1
- y = (lam12 - math.pi) / lamscale
+ y = lam12x / lamscale
if y > -Geodesic.tol1_ and x > -1 - Geodesic.xthresh_:
# strip near cut
- if self._f >= 0:
+ if self.f >= 0:
salp1 = min(1.0, -x); calp1 = - math.sqrt(1 - Math.sq(salp1))
else:
calp1 = max((0.0 if x > -Geodesic.tol1_ else -1.0), x)
@@ -588,8 +608,8 @@ class Geodesic(object):
# 6 56 0
#
# Because omg12 is near pi, estimate work with omg12a = pi - omg12
- k = Geodesic.Astroid(x, y)
- omg12a = lamscale * ( -x * k/(1 + k) if self._f >= 0
+ k = Geodesic._Astroid(x, y)
+ omg12a = lamscale * ( -x * k/(1 + k) if self.f >= 0
else -y * (1 + k)/k )
somg12 = math.sin(omg12a); comg12 = -math.cos(omg12a)
# Update spherical estimate of alp1 using omg12 instead of lam12
@@ -603,8 +623,9 @@ class Geodesic(object):
return sig12, salp1, calp1, salp2, calp2, dnm
# return lam12, salp2, calp2, sig12, ssig1, csig1, ssig2, csig2, eps,
- # domg12, dlam12
- def Lambda12(self, sbet1, cbet1, dn1, sbet2, cbet2, dn2, salp1, calp1, diffp,
+ # somg12, comg12, dlam12
+ def _Lambda12(self, sbet1, cbet1, dn1, sbet2, cbet2, dn2, salp1, calp1,
+ slam120, clam120, diffp,
# Scratch areas of the right size
C1a, C2a, C3a):
"""Private: Solve hybrid problem"""
@@ -617,7 +638,7 @@ class Geodesic(object):
salp0 = salp1 * cbet1
calp0 = math.hypot(calp1, salp1 * sbet1) # calp0 > 0
- # real somg1, comg1, somg2, comg2, omg12, lam12
+ # real somg1, comg1, somg2, comg2, lam12
# tan(bet1) = tan(sig1) * cos(alp1)
# tan(omg1) = sin(alp0) * tan(sig1) = tan(omg1)=tan(alp1)*sin(bet1)
ssig1 = sbet1; somg1 = salp0 * sbet1
@@ -650,23 +671,25 @@ class Geodesic(object):
csig1 * csig2 + ssig1 * ssig2)
# omg12 = omg2 - omg1, limit to [0, pi]
- omg12 = math.atan2(max(0.0, comg1 * somg2 - somg1 * comg2),
- comg1 * comg2 + somg1 * somg2)
- # real B312, h0
+ somg12 = max(0.0, comg1 * somg2 - somg1 * comg2)
+ comg12 = comg1 * comg2 + somg1 * somg2
+ # eta = omg12 - lam120
+ eta = math.atan2(somg12 * clam120 - comg12 * slam120,
+ comg12 * clam120 + somg12 * slam120)
+
+ # real B312
k2 = Math.sq(calp0) * self._ep2
eps = k2 / (2 * (1 + math.sqrt(1 + k2)) + k2)
- self.C3f(eps, C3a)
- B312 = (Geodesic.SinCosSeries(True, ssig2, csig2, C3a) -
- Geodesic.SinCosSeries(True, ssig1, csig1, C3a))
- h0 = -self._f * self.A3f(eps)
- domg12 = salp0 * h0 * (sig12 + B312)
- lam12 = omg12 + domg12
+ self._C3f(eps, C3a)
+ B312 = (Geodesic._SinCosSeries(True, ssig2, csig2, C3a) -
+ Geodesic._SinCosSeries(True, ssig1, csig1, C3a))
+ lam12 = eta - self.f * self._A3f(eps) * salp0 * (sig12 + B312)
if diffp:
if calp2 == 0:
dlam12 = - 2 * self._f1 * dn1 / sbet1
else:
- dummy, dlam12, dummy, dummy, dummy = self.Lengths(
+ dummy, dlam12, dummy, dummy, dummy = self._Lengths(
eps, sig12, ssig1, csig1, dn1, ssig2, csig2, dn2, cbet1, cbet2,
Geodesic.REDUCEDLENGTH, C1a, C2a)
dlam12 *= self._f1 / (calp2 * cbet2)
@@ -674,22 +697,29 @@ class Geodesic(object):
dlam12 = Math.nan
return (lam12, salp2, calp2, sig12, ssig1, csig1, ssig2, csig2, eps,
- domg12, dlam12)
+ somg12, comg12, dlam12)
- # return a12, s12, azi1, azi2, m12, M12, M21, S12
- def GenInverse(self, lat1, lon1, lat2, lon2, outmask):
+ # return a12, s12, salp1, calp1, salp2, calp2, m12, M12, M21, S12
+ def _GenInverse(self, lat1, lon1, lat2, lon2, outmask):
"""Private: General version of the inverse problem"""
- a12 = s12 = azi1 = azi2 = m12 = M12 = M21 = S12 = Math.nan # return vals
+ a12 = s12 = m12 = M12 = M21 = S12 = Math.nan # return vals
outmask &= Geodesic.OUT_MASK
# Compute longitude difference (AngDiff does this carefully). Result is
# in [-180, 180] but -180 is only for west-going geodesics. 180 is for
# east-going and meridional geodesics.
- # If very close to being on the same half-meridian, then make it so.
- lon12 = Math.AngRound(Math.AngDiff(lon1, lon2))
+ lon12, lon12s = Math.AngDiff(lon1, lon2)
# Make longitude difference positive.
lonsign = 1 if lon12 >= 0 else -1
- lon12 *= lonsign
+ # If very close to being on the same half-meridian, then make it so.
+ lon12 = lonsign * Math.AngRound(lon12)
+ lon12s = Math.AngRound((180 - lon12) - lonsign * lon12s)
+ lam12 = math.radians(lon12)
+ if lon12 > 90:
+ slam12, clam12 = Math.sincosd(lon12s); clam12 = -clam12
+ else:
+ slam12, clam12 = Math.sincosd(lon12)
+
# If really close to the equator, treat as on equator.
lat1 = Math.AngRound(Math.LatFix(lat1))
lat2 = Math.AngRound(Math.LatFix(lat2))
@@ -743,9 +773,6 @@ class Geodesic(object):
dn1 = math.sqrt(1 + self._ep2 * Math.sq(sbet1))
dn2 = math.sqrt(1 + self._ep2 * Math.sq(sbet2))
- lam12 = math.radians(lon12)
- slam12, clam12 = Math.sincosd(lon12)
-
# real a12, sig12, calp1, salp1, calp2, salp2
# index zero elements of these arrays are unused
C1a = list(range(Geodesic.nC1_ + 1))
@@ -760,7 +787,7 @@ class Geodesic(object):
# a meridian.
calp1 = clam12; salp1 = slam12 # Head to the target longitude
- calp2 = 1; salp2 = 0 # At the target we're heading north
+ calp2 = 1.0; salp2 = 0.0 # At the target we're heading north
# tan(bet) = tan(sig) * cos(alp)
ssig1 = sbet1; csig1 = calp1 * cbet1
@@ -770,7 +797,7 @@ class Geodesic(object):
sig12 = math.atan2(max(0.0, csig1 * ssig2 - ssig1 * csig2),
csig1 * csig2 + ssig1 * ssig2)
- s12x, m12x, dummy, M12, M21 = self.Lengths(
+ s12x, m12x, dummy, M12, M21 = self._Lengths(
self._n, sig12, ssig1, csig1, dn1, ssig2, csig2, dn2, cbet1, cbet2,
outmask | Geodesic.DISTANCE | Geodesic.REDUCEDLENGTH, C1a, C2a)
@@ -783,7 +810,7 @@ class Geodesic(object):
# not a shortest path.
if sig12 < 1 or m12x >= 0:
if sig12 < 3 * Geodesic.tiny_:
- sig12 = m12x = s12x = 0
+ sig12 = m12x = s12x = 0.0
m12x *= self._b
s12x *= self._b
a12 = math.degrees(sig12)
@@ -792,15 +819,16 @@ class Geodesic(object):
meridian = False
# end if meridian:
- #real omg12
+ # somg12 > 1 marks that it needs to be calculated
+ somg12 = 2.0; omg12 = 0.0
if (not meridian and
sbet1 == 0 and # and sbet2 == 0
# Mimic the way Lambda12 works with calp1 = 0
- (self._f <= 0 or lam12 <= math.pi - self._f * math.pi)):
+ (self.f <= 0 or lon12s >= self.f * 180)):
# Geodesic runs along equator
- calp1 = calp2 = 0; salp1 = salp2 = 1
- s12x = self._a * lam12
+ calp1 = calp2 = 0.0; salp1 = salp2 = 1.0
+ s12x = self.a * lam12
sig12 = omg12 = lam12 / self._f1
m12x = self._b * math.sin(sig12)
if outmask & Geodesic.GEODESICSCALE:
@@ -813,8 +841,8 @@ class Geodesic(object):
# meridian and geodesic is neither meridional or equatorial.
# Figure a starting point for Newton's method
- sig12, salp1, calp1, salp2, calp2, dnm = self.InverseStart(
- sbet1, cbet1, dn1, sbet2, cbet2, dn2, lam12, C1a, C2a)
+ sig12, salp1, calp1, salp2, calp2, dnm = self._InverseStart(
+ sbet1, cbet1, dn1, sbet2, cbet2, dn2, lam12, slam12, clam12, C1a, C2a)
if sig12 >= 0:
# Short lines (InverseStart sets salp2, calp2, dnm)
@@ -841,20 +869,20 @@ class Geodesic(object):
numit = 0
tripn = tripb = False
# Bracketing range
- salp1a = Geodesic.tiny_; calp1a = 1
- salp1b = Geodesic.tiny_; calp1b = -1
+ salp1a = Geodesic.tiny_; calp1a = 1.0
+ salp1b = Geodesic.tiny_; calp1b = -1.0
while numit < Geodesic.maxit2_:
# the WGS84 test set: mean = 1.47, sd = 1.25, max = 16
# WGS84 and random input: mean = 2.85, sd = 0.60
- (nlam12, salp2, calp2, sig12, ssig1, csig1, ssig2, csig2,
- eps, omg12, dv) = self.Lambda12(
+ (v, salp2, calp2, sig12, ssig1, csig1, ssig2, csig2,
+ eps, somg12, comg12, dv) = self._Lambda12(
sbet1, cbet1, dn1, sbet2, cbet2, dn2,
- salp1, calp1, numit < Geodesic.maxit1_, C1a, C2a, C3a)
- v = nlam12 - lam12
+ salp1, calp1, slam12, clam12, numit < Geodesic.maxit1_,
+ C1a, C2a, C3a)
# 2 * tol0 is approximately 1 ulp for a number in [0, pi].
# Reversed test to allow escape with NaNs
- if tripb or not (abs(v) >= (8 if tripn else 2) * Geodesic.tol0_):
+ if tripb or not (abs(v) >= (8 if tripn else 1) * Geodesic.tol0_):
break
# Update bracketing values
if v > 0 and (numit > Geodesic.maxit1_ or
@@ -897,21 +925,20 @@ class Geodesic(object):
if (outmask & (Geodesic.REDUCEDLENGTH |
Geodesic.GEODESICSCALE))
else Geodesic.EMPTY))
- s12x, m12x, dummy, M12, M21 = self.Lengths(
+ s12x, m12x, dummy, M12, M21 = self._Lengths(
eps, sig12, ssig1, csig1, dn1, ssig2, csig2, dn2, cbet1, cbet2,
lengthmask, C1a, C2a)
m12x *= self._b
s12x *= self._b
a12 = math.degrees(sig12)
- omg12 = lam12 - omg12
# end elif not meridian
if outmask & Geodesic.DISTANCE:
- s12 = 0 + s12x # Convert -0 to 0
+ s12 = 0.0 + s12x # Convert -0 to 0
if outmask & Geodesic.REDUCEDLENGTH:
- m12 = 0 + m12x # Convert -0 to 0
+ m12 = 0.0 + m12x # Convert -0 to 0
if outmask & Geodesic.AREA:
# From Lambda12: sin(alp1) * cos(bet1) = sin(alp0)
@@ -925,25 +952,32 @@ class Geodesic(object):
k2 = Math.sq(calp0) * self._ep2
eps = k2 / (2 * (1 + math.sqrt(1 + k2)) + k2)
# Multiplier = a^2 * e^2 * cos(alpha0) * sin(alpha0).
- A4 = Math.sq(self._a) * calp0 * salp0 * self._e2
+ A4 = Math.sq(self.a) * calp0 * salp0 * self._e2
ssig1, csig1 = Math.norm(ssig1, csig1)
ssig2, csig2 = Math.norm(ssig2, csig2)
C4a = list(range(Geodesic.nC4_))
- self.C4f(eps, C4a)
- B41 = Geodesic.SinCosSeries(False, ssig1, csig1, C4a)
- B42 = Geodesic.SinCosSeries(False, ssig2, csig2, C4a)
+ self._C4f(eps, C4a)
+ B41 = Geodesic._SinCosSeries(False, ssig1, csig1, C4a)
+ B42 = Geodesic._SinCosSeries(False, ssig2, csig2, C4a)
S12 = A4 * (B42 - B41)
else:
# Avoid problems with indeterminate sig1, sig2 on equator
- S12 = 0
+ S12 = 0.0
+
+ if not meridian:
+ if somg12 > 1:
+ somg12 = math.sin(omg12); comg12 = math.cos(omg12)
+ else:
+ somg12, comg12 = Math.norm(somg12, comg12)
+
if (not meridian and
- omg12 < 0.75 * math.pi and # Long difference too big
- sbet2 - sbet1 < 1.75): # Lat difference too big
+ # omg12 < 3/4 * pi
+ comg12 > -0.7071 and # Long difference not too big
+ sbet2 - sbet1 < 1.75): # Lat difference not too big
# Use tan(Gamma/2) = tan(omg12/2)
# * (tan(bet1/2)+tan(bet2/2))/(1+tan(bet1/2)*tan(bet2/2))
# with tan(x/2) = sin(x)/(1+cos(x))
- somg12 = math.sin(omg12); domg12 = 1 + math.cos(omg12)
- dbet1 = 1 + cbet1; dbet2 = 1 + cbet2
+ domg12 = 1 + comg12; dbet1 = 1 + cbet1; dbet2 = 1 + cbet2
alp12 = 2 * math.atan2( somg12 * ( sbet1 * dbet2 + sbet2 * dbet1 ),
domg12 * ( sbet1 * sbet2 + dbet1 * dbet2 ) )
else:
@@ -956,12 +990,12 @@ class Geodesic(object):
# behavior.
if salp12 == 0 and calp12 < 0:
salp12 = Geodesic.tiny_ * calp1
- calp12 = -1
+ calp12 = -1.0
alp12 = math.atan2(salp12, calp12)
S12 += self._c2 * alp12
S12 *= swapp * lonsign * latsign
# Convert -0 to 0
- S12 += 0
+ S12 += 0.0
# Convert calp, salp to azimuth accounting for lonsign, swapp, latsign.
if swapp < 0:
@@ -973,90 +1007,44 @@ class Geodesic(object):
salp1 *= swapp * lonsign; calp1 *= swapp * latsign
salp2 *= swapp * lonsign; calp2 *= swapp * latsign
- if outmask & Geodesic.AZIMUTH:
- # minus signs give range [-180, 180). 0- converts -0 to +0.
- azi1 = Math.atan2d(salp1, calp1)
- azi2 = Math.atan2d(salp2, calp2)
-
- # Returned value in [0, 180]
- return a12, s12, azi1, azi2, m12, M12, M21, S12
-
- def CheckPosition(lat, lon):
- """Check that lat and lon are legal and return normalized lon"""
- if abs(lat) > 90:
- raise ValueError("latitude " + str(lat) + " not in [-90, 90]")
- # if not Math.isfinite(lon):
- # raise ValueError("longitude " + str(lon) + " not a finite number")
- return Math.AngNormalize(lon)
- CheckPosition = staticmethod(CheckPosition)
-
- def CheckAzimuth(azi):
- """Check that azi is legal and return normalized value"""
- # if not Math.isfinite(azi):
- # raise ValueError("azimuth " + str(azi) + " not a finite number")
- return Math.AngNormalize(azi)
- CheckAzimuth = staticmethod(CheckAzimuth)
-
- def CheckDistance(s):
- """Check that s is a legal distance"""
- # if not Math.isfinite(s):
- # raise ValueError("distance " + str(s) + " not a finite number")
- CheckDistance = staticmethod(CheckDistance)
-
- def Inverse(self, lat1, lon1, lat2, lon2, outmask = STANDARD):
- """Solve the inverse geodesic problem. Compute geodesic between (lat1,
- lon1) and (lat2, lon2). Return a dictionary with (some) of the
- following entries:
-
- lat1 latitude of point 1
- lon1 longitude of point 1
- azi1 azimuth of line at point 1
- lat2 latitude of point 2
- lon2 longitude of point 2
- azi2 azimuth of line at point 2
- s12 distance from 1 to 2
- a12 arc length on auxiliary sphere from 1 to 2
- m12 reduced length of geodesic
- M12 geodesic scale 2 relative to 1
- M21 geodesic scale 1 relative to 2
- S12 area between geodesic and equator
-
- outmask determines which fields get included and if outmask is
- omitted, then only the basic geodesic fields are computed. The mask
- is an or'ed combination of the following values
-
- Geodesic.AZIMUTH
- Geodesic.DISTANCE
- Geodesic.STANDARD (all of the above)
- Geodesic.REDUCEDLENGTH
- Geodesic.GEODESICSCALE
- Geodesic.AREA
- Geodesic.ALL (all of the above)
- Geodesic.LONG_UNROLL
-
- If Geodesic.LONG_UNROLL is set, then lon1 is unchanged and lon2 -
- lon1 indicates whether the geodesic is east going or west going.
- Otherwise lon1 and lon2 are both reduced to the range [-180,180).
-
- The default value of outmask is STANDARD.
+ return a12, s12, salp1, calp1, salp2, calp2, m12, M12, M21, S12
+
+ def Inverse(self, lat1, lon1, lat2, lon2,
+ outmask = GeodesicCapability.STANDARD):
+ """Solve the inverse geodesic problem
+
+ :param lat1: latitude of the first point in degrees
+ :param lon1: longitude of the first point in degrees
+ :param lat2: latitude of the second point in degrees
+ :param lon2: longitude of the second point in degrees
+ :param outmask: the :ref:`output mask <outmask>`
+ :return: a :ref:`dict`
+
+ Compute geodesic between (*lat1*, *lon1*) and (*lat2*, *lon2*).
+ The default value of *outmask* is STANDARD, i.e., the *lat1*,
+ *lon1*, *azi1*, *lat2*, *lon2*, *azi2*, *s12*, *a12* entries are
+ returned.
"""
- lon1a = Geodesic.CheckPosition(lat1, lon1)
- lon2a = Geodesic.CheckPosition(lat2, lon2)
+ a12, s12, salp1,calp1, salp2,calp2, m12, M12, M21, S12 = self._GenInverse(
+ lat1, lon1, lat2, lon2, outmask)
+ outmask &= Geodesic.OUT_MASK
if outmask & Geodesic.LONG_UNROLL:
- lon2 = lon1 + Math.AngDiff(lon1a, lon2a)
+ lon12, e = Math.AngDiff(lon1, lon2)
+ lon2 = (lon1 + lon12) + e
else:
- lon1 = lon1a; lon2 = lon2a
-
- result = {'lat1': lat1, 'lon1': lon1, 'lat2': lat2, 'lon2': lon2}
- a12, s12, azi1, azi2, m12, M12, M21, S12 = self.GenInverse(
- lat1, lon1a, lat2, lon2a, outmask)
- outmask &= Geodesic.OUT_MASK
+ lon2 = Math.AngNormalize(lon2)
+ result = {'lat1': Math.LatFix(lat1),
+ 'lon1': lon1 if outmask & Geodesic.LONG_UNROLL else
+ Math.AngNormalize(lon1),
+ 'lat2': Math.LatFix(lat2),
+ 'lon2': lon2}
result['a12'] = a12
if outmask & Geodesic.DISTANCE: result['s12'] = s12
if outmask & Geodesic.AZIMUTH:
- result['azi1'] = azi1; result['azi2'] = azi2
+ result['azi1'] = Math.atan2d(salp1, calp1)
+ result['azi2'] = Math.atan2d(salp2, calp2)
if outmask & Geodesic.REDUCEDLENGTH: result['m12'] = m12
if outmask & Geodesic.GEODESICSCALE:
result['M12'] = M12; result['M21'] = M21
@@ -1064,67 +1052,41 @@ class Geodesic(object):
return result
# return a12, lat2, lon2, azi2, s12, m12, M12, M21, S12
- def GenDirect(self, lat1, lon1, azi1, arcmode, s12_a12, outmask):
+ def _GenDirect(self, lat1, lon1, azi1, arcmode, s12_a12, outmask):
"""Private: General version of direct problem"""
from geographiclib.geodesicline import GeodesicLine
- line = GeodesicLine(
- self, lat1, lon1, azi1,
- # Automatically supply DISTANCE_IN if necessary
- outmask | (Geodesic.EMPTY if arcmode else Geodesic.DISTANCE_IN))
- return line.GenPosition(arcmode, s12_a12, outmask)
-
- def Direct(self, lat1, lon1, azi1, s12, outmask = STANDARD):
- """Solve the direct geodesic problem. Compute geodesic starting at
- (lat1, lon1) with azimuth azi1 and length s12. Return a dictionary
- with (some) of the following entries:
-
- lat1 latitude of point 1
- lon1 longitude of point 1
- azi1 azimuth of line at point 1
- lat2 latitude of point 2
- lon2 longitude of point 2
- azi2 azimuth of line at point 2
- s12 distance from 1 to 2
- a12 arc length on auxiliary sphere from 1 to 2
- m12 reduced length of geodesic
- M12 geodesic scale 2 relative to 1
- M21 geodesic scale 1 relative to 2
- S12 area between geodesic and equator
-
- outmask determines which fields get included and if outmask is
- omitted, then only the basic geodesic fields are computed. The mask
- is an or'ed combination of the following values
-
- Geodesic.LATITUDE
- Geodesic.LONGITUDE
- Geodesic.AZIMUTH
- Geodesic.STANDARD (all of the above)
- Geodesic.REDUCEDLENGTH
- Geodesic.GEODESICSCALE
- Geodesic.AREA
- Geodesic.ALL (all of the above)
- Geodesic.LONG_UNROLL
-
- The LONG_UNROLL bit unrolls the longitudes (instead of reducing them
- to the range [-180,180)); the quantity lon2 - lon1 then indicates
- how many times and in what sense the geodesic encircles the
- ellipsoid.
-
- The default value of outmask is STANDARD.
+ # Automatically supply DISTANCE_IN if necessary
+ if not arcmode: outmask |= Geodesic.DISTANCE_IN
+ line = GeodesicLine(self, lat1, lon1, azi1, outmask)
+ return line._GenPosition(arcmode, s12_a12, outmask)
+
+ def Direct(self, lat1, lon1, azi1, s12,
+ outmask = GeodesicCapability.STANDARD):
+ """Solve the direct geodesic problem
+
+ :param lat1: latitude of the first point in degrees
+ :param lon1: longitude of the first point in degrees
+ :param azi1: azimuth at the first point in degrees
+ :param s12: the distance from the first point to the second in
+ meters
+ :param outmask: the :ref:`output mask <outmask>`
+ :return: a :ref:`dict`
+
+ Compute geodesic starting at (*lat1*, *lon1*) with azimuth *azi1*
+ and length *s12*. The default value of *outmask* is STANDARD, i.e.,
+ the *lat1*, *lon1*, *azi1*, *lat2*, *lon2*, *azi2*, *s12*, *a12*
+ entries are returned.
"""
- if outmask & Geodesic.LONG_UNROLL:
- Geodesic.CheckPosition(lat1, lon1)
- else:
- lon1 = Geodesic.CheckPosition(lat1, lon1)
- azi1 = Geodesic.CheckAzimuth(azi1)
- Geodesic.CheckDistance(s12)
-
- result = {'lat1': lat1, 'lon1': lon1, 'azi1': azi1, 's12': s12}
- a12, lat2, lon2, azi2, s12, m12, M12, M21, S12 = self.GenDirect(
+ a12, lat2, lon2, azi2, s12, m12, M12, M21, S12 = self._GenDirect(
lat1, lon1, azi1, False, s12, outmask)
outmask &= Geodesic.OUT_MASK
+ result = {'lat1': Math.LatFix(lat1),
+ 'lon1': lon1 if outmask & Geodesic.LONG_UNROLL else
+ Math.AngNormalize(lon1),
+ 'azi1': Math.AngNormalize(azi1),
+ 's12': s12}
result['a12'] = a12
if outmask & Geodesic.LATITUDE: result['lat2'] = lat2
if outmask & Geodesic.LONGITUDE: result['lon2'] = lon2
@@ -1135,56 +1097,33 @@ class Geodesic(object):
if outmask & Geodesic.AREA: result['S12'] = S12
return result
- def ArcDirect(self, lat1, lon1, azi1, a12, outmask = STANDARD):
- """Solve the direct geodesic problem. Compute geodesic starting at
- (lat1, lon1) with azimuth azi1 and spherical arc length a12. Return
- a dictionary with (some) of the following entries:
-
- lat1 latitude of point 1
- lon1 longitude of point 1
- azi1 azimuth of line at point 1
- lat2 latitude of point 2
- lon2 longitude of point 2
- azi2 azimuth of line at point 2
- s12 distance from 1 to 2
- a12 arc length on auxiliary sphere from 1 to 2
- m12 reduced length of geodesic
- M12 geodesic scale 2 relative to 1
- M21 geodesic scale 1 relative to 2
- S12 area between geodesic and equator
-
- outmask determines which fields get included and if outmask is
- omitted, then only the basic geodesic fields are computed. The
- LONG_UNROLL bit unrolls the longitudes (instead of reducing them to
- the range [-180,180)). The mask is an or'ed combination of the
- following values
-
- Geodesic.LATITUDE
- Geodesic.LONGITUDE
- Geodesic.AZIMUTH
- Geodesic.DISTANCE
- Geodesic.STANDARD (all of the above)
- Geodesic.REDUCEDLENGTH
- Geodesic.GEODESICSCALE
- Geodesic.AREA
- Geodesic.ALL (all of the above)
- Geodesic.LONG_UNROLL
-
- The default value of outmask is STANDARD.
+ def ArcDirect(self, lat1, lon1, azi1, a12,
+ outmask = GeodesicCapability.STANDARD):
+ """Solve the direct geodesic problem in terms of spherical arc length
- """
+ :param lat1: latitude of the first point in degrees
+ :param lon1: longitude of the first point in degrees
+ :param azi1: azimuth at the first point in degrees
+ :param a12: spherical arc length from the first point to the second
+ in degrees
+ :param outmask: the :ref:`output mask <outmask>`
+ :return: a :ref:`dict`
- if outmask & Geodesic.LONG_UNROLL:
- Geodesic.CheckPosition(lat1, lon1)
- else:
- lon1 = Geodesic.CheckPosition(lat1, lon1)
- azi1 = Geodesic.CheckAzimuth(azi1)
- Geodesic.CheckDistance(a12)
+ Compute geodesic starting at (*lat1*, *lon1*) with azimuth *azi1*
+ and arc length *a12*. The default value of *outmask* is STANDARD,
+ i.e., the *lat1*, *lon1*, *azi1*, *lat2*, *lon2*, *azi2*, *s12*,
+ *a12* entries are returned.
- result = {'lat1': lat1, 'lon1': lon1, 'azi1': azi1, 'a12': a12}
- a12, lat2, lon2, azi2, s12, m12, M12, M21, S12 = self.GenDirect(
+ """
+
+ a12, lat2, lon2, azi2, s12, m12, M12, M21, S12 = self._GenDirect(
lat1, lon1, azi1, True, a12, outmask)
outmask &= Geodesic.OUT_MASK
+ result = {'lat1': Math.LatFix(lat1),
+ 'lon1': lon1 if outmask & Geodesic.LONG_UNROLL else
+ Math.AngNormalize(lon1),
+ 'azi1': Math.AngNormalize(azi1),
+ 'a12': a12}
if outmask & Geodesic.DISTANCE: result['s12'] = s12
if outmask & Geodesic.LATITUDE: result['lat2'] = lat2
if outmask & Geodesic.LONGITUDE: result['lon2'] = lon2
@@ -1195,56 +1134,153 @@ class Geodesic(object):
if outmask & Geodesic.AREA: result['S12'] = S12
return result
- def Line(self, lat1, lon1, azi1, caps = ALL):
- """Return a GeodesicLine object to compute points along a geodesic
- starting at lat1, lon1, with azimuth azi1. caps is an or'ed
- combination of bit the following values indicating the capabilities
- of the returned object
-
- Geodesic.LATITUDE
- Geodesic.LONGITUDE
- Geodesic.AZIMUTH
- Geodesic.DISTANCE
- Geodesic.STANDARD (all of the above)
- Geodesic.REDUCEDLENGTH
- Geodesic.GEODESICSCALE
- Geodesic.AREA
- Geodesic.DISTANCE_IN
- Geodesic.ALL (all of the above)
-
- The default value of caps is ALL.
+ def Line(self, lat1, lon1, azi1,
+ caps = GeodesicCapability.STANDARD | GeodesicCapability.DISTANCE_IN):
+ """Return a GeodesicLine object
+
+ :param lat1: latitude of the first point in degrees
+ :param lon1: longitude of the first point in degrees
+ :param azi1: azimuth at the first point in degrees
+ :param caps: the :ref:`capabilities <outmask>`
+ :return: a :class:`~geographiclib.geodesicline.GeodesicLine`
+
+ This allows points along a geodesic starting at (*lat1*, *lon1*),
+ with azimuth *azi1* to be found. The default value of *caps* is
+ STANDARD | DISTANCE_IN, allowing direct geodesic problem to be
+ solved.
"""
from geographiclib.geodesicline import GeodesicLine
- lon1 = Geodesic.CheckPosition(lat1, lon1)
- azi1 = Geodesic.CheckAzimuth(azi1)
- return GeodesicLine(
- self, lat1, lon1, azi1,
- # Automatically supply DISTANCE_IN
- caps | Geodesic.DISTANCE_IN)
-
- def Area(self, points, polyline = False):
- """Compute the area of a geodesic polygon given by points, an array of
- dictionaries with entries lat and lon. Return a dictionary with
- entries
-
- number the number of verices
- perimeter the perimeter
- area the area (counter-clockwise traversal positive)
-
- There is no need to "close" the polygon. If polyline is set to
- True, then the points define a polyline instead of a polygon, the
- length is returned as the perimeter, and the area is not returned.
+ return GeodesicLine(self, lat1, lon1, azi1, caps)
+
+ def _GenDirectLine(self, lat1, lon1, azi1, arcmode, s12_a12,
+ caps = GeodesicCapability.STANDARD |
+ GeodesicCapability.DISTANCE_IN):
+ """Private: general form of DirectLine"""
+ from geographiclib.geodesicline import GeodesicLine
+ # Automatically supply DISTANCE_IN if necessary
+ if not arcmode: caps |= Geodesic.DISTANCE_IN
+ line = GeodesicLine(self, lat1, lon1, azi1, caps)
+ if arcmode:
+ line.SetArc(s12_a12)
+ else:
+ line.SetDistance(s12_a12)
+ return line
+
+ def DirectLine(self, lat1, lon1, azi1, s12,
+ caps = GeodesicCapability.STANDARD |
+ GeodesicCapability.DISTANCE_IN):
+ """Define a GeodesicLine object in terms of the direct geodesic
+ problem specified in terms of spherical arc length
+
+ :param lat1: latitude of the first point in degrees
+ :param lon1: longitude of the first point in degrees
+ :param azi1: azimuth at the first point in degrees
+ :param s12: the distance from the first point to the second in
+ meters
+ :param caps: the :ref:`capabilities <outmask>`
+ :return: a :class:`~geographiclib.geodesicline.GeodesicLine`
+
+ This function sets point 3 of the GeodesicLine to correspond to
+ point 2 of the direct geodesic problem. The default value of *caps*
+ is STANDARD | DISTANCE_IN, allowing direct geodesic problem to be
+ solved.
+
+ """
+
+ return self._GenDirectLine(lat1, lon1, azi1, False, s12, caps)
+
+ def ArcDirectLine(self, lat1, lon1, azi1, a12,
+ caps = GeodesicCapability.STANDARD |
+ GeodesicCapability.DISTANCE_IN):
+ """Define a GeodesicLine object in terms of the direct geodesic
+ problem specified in terms of spherical arc length
+
+ :param lat1: latitude of the first point in degrees
+ :param lon1: longitude of the first point in degrees
+ :param azi1: azimuth at the first point in degrees
+ :param a12: spherical arc length from the first point to the second
+ in degrees
+ :param caps: the :ref:`capabilities <outmask>`
+ :return: a :class:`~geographiclib.geodesicline.GeodesicLine`
+
+ This function sets point 3 of the GeodesicLine to correspond to
+ point 2 of the direct geodesic problem. The default value of *caps*
+ is STANDARD | DISTANCE_IN, allowing direct geodesic problem to be
+ solved.
+
+ """
+
+ return self._GenDirectLine(lat1, lon1, azi1, True, a12, caps)
+
+ def InverseLine(self, lat1, lon1, lat2, lon2,
+ caps = GeodesicCapability.STANDARD |
+ GeodesicCapability.DISTANCE_IN):
+ """Define a GeodesicLine object in terms of the invese geodesic problem
+
+ :param lat1: latitude of the first point in degrees
+ :param lon1: longitude of the first point in degrees
+ :param lat2: latitude of the second point in degrees
+ :param lon2: longitude of the second point in degrees
+ :param caps: the :ref:`capabilities <outmask>`
+ :return: a :class:`~geographiclib.geodesicline.GeodesicLine`
+
+ This function sets point 3 of the GeodesicLine to correspond to
+ point 2 of the inverse geodesic problem. The default value of *caps*
+ is STANDARD | DISTANCE_IN, allowing direct geodesic problem to be
+ solved.
+
+ """
+
+ from geographiclib.geodesicline import GeodesicLine
+ a12, _, salp1, calp1, _, _, _, _, _, _ = self._GenInverse(
+ lat1, lon1, lat2, lon2, 0)
+ azi1 = Math.atan2d(salp1, calp1)
+ if caps & (Geodesic.OUT_MASK & Geodesic.DISTANCE_IN):
+ caps |= Geodesic.DISTANCE
+ line = GeodesicLine(self, lat1, lon1, azi1, caps, salp1, calp1)
+ line.SetArc(a12)
+ return line
+
+ def Polygon(self, polyline = False):
+ """Return a PolygonArea object
+
+ :param polyline: if True then the object describes a polyline
+ instead of a polygon
+ :return: a :class:`~geographiclib.polygonarea.PolygonArea`
"""
from geographiclib.polygonarea import PolygonArea
- for p in points:
- Geodesic.CheckPosition(p['lat'], p['lon'])
- num, perimeter, area = PolygonArea.Area(self, points, polyline)
- result = {'number': num, 'perimeter': perimeter}
- if not polyline: result['area'] = area
- return result
+ return PolygonArea(self, polyline)
+
+ EMPTY = GeodesicCapability.EMPTY
+ """No capabilities, no output."""
+ LATITUDE = GeodesicCapability.LATITUDE
+ """Calculate latitude *lat2*."""
+ LONGITUDE = GeodesicCapability.LONGITUDE
+ """Calculate longitude *lon2*."""
+ AZIMUTH = GeodesicCapability.AZIMUTH
+ """Calculate azimuths *azi1* and *azi2*."""
+ DISTANCE = GeodesicCapability.DISTANCE
+ """Calculate distance *s12*."""
+ STANDARD = GeodesicCapability.STANDARD
+ """All of the above."""
+ DISTANCE_IN = GeodesicCapability.DISTANCE_IN
+ """Allow distance *s12* to be used as input in the direct geodesic
+ problem."""
+ REDUCEDLENGTH = GeodesicCapability.REDUCEDLENGTH
+ """Calculate reduced length *m12*."""
+ GEODESICSCALE = GeodesicCapability.GEODESICSCALE
+ """Calculate geodesic scales *M12* and *M21*."""
+ AREA = GeodesicCapability.AREA
+ """Calculate area *S12*."""
+ ALL = GeodesicCapability.ALL
+ """All of the above."""
+ LONG_UNROLL = GeodesicCapability.LONG_UNROLL
+ """Unroll longitudes, rather than reducing them to the reducing them to
+ the range [-180d,180d)."""
Geodesic.WGS84 = Geodesic(Constants.WGS84_a, Constants.WGS84_f)
+"""Instantiation for the WGS84 ellipsoid"""
diff --git a/python/geographiclib/geodesiccapability.py b/python/geographiclib/geodesiccapability.py
index d2a55fb..43ddb91 100644
--- a/python/geographiclib/geodesiccapability.py
+++ b/python/geographiclib/geodesiccapability.py
@@ -38,5 +38,4 @@ class GeodesicCapability(object):
GEODESICSCALE = 1 << 13 | CAP_C1 | CAP_C2
AREA = 1 << 14 | CAP_C4
LONG_UNROLL = 1 << 15
- LONG_NOWRAP = LONG_UNROLL # For backwards compatibility only
ALL = OUT_ALL | CAP_ALL # Does not include LONG_UNROLL
diff --git a/python/geographiclib/geodesicline.py b/python/geographiclib/geodesicline.py
index a03dc99..ac44406 100644
--- a/python/geographiclib/geodesicline.py
+++ b/python/geographiclib/geodesicline.py
@@ -1,4 +1,42 @@
-"""geodesicline.py: transcription of GeographicLib::GeodesicLine class."""
+"""Define the :class:`~geographiclib.geodesicline.GeodesicLine` class
+
+The constructor defines the starting point of the line. Points on the
+line are given by
+
+ * :meth:`~geographiclib.geodesicline.GeodesicLine.Position` position
+ given in terms of distance
+ * :meth:`~geographiclib.geodesicline.GeodesicLine.ArcPosition` position
+ given in terms of spherical arc length
+
+A reference point 3 can be defined with
+
+ * :meth:`~geographiclib.geodesicline.GeodesicLine.SetDistance` set
+ position of 3 in terms of the distance from the starting point
+ * :meth:`~geographiclib.geodesicline.GeodesicLine.SetArc` set
+ position of 3 in terms of the spherical arc length from the starting point
+
+The object can also be constructed by
+
+ * :meth:`Geodesic.Line <geographiclib.geodesic.Geodesic.Line>`
+ * :meth:`Geodesic.DirectLine <geographiclib.geodesic.Geodesic.DirectLine>`
+ * :meth:`Geodesic.ArcDirectLine
+ <geographiclib.geodesic.Geodesic.ArcDirectLine>`
+ * :meth:`Geodesic.InverseLine <geographiclib.geodesic.Geodesic.InverseLine>`
+
+The public attributes for this class are
+
+ * :attr:`~geographiclib.geodesicline.GeodesicLine.a`
+ :attr:`~geographiclib.geodesicline.GeodesicLine.f`
+ :attr:`~geographiclib.geodesicline.GeodesicLine.caps`
+ :attr:`~geographiclib.geodesicline.GeodesicLine.lat1`
+ :attr:`~geographiclib.geodesicline.GeodesicLine.lon1`
+ :attr:`~geographiclib.geodesicline.GeodesicLine.azi1`
+ :attr:`~geographiclib.geodesicline.GeodesicLine.salp1`
+ :attr:`~geographiclib.geodesicline.GeodesicLine.calp1`
+ :attr:`~geographiclib.geodesicline.GeodesicLine.s13`
+ :attr:`~geographiclib.geodesicline.GeodesicLine.a13`
+
+"""
# geodesicline.py
#
# This is a rather literal translation of the GeographicLib::GeodesicLine class
@@ -11,9 +49,9 @@
# Charles F. F. Karney,
# Algorithms for geodesics, J. Geodesy 87, 43-55 (2013),
# https://dx.doi.org/10.1007/s00190-012-0578-z
-# Addenda: http://geographiclib.sf.net/geod-addenda.html
+# Addenda: http://geographiclib.sourceforge.net/geod-addenda.html
#
-# Copyright (c) Charles Karney (2011-2015) <charles at karney.com> and licensed
+# Copyright (c) Charles Karney (2011-2016) <charles at karney.com> and licensed
# under the MIT/X11 License. For more information, see
# http://geographiclib.sourceforge.net/
######################################################################
@@ -25,42 +63,53 @@ from geographiclib.geodesiccapability import GeodesicCapability
class GeodesicLine(object):
"""Points on a geodesic path"""
- def __init__(self, geod, lat1, lon1, azi1, caps = GeodesicCapability.ALL):
- """Construct a GeodesicLine object describing a geodesic line
- starting at (lat1, lon1) with azimuth azi1. geod is a Geodesic
- object (which embodies the ellipsoid parameters). caps is caps is
- an or'ed combination of bit the following values indicating the
- capabilities of the returned object
-
- Geodesic.LATITUDE
- Geodesic.LONGITUDE
- Geodesic.AZIMUTH
- Geodesic.DISTANCE
- Geodesic.STANDARD (all of the above)
- Geodesic.REDUCEDLENGTH
- Geodesic.GEODESICSCALE
- Geodesic.AREA
- Geodesic.DISTANCE_IN
- Geodesic.ALL (all of the above)
-
- The default value of caps is ALL.
+ def __init__(self, geod, lat1, lon1, azi1,
+ caps = GeodesicCapability.STANDARD |
+ GeodesicCapability.DISTANCE_IN,
+ salp1 = Math.nan, calp1 = Math.nan):
+ """Construct a GeodesicLine object
+
+ :param geod: a :class:`~geographiclib.geodesic.Geodesic` object
+ :param lat1: latitude of the first point in degrees
+ :param lon1: longitude of the first point in degrees
+ :param azi1: azimuth at the first point in degrees
+ :param caps: the :ref:`capabilities <outmask>`
+
+ This creates an object allowing points along a geodesic starting at
+ (*lat1*, *lon1*), with azimuth *azi1* to be found. The default
+ value of *caps* is STANDARD | DISTANCE_IN. The optional parameters
+ *salp1* and *calp1* should not be supplied; they are part of the
+ private interface.
"""
from geographiclib.geodesic import Geodesic
- self._a = geod._a
- self._f = geod._f
+ self.a = geod.a
+ """The equatorial radius in meters (readonly)"""
+ self.f = geod.f
+ """The flattening (readonly)"""
self._b = geod._b
self._c2 = geod._c2
self._f1 = geod._f1
- self._caps = (caps | Geodesic.LATITUDE | Geodesic.AZIMUTH |
+ self.caps = (caps | Geodesic.LATITUDE | Geodesic.AZIMUTH |
Geodesic.LONG_UNROLL)
+ """the capabilities (readonly)"""
# Guard against underflow in salp0
- self._lat1 = Math.LatFix(lat1)
- self._lon1 = lon1
- self._azi1 = Math.AngNormalize(azi1)
- self._salp1, self._calp1 = Math.sincosd(Math.AngRound(azi1))
+ self.lat1 = Math.LatFix(lat1)
+ """the latitude of the first point in degrees (readonly)"""
+ self.lon1 = lon1
+ """the longitude of the first point in degrees (readonly)"""
+ if Math.isnan(salp1) or Math.isnan(calp1):
+ self.azi1 = Math.AngNormalize(azi1)
+ self.salp1, self.calp1 = Math.sincosd(Math.AngRound(azi1))
+ else:
+ self.azi1 = azi1
+ """the azimuth at the first point in degrees (readonly)"""
+ self.salp1 = salp1
+ """the sine of the azimuth at the first point (readonly)"""
+ self.calp1 = calp1
+ """the cosine of the azimuth at the first point (readonly)"""
# real cbet1, sbet1
sbet1, cbet1 = Math.sincosd(Math.AngRound(lat1)); sbet1 *= self._f1
@@ -69,10 +118,10 @@ class GeodesicLine(object):
self._dn1 = math.sqrt(1 + geod._ep2 * Math.sq(sbet1))
# Evaluate alp0 from sin(alp1) * cos(bet1) = sin(alp0),
- self._salp0 = self._salp1 * cbet1 # alp0 in [0, pi/2 - |bet1|]
+ self._salp0 = self.salp1 * cbet1 # alp0 in [0, pi/2 - |bet1|]
# Alt: calp0 = hypot(sbet1, calp1 * cbet1). The following
# is slightly better (consider the case salp1 = 0).
- self._calp0 = math.hypot(self._calp1, self._salp1 * sbet1)
+ self._calp0 = math.hypot(self.calp1, self.salp1 * sbet1)
# Evaluate sig with tan(bet1) = tan(sig1) * cos(alp1).
# sig = 0 is nearest northward crossing of equator.
# With bet1 = 0, alp1 = pi/2, we have sig1 = 0 (equatorial line).
@@ -83,8 +132,8 @@ class GeodesicLine(object):
# No atan2(0,0) ambiguity at poles since cbet1 = +epsilon.
# With alp0 = 0, omg1 = 0 for alp1 = 0, omg1 = pi for alp1 = pi.
self._ssig1 = sbet1; self._somg1 = self._salp0 * sbet1
- self._csig1 = self._comg1 = (cbet1 * self._calp1
- if sbet1 != 0 or self._calp1 != 0 else 1)
+ self._csig1 = self._comg1 = (cbet1 * self.calp1
+ if sbet1 != 0 or self.calp1 != 0 else 1)
# sig1 in (-pi, pi]
self._ssig1, self._csig1 = Math.norm(self._ssig1, self._csig1)
# No need to normalize
@@ -93,58 +142,62 @@ class GeodesicLine(object):
self._k2 = Math.sq(self._calp0) * geod._ep2
eps = self._k2 / (2 * (1 + math.sqrt(1 + self._k2)) + self._k2)
- if self._caps & Geodesic.CAP_C1:
- self._A1m1 = Geodesic.A1m1f(eps)
+ if self.caps & Geodesic.CAP_C1:
+ self._A1m1 = Geodesic._A1m1f(eps)
self._C1a = list(range(Geodesic.nC1_ + 1))
- Geodesic.C1f(eps, self._C1a)
- self._B11 = Geodesic.SinCosSeries(
+ Geodesic._C1f(eps, self._C1a)
+ self._B11 = Geodesic._SinCosSeries(
True, self._ssig1, self._csig1, self._C1a)
s = math.sin(self._B11); c = math.cos(self._B11)
# tau1 = sig1 + B11
self._stau1 = self._ssig1 * c + self._csig1 * s
self._ctau1 = self._csig1 * c - self._ssig1 * s
# Not necessary because C1pa reverts C1a
- # _B11 = -SinCosSeries(true, _stau1, _ctau1, _C1pa)
+ # _B11 = -_SinCosSeries(true, _stau1, _ctau1, _C1pa)
- if self._caps & Geodesic.CAP_C1p:
+ if self.caps & Geodesic.CAP_C1p:
self._C1pa = list(range(Geodesic.nC1p_ + 1))
- Geodesic.C1pf(eps, self._C1pa)
+ Geodesic._C1pf(eps, self._C1pa)
- if self._caps & Geodesic.CAP_C2:
- self._A2m1 = Geodesic.A2m1f(eps)
+ if self.caps & Geodesic.CAP_C2:
+ self._A2m1 = Geodesic._A2m1f(eps)
self._C2a = list(range(Geodesic.nC2_ + 1))
- Geodesic.C2f(eps, self._C2a)
- self._B21 = Geodesic.SinCosSeries(
+ Geodesic._C2f(eps, self._C2a)
+ self._B21 = Geodesic._SinCosSeries(
True, self._ssig1, self._csig1, self._C2a)
- if self._caps & Geodesic.CAP_C3:
+ if self.caps & Geodesic.CAP_C3:
self._C3a = list(range(Geodesic.nC3_))
- geod.C3f(eps, self._C3a)
- self._A3c = -self._f * self._salp0 * geod.A3f(eps)
- self._B31 = Geodesic.SinCosSeries(
+ geod._C3f(eps, self._C3a)
+ self._A3c = -self.f * self._salp0 * geod._A3f(eps)
+ self._B31 = Geodesic._SinCosSeries(
True, self._ssig1, self._csig1, self._C3a)
- if self._caps & Geodesic.CAP_C4:
+ if self.caps & Geodesic.CAP_C4:
self._C4a = list(range(Geodesic.nC4_))
- geod.C4f(eps, self._C4a)
+ geod._C4f(eps, self._C4a)
# Multiplier = a^2 * e^2 * cos(alpha0) * sin(alpha0)
- self._A4 = Math.sq(self._a) * self._calp0 * self._salp0 * geod._e2
- self._B41 = Geodesic.SinCosSeries(
+ self._A4 = Math.sq(self.a) * self._calp0 * self._salp0 * geod._e2
+ self._B41 = Geodesic._SinCosSeries(
False, self._ssig1, self._csig1, self._C4a)
+ self.s13 = Math.nan
+ """the distance between point 1 and point 3 in meters (readonly)"""
+ self.a13 = Math.nan
+ """the arc length between point 1 and point 3 in degrees (readonly)"""
# return a12, lat2, lon2, azi2, s12, m12, M12, M21, S12
- def GenPosition(self, arcmode, s12_a12, outmask):
+ def _GenPosition(self, arcmode, s12_a12, outmask):
"""Private: General solution of position along geodesic"""
from geographiclib.geodesic import Geodesic
a12 = lat2 = lon2 = azi2 = s12 = m12 = M12 = M21 = S12 = Math.nan
- outmask &= self._caps & Geodesic.OUT_MASK
+ outmask &= self.caps & Geodesic.OUT_MASK
if not (arcmode or
- (self._caps & Geodesic.DISTANCE_IN & Geodesic.OUT_MASK)):
+ (self.caps & (Geodesic.OUT_MASK & Geodesic.DISTANCE_IN))):
# Uninitialized or impossible distance calculation requested
return a12, lat2, lon2, azi2, s12, m12, M12, M21, S12
# Avoid warning about uninitialized B12.
- B12 = 0; AB1 = 0
+ B12 = 0.0; AB1 = 0.0
if arcmode:
# Interpret s12_a12 as spherical arc length
sig12 = math.radians(s12_a12)
@@ -154,13 +207,13 @@ class GeodesicLine(object):
tau12 = s12_a12 / (self._b * (1 + self._A1m1))
s = math.sin(tau12); c = math.cos(tau12)
# tau2 = tau1 + tau12
- B12 = - Geodesic.SinCosSeries(True,
+ B12 = - Geodesic._SinCosSeries(True,
self._stau1 * c + self._ctau1 * s,
self._ctau1 * c - self._stau1 * s,
self._C1pa)
sig12 = tau12 - (B12 - self._B11)
ssig12 = math.sin(sig12); csig12 = math.cos(sig12)
- if abs(self._f) > 0.01:
+ if abs(self.f) > 0.01:
# Reverted distance series is inaccurate for |f| > 1/100, so correct
# sig12 with 1 Newton iteration. The following table shows the
# approximate maximum error for a = WGS_a() and various f relative to
@@ -184,7 +237,7 @@ class GeodesicLine(object):
# 1/5 157e6 3.8e9 280e6
ssig2 = self._ssig1 * csig12 + self._csig1 * ssig12
csig2 = self._csig1 * csig12 - self._ssig1 * ssig12
- B12 = Geodesic.SinCosSeries(True, ssig2, csig2, self._C1a)
+ B12 = Geodesic._SinCosSeries(True, ssig2, csig2, self._C1a)
serr = ((1 + self._A1m1) * (sig12 + (B12 - self._B11)) -
s12_a12 / self._b)
sig12 = sig12 - serr / math.sqrt(1 + self._k2 * Math.sq(ssig2))
@@ -199,8 +252,8 @@ class GeodesicLine(object):
dn2 = math.sqrt(1 + self._k2 * Math.sq(ssig2))
if outmask & (
Geodesic.DISTANCE | Geodesic.REDUCEDLENGTH | Geodesic.GEODESICSCALE):
- if arcmode or abs(self._f) > 0.01:
- B12 = Geodesic.SinCosSeries(True, ssig2, csig2, self._C1a)
+ if arcmode or abs(self.f) > 0.01:
+ B12 = Geodesic._SinCosSeries(True, ssig2, csig2, self._C1a)
AB1 = (1 + self._A1m1) * (B12 - self._B11)
# sin(bet2) = cos(alp0) * sin(sig2)
sbet2 = self._calp0 * ssig2
@@ -218,7 +271,7 @@ class GeodesicLine(object):
if outmask & Geodesic.LONGITUDE:
# tan(omg2) = sin(alp0) * tan(sig2)
somg2 = self._salp0 * ssig2; comg2 = csig2 # No need to normalize
- E = -1 if self._salp0 < 0 else 1 # East or west going?
+ E = Math.copysign(1, self._salp0) # East or west going?
# omg12 = omg2 - omg1
omg12 = (E * (sig12
- (math.atan2( ssig2, csig2) -
@@ -229,11 +282,11 @@ class GeodesicLine(object):
else math.atan2(somg2 * self._comg1 - comg2 * self._somg1,
comg2 * self._comg1 + somg2 * self._somg1))
lam12 = omg12 + self._A3c * (
- sig12 + (Geodesic.SinCosSeries(True, ssig2, csig2, self._C3a)
+ sig12 + (Geodesic._SinCosSeries(True, ssig2, csig2, self._C3a)
- self._B31))
lon12 = math.degrees(lam12)
- lon2 = (self._lon1 + lon12 if outmask & Geodesic.LONG_UNROLL else
- Math.AngNormalize(Math.AngNormalize(self._lon1) +
+ lon2 = (self.lon1 + lon12 if outmask & Geodesic.LONG_UNROLL else
+ Math.AngNormalize(Math.AngNormalize(self.lon1) +
Math.AngNormalize(lon12)))
if outmask & Geodesic.LATITUDE:
@@ -244,7 +297,7 @@ class GeodesicLine(object):
azi2 = Math.atan2d(salp2, calp2)
if outmask & (Geodesic.REDUCEDLENGTH | Geodesic.GEODESICSCALE):
- B22 = Geodesic.SinCosSeries(True, ssig2, csig2, self._C2a)
+ B22 = Geodesic._SinCosSeries(True, ssig2, csig2, self._C2a)
AB2 = (1 + self._A2m1) * (B22 - self._B21)
J12 = (self._A1m1 - self._A2m1) * sig12 + (AB1 - AB2)
if outmask & Geodesic.REDUCEDLENGTH:
@@ -260,18 +313,12 @@ class GeodesicLine(object):
M21 = csig12 - (t * self._ssig1 - self._csig1 * J12) * ssig2 / dn2
if outmask & Geodesic.AREA:
- B42 = Geodesic.SinCosSeries(False, ssig2, csig2, self._C4a)
+ B42 = Geodesic._SinCosSeries(False, ssig2, csig2, self._C4a)
# real salp12, calp12
if self._calp0 == 0 or self._salp0 == 0:
# alp12 = alp2 - alp1, used in atan2 so no need to normalize
- salp12 = salp2 * self._calp1 - calp2 * self._salp1
- calp12 = calp2 * self._calp1 + salp2 * self._salp1
- # The right thing appears to happen if alp1 = +/-180 and alp2 = 0, viz
- # salp12 = -0 and alp12 = -180. However this depends on the sign being
- # attached to 0 correctly. The following ensures the correct behavior.
- if salp12 == 0 and calp12 < 0:
- salp12 = Geodesic.tiny_ * self._calp1
- calp12 = -1
+ salp12 = salp2 * self.calp1 - calp2 * self.salp1
+ calp12 = calp2 * self.calp1 + salp2 * self.salp1
else:
# tan(alp) = tan(alp0) * sec(sig)
# tan(alp2-alp1) = (tan(alp2) -tan(alp1)) / (tan(alp2)*tan(alp1)+1)
@@ -293,50 +340,26 @@ class GeodesicLine(object):
return a12, lat2, lon2, azi2, s12, m12, M12, M21, S12
def Position(self, s12, outmask = GeodesicCapability.STANDARD):
- """Return the point a distance s12 along the geodesic line. Return a
- dictionary with (some) of the following entries:
-
- lat1 latitude of point 1
- lon1 longitude of point 1
- azi1 azimuth of line at point 1
- lat2 latitude of point 2
- lon2 longitude of point 2
- azi2 azimuth of line at point 2
- s12 distance from 1 to 2
- a12 arc length on auxiliary sphere from 1 to 2
- m12 reduced length of geodesic
- M12 geodesic scale 2 relative to 1
- M21 geodesic scale 1 relative to 2
- S12 area between geodesic and equator
-
- outmask determines which fields get included and if outmask is
- omitted, then only the basic geodesic fields are computed. The
- LONG_UNROLL bit unrolls the longitudes (instead of reducing them to
- the range [-180,180)), so that lon2 - lon1 indicates how many times
- and in what sense the geodesic encircles the ellipsoid. The mask is
- an or'ed combination of the following values
-
- Geodesic.LATITUDE
- Geodesic.LONGITUDE
- Geodesic.AZIMUTH
- Geodesic.STANDARD (all of the above)
- Geodesic.REDUCEDLENGTH
- Geodesic.GEODESICSCALE
- Geodesic.AREA
- Geodesic.ALL (all of the above)
- Geodesic.LONG_UNROLL
-
- The default value of outmask is STANDARD.
+ """Find the position on the line given *s12*
+
+ :param s12: the distance from the first point to the second in
+ meters
+ :param outmask: the :ref:`output mask <outmask>`
+ :return: a :ref:`dict`
+
+ The default value of *outmask* is STANDARD, i.e., the *lat1*,
+ *lon1*, *azi1*, *lat2*, *lon2*, *azi2*, *s12*, *a12* entries are
+ returned. The :class:`~geographiclib.geodesicline.GeodesicLine`
+ object must have been constructed with the DISTANCE_IN capability.
"""
from geographiclib.geodesic import Geodesic
- Geodesic.CheckDistance(s12)
- result = {'lat1': self._lat1,
- 'lon1': self._lon1 if outmask & Geodesic.LONG_UNROLL else
- Math.AngNormalize(self._lon1),
- 'azi1': self._azi1, 's12': s12}
- a12, lat2, lon2, azi2, s12, m12, M12, M21, S12 = self.GenPosition(
+ result = {'lat1': self.lat1,
+ 'lon1': self.lon1 if outmask & Geodesic.LONG_UNROLL else
+ Math.AngNormalize(self.lon1),
+ 'azi1': self.azi1, 's12': s12}
+ a12, lat2, lon2, azi2, s12, m12, M12, M21, S12 = self._GenPosition(
False, s12, outmask)
outmask &= Geodesic.OUT_MASK
result['a12'] = a12
@@ -350,50 +373,25 @@ class GeodesicLine(object):
return result
def ArcPosition(self, a12, outmask = GeodesicCapability.STANDARD):
- """Return the point a spherical arc length a12 along the geodesic line.
- Return a dictionary with (some) of the following entries:
-
- lat1 latitude of point 1
- lon1 longitude of point 1
- azi1 azimuth of line at point 1
- lat2 latitude of point 2
- lon2 longitude of point 2
- azi2 azimuth of line at point 2
- s12 distance from 1 to 2
- a12 arc length on auxiliary sphere from 1 to 2
- m12 reduced length of geodesic
- M12 geodesic scale 2 relative to 1
- M21 geodesic scale 1 relative to 2
- S12 area between geodesic and equator
-
- outmask determines which fields get included and if outmask is
- omitted, then only the basic geodesic fields are computed. The
- LONG_UNROLL bit unrolls the longitudes (instead of reducing them to
- the range [-180,180)). The mask is an or'ed combination of the
- following values
-
- Geodesic.LATITUDE
- Geodesic.LONGITUDE
- Geodesic.AZIMUTH
- Geodesic.DISTANCE
- Geodesic.STANDARD (all of the above)
- Geodesic.REDUCEDLENGTH
- Geodesic.GEODESICSCALE
- Geodesic.AREA
- Geodesic.ALL (all of the above)
- Geodesic.LONG_UNROLL
-
- The default value of outmask is STANDARD.
+ """Find the position on the line given *a12*
+
+ :param a12: spherical arc length from the first point to the second
+ in degrees
+ :param outmask: the :ref:`output mask <outmask>`
+ :return: a :ref:`dict`
+
+ The default value of *outmask* is STANDARD, i.e., the *lat1*,
+ *lon1*, *azi1*, *lat2*, *lon2*, *azi2*, *s12*, *a12* entries are
+ returned.
"""
from geographiclib.geodesic import Geodesic
- Geodesic.CheckDistance(a12)
- result = {'lat1': self._lat1,
- 'lon1': self._lon1 if outmask & Geodesic.LONG_UNROLL else
- Math.AngNormalize(self._lon1),
- 'azi1': self._azi1, 'a12': a12}
- a12, lat2, lon2, azi2, s12, m12, M12, M21, S12 = self.GenPosition(
+ result = {'lat1': self.lat1,
+ 'lon1': self.lon1 if outmask & Geodesic.LONG_UNROLL else
+ Math.AngNormalize(self.lon1),
+ 'azi1': self.azi1, 'a12': a12}
+ a12, lat2, lon2, azi2, s12, m12, M12, M21, S12 = self._GenPosition(
True, a12, outmask)
outmask &= Geodesic.OUT_MASK
if outmask & Geodesic.DISTANCE: result['s12'] = s12
@@ -405,3 +403,25 @@ class GeodesicLine(object):
result['M12'] = M12; result['M21'] = M21
if outmask & Geodesic.AREA: result['S12'] = S12
return result
+
+ def SetDistance(self, s13):
+ """Specify the position of point 3 in terms of distance
+
+ :param s13: distance from point 1 to point 3 in meters
+
+ """
+
+ self.s13 = s13
+ self.a13, _, _, _, _, _, _, _, _ = self._GenPosition(False, self.s13, 0)
+
+ def SetArc(self, a13):
+ """Specify the position of point 3 in terms of arc length
+
+ :param a13: spherical arc length from point 1 to point 3 in degrees
+
+ """
+
+ from geographiclib.geodesic import Geodesic
+ self.a13 = a13
+ _, _, _, _, self.s13, _, _, _, _ = self._GenPosition(True, self.a13,
+ Geodesic.DISTANCE)
diff --git a/python/geographiclib/geomath.py b/python/geographiclib/geomath.py
index 0435319..af3daad 100644
--- a/python/geographiclib/geomath.py
+++ b/python/geographiclib/geomath.py
@@ -6,7 +6,7 @@
#
# http://geographiclib.sourceforge.net/html/annotated.html
#
-# Copyright (c) Charles Karney (2011-2015) <charles at karney.com> and
+# Copyright (c) Charles Karney (2011-2016) <charles at karney.com> and
# licensed under the MIT/X11 License. For more information, see
# http://geographiclib.sourceforge.net/
######################################################################
@@ -73,6 +73,15 @@ class Math(object):
return -y if x < 0 else y
atanh = staticmethod(atanh)
+ def copysign(x, y):
+ """return x with the sign of y (missing from python 2.5.2)"""
+
+ if sys.version_info > (2, 6):
+ return math.copysign(x, y)
+
+ return math.fabs(x) * (-1 if y < 0 or (y == 0 and 1/y < 0) else 1)
+ copysign = staticmethod(copysign)
+
def norm(x, y):
"""Private: Normalize a two-vector."""
r = math.hypot(x, y)
@@ -114,7 +123,7 @@ class Math(object):
y = abs(x)
# The compiler mustn't "simplify" z - (z - y) to y
if y < z: y = z - (z - y)
- return 0 - y if x < 0 else y
+ return 0.0 if x == 0 else (-y if x < 0 else y)
AngRound = staticmethod(AngRound)
def AngNormalize(x):
@@ -136,7 +145,7 @@ class Math(object):
d, t = Math.sum(Math.AngNormalize(x), Math.AngNormalize(-y))
d = - Math.AngNormalize(d)
- return (-180 if d == 180 and t < 0 else d) - t
+ return Math.sum(-180 if d == 180 and t < 0 else d, -t)
AngDiff = staticmethod(AngDiff)
def sincosd(x):
@@ -148,11 +157,11 @@ class Math(object):
s = math.sin(r); c = math.cos(r)
q = q % 4
if q == 1:
- s, c = c, 0-s
+ s, c = c, 0.0-s
elif q == 2:
- s, c = 0-s, 0-c
+ s, c = 0.0-s, 0.0-c
elif q == 3:
- s, c = 0-c, s
+ s, c = 0.0-c, s
return s, c
sincosd = staticmethod(sincosd)
diff --git a/python/geographiclib/polygonarea.py b/python/geographiclib/polygonarea.py
index 5a28e60..b0f9385 100644
--- a/python/geographiclib/polygonarea.py
+++ b/python/geographiclib/polygonarea.py
@@ -1,4 +1,30 @@
-"""polygonarea.py: transcription of GeographicLib::PolygonArea class."""
+"""Define the :class:`~geographiclib.polygonarea.PolygonArea` class
+
+The constructor initializes a empty polygon. The available methods are
+
+ * :meth:`~geographiclib.polygonarea.PolygonArea.Clear` reset the
+ polygon
+ * :meth:`~geographiclib.polygonarea.PolygonArea.AddPoint` add a vertex
+ to the polygon
+ * :meth:`~geographiclib.polygonarea.PolygonArea.AddEdge` add an edge
+ to the polygon
+ * :meth:`~geographiclib.polygonarea.PolygonArea.Compute` compute the
+ properties of the polygon
+ * :meth:`~geographiclib.polygonarea.PolygonArea.TestPoint` compute the
+ properties of the polygon with a tentative additional vertex
+ * :meth:`~geographiclib.polygonarea.PolygonArea.TestEdge` compute the
+ properties of the polygon with a tentative additional edge
+
+The public attributes for this class are
+
+ * :attr:`~geographiclib.polygonarea.PolygonArea.earth`
+ :attr:`~geographiclib.polygonarea.PolygonArea.polyline`
+ :attr:`~geographiclib.polygonarea.PolygonArea.area0`
+ :attr:`~geographiclib.polygonarea.PolygonArea.num`
+ :attr:`~geographiclib.polygonarea.PolygonArea.lat1`
+ :attr:`~geographiclib.polygonarea.PolygonArea.lon1`
+
+"""
# polygonarea.py
#
# This is a rather literal translation of the GeographicLib::PolygonArea class
@@ -11,9 +37,9 @@
# Charles F. F. Karney,
# Algorithms for geodesics, J. Geodesy 87, 43-55 (2013),
# https://dx.doi.org/10.1007/s00190-012-0578-z
-# Addenda: http://geographiclib.sf.net/geod-addenda.html
+# Addenda: http://geographiclib.sourceforge.net/geod-addenda.html
#
-# Copyright (c) Charles Karney (2011-2014) <charles at karney.com> and licensed
+# Copyright (c) Charles Karney (2011-2016) <charles at karney.com> and licensed
# under the MIT/X11 License. For more information, see
# http://geographiclib.sourceforge.net/
######################################################################
@@ -25,20 +51,20 @@ from geographiclib.accumulator import Accumulator
class PolygonArea(object):
"""Area of a geodesic polygon"""
- def transit(lon1, lon2):
+ def _transit(lon1, lon2):
"""Count crossings of prime meridian for AddPoint."""
# Return 1 or -1 if crossing prime meridian in east or west direction.
# Otherwise return zero.
# Compute lon12 the same way as Geodesic::Inverse.
lon1 = Math.AngNormalize(lon1)
lon2 = Math.AngNormalize(lon2)
- lon12 = Math.AngDiff(lon1, lon2)
+ lon12, _ = Math.AngDiff(lon1, lon2)
cross = (1 if lon1 < 0 and lon2 >= 0 and lon12 > 0
else (-1 if lon2 < 0 and lon1 >= 0 and lon12 < 0 else 0))
return cross
- transit = staticmethod(transit)
+ _transit = staticmethod(_transit)
- def transitdirect(lon1, lon2):
+ def _transitdirect(lon1, lon2):
"""Count crossings of prime meridian for AddEdge."""
# We want to compute exactly
# int(floor(lon2 / 360)) - int(floor(lon1 / 360))
@@ -47,197 +73,252 @@ class PolygonArea(object):
lon1 = math.fmod(lon1, 720.0); lon2 = math.fmod(lon2, 720.0)
return ( (0 if ((lon2 >= 0 and lon2 < 360) or lon2 < -360) else 1) -
(0 if ((lon1 >= 0 and lon1 < 360) or lon1 < -360) else 1) )
- transitdirect = staticmethod(transitdirect)
+ _transitdirect = staticmethod(_transitdirect)
def __init__(self, earth, polyline = False):
+ """Construct a PolygonArea object
+
+ :param earth: a :class:`~geographiclib.geodesic.Geodesic` object
+ :param polyline: if true, treat object as a polyline instead of a polygon
+
+ Initially the polygon has no vertices.
+ """
+
from geographiclib.geodesic import Geodesic
- self._earth = earth
- self._area0 = 4 * math.pi * earth._c2
- self._polyline = polyline
+ self.earth = earth
+ """The geodesic object (readonly)"""
+ self.polyline = polyline
+ """Is this a polyline? (readonly)"""
+ self.area0 = 4 * math.pi * earth._c2
+ """The total area of the ellipsoid in meter^2 (readonly)"""
self._mask = (Geodesic.LATITUDE | Geodesic.LONGITUDE |
Geodesic.DISTANCE |
- (Geodesic.EMPTY if self._polyline else
+ (Geodesic.EMPTY if self.polyline else
Geodesic.AREA | Geodesic.LONG_UNROLL))
- if not self._polyline: self._areasum = Accumulator()
+ if not self.polyline: self._areasum = Accumulator()
self._perimetersum = Accumulator()
+ self.num = 0
+ """The current number of points in the polygon (readonly)"""
+ self.lat1 = Math.nan
+ """The current latitude in degrees (readonly)"""
+ self.lon1 = Math.nan
+ """The current longitude in degrees (readonly)"""
self.Clear()
def Clear(self):
"""Reset to empty polygon."""
- self._num = 0
+ self.num = 0
self._crossings = 0
- if not self._polyline: self._areasum.Set(0)
+ if not self.polyline: self._areasum.Set(0)
self._perimetersum.Set(0)
- self._lat0 = self._lon0 = self._lat1 = self._lon1 = Math.nan
+ self._lat0 = self._lon0 = self.lat1 = self.lon1 = Math.nan
def AddPoint(self, lat, lon):
- """Add a vertex to the polygon."""
- if self._num == 0:
- self._lat0 = self._lat1 = lat
- self._lon0 = self._lon1 = lon
+ """Add the next vertex to the polygon
+
+ :param lat: the latitude of the point in degrees
+ :param lon: the longitude of the point in degrees
+
+ This adds an edge from the current vertex to the new vertex.
+ """
+
+ if self.num == 0:
+ self._lat0 = self.lat1 = lat
+ self._lon0 = self.lon1 = lon
else:
- _, s12, _, _, _, _, _, S12 = self._earth.GenInverse(
- self._lat1, self._lon1, lat, lon, self._mask)
+ _, s12, _, _, _, _, _, _, _, S12 = self.earth._GenInverse(
+ self.lat1, self.lon1, lat, lon, self._mask)
self._perimetersum.Add(s12)
- if not self._polyline:
+ if not self.polyline:
self._areasum.Add(S12)
- self._crossings += PolygonArea.transit(self._lon1, lon)
- self._lat1 = lat
- self._lon1 = lon
- self._num += 1
+ self._crossings += PolygonArea._transit(self.lon1, lon)
+ self.lat1 = lat
+ self.lon1 = lon
+ self.num += 1
def AddEdge(self, azi, s):
- """Add an edge to the polygon."""
- if self._num != 0:
- _, lat, lon, _, _, _, _, _, S12 = self._earth.GenDirect(
- self._lat1, self._lon1, azi, False, s, self._mask)
+ """Add the next edge to the polygon
+
+ :param azi: the azimuth at the current the point in degrees
+ :param s: the length of the edge in meters
+
+ This specifies the new vertex in terms of the edge from the current
+ vertex.
+
+ """
+
+ if self.num != 0:
+ _, lat, lon, _, _, _, _, _, S12 = self.earth._GenDirect(
+ self.lat1, self.lon1, azi, False, s, self._mask)
self._perimetersum.Add(s)
- if not self._polyline:
+ if not self.polyline:
self._areasum.Add(S12)
- self._crossings += PolygonArea.transitdirect(self._lon1, lon)
- self._lat1 = lat
- self._lon1 = lon
- self._num += 1
+ self._crossings += PolygonArea._transitdirect(self.lon1, lon)
+ self.lat1 = lat
+ self.lon1 = lon
+ self.num += 1
# return number, perimeter, area
- def Compute(self, reverse, sign):
- """Return the number, perimeter, and area for the polygon."""
- if self._polyline: area = Math.nan
- if self._num < 2:
- perimeter = 0
- if not self._polyline: area = 0
- return self._num, perimeter, area
-
- if self._polyline:
+ def Compute(self, reverse = False, sign = True):
+ """Compute the properties of the polygon
+
+ :param reverse: if true then clockwise (instead of
+ counter-clockwise) traversal counts as a positive area
+ :param sign: if true then return a signed result for the area if the
+ polygon is traversed in the "wrong" direction instead of returning
+ the area for the rest of the earth
+ :return: a tuple of number, perimeter (meters), area (meters^2)
+
+ If the object is a polygon (and not a polygon), the perimeter
+ includes the length of a final edge connecting the current point to
+ the initial point. If the object is a polyline, then area is nan.
+
+ More points can be added to the polygon after this call.
+
+ """
+ if self.polyline: area = Math.nan
+ if self.num < 2:
+ perimeter = 0.0
+ if not self.polyline: area = 0.0
+ return self.num, perimeter, area
+
+ if self.polyline:
perimeter = self._perimetersum.Sum()
- return self._num, perimeter, area
+ return self.num, perimeter, area
- _, s12, _, _, _, _, _, S12 = self._earth.GenInverse(
- self._lat1, self._lon1, self._lat0, self._lon0, self._mask)
+ _, s12, _, _, _, _, _, _, _, S12 = self.earth._GenInverse(
+ self.lat1, self.lon1, self._lat0, self._lon0, self._mask)
perimeter = self._perimetersum.Sum(s12)
tempsum = Accumulator(self._areasum)
tempsum.Add(S12)
- crossings = self._crossings + PolygonArea.transit(self._lon1, self._lon0)
+ crossings = self._crossings + PolygonArea._transit(self.lon1, self._lon0)
if crossings & 1:
- tempsum.Add( (1 if tempsum.Sum() < 0 else -1) * self._area0/2 )
+ tempsum.Add( (1 if tempsum.Sum() < 0 else -1) * self.area0/2 )
# area is with the clockwise sense. If !reverse convert to
# counter-clockwise convention.
if not reverse: tempsum.Negate()
# If sign put area in (-area0/2, area0/2], else put area in [0, area0)
if sign:
- if tempsum.Sum() > self._area0/2:
- tempsum.Add( -self._area0 )
- elif tempsum.Sum() <= -self._area0/2:
- tempsum.Add( self._area0 )
+ if tempsum.Sum() > self.area0/2:
+ tempsum.Add( -self.area0 )
+ elif tempsum.Sum() <= -self.area0/2:
+ tempsum.Add( self.area0 )
else:
- if tempsum.Sum() >= self._area0:
- tempsum.Add( -self._area0 )
+ if tempsum.Sum() >= self.area0:
+ tempsum.Add( -self.area0 )
elif tempsum.Sum() < 0:
- tempsum.Add( self._area0 )
+ tempsum.Add( self.area0 )
- area = 0 + tempsum.Sum()
- return self._num, perimeter, area
+ area = 0.0 + tempsum.Sum()
+ return self.num, perimeter, area
# return number, perimeter, area
- def TestPoint(self, lat, lon, reverse, sign):
- """Return the results for a tentative additional vertex."""
- if self._polyline: area = Math.nan
- if self._num == 0:
- perimeter = 0
- if not self._polyline: area = 0
+ def TestPoint(self, lat, lon, reverse = False, sign = True):
+ """Compute the properties for a tentative additional vertex
+
+ :param lat: the latitude of the point in degrees
+ :param lon: the longitude of the point in degrees
+ :param reverse: if true then clockwise (instead of
+ counter-clockwise) traversal counts as a positive area
+ :param sign: if true then return a signed result for the area if the
+ polygon is traversed in the "wrong" direction instead of returning
+ the area for the rest of the earth
+ :return: a tuple of number, perimeter (meters), area (meters^2)
+
+ """
+ if self.polyline: area = Math.nan
+ if self.num == 0:
+ perimeter = 0.0
+ if not self.polyline: area = 0.0
return 1, perimeter, area
perimeter = self._perimetersum.Sum()
- tempsum = 0 if self._polyline else self._areasum.Sum()
- crossings = self._crossings; num = self._num + 1
- for i in ([0] if self._polyline else [0, 1]):
- _, s12, _, _, _, _, _, S12 = self._earth.GenInverse(
- self._lat1 if i == 0 else lat, self._lon1 if i == 0 else lon,
+ tempsum = 0.0 if self.polyline else self._areasum.Sum()
+ crossings = self._crossings; num = self.num + 1
+ for i in ([0] if self.polyline else [0, 1]):
+ _, s12, _, _, _, _, _, _, _, S12 = self.earth._GenInverse(
+ self.lat1 if i == 0 else lat, self.lon1 if i == 0 else lon,
self._lat0 if i != 0 else lat, self._lon0 if i != 0 else lon,
self._mask)
perimeter += s12
- if not self._polyline:
+ if not self.polyline:
tempsum += S12
- crossings += PolygonArea.transit(self._lon1 if i == 0 else lon,
+ crossings += PolygonArea._transit(self.lon1 if i == 0 else lon,
self._lon0 if i != 0 else lon)
- if self._polyline:
+ if self.polyline:
return num, perimeter, area
if crossings & 1:
- tempsum += (1 if tempsum < 0 else -1) * self._area0/2
+ tempsum += (1 if tempsum < 0 else -1) * self.area0/2
# area is with the clockwise sense. If !reverse convert to
# counter-clockwise convention.
if not reverse: tempsum *= -1
# If sign put area in (-area0/2, area0/2], else put area in [0, area0)
if sign:
- if tempsum > self._area0/2:
- tempsum -= self._area0
- elif tempsum <= -self._area0/2:
- tempsum += self._area0
+ if tempsum > self.area0/2:
+ tempsum -= self.area0
+ elif tempsum <= -self.area0/2:
+ tempsum += self.area0
else:
- if tempsum >= self._area0:
- tempsum -= self._area0
+ if tempsum >= self.area0:
+ tempsum -= self.area0
elif tempsum < 0:
- tempsum += self._area0
+ tempsum += self.area0
- area = 0 + tempsum
+ area = 0.0 + tempsum
return num, perimeter, area
- # return number, perimeter, area (for backward compatibility)
- def TestCompute(self, lat, lon, reverse, sign):
- return self.TestPoint(lat, lon, reverse, sign)
-
# return num, perimeter, area
- def TestEdge(self, azi, s, reverse, sign):
- """Return the results for a tentative additional edge."""
- if self._num == 0: # we don't have a starting point!
+ def TestEdge(self, azi, s, reverse = False, sign = True):
+ """Compute the properties for a tentative additional edge
+
+ :param azi: the azimuth at the current the point in degrees
+ :param s: the length of the edge in meters
+ :param reverse: if true then clockwise (instead of
+ counter-clockwise) traversal counts as a positive area
+ :param sign: if true then return a signed result for the area if the
+ polygon is traversed in the "wrong" direction instead of returning
+ the area for the rest of the earth
+ :return: a tuple of number, perimeter (meters), area (meters^2)
+
+ """
+
+ if self.num == 0: # we don't have a starting point!
return 0, Math.nan, Math.nan
- num = self._num + 1
+ num = self.num + 1
perimeter = self._perimetersum.Sum() + s
- if self._polyline:
+ if self.polyline:
return num, perimeter, Math.nan
tempsum = self._areasum.Sum()
crossings = self._crossings
- _, lat, lon, _, _, _, _, _, S12 = self._earth.GenDirect(
- self._lat1, self._lon1, azi, False, s, self._mask)
+ _, lat, lon, _, _, _, _, _, S12 = self.earth._GenDirect(
+ self.lat1, self.lon1, azi, False, s, self._mask)
tempsum += S12
- crossings += PolygonArea.transitdirect(self._lon1, lon)
- _, s12, _, _, _, _, _, S12 = self._earth.GenInverse(
+ crossings += PolygonArea._transitdirect(self.lon1, lon)
+ _, s12, _, _, _, _, _, _, _, S12 = self.earth._GenInverse(
lat, lon, self._lat0, self._lon0, self._mask)
perimeter += s12
tempsum += S12
- crossings += PolygonArea.transit(lon, self._lon0)
+ crossings += PolygonArea._transit(lon, self._lon0)
if crossings & 1:
- tempsum += (1 if tempsum < 0 else -1) * self._area0/2
+ tempsum += (1 if tempsum < 0 else -1) * self.area0/2
# area is with the clockwise sense. If !reverse convert to
# counter-clockwise convention.
if not reverse: tempsum *= -1
# If sign put area in (-area0/2, area0/2], else put area in [0, area0)
if sign:
- if tempsum > self._area0/2:
- tempsum -= self._area0
- elif tempsum <= -self._area0/2:
- tempsum += self._area0
+ if tempsum > self.area0/2:
+ tempsum -= self.area0
+ elif tempsum <= -self.area0/2:
+ tempsum += self.area0
else:
- if tempsum >= self._area0:
- tempsum -= self._area0
+ if tempsum >= self.area0:
+ tempsum -= self.area0
elif tempsum < 0:
- tempsum += self._area0
+ tempsum += self.area0
- area = 0 + tempsum
+ area = 0.0 + tempsum
return num, perimeter, area
-
- def CurrentPoint(self):
- """Return the current point as a lat, lon tuple."""
- return self._lat1, self._lon1
-
- def Area(earth, points, polyline):
- """Return the number, perimeter, and area for a set of vertices."""
- poly = PolygonArea(earth, polyline)
- for p in points:
- poly.AddPoint(p['lat'], p['lon'])
- return poly.Compute(False, True)
- Area = staticmethod(Area)
diff --git a/python/test/__init__.py b/python/geographiclib/test/__init__.py
similarity index 55%
rename from python/test/__init__.py
rename to python/geographiclib/test/__init__.py
index 8dd3877..e8dacf0 100644
--- a/python/test/__init__.py
+++ b/python/geographiclib/test/__init__.py
@@ -4,8 +4,8 @@ test_geodesic: test the geodesic routines from GeographicLib
Run these tests with one of
- python2 -m unittest -v test.test_geodesic
- python3 -m unittest -v test.test_geodesic
+ python2 -m unittest -v geographiclib.test.test_geodesic
+ python3 -m unittest -v geographiclib.test.test_geodesic
executed in this directory's parent directory.
diff --git a/python/geographiclib/test/test_geodesic.py b/python/geographiclib/test/test_geodesic.py
new file mode 100644
index 0000000..566f12d
--- /dev/null
+++ b/python/geographiclib/test/test_geodesic.py
@@ -0,0 +1,514 @@
+import unittest
+
+from geographiclib.geodesic import Geodesic
+from geographiclib.geomath import Math
+
+class GeodesicTest(unittest.TestCase):
+
+ testcases = [
+ [35.60777, -139.44815, 111.098748429560326,
+ -11.17491, -69.95921, 129.289270889708762,
+ 8935244.5604818305, 80.50729714281974, 6273170.2055303837,
+ 0.16606318447386067, 0.16479116945612937, 12841384694976.432],
+ [55.52454, 106.05087, 22.020059880982801,
+ 77.03196, 197.18234, 109.112041110671519,
+ 4105086.1713924406, 36.892740690445894, 3828869.3344387607,
+ 0.80076349608092607, 0.80101006984201008, 61674961290615.615],
+ [-21.97856, 142.59065, -32.44456876433189,
+ 41.84138, 98.56635, -41.84359951440466,
+ 8394328.894657671, 75.62930491011522, 6161154.5773110616,
+ 0.24816339233950381, 0.24930251203627892, -6637997720646.717],
+ [-66.99028, 112.2363, 173.73491240878403,
+ -12.70631, 285.90344, 2.512956620913668,
+ 11150344.2312080241, 100.278634181155759, 6289939.5670446687,
+ -0.17199490274700385, -0.17722569526345708, -121287239862139.744],
+ [-17.42761, 173.34268, -159.033557661192928,
+ -15.84784, 5.93557, -20.787484651536988,
+ 16076603.1631180673, 144.640108810286253, 3732902.1583877189,
+ -0.81273638700070476, -0.81299800519154474, 97825992354058.708],
+ [32.84994, 48.28919, 150.492927788121982,
+ -56.28556, 202.29132, 48.113449399816759,
+ 16727068.9438164461, 150.565799985466607, 3147838.1910180939,
+ -0.87334918086923126, -0.86505036767110637, -72445258525585.010],
+ [6.96833, 52.74123, 92.581585386317712,
+ -7.39675, 206.17291, 90.721692165923907,
+ 17102477.2496958388, 154.147366239113561, 2772035.6169917581,
+ -0.89991282520302447, -0.89986892177110739, -1311796973197.995],
+ [-50.56724, -16.30485, -105.439679907590164,
+ -33.56571, -94.97412, -47.348547835650331,
+ 6455670.5118668696, 58.083719495371259, 5409150.7979815838,
+ 0.53053508035997263, 0.52988722644436602, 41071447902810.047],
+ [-58.93002, -8.90775, 140.965397902500679,
+ -8.91104, 133.13503, 19.255429433416599,
+ 11756066.0219864627, 105.755691241406877, 6151101.2270708536,
+ -0.26548622269867183, -0.27068483874510741, -86143460552774.735],
+ [-68.82867, -74.28391, 93.774347763114881,
+ -50.63005, -8.36685, 34.65564085411343,
+ 3956936.926063544, 35.572254987389284, 3708890.9544062657,
+ 0.81443963736383502, 0.81420859815358342, -41845309450093.787],
+ [-10.62672, -32.0898, -86.426713286747751,
+ 5.883, -134.31681, -80.473780971034875,
+ 11470869.3864563009, 103.387395634504061, 6184411.6622659713,
+ -0.23138683500430237, -0.23155097622286792, 4198803992123.548],
+ [-21.76221, 166.90563, 29.319421206936428,
+ 48.72884, 213.97627, 43.508671946410168,
+ 9098627.3986554915, 81.963476716121964, 6299240.9166992283,
+ 0.13965943368590333, 0.14152969707656796, 10024709850277.476],
+ [-19.79938, -174.47484, 71.167275780171533,
+ -11.99349, -154.35109, 65.589099775199228,
+ 2319004.8601169389, 20.896611684802389, 2267960.8703918325,
+ 0.93427001867125849, 0.93424887135032789, -3935477535005.785],
+ [-11.95887, -116.94513, 92.712619830452549,
+ 4.57352, 7.16501, 78.64960934409585,
+ 13834722.5801401374, 124.688684161089762, 5228093.177931598,
+ -0.56879356755666463, -0.56918731952397221, -9919582785894.853],
+ [-87.85331, 85.66836, -65.120313040242748,
+ 66.48646, 16.09921, -4.888658719272296,
+ 17286615.3147144645, 155.58592449699137, 2635887.4729110181,
+ -0.90697975771398578, -0.91095608883042767, 42667211366919.534],
+ [1.74708, 128.32011, -101.584843631173858,
+ -11.16617, 11.87109, -86.325793296437476,
+ 12942901.1241347408, 116.650512484301857, 5682744.8413270572,
+ -0.44857868222697644, -0.44824490340007729, 10763055294345.653],
+ [-25.72959, -144.90758, -153.647468693117198,
+ -57.70581, -269.17879, -48.343983158876487,
+ 9413446.7452453107, 84.664533838404295, 6356176.6898881281,
+ 0.09492245755254703, 0.09737058264766572, 74515122850712.444],
+ [-41.22777, 122.32875, 14.285113402275739,
+ -7.57291, 130.37946, 10.805303085187369,
+ 3812686.035106021, 34.34330804743883, 3588703.8812128856,
+ 0.82605222593217889, 0.82572158200920196, -2456961531057.857],
+ [11.01307, 138.25278, 79.43682622782374,
+ 6.62726, 247.05981, 103.708090215522657,
+ 11911190.819018408, 107.341669954114577, 6070904.722786735,
+ -0.29767608923657404, -0.29785143390252321, 17121631423099.696],
+ [-29.47124, 95.14681, -163.779130441688382,
+ -27.46601, -69.15955, -15.909335945554969,
+ 13487015.8381145492, 121.294026715742277, 5481428.9945736388,
+ -0.51527225545373252, -0.51556587964721788, 104679964020340.318]]
+
+ def test_inverse(self):
+ for l in GeodesicTest.testcases:
+ (lat1, lon1, azi1, lat2, lon2, azi2,
+ s12, a12, m12, M12, M21, S12) = l
+ inv = Geodesic.WGS84.Inverse(lat1, lon1, lat2, lon2,
+ Geodesic.ALL | Geodesic.LONG_UNROLL)
+ self.assertAlmostEqual(lon2, inv["lon2"], delta = 1e-13)
+ self.assertAlmostEqual(azi1, inv["azi1"], delta = 1e-13)
+ self.assertAlmostEqual(azi2, inv["azi2"], delta = 1e-13)
+ self.assertAlmostEqual(s12, inv["s12"], delta = 1e-8)
+ self.assertAlmostEqual(a12, inv["a12"], delta = 1e-13)
+ self.assertAlmostEqual(m12, inv["m12"], delta = 1e-8)
+ self.assertAlmostEqual(M12, inv["M12"], delta = 1e-15)
+ self.assertAlmostEqual(M21, inv["M21"], delta = 1e-15)
+ self.assertAlmostEqual(S12, inv["S12"], delta = 0.1)
+
+ def test_direct(self):
+ for l in GeodesicTest.testcases:
+ (lat1, lon1, azi1, lat2, lon2, azi2,
+ s12, a12, m12, M12, M21, S12) = l
+ dir = Geodesic.WGS84.Direct(lat1, lon1, azi1, s12,
+ Geodesic.ALL | Geodesic.LONG_UNROLL)
+ self.assertAlmostEqual(lat2, dir["lat2"], delta = 1e-13)
+ self.assertAlmostEqual(lon2, dir["lon2"], delta = 1e-13)
+ self.assertAlmostEqual(azi2, dir["azi2"], delta = 1e-13)
+ self.assertAlmostEqual(a12, dir["a12"], delta = 1e-13)
+ self.assertAlmostEqual(m12, dir["m12"], delta = 1e-8)
+ self.assertAlmostEqual(M12, dir["M12"], delta = 1e-15)
+ self.assertAlmostEqual(M21, dir["M21"], delta = 1e-15)
+ self.assertAlmostEqual(S12, dir["S12"], delta = 0.1)
+
+ def test_arcdirect(self):
+ for l in GeodesicTest.testcases:
+ (lat1, lon1, azi1, lat2, lon2, azi2,
+ s12, a12, m12, M12, M21, S12) = l
+ dir = Geodesic.WGS84.ArcDirect(lat1, lon1, azi1, a12,
+ Geodesic.ALL | Geodesic.LONG_UNROLL)
+ self.assertAlmostEqual(lat2, dir["lat2"], delta = 1e-13)
+ self.assertAlmostEqual(lon2, dir["lon2"], delta = 1e-13)
+ self.assertAlmostEqual(azi2, dir["azi2"], delta = 1e-13)
+ self.assertAlmostEqual(s12, dir["s12"], delta = 1e-8)
+ self.assertAlmostEqual(m12, dir["m12"], delta = 1e-8)
+ self.assertAlmostEqual(M12, dir["M12"], delta = 1e-15)
+ self.assertAlmostEqual(M21, dir["M21"], delta = 1e-15)
+ self.assertAlmostEqual(S12, dir["S12"], delta = 0.1)
+
+class GeodSolveTest(unittest.TestCase):
+
+ def test_GeodSolve0(self):
+ inv = Geodesic.WGS84.Inverse(40.6, -73.8, 49.01666667, 2.55)
+ self.assertAlmostEqual(inv["azi1"], 53.47022, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["azi2"], 111.59367, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["s12"], 5853226, delta = 0.5)
+
+ def test_GeodSolve1(self):
+ dir = Geodesic.WGS84.Direct(40.63972222, -73.77888889, 53.5, 5850e3)
+ self.assertAlmostEqual(dir["lat2"], 49.01467, delta = 0.5e-5)
+ self.assertAlmostEqual(dir["lon2"], 2.56106, delta = 0.5e-5)
+ self.assertAlmostEqual(dir["azi2"], 111.62947, delta = 0.5e-5)
+
+ def test_GeodSolve2(self):
+ # Check fix for antipodal prolate bug found 2010-09-04
+ geod = Geodesic(6.4e6, -1/150.0)
+ inv = geod.Inverse(0.07476, 0, -0.07476, 180)
+ self.assertAlmostEqual(inv["azi1"], 90.00078, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["azi2"], 90.00078, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["s12"], 20106193, delta = 0.5)
+ inv = geod.Inverse(0.1, 0, -0.1, 180)
+ self.assertAlmostEqual(inv["azi1"], 90.00105, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["azi2"], 90.00105, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["s12"], 20106193, delta = 0.5)
+
+ def test_GeodSolve4(self):
+ # Check fix for short line bug found 2010-05-21
+ inv = Geodesic.WGS84.Inverse(36.493349428792, 0,
+ 36.49334942879201, 0.0000008)
+ self.assertAlmostEqual(inv["s12"], 0.072, delta = 0.5e-3)
+
+ def test_GeodSolve5(self):
+ # Check fix for point2=pole bug found 2010-05-03
+ dir = Geodesic.WGS84.Direct(0.01777745589997, 30, 0, 10e6)
+ self.assertAlmostEqual(dir["lat2"], 90, delta = 0.5e-5)
+ if dir["lon2"] < 0:
+ self.assertAlmostEqual(dir["lon2"], -150, delta = 0.5e-5)
+ self.assertAlmostEqual(dir["azi2"], -180, delta = 0.5e-5)
+ else:
+ self.assertAlmostEqual(dir["lon2"], 30, delta = 0.5e-5)
+ self.assertAlmostEqual(dir["azi2"], 0, delta = 0.5e-5)
+
+ def test_GeodSolve6(self):
+ # Check fix for volatile sbet12a bug found 2011-06-25 (gcc 4.4.4
+ # x86 -O3). Found again on 2012-03-27 with tdm-mingw32 (g++ 4.6.1).
+ inv = Geodesic.WGS84.Inverse(88.202499451857, 0,
+ -88.202499451857, 179.981022032992859592)
+ self.assertAlmostEqual(inv["s12"], 20003898.214, delta = 0.5e-3)
+ inv = Geodesic.WGS84.Inverse(89.262080389218, 0,
+ -89.262080389218, 179.992207982775375662)
+ self.assertAlmostEqual(inv["s12"], 20003925.854, delta = 0.5e-3)
+ inv = Geodesic.WGS84.Inverse(89.333123580033, 0,
+ -89.333123580032997687,
+ 179.99295812360148422)
+ self.assertAlmostEqual(inv["s12"], 20003926.881, delta = 0.5e-3)
+
+ def test_GeodSolve9(self):
+ # Check fix for volatile x bug found 2011-06-25 (gcc 4.4.4 x86 -O3)
+ inv = Geodesic.WGS84.Inverse(56.320923501171, 0,
+ -56.320923501171, 179.664747671772880215)
+ self.assertAlmostEqual(inv["s12"], 19993558.287, delta = 0.5e-3)
+
+ def test_GeodSolve10(self):
+ # Check fix for adjust tol1_ bug found 2011-06-25 (Visual Studio
+ # 10 rel + debug)
+ inv = Geodesic.WGS84.Inverse(52.784459512564, 0,
+ -52.784459512563990912,
+ 179.634407464943777557)
+ self.assertAlmostEqual(inv["s12"], 19991596.095, delta = 0.5e-3)
+
+ def test_GeodSolve11(self):
+ # Check fix for bet2 = -bet1 bug found 2011-06-25 (Visual Studio
+ # 10 rel + debug)
+ inv = Geodesic.WGS84.Inverse(48.522876735459, 0,
+ -48.52287673545898293,
+ 179.599720456223079643)
+ self.assertAlmostEqual(inv["s12"], 19989144.774, delta = 0.5e-3)
+
+ def test_GeodSolve12(self):
+ # Check fix for inverse geodesics on extreme prolate/oblate
+ # ellipsoids Reported 2012-08-29 Stefan Guenther
+ # <stefan.gunther at embl.de>; fixed 2012-10-07
+ geod = Geodesic(89.8, -1.83)
+ inv = geod.Inverse(0, 0, -10, 160)
+ self.assertAlmostEqual(inv["azi1"], 120.27, delta = 1e-2)
+ self.assertAlmostEqual(inv["azi2"], 105.15, delta = 1e-2)
+ self.assertAlmostEqual(inv["s12"], 266.7, delta = 1e-1)
+
+ def test_GeodSolve14(self):
+ # Check fix for inverse ignoring lon12 = nan
+ inv = Geodesic.WGS84.Inverse(0, 0, 1, Math.nan)
+ self.assertTrue(Math.isnan(inv["azi1"]))
+ self.assertTrue(Math.isnan(inv["azi2"]))
+ self.assertTrue(Math.isnan(inv["s12"]))
+
+ def test_GeodSolve15(self):
+ # Initial implementation of Math::eatanhe was wrong for e^2 < 0. This
+ # checks that this is fixed.
+ geod = Geodesic(6.4e6, -1/150.0)
+ dir = geod.Direct(1, 2, 3, 4, Geodesic.AREA)
+ self.assertAlmostEqual(dir["S12"], 23700, delta = 0.5)
+
+ def test_GeodSolve17(self):
+ # Check fix for LONG_UNROLL bug found on 2015-05-07
+ dir = Geodesic.WGS84.Direct(40, -75, -10, 2e7,
+ Geodesic.STANDARD | Geodesic.LONG_UNROLL)
+ self.assertAlmostEqual(dir["lat2"], -39, delta = 1)
+ self.assertAlmostEqual(dir["lon2"], -254, delta = 1)
+ self.assertAlmostEqual(dir["azi2"], -170, delta = 1)
+ line = Geodesic.WGS84.Line(40, -75, -10)
+ dir = line.Position(2e7, Geodesic.STANDARD | Geodesic.LONG_UNROLL)
+ self.assertAlmostEqual(dir["lat2"], -39, delta = 1)
+ self.assertAlmostEqual(dir["lon2"], -254, delta = 1)
+ self.assertAlmostEqual(dir["azi2"], -170, delta = 1)
+ dir = Geodesic.WGS84.Direct(40, -75, -10, 2e7)
+ self.assertAlmostEqual(dir["lat2"], -39, delta = 1)
+ self.assertAlmostEqual(dir["lon2"], 105, delta = 1)
+ self.assertAlmostEqual(dir["azi2"], -170, delta = 1)
+ dir = line.Position(2e7)
+ self.assertAlmostEqual(dir["lat2"], -39, delta = 1)
+ self.assertAlmostEqual(dir["lon2"], 105, delta = 1)
+ self.assertAlmostEqual(dir["azi2"], -170, delta = 1)
+
+ def test_GeodSolve26(self):
+ # Check 0/0 problem with area calculation on sphere 2015-09-08
+ geod = Geodesic(6.4e6, 0)
+ inv = geod.Inverse(1, 2, 3, 4, Geodesic.AREA)
+ self.assertAlmostEqual(inv["S12"], 49911046115.0, delta = 0.5)
+
+ def test_GeodSolve28(self):
+ # Check for bad placement of assignment of r.a12 with |f| > 0.01 (bug in
+ # Java implementation fixed on 2015-05-19).
+ geod = Geodesic(6.4e6, 0.1)
+ dir = geod.Direct(1, 2, 10, 5e6)
+ self.assertAlmostEqual(dir["a12"], 48.55570690, delta = 0.5e-8)
+
+ def test_GeodSolve29(self):
+ # Check longitude unrolling with inverse calculation 2015-09-16
+ dir = Geodesic.WGS84.Inverse(0, 539, 0, 181)
+ self.assertAlmostEqual(dir["lon1"], 179, delta = 1e-10)
+ self.assertAlmostEqual(dir["lon2"], -179, delta = 1e-10)
+ self.assertAlmostEqual(dir["s12"], 222639, delta = 0.5)
+ dir = Geodesic.WGS84.Inverse(0, 539, 0, 181,
+ Geodesic.STANDARD | Geodesic.LONG_UNROLL)
+ self.assertAlmostEqual(dir["lon1"], 539, delta = 1e-10)
+ self.assertAlmostEqual(dir["lon2"], 541, delta = 1e-10)
+ self.assertAlmostEqual(dir["s12"], 222639, delta = 0.5)
+
+ def test_GeodSolve33(self):
+ # Check max(-0.0,+0.0) issues 2015-08-22 (triggered by bugs in
+ # Octave -- sind(-0.0) = +0.0 -- and in some version of Visual
+ # Studio -- fmod(-0.0, 360.0) = +0.0.
+ inv = Geodesic.WGS84.Inverse(0, 0, 0, 179)
+ self.assertAlmostEqual(inv["azi1"], 90.00000, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["azi2"], 90.00000, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["s12"], 19926189, delta = 0.5)
+ inv = Geodesic.WGS84.Inverse(0, 0, 0, 179.5)
+ self.assertAlmostEqual(inv["azi1"], 55.96650, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["azi2"], 124.03350, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["s12"], 19980862, delta = 0.5)
+ inv = Geodesic.WGS84.Inverse(0, 0, 0, 180)
+ self.assertAlmostEqual(inv["azi1"], 0.00000, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["azi2"], -180.00000, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["s12"], 20003931, delta = 0.5)
+ inv = Geodesic.WGS84.Inverse(0, 0, 1, 180)
+ self.assertAlmostEqual(inv["azi1"], 0.00000, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["azi2"], -180.00000, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["s12"], 19893357, delta = 0.5)
+ geod = Geodesic(6.4e6, 0)
+ inv = geod.Inverse(0, 0, 0, 179)
+ self.assertAlmostEqual(inv["azi1"], 90.00000, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["azi2"], 90.00000, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["s12"], 19994492, delta = 0.5)
+ inv = geod.Inverse(0, 0, 0, 180)
+ self.assertAlmostEqual(inv["azi1"], 0.00000, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["azi2"], -180.00000, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["s12"], 20106193, delta = 0.5)
+ inv = geod.Inverse(0, 0, 1, 180)
+ self.assertAlmostEqual(inv["azi1"], 0.00000, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["azi2"], -180.00000, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["s12"], 19994492, delta = 0.5)
+ geod = Geodesic(6.4e6, -1/300.0)
+ inv = geod.Inverse(0, 0, 0, 179)
+ self.assertAlmostEqual(inv["azi1"], 90.00000, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["azi2"], 90.00000, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["s12"], 19994492, delta = 0.5)
+ inv = geod.Inverse(0, 0, 0, 180)
+ self.assertAlmostEqual(inv["azi1"], 90.00000, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["azi2"], 90.00000, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["s12"], 20106193, delta = 0.5)
+ inv = geod.Inverse(0, 0, 0.5, 180)
+ self.assertAlmostEqual(inv["azi1"], 33.02493, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["azi2"], 146.97364, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["s12"], 20082617, delta = 0.5)
+ inv = geod.Inverse(0, 0, 1, 180)
+ self.assertAlmostEqual(inv["azi1"], 0.00000, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["azi2"], -180.00000, delta = 0.5e-5)
+ self.assertAlmostEqual(inv["s12"], 20027270, delta = 0.5)
+
+ def test_GeodSolve55(self):
+ # Check fix for nan + point on equator or pole not returning all nans in
+ # Geodesic::Inverse, found 2015-09-23.
+ inv = Geodesic.WGS84.Inverse(Math.nan, 0, 0, 90)
+ self.assertTrue(Math.isnan(inv["azi1"]))
+ self.assertTrue(Math.isnan(inv["azi2"]))
+ self.assertTrue(Math.isnan(inv["s12"]))
+ inv = Geodesic.WGS84.Inverse(Math.nan, 0, 90, 9)
+ self.assertTrue(Math.isnan(inv["azi1"]))
+ self.assertTrue(Math.isnan(inv["azi2"]))
+ self.assertTrue(Math.isnan(inv["s12"]))
+
+ def test_GeodSolve59(self):
+ # Check for points close with longitudes close to 180 deg apart.
+ inv = Geodesic.WGS84.Inverse(5, 0.00000000000001, 10, 180)
+ self.assertAlmostEqual(inv["azi1"], 0.000000000000035, delta = 1.5e-14)
+ self.assertAlmostEqual(inv["azi2"], 179.99999999999996, delta = 1.5e-14)
+ self.assertAlmostEqual(inv["s12"], 18345191.174332713, delta = 4e-9)
+
+ def test_GeodSolve61(self):
+ # Make sure small negative azimuths are west-going
+ dir = Geodesic.WGS84.Direct(45, 0, -0.000000000000000003, 1e7,
+ Geodesic.STANDARD | Geodesic.LONG_UNROLL)
+ self.assertAlmostEqual(dir["lat2"], 45.30632, delta = 0.5e-5)
+ self.assertAlmostEqual(dir["lon2"], -180, delta = 0.5e-5)
+ self.assertAlmostEqual(dir["azi2"], -180, delta = 0.5e-5)
+ line = Geodesic.WGS84.InverseLine(45, 0, 80, -0.000000000000000003)
+ dir = line.Position(1e7)
+ self.assertAlmostEqual(dir["lat2"], 45.30632, delta = 0.5e-5)
+ self.assertAlmostEqual(dir["lon2"], -180, delta = 0.5e-5)
+ self.assertAlmostEqual(dir["azi2"], -180, delta = 0.5e-5)
+
+ def test_GeodSolve65(self):
+ # Check for bug in east-going check in GeodesicLine (needed to check for
+ # sign of 0) and sign error in area calculation due to a bogus override
+ # of the code for alp12. Found/fixed on 2015-12-19.
+ line = Geodesic.WGS84.InverseLine(30, -0.000000000000000001, -31, 180,
+ Geodesic.ALL)
+ dir = line.Position(1e7, Geodesic.ALL | Geodesic.LONG_UNROLL)
+ self.assertAlmostEqual(dir["lat1"], 30.00000 , delta = 0.5e-5)
+ self.assertAlmostEqual(dir["lon1"], -0.00000 , delta = 0.5e-5)
+ self.assertAlmostEqual(dir["azi1"], -180.00000, delta = 0.5e-5)
+ self.assertAlmostEqual(dir["lat2"], -60.23169 , delta = 0.5e-5)
+ self.assertAlmostEqual(dir["lon2"], -0.00000 , delta = 0.5e-5)
+ self.assertAlmostEqual(dir["azi2"], -180.00000, delta = 0.5e-5)
+ self.assertAlmostEqual(dir["s12"] , 10000000 , delta = 0.5)
+ self.assertAlmostEqual(dir["a12"] , 90.06544 , delta = 0.5e-5)
+ self.assertAlmostEqual(dir["m12"] , 6363636 , delta = 0.5)
+ self.assertAlmostEqual(dir["M12"] , -0.0012834, delta = 0.5e7)
+ self.assertAlmostEqual(dir["M21"] , 0.0013749 , delta = 0.5e-7)
+ self.assertAlmostEqual(dir["S12"] , 0 , delta = 0.5)
+ dir = line.Position(2e7, Geodesic.ALL | Geodesic.LONG_UNROLL)
+ self.assertAlmostEqual(dir["lat1"], 30.00000 , delta = 0.5e-5)
+ self.assertAlmostEqual(dir["lon1"], -0.00000 , delta = 0.5e-5)
+ self.assertAlmostEqual(dir["azi1"], -180.00000, delta = 0.5e-5)
+ self.assertAlmostEqual(dir["lat2"], -30.03547 , delta = 0.5e-5)
+ self.assertAlmostEqual(dir["lon2"], -180.00000, delta = 0.5e-5)
+ self.assertAlmostEqual(dir["azi2"], -0.00000 , delta = 0.5e-5)
+ self.assertAlmostEqual(dir["s12"] , 20000000 , delta = 0.5)
+ self.assertAlmostEqual(dir["a12"] , 179.96459 , delta = 0.5e-5)
+ self.assertAlmostEqual(dir["m12"] , 54342 , delta = 0.5)
+ self.assertAlmostEqual(dir["M12"] , -1.0045592, delta = 0.5e7)
+ self.assertAlmostEqual(dir["M21"] , -0.9954339, delta = 0.5e-7)
+ self.assertAlmostEqual(dir["S12"] , 127516405431022.0, delta = 0.5)
+
+ def test_GeodSolve66(self):
+ # Check for InverseLine if line is slightly west of S and that s13 is
+ # correctly set.
+ line = Geodesic.WGS84.InverseLine(-5, -0.000000000000002, -10, 180)
+ dir = line.Position(2e7, Geodesic.STANDARD | Geodesic.LONG_UNROLL)
+ self.assertAlmostEqual(dir["lat2"], 4.96445 , delta = 0.5e-5)
+ self.assertAlmostEqual(dir["lon2"], -180.00000, delta = 0.5e-5)
+ self.assertAlmostEqual(dir["azi2"], -0.00000 , delta = 0.5e-5)
+ dir = line.Position(0.5 * line.s13,
+ Geodesic.STANDARD | Geodesic.LONG_UNROLL)
+ self.assertAlmostEqual(dir["lat2"], -87.52461 , delta = 0.5e-5)
+ self.assertAlmostEqual(dir["lon2"], -0.00000 , delta = 0.5e-5)
+ self.assertAlmostEqual(dir["azi2"], -180.00000, delta = 0.5e-5)
+
+ def test_GeodSolve71(self):
+ # Check that DirectLine sets s13.
+ line = Geodesic.WGS84.DirectLine(1, 2, 45, 1e7)
+ dir = line.Position(0.5 * line.s13,
+ Geodesic.STANDARD | Geodesic.LONG_UNROLL)
+ self.assertAlmostEqual(dir["lat2"], 30.92625, delta = 0.5e-5)
+ self.assertAlmostEqual(dir["lon2"], 37.54640, delta = 0.5e-5)
+ self.assertAlmostEqual(dir["azi2"], 55.43104, delta = 0.5e-5)
+
+ def test_GeodSolve73(self):
+ # Check for backwards from the pole bug reported by Anon on 2016-02-13.
+ # This only affected the Java implementation. It was introduced in Java
+ # version 1.44 and fixed in 1.46-SNAPSHOT on 2016-01-17.
+ dir = Geodesic.WGS84.Direct(90, 10, 180, -1e6)
+ self.assertAlmostEqual(dir["lat2"], 81.04623, delta = 0.5e-5)
+ self.assertAlmostEqual(dir["lon2"], -170, delta = 0.5e-5)
+ self.assertAlmostEqual(dir["azi2"], 0, delta = 0.5e-5)
+
+class PlanimeterTest(unittest.TestCase):
+
+ polygon = Geodesic.WGS84.Polygon(False)
+ polyline = Geodesic.WGS84.Polygon(True)
+
+ def Planimeter(points):
+ PlanimeterTest.polygon.Clear()
+ for p in points:
+ PlanimeterTest.polygon.AddPoint(p[0], p[1])
+ return PlanimeterTest.polygon.Compute(False, True)
+ Planimeter = staticmethod(Planimeter)
+
+ def PolyLength(points):
+ PlanimeterTest.polyline.Clear()
+ for p in points:
+ PlanimeterTest.polyline.AddPoint(p[0], p[1])
+ return PlanimeterTest.polyline.Compute(False, True)
+ PolyLength = staticmethod(PolyLength)
+
+ def test_Planimeter0(self):
+ # Check fix for pole-encircling bug found 2011-03-16
+ points = [[89, 0], [89, 90], [89, 180], [89, 270]]
+ num, perimeter, area = PlanimeterTest.Planimeter(points)
+ self.assertAlmostEqual(perimeter, 631819.8745, delta = 1e-4)
+ self.assertAlmostEqual(area, 24952305678.0, delta = 1)
+ points = [[-89, 0], [-89, 90], [-89, 180], [-89, 270]]
+ num, perimeter, area = PlanimeterTest.Planimeter(points)
+ self.assertAlmostEqual(perimeter, 631819.8745, delta = 1e-4)
+ self.assertAlmostEqual(area, -24952305678.0, delta = 1)
+
+ points = [[0, -1], [-1, 0], [0, 1], [1, 0]]
+ num, perimeter, area = PlanimeterTest.Planimeter(points)
+ self.assertAlmostEqual(perimeter, 627598.2731, delta = 1e-4)
+ self.assertAlmostEqual(area, 24619419146.0, delta = 1)
+
+ points = [[90, 0], [0, 0], [0, 90]]
+ num, perimeter, area = PlanimeterTest.Planimeter(points)
+ self.assertAlmostEqual(perimeter, 30022685, delta = 1)
+ self.assertAlmostEqual(area, 63758202715511.0, delta = 1)
+ num, perimeter, area = PlanimeterTest.PolyLength(points)
+ self.assertAlmostEqual(perimeter, 20020719, delta = 1)
+ self.assertTrue(Math.isnan(area))
+
+ def test_Planimeter5(self):
+ # Check fix for Planimeter pole crossing bug found 2011-06-24
+ points = [[89, 0.1], [89, 90.1], [89, -179.9]]
+ num, perimeter, area = PlanimeterTest.Planimeter(points)
+ self.assertAlmostEqual(perimeter, 539297, delta = 1)
+ self.assertAlmostEqual(area, 12476152838.5, delta = 1)
+
+ def test_Planimeter6(self):
+ # Check fix for Planimeter lon12 rounding bug found 2012-12-03
+ points = [[9, -0.00000000000001], [9, 180], [9, 0]]
+ num, perimeter, area = PlanimeterTest.Planimeter(points)
+ self.assertAlmostEqual(perimeter, 36026861, delta = 1)
+ self.assertAlmostEqual(area, 0, delta = 1)
+ points = [[9, 0.00000000000001], [9, 0], [9, 180]]
+ num, perimeter, area = PlanimeterTest.Planimeter(points)
+ self.assertAlmostEqual(perimeter, 36026861, delta = 1)
+ self.assertAlmostEqual(area, 0, delta = 1)
+ points = [[9, 0.00000000000001], [9, 180], [9, 0]]
+ num, perimeter, area = PlanimeterTest.Planimeter(points)
+ self.assertAlmostEqual(perimeter, 36026861, delta = 1)
+ self.assertAlmostEqual(area, 0, delta = 1)
+ points = [[9, -0.00000000000001], [9, 0], [9, 180]]
+ num, perimeter, area = PlanimeterTest.Planimeter(points)
+ self.assertAlmostEqual(perimeter, 36026861, delta = 1)
+ self.assertAlmostEqual(area, 0, delta = 1)
+
+ def test_Planimeter12(self):
+ # Area of arctic circle (not really -- adjunct to rhumb-area test)
+ points = [[66.562222222, 0], [66.562222222, 180]]
+ num, perimeter, area = PlanimeterTest.Planimeter(points)
+ self.assertAlmostEqual(perimeter, 10465729, delta = 1)
+ self.assertAlmostEqual(area, 0, delta = 1)
+
+ def test_Planimeter13(self):
+ # Check encircling pole twice
+ points = [[89,-360], [89,-240], [89,-120], [89,0], [89,120], [89,240]]
+ num, perimeter, area = PlanimeterTest.Planimeter(points)
+ self.assertAlmostEqual(perimeter, 1160741, delta = 1)
+ self.assertAlmostEqual(area, 32415230256.0, delta = 1)
diff --git a/python/setup.py b/python/setup.py
index b27421f..2baa5b2 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -4,8 +4,15 @@
#
# python setup.py install
#
-# in this directory. To upload the latest version to the python
-# repository run
+# in this directory. To run the unit tests, execute
+#
+# python setup.py test
+#
+# To update the HTML page for this version, run
+#
+# python setup.py register
+#
+# To upload the latest version to the python repository, run
#
# python setup.py sdist --formats gztar,zip upload
#
@@ -13,19 +20,38 @@
# Andrew MacIntyre <Andrew.MacIntyre at acma.gov.au>.
from distutils.core import setup
+from distutils.cmd import Command
+
+class TestCommand(Command):
+ user_options = []
+ def initialize_options(self):
+ pass
+ def finalize_options(self):
+ pass
+ def run(self):
+ import sys, subprocess
+ raise SystemExit(subprocess.call([sys.executable,
+ '-m',
+ 'unittest',
+ '-v',
+ 'geographiclib.test.test_geodesic'
+ ]))
+
+name = "geographiclib"
+version = "1.46"
-setup(name="geographiclib",
- version="1.45",
- description=
- "A translation of the GeographicLib::Geodesic class to Python",
- author="Charles Karney",
- author_email="charles at karney.com",
- url="http://geographiclib.sourceforge.net/",
- packages=["geographiclib"],
- data_files=[],
- license="MIT",
- keywords="gis geographical earth distance geodesic",
- classifiers=[
+setup(name = name,
+ version = version,
+ description = "The geodesic routines from GeographicLib",
+ long_description = open("README.rst").read(),
+ author = "Charles Karney",
+ author_email = "charles at karney.com",
+ url = "http://geographiclib.sourceforge.net/" + version + "/python",
+ packages = ["geographiclib", "geographiclib/test"],
+ data_files = [],
+ license = "MIT",
+ keywords = "gis geographical earth distance geodesic",
+ classifiers = [
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"Intended Audience :: Science/Research",
@@ -35,4 +61,7 @@ setup(name="geographiclib",
"Topic :: Scientific/Engineering :: GIS",
"Topic :: Software Development :: Libraries :: Python Modules",
],
+ cmdclass={
+ 'test': TestCommand,
+ },
)
diff --git a/python/test/test_geodesic.py b/python/test/test_geodesic.py
deleted file mode 100644
index 49ef638..0000000
--- a/python/test/test_geodesic.py
+++ /dev/null
@@ -1,432 +0,0 @@
-import unittest
-
-from geographiclib.geodesic import Geodesic
-from geographiclib.geomath import Math
-
-class GeodesicTest(unittest.TestCase):
-
- testcases = [
- [35.60777, -139.44815, 111.098748429560326,
- -11.17491, -69.95921, 129.289270889708762,
- 8935244.5604818305, 80.50729714281974, 6273170.2055303837,
- 0.16606318447386067, 0.16479116945612937, 12841384694976.432],
- [55.52454, 106.05087, 22.020059880982801,
- 77.03196, 197.18234, 109.112041110671519,
- 4105086.1713924406, 36.892740690445894, 3828869.3344387607,
- 0.80076349608092607, 0.80101006984201008, 61674961290615.615],
- [-21.97856, 142.59065, -32.44456876433189,
- 41.84138, 98.56635, -41.84359951440466,
- 8394328.894657671, 75.62930491011522, 6161154.5773110616,
- 0.24816339233950381, 0.24930251203627892, -6637997720646.717],
- [-66.99028, 112.2363, 173.73491240878403,
- -12.70631, 285.90344, 2.512956620913668,
- 11150344.2312080241, 100.278634181155759, 6289939.5670446687,
- -0.17199490274700385, -0.17722569526345708, -121287239862139.744],
- [-17.42761, 173.34268, -159.033557661192928,
- -15.84784, 5.93557, -20.787484651536988,
- 16076603.1631180673, 144.640108810286253, 3732902.1583877189,
- -0.81273638700070476, -0.81299800519154474, 97825992354058.708],
- [32.84994, 48.28919, 150.492927788121982,
- -56.28556, 202.29132, 48.113449399816759,
- 16727068.9438164461, 150.565799985466607, 3147838.1910180939,
- -0.87334918086923126, -0.86505036767110637, -72445258525585.010],
- [6.96833, 52.74123, 92.581585386317712,
- -7.39675, 206.17291, 90.721692165923907,
- 17102477.2496958388, 154.147366239113561, 2772035.6169917581,
- -0.89991282520302447, -0.89986892177110739, -1311796973197.995],
- [-50.56724, -16.30485, -105.439679907590164,
- -33.56571, -94.97412, -47.348547835650331,
- 6455670.5118668696, 58.083719495371259, 5409150.7979815838,
- 0.53053508035997263, 0.52988722644436602, 41071447902810.047],
- [-58.93002, -8.90775, 140.965397902500679,
- -8.91104, 133.13503, 19.255429433416599,
- 11756066.0219864627, 105.755691241406877, 6151101.2270708536,
- -0.26548622269867183, -0.27068483874510741, -86143460552774.735],
- [-68.82867, -74.28391, 93.774347763114881,
- -50.63005, -8.36685, 34.65564085411343,
- 3956936.926063544, 35.572254987389284, 3708890.9544062657,
- 0.81443963736383502, 0.81420859815358342, -41845309450093.787],
- [-10.62672, -32.0898, -86.426713286747751,
- 5.883, -134.31681, -80.473780971034875,
- 11470869.3864563009, 103.387395634504061, 6184411.6622659713,
- -0.23138683500430237, -0.23155097622286792, 4198803992123.548],
- [-21.76221, 166.90563, 29.319421206936428,
- 48.72884, 213.97627, 43.508671946410168,
- 9098627.3986554915, 81.963476716121964, 6299240.9166992283,
- 0.13965943368590333, 0.14152969707656796, 10024709850277.476],
- [-19.79938, -174.47484, 71.167275780171533,
- -11.99349, -154.35109, 65.589099775199228,
- 2319004.8601169389, 20.896611684802389, 2267960.8703918325,
- 0.93427001867125849, 0.93424887135032789, -3935477535005.785],
- [-11.95887, -116.94513, 92.712619830452549,
- 4.57352, 7.16501, 78.64960934409585,
- 13834722.5801401374, 124.688684161089762, 5228093.177931598,
- -0.56879356755666463, -0.56918731952397221, -9919582785894.853],
- [-87.85331, 85.66836, -65.120313040242748,
- 66.48646, 16.09921, -4.888658719272296,
- 17286615.3147144645, 155.58592449699137, 2635887.4729110181,
- -0.90697975771398578, -0.91095608883042767, 42667211366919.534],
- [1.74708, 128.32011, -101.584843631173858,
- -11.16617, 11.87109, -86.325793296437476,
- 12942901.1241347408, 116.650512484301857, 5682744.8413270572,
- -0.44857868222697644, -0.44824490340007729, 10763055294345.653],
- [-25.72959, -144.90758, -153.647468693117198,
- -57.70581, -269.17879, -48.343983158876487,
- 9413446.7452453107, 84.664533838404295, 6356176.6898881281,
- 0.09492245755254703, 0.09737058264766572, 74515122850712.444],
- [-41.22777, 122.32875, 14.285113402275739,
- -7.57291, 130.37946, 10.805303085187369,
- 3812686.035106021, 34.34330804743883, 3588703.8812128856,
- 0.82605222593217889, 0.82572158200920196, -2456961531057.857],
- [11.01307, 138.25278, 79.43682622782374,
- 6.62726, 247.05981, 103.708090215522657,
- 11911190.819018408, 107.341669954114577, 6070904.722786735,
- -0.29767608923657404, -0.29785143390252321, 17121631423099.696],
- [-29.47124, 95.14681, -163.779130441688382,
- -27.46601, -69.15955, -15.909335945554969,
- 13487015.8381145492, 121.294026715742277, 5481428.9945736388,
- -0.51527225545373252, -0.51556587964721788, 104679964020340.318]]
-
- def test_inverse(self):
- for l in GeodesicTest.testcases:
- (lat1, lon1, azi1, lat2, lon2, azi2,
- s12, a12, m12, M12, M21, S12) = l
- inv = Geodesic.WGS84.Inverse(lat1, lon1, lat2, lon2,
- Geodesic.ALL | Geodesic.LONG_UNROLL)
- self.assertAlmostEqual(lon2, inv["lon2"], delta = 1e-13)
- self.assertAlmostEqual(azi1, inv["azi1"], delta = 1e-13)
- self.assertAlmostEqual(azi2, inv["azi2"], delta = 1e-13)
- self.assertAlmostEqual(s12, inv["s12"], delta = 1e-8)
- self.assertAlmostEqual(a12, inv["a12"], delta = 1e-13)
- self.assertAlmostEqual(m12, inv["m12"], delta = 1e-8)
- self.assertAlmostEqual(M12, inv["M12"], delta = 1e-15)
- self.assertAlmostEqual(M21, inv["M21"], delta = 1e-15)
- self.assertAlmostEqual(S12, inv["S12"], delta = 0.1)
-
- def test_direct(self):
- for l in GeodesicTest.testcases:
- (lat1, lon1, azi1, lat2, lon2, azi2,
- s12, a12, m12, M12, M21, S12) = l
- dir = Geodesic.WGS84.Direct(lat1, lon1, azi1, s12,
- Geodesic.ALL | Geodesic.LONG_UNROLL)
- self.assertAlmostEqual(lat2, dir["lat2"], delta = 1e-13)
- self.assertAlmostEqual(lon2, dir["lon2"], delta = 1e-13)
- self.assertAlmostEqual(azi2, dir["azi2"], delta = 1e-13)
- self.assertAlmostEqual(a12, dir["a12"], delta = 1e-13)
- self.assertAlmostEqual(m12, dir["m12"], delta = 1e-8)
- self.assertAlmostEqual(M12, dir["M12"], delta = 1e-15)
- self.assertAlmostEqual(M21, dir["M21"], delta = 1e-15)
- self.assertAlmostEqual(S12, dir["S12"], delta = 0.1)
-
- def test_arcdirect(self):
- for l in GeodesicTest.testcases:
- (lat1, lon1, azi1, lat2, lon2, azi2,
- s12, a12, m12, M12, M21, S12) = l
- dir = Geodesic.WGS84.ArcDirect(lat1, lon1, azi1, a12,
- Geodesic.ALL | Geodesic.LONG_UNROLL)
- self.assertAlmostEqual(lat2, dir["lat2"], delta = 1e-13)
- self.assertAlmostEqual(lon2, dir["lon2"], delta = 1e-13)
- self.assertAlmostEqual(azi2, dir["azi2"], delta = 1e-13)
- self.assertAlmostEqual(s12, dir["s12"], delta = 1e-8)
- self.assertAlmostEqual(m12, dir["m12"], delta = 1e-8)
- self.assertAlmostEqual(M12, dir["M12"], delta = 1e-15)
- self.assertAlmostEqual(M21, dir["M21"], delta = 1e-15)
- self.assertAlmostEqual(S12, dir["S12"], delta = 0.1)
-
-class GeodSolveTest(unittest.TestCase):
-
- def test_GeodSolve0(self):
- inv = Geodesic.WGS84.Inverse(40.6, -73.8, 49.01666667, 2.55)
- self.assertAlmostEqual(inv["azi1"], 53.47022, delta = 0.5e-5)
- self.assertAlmostEqual(inv["azi2"], 111.59367, delta = 0.5e-5)
- self.assertAlmostEqual(inv["s12"], 5853226, delta = 0.5)
-
- def test_GeodSolve1(self):
- dir = Geodesic.WGS84.Direct(40.63972222, -73.77888889, 53.5, 5850e3)
- self.assertAlmostEqual(dir["lat2"], 49.01467, delta = 0.5e-5)
- self.assertAlmostEqual(dir["lon2"], 2.56106, delta = 0.5e-5)
- self.assertAlmostEqual(dir["azi2"], 111.62947, delta = 0.5e-5)
-
- def test_GeodSolve2(self):
- # Check fix for antipodal prolate bug found 2010-09-04
- geod = Geodesic(6.4e6, -1/150.0)
- inv = geod.Inverse(0.07476, 0, -0.07476, 180)
- self.assertAlmostEqual(inv["azi1"], 90.00078, delta = 0.5e-5)
- self.assertAlmostEqual(inv["azi2"], 90.00078, delta = 0.5e-5)
- self.assertAlmostEqual(inv["s12"], 20106193, delta = 0.5)
- inv = geod.Inverse(0.1, 0, -0.1, 180)
- self.assertAlmostEqual(inv["azi1"], 90.00105, delta = 0.5e-5)
- self.assertAlmostEqual(inv["azi2"], 90.00105, delta = 0.5e-5)
- self.assertAlmostEqual(inv["s12"], 20106193, delta = 0.5)
-
- def test_GeodSolve4(self):
- # Check fix for short line bug found 2010-05-21
- inv = Geodesic.WGS84.Inverse(36.493349428792, 0,
- 36.49334942879201, .0000008)
- self.assertAlmostEqual(inv["s12"], 0.072, delta = 0.5e-3)
-
- def test_GeodSolve5(self):
- # Check fix for point2=pole bug found 2010-05-03
- dir = Geodesic.WGS84.Direct(0.01777745589997, 30, 0, 10e6)
- self.assertAlmostEqual(dir["lat2"], 90, delta = 0.5e-5)
- if dir["lon2"] < 0:
- self.assertAlmostEqual(dir["lon2"], -150, delta = 0.5e-5)
- self.assertAlmostEqual(dir["azi2"], -180, delta = 0.5e-5)
- else:
- self.assertAlmostEqual(dir["lon2"], 30, delta = 0.5e-5)
- self.assertAlmostEqual(dir["azi2"], 0, delta = 0.5e-5)
-
- def test_GeodSolve6(self):
- # Check fix for volatile sbet12a bug found 2011-06-25 (gcc 4.4.4
- # x86 -O3). Found again on 2012-03-27 with tdm-mingw32 (g++ 4.6.1).
- inv = Geodesic.WGS84.Inverse(88.202499451857, 0,
- -88.202499451857, 179.981022032992859592)
- self.assertAlmostEqual(inv["s12"], 20003898.214, delta = 0.5e-3)
- inv = Geodesic.WGS84.Inverse(89.262080389218, 0,
- -89.262080389218, 179.992207982775375662)
- self.assertAlmostEqual(inv["s12"], 20003925.854, delta = 0.5e-3)
- inv = Geodesic.WGS84.Inverse(89.333123580033, 0,
- -89.333123580032997687,
- 179.99295812360148422)
- self.assertAlmostEqual(inv["s12"], 20003926.881, delta = 0.5e-3)
-
- def test_GeodSolve9(self):
- # Check fix for volatile x bug found 2011-06-25 (gcc 4.4.4 x86 -O3)
- inv = Geodesic.WGS84.Inverse(56.320923501171, 0,
- -56.320923501171, 179.664747671772880215)
- self.assertAlmostEqual(inv["s12"], 19993558.287, delta = 0.5e-3)
-
- def test_GeodSolve10(self):
- # Check fix for adjust tol1_ bug found 2011-06-25 (Visual Studio
- # 10 rel + debug)
- inv = Geodesic.WGS84.Inverse(52.784459512564, 0,
- -52.784459512563990912,
- 179.634407464943777557)
- self.assertAlmostEqual(inv["s12"], 19991596.095, delta = 0.5e-3)
-
- def test_GeodSolve11(self):
- # Check fix for bet2 = -bet1 bug found 2011-06-25 (Visual Studio
- # 10 rel + debug)
- inv = Geodesic.WGS84.Inverse(48.522876735459, 0,
- -48.52287673545898293,
- 179.599720456223079643)
- self.assertAlmostEqual(inv["s12"], 19989144.774, delta = 0.5e-3)
-
- def test_GeodSolve12(self):
- # Check fix for inverse geodesics on extreme prolate/oblate
- # ellipsoids Reported 2012-08-29 Stefan Guenther
- # <stefan.gunther at embl.de>; fixed 2012-10-07
- geod = Geodesic(89.8, -1.83)
- inv = geod.Inverse(0, 0, -10, 160)
- self.assertAlmostEqual(inv["azi1"], 120.27, delta = 1e-2)
- self.assertAlmostEqual(inv["azi2"], 105.15, delta = 1e-2)
- self.assertAlmostEqual(inv["s12"], 266.7, delta = 1e-1)
-
- def test_GeodSolve14(self):
- # Check fix for inverse ignoring lon12 = nan
- inv = Geodesic.WGS84.Inverse(0, 0, 1, Math.nan)
- self.assertTrue(Math.isnan(inv["azi1"]))
- self.assertTrue(Math.isnan(inv["azi2"]))
- self.assertTrue(Math.isnan(inv["s12"]))
-
- def test_GeodSolve15(self):
- # Initial implementation of Math::eatanhe was wrong for e^2 < 0. This
- # checks that this is fixed.
- geod = Geodesic(6.4e6, -1/150.0)
- dir = geod.Direct(1, 2, 3, 4, Geodesic.AREA)
- self.assertAlmostEqual(dir["S12"], 23700, delta = 0.5)
-
- def test_GeodSolve17(self):
- # Check fix for LONG_UNROLL bug found on 2015-05-07
- dir = Geodesic.WGS84.Direct(40, -75, -10, 2e7,
- Geodesic.STANDARD | Geodesic.LONG_UNROLL)
- self.assertAlmostEqual(dir["lat2"], -39, delta = 1)
- self.assertAlmostEqual(dir["lon2"], -254, delta = 1)
- self.assertAlmostEqual(dir["azi2"], -170, delta = 1)
- line = Geodesic.WGS84.Line(40, -75, -10)
- dir = line.Position(2e7, Geodesic.STANDARD | Geodesic.LONG_UNROLL)
- self.assertAlmostEqual(dir["lat2"], -39, delta = 1)
- self.assertAlmostEqual(dir["lon2"], -254, delta = 1)
- self.assertAlmostEqual(dir["azi2"], -170, delta = 1)
- dir = Geodesic.WGS84.Direct(40, -75, -10, 2e7)
- self.assertAlmostEqual(dir["lat2"], -39, delta = 1)
- self.assertAlmostEqual(dir["lon2"], 105, delta = 1)
- self.assertAlmostEqual(dir["azi2"], -170, delta = 1)
- dir = line.Position(2e7)
- self.assertAlmostEqual(dir["lat2"], -39, delta = 1)
- self.assertAlmostEqual(dir["lon2"], 105, delta = 1)
- self.assertAlmostEqual(dir["azi2"], -170, delta = 1)
-
- def test_GeodSolve26(self):
- # Check 0/0 problem with area calculation on sphere 2015-09-08
- geod = Geodesic(6.4e6, 0)
- inv = geod.Inverse(1, 2, 3, 4, Geodesic.AREA)
- self.assertAlmostEqual(inv["S12"], 49911046115.0, delta = 0.5)
-
- def test_GeodSolve28(self):
- # Check for bad placement of assignment of r.a12 with |f| > 0.01 (bug in
- # Java implementation fixed on 2015-05-19).
- geod = Geodesic(6.4e6, 0.1)
- dir = geod.Direct(1, 2, 10, 5e6)
- self.assertAlmostEqual(dir["a12"], 48.55570690, delta = 0.5e-8)
-
- def test_GeodSolve29(self):
- # Check longitude unrolling with inverse calculation 2015-09-16
- dir = Geodesic.WGS84.Inverse(0, 539, 0, 181)
- self.assertAlmostEqual(dir["lon1"], 179, delta = 1e-10)
- self.assertAlmostEqual(dir["lon2"], -179, delta = 1e-10)
- self.assertAlmostEqual(dir["s12"], 222639, delta = 0.5)
- dir = Geodesic.WGS84.Inverse(0, 539, 0, 181,
- Geodesic.STANDARD | Geodesic.LONG_UNROLL)
- self.assertAlmostEqual(dir["lon1"], 539, delta = 1e-10)
- self.assertAlmostEqual(dir["lon2"], 541, delta = 1e-10)
- self.assertAlmostEqual(dir["s12"], 222639, delta = 0.5)
-
- def test_GeodSolve33(self):
- # Check max(-0.0,+0.0) issues 2015-08-22 (triggered by bugs in
- # Octave -- sind(-0.0) = +0.0 -- and in some version of Visual
- # Studio -- fmod(-0.0, 360.0) = +0.0.
- inv = Geodesic.WGS84.Inverse(0, 0, 0, 179)
- self.assertAlmostEqual(inv["azi1"], 90.00000, delta = 0.5e-5)
- self.assertAlmostEqual(inv["azi2"], 90.00000, delta = 0.5e-5)
- self.assertAlmostEqual(inv["s12"], 19926189, delta = 0.5)
- inv = Geodesic.WGS84.Inverse(0, 0, 0, 179.5)
- self.assertAlmostEqual(inv["azi1"], 55.96650, delta = 0.5e-5)
- self.assertAlmostEqual(inv["azi2"], 124.03350, delta = 0.5e-5)
- self.assertAlmostEqual(inv["s12"], 19980862, delta = 0.5)
- inv = Geodesic.WGS84.Inverse(0, 0, 0, 180)
- self.assertAlmostEqual(inv["azi1"], 0.00000, delta = 0.5e-5)
- self.assertAlmostEqual(inv["azi2"], -180.00000, delta = 0.5e-5)
- self.assertAlmostEqual(inv["s12"], 20003931, delta = 0.5)
- inv = Geodesic.WGS84.Inverse(0, 0, 1, 180)
- self.assertAlmostEqual(inv["azi1"], 0.00000, delta = 0.5e-5)
- self.assertAlmostEqual(inv["azi2"], -180.00000, delta = 0.5e-5)
- self.assertAlmostEqual(inv["s12"], 19893357, delta = 0.5)
- geod = Geodesic(6.4e6, 0)
- inv = geod.Inverse(0, 0, 0, 179)
- self.assertAlmostEqual(inv["azi1"], 90.00000, delta = 0.5e-5)
- self.assertAlmostEqual(inv["azi2"], 90.00000, delta = 0.5e-5)
- self.assertAlmostEqual(inv["s12"], 19994492, delta = 0.5)
- inv = geod.Inverse(0, 0, 0, 180)
- self.assertAlmostEqual(inv["azi1"], 0.00000, delta = 0.5e-5)
- self.assertAlmostEqual(inv["azi2"], -180.00000, delta = 0.5e-5)
- self.assertAlmostEqual(inv["s12"], 20106193, delta = 0.5)
- inv = geod.Inverse(0, 0, 1, 180)
- self.assertAlmostEqual(inv["azi1"], 0.00000, delta = 0.5e-5)
- self.assertAlmostEqual(inv["azi2"], -180.00000, delta = 0.5e-5)
- self.assertAlmostEqual(inv["s12"], 19994492, delta = 0.5)
- geod = Geodesic(6.4e6, -1/300.0)
- inv = geod.Inverse(0, 0, 0, 179)
- self.assertAlmostEqual(inv["azi1"], 90.00000, delta = 0.5e-5)
- self.assertAlmostEqual(inv["azi2"], 90.00000, delta = 0.5e-5)
- self.assertAlmostEqual(inv["s12"], 19994492, delta = 0.5)
- inv = geod.Inverse(0, 0, 0, 180)
- self.assertAlmostEqual(inv["azi1"], 90.00000, delta = 0.5e-5)
- self.assertAlmostEqual(inv["azi2"], 90.00000, delta = 0.5e-5)
- self.assertAlmostEqual(inv["s12"], 20106193, delta = 0.5)
- inv = geod.Inverse(0, 0, 0.5, 180)
- self.assertAlmostEqual(inv["azi1"], 33.02493, delta = 0.5e-5)
- self.assertAlmostEqual(inv["azi2"], 146.97364, delta = 0.5e-5)
- self.assertAlmostEqual(inv["s12"], 20082617, delta = 0.5)
- inv = geod.Inverse(0, 0, 1, 180)
- self.assertAlmostEqual(inv["azi1"], 0.00000, delta = 0.5e-5)
- self.assertAlmostEqual(inv["azi2"], -180.00000, delta = 0.5e-5)
- self.assertAlmostEqual(inv["s12"], 20027270, delta = 0.5);
-
- def test_GeodSolve55(self):
- # Check fix for nan + point on equator or pole not returning all nans in
- # Geodesic::Inverse, found 2015-09-23.
- inv = Geodesic.WGS84.Inverse(Math.nan, 0, 0, 90)
- self.assertTrue(Math.isnan(inv["azi1"]))
- self.assertTrue(Math.isnan(inv["azi2"]))
- self.assertTrue(Math.isnan(inv["s12"]))
- inv = Geodesic.WGS84.Inverse(Math.nan, 0, 90, 9)
- self.assertTrue(Math.isnan(inv["azi1"]))
- self.assertTrue(Math.isnan(inv["azi2"]))
- self.assertTrue(Math.isnan(inv["s12"]))
-
-class PlanimeterTest(unittest.TestCase):
-
- from geographiclib.polygonarea import PolygonArea
- polygon = PolygonArea(Geodesic.WGS84)
- polyline = PolygonArea(Geodesic.WGS84, True)
-
- def Planimeter(points):
- PlanimeterTest.polygon.Clear()
- for p in points:
- Geodesic.CheckPosition(p[0], p[1])
- PlanimeterTest.polygon.AddPoint(p[0], p[1])
- return PlanimeterTest.polygon.Compute(False, True)
- Planimeter = staticmethod(Planimeter)
-
- def PolyLength(points):
- PlanimeterTest.polyline.Clear()
- for p in points:
- Geodesic.CheckPosition(p[0], p[1])
- PlanimeterTest.polyline.AddPoint(p[0], p[1])
- return PlanimeterTest.polyline.Compute(False, True)
- PolyLength = staticmethod(PolyLength)
-
- def test_Planimeter0(self):
- # Check fix for pole-encircling bug found 2011-03-16
- points = [[89, 0], [89, 90], [89, 180], [89, 270]]
- num, perimeter, area = PlanimeterTest.Planimeter(points)
- self.assertAlmostEqual(perimeter, 631819.8745, delta = 1e-4)
- self.assertAlmostEqual(area, 24952305678.0, delta = 1)
- points = [[-89, 0], [-89, 90], [-89, 180], [-89, 270]]
- num, perimeter, area = PlanimeterTest.Planimeter(points)
- self.assertAlmostEqual(perimeter, 631819.8745, delta = 1e-4)
- self.assertAlmostEqual(area, -24952305678.0, delta = 1)
-
- points = [[0, -1], [-1, 0], [0, 1], [1, 0]]
- num, perimeter, area = PlanimeterTest.Planimeter(points)
- self.assertAlmostEqual(perimeter, 627598.2731, delta = 1e-4)
- self.assertAlmostEqual(area, 24619419146.0, delta = 1)
-
- points = [[90, 0], [0, 0], [0, 90]]
- num, perimeter, area = PlanimeterTest.Planimeter(points)
- self.assertAlmostEqual(perimeter, 30022685, delta = 1)
- self.assertAlmostEqual(area, 63758202715511.0, delta = 1)
- num, perimeter, area = PlanimeterTest.PolyLength(points)
- self.assertAlmostEqual(perimeter, 20020719, delta = 1)
- self.assertTrue(Math.isnan(area))
-
- def test_Planimeter5(self):
- # Check fix for Planimeter pole crossing bug found 2011-06-24
- points = [[89, 0.1], [89, 90.1], [89, -179.9]]
- num, perimeter, area = PlanimeterTest.Planimeter(points)
- self.assertAlmostEqual(perimeter, 539297, delta = 1)
- self.assertAlmostEqual(area, 12476152838.5, delta = 1)
-
- def test_Planimeter6(self):
- # Check fix for Planimeter lon12 rounding bug found 2012-12-03
- points = [[9, -0.00000000000001], [9, 180], [9, 0]]
- num, perimeter, area = PlanimeterTest.Planimeter(points)
- self.assertAlmostEqual(perimeter, 36026861, delta = 1)
- self.assertAlmostEqual(area, 0, delta = 1)
- points = [[9, 0.00000000000001], [9, 0], [9, 180]]
- num, perimeter, area = PlanimeterTest.Planimeter(points)
- self.assertAlmostEqual(perimeter, 36026861, delta = 1)
- self.assertAlmostEqual(area, 0, delta = 1)
- points = [[9, 0.00000000000001], [9, 180], [9, 0]]
- num, perimeter, area = PlanimeterTest.Planimeter(points)
- self.assertAlmostEqual(perimeter, 36026861, delta = 1)
- self.assertAlmostEqual(area, 0, delta = 1)
- points = [[9, -0.00000000000001], [9, 0], [9, 180]]
- num, perimeter, area = PlanimeterTest.Planimeter(points)
- self.assertAlmostEqual(perimeter, 36026861, delta = 1)
- self.assertAlmostEqual(area, 0, delta = 1)
-
- def test_Planimeter12(self):
- # Area of arctic circle (not really -- adjunct to rhumb-area test)
- points = [[66.562222222, 0], [66.562222222, 180]]
- num, perimeter, area = PlanimeterTest.Planimeter(points)
- self.assertAlmostEqual(perimeter, 10465729, delta = 1)
- self.assertAlmostEqual(area, 0, delta = 1)
-
- def test_Planimeter13(self):
- # Check encircling pole twice
- points = [[89,-360], [89,-240], [89,-120], [89,0], [89,120], [89,240]]
- num, perimeter, area = PlanimeterTest.Planimeter(points)
- self.assertAlmostEqual(perimeter, 1160741, delta = 1)
- self.assertAlmostEqual(area, 32415230256.0, delta = 1)
diff --git a/src/AlbersEqualArea.cpp b/src/AlbersEqualArea.cpp
index ef404d0..2839efc 100644
--- a/src/AlbersEqualArea.cpp
+++ b/src/AlbersEqualArea.cpp
@@ -25,7 +25,7 @@ namespace GeographicLib {
, tol_(sqrt(eps_))
, tol0_(tol_ * sqrt(sqrt(eps_)))
, _a(a)
- , _f(f <= 1 ? f : 1/f) // f > 1 behavior is DEPRECATED
+ , _f(f)
, _fm(1 - _f)
, _e2(_f * (2 - _f))
, _e(sqrt(abs(_e2)))
@@ -54,7 +54,7 @@ namespace GeographicLib {
, tol_(sqrt(eps_))
, tol0_(tol_ * sqrt(sqrt(eps_)))
, _a(a)
- , _f(f <= 1 ? f : 1/f) // f > 1 behavior is DEPRECATED
+ , _f(f)
, _fm(1 - _f)
, _e2(_f * (2 - _f))
, _e(sqrt(abs(_e2)))
@@ -88,7 +88,7 @@ namespace GeographicLib {
, tol_(sqrt(eps_))
, tol0_(tol_ * sqrt(sqrt(eps_)))
, _a(a)
- , _f(f <= 1 ? f : 1/f) // f > 1 behavior is DEPRECATED
+ , _f(f)
, _fm(1 - _f)
, _e2(_f * (2 - _f))
, _e(sqrt(abs(_e2)))
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 63e92a4..215d242 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,7 @@ file (GLOB HEADERS
${PROJECT_BINARY_DIR}/include/GeographicLib/Config.h
../include/GeographicLib/[A-Za-z]*.hpp)
-add_definitions(-DGEOGRAPHICLIB_DATA="${GEOGRAPHICLIB_DATA}")
+add_definitions (-DGEOGRAPHICLIB_DATA="${GEOGRAPHICLIB_DATA}")
# Define the library and specify whether it is shared or not.
if (GEOGRAPHICLIB_SHARED_LIB)
add_library (${PROJECT_SHARED_LIBRARIES} SHARED ${SOURCES} ${HEADERS})
diff --git a/src/CircularEngine.cpp b/src/CircularEngine.cpp
index c1e1d76..dd65d94 100644
--- a/src/CircularEngine.cpp
+++ b/src/CircularEngine.cpp
@@ -13,7 +13,7 @@ namespace GeographicLib {
using namespace std;
- Math::real CircularEngine::Value(bool gradp, real cl, real sl,
+ Math::real CircularEngine::Value(bool gradp, real sl, real cl,
real& gradx, real& grady, real& gradz)
const {
gradp = _gradp && gradp;
diff --git a/src/Ellipsoid.cpp b/src/Ellipsoid.cpp
index 6ca38bd..861a9d5 100644
--- a/src/Ellipsoid.cpp
+++ b/src/Ellipsoid.cpp
@@ -16,7 +16,7 @@ namespace GeographicLib {
Ellipsoid::Ellipsoid(real a, real f)
: stol_(real(0.01) * sqrt(numeric_limits<real>::epsilon()))
, _a(a)
- , _f(f <= 1 ? f : 1/f) // f > 1 behavior is DEPRECATED
+ , _f(f)
, _f1(1 - _f)
, _f12(Math::sq(_f1))
, _e2(_f * (2 - _f))
diff --git a/src/GeoCoords.cpp b/src/GeoCoords.cpp
index bc89c61..ba07366 100644
--- a/src/GeoCoords.cpp
+++ b/src/GeoCoords.cpp
@@ -50,7 +50,7 @@ namespace GeographicLib {
+ " (ex: 38n, 09s, n)");
UTMUPS::DecodeZone(sa[zoneind], _zone, _northp);
for (unsigned i = 0; i < 2; ++i)
- (i ? _northing : _easting) = DMS::Decode(sa[coordind + i]);
+ (i ? _northing : _easting) = Utility::num<real>(sa[coordind + i]);
UTMUPS::Reverse(_zone, _northp, _easting, _northing,
_lat, _long, _gamma, _k);
FixHemisphere();
diff --git a/src/Geocentric.cpp b/src/Geocentric.cpp
index bb3e8ae..ed7b165 100644
--- a/src/Geocentric.cpp
+++ b/src/Geocentric.cpp
@@ -15,7 +15,7 @@ namespace GeographicLib {
Geocentric::Geocentric(real a, real f)
: _a(a)
- , _f(f <= 1 ? f : 1/f) // f > 1 behavior is DEPRECATED
+ , _f(f)
, _e2(_f * (2 - _f))
, _e2m(Math::sq(1 - _f)) // 1 - _e2
, _e2a(abs(_e2))
diff --git a/src/Geodesic.cpp b/src/Geodesic.cpp
index 71435a3..cf50e82 100644
--- a/src/Geodesic.cpp
+++ b/src/Geodesic.cpp
@@ -2,7 +2,7 @@
* \file Geodesic.cpp
* \brief Implementation for GeographicLib::Geodesic class
*
- * Copyright (c) Charles Karney (2009-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2009-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
*
@@ -54,7 +54,7 @@ namespace GeographicLib {
, tolb_(tol0_ * tol2_) // Check on bisection interval
, xthresh_(1000 * tol2_)
, _a(a)
- , _f(f <= 1 ? f : 1/f) // f > 1 behavior is DEPRECATED
+ , _f(f)
, _f1(1 - _f)
, _e2(_f * (2 - _f))
, _ep2(_e2 / Math::sq(_f1)) // e2 / (1 - e2)
@@ -125,28 +125,61 @@ namespace GeographicLib {
real& lat2, real& lon2, real& azi2,
real& s12, real& m12, real& M12, real& M21,
real& S12) const {
- return GeodesicLine(*this, lat1, lon1, azi1,
- // Automatically supply DISTANCE_IN if necessary
- outmask | (arcmode ? NONE : DISTANCE_IN))
+ // Automatically supply DISTANCE_IN if necessary
+ if (!arcmode) outmask |= DISTANCE_IN;
+ return GeodesicLine(*this, lat1, lon1, azi1, outmask)
. // Note the dot!
GenPosition(arcmode, s12_a12, outmask,
lat2, lon2, azi2, s12, m12, M12, M21, S12);
}
+ GeodesicLine Geodesic::GenDirectLine(real lat1, real lon1, real azi1,
+ bool arcmode, real s12_a12,
+ unsigned caps) const {
+ azi1 = Math::AngNormalize(azi1);
+ real salp1, calp1;
+ // Guard against underflow in salp0. Also -0 is converted to +0.
+ Math::sincosd(Math::AngRound(azi1), salp1, calp1);
+ // Automatically supply DISTANCE_IN if necessary
+ if (!arcmode) caps |= DISTANCE_IN;
+ return GeodesicLine(*this, lat1, lon1, azi1, salp1, calp1,
+ caps, arcmode, s12_a12);
+ }
+
+ GeodesicLine Geodesic::DirectLine(real lat1, real lon1, real azi1, real s12,
+ unsigned caps) const {
+ return GenDirectLine(lat1, lon1, azi1, false, s12, caps);
+ }
+
+ GeodesicLine Geodesic::ArcDirectLine(real lat1, real lon1, real azi1,
+ real a12, unsigned caps) const {
+ return GenDirectLine(lat1, lon1, azi1, true, a12, caps);
+ }
+
Math::real Geodesic::GenInverse(real lat1, real lon1, real lat2, real lon2,
- unsigned outmask,
- real& s12, real& azi1, real& azi2,
+ unsigned outmask, real& s12,
+ real& salp1, real& calp1,
+ real& salp2, real& calp2,
real& m12, real& M12, real& M21, real& S12)
const {
- outmask &= OUT_MASK;
// Compute longitude difference (AngDiff does this carefully). Result is
// in [-180, 180] but -180 is only for west-going geodesics. 180 is for
// east-going and meridional geodesics.
- // If very close to being on the same half-meridian, then make it so.
- real lon12 = Math::AngRound(Math::AngDiff(lon1, lon2));
+ real lon12s, lon12 = Math::AngDiff(lon1, lon2, lon12s);
// Make longitude difference positive.
int lonsign = lon12 >= 0 ? 1 : -1;
- lon12 *= lonsign;
+ // If very close to being on the same half-meridian, then make it so.
+ lon12 = lonsign * Math::AngRound(lon12);
+ lon12s = Math::AngRound((180 - lon12) - lonsign * lon12s);
+ real
+ lam12 = lon12 * Math::degree(),
+ slam12, clam12;
+ if (lon12 > 90) {
+ Math::sincosd(lon12s, slam12, clam12);
+ clam12 = -clam12;
+ } else
+ Math::sincosd(lon12, slam12, clam12);
+
// If really close to the equator, treat as on equator.
lat1 = Math::AngRound(Math::LatFix(lat1));
lat2 = Math::AngRound(Math::LatFix(lat2));
@@ -204,12 +237,7 @@ namespace GeographicLib {
dn1 = sqrt(1 + _ep2 * Math::sq(sbet1)),
dn2 = sqrt(1 + _ep2 * Math::sq(sbet2));
- real
- lam12 = lon12 * Math::degree(), slam12, clam12;
- Math::sincosd(lon12, slam12, clam12);
-
- // initial values to suppress warning
- real a12, sig12, calp1, salp1, calp2 = 0, salp2 = 0;
+ real a12, sig12;
// index zero element of this array is unused
real Ca[nC_];
@@ -256,11 +284,11 @@ namespace GeographicLib {
meridian = false;
}
- real omg12 = 0; // initial value to suppress warning
+ // somg12 > 1 marks that it needs to be calculated
+ real omg12 = 0, somg12 = 2, comg12 = 0;
if (!meridian &&
sbet1 == 0 && // and sbet2 == 0
- // Mimic the way Lambda12 works with calp1 = 0
- (_f <= 0 || lam12 <= Math::pi() - _f * Math::pi())) {
+ (_f <= 0 || lon12s >= _f * 180)) {
// Geodesic runs along equator
calp1 = calp2 = 0; salp1 = salp2 = 1;
@@ -279,7 +307,7 @@ namespace GeographicLib {
// Figure a starting point for Newton's method
real dnm;
sig12 = InverseStart(sbet1, cbet1, dn1, sbet2, cbet2, dn2,
- lam12,
+ lam12, slam12, clam12,
salp1, calp1, salp2, calp2, dnm,
Ca);
@@ -317,12 +345,11 @@ namespace GeographicLib {
// WGS84 and random input: mean = 2.85, sd = 0.60
real dv;
real v = Lambda12(sbet1, cbet1, dn1, sbet2, cbet2, dn2, salp1, calp1,
+ slam12, clam12,
salp2, calp2, sig12, ssig1, csig1, ssig2, csig2,
- eps, omg12, numit < maxit1_, dv, Ca)
- - lam12;
- // 2 * tol0 is approximately 1 ulp for a number in [0, pi].
+ eps, somg12, comg12, numit < maxit1_, dv, Ca);
// Reversed test to allow escape with NaNs
- if (tripb || !(abs(v) >= (tripn ? 8 : 2) * tol0_)) break;
+ if (tripb || !(abs(v) >= (tripn ? 8 : 1) * tol0_)) break;
// Update bracketing values
if (v > 0 && (numit > maxit1_ || calp1/salp1 > calp1b/salp1b))
{ salp1b = salp1; calp1b = calp1; }
@@ -372,7 +399,6 @@ namespace GeographicLib {
m12x *= _b;
s12x *= _b;
a12 = sig12 / Math::degree();
- omg12 = lam12 - omg12;
}
}
@@ -408,15 +434,21 @@ namespace GeographicLib {
// Avoid problems with indeterminate sig1, sig2 on equator
S12 = 0;
+ if (!meridian) {
+ if (somg12 > 1) {
+ somg12 = sin(omg12); comg12 = cos(omg12);
+ } else
+ Math::norm(somg12, comg12);
+ }
+
if (!meridian &&
- omg12 < real(0.75) * Math::pi() && // Long difference too big
- sbet2 - sbet1 < real(1.75)) { // Lat difference too big
+ // omg12 < 3/4 * pi
+ comg12 > -real(0.7071) && // Long difference not too big
+ sbet2 - sbet1 < real(1.75)) { // Lat difference not too big
// Use tan(Gamma/2) = tan(omg12/2)
// * (tan(bet1/2)+tan(bet2/2))/(1+tan(bet1/2)*tan(bet2/2))
// with tan(x/2) = sin(x)/(1+cos(x))
- real
- somg12 = sin(omg12), domg12 = 1 + cos(omg12),
- dbet1 = 1 + cbet1, dbet2 = 1 + cbet2;
+ real domg12 = 1 + comg12, dbet1 = 1 + cbet1, dbet2 = 1 + cbet2;
alp12 = 2 * atan2( somg12 * ( sbet1 * dbet2 + sbet2 * dbet1 ),
domg12 * ( sbet1 * sbet2 + dbet1 * dbet2 ) );
} else {
@@ -451,15 +483,40 @@ namespace GeographicLib {
salp1 *= swapp * lonsign; calp1 *= swapp * latsign;
salp2 *= swapp * lonsign; calp2 *= swapp * latsign;
+ // Returned value in [0, 180]
+ return a12;
+ }
+
+ Math::real Geodesic::GenInverse(real lat1, real lon1, real lat2, real lon2,
+ unsigned outmask,
+ real& s12, real& azi1, real& azi2,
+ real& m12, real& M12, real& M21, real& S12)
+ const {
+ outmask &= OUT_MASK;
+ real salp1, calp1, salp2, calp2,
+ a12 = GenInverse(lat1, lon1, lat2, lon2,
+ outmask, s12, salp1, calp1, salp2, calp2,
+ m12, M12, M21, S12);
if (outmask & AZIMUTH) {
azi1 = Math::atan2d(salp1, calp1);
azi2 = Math::atan2d(salp2, calp2);
}
-
- // Returned value in [0, 180]
return a12;
}
+ GeodesicLine Geodesic::InverseLine(real lat1, real lon1, real lat2, real lon2,
+ unsigned caps) const {
+ real t, salp1, calp1, salp2, calp2,
+ a12 = GenInverse(lat1, lon1, lat2, lon2,
+ // No need to specify AZIMUTH here
+ 0u, t, salp1, calp1, salp2, calp2,
+ t, t, t, t),
+ azi1 = Math::atan2d(salp1, calp1);
+ // Ensure that a12 can be converted to a distance
+ if (caps & (OUT_MASK & DISTANCE_IN)) caps |= DISTANCE;
+ return GeodesicLine(*this, lat1, lon1, azi1, salp1, calp1, caps, true, a12);
+ }
+
void Geodesic::Lengths(real eps, real sig12,
real ssig1, real csig1, real dn1,
real ssig2, real csig2, real dn2,
@@ -575,7 +632,7 @@ namespace GeographicLib {
Math::real Geodesic::InverseStart(real sbet1, real cbet1, real dn1,
real sbet2, real cbet2, real dn2,
- real lam12,
+ real lam12, real slam12, real clam12,
real& salp1, real& calp1,
// Only updated if return val >= 0
real& salp2, real& calp2,
@@ -610,16 +667,18 @@ namespace GeographicLib {
#endif
bool shortline = cbet12 >= 0 && sbet12 < real(0.5) &&
cbet2 * lam12 < real(0.5);
- real omg12 = lam12;
+ real somg12, comg12;
if (shortline) {
real sbetm2 = Math::sq(sbet1 + sbet2);
// sin((bet1+bet2)/2)^2
// = (sbet1 + sbet2)^2 / ((sbet1 + sbet2)^2 + (cbet1 + cbet2)^2)
sbetm2 /= sbetm2 + Math::sq(cbet1 + cbet2);
dnm = sqrt(1 + _ep2 * sbetm2);
- omg12 /= _f1 * dnm;
+ real omg12 = lam12 / (_f1 * dnm);
+ somg12 = sin(omg12); comg12 = cos(omg12);
+ } else {
+ somg12 = slam12; comg12 = clam12;
}
- real somg12 = sin(omg12), comg12 = cos(omg12);
salp1 = cbet2 * somg12;
calp1 = comg12 >= 0 ?
@@ -650,6 +709,7 @@ namespace GeographicLib {
// 56.320923501171 0 -56.320923501171 179.664747671772880215
// which otherwise fails with g++ 4.4.4 x86 -O3
GEOGRAPHICLIB_VOLATILE real x;
+ real lam12x = atan2(-slam12, -clam12); // lam12 - pi
if (_f >= 0) { // In fact f == 0 does not get here
// x = dlong, y = dlat
{
@@ -660,7 +720,7 @@ namespace GeographicLib {
}
betscale = lamscale * cbet1;
- x = (lam12 - Math::pi()) / lamscale;
+ x = lam12x / lamscale;
y = sbet12a / betscale;
} else { // _f < 0
// x = dlat, y = dlong
@@ -677,7 +737,7 @@ namespace GeographicLib {
betscale = x < -real(0.01) ? sbet12a / x :
-_f * Math::sq(cbet1) * Math::pi();
lamscale = betscale / cbet1;
- y = (lam12 - Math::pi()) / lamscale;
+ y = lam12x / lamscale;
}
if (y > -tol1_ && x > -1 - xthresh_) {
@@ -745,11 +805,12 @@ namespace GeographicLib {
Math::real Geodesic::Lambda12(real sbet1, real cbet1, real dn1,
real sbet2, real cbet2, real dn2,
real salp1, real calp1,
+ real slam120, real clam120,
real& salp2, real& calp2,
real& sig12,
real& ssig1, real& csig1,
real& ssig2, real& csig2,
- real& eps, real& domg12,
+ real& eps, real& somg12, real& comg12,
bool diffp, real& dlam12,
// Scratch area of the right size
real Ca[]) const {
@@ -764,7 +825,7 @@ namespace GeographicLib {
salp0 = salp1 * cbet1,
calp0 = Math::hypot(calp1, salp1 * sbet1); // calp0 > 0
- real somg1, comg1, somg2, comg2, omg12, lam12;
+ real somg1, comg1, somg2, comg2, lam12;
// tan(bet1) = tan(sig1) * cos(alp1)
// tan(omg1) = sin(alp0) * tan(sig1) = tan(omg1)=tan(alp1)*sin(bet1)
ssig1 = sbet1; somg1 = salp0 * sbet1;
@@ -799,17 +860,18 @@ namespace GeographicLib {
csig1 * csig2 + ssig1 * ssig2);
// omg12 = omg2 - omg1, limit to [0, pi]
- omg12 = atan2(max(real(0), comg1 * somg2 - somg1 * comg2),
- comg1 * comg2 + somg1 * somg2);
- real B312, h0;
+ somg12 = max(real(0), comg1 * somg2 - somg1 * comg2);
+ comg12 = comg1 * comg2 + somg1 * somg2;
+ // eta = omg12 - lam120
+ real eta = atan2(somg12 * clam120 - comg12 * slam120,
+ comg12 * clam120 + somg12 * slam120);
+ real B312;
real k2 = Math::sq(calp0) * _ep2;
eps = k2 / (2 * (1 + sqrt(1 + k2)) + k2);
C3f(eps, Ca);
B312 = (SinCosSeries(true, ssig2, csig2, Ca, nC3_-1) -
SinCosSeries(true, ssig1, csig1, Ca, nC3_-1));
- h0 = -_f * A3f(eps);
- domg12 = salp0 * h0 * (sig12 + B312);
- lam12 = omg12 + domg12;
+ lam12 = eta - _f * A3f(eps) * salp0 * (sig12 + B312);
if (diffp) {
if (calp2 == 0)
diff --git a/src/GeodesicExact.cpp b/src/GeodesicExact.cpp
index 9d11489..919d077 100644
--- a/src/GeodesicExact.cpp
+++ b/src/GeodesicExact.cpp
@@ -2,7 +2,7 @@
* \file GeodesicExact.cpp
* \brief Implementation for GeographicLib::GeodesicExact class
*
- * Copyright (c) Charles Karney (2012-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2012-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
*
@@ -54,7 +54,7 @@ namespace GeographicLib {
, tolb_(tol0_ * tol2_) // Check on bisection interval
, xthresh_(1000 * tol2_)
, _a(a)
- , _f(f <= 1 ? f : 1/f) // f > 1 behavior is DEPRECATED
+ , _f(f)
, _f1(1 - _f)
, _e2(_f * (2 - _f))
, _ep2(_e2 / Math::sq(_f1)) // e2 / (1 - e2)
@@ -128,29 +128,65 @@ namespace GeographicLib {
real& s12, real& m12,
real& M12, real& M21,
real& S12) const {
- return GeodesicLineExact(*this, lat1, lon1, azi1,
- // Automatically supply DISTANCE_IN if necessary
- outmask | (arcmode ? NONE : DISTANCE_IN))
+ // Automatically supply DISTANCE_IN if necessary
+ if (!arcmode) outmask |= DISTANCE_IN;
+ return GeodesicLineExact(*this, lat1, lon1, azi1, outmask)
. // Note the dot!
GenPosition(arcmode, s12_a12, outmask,
lat2, lon2, azi2, s12, m12, M12, M21, S12);
}
+ GeodesicLineExact GeodesicExact::GenDirectLine(real lat1, real lon1,
+ real azi1,
+ bool arcmode, real s12_a12,
+ unsigned caps) const {
+ azi1 = Math::AngNormalize(azi1);
+ real salp1, calp1;
+ // Guard against underflow in salp0. Also -0 is converted to +0.
+ Math::sincosd(Math::AngRound(azi1), salp1, calp1);
+ // Automatically supply DISTANCE_IN if necessary
+ if (!arcmode) caps |= DISTANCE_IN;
+ return GeodesicLineExact(*this, lat1, lon1, azi1, salp1, calp1,
+ caps, arcmode, s12_a12);
+ }
+
+ GeodesicLineExact GeodesicExact::DirectLine(real lat1, real lon1,
+ real azi1, real s12,
+ unsigned caps) const {
+ return GenDirectLine(lat1, lon1, azi1, false, s12, caps);
+ }
+
+ GeodesicLineExact GeodesicExact::ArcDirectLine(real lat1, real lon1,
+ real azi1, real a12,
+ unsigned caps) const {
+ return GenDirectLine(lat1, lon1, azi1, true, a12, caps);
+ }
+
Math::real GeodesicExact::GenInverse(real lat1, real lon1,
real lat2, real lon2,
- unsigned outmask,
- real& s12, real& azi1, real& azi2,
+ unsigned outmask, real& s12,
+ real& salp1, real& calp1,
+ real& salp2, real& calp2,
real& m12, real& M12, real& M21,
real& S12) const {
- outmask &= OUT_ALL;
// Compute longitude difference (AngDiff does this carefully). Result is
// in [-180, 180] but -180 is only for west-going geodesics. 180 is for
// east-going and meridional geodesics.
- // If very close to being on the same half-meridian, then make it so.
- real lon12 = Math::AngRound(Math::AngDiff(lon1, lon2));
+ real lon12s, lon12 = Math::AngDiff(lon1, lon2, lon12s);
// Make longitude difference positive.
int lonsign = lon12 >= 0 ? 1 : -1;
- lon12 *= lonsign;
+ // If very close to being on the same half-meridian, then make it so.
+ lon12 = lonsign * Math::AngRound(lon12);
+ lon12s = Math::AngRound((180 - lon12) - lonsign * lon12s);
+ real
+ lam12 = lon12 * Math::degree(),
+ slam12, clam12;
+ if (lon12 > 90) {
+ Math::sincosd(lon12s, slam12, clam12);
+ clam12 = -clam12;
+ } else
+ Math::sincosd(lon12, slam12, clam12);
+
// If really close to the equator, treat as on equator.
lat1 = Math::AngRound(Math::LatFix(lat1));
lat2 = Math::AngRound(Math::LatFix(lat2));
@@ -213,12 +249,7 @@ namespace GeographicLib {
dn2 = (_f >= 0 ? sqrt(1 + _ep2 * Math::sq(sbet2)) :
sqrt(1 - _e2 * Math::sq(cbet2)) / _f1);
- real
- lam12 = lon12 * Math::degree(), slam12, clam12;
- Math::sincosd(lon12, slam12, clam12);
-
- // initial values to suppress warning
- real a12, sig12, calp1, salp1, calp2 = 0, salp2 = 0;
+ real a12, sig12;
bool meridian = lat1 == -90 || slam12 == 0;
@@ -263,11 +294,11 @@ namespace GeographicLib {
meridian = false;
}
- real omg12 = 0; // initial value to suppress warning
+ // somg12 > 1 marks that it needs to be calculated
+ real omg12 = 0, somg12 = 2, comg12 = 0;
if (!meridian &&
sbet1 == 0 && // and sbet2 == 0
- // Mimic the way Lambda12 works with calp1 = 0
- (_f <= 0 || lam12 <= Math::pi() - _f * Math::pi())) {
+ (_f <= 0 || lon12s >= _f * 180)) {
// Geodesic runs along equator
calp1 = calp2 = 0; salp1 = salp2 = 1;
@@ -286,7 +317,7 @@ namespace GeographicLib {
// Figure a starting point for Newton's method
real dnm;
sig12 = InverseStart(E, sbet1, cbet1, dn1, sbet2, cbet2, dn2,
- lam12,
+ lam12, slam12, clam12,
salp1, calp1, salp2, calp2, dnm);
if (sig12 >= 0) {
@@ -342,11 +373,11 @@ namespace GeographicLib {
// 7 19024 6.19 3.30
real dv;
real v = Lambda12(sbet1, cbet1, dn1, sbet2, cbet2, dn2, salp1, calp1,
+ slam12, clam12,
salp2, calp2, sig12, ssig1, csig1, ssig2, csig2,
- E, omg12, numit < maxit1_, dv) - lam12;
- // 2 * tol0 is approximately 1 ulp for a number in [0, pi].
+ E, somg12, comg12, numit < maxit1_, dv);
// Reversed test to allow escape with NaNs
- if (tripb || !(abs(v) >= (tripn ? 8 : 2) * tol0_)) break;
+ if (tripb || !(abs(v) >= (tripn ? 8 : 1) * tol0_)) break;
// Update bracketing values
if (v > 0 && (numit > maxit1_ || calp1/salp1 > calp1b/salp1b))
{ salp1b = salp1; calp1b = calp1; }
@@ -428,15 +459,21 @@ namespace GeographicLib {
// Avoid problems with indeterminate sig1, sig2 on equator
S12 = 0;
+ if (!meridian) {
+ if (somg12 > 1) {
+ somg12 = sin(omg12); comg12 = cos(omg12);
+ } else
+ Math::norm(somg12, comg12);
+ }
+
if (!meridian &&
- omg12 < real(0.75) * Math::pi() && // Long difference too big
- sbet2 - sbet1 < real(1.75)) { // Lat difference too big
+ // omg12 < 3/4 * pi
+ comg12 > -real(0.7071) && // Long difference not too big
+ sbet2 - sbet1 < real(1.75)) { // Lat difference not too big
// Use tan(Gamma/2) = tan(omg12/2)
// * (tan(bet1/2)+tan(bet2/2))/(1+tan(bet1/2)*tan(bet2/2))
// with tan(x/2) = sin(x)/(1+cos(x))
- real
- somg12 = sin(omg12), domg12 = 1 + cos(omg12),
- dbet1 = 1 + cbet1, dbet2 = 1 + cbet2;
+ real domg12 = 1 + comg12, dbet1 = 1 + cbet1, dbet2 = 1 + cbet2;
alp12 = 2 * atan2( somg12 * ( sbet1 * dbet2 + sbet2 * dbet1 ),
domg12 * ( sbet1 * sbet2 + dbet1 * dbet2 ) );
} else {
@@ -471,15 +508,44 @@ namespace GeographicLib {
salp1 *= swapp * lonsign; calp1 *= swapp * latsign;
salp2 *= swapp * lonsign; calp2 *= swapp * latsign;
+ // Returned value in [0, 180]
+ return a12;
+ }
+
+ Math::real GeodesicExact::GenInverse(real lat1, real lon1,
+ real lat2, real lon2,
+ unsigned outmask,
+ real& s12, real& azi1, real& azi2,
+ real& m12, real& M12, real& M21,
+ real& S12)
+ const {
+ outmask &= OUT_MASK;
+ real salp1, calp1, salp2, calp2,
+ a12 = GenInverse(lat1, lon1, lat2, lon2,
+ outmask, s12, salp1, calp1, salp2, calp2,
+ m12, M12, M21, S12);
if (outmask & AZIMUTH) {
azi1 = Math::atan2d(salp1, calp1);
azi2 = Math::atan2d(salp2, calp2);
}
-
- // Returned value in [0, 180]
return a12;
}
+ GeodesicLineExact GeodesicExact::InverseLine(real lat1, real lon1,
+ real lat2, real lon2,
+ unsigned caps) const {
+ real t, salp1, calp1, salp2, calp2,
+ a12 = GenInverse(lat1, lon1, lat2, lon2,
+ // No need to specify AZIMUTH here
+ 0u, t, salp1, calp1, salp2, calp2,
+ t, t, t, t),
+ azi1 = Math::atan2d(salp1, calp1);
+ // Ensure that a12 can be converted to a distance
+ if (caps & (OUT_MASK & DISTANCE_IN)) caps |= DISTANCE;
+ return GeodesicLineExact(*this, lat1, lon1, azi1, salp1, calp1, caps,
+ true, a12);
+ }
+
void GeodesicExact::Lengths(const EllipticFunction& E,
real sig12,
real ssig1, real csig1, real dn1,
@@ -579,7 +645,7 @@ namespace GeographicLib {
Math::real GeodesicExact::InverseStart(EllipticFunction& E,
real sbet1, real cbet1, real dn1,
real sbet2, real cbet2, real dn2,
- real lam12,
+ real lam12, real slam12, real clam12,
real& salp1, real& calp1,
// Only updated if return val >= 0
real& salp2, real& calp2,
@@ -613,16 +679,18 @@ namespace GeographicLib {
#endif
bool shortline = cbet12 >= 0 && sbet12 < real(0.5) &&
cbet2 * lam12 < real(0.5);
- real omg12 = lam12;
+ real somg12, comg12;
if (shortline) {
real sbetm2 = Math::sq(sbet1 + sbet2);
// sin((bet1+bet2)/2)^2
// = (sbet1 + sbet2)^2 / ((sbet1 + sbet2)^2 + (cbet1 + cbet2)^2)
sbetm2 /= sbetm2 + Math::sq(cbet1 + cbet2);
dnm = sqrt(1 + _ep2 * sbetm2);
- omg12 /= _f1 * dnm;
+ real omg12 = lam12 / (_f1 * dnm);
+ somg12 = sin(omg12); comg12 = cos(omg12);
+ } else {
+ somg12 = slam12; comg12 = clam12;
}
- real somg12 = sin(omg12), comg12 = cos(omg12);
salp1 = cbet2 * somg12;
calp1 = comg12 >= 0 ?
@@ -653,6 +721,7 @@ namespace GeographicLib {
// 56.320923501171 0 -56.320923501171 179.664747671772880215
// which otherwise fails with g++ 4.4.4 x86 -O3
GEOGRAPHICLIB_VOLATILE real x;
+ real lam12x = atan2(-slam12, -clam12); // lam12 - pi
if (_f >= 0) { // In fact f == 0 does not get here
// x = dlong, y = dlat
{
@@ -662,7 +731,7 @@ namespace GeographicLib {
}
betscale = lamscale * cbet1;
- x = (lam12 - Math::pi()) / lamscale;
+ x = lam12x / lamscale;
y = sbet12a / betscale;
} else { // _f < 0
// x = dlat, y = dlong
@@ -679,7 +748,7 @@ namespace GeographicLib {
betscale = x < -real(0.01) ? sbet12a / x :
-_f * Math::sq(cbet1) * Math::pi();
lamscale = betscale / cbet1;
- y = (lam12 - Math::pi()) / lamscale;
+ y = lam12x / lamscale;
}
if (y > -tol1_ && x > -1 - xthresh_) {
@@ -747,12 +816,13 @@ namespace GeographicLib {
Math::real GeodesicExact::Lambda12(real sbet1, real cbet1, real dn1,
real sbet2, real cbet2, real dn2,
real salp1, real calp1,
+ real slam120, real clam120,
real& salp2, real& calp2,
real& sig12,
real& ssig1, real& csig1,
real& ssig2, real& csig2,
EllipticFunction& E,
- real& omg12,
+ real& somg12, real& comg12,
bool diffp, real& dlam12) const
{
@@ -807,13 +877,19 @@ namespace GeographicLib {
csig1 * csig2 + ssig1 * ssig2);
// omg12 = omg2 - omg1, limit to [0, pi]
- omg12 = atan2(max(real(0), comg1 * somg2 - somg1 * comg2),
- comg1 * comg2 + somg1 * somg2);
+ somg12 = max(real(0), comg1 * somg2 - somg1 * comg2);
+ comg12 = comg1 * comg2 + somg1 * somg2;
real k2 = Math::sq(calp0) * _ep2;
E.Reset(-k2, -_ep2, 1 + k2, 1 + _ep2);
- real chi12 = atan2(max(real(0), cchi1 * somg2 - somg1 * cchi2),
- cchi1 * cchi2 + somg1 * somg2);
- lam12 = chi12 -
+ // chi12 = chi2 - chi1, limit to [0, pi]
+ real
+ schi12 = max(real(0), cchi1 * somg2 - somg1 * cchi2),
+ cchi12 = cchi1 * cchi2 + somg1 * somg2;
+ // eta = chi12 - lam120
+ real eta = atan2(schi12 * clam120 - cchi12 * slam120,
+ cchi12 * clam120 + schi12 * slam120);
+
+ lam12 = eta -
_e2/_f1 * salp0 * E.H() / (Math::pi() / 2) *
(sig12 + (E.deltaH(ssig2, csig2, dn2) - E.deltaH(ssig1, csig1, dn1)));
diff --git a/src/GeodesicLine.cpp b/src/GeodesicLine.cpp
index a9ad1a5..96eb181 100644
--- a/src/GeodesicLine.cpp
+++ b/src/GeodesicLine.cpp
@@ -2,7 +2,7 @@
* \file GeodesicLine.cpp
* \brief Implementation for GeographicLib::GeodesicLine class
*
- * Copyright (c) Charles Karney (2009-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2009-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
*
@@ -32,23 +32,24 @@ namespace GeographicLib {
using namespace std;
- GeodesicLine::GeodesicLine(const Geodesic& g,
- real lat1, real lon1, real azi1,
- unsigned caps)
- : tiny_(g.tiny_)
- , _lat1(Math::LatFix(lat1))
- , _lon1(lon1)
- , _azi1(Math::AngNormalize(azi1))
- , _a(g._a)
- , _f(g._f)
- , _b(g._b)
- , _c2(g._c2)
- , _f1(g._f1)
- // Always allow latitude and azimuth and unrolling of longitude
- , _caps(caps | LATITUDE | AZIMUTH | LONG_UNROLL)
- {
- // Guard against underflow in salp0. Also -0 is converted to +0.
- Math::sincosd(Math::AngRound(_azi1), _salp1, _calp1);
+ void GeodesicLine::LineInit(const Geodesic& g,
+ real lat1, real lon1,
+ real azi1, real salp1, real calp1,
+ unsigned caps) {
+ tiny_ = g.tiny_;
+ _lat1 = Math::LatFix(lat1);
+ _lon1 = lon1;
+ _azi1 = azi1;
+ _salp1 = salp1;
+ _calp1 = calp1;
+ _a = g._a;
+ _f = g._f;
+ _b = g._b;
+ _c2 = g._c2;
+ _f1 = g._f1;
+ // Always allow latitude and azimuth and unrolling of longitude
+ _caps = caps | LATITUDE | AZIMUTH | LONG_UNROLL;
+
real cbet1, sbet1;
Math::sincosd(Math::AngRound(_lat1), sbet1, cbet1); sbet1 *= _f1;
// Ensure cbet1 = +epsilon at poles
@@ -110,6 +111,26 @@ namespace GeographicLib {
_A4 = Math::sq(_a) * _calp0 * _salp0 * g._e2;
_B41 = Geodesic::SinCosSeries(false, _ssig1, _csig1, _C4a, nC4_);
}
+
+ _a13 = _s13 = Math::NaN();
+ }
+
+ GeodesicLine::GeodesicLine(const Geodesic& g,
+ real lat1, real lon1, real azi1,
+ unsigned caps) {
+ azi1 = Math::AngNormalize(azi1);
+ real salp1, calp1;
+ // Guard against underflow in salp0. Also -0 is converted to +0.
+ Math::sincosd(Math::AngRound(azi1), salp1, calp1);
+ LineInit(g, lat1, lon1, azi1, salp1, calp1, caps);
+ }
+
+ GeodesicLine::GeodesicLine(const Geodesic& g,
+ real lat1, real lon1,
+ real azi1, real salp1, real calp1,
+ unsigned caps, bool arcmode, real s13_a13) {
+ LineInit(g, lat1, lon1, azi1, salp1, calp1, caps);
+ GenSetDistance(arcmode, s13_a13);
}
Math::real GeodesicLine::GenPosition(bool arcmode, real s12_a12,
@@ -120,7 +141,7 @@ namespace GeographicLib {
real& S12)
const {
outmask &= _caps & OUT_MASK;
- if (!( Init() && (arcmode || (_caps & DISTANCE_IN & OUT_MASK)) ))
+ if (!( Init() && (arcmode || (_caps & (OUT_MASK & DISTANCE_IN))) ))
// Uninitialized or impossible distance calculation requested
return Math::NaN();
@@ -201,8 +222,8 @@ namespace GeographicLib {
if (outmask & LONGITUDE) {
// tan(omg2) = sin(alp0) * tan(sig2)
- real somg2 = _salp0 * ssig2, comg2 = csig2; // No need to normalize
- int E = _salp0 < 0 ? -1 : 1; // east-going?
+ real somg2 = _salp0 * ssig2, comg2 = csig2, // No need to normalize
+ E = Math::copysign(real(1), _salp0); // east-going?
// omg12 = omg2 - omg1
real omg12 = outmask & LONG_UNROLL
? E * (sig12
@@ -250,13 +271,13 @@ namespace GeographicLib {
// alp12 = alp2 - alp1, used in atan2 so no need to normalize
salp12 = salp2 * _calp1 - calp2 * _salp1;
calp12 = calp2 * _calp1 + salp2 * _salp1;
- // The right thing appears to happen if alp1 = +/-180 and alp2 = 0, viz
- // salp12 = -0 and alp12 = -180. However this depends on the sign being
- // attached to 0 correctly. The following ensures the correct behavior.
- if (salp12 == 0 && calp12 < 0) {
- salp12 = tiny_ * _calp1;
- calp12 = -1;
- }
+ // We used to include here some patch up code that purported to deal
+ // with nearly meridional geodesics properly. However, this turned out
+ // to be wrong once _salp1 = -0 was allowed (via
+ // Geodesic::InverseLine). In fact, the calculation of {s,c}alp12
+ // was already correct (following the IEEE rules for handling signed
+ // zeros). So the patch up code was unnecessary (as well as
+ // dangerous).
} else {
// tan(alp) = tan(alp0) * sec(sig)
// tan(alp2-alp1) = (tan(alp2) -tan(alp1)) / (tan(alp2)*tan(alp1)+1)
@@ -277,4 +298,24 @@ namespace GeographicLib {
return arcmode ? s12_a12 : sig12 / Math::degree();
}
+ void GeodesicLine::SetDistance(real s13) {
+ _s13 = s13;
+ real t;
+ // This will set _a13 to NaN if the GeodesicLine doesn't have the
+ // DISTANCE_IN capability.
+ _a13 = GenPosition(false, _s13, 0u, t, t, t, t, t, t, t, t);
+ }
+
+ void GeodesicLine::SetArc(real a13) {
+ _a13 = a13;
+ // In case the GeodesicLine doesn't have the DISTANCE capability.
+ _s13 = Math::NaN();
+ real t;
+ GenPosition(true, _a13, DISTANCE, t, t, t, _s13, t, t, t, t);
+ }
+
+ void GeodesicLine::GenSetDistance(bool arcmode, real s13_a13) {
+ arcmode ? SetArc(s13_a13) : SetDistance(s13_a13);
+ }
+
} // namespace GeographicLib
diff --git a/src/GeodesicLineExact.cpp b/src/GeodesicLineExact.cpp
index 7df4e66..5c92de6 100644
--- a/src/GeodesicLineExact.cpp
+++ b/src/GeodesicLineExact.cpp
@@ -2,7 +2,7 @@
* \file GeodesicLineExact.cpp
* \brief Implementation for GeographicLib::GeodesicLineExact class
*
- * Copyright (c) Charles Karney (2012-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2012-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
*
@@ -32,25 +32,25 @@ namespace GeographicLib {
using namespace std;
- GeodesicLineExact::GeodesicLineExact(const GeodesicExact& g,
- real lat1, real lon1, real azi1,
- unsigned caps)
- : tiny_(g.tiny_)
- , _lat1(Math::LatFix(lat1))
- , _lon1(lon1)
- , _azi1(Math::AngNormalize(azi1))
- , _a(g._a)
- , _f(g._f)
- , _b(g._b)
- , _c2(g._c2)
- , _f1(g._f1)
- , _e2(g._e2)
- , _E(0, 0)
- // Always allow latitude and azimuth and unrolling of longitude
- , _caps(caps | LATITUDE | AZIMUTH | LONG_UNROLL)
- {
- // Guard against underflow in salp0
- Math::sincosd(Math::AngRound(_azi1), _salp1, _calp1);
+ void GeodesicLineExact::LineInit(const GeodesicExact& g,
+ real lat1, real lon1,
+ real azi1, real salp1, real calp1,
+ unsigned caps) {
+ tiny_ = g.tiny_;
+ _lat1 = Math::LatFix(lat1);
+ _lon1 = lon1;
+ _azi1 = azi1;
+ _salp1 = salp1;
+ _calp1 = calp1;
+ _a = g._a;
+ _f = g._f;
+ _b = g._b;
+ _c2 = g._c2;
+ _f1 = g._f1;
+ _e2 = g._e2;
+ // Always allow latitude and azimuth and unrolling of longitude
+ _caps = caps | LATITUDE | AZIMUTH | LONG_UNROLL;
+
real cbet1, sbet1;
Math::sincosd(Math::AngRound(_lat1), sbet1, cbet1); sbet1 *= _f1;
// Ensure cbet1 = +epsilon at poles
@@ -111,6 +111,27 @@ namespace GeographicLib {
_A4 = Math::sq(_a) * _calp0 * _salp0 * _e2;
_B41 = GeodesicExact::CosSeries(_ssig1, _csig1, _C4a, nC4_);
}
+
+ _a13 = _s13 = Math::NaN();
+ }
+
+ GeodesicLineExact::GeodesicLineExact(const GeodesicExact& g,
+ real lat1, real lon1, real azi1,
+ unsigned caps) {
+ azi1 = Math::AngNormalize(azi1);
+ real salp1, calp1;
+ // Guard against underflow in salp0. Also -0 is converted to +0.
+ Math::sincosd(Math::AngRound(azi1), salp1, calp1);
+ LineInit(g, lat1, lon1, azi1, salp1, calp1, caps);
+ }
+
+ GeodesicLineExact::GeodesicLineExact(const GeodesicExact& g,
+ real lat1, real lon1,
+ real azi1, real salp1, real calp1,
+ unsigned caps,
+ bool arcmode, real s13_a13) {
+ LineInit(g, lat1, lon1, azi1, salp1, calp1, caps);
+ GenSetDistance(arcmode, s13_a13);
}
Math::real GeodesicLineExact::GenPosition(bool arcmode, real s12_a12,
@@ -121,7 +142,7 @@ namespace GeographicLib {
real& S12)
const {
outmask &= _caps & OUT_MASK;
- if (!( Init() && (arcmode || (_caps & DISTANCE_IN & OUT_MASK)) ))
+ if (!( Init() && (arcmode || (_caps & (OUT_MASK & DISTANCE_IN))) ))
// Uninitialized or impossible distance calculation requested
return Math::NaN();
@@ -172,8 +193,8 @@ namespace GeographicLib {
s12 = arcmode ? _b * (_E0 * sig12 + AB1) : s12_a12;
if (outmask & LONGITUDE) {
- real somg2 = _salp0 * ssig2, comg2 = csig2; // No need to normalize
- int E = _salp0 < 0 ? -1 : 1; // east-going?
+ real somg2 = _salp0 * ssig2, comg2 = csig2, // No need to normalize
+ E = Math::copysign(real(1), _salp0); // east-going?
// Without normalization we have schi2 = somg2.
real cchi2 = _f1 * dn2 * comg2;
real chi12 = outmask & LONG_UNROLL
@@ -218,13 +239,13 @@ namespace GeographicLib {
// alp12 = alp2 - alp1, used in atan2 so no need to normalize
salp12 = salp2 * _calp1 - calp2 * _salp1;
calp12 = calp2 * _calp1 + salp2 * _salp1;
- // The right thing appears to happen if alp1 = +/-180 and alp2 = 0, viz
- // salp12 = -0 and alp12 = -180. However this depends on the sign being
- // attached to 0 correctly. The following ensures the correct behavior.
- if (salp12 == 0 && calp12 < 0) {
- salp12 = tiny_ * _calp1;
- calp12 = -1;
- }
+ // We used to include here some patch up code that purported to deal
+ // with nearly meridional geodesics properly. However, this turned out
+ // to be wrong once _salp1 = -0 was allowed (via
+ // GeodesicExact::InverseLine). In fact, the calculation of {s,c}alp12
+ // was already correct (following the IEEE rules for handling signed
+ // zeros). So the patch up code was unnecessary (as well as
+ // dangerous).
} else {
// tan(alp) = tan(alp0) * sec(sig)
// tan(alp2-alp1) = (tan(alp2) -tan(alp1)) / (tan(alp2)*tan(alp1)+1)
@@ -245,4 +266,24 @@ namespace GeographicLib {
return arcmode ? s12_a12 : sig12 / Math::degree();
}
+ void GeodesicLineExact::SetDistance(real s13) {
+ _s13 = s13;
+ real t;
+ // This will set _a13 to NaN if the GeodesicLineExact doesn't have the
+ // DISTANCE_IN capability.
+ _a13 = GenPosition(false, _s13, 0u, t, t, t, t, t, t, t, t);
+ }
+
+ void GeodesicLineExact::SetArc(real a13) {
+ _a13 = a13;
+ // In case the GeodesicLineExact doesn't have the DISTANCE capability.
+ _s13 = Math::NaN();
+ real t;
+ GenPosition(true, _a13, DISTANCE, t, t, t, _s13, t, t, t, t);
+ }
+
+ void GeodesicLineExact::GenSetDistance(bool arcmode, real s13_a13) {
+ arcmode ? SetArc(s13_a13) : SetDistance(s13_a13);
+ }
+
} // namespace GeographicLib
diff --git a/src/GeographicLib.pro b/src/GeographicLib.pro
deleted file mode 100644
index db5f3a0..0000000
--- a/src/GeographicLib.pro
+++ /dev/null
@@ -1,88 +0,0 @@
-VERSION = 14.2.1
-
-TEMPLATE = lib
-
-INCLUDEPATH = ../include
-INCLUDEDIR = $$INCLUDEPATH/GeographicLib
-
-SOURCES += Accumulator.cpp
-SOURCES += AlbersEqualArea.cpp
-SOURCES += AzimuthalEquidistant.cpp
-SOURCES += CassiniSoldner.cpp
-SOURCES += CircularEngine.cpp
-SOURCES += DMS.cpp
-SOURCES += Ellipsoid.cpp
-SOURCES += EllipticFunction.cpp
-SOURCES += GARS.cpp
-SOURCES += GeoCoords.cpp
-SOURCES += Geocentric.cpp
-SOURCES += Geodesic.cpp
-SOURCES += GeodesicExact.cpp
-SOURCES += GeodesicExactC4.cpp
-SOURCES += GeodesicLine.cpp
-SOURCES += GeodesicLineExact.cpp
-SOURCES += Geohash.cpp
-SOURCES += Geoid.cpp
-SOURCES += Georef.cpp
-SOURCES += Gnomonic.cpp
-SOURCES += GravityCircle.cpp
-SOURCES += GravityModel.cpp
-SOURCES += LambertConformalConic.cpp
-SOURCES += LocalCartesian.cpp
-SOURCES += MGRS.cpp
-SOURCES += MagneticCircle.cpp
-SOURCES += MagneticModel.cpp
-SOURCES += Math.cpp
-SOURCES += NormalGravity.cpp
-SOURCES += OSGB.cpp
-SOURCES += PolarStereographic.cpp
-SOURCES += PolygonArea.cpp
-SOURCES += Rhumb.cpp
-SOURCES += SphericalEngine.cpp
-SOURCES += TransverseMercator.cpp
-SOURCES += TransverseMercatorExact.cpp
-SOURCES += UTMUPS.cpp
-SOURCES += Utility.cpp
-
-HEADERS += $$INCLUDEDIR/Accumulator.hpp
-HEADERS += $$INCLUDEDIR/AlbersEqualArea.hpp
-HEADERS += $$INCLUDEDIR/AzimuthalEquidistant.hpp
-HEADERS += $$INCLUDEDIR/CassiniSoldner.hpp
-HEADERS += $$INCLUDEDIR/CircularEngine.hpp
-HEADERS += $$INCLUDEDIR/Constants.hpp
-HEADERS += $$INCLUDEDIR/DMS.hpp
-HEADERS += $$INCLUDEDIR/Ellipsoid.hpp
-HEADERS += $$INCLUDEDIR/EllipticFunction.hpp
-HEADERS += $$INCLUDEDIR/GARS.hpp
-HEADERS += $$INCLUDEDIR/GeoCoords.hpp
-HEADERS += $$INCLUDEDIR/Geocentric.hpp
-HEADERS += $$INCLUDEDIR/Geodesic.hpp
-HEADERS += $$INCLUDEDIR/GeodesicExact.hpp
-HEADERS += $$INCLUDEDIR/GeodesicLine.hpp
-HEADERS += $$INCLUDEDIR/GeodesicLineExact.hpp
-HEADERS += $$INCLUDEDIR/Geohash.hpp
-HEADERS += $$INCLUDEDIR/Geoid.hpp
-HEADERS += $$INCLUDEDIR/Georef.hpp
-HEADERS += $$INCLUDEDIR/Gnomonic.hpp
-HEADERS += $$INCLUDEDIR/GravityCircle.hpp
-HEADERS += $$INCLUDEDIR/GravityModel.hpp
-HEADERS += $$INCLUDEDIR/LambertConformalConic.hpp
-HEADERS += $$INCLUDEDIR/LocalCartesian.hpp
-HEADERS += $$INCLUDEDIR/MGRS.hpp
-HEADERS += $$INCLUDEDIR/MagneticCircle.hpp
-HEADERS += $$INCLUDEDIR/MagneticModel.hpp
-HEADERS += $$INCLUDEDIR/Math.hpp
-HEADERS += $$INCLUDEDIR/NormalGravity.hpp
-HEADERS += $$INCLUDEDIR/OSGB.hpp
-HEADERS += $$INCLUDEDIR/PolarStereographic.hpp
-HEADERS += $$INCLUDEDIR/PolygonArea.hpp
-HEADERS += $$INCLUDEDIR/Rhumb.hpp
-HEADERS += $$INCLUDEDIR/SphericalEngine.hpp
-HEADERS += $$INCLUDEDIR/SphericalHarmonic.hpp
-HEADERS += $$INCLUDEDIR/SphericalHarmonic1.hpp
-HEADERS += $$INCLUDEDIR/SphericalHarmonic2.hpp
-HEADERS += $$INCLUDEDIR/TransverseMercator.hpp
-HEADERS += $$INCLUDEDIR/TransverseMercatorExact.hpp
-HEADERS += $$INCLUDEDIR/UTMUPS.hpp
-HEADERS += $$INCLUDEDIR/Utility.hpp
-HEADERS += $$INCLUDEDIR/Config.h
diff --git a/src/Geoid.cpp b/src/Geoid.cpp
index 2302ab1..87bc573 100644
--- a/src/Geoid.cpp
+++ b/src/Geoid.cpp
@@ -303,11 +303,9 @@ namespace GeographicLib {
}
}
- Math::real Geoid::height(real lat, real lon, bool gradp,
- real& gradn, real& grade) const {
+ Math::real Geoid::height(real lat, real lon) const {
lat = Math::LatFix(lat);
if (Math::isnan(lat) || Math::isnan(lon)) {
- if (gradp) gradn = grade = Math::NaN();
return Math::NaN();
}
lon = Math::AngNormalize(lon);
@@ -370,20 +368,6 @@ namespace GeographicLib {
b = (1 - fx) * v10 + fx * v11,
c = (1 - fy) * a + fy * b,
h = _offset + _scale * c;
- if (gradp) {
- real cosphi, sinphi;
- Math::sincosd(lat, sinphi, cosphi);
- real n = 1/sqrt(1 - _e2 * Math::sq(sinphi));
- gradn = ((1 - fx) * (v00 - v10) + fx * (v01 - v11)) *
- _rlatres / (_degree * _a * (1 - _e2) * n * n * n);
- grade = (cosphi > _eps ?
- ((1 - fy) * (v01 - v00) + fy * (v11 - v10)) / cosphi :
- (sinphi > 0 ? v11 - v10 : v01 - v00) *
- _rlatres / _degree ) *
- _rlonres / (_degree * _a * n);
- gradn *= _scale;
- grade *= _scale;
- }
if (!_threadsafe) {
_ix = ix;
_iy = iy;
@@ -398,22 +382,6 @@ namespace GeographicLib {
fy * (t[2] + fx * (t[4] + fx * t[7]) +
fy * (t[5] + fx * t[8] + fy * t[9]));
h = _offset + _scale * h;
- if (gradp) {
- // Avoid 0/0 at the poles by backing off 1/100 of a cell size
- lat = min(lat, 90 - 1/(100 * _rlatres));
- lat = max(lat, -90 + 1/(100 * _rlatres));
- fy = (90 - lat) * _rlatres;
- fy -= int(fy);
- real cosphi, sinphi;
- Math::sincosd(lat, sinphi, cosphi);
- real n = 1/sqrt(1 - _e2 * Math::sq(sinphi));
- gradn = t[2] + fx * (t[4] + fx * t[7]) +
- fy * (2 * t[5] + fx * 2 * t[8] + 3 * fy * t[9]);
- grade = t[1] + fx * (2 * t[3] + fx * 3 * t[6]) +
- fy * (t[4] + fx * 2 * t[7] + fy * t[8]);
- gradn *= - _rlatres / (_degree * _a * (1 - _e2) * n * n * n) * _scale;
- grade *= _rlonres / (_degree * _a * n * cosphi) * _scale;
- }
if (!_threadsafe) {
_ix = ix;
_iy = iy;
diff --git a/src/GravityCircle.cpp b/src/GravityCircle.cpp
index 6c833f5..939da9e 100644
--- a/src/GravityCircle.cpp
+++ b/src/GravityCircle.cpp
@@ -18,9 +18,9 @@ namespace GeographicLib {
Math::real GravityCircle::Gravity(real lon, real& gx, real& gy, real& gz)
const {
- real clam, slam, M[Geocentric::dim2_];
+ real slam, clam, M[Geocentric::dim2_];
Math::sincosd(lon, slam, clam);
- real Wres = W(clam, slam, gx, gy, gz);
+ real Wres = W(slam, clam, gx, gy, gz);
Geocentric::Rotation(_sphi, _cphi, slam, clam, M);
Geocentric::Unrotate(M, gx, gy, gz, gx, gy, gz);
return Wres;
@@ -28,9 +28,9 @@ namespace GeographicLib {
Math::real GravityCircle::Disturbance(real lon, real& deltax, real& deltay,
real& deltaz) const {
- real clam, slam, M[Geocentric::dim2_];
+ real slam, clam, M[Geocentric::dim2_];
Math::sincosd(lon, slam, clam);
- real Tres = InternalT(clam, slam, deltax, deltay, deltaz, true, true);
+ real Tres = InternalT(slam, clam, deltax, deltay, deltaz, true, true);
Geocentric::Rotation(_sphi, _cphi, slam, clam, M);
Geocentric::Unrotate(M, deltax, deltay, deltaz, deltax, deltay, deltaz);
return Tres;
@@ -39,10 +39,10 @@ namespace GeographicLib {
Math::real GravityCircle::GeoidHeight(real lon) const {
if ((_caps & GEOID_HEIGHT) != GEOID_HEIGHT)
return Math::NaN();
- real clam, slam, dummy;
+ real slam, clam, dummy;
Math::sincosd(lon, slam, clam);
- real T = InternalT(clam, slam, dummy, dummy, dummy, false, false);
- real correction = _corrmult * _correction(clam, slam);
+ real T = InternalT(slam, clam, dummy, dummy, dummy, false, false);
+ real correction = _corrmult * _correction(slam, clam);
return T/_gamma0 + correction;
}
@@ -53,11 +53,11 @@ namespace GeographicLib {
Dg01 = xi = eta = Math::NaN();
return;
}
- real clam, slam;
+ real slam, clam;
Math::sincosd(lon, slam, clam);
real
deltax, deltay, deltaz,
- T = InternalT(clam, slam, deltax, deltay, deltaz, true, false);
+ T = InternalT(slam, clam, deltax, deltay, deltaz, true, false);
// Rotate cartesian into spherical coordinates
real MC[Geocentric::dim2_];
Geocentric::Rotation(_spsi, _cpsi, slam, clam, MC);
@@ -68,15 +68,15 @@ namespace GeographicLib {
eta = -(deltax/_gamma) / Math::degree();
}
- Math::real GravityCircle::W(real clam, real slam,
+ Math::real GravityCircle::W(real slam, real clam,
real& gX, real& gY, real& gZ) const {
- real Wres = V(clam, slam, gX, gY, gZ) + _frot * _Px / 2;
+ real Wres = V(slam, clam, gX, gY, gZ) + _frot * _Px / 2;
gX += _frot * clam;
gY += _frot * slam;
return Wres;
}
- Math::real GravityCircle::V(real clam, real slam,
+ Math::real GravityCircle::V(real slam, real clam,
real& GX, real& GY, real& GZ)
const {
if ((_caps & GRAVITY) != GRAVITY) {
@@ -84,7 +84,7 @@ namespace GeographicLib {
return Math::NaN();
}
real
- Vres = _gravitational(clam, slam, GX, GY, GZ),
+ Vres = _gravitational(slam, clam, GX, GY, GZ),
f = _GMmodel / _amodel;
Vres *= f;
GX *= f;
@@ -93,7 +93,7 @@ namespace GeographicLib {
return Vres;
}
- Math::real GravityCircle::InternalT(real clam, real slam,
+ Math::real GravityCircle::InternalT(real slam, real clam,
real& deltaX, real& deltaY, real& deltaZ,
bool gradp, bool correct) const {
if (gradp) {
@@ -108,8 +108,8 @@ namespace GeographicLib {
if (_dzonal0 == 0)
correct = false;
real T = (gradp
- ? _disturbing(clam, slam, deltaX, deltaY, deltaZ)
- : _disturbing(clam, slam));
+ ? _disturbing(slam, clam, deltaX, deltaY, deltaZ)
+ : _disturbing(slam, clam));
T = (T / _amodel - (correct ? _dzonal0 : 0) * _invR) * _GMmodel;
if (gradp) {
real f = _GMmodel / _amodel;
diff --git a/src/LambertConformalConic.cpp b/src/LambertConformalConic.cpp
index 3283507..285d036 100644
--- a/src/LambertConformalConic.cpp
+++ b/src/LambertConformalConic.cpp
@@ -19,7 +19,7 @@ namespace GeographicLib {
, epsx_(Math::sq(eps_))
, ahypover_(Math::digits() * log(real(numeric_limits<real>::radix)) + 2)
, _a(a)
- , _f(f <= 1 ? f : 1/f) // f > 1 behavior is DEPRECATED
+ , _f(f)
, _fm(1 - _f)
, _e2(_f * (2 - _f))
, _es((_f < 0 ? -1 : 1) * sqrt(abs(_e2)))
@@ -44,7 +44,7 @@ namespace GeographicLib {
, epsx_(Math::sq(eps_))
, ahypover_(Math::digits() * log(real(numeric_limits<real>::radix)) + 2)
, _a(a)
- , _f(f <= 1 ? f : 1/f) // f > 1 behavior is DEPRECATED
+ , _f(f)
, _fm(1 - _f)
, _e2(_f * (2 - _f))
, _es((_f < 0 ? -1 : 1) * sqrt(abs(_e2)))
@@ -73,7 +73,7 @@ namespace GeographicLib {
, epsx_(Math::sq(eps_))
, ahypover_(Math::digits() * log(real(numeric_limits<real>::radix)) + 2)
, _a(a)
- , _f(f <= 1 ? f : 1/f) // f > 1 behavior is DEPRECATED
+ , _f(f)
, _fm(1 - _f)
, _e2(_f * (2 - _f))
, _es((_f < 0 ? -1 : 1) * sqrt(abs(_e2)))
diff --git a/src/MagneticCircle.cpp b/src/MagneticCircle.cpp
index afb9940..7615192 100644
--- a/src/MagneticCircle.cpp
+++ b/src/MagneticCircle.cpp
@@ -19,16 +19,16 @@ namespace GeographicLib {
void MagneticCircle::Field(real lon, bool diffp,
real& Bx, real& By, real& Bz,
real& Bxt, real& Byt, real& Bzt) const {
- real clam, slam;
+ real slam, clam;
Math::sincosd(lon, slam, clam);
real M[Geocentric::dim2_];
Geocentric::Rotation(_sphi, _cphi, slam, clam, M);
real BX0, BY0, BZ0, BX1, BY1, BZ1; // Components in geocentric basis
real BXc = 0, BYc = 0, BZc = 0;
- _circ0(clam, slam, BX0, BY0, BZ0);
- _circ1(clam, slam, BX1, BY1, BZ1);
+ _circ0(slam, clam, BX0, BY0, BZ0);
+ _circ1(slam, clam, BX1, BY1, BZ1);
if (_constterm)
- _circ2(clam, slam, BXc, BYc, BZc);
+ _circ2(slam, clam, BXc, BYc, BZc);
if (_interpolate) {
BX1 = (BX1 - BX0) / _dt0;
BY1 = (BY1 - BY0) / _dt0;
diff --git a/src/Makefile.am b/src/Makefile.am
index e85e08f..840526f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -103,4 +103,4 @@ geographiclib_data=$(datadir)/GeographicLib
DEFS=-DGEOGRAPHICLIB_DATA=\"$(geographiclib_data)\" @DEFS@
-EXTRA_DIST = Makefile.mk CMakeLists.txt GeographicLib.pro
+EXTRA_DIST = Makefile.mk CMakeLists.txt
diff --git a/src/Makefile.in b/src/Makefile.in
index 7caa38b..0a040bd 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,17 @@
# Copyright (C) 2009, Francesco P. Lovergine <frankie at debian.org>
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -85,8 +95,6 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
subdir = src
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -94,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/include/GeographicLib/Config-ac.h
CONFIG_CLEAN_FILES =
@@ -226,6 +235,7 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -278,6 +288,7 @@ LTLIBOBJS = @LTLIBOBJS@
LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@
LT_REVISION = @LT_REVISION@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -448,7 +459,7 @@ libGeographic_la_SOURCES = Accumulator.cpp \
../include/GeographicLib/Config.h
geographiclib_data = $(datadir)/GeographicLib
-EXTRA_DIST = Makefile.mk CMakeLists.txt GeographicLib.pro
+EXTRA_DIST = Makefile.mk CMakeLists.txt
all: all-am
.SUFFIXES:
@@ -465,7 +476,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu src/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -800,6 +810,8 @@ uninstall-am: uninstall-libLTLIBRARIES
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES
+.PRECIOUS: Makefile
+
../include/GeographicLib/Config.h: ../include/GeographicLib/Config-ac.h
( egrep '\bVERSION\b|\bGEOGRAPHICLIB_|\bHAVE_LONG_DOUBLE\b' $< | \
diff --git a/src/Math.cpp b/src/Math.cpp
index cad928a..d5a3c29 100644
--- a/src/Math.cpp
+++ b/src/Math.cpp
@@ -16,8 +16,6 @@
namespace GeographicLib {
- /// \cond SKIP
-
using namespace std;
template<typename T> T Math::eatanhe(T x, T es) {
@@ -55,11 +53,11 @@ namespace GeographicLib {
return tau;
}
+ /// \cond SKIP
// Instantiate
template Math::real Math::eatanhe<Math::real>(Math::real, Math::real);
template Math::real Math::taupf<Math::real>(Math::real, Math::real);
template Math::real Math::tauf<Math::real>(Math::real, Math::real);
-
/// \endcond
} // namespace GeographicLib
diff --git a/src/PolarStereographic.cpp b/src/PolarStereographic.cpp
index 99e290e..0a7fa87 100644
--- a/src/PolarStereographic.cpp
+++ b/src/PolarStereographic.cpp
@@ -15,7 +15,7 @@ namespace GeographicLib {
PolarStereographic::PolarStereographic(real a, real f, real k0)
: _a(a)
- , _f(f <= 1 ? f : 1/f) // f > 1 behavior is DEPRECATED
+ , _f(f)
, _e2(_f * (2 - _f))
, _es((_f < 0 ? -1 : 1) * sqrt(abs(_e2)))
, _e2m(1 - _e2)
diff --git a/src/TransverseMercator.cpp b/src/TransverseMercator.cpp
index e3a8d01..600b783 100644
--- a/src/TransverseMercator.cpp
+++ b/src/TransverseMercator.cpp
@@ -47,7 +47,7 @@ namespace GeographicLib {
TransverseMercator::TransverseMercator(real a, real f, real k0)
: _a(a)
- , _f(f <= 1 ? f : 1/f) // f > 1 behavior is DEPRECATED
+ , _f(f)
, _k0(k0)
, _e2(_f * (2 - _f))
, _es((f < 0 ? -1 : 1) * sqrt(abs(_e2)))
diff --git a/src/TransverseMercatorExact.cpp b/src/TransverseMercatorExact.cpp
index c334f47..5d1a3d6 100644
--- a/src/TransverseMercatorExact.cpp
+++ b/src/TransverseMercatorExact.cpp
@@ -57,7 +57,7 @@ namespace GeographicLib {
, tol2_(real(0.1) * tol_)
, taytol_(pow(tol_, real(0.6)))
, _a(a)
- , _f(f <= 1 ? f : 1/f) // f > 1 behavior is DEPRECATED
+ , _f(f)
, _k0(k0)
, _mu(_f * (2 - _f)) // e^2
, _mv(1 - _mu) // 1 - e^2
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 16522ad..9d3df7a 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -56,6 +56,3 @@ if (NOT WIN32)
endforeach ()
add_custom_target (scripts ALL DEPENDS ${SCRIPTS})
endif ()
-
-# The test suite -- split into a separate file because it's rather large.
-include (tests.cmake)
diff --git a/tools/CartConvert.cpp b/tools/CartConvert.cpp
index e12c325..f8f5dca 100644
--- a/tools/CartConvert.cpp
+++ b/tools/CartConvert.cpp
@@ -2,7 +2,7 @@
* \file CartConvert.cpp
* \brief Command line utility for geodetic to cartesian coordinate conversions
*
- * Copyright (c) Charles Karney (2009-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2009-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
*
@@ -10,7 +10,6 @@
**********************************************************************/
#include <iostream>
-#include <sstream>
#include <string>
#include <sstream>
#include <fstream>
@@ -70,7 +69,7 @@ int main(int argc, char* argv[]) {
}
m += 2;
} else if (arg == "-w")
- longfirst = true;
+ longfirst = !longfirst;
else if (arg == "-p") {
if (++m == argc) return usage(1, true);
try {
diff --git a/tools/ConicProj.cpp b/tools/ConicProj.cpp
index e502a34..58036dc 100644
--- a/tools/ConicProj.cpp
+++ b/tools/ConicProj.cpp
@@ -2,7 +2,7 @@
* \file ConicProj.cpp
* \brief Command line utility for conical projections
*
- * Copyright (c) Charles Karney (2009-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2009-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
*
@@ -10,7 +10,6 @@
**********************************************************************/
#include <iostream>
-#include <sstream>
#include <string>
#include <sstream>
#include <fstream>
@@ -98,8 +97,8 @@ int main(int argc, char* argv[]) {
}
m += 2;
} else if (arg == "-w")
- longfirst = true;
- else if (arg == "-p") {
+ longfirst = !longfirst;
+ else if (arg == "-p") {
if (++m == argc) return usage(1, true);
try {
prec = Utility::num<int>(std::string(argv[m]));
diff --git a/tools/GeoConvert.cpp b/tools/GeoConvert.cpp
index 67c5280..f51e25b 100644
--- a/tools/GeoConvert.cpp
+++ b/tools/GeoConvert.cpp
@@ -2,7 +2,7 @@
* \file GeoConvert.cpp
* \brief Command line utility for geographic coordinate conversions
*
- * Copyright (c) Charles Karney (2008-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2008-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
*
@@ -10,7 +10,6 @@
**********************************************************************/
#include <iostream>
-#include <sstream>
#include <string>
#include <sstream>
#include <fstream>
@@ -38,7 +37,7 @@ int main(int argc, char* argv[]) {
bool centerp = true, longfirst = false;
std::string istring, ifile, ofile, cdelim;
char lsep = ';', dmssep = char(0);
- bool sethemisphere = false, northp = false, abbrev = true;
+ bool sethemisphere = false, northp = false, abbrev = true, latch = false;
for (int m = 1; m < argc; ++m) {
std::string arg(argv[m]);
@@ -79,14 +78,25 @@ int main(int argc, char* argv[]) {
}
sethemisphere = false;
}
+ latch = false;
} else if (arg == "-s") {
zone = UTMUPS::STANDARD;
sethemisphere = false;
+ latch = false;
+ } else if (arg == "-S") {
+ zone = UTMUPS::STANDARD;
+ sethemisphere = false;
+ latch = true;
} else if (arg == "-t") {
zone = UTMUPS::UTM;
sethemisphere = false;
+ latch = false;
+ } else if (arg == "-T") {
+ zone = UTMUPS::UTM;
+ sethemisphere = false;
+ latch = true;
} else if (arg == "-w")
- longfirst = true;
+ longfirst = !longfirst;
else if (arg == "-p") {
if (++m == argc) return usage(1, true);
try {
@@ -207,6 +217,13 @@ int main(int argc, char* argv[]) {
+ Utility::str(k, prec1 + 7);
}
}
+ if (latch &&
+ zone < UTMUPS::MINZONE && p.AltZone() >= UTMUPS::MINZONE) {
+ zone = p.AltZone();
+ northp = p.Northp();
+ sethemisphere = true;
+ latch = false;
+ }
}
catch (const std::exception& e) {
// Write error message to cout so output lines match input lines
diff --git a/tools/GeodSolve.cpp b/tools/GeodSolve.cpp
index 582a77e..a31ba1f 100644
--- a/tools/GeodSolve.cpp
+++ b/tools/GeodSolve.cpp
@@ -2,7 +2,7 @@
* \file GeodSolve.cpp
* \brief Command line utility for geodesic calculations
*
- * Copyright (c) Charles Karney (2009-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2009-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
*
@@ -10,7 +10,6 @@
**********************************************************************/
#include <iostream>
-#include <sstream>
#include <string>
#include <sstream>
#include <fstream>
@@ -70,15 +69,18 @@ real ReadDistance(const std::string& s, bool arcmode) {
int main(int argc, char* argv[]) {
try {
using namespace GeographicLib;
+ enum { NONE = 0, LINE, DIRECT, INVERSE };
Utility::set_digits();
- bool linecalc = false, inverse = false, arcmode = false,
+ bool inverse = false, arcmode = false,
dms = false, full = false, exact = false, unroll = false,
- longfirst = false, azi2back = false;
+ longfirst = false, azi2back = false, fraction = false,
+ arcmodeline = false;
real
a = Constants::WGS84_a(),
f = Constants::WGS84_f();
- real lat1, lon1, azi1, lat2, lon2, azi2, s12, m12, a12, M12, M21, S12;
- int prec = 3;
+ real lat1, lon1, azi1, lat2, lon2, azi2, s12, m12, a12, M12, M21, S12,
+ mult = 1;
+ int linecalc = NONE, prec = 3;
std::string istring, ifile, ofile, cdelim;
char lsep = ';', dmssep = char(0);
@@ -86,12 +88,14 @@ int main(int argc, char* argv[]) {
std::string arg(argv[m]);
if (arg == "-i") {
inverse = true;
- linecalc = false;
+ linecalc = NONE;
} else if (arg == "-a")
- arcmode = true;
- else if (arg == "-l") {
+ arcmode = !arcmode;
+ else if (arg == "-F")
+ fraction = true;
+ else if (arg == "-L" || arg == "-l") { // -l is DEPRECATED
inverse = false;
- linecalc = true;
+ linecalc = LINE;
if (m + 3 >= argc) return usage(1, true);
try {
DMS::DecodeLatLon(std::string(argv[m + 1]), std::string(argv[m + 2]),
@@ -99,10 +103,41 @@ int main(int argc, char* argv[]) {
azi1 = DMS::DecodeAzimuth(std::string(argv[m + 3]));
}
catch (const std::exception& e) {
- std::cerr << "Error decoding arguments of -l: " << e.what() << "\n";
+ std::cerr << "Error decoding arguments of -L: " << e.what() << "\n";
return 1;
}
m += 3;
+ } else if (arg == "-D") {
+ inverse = false;
+ linecalc = DIRECT;
+ if (m + 4 >= argc) return usage(1, true);
+ try {
+ DMS::DecodeLatLon(std::string(argv[m + 1]), std::string(argv[m + 2]),
+ lat1, lon1, longfirst);
+ azi1 = DMS::DecodeAzimuth(std::string(argv[m + 3]));
+ s12 = ReadDistance(std::string(argv[m + 4]), arcmode);
+ arcmodeline = arcmode;
+ }
+ catch (const std::exception& e) {
+ std::cerr << "Error decoding arguments of -D: " << e.what() << "\n";
+ return 1;
+ }
+ m += 4;
+ } else if (arg == "-I") {
+ inverse = false;
+ linecalc = INVERSE;
+ if (m + 4 >= argc) return usage(1, true);
+ try {
+ DMS::DecodeLatLon(std::string(argv[m + 1]), std::string(argv[m + 2]),
+ lat1, lon1, longfirst);
+ DMS::DecodeLatLon(std::string(argv[m + 3]), std::string(argv[m + 4]),
+ lat2, lon2, longfirst);
+ }
+ catch (const std::exception& e) {
+ std::cerr << "Error decoding arguments of -I: " << e.what() << "\n";
+ return 1;
+ }
+ m += 4;
} else if (arg == "-e") {
if (m + 2 >= argc) return usage(1, true);
try {
@@ -123,7 +158,7 @@ int main(int argc, char* argv[]) {
dms = true;
dmssep = ':';
} else if (arg == "-w")
- longfirst = true;
+ longfirst = !longfirst;
else if (arg == "-b")
azi2back = true;
else if (arg == "-f")
@@ -220,10 +255,26 @@ int main(int argc, char* argv[]) {
GeodesicLine ls;
GeodesicLineExact le;
if (linecalc) {
- if (exact)
- le = geode.Line(lat1, lon1, azi1, outmask);
- else
- ls = geods.Line(lat1, lon1, azi1, outmask);
+ if (linecalc == LINE) fraction = false;
+ if (exact) {
+ le = linecalc == DIRECT ?
+ geode.GenDirectLine(lat1, lon1, azi1, arcmodeline, s12, outmask) :
+ linecalc == INVERSE ?
+ geode.InverseLine(lat1, lon1, lat2, lon2, outmask) :
+ // linecalc == LINE
+ geode.Line(lat1, lon1, azi1, outmask);
+ mult = fraction ? le.GenDistance(arcmode) : 1;
+ if (linecalc == INVERSE) azi1 = le.Azimuth();
+ } else {
+ ls = linecalc == DIRECT ?
+ geods.GenDirectLine(lat1, lon1, azi1, arcmodeline, s12, outmask) :
+ linecalc == INVERSE ?
+ geods.InverseLine(lat1, lon1, lat2, lon2, outmask) :
+ // linecalc == LINE
+ geods.Line(lat1, lon1, azi1, outmask);
+ mult = fraction ? ls.GenDistance(arcmode) : 1;
+ if (linecalc == INVERSE) azi1 = ls.Azimuth();
+ }
}
// Max precision = 10: 0.1 nm in distance, 10^-15 deg (= 0.11 nm),
@@ -256,9 +307,11 @@ int main(int argc, char* argv[]) {
geods.GenInverse(lat1, lon1, lat2, lon2, outmask,
s12, azi1, azi2, m12, M12, M21, S12);
if (full) {
- if (unroll)
- lon2 = lon1 + Math::AngDiff(lon1, lon2);
- else {
+ if (unroll) {
+ real e;
+ lon2 = lon1 + Math::AngDiff(lon1, lon2, e);
+ lon2 += e;
+ } else {
lon1 = Math::AngNormalize(lon1);
lon2 = Math::AngNormalize(lon2);
}
@@ -285,7 +338,8 @@ int main(int argc, char* argv[]) {
throw GeographicErr("Incomplete input: " + s);
if (str >> strc)
throw GeographicErr("Extraneous input: " + strc);
- s12 = ReadDistance(ss12, arcmode);
+ // In fraction mode input is read as a distance
+ s12 = ReadDistance(ss12, !fraction && arcmode) * mult;
a12 = exact ?
le.GenPosition(arcmode, s12, outmask,
lat2, lon2, azi2, s12, m12, M12, M21, S12) :
diff --git a/tools/GeodesicProj.cpp b/tools/GeodesicProj.cpp
index 3af89b6..7159653 100644
--- a/tools/GeodesicProj.cpp
+++ b/tools/GeodesicProj.cpp
@@ -2,7 +2,7 @@
* \file GeodesicProj.cpp
* \brief Command line utility for geodesic projections
*
- * Copyright (c) Charles Karney (2009-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2009-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
*
@@ -10,7 +10,6 @@
**********************************************************************/
#include <iostream>
-#include <sstream>
#include <string>
#include <sstream>
#include <fstream>
@@ -49,6 +48,7 @@ int main(int argc, char* argv[]) {
if (arg == "-r")
reverse = true;
else if (arg == "-c" || arg == "-z" || arg == "-g") {
+ cassini = azimuthal = gnomonic = false;
cassini = arg == "-c";
azimuthal = arg == "-z";
gnomonic = arg == "-g";
@@ -75,7 +75,7 @@ int main(int argc, char* argv[]) {
}
m += 2;
} else if (arg == "-w")
- longfirst = true;
+ longfirst = !longfirst;
else if (arg == "-p") {
if (++m == argc) return usage(1, true);
try {
diff --git a/tools/GeoidEval.cpp b/tools/GeoidEval.cpp
index dcc7973..11fc278 100644
--- a/tools/GeoidEval.cpp
+++ b/tools/GeoidEval.cpp
@@ -31,8 +31,7 @@ int main(int argc, char* argv[]) {
using namespace GeographicLib;
typedef Math::real real;
Utility::set_digits();
- bool cacheall = false, cachearea = false, verbose = false,
- cubic = true, gradp = false;
+ bool cacheall = false, cachearea = false, verbose = false, cubic = true;
real caches, cachew, cachen, cachee;
std::string dir;
std::string geoid = Geoid::DefaultGeoidName();
@@ -68,7 +67,7 @@ int main(int argc, char* argv[]) {
else if (arg == "--haetomsl")
heightmult = Geoid::ELLIPSOIDTOGEOID;
else if (arg == "-w")
- longfirst = true;
+ longfirst = !longfirst;
else if (arg == "-z") {
if (++m == argc) return usage(1, true);
std::string zone = argv[m];
@@ -91,8 +90,6 @@ int main(int argc, char* argv[]) {
dir = argv[m];
} else if (arg == "-l")
cubic = false;
- else if (arg == "-g")
- gradp = true;
else if (arg == "-v")
verbose = true;
else if (arg == "--input-string") {
@@ -253,19 +250,8 @@ int main(int argc, char* argv[]) {
<< Utility::str(height + real(heightmult) * h, 4)
<< suff << eol;
} else {
- if (gradp) {
- real gradn, grade;
- real h = g(p.Latitude(), p.Longitude(), gradn, grade);
- *output << Utility::str(h, 4) << " "
- << Utility::str(gradn * 1e6, 2)
- << (Math::isnan(gradn) ? " " : "e-6 ")
- << Utility::str(grade * 1e6, 2)
- << (Math::isnan(grade) ? "" : "e-6")
- << eol;
- } else {
real h = g(p.Latitude(), p.Longitude());
*output << Utility::str(h, 4) << eol;
- }
}
}
catch (const std::exception& e) {
diff --git a/tools/Gravity.cpp b/tools/Gravity.cpp
index e16b69b..a934fd3 100644
--- a/tools/Gravity.cpp
+++ b/tools/Gravity.cpp
@@ -81,7 +81,7 @@ int main(int argc, char* argv[]) {
return 1;
}
} else if (arg == "-w")
- longfirst = true;
+ longfirst = !longfirst;
else if (arg == "-p") {
if (++m == argc) return usage(1, true);
try {
diff --git a/tools/MagneticField.cpp b/tools/MagneticField.cpp
index 1e22fac..1b96555 100644
--- a/tools/MagneticField.cpp
+++ b/tools/MagneticField.cpp
@@ -2,7 +2,7 @@
* \file MagneticField.cpp
* \brief Command line utility for evaluating magnetic fields
*
- * Copyright (c) Charles Karney (2011-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2011-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
*
@@ -83,7 +83,7 @@ int main(int argc, char* argv[]) {
} else if (arg == "-r")
rate = !rate;
else if (arg == "-w")
- longfirst = true;
+ longfirst = !longfirst;
else if (arg == "-p") {
if (++m == argc) return usage(1, true);
try {
@@ -233,7 +233,7 @@ int main(int argc, char* argv[]) {
const MagneticCircle c(circle ? m.Circle(time, lat, h) :
MagneticCircle());
std::string s, eol, stra, strb;
- std::istringstream str(s);
+ std::istringstream str;
while (std::getline(*input, s)) {
try {
eol = "\n";
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 0a19dd4..b753fcb 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -21,7 +21,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -91,8 +101,6 @@ bin_PROGRAMS = CartConvert$(EXEEXT) ConicProj$(EXEEXT) \
Planimeter$(EXEEXT) RhumbSolve$(EXEEXT) \
TransverseMercatorProj$(EXEEXT)
subdir = tools
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -100,6 +108,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/include/GeographicLib/Config-ac.h
CONFIG_CLEAN_FILES =
@@ -271,6 +280,7 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -323,6 +333,7 @@ LTLIBOBJS = @LTLIBOBJS@
LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@
LT_REVISION = @LT_REVISION@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -567,7 +578,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu tools/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -966,6 +976,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-sbinSCRIPTS
pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-sbinSCRIPTS
+.PRECIOUS: Makefile
+
geographiclib-get-geoids: geographiclib-get-geoids.sh
sed -e "s%@GEOGRAPHICLIB_DATA@%$(geographiclib_data)%" $< > $@
chmod +x $@
diff --git a/tools/Planimeter.cpp b/tools/Planimeter.cpp
index 44f483d..71d13cd 100644
--- a/tools/Planimeter.cpp
+++ b/tools/Planimeter.cpp
@@ -2,7 +2,7 @@
* \file Planimeter.cpp
* \brief Command line utility for measuring the area of geodesic polygons
*
- * Copyright (c) Charles Karney (2010-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2010-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
*
@@ -61,7 +61,7 @@ int main(int argc, char* argv[]) {
}
m += 2;
} else if (arg == "-w")
- longfirst = true;
+ longfirst = !longfirst;
else if (arg == "-p") {
if (++m == argc) return usage(1, true);
try {
@@ -174,7 +174,7 @@ int main(int argc, char* argv[]) {
bool endpoly = s.empty();
if (!endpoly) {
try {
- p.Reset(s, longfirst);
+ p.Reset(s, true, longfirst);
if (Math::isnan(p.Latitude()) || Math::isnan(p.Longitude()))
endpoly = true;
}
diff --git a/tools/RhumbSolve.cpp b/tools/RhumbSolve.cpp
index 4fb4104..7d3d03c 100644
--- a/tools/RhumbSolve.cpp
+++ b/tools/RhumbSolve.cpp
@@ -2,7 +2,7 @@
* \file RhumbSolve.cpp
* \brief Command line utility for rhumb line calculations
*
- * Copyright (c) Charles Karney (2014-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2014-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
*
@@ -10,7 +10,6 @@
**********************************************************************/
#include <iostream>
-#include <sstream>
#include <string>
#include <sstream>
#include <fstream>
@@ -66,7 +65,7 @@ int main(int argc, char* argv[]) {
if (arg == "-i") {
inverse = true;
linecalc = false;
- } else if (arg == "-l") {
+ } else if (arg == "-L" || arg == "-l") { // -l is DEPRECATED
inverse = false;
linecalc = true;
if (m + 3 >= argc) return usage(1, true);
@@ -76,7 +75,7 @@ int main(int argc, char* argv[]) {
azi12 = DMS::DecodeAzimuth(std::string(argv[m + 3]));
}
catch (const std::exception& e) {
- std::cerr << "Error decoding arguments of -l: " << e.what() << "\n";
+ std::cerr << "Error decoding arguments of -L: " << e.what() << "\n";
return 1;
}
m += 3;
@@ -99,7 +98,7 @@ int main(int argc, char* argv[]) {
dms = true;
dmssep = ':';
} else if (arg == "-w")
- longfirst = true;
+ longfirst = !longfirst;
else if (arg == "-p") {
if (++m == argc) return usage(1, true);
try {
diff --git a/tools/TransverseMercatorProj.cpp b/tools/TransverseMercatorProj.cpp
index 2956ebd..3ef94a2 100644
--- a/tools/TransverseMercatorProj.cpp
+++ b/tools/TransverseMercatorProj.cpp
@@ -2,7 +2,7 @@
* \file TransverseMercatorProj.cpp
* \brief Command line utility for transverse Mercator projections
*
- * Copyright (c) Charles Karney (2008-2015) <charles at karney.com> and licensed
+ * Copyright (c) Charles Karney (2008-2016) <charles at karney.com> and licensed
* under the MIT/X11 License. For more information, see
* http://geographiclib.sourceforge.net/
*
@@ -11,7 +11,6 @@
**********************************************************************/
#include <iostream>
-#include <sstream>
#include <string>
#include <sstream>
#include <fstream>
@@ -92,7 +91,7 @@ int main(int argc, char* argv[]) {
}
m += 2;
} else if (arg == "-w")
- longfirst = true;
+ longfirst = !longfirst;
else if (arg == "-p") {
if (++m == argc) return usage(1, true);
try {
@@ -177,7 +176,7 @@ int main(int argc, char* argv[]) {
// 10^-11 sec (= 0.3 nm).
prec = std::min(10 + Math::extra_digits(), std::max(0, prec));
std::string s, eol, stra, strb, strc;
- std::istringstream str(s);
+ std::istringstream str;
int retval = 0;
std::cout << std::fixed;
while (std::getline(*input, s)) {
diff --git a/tools/tests.cmake b/tools/tests.cmake
index 5a59068..3b52f60 100644
--- a/tools/tests.cmake
+++ b/tools/tests.cmake
@@ -1,7 +1,11 @@
# Here are the tests for GeographicLib
-# First turn on testing
enable_testing ()
+if (DEFINED ENV{GEOGRAPHICLIB_DATA})
+ set (_DATADIR "$ENV{GEOGRAPHICLIB_DATA}")
+else ()
+ set (_DATADIR "${GEOGRAPHICLIB_DATA}")
+endif ()
# The tests consist of calling the various tools with --input-string and
# matching the output against regular expressions.
@@ -33,10 +37,13 @@ add_test (NAME GeoConvert5 COMMAND GeoConvert --input-string "5d. 0")
set_tests_properties (GeoConvert5 PROPERTIES WILL_FAIL ON)
if (NOT (MSVC AND MSVC_VERSION MATCHES "1[78].."))
# Check fix for DMS::Decode double rounding bug fixed on 2012-11-15
- # This test is known to fail for VS 11 and 12 bug reported 2013-01-10
+ # This test is known to fail for VC 11 and 12 bug reported 2013-01-10
# http://connect.microsoft.com/VisualStudio/feedback/details/776287
# OK to skip this test for these compilers because this is a question
- # of accuracy of the least significant bit. The bug is fixed in VS 14.
+ # of accuracy of the least significant bit. The bug is fixed in VC 14.
+ #
+ # N.B. 179.99999999999998578 = 180 - 0.50032 * 0.5^45 which (as a
+ # double) rounds to 180 - 0.5^45 = 179.9999999999999716
add_test (NAME GeoConvert6 COMMAND GeoConvert -p 9
--input-string "0 179.99999999999998578")
set_tests_properties (GeoConvert6 PROPERTIES PASS_REGULAR_EXPRESSION
@@ -156,11 +163,12 @@ add_test (NAME GeodSolve13 COMMAND GeodSolve
set_tests_properties (GeodSolve12 GeodSolve13 PROPERTIES PASS_REGULAR_EXPRESSION
"120\\.27.* 105\\.15.* 266\\.7")
-if (NOT GEOGRAPHICLIB_PRECISION EQUAL 4)
+if (NOT (GEOGRAPHICLIB_PRECISION EQUAL 4 AND Boost_VERSION LESS 106000))
# mpfr (nan == 0 is true) and boost-quadmath (nan > 0 is true) have
# bugs in handling nans, so skip this test. Problems reported on
- # 2015-03-31, https://svn.boost.org/trac/boost/ticket/11159. MFPR C++
- # version 3.6.2 fixes its nan problem.
+ # 2015-03-31, https://svn.boost.org/trac/boost/ticket/11159 (this
+ # might be fixed in Boost 1.60).. MFPR C++ version 3.6.2 fixes its
+ # nan problem.
#
# Check fix for inverse ignoring lon12 = nan
add_test (NAME GeodSolve14 COMMAND GeodSolve -i --input-string "0 0 1 nan")
@@ -183,9 +191,9 @@ add_test (NAME GeodSolve17 COMMAND GeodSolve
add_test (NAME GeodSolve18 COMMAND GeodSolve
-u --input-string "40 -75 -10 2e7" -E)
add_test (NAME GeodSolve19 COMMAND GeodSolve
- -u -l 40 -75 -10 --input-string "2e7")
+ -u -L 40 -75 -10 --input-string "2e7")
add_test (NAME GeodSolve20 COMMAND GeodSolve
- -u -l 40 -75 -10 --input-string "2e7" -E)
+ -u -L 40 -75 -10 --input-string "2e7" -E)
set_tests_properties (GeodSolve17 GeodSolve18 GeodSolve19 GeodSolve20
PROPERTIES PASS_REGULAR_EXPRESSION "-39\\.[0-9]* -254\\.[0-9]* -170\\.[0-9]*")
add_test (NAME GeodSolve21 COMMAND GeodSolve
@@ -193,9 +201,9 @@ add_test (NAME GeodSolve21 COMMAND GeodSolve
add_test (NAME GeodSolve22 COMMAND GeodSolve
--input-string "40 -75 -10 2e7" -E)
add_test (NAME GeodSolve23 COMMAND GeodSolve
- -l 40 -75 -10 --input-string "2e7")
+ -L 40 -75 -10 --input-string "2e7")
add_test (NAME GeodSolve24 COMMAND GeodSolve
- -l 40 -75 -10 --input-string "2e7" -E)
+ -L 40 -75 -10 --input-string "2e7" -E)
set_tests_properties (GeodSolve21 GeodSolve22 GeodSolve23 GeodSolve24
PROPERTIES PASS_REGULAR_EXPRESSION "-39\\.[0-9]* 105\\.[0-9]* -170\\.[0-9]*")
@@ -305,14 +313,82 @@ set_tests_properties (GeodSolve51 GeodSolve52
set_tests_properties (GeodSolve53 GeodSolve54
PROPERTIES PASS_REGULAR_EXPRESSION "0\\.00000 -180\\.00000 20027270")
-# Check fix for nan + point on equator or pole not returning all nans in
-# Geodesic::Inverse, found 2015-09-23.
-add_test (NAME GeodSolve55 COMMAND GeodSolve -i --input-string "nan 0 0 90")
-add_test (NAME GeodSolve56 COMMAND GeodSolve -i --input-string "nan 0 0 90" -E)
-add_test (NAME GeodSolve57 COMMAND GeodSolve -i --input-string "nan 0 90 9")
-add_test (NAME GeodSolve58 COMMAND GeodSolve -i --input-string "nan 0 90 9" -E)
-set_tests_properties (GeodSolve55 GeodSolve56 GeodSolve57 GeodSolve58
- PROPERTIES PASS_REGULAR_EXPRESSION "nan nan nan")
+if (NOT (GEOGRAPHICLIB_PRECISION EQUAL 4 AND Boost_VERSION LESS 106000))
+ # Check fix for nan + point on equator or pole not returning all nans in
+ # Geodesic::Inverse, found 2015-09-23.
+ add_test (NAME GeodSolve55 COMMAND GeodSolve -i --input-string "nan 0 0 90")
+ add_test (NAME GeodSolve56 COMMAND GeodSolve
+ -i --input-string "nan 0 0 90" -E)
+ add_test (NAME GeodSolve57 COMMAND GeodSolve -i --input-string "nan 0 90 9")
+ add_test (NAME GeodSolve58 COMMAND GeodSolve
+ -i --input-string "nan 0 90 9" -E)
+ set_tests_properties (GeodSolve55 GeodSolve56 GeodSolve57 GeodSolve58
+ PROPERTIES PASS_REGULAR_EXPRESSION "nan nan nan")
+endif ()
+
+# Check for points close with longitudes close to 180 deg apart.
+add_test (NAME GeodSolve59 COMMAND GeodSolve
+ -i -p 9 --input-string "5 0.00000000000001 10 180")
+add_test (NAME GeodSolve60 COMMAND GeodSolve
+ -i -p 9 --input-string "5 0.00000000000001 10 180" -E)
+set_tests_properties (GeodSolve59 GeodSolve60
+ PROPERTIES PASS_REGULAR_EXPRESSION
+ # Correct values: 0.000000000000037 179.999999999999963 18345191.1743327133
+ "0\\.0000000000000[34] 179\\.9999999999999[5-7] 18345191\\.17433271[2-6]")
+
+# Make sure small negative azimuths are west-going
+add_test (NAME GeodSolve61 COMMAND GeodSolve
+ -u -p 0 --input-string "45 0 -0.000000000000000003 1e7")
+add_test (NAME GeodSolve62 COMMAND GeodSolve
+ -u -p 0 -I 45 0 80 -0.000000000000000003 --input-string 1e7)
+add_test (NAME GeodSolve63 COMMAND GeodSolve
+ -u -p 0 --input-string "45 0 -0.000000000000000003 1e7" -E)
+add_test (NAME GeodSolve64 COMMAND GeodSolve
+ -u -p 0 -I 45 0 80 -0.000000000000000003 --input-string 1e7 -E)
+set_tests_properties (GeodSolve61 GeodSolve62 GeodSolve63 GeodSolve64
+ PROPERTIES PASS_REGULAR_EXPRESSION "45\\.30632 -180\\.00000 -180\\.00000")
+
+# Check for bug in east-going check in GeodesicLine (needed to check for
+# sign of 0) and sign error in area calculation due to a bogus override
+# of the code for alp12. Found/fixed on 2015-12-19.
+add_test (NAME GeodSolve65 COMMAND GeodSolve
+ -I 30 -0.000000000000000001 -31 180 -f -u -p 0 --input-string "1e7;2e7")
+add_test (NAME GeodSolve66 COMMAND GeodSolve
+ -I 30 -0.000000000000000001 -31 180 -f -u -p 0 --input-string "1e7;2e7" -E)
+set_tests_properties (GeodSolve65 GeodSolve66
+ PROPERTIES PASS_REGULAR_EXPRESSION
+ "30\\.00000 -0\\.00000 -180\\.00000 -60\\.23169 -0\\.00000 -180\\.00000 10000000 90\\.06544 6363636 -0\\.0012834 0\\.0013749 0[\r\n]+30\\.00000 -0\\.00000 -180\\.00000 -30\\.03547 -180\\.00000 -0\\.00000 20000000 179\\.96459 54342 -1\\.0045592 -0\\.9954339 127516405431022")
+
+# Check for InverseLine if line is slightly west of S and that s13 is
+# correctly set.
+add_test (NAME GeodSolve67 COMMAND GeodSolve
+ -u -p 0 -I -5 -0.000000000000002 -10 180 --input-string 2e7)
+add_test (NAME GeodSolve68 COMMAND GeodSolve
+ -u -p 0 -I -5 -0.000000000000002 -10 180 --input-string 2e7 -E)
+set_tests_properties (GeodSolve67 GeodSolve68
+ PROPERTIES PASS_REGULAR_EXPRESSION "4\\.96445 -180\\.00000 -0\\.00000")
+add_test (NAME GeodSolve69 COMMAND GeodSolve
+ -u -p 0 -I -5 -0.000000000000002 -10 180 --input-string 0.5 -F)
+add_test (NAME GeodSolve70 COMMAND GeodSolve
+ -u -p 0 -I -5 -0.000000000000002 -10 180 --input-string 0.5 -F -E)
+set_tests_properties (GeodSolve69 GeodSolve70
+ PROPERTIES PASS_REGULAR_EXPRESSION "-87\\.52461 -0\\.00000 -180\\.00000")
+
+# Check that DirectLine sets s13.
+add_test (NAME GeodSolve71 COMMAND GeodSolve
+ -D 1 2 45 1e7 -p 0 --input-string 0.5 -F)
+add_test (NAME GeodSolve72 COMMAND GeodSolve
+ -D 1 2 45 1e7 -p 0 --input-string 0.5 -F)
+set_tests_properties (GeodSolve71 GeodSolve72
+ PROPERTIES PASS_REGULAR_EXPRESSION "30\\.92625 37\\.54640 55\\.43104")
+
+# Check for backwards from the pole bug reported by Anon on 2016-02-13.
+# This only affected the Java implementation. It was introduced in Java
+# version 1.44 and fixed in 1.46-SNAPSHOT on 2016-01-17.
+add_test (NAME GeodSolve73 COMMAND GeodSolve
+ -p 0 --input-string "90 10 180 -1e6")
+set_tests_properties (GeodSolve73
+ PROPERTIES PASS_REGULAR_EXPRESSION "81\\.04623 -170\\.00000 0\\.00000")
# Check fix for pole-encircling bug found 2011-03-16
add_test (NAME Planimeter0 COMMAND Planimeter
@@ -365,8 +441,11 @@ set_tests_properties (Planimeter12 PROPERTIES PASS_REGULAR_EXPRESSION
# Check encircling pole twice
add_test (NAME Planimeter13 COMMAND Planimeter
--input-string "89 -360; 89 -240; 89 -120; 89 0; 89 120; 89 240")
-set_tests_properties (Planimeter13 PROPERTIES PASS_REGULAR_EXPRESSION
- "6 1160741\\..* 32415230256\\.")
+# Check -w fix for Planimeter (bug found/fixed 2016-01-19)
+add_test (NAME Planimeter14 COMMAND Planimeter
+ --input-string "-360 89;-240 89;-120 89;0 89;120 89;240 89" -w)
+set_tests_properties (Planimeter13 Planimeter14
+ PROPERTIES PASS_REGULAR_EXPRESSION "6 1160741\\..* 32415230256\\.")
# Check fix for AlbersEqualArea::Reverse bug found 2011-05-01
add_test (NAME ConicProj0 COMMAND ConicProj
@@ -443,7 +522,7 @@ add_test (NAME GeodesicProj0 COMMAND GeodesicProj
set_tests_properties (GeodesicProj0 PROPERTIES PASS_REGULAR_EXPRESSION
"^-?0\\.0+ [0-9]+\\.[0-9]+ 170\\.0+ ")
-if (EXISTS ${GEOGRAPHICLIB_DATA}/geoids/egm96-5.pgm)
+if (EXISTS "${_DATADIR}/geoids/egm96-5.pgm")
# Check fix for single-cell cache bug found 2010-11-23
add_test (NAME GeoidEval0 COMMAND GeoidEval
-n egm96-5 --input-string "0d1 0d1;0d4 0d4")
@@ -451,7 +530,7 @@ if (EXISTS ${GEOGRAPHICLIB_DATA}/geoids/egm96-5.pgm)
"^17\\.1[56]..\n17\\.1[45]..")
endif ()
-if (EXISTS ${GEOGRAPHICLIB_DATA}/magnetic/wmm2010.wmm)
+if (EXISTS "${_DATADIR}/magnetic/wmm2010.wmm")
# Test case from WMM2010_Report.pdf, Sec 1.5, pp 14-15:
# t = 2012.5, lat = -80, lon = 240, h = 100e3
add_test (NAME MagneticField0 COMMAND MagneticField
@@ -469,7 +548,7 @@ if (EXISTS ${GEOGRAPHICLIB_DATA}/magnetic/wmm2010.wmm)
" 5535\\.5249148687 14765\\.3703243050 -50625\\.930547879[45] .*\n.* 20\\.4904268023 1\\.0272592716 83\\.5313962281 ")
endif ()
-if (EXISTS ${GEOGRAPHICLIB_DATA}/magnetic/emm2015.wmm)
+if (EXISTS "${_DATADIR}/magnetic/emm2015.wmm")
# Tests from EMM2015_TEST_VALUES.txt including cases of linear
# interpolation and extrapolation.
add_test (NAME MagneticField3 COMMAND MagneticField
@@ -488,7 +567,7 @@ if (EXISTS ${GEOGRAPHICLIB_DATA}/magnetic/emm2015.wmm)
"-8\\.73 86\\.82 3128\\.9 3092\\.6 -474\\.7 56338\\.9 56425\\.8\n-0\\.2. 0\\.0. -20\\.7 -22\\.3 -9\\.2 26\\.5 25\\.3")
endif ()
-if (EXISTS ${GEOGRAPHICLIB_DATA}/gravity/egm2008.egm)
+if (EXISTS "${_DATADIR}/gravity/egm2008.egm")
# Verify no overflow at poles with high degree model
add_test (NAME Gravity0 COMMAND Gravity
-n egm2008 -p 6 --input-string "90 110 0")
@@ -506,7 +585,7 @@ if (EXISTS ${GEOGRAPHICLIB_DATA}/gravity/egm2008.egm)
"7\\.404 -6\\.168 7\\.616")
endif ()
-if (EXISTS ${GEOGRAPHICLIB_DATA}/gravity/grs80.egm)
+if (EXISTS "${_DATADIR}/gravity/grs80.egm")
# Check close to zero gravity in geostationary orbit
add_test (NAME Gravity3 COMMAND Gravity
-p 3 -n grs80 --input-string "0 123 35786e3")
diff --git a/windows/CartConvert-vc8.vcproj b/windows/CartConvert-vc8.vcproj
deleted file mode 100644
index 8ccb446..0000000
--- a/windows/CartConvert-vc8.vcproj
+++ /dev/null
@@ -1,340 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="CartConvert"
- ProjectGUID="{699D2AD1-5545-4FE8-AF72-7D5AAF5D8F65}"
- RootNamespace="CartConvert"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic_d.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
- ConfigurationType="1"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN64;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic_d.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
- ConfigurationType="1"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN64;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\tools\CartConvert.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath="..\man\CartConvert.usage"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/windows/ConicProj-vc8.vcproj b/windows/ConicProj-vc8.vcproj
deleted file mode 100644
index 97f9417..0000000
--- a/windows/ConicProj-vc8.vcproj
+++ /dev/null
@@ -1,340 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="ConicProj"
- ProjectGUID="{62483C58-6125-4DB8-889D-23F5CB1D9744}"
- RootNamespace="ConicProj"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic_d.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
- ConfigurationType="1"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN64;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic_d.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
- ConfigurationType="1"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN64;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\tools\ConicProj.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath="..\man\ConicProj.usage"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/windows/GeoConvert-vc8.vcproj b/windows/GeoConvert-vc8.vcproj
deleted file mode 100644
index a8388e4..0000000
--- a/windows/GeoConvert-vc8.vcproj
+++ /dev/null
@@ -1,340 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="GeoConvert"
- ProjectGUID="{C7BBC1C8-0E3A-4338-B47F-9DE092DC7034}"
- RootNamespace="GeoConvert"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic_d.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
- ConfigurationType="1"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN64;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic_d.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
- ConfigurationType="1"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN64;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\tools\GeoConvert.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath="..\man\GeoConvert.usage"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/windows/GeodSolve-vc8.vcproj b/windows/GeodSolve-vc8.vcproj
deleted file mode 100644
index cf25546..0000000
--- a/windows/GeodSolve-vc8.vcproj
+++ /dev/null
@@ -1,340 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="GeodSolve"
- ProjectGUID="{F1B64F66-7B95-4087-9619-4ABC20BEB591}"
- RootNamespace="GeodSolve"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic_d.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
- ConfigurationType="1"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN64;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic_d.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
- ConfigurationType="1"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN64;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\tools\GeodSolve.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath="..\man\GeodSolve.usage"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/windows/GeodesicProj-vc8.vcproj b/windows/GeodesicProj-vc8.vcproj
deleted file mode 100644
index 48cd17a..0000000
--- a/windows/GeodesicProj-vc8.vcproj
+++ /dev/null
@@ -1,340 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="GeodesicProj"
- ProjectGUID="{2E0C4271-25A7-4A94-8112-7DA0D1A8AF9A}"
- RootNamespace="GeodesicProj"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic_d.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
- ConfigurationType="1"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN64;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic_d.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
- ConfigurationType="1"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN64;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\tools\GeodesicProj.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath="..\man\GeodesicProj.usage"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/windows/Geographic-vc8.vcproj b/windows/Geographic-vc8.vcproj
deleted file mode 100644
index ea5a88f..0000000
--- a/windows/Geographic-vc8.vcproj
+++ /dev/null
@@ -1,583 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="Geographic"
- ProjectGUID="{4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1}"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="4"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)\$(ProjectName)_d.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="4"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
- ConfigurationType="4"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include"
- PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)\$(ProjectName)_d.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
- ConfigurationType="4"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include"
- PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\src\Accumulator.cpp"
- >
- </File>
- <File
- RelativePath="..\src\AlbersEqualArea.cpp"
- >
- </File>
- <File
- RelativePath="..\src\AzimuthalEquidistant.cpp"
- >
- </File>
- <File
- RelativePath="..\src\CassiniSoldner.cpp"
- >
- </File>
- <File
- RelativePath="..\src\CircularEngine.cpp"
- >
- </File>
- <File
- RelativePath="..\src\DMS.cpp"
- >
- </File>
- <File
- RelativePath="..\src\Ellipsoid.cpp"
- >
- </File>
- <File
- RelativePath="..\src\EllipticFunction.cpp"
- >
- </File>
- <File
- RelativePath="..\src\GeoCoords.cpp"
- >
- </File>
- <File
- RelativePath="..\src\Geocentric.cpp"
- >
- </File>
- <File
- RelativePath="..\src\Geodesic.cpp"
- >
- </File>
- <File
- RelativePath="..\src\GeodesicExact.cpp"
- >
- </File>
- <File
- RelativePath="..\src\GeodesicExactC4.cpp"
- >
- </File>
- <File
- RelativePath="..\src\GeodesicLine.cpp"
- >
- </File>
- <File
- RelativePath="..\src\GeodesicLineExact.cpp"
- >
- </File>
- <File
- RelativePath="..\src\Geohash.cpp"
- >
- </File>
- <File
- RelativePath="..\src\Geoid.cpp"
- >
- </File>
- <File
- RelativePath="..\src\Gnomonic.cpp"
- >
- </File>
- <File
- RelativePath="..\src\GravityCircle.cpp"
- >
- </File>
- <File
- RelativePath="..\src\GravityModel.cpp"
- >
- </File>
- <File
- RelativePath="..\src\LambertConformalConic.cpp"
- >
- </File>
- <File
- RelativePath="..\src\LocalCartesian.cpp"
- >
- </File>
- <File
- RelativePath="..\src\MGRS.cpp"
- >
- </File>
- <File
- RelativePath="..\src\MagneticCircle.cpp"
- >
- </File>
- <File
- RelativePath="..\src\MagneticModel.cpp"
- >
- </File>
- <File
- RelativePath="..\src\Math.cpp"
- >
- </File>
- <File
- RelativePath="..\src\NormalGravity.cpp"
- >
- </File>
- <File
- RelativePath="..\src\OSGB.cpp"
- >
- </File>
- <File
- RelativePath="..\src\PolarStereographic.cpp"
- >
- </File>
- <File
- RelativePath="..\src\PolygonArea.cpp"
- >
- </File>
- <File
- RelativePath="..\src\Rhumb.cpp"
- >
- </File>
- <File
- RelativePath="..\src\SphericalEngine.cpp"
- >
- </File>
- <File
- RelativePath="..\src\TransverseMercator.cpp"
- >
- </File>
- <File
- RelativePath="..\src\TransverseMercatorExact.cpp"
- >
- </File>
- <File
- RelativePath="..\src\UTMUPS.cpp"
- >
- </File>
- <File
- RelativePath="..\src\Utility.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath="../include/GeographicLib/Accumulator.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/AlbersEqualArea.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/AzimuthalEquidistant.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/CassiniSoldner.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/CircularEngine.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/Constants.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/DMS.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/Ellipsoid.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/EllipticFunction.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/GeoCoords.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/Geocentric.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/Geodesic.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/GeodesicExact.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/GeodesicLine.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/GeodesicLineExact.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/Geohash.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/Geoid.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/Gnomonic.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/LambertConformalConic.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/GravityCircle.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/GravityModel.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/LocalCartesian.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/MGRS.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/MagneticCircle.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/MagneticModel.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/Math.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/NormalGravity.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/OSGB.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/PolarStereographic.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/PolygonArea.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/Rhumb.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/SphericalEngine.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/SphericalHarmonic.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/SphericalHarmonic1.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/SphericalHarmonic2.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/TransverseMercator.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/TransverseMercatorExact.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/UTMUPS.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/Utility.hpp"
- >
- </File>
- <File
- RelativePath="../include/GeographicLib/Config.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/windows/GeographicLib-vc8.sln b/windows/GeographicLib-vc8.sln
deleted file mode 100644
index 02b0c40..0000000
--- a/windows/GeographicLib-vc8.sln
+++ /dev/null
@@ -1,178 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Geographic", "Geographic-vc8.vcproj", "{4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GeoConvert", "GeoConvert-vc8.vcproj", "{C7BBC1C8-0E3A-4338-B47F-9DE092DC7034}"
- ProjectSection(ProjectDependencies) = postProject
- {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1} = {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GeodSolve", "GeodSolve-vc8.vcproj", "{F1B64F66-7B95-4087-9619-4ABC20BEB591}"
- ProjectSection(ProjectDependencies) = postProject
- {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1} = {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1}
- {C7BBC1C8-0E3A-4338-B47F-9DE092DC7034} = {C7BBC1C8-0E3A-4338-B47F-9DE092DC7034}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GeoidEval", "GeoidEval-vc8.vcproj", "{0507FE91-AD45-4630-88EF-DABFA9A02FB4}"
- ProjectSection(ProjectDependencies) = postProject
- {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1} = {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1}
- {F1B64F66-7B95-4087-9619-4ABC20BEB591} = {F1B64F66-7B95-4087-9619-4ABC20BEB591}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CartConvert", "CartConvert-vc8.vcproj", "{699D2AD1-5545-4FE8-AF72-7D5AAF5D8F65}"
- ProjectSection(ProjectDependencies) = postProject
- {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1} = {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1}
- {0507FE91-AD45-4630-88EF-DABFA9A02FB4} = {0507FE91-AD45-4630-88EF-DABFA9A02FB4}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TransverseMercatorProj", "TransverseMercatorProj-vc8.vcproj", "{73FED050-34B7-40EE-96FA-6EABA84F6F9B}"
- ProjectSection(ProjectDependencies) = postProject
- {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1} = {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1}
- {699D2AD1-5545-4FE8-AF72-7D5AAF5D8F65} = {699D2AD1-5545-4FE8-AF72-7D5AAF5D8F65}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GeodesicProj", "GeodesicProj-vc8.vcproj", "{2E0C4271-25A7-4A94-8112-7DA0D1A8AF9A}"
- ProjectSection(ProjectDependencies) = postProject
- {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1} = {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1}
- {73FED050-34B7-40EE-96FA-6EABA84F6F9B} = {73FED050-34B7-40EE-96FA-6EABA84F6F9B}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Planimeter", "Planimeter-vc8.vcproj", "{AAA7F386-D98F-4E1C-BA16-628CEF1DB440}"
- ProjectSection(ProjectDependencies) = postProject
- {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1} = {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1}
- {2E0C4271-25A7-4A94-8112-7DA0D1A8AF9A} = {2E0C4271-25A7-4A94-8112-7DA0D1A8AF9A}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ConicProj", "ConicProj-vc8.vcproj", "{62483C58-6125-4DB8-889D-23F5CB1D9744}"
- ProjectSection(ProjectDependencies) = postProject
- {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1} = {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1}
- {AAA7F386-D98F-4E1C-BA16-628CEF1DB440} = {AAA7F386-D98F-4E1C-BA16-628CEF1DB440}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MagneticField", "MagneticField-vc8.vcproj", "{3D185FB1-192C-457B-A327-27CFAEB82D8A}"
- ProjectSection(ProjectDependencies) = postProject
- {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1} = {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1}
- {62483C58-6125-4DB8-889D-23F5CB1D9744} = {62483C58-6125-4DB8-889D-23F5CB1D9744}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Gravity", "Gravity-vc8.vcproj", "{0FC0DED7-C708-468A-9E29-E7F245EE0C1C}"
- ProjectSection(ProjectDependencies) = postProject
- {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1} = {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1}
- {3D185FB1-192C-457B-A327-27CFAEB82D8A} = {3D185FB1-192C-457B-A327-27CFAEB82D8A}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RhumbSolve", "RhumbSolve-vc98.vcproj", "{57A786B5-042F-46BD-BBC6-74148C3F961F}"
- ProjectSection(ProjectDependencies) = postProject
- {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1} = {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1}
- {0FC0DED7-C708-468A-9E29-E7F245EE0C1C} = {0FC0DED7-C708-468A-9E29-E7F245EE0C1C}
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1}.Debug|Win32.ActiveCfg = Debug|Win32
- {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1}.Debug|Win32.Build.0 = Debug|Win32
- {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1}.Debug|x64.ActiveCfg = Debug|x64
- {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1}.Debug|x64.Build.0 = Debug|x64
- {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1}.Release|Win32.ActiveCfg = Release|Win32
- {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1}.Release|Win32.Build.0 = Release|Win32
- {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1}.Release|x64.ActiveCfg = Release|x64
- {4CFBCD6C-956C-42BC-A863-3C60F3ED9CC1}.Release|x64.Build.0 = Release|x64
- {C7BBC1C8-0E3A-4338-B47F-9DE092DC7034}.Debug|Win32.ActiveCfg = Debug|Win32
- {C7BBC1C8-0E3A-4338-B47F-9DE092DC7034}.Debug|Win32.Build.0 = Debug|Win32
- {C7BBC1C8-0E3A-4338-B47F-9DE092DC7034}.Debug|x64.ActiveCfg = Debug|x64
- {C7BBC1C8-0E3A-4338-B47F-9DE092DC7034}.Debug|x64.Build.0 = Debug|x64
- {C7BBC1C8-0E3A-4338-B47F-9DE092DC7034}.Release|Win32.ActiveCfg = Release|Win32
- {C7BBC1C8-0E3A-4338-B47F-9DE092DC7034}.Release|Win32.Build.0 = Release|Win32
- {C7BBC1C8-0E3A-4338-B47F-9DE092DC7034}.Release|x64.ActiveCfg = Release|x64
- {C7BBC1C8-0E3A-4338-B47F-9DE092DC7034}.Release|x64.Build.0 = Release|x64
- {F1B64F66-7B95-4087-9619-4ABC20BEB591}.Debug|Win32.ActiveCfg = Debug|Win32
- {F1B64F66-7B95-4087-9619-4ABC20BEB591}.Debug|Win32.Build.0 = Debug|Win32
- {F1B64F66-7B95-4087-9619-4ABC20BEB591}.Debug|x64.ActiveCfg = Debug|x64
- {F1B64F66-7B95-4087-9619-4ABC20BEB591}.Debug|x64.Build.0 = Debug|x64
- {F1B64F66-7B95-4087-9619-4ABC20BEB591}.Release|Win32.ActiveCfg = Release|Win32
- {F1B64F66-7B95-4087-9619-4ABC20BEB591}.Release|Win32.Build.0 = Release|Win32
- {F1B64F66-7B95-4087-9619-4ABC20BEB591}.Release|x64.ActiveCfg = Release|x64
- {F1B64F66-7B95-4087-9619-4ABC20BEB591}.Release|x64.Build.0 = Release|x64
- {0507FE91-AD45-4630-88EF-DABFA9A02FB4}.Debug|Win32.ActiveCfg = Debug|Win32
- {0507FE91-AD45-4630-88EF-DABFA9A02FB4}.Debug|Win32.Build.0 = Debug|Win32
- {0507FE91-AD45-4630-88EF-DABFA9A02FB4}.Debug|x64.ActiveCfg = Debug|x64
- {0507FE91-AD45-4630-88EF-DABFA9A02FB4}.Debug|x64.Build.0 = Debug|x64
- {0507FE91-AD45-4630-88EF-DABFA9A02FB4}.Release|Win32.ActiveCfg = Release|Win32
- {0507FE91-AD45-4630-88EF-DABFA9A02FB4}.Release|Win32.Build.0 = Release|Win32
- {0507FE91-AD45-4630-88EF-DABFA9A02FB4}.Release|x64.ActiveCfg = Release|x64
- {0507FE91-AD45-4630-88EF-DABFA9A02FB4}.Release|x64.Build.0 = Release|x64
- {699D2AD1-5545-4FE8-AF72-7D5AAF5D8F65}.Debug|Win32.ActiveCfg = Debug|Win32
- {699D2AD1-5545-4FE8-AF72-7D5AAF5D8F65}.Debug|Win32.Build.0 = Debug|Win32
- {699D2AD1-5545-4FE8-AF72-7D5AAF5D8F65}.Debug|x64.ActiveCfg = Debug|x64
- {699D2AD1-5545-4FE8-AF72-7D5AAF5D8F65}.Debug|x64.Build.0 = Debug|x64
- {699D2AD1-5545-4FE8-AF72-7D5AAF5D8F65}.Release|Win32.ActiveCfg = Release|Win32
- {699D2AD1-5545-4FE8-AF72-7D5AAF5D8F65}.Release|Win32.Build.0 = Release|Win32
- {699D2AD1-5545-4FE8-AF72-7D5AAF5D8F65}.Release|x64.ActiveCfg = Release|x64
- {699D2AD1-5545-4FE8-AF72-7D5AAF5D8F65}.Release|x64.Build.0 = Release|x64
- {73FED050-34B7-40EE-96FA-6EABA84F6F9B}.Debug|Win32.ActiveCfg = Debug|Win32
- {73FED050-34B7-40EE-96FA-6EABA84F6F9B}.Debug|Win32.Build.0 = Debug|Win32
- {73FED050-34B7-40EE-96FA-6EABA84F6F9B}.Debug|x64.ActiveCfg = Debug|x64
- {73FED050-34B7-40EE-96FA-6EABA84F6F9B}.Debug|x64.Build.0 = Debug|x64
- {73FED050-34B7-40EE-96FA-6EABA84F6F9B}.Release|Win32.ActiveCfg = Release|Win32
- {73FED050-34B7-40EE-96FA-6EABA84F6F9B}.Release|Win32.Build.0 = Release|Win32
- {73FED050-34B7-40EE-96FA-6EABA84F6F9B}.Release|x64.ActiveCfg = Release|x64
- {73FED050-34B7-40EE-96FA-6EABA84F6F9B}.Release|x64.Build.0 = Release|x64
- {2E0C4271-25A7-4A94-8112-7DA0D1A8AF9A}.Debug|Win32.ActiveCfg = Debug|Win32
- {2E0C4271-25A7-4A94-8112-7DA0D1A8AF9A}.Debug|Win32.Build.0 = Debug|Win32
- {2E0C4271-25A7-4A94-8112-7DA0D1A8AF9A}.Debug|x64.ActiveCfg = Debug|x64
- {2E0C4271-25A7-4A94-8112-7DA0D1A8AF9A}.Debug|x64.Build.0 = Debug|x64
- {2E0C4271-25A7-4A94-8112-7DA0D1A8AF9A}.Release|Win32.ActiveCfg = Release|Win32
- {2E0C4271-25A7-4A94-8112-7DA0D1A8AF9A}.Release|Win32.Build.0 = Release|Win32
- {2E0C4271-25A7-4A94-8112-7DA0D1A8AF9A}.Release|x64.ActiveCfg = Release|x64
- {2E0C4271-25A7-4A94-8112-7DA0D1A8AF9A}.Release|x64.Build.0 = Release|x64
- {AAA7F386-D98F-4E1C-BA16-628CEF1DB440}.Debug|Win32.ActiveCfg = Debug|Win32
- {AAA7F386-D98F-4E1C-BA16-628CEF1DB440}.Debug|Win32.Build.0 = Debug|Win32
- {AAA7F386-D98F-4E1C-BA16-628CEF1DB440}.Debug|x64.ActiveCfg = Debug|x64
- {AAA7F386-D98F-4E1C-BA16-628CEF1DB440}.Debug|x64.Build.0 = Debug|x64
- {AAA7F386-D98F-4E1C-BA16-628CEF1DB440}.Release|Win32.ActiveCfg = Release|Win32
- {AAA7F386-D98F-4E1C-BA16-628CEF1DB440}.Release|Win32.Build.0 = Release|Win32
- {AAA7F386-D98F-4E1C-BA16-628CEF1DB440}.Release|x64.ActiveCfg = Release|x64
- {AAA7F386-D98F-4E1C-BA16-628CEF1DB440}.Release|x64.Build.0 = Release|x64
- {62483C58-6125-4DB8-889D-23F5CB1D9744}.Debug|Win32.ActiveCfg = Debug|Win32
- {62483C58-6125-4DB8-889D-23F5CB1D9744}.Debug|Win32.Build.0 = Debug|Win32
- {62483C58-6125-4DB8-889D-23F5CB1D9744}.Debug|x64.ActiveCfg = Debug|x64
- {62483C58-6125-4DB8-889D-23F5CB1D9744}.Debug|x64.Build.0 = Debug|x64
- {62483C58-6125-4DB8-889D-23F5CB1D9744}.Release|Win32.ActiveCfg = Release|Win32
- {62483C58-6125-4DB8-889D-23F5CB1D9744}.Release|Win32.Build.0 = Release|Win32
- {62483C58-6125-4DB8-889D-23F5CB1D9744}.Release|x64.ActiveCfg = Release|x64
- {62483C58-6125-4DB8-889D-23F5CB1D9744}.Release|x64.Build.0 = Release|x64
- {3D185FB1-192C-457B-A327-27CFAEB82D8A}.Debug|Win32.ActiveCfg = Debug|Win32
- {3D185FB1-192C-457B-A327-27CFAEB82D8A}.Debug|Win32.Build.0 = Debug|Win32
- {3D185FB1-192C-457B-A327-27CFAEB82D8A}.Debug|x64.ActiveCfg = Debug|x64
- {3D185FB1-192C-457B-A327-27CFAEB82D8A}.Debug|x64.Build.0 = Debug|x64
- {3D185FB1-192C-457B-A327-27CFAEB82D8A}.Release|Win32.ActiveCfg = Release|Win32
- {3D185FB1-192C-457B-A327-27CFAEB82D8A}.Release|Win32.Build.0 = Release|Win32
- {3D185FB1-192C-457B-A327-27CFAEB82D8A}.Release|x64.ActiveCfg = Release|x64
- {3D185FB1-192C-457B-A327-27CFAEB82D8A}.Release|x64.Build.0 = Release|x64
- {0FC0DED7-C708-468A-9E29-E7F245EE0C1C}.Debug|Win32.ActiveCfg = Debug|Win32
- {0FC0DED7-C708-468A-9E29-E7F245EE0C1C}.Debug|Win32.Build.0 = Debug|Win32
- {0FC0DED7-C708-468A-9E29-E7F245EE0C1C}.Debug|x64.ActiveCfg = Debug|x64
- {0FC0DED7-C708-468A-9E29-E7F245EE0C1C}.Debug|x64.Build.0 = Debug|x64
- {0FC0DED7-C708-468A-9E29-E7F245EE0C1C}.Release|Win32.ActiveCfg = Release|Win32
- {0FC0DED7-C708-468A-9E29-E7F245EE0C1C}.Release|Win32.Build.0 = Release|Win32
- {0FC0DED7-C708-468A-9E29-E7F245EE0C1C}.Release|x64.ActiveCfg = Release|x64
- {0FC0DED7-C708-468A-9E29-E7F245EE0C1C}.Release|x64.Build.0 = Release|x64
- {57A786B5-042F-46BD-BBC6-74148C3F961F}.Debug|Win32.ActiveCfg = Debug|Win32
- {57A786B5-042F-46BD-BBC6-74148C3F961F}.Debug|Win32.Build.0 = Debug|Win32
- {57A786B5-042F-46BD-BBC6-74148C3F961F}.Debug|x64.ActiveCfg = Debug|x64
- {57A786B5-042F-46BD-BBC6-74148C3F961F}.Debug|x64.Build.0 = Debug|x64
- {57A786B5-042F-46BD-BBC6-74148C3F961F}.Release|Win32.ActiveCfg = Release|Win32
- {57A786B5-042F-46BD-BBC6-74148C3F961F}.Release|Win32.Build.0 = Release|Win32
- {57A786B5-042F-46BD-BBC6-74148C3F961F}.Release|x64.ActiveCfg = Release|x64
- {57A786B5-042F-46BD-BBC6-74148C3F961F}.Release|x64.Build.0 = Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/windows/GeoidEval-vc8.vcproj b/windows/GeoidEval-vc8.vcproj
deleted file mode 100644
index fb33fb5..0000000
--- a/windows/GeoidEval-vc8.vcproj
+++ /dev/null
@@ -1,340 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="GeoidEval"
- ProjectGUID="{0507FE91-AD45-4630-88EF-DABFA9A02FB4}"
- RootNamespace="GeoidEval"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic_d.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
- ConfigurationType="1"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN64;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic_d.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
- ConfigurationType="1"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN64;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\tools\GeoidEval.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath="..\man\GeoidEval.usage"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/windows/Gravity-vc8.vcproj b/windows/Gravity-vc8.vcproj
deleted file mode 100644
index 2ac5f7a..0000000
--- a/windows/Gravity-vc8.vcproj
+++ /dev/null
@@ -1,340 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="Gravity"
- ProjectGUID="{0FC0DED7-C708-468A-9E29-E7F245EE0C1C}"
- RootNamespace="Gravity"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic_d.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
- ConfigurationType="1"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN64;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic_d.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
- ConfigurationType="1"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN64;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\tools\Gravity.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath="..\man\Gravity.usage"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/windows/MagneticField-vc8.vcproj b/windows/MagneticField-vc8.vcproj
deleted file mode 100644
index 968dcc7..0000000
--- a/windows/MagneticField-vc8.vcproj
+++ /dev/null
@@ -1,340 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="MagneticField"
- ProjectGUID="{3D185FB1-192C-457B-A327-27CFAEB82D8A}"
- RootNamespace="MagneticField"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic_d.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
- ConfigurationType="1"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN64;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic_d.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
- ConfigurationType="1"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN64;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\tools\MagneticField.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath="..\man\MagneticField.usage"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/windows/Planimeter-vc8.vcproj b/windows/Planimeter-vc8.vcproj
deleted file mode 100644
index ed67141..0000000
--- a/windows/Planimeter-vc8.vcproj
+++ /dev/null
@@ -1,340 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="Planimeter"
- ProjectGUID="{AAA7F386-D98F-4E1C-BA16-628CEF1DB440}"
- RootNamespace="Planimeter"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic_d.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
- ConfigurationType="1"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN64;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic_d.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
- ConfigurationType="1"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN64;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\tools\Planimeter.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath="..\man\Planimeter.usage"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/windows/RhumbSolve-vc8.vcproj b/windows/RhumbSolve-vc8.vcproj
deleted file mode 100644
index bf05532..0000000
--- a/windows/RhumbSolve-vc8.vcproj
+++ /dev/null
@@ -1,340 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="RhumbSolve"
- ProjectGUID="{57A786B5-042F-46BD-BBC6-74148C3F961F}"
- RootNamespace="RhumbSolve"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic_d.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
- ConfigurationType="1"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN64;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic_d.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
- ConfigurationType="1"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN64;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\tools\RhumbSolve.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath="..\man\RhumbSolve.usage"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/windows/TransverseMercatorProj-vc8.vcproj b/windows/TransverseMercatorProj-vc8.vcproj
deleted file mode 100644
index 4cefbfc..0000000
--- a/windows/TransverseMercatorProj-vc8.vcproj
+++ /dev/null
@@ -1,340 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="TransverseMercatorProj"
- ProjectGUID="{73FED050-34B7-40EE-96FA-6EABA84F6F9B}"
- RootNamespace="TransverseMercatorProj"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic_d.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
- ConfigurationType="1"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN64;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic_d.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
- ConfigurationType="1"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../man"
- PreprocessorDefinitions="WIN64;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Geographic.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\tools\TransverseMercatorProj.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath="..\man\TransverseMercatorProj.usage"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/wrapper/C/00README.txt b/wrapper/C/00README.txt
new file mode 100644
index 0000000..e688d6c
--- /dev/null
+++ b/wrapper/C/00README.txt
@@ -0,0 +1,48 @@
+The geodesic routines in GeographicLib have been implemented as a native
+C library. See
+
+ http://geographiclib.sourceforge.net/html/C/
+
+It is also possible to call the C++ version of GeographicLib directly
+from C and this directory contains a small example, which convert
+heights above the geoid to heights above the ellipsoid. More
+information on calling C++ from C, see
+
+ https://isocpp.org/wiki/faq/mixing-c-and-cpp
+
+To build and install this interface, do
+
+ mkdir BUILD
+ cd BUILD
+ cmake ..
+ make
+
+This assumes that you have installed GeographicLib somewhere that cmake
+can find it. If you want just to use the version of GeographicLib that
+you have built in the top-level BUILD directory, include, e.g.,
+
+ -D GeographicLib_DIR=../../BUILD
+
+in the invocation of cmake (the directory is relative to the source
+directory, wrapper/C). To convert 20m above the geoid at 42N 75W to a
+height above the ellipsoid, use
+
+$ echo 42 -75 20 | ./geoidtest
+-10.672
+
+Notes:
+
+* The geoid data (egm2008-1) should be installed somewhere that
+ GeographicLib knows about.
+
+* This prescription applies to Linux machines. Similar steps can be
+ used on Windows and MacOSX machines.
+
+* It is essential that the application be linked with the C++ compiler,
+ so that the C++ runtime library is included.
+
+* In this example, the main program is compiled with the C compiler. In
+ more complicated situations, it may be necessary to use the C++
+ compiler. This is necessary to get static initializations of C++
+ classes performed. (However, GeographicLib doesn't need any static
+ initialization.)
diff --git a/wrapper/C/CMakeLists.txt b/wrapper/C/CMakeLists.txt
new file mode 100644
index 0000000..592e94b
--- /dev/null
+++ b/wrapper/C/CMakeLists.txt
@@ -0,0 +1,41 @@
+project (geoidtest)
+
+cmake_minimum_required (VERSION 2.8.8)
+
+# Set a default build type for single-configuration cmake generators if
+# no build type is set.
+if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
+ set (CMAKE_BUILD_TYPE Release)
+endif ()
+
+# Make the compiler more picky.
+if (MSVC)
+ string (REGEX REPLACE "/W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
+ string (REGEX REPLACE "/W[0-4]" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
+else ()
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra")
+endif ()
+
+find_package (GeographicLib REQUIRED COMPONENTS SHARED)
+include_directories (${GeographicLib_INCLUDE_DIRS})
+
+add_executable (${PROJECT_NAME} ${PROJECT_NAME}.c cgeoid.cpp)
+target_link_libraries (${PROJECT_NAME} ${GeographicLib_LIBRARIES})
+
+get_target_property (GEOGRAPHICLIB_LIB_TYPE ${GeographicLib_LIBRARIES} TYPE)
+if (GEOGRAPHICLIB_LIB_TYPE STREQUAL "SHARED_LIBRARY")
+ if (WIN32)
+ add_custom_command (TARGET ${PROJECT_NAME} POST_BUILD
+ COMMAND
+ ${CMAKE_COMMAND} -E
+ copy $<TARGET_FILE:${GeographicLib_LIBRARIES}> ${CMAKE_CFG_INTDIR}
+ COMMENT "Installing shared library in build tree")
+ else ()
+ # Set the run time path for shared libraries for non-Windows machines.
+ set_target_properties (${PROJECT_NAME}
+ PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
+ endif ()
+endif ()
diff --git a/wrapper/C/cgeoid.cpp b/wrapper/C/cgeoid.cpp
new file mode 100644
index 0000000..a93d507
--- /dev/null
+++ b/wrapper/C/cgeoid.cpp
@@ -0,0 +1,14 @@
+#include "cgeoid.h"
+#include "GeographicLib/Geoid.hpp"
+
+extern "C"
+double HeightAboveEllipsoid(double lat, double lon, double h) {
+ try {
+ // Declare static so that g is only constructed once
+ static const GeographicLib::Geoid g("egm2008-1");
+ return h + GeographicLib::Geoid::GEOIDTOELLIPSOID * g(lat, lon);
+ }
+ catch (...) {
+ return GeographicLib::Math::NaN();
+ }
+}
diff --git a/wrapper/C/cgeoid.h b/wrapper/C/cgeoid.h
new file mode 100644
index 0000000..b803951
--- /dev/null
+++ b/wrapper/C/cgeoid.h
@@ -0,0 +1,9 @@
+#if !defined(CGEOID_H)
+#define CGEOID_H 1
+
+#if defined(__cplusplus)
+extern "C"
+#endif
+double HeightAboveEllipsoid(double lat, double lon, double h);
+
+#endif /* CGEOID_H */
diff --git a/wrapper/C/geoidtest.c b/wrapper/C/geoidtest.c
new file mode 100644
index 0000000..3701c4f
--- /dev/null
+++ b/wrapper/C/geoidtest.c
@@ -0,0 +1,13 @@
+#include <stdio.h>
+#include "cgeoid.h"
+
+#if defined(_MSC_VER)
+/* Squelch warnings about scanf */
+# pragma warning (disable: 4996)
+#endif
+
+int main() {
+ double lat, lon, h;
+ while(scanf("%lf %lf %lf", &lat, &lon, &h) == 3)
+ printf("%.3f\n", HeightAboveEllipsoid(lat, lon, h));
+}
diff --git a/wrapper/matlab/00README.txt b/wrapper/matlab/00README.txt
new file mode 100644
index 0000000..2c726c1
--- /dev/null
+++ b/wrapper/matlab/00README.txt
@@ -0,0 +1,48 @@
+The Matlab Central Package
+
+ http://www.mathworks.com/matlabcentral/fileexchange/50605
+
+provide a native Matlab/Octave implementation of a subset of
+GeographicLib.
+
+It is also possible to call the C++ GeographicLib library directly from
+Matlab and Octave. This gives you access to the full range of
+GeographicLib's capabilities.
+
+In order to make use of this facility, it is necessary to write some
+interface code. The files in this directory provide a sample of such
+interface code. This example solves the inverse geodesic problem for
+ellipsoids with arbitrary flattening. (The code geoddistance.m does
+this as native Matlab code; but it is limited to ellipsoids with a
+smaller flattening.)
+
+For full details on how to write the interface code, see
+
+ http://www.mathworks.com/help/matlab/write-cc-mex-files.html
+
+To compile the interface code, start Matlab or Octave and run, e.g.,
+
+ mex -setup
+ help geographiclibinterface
+ geographiclibinterface
+ help geodesicinverse
+ geodesicinverse([40.6, -73.8, 51.6, -0.5])
+ ans =
+
+ 5.1199e+01 1.0782e+02 5.5518e+06
+
+The first command allows you to select the compiler to use (which should
+be the same as that used to compile GeographicLib). On Mac OSX and
+Matlab R2014b, the setup command is
+
+ mex -setup C++
+
+These routines just offer a simple interface to the corresponding C++
+class. Use the help function to get documentation,
+
+ help geodesicinverse
+
+Unfortunately, the help function does not work for compiled functions in
+Octave; in this case, just list the .m file, e.g.,
+
+ type geodesicinverse.m
diff --git a/matlab/geographiclib-legacy/geodesicinverse.cpp b/wrapper/matlab/geodesicinverse.cpp
similarity index 100%
rename from matlab/geographiclib-legacy/geodesicinverse.cpp
rename to wrapper/matlab/geodesicinverse.cpp
diff --git a/wrapper/matlab/geodesicinverse.m b/wrapper/matlab/geodesicinverse.m
new file mode 100644
index 0000000..0b953f8
--- /dev/null
+++ b/wrapper/matlab/geodesicinverse.m
@@ -0,0 +1,33 @@
+function geodesicinverse(~, ~, ~)
+%geodesicinverse Solve inverse geodesic problem
+%
+% [geodesic, aux] = geodesicinverse(latlong)
+% [geodesic, aux] = geodesicinverse(latlong, a, f)
+%
+% latlong is an M x 4 matrix
+% latitude of point 1 = latlong(:,1) in degrees
+% longitude of point 1 = latlong(:,2) in degrees
+% latitude of point 2 = latlong(:,3) in degrees
+% longitude of point 2 = latlong(:,4) in degrees
+%
+% geodesic is an M x 3 matrix
+% azimuth at point 1 = geodesic(:,1) in degrees
+% azimuth at point 2 = geodesic(:,2) in degrees
+% distance between points 1 and 2 = geodesic(:,3) in meters
+% aux is an M x 5 matrix
+% spherical arc length = aux(:,1) in degrees
+% reduced length = aux(:,2) in meters
+% geodesic scale 1 to 2 = aux(:,3)
+% geodesic scale 2 to 1 = aux(:,4)
+% area under geodesic = aux(:,5) in meters^2
+%
+% a = major radius (meters)
+% f = flattening (0 means a sphere)
+% If a and f are omitted, the WGS84 values are used.
+%
+% A native MATLAB implementation is available as GEODDISTANCE.
+%
+% See also GEODDISTANCE.
+
+ error('Error: executing .m file instead of compiled routine');
+end
diff --git a/wrapper/matlab/geographiclibinterface.m b/wrapper/matlab/geographiclibinterface.m
new file mode 100644
index 0000000..51e7847
--- /dev/null
+++ b/wrapper/matlab/geographiclibinterface.m
@@ -0,0 +1,63 @@
+function geographiclibinterface(incdir, libdir)
+% geographiclibinterface Use mex to compile interface to GeographicLib
+%
+% geographiclibinterface
+% geographiclibinterface(INSTALLDIR)
+% geographiclibinterface(INCDIR, LIBDIR)
+%
+% With one argument the library is looked for in INSTALLDIR/lib and the
+% include files in INSTALLDIR/include.
+%
+% With no arguments, INSTALLDIR is taked to be '/usr/local', on Unix and
+% Linux systems, and 'C:/Program Files/GeographicLib', on Windows systems
+%
+% With two arguments, the library is looked for in LIBDIR and the include
+% files in INCDIR.
+%
+% This has been tested with
+%
+% Octave 3.2.3 and g++ 4.4.4 under Linux
+% Octave 3.6.4 and g++ 4.8.3 under Linux
+% Matlab 2007a and Visual Studio 2005 under Windows
+% Matlab 2008a and Visual Studio 2005 under Windows
+% Matlab 2008a and Visual Studio 2008 under Windows
+% Matlab 2010b and Visual Studio 2005 under Windows
+% Matlab 2010b and Visual Studio 2008 under Windows
+% Matlab 2010b and Visual Studio 2010 under Windows
+% Matlab 2013b and Visual Studio 2012 under Windows
+% Matlab 2014b and Mac OSX 10.10 (Yosemite)
+%
+% Run 'mex -setup' to configure the C++ compiler for Matlab to use.
+
+ funs = { 'geodesicinverse' };
+ lib='Geographic';
+ if (nargin < 2)
+ if (nargin == 0)
+ if ispc
+ installdir = 'C:/Program Files/GeographicLib';
+ else
+ installdir = '/usr/local';
+ end
+ else
+ installdir = incdir;
+ end
+ incdir=[installdir '/include'];
+ libdir=[installdir '/lib'];
+ end
+ testheader = [incdir '/GeographicLib/Constants.hpp'];
+ if (~ exist(testheader, 'file'))
+ error(['Cannot find ' testheader]);
+ end
+ fprintf('Compiling Matlab interface to GeographicLib\n');
+ fprintf('Include directory: %s\nLibrary directory: %s\n', incdir, libdir);
+ for i = 1:size(funs,2)
+ fprintf('Compiling %s...', funs{i});
+ if ispc || ismac
+ mex( ['-I' incdir], ['-L' libdir], ['-l' lib], [funs{i} '.cpp'] );
+ else
+ mex( ['-I' incdir], ['-L' libdir], ['-l' lib], ['-Wl,-rpath=' libdir], ...
+ [funs{i} '.cpp'] );
+ end
+ fprintf(' done.\n');
+ end
+end
diff --git a/wrapper/python/00README.txt b/wrapper/python/00README.txt
new file mode 100644
index 0000000..71c6fe9
--- /dev/null
+++ b/wrapper/python/00README.txt
@@ -0,0 +1,69 @@
+The geodesic routines in GeographicLib have been implemented as a native
+Python library. See
+
+ http://geographiclib.sourceforge.net/html/python/
+
+It is also possible to call the C++ version of GeographicLib directly
+from Python and this directory contains a small example,
+PyGeographicLib.cpp, which uses boost-python and the Geoid class to
+convert heights above the geoid to heights above the ellipsoid. More
+information on calling boost-python, see
+
+ http://www.boost.org/doc/libs/release/libs/python
+
+To build and install this interface, do
+
+ mkdir BUILD
+ cd BUILD
+ cmake -D CMAKE_INSTALL_PREFIX=~/.local ..
+ make
+ make install
+
+This assumes that you have installed GeographicLib somewhere that cmake
+can find it. If you want just to use the version of GeographicLib that
+you have built in the top-level BUILD directory, include, e.g.,
+
+ -D GeographicLib_DIR=../../BUILD
+
+in the invocation of cmake (the directory is relative to the source
+directory, wrapper/python).
+
+"make install" installs PyGeographicLib in
+
+ ~/.local/lib/python2.7/site-packages
+
+which is in the default search path for python 2.7. To convert 20m
+above the geoid at 42N 75W to a height above the ellipsoid, do
+
+ $ python
+ >>> from PyGeographicLib import Geoid
+ >>> geoid = Geoid("egm2008-1")
+ >>> geoid.EllipsoidHeight(42, -75, 20)
+ -10.671887499999997
+ >>> help(Geoid.EllipsoidHeight)
+
+Notes:
+
+* The geoid data (egm2008-1) should be installed somewhere that
+ GeographicLib knows about.
+
+* This prescription applies to Linux machines. Similar steps can be
+ used on Windows and MacOSX machines.
+
+* You will need the packages boost-python, boost-devel, python, and
+ python-devel installed.
+
+* CMakeLists.txt specifies the version of python to look for (version
+ 2.7). This must match that used in boost-python. To check do, e.g.,
+
+ ldd /usr/lib64/libboost_python.so
+
+* CmakeLists.txt looks for a shared-library version of GeographicLib.
+ This is the default with cmake build on non-Windows platforms. On
+ Windows, use the cmake variable GEOGRAPHICLIB_LIB_TYPE to specify
+ building a shared library.
+
+Acknowledgment:
+
+Thanks to Jonathan Takahashi <jtakahashi at gmail.com> for the sample code
+in PyGeographicLib.cpp and the commands needed to compile and link this.
diff --git a/wrapper/python/CMakeLists.txt b/wrapper/python/CMakeLists.txt
new file mode 100644
index 0000000..d465c15
--- /dev/null
+++ b/wrapper/python/CMakeLists.txt
@@ -0,0 +1,59 @@
+project (PyGeographicLib)
+
+cmake_minimum_required (VERSION 2.8.8)
+
+# Set a default build type for single-configuration cmake generators if
+# no build type is set.
+if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
+ set (CMAKE_BUILD_TYPE Release)
+endif ()
+
+# Make the compiler more picky.
+if (MSVC)
+ string (REGEX REPLACE "/W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
+else ()
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
+endif ()
+
+# The version of python that boost-python uses. Also used for the
+# installation directory.
+set (PYTHON_VERSION 2.7)
+
+# Requires python + python devel
+find_package (PythonLibs ${PYTHON_VERSION} REQUIRED)
+
+# Required boost-python + boost-devel
+find_package (Boost REQUIRED COMPONENTS python)
+
+find_package (GeographicLib REQUIRED COMPONENTS SHARED)
+
+include_directories (${GeographicLib_INCLUDE_DIRS}
+ ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS})
+
+add_library (${PROJECT_NAME} MODULE ${PROJECT_NAME}.cpp)
+
+get_target_property (GEOGRAPHICLIB_LIB_TYPE ${GeographicLib_LIBRARIES} TYPE)
+if (GEOGRAPHICLIB_LIB_TYPE STREQUAL "SHARED_LIBRARY")
+ if (WIN32)
+ add_custom_command (TARGET ${PROJECT_NAME} POST_BUILD
+ COMMAND
+ ${CMAKE_COMMAND} -E
+ copy $<TARGET_FILE:${GeographicLib_LIBRARIES}> ${CMAKE_CFG_INTDIR}
+ COMMENT "Installing shared library in build tree")
+ else ()
+ # Set the run time path for shared libraries for non-Windows machines.
+ set_target_properties (${PROJECT_NAME}
+ PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
+ endif ()
+endif ()
+
+# Don't include the "lib" prefix on the output name
+set_target_properties (${PROJECT_NAME} PROPERTIES PREFIX "")
+target_link_libraries (${PROJECT_NAME} ${GeographicLib_LIBRARIES}
+ ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
+
+install (TARGETS ${PROJECT_NAME} LIBRARY
+ # if CMAKE_INSTALL_PREFIX=~/.local then this specifies a directory in
+ # the default path.
+ DESTINATION lib/python${PYTHON_VERSION}/site-packages)
diff --git a/wrapper/python/PyGeographicLib.cpp b/wrapper/python/PyGeographicLib.cpp
new file mode 100644
index 0000000..ddde587
--- /dev/null
+++ b/wrapper/python/PyGeographicLib.cpp
@@ -0,0 +1,21 @@
+#include <boost/python.hpp>
+#include <GeographicLib/Geoid.hpp>
+
+using namespace boost::python;
+using namespace GeographicLib;
+
+double EllipsoidHeight(Geoid& geoid,
+ double lat, double lon, double hmsl) {
+ return hmsl + Geoid::GEOIDTOELLIPSOID * geoid(lat, lon);
+}
+
+BOOST_PYTHON_MODULE(PyGeographicLib) {
+
+ class_<Geoid, boost::noncopyable>("Geoid", init<std::string>())
+ .def("EllipsoidHeight", &EllipsoidHeight,
+ "Return geoid height:\n\
+ input: lat, lon, height_above_geoid\n\
+ output: height_above_ellipsoid")
+ ;
+
+}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/geographiclib.git
More information about the Pkg-grass-devel
mailing list