Skip to content
Commits on Source (9)
......@@ -2,7 +2,7 @@ project (GeographicLib)
# Version information
set (PROJECT_VERSION_MAJOR 1)
set (PROJECT_VERSION_MINOR 49)
set (PROJECT_VERSION_MINOR 50)
set (PROJECT_VERSION_PATCH 0)
set (PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
if (PROJECT_VERSION_PATCH GREATER 0)
......@@ -42,12 +42,12 @@ endif ()
# The library version tracks the numbering given by libtool in the
# autoconf set up.
set (LIBVERSION_API 17)
set (LIBVERSION_BUILD 17.1.2)
set (LIBVERSION_API 19)
set (LIBVERSION_BUILD 19.0.0)
string (TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
string (TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER)
cmake_minimum_required (VERSION 2.8.4) # This version was released 2011-02-16
cmake_minimum_required (VERSION 3.1.0) # This version was released 2014-12-15
# User-settable variables
......@@ -122,7 +122,7 @@ else ()
endif ()
if (GEOGRAPHICLIB_SHARED_LIB)
set (PROJECT_SHARED_LIBRARIES GeographicLib)
set (PROJECT_SHARED_LIBRARIES GeographicLib_SHARED)
set (PROJECT_LIBRARIES ${PROJECT_SHARED_LIBRARIES})
set (PROJECT_SHARED_DEFINITIONS -DGEOGRAPHICLIB_SHARED_LIB=1)
set (PROJECT_DEFINITIONS ${PROJECT_SHARED_DEFINITIONS})
......@@ -133,6 +133,12 @@ else ()
set (PROJECT_DEFINITIONS ${PROJECT_STATIC_DEFINITIONS})
endif ()
set (PROJECT_INTERFACE_LIBRARIES GeographicLib)
set (PROJECT_ALL_LIBRARIES
${PROJECT_STATIC_LIBRARIES}
${PROJECT_SHARED_LIBRARIES}
${PROJECT_INTERFACE_LIBRARIES})
# (5) Create the documentation? This depends on whether doxygen can be
# found. If this is OFF, then links will be provided to the online
# documentation on Sourceforge.
......@@ -202,21 +208,21 @@ if (NOT MSVC)
if (NOT APPLE)
# Use relative path so that package is relocatable
set (CMAKE_INSTALL_RPATH "\$ORIGIN/../lib${LIB_SUFFIX}")
else ()
if (CMAKE_VERSION VERSION_LESS 2.8.12)
# Use absolute path with MacOSx
set (CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
else ()
# cmake 2.8.12 introduced a way to make the package relocatable.
# See also INSTALL_RPATH property on the tools.
set (CMAKE_MACOSX_RPATH ON)
endif ()
endif ()
endif ()
include (CheckTypeSize)
check_type_size ("long double" LONG_DOUBLE BUILTIN_TYPES_ONLY)
set (GEOGRAPHICLIB_HAVE_LONG_DOUBLE ${HAVE_LONG_DOUBLE})
check_type_size ("double" DOUBLE BUILTIN_TYPES_ONLY)
if (HAVE_LONG_DOUBLE AND (LONG_DOUBLE GREATER DOUBLE))
set (GEOGRAPHICLIB_HAVE_LONG_DOUBLE TRUE)
else ()
set (GEOGRAPHICLIB_HAVE_LONG_DOUBLE FALSE)
endif ()
include (TestBigEndian)
test_big_endian (GEOGRAPHICLIB_WORDS_BIGENDIAN)
......@@ -236,17 +242,20 @@ else ()
"${CMAKE_CXX_FLAGS} -Wall -Wextra ${FLOAT_CONVERSION_FLAG}")
# g++ 6.0 defaults to -std=gnu++14
if (NOT (CMAKE_CXX_COMPILER_ID STREQUAL GNU AND
NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0) OR
NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
# but Boost 1.60 quadmath needs c++14 and not gnu++14
GEOGRAPHICLIB_PRECISION EQUAL 4)
# OR GEOGRAPHICLIB_PRECISION EQUAL 4
# This exception is no longer needed with Boost 1.66
)
# check for C++11 support. This flag is *not* propagated to clients
# that use GeographicLib. However, this is of no consequence. When
# the client code is being compiled (and the GeographicLib headers
# being included), work-alike substitutions are used.
# The only "deprecated" flag included here is "0x" to activate C++11
# with old versions of g++. We'll add "17" when it's available.
# with old versions of g++.
# Note: C++11 (actually gnu++14) support is turned on by default in
# g++ 6.1 and later.
# Don't include 17 for Intel.
foreach (_F 14 11 0x)
set (CXX11_FLAG "-std=c++${_F}")
set (_T CXX11TEST${_F})
......@@ -272,6 +281,20 @@ if (DEVELOPER OR CONVERT_WARNINGS_TO_ERRORS)
endif ()
endif ()
# Tell Intel compiler to do arithmetic accurately. This is needed to
# stop the compiler from ignoring parentheses in expressions like
# (a + b) + c and from simplifying 0.0 + x to x (which is wrong if
# x = -0.0).
if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
if (MSVC)
set (CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} /fp:precise /Qdiag-disable:11074,11076")
else ()
set (CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} -fp-model precise -diag-disable=11074,11076")
endif ()
endif ()
include (CheckCXXSourceCompiles)
if (MSVC)
set (CMAKE_REQUIRED_FLAGS "${CMAKE_CXX_FLAGS} /WX")
......@@ -291,8 +314,9 @@ 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::copysign(1.0, -0.0)) +
std::isfinite(4.0) + std::isnan(0.0);
std::remainder(100.0, 90.0) + std::copysign(1.0, -0.0) +
std::round(3.5)) +
std::isfinite(4.0) + std::isnan(0.0) + int(std::lround(-3.5));
}\n" CXX11_MATH)
if (CXX11_MATH)
add_definitions (-DGEOGRAPHICLIB_CXX11_MATH=1)
......@@ -322,11 +346,12 @@ endif ()
include_directories ("${PROJECT_BINARY_DIR}/include" include)
if (USE_BOOST_FOR_EXAMPLES)
# quad precision numbers appeared in Boost 1.54.
find_package (Boost 1.54 COMPONENTS serialization)
# quad precision numbers appeared in Boost 1.54. Various
# workarounds stopped being needed with Boost 1.64.
find_package (Boost 1.64 COMPONENTS serialization)
elseif (GEOGRAPHICLIB_PRECISION EQUAL 4)
if (CMAKE_CXX_COMPILER_ID STREQUAL GNU AND CXX11_MATH)
find_package (Boost 1.54)
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CXX11_MATH)
find_package (Boost 1.64)
endif ()
endif ()
......@@ -342,7 +367,7 @@ elseif (GEOGRAPHICLIB_PRECISION EQUAL 3)
set (GEOGRAPHICLIB_PRECISION 2)
endif ()
elseif (GEOGRAPHICLIB_PRECISION EQUAL 4)
if (CMAKE_CXX_COMPILER_ID STREQUAL GNU AND CXX11_MATH)
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CXX11_MATH)
if (Boost_FOUND)
include_directories ("${Boost_INCLUDE_DIRS}")
set (HIGHPREC_LIBRARIES quadmath)
......@@ -405,7 +430,7 @@ elseif (GEOGRAPHICLIB_PRECISION EQUAL 5)
link_directories (/usr/local/lib)
endif ()
# g++ before 4.5 doesn't work (no explicit cast operator)
if (NOT (CMAKE_CXX_COMPILER_ID STREQUAL GNU AND
if (NOT (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND
CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.5))
set (HIGHPREC_LIBRARIES mpfr gmp)
endif ()
......@@ -562,16 +587,17 @@ if (WIN32)
set (CPACK_NSIS_CONTACT "charles@karney.com")
set (CPACK_NSIS_URL_INFO_ABOUT "https://geographiclib.sourceforge.io")
set (CPACK_NSIS_HELP_LINK "mailto:charles@karney.com")
# No provision for accommodating different compiler versions. However
# the Visual Studio 14 2015 build works also with Visual Studio 15
# 2017 and Visual Studio 16 2019.
if (CMAKE_SIZEOF_VOID_P EQUAL 8)
# Hardcode the prefix for Visual Studio 12 2013
set (CPACK_NSIS_INSTALL_ROOT "C:\\\\pkg-vc12-x64")
set (CPACK_NSIS_INSTALL_ROOT "C:\\\\Program Files")
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 12 2013
set (CPACK_NSIS_INSTALL_ROOT "C:\\\\pkg-vc12-win32")
set (CPACK_NSIS_INSTALL_ROOT "C:\\\\Program Files (x86)")
set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}-win32")
set (CPACK_NSIS_PACKAGE_NAME "${PROJECT_NAME} win32 ${PROJECT_VERSION}")
set (CPACK_PACKAGE_INSTALL_REGISTRY_KEY
......@@ -644,4 +670,5 @@ if (MAINTAINER)
endif ()
# The test suite -- split into a separate file because it's rather large.
# N.B. Many of the tests fail with GEOGRAPHICLIB_PRECISION = 1 (float).
include (tools/tests.cmake)
The MIT License (MIT); this license applies to GeographicLib,
versions 1.12 and later.
Copyright (c) 2008-2017, Charles Karney
Copyright (c) 2008-2019, Charles Karney
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -173,7 +173,7 @@ am__recursive_targets = \
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
cscope distdir dist dist-all distcheck
cscope distdir distdir-am dist dist-all distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
......@@ -415,8 +415,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
......@@ -579,7 +579,10 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
distdir: $(DISTFILES)
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
......
......@@ -4,7 +4,124 @@ For more information, see
https://geographiclib.sourceforge.io/
The current version of the library is 1.49.
The current version of the library is 1.50.
Changes between 1.50 (released 2019-09-24) and 1.49 versions:
* BUG fixes:
+ Java + JavaScript implementations of PolygonArea::TestEdge
counted the pole encirclings wrong.
+ Fix typo in JavaScript implementation which affected unsigned
areas.
+ Adding edges to a polygon counted pole encirclings inconsistent
with the way the adding point counted them. This might have
caused an incorrect result if a polygon vertex had longitude =
0. This affected all implementations except Fortran and
MATLAB).
+ GARS::Forward: fix BUG in handling of longitude = +/-180d.
+ Fix bug in Rhumb class and RhumbSolve(1) utiity which caused
incorrect area to be reported if an endpoint is at a pole.
Thanks to Natalia Sabourova for reporting this.
+ Fix bug in MATLAB routine mgrs_inv which resulted in incorrect
results for UPS zones with prec = -1.
+ In geodreckon.m geoddistance.m, suppress (innocuous) "warning:
division by zero" messages from Octave.
+ In python implementation, work around problems caused by
sin(inf) and fmod(inf) raising exceptions.
+ Geoid class, fix the use of streamoff.
* The PolygonArea class, the Planimeter utility, and their equivalents
in C, Fortran, MATLAB, Java, JavaScript, Python, and Maxima can now
handle arbitrarily complex polygons. In the case of
self-intersecting polygons the area is accumulated "algebraically",
e.g., the areas of the 2 loops in a figure-8 polygon will partially
cancel.
* Changes in gravity and magnetic model handling
+ SphericalEngine::coeff::readcoeffs takes new optional argument
truncate.
+ The constructors for GravityModel and MagneticModel allow the
maximum degree and order to be specified. The array of
coefficients will then be truncated if necessary.
+ GravityModel::Degree(), GravityModel::Order(),
MagneticModel::Degree(), MagneticModel::Order() return the
maximum degree and order of all the components of a GravityModel
or MagneticModel.
+ Gravity and MagneticField utilities accept -N and -M options to
to allow the maximum degree and order to be specified.
* The GeodSolve allows fractional distances to be entered as fractions
(with the -F flag).
* MajorRadius() methods are now called EquatorialRadius() for the C++,
Java, and .NET libraries. "Equatorial" is more descriptive in the
case of prolate ellipsoids. MajorRadius() is retained for backward
compatibility for C++ and Java but is deprecated.
* Minimum version updates:
+ CMake = 3.1.0, released 2014-12-15.
+ Minimum g++ version = 4.8.0, released 2013-03-22.
+ Visual Studio 10 2010 (haven't been able to check Visual Studio
2008 for a long time).
+ WARNING: The next version of GeographicLib will require a C++11
compliant compiler. This means that the minimum version of
Visual Studio will be Visual Studio 12 2013.
+ Minimum boost version = 1.64 needed for GEOGRAPHICLIB_PRECISION
= 4.
+ Java = 1.6; this allows the removal of epsilon, min, hypot,
log1p, copysign, cbrt from GeoMath.
* CMake updates:
+ Fine tune Visual Studio compatibility check in
find_package(GeographicLib); this allows GeographicLib compiled
with Visual Studio 14 2015 to be used with a project compiled
with Visual Studio 15 2017 and 16 2019.
+ Suppress warnings with dotnet build.
+ Change CMake target names and add an interface library (thanks
to Matthew Woehlke).
+ Remove pre-3.1.0 cruft and update the documentation to remove
the need to call include_dirctories.
+ Add _d suffix to example and test programs.
+ Changer installation path for binary installer to the Windows
default.
+ Add support for Intel compiler (for C++, C, Fortran). This
entails supplying the -fp-model precise flag to prevent the
compiler from incorrectly simplying (a + b) + c and 0.0 + x.
* Add version 2 of the World Magnetic Model 2015, wmm2015v2. This is
now the default magnetic model for MagneticField (replacing wmm2015
which is now deprecated). Coming in 2019-12: the wmm2020 model.
* The -f flag in the scripts geographiclib-get-geoids,
geographiclib-get-gravity, and geographiclib-get-magnetic, allows
you to load new models (not yet in the set defined by "all"). This
is in addition to its original role of allowing you to overwrite
existing models.
* Changes in math function support:
+ Move some of the functionality from Math.hpp to Math.cpp to make
compilation of package which depend on GeographicLib less
sensitive to the current compiler environment.
+ Add Math::remainder, Math::remquo, Math::round, and
Math::lround. Also add implementations of remainder, remquo to
C implementation.
+ Math::cbrt, Math::atanh, and Math::asinh now preserve the sign
of -0. (Also: C, Java, JavaScript, Python, MATLAB. Not
necessary: Fortran because sign is a built-in function.)
+ JavaScript: fall back to Math.hypot, Math.cbrt, Math.log1p,
Math.atanh if they are available.
* When parsing DMS strings ignore various non-breaking spaces (C++ and
JavaScript).
* Improve code coverage in the tests of geodesic algorithms (C++, C,
Java, JavaScript, Python, MATLAB, Fortran).
* Old deprecated NormalGravity::NormalGravity constructor removed.
* Additions to the documentation:
+ add documentation links to ge{distance,reckon}.m;
+ clarify which solution is returned for Geocentric::Reverse.
Changes between 1.49 (released 2017-10-05) and 1.48 versions:
......
# generated automatically by aclocal 1.15 -*- Autoconf -*-
# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2018 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-2014 Free Software Foundation, Inc.
# Copyright (C) 2002-2018 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.15'
[am__api_version='1.16'
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.15], [],
m4_if([$1], [1.16.1], [],
[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.15])dnl
[AM_AUTOMAKE_VERSION([1.16.1])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-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -185,7 +185,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -216,7 +216,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -407,13 +407,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
......@@ -421,49 +420,41 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
*\'*) eval set x "$CONFIG_FILES" ;;
*) set x $CONFIG_FILES ;;
esac
# TODO: see whether this extra hack can be removed once we start
# requiring Autoconf 2.70 or later.
AS_CASE([$CONFIG_FILES],
[*\'*], [eval set x "$CONFIG_FILES"],
[*], [set x $CONFIG_FILES])
shift
for mf
# Used to flag and report bootstrapping failures.
am_rc=0
for am_mf
do
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
# We used to match only the files named 'Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile which includes
# dependency-tracking related rules and includes.
# Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
# from the Makefile without running 'make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
test -z "$am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`AS_DIRNAME(["$file"])`
AS_MKDIR_P([$dirpart/$fdir])
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
|| continue
am_dirpart=`AS_DIRNAME(["$am_mf"])`
am_filepart=`AS_BASENAME(["$am_mf"])`
AM_RUN_LOG([cd "$am_dirpart" \
&& sed -e '/# am--include-marker/d' "$am_filepart" \
| $MAKE -f - am--depfiles]) || am_rc=$?
done
if test $am_rc -ne 0; then
AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
for automatic dependency tracking. Try re-running configure with the
'--disable-dependency-tracking' option to at least be able to build
the package (albeit without support for automatic dependency tracking).])
fi
AS_UNSET([am_dirpart])
AS_UNSET([am_filepart])
AS_UNSET([am_mf])
AS_UNSET([am_rc])
rm -f conftest-deps.mk
}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
......@@ -472,18 +463,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# -----------------------------
# This macro should only be invoked once -- use via AC_REQUIRE.
#
# This code is only required when automatic dependency tracking
# is enabled. FIXME. This creates each '.P' file that we will
# need in order to bootstrap the dependency handling code.
# This code is only required when automatic dependency tracking is enabled.
# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
# order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
[AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -570,8 +560,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target (and possibly the TAP driver). The
# system "awk" is bad on some platforms.
......@@ -638,7 +628,7 @@ END
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
that behaves properly: <http://www.gnu.org/software/coreutils/>.
that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
......@@ -680,7 +670,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-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -701,7 +691,7 @@ if test x"${install_sh+set}" != xset; then
fi
AC_SUBST([install_sh])])
# Copyright (C) 2003-2014 Free Software Foundation, Inc.
# Copyright (C) 2003-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -723,7 +713,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -758,7 +748,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -766,49 +756,42 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# AM_MAKE_INCLUDE()
# -----------------
# Check to see how make treats includes.
# Check whether make has an 'include' directive that can support all
# the idioms we need for our automatic dependency tracking code.
AC_DEFUN([AM_MAKE_INCLUDE],
[am_make=${MAKE-make}
cat > confinc << 'END'
[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
cat > confinc.mk << 'END'
am__doit:
@echo this is the am__doit target
@echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
AC_MSG_CHECKING([for style of include used by $am_make])
am__include="#"
am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
# Ignore all kinds of additional output from 'make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
am__quote=
_am_result=GNU
;;
esac
# Now try BSD make style include.
if test "$am__include" = "#"; then
echo '.include "confinc"' > confmf
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=.include
am__quote="\""
_am_result=BSD
;;
esac
# BSD make does it like this.
echo '.include "confinc.mk" # ignored' > confmf.BSD
# Other make implementations (GNU, Solaris 10, AIX) do it like this.
echo 'include confinc.mk # ignored' > confmf.GNU
_am_result=no
for s in GNU BSD; do
AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
AS_CASE([$?:`cat confinc.out 2>/dev/null`],
['0:this is the am__doit target'],
[AS_CASE([$s],
[BSD], [am__include='.include' am__quote='"'],
[am__include='include' am__quote=''])])
if test "$am__include" != "#"; then
_am_result="yes ($s style)"
break
fi
AC_SUBST([am__include])
AC_SUBST([am__quote])
AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
done
rm -f confinc.* confmf.*
AC_MSG_RESULT([${_am_result}])
AC_SUBST([am__include])])
AC_SUBST([am__quote])])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -847,7 +830,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -876,7 +859,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -923,7 +906,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -942,7 +925,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1023,7 +1006,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
# Copyright (C) 2009-2014 Free Software Foundation, Inc.
# Copyright (C) 2009-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1083,7 +1066,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1111,7 +1094,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
# Copyright (C) 2006-2014 Free Software Foundation, Inc.
# Copyright (C) 2006-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1130,7 +1113,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004-2014 Free Software Foundation, Inc.
# Copyright (C) 2004-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......
......@@ -5,6 +5,25 @@
# this is an absolute path, it's in the build tree; otherwise, it's in the
# install tree. (Note that the whole install tree can be relocated.)
# Variables needed by ${PROJECT_NAME_LOWER}-config-version.cmake
if (MSVC)
# For checking the compatibility of MSVC_TOOLSET_VERSION; see
# https://docs.microsoft.com/en-us/cpp/porting/overview-of-potential-upgrade-issues-visual-cpp
# Assume major version number is obtained by dropping the last decimal
# digit.
math (EXPR MSVC_TOOLSET_MAJOR "${MSVC_TOOLSET_VERSION}/10")
else ()
set (MSVC_TOOLSET_VERSION 0)
set (MSVC_TOOLSET_MAJOR 0)
endif ()
if (CMAKE_CROSSCOMPILING)
# Ensure that all "true" (resp. "false") settings are represented by
# the same string.
set (CMAKE_CROSSCOMPILING_STR "ON")
else ()
set (CMAKE_CROSSCOMPILING_STR "OFF")
endif ()
# geographiclib-config.cmake for the build tree
set (PROJECT_ROOT_DIR "${PROJECT_BINARY_DIR}")
set (PROJECT_INCLUDE_DIRS
......@@ -14,10 +33,10 @@ configure_file (project-config.cmake.in
configure_file (project-config-version.cmake.in
"${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config-version.cmake" @ONLY)
export (TARGETS
${PROJECT_SHARED_LIBRARIES} ${PROJECT_STATIC_LIBRARIES} ${TOOLS}
${PROJECT_ALL_LIBRARIES} ${TOOLS}
FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-targets.cmake")
export (TARGETS
${PROJECT_SHARED_LIBRARIES} ${PROJECT_STATIC_LIBRARIES} ${TOOLS}
${PROJECT_ALL_LIBRARIES} ${TOOLS}
NAMESPACE ${PROJECT_NAME}::
FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-namespace-targets.cmake")
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -291,8 +291,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
......@@ -318,7 +318,10 @@ ctags CTAGS:
cscope cscopelist:
distdir: $(DISTFILES)
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
......
......@@ -5,6 +5,23 @@ set (PACKAGE_VERSION_MAJOR "@PROJECT_VERSION_MAJOR@")
set (PACKAGE_VERSION_MINOR "@PROJECT_VERSION_MINOR@")
set (PACKAGE_VERSION_PATCH "@PROJECT_VERSION_PATCH@")
# These variable definitions parallel those in @PROJECT_NAME@'s
# cmake/CMakeLists.txt.
if (MSVC)
# For checking the compatibility of MSVC_TOOLSET_VERSION; see
# https://docs.microsoft.com/en-us/cpp/porting/overview-of-potential-upgrade-issues-visual-cpp
# Assume major version number is obtained by dropping the last decimal
# digit.
math (EXPR MSVC_TOOLSET_MAJOR "${MSVC_TOOLSET_VERSION}/10")
endif ()
if (CMAKE_CROSSCOMPILING)
# Ensure that all "true" (resp. "false") settings are represented by
# the same string.
set (CMAKE_CROSSCOMPILING_STR "ON")
else ()
set (CMAKE_CROSSCOMPILING_STR "OFF")
endif ()
if (NOT PACKAGE_FIND_NAME STREQUAL "@PROJECT_NAME@")
# Check package name (in particular, because of the way cmake finds
# package config files, the capitalization could easily be "wrong").
......@@ -18,11 +35,15 @@ elseif (NOT (APPLE OR (NOT DEFINED CMAKE_SIZEOF_VOID_P) OR
# since a multi-architecture library is built for that platform).
set (REASON "sizeof(*void) = @CMAKE_SIZEOF_VOID_P@")
set (PACKAGE_VERSION_UNSUITABLE TRUE)
elseif (MSVC AND NOT MSVC_VERSION STREQUAL "@MSVC_VERSION@")
elseif (MSVC AND NOT (
# toolset version must be at least as great as @PROJECT_NAME@'s
MSVC_TOOLSET_VERSION GREATER_EQUAL @MSVC_TOOLSET_VERSION@
# and major versions must match
AND MSVC_TOOLSET_MAJOR EQUAL @MSVC_TOOLSET_MAJOR@ ))
# Reject if there's a mismatch in MSVC compiler versions
set (REASON "_MSC_VER = @MSVC_VERSION@")
set (REASON "MSVC_TOOLSET_VERSION = @MSVC_TOOLSET_VERSION@")
set (PACKAGE_VERSION_UNSUITABLE TRUE)
elseif (NOT CMAKE_CROSSCOMPILING STREQUAL "@CMAKE_CROSSCOMPILING@")
elseif (NOT CMAKE_CROSSCOMPILING_STR STREQUAL "@CMAKE_CROSSCOMPILING_STR@")
# Reject if there's a mismatch in ${CMAKE_CROSSCOMPILING}
set (REASON "cross-compiling = @CMAKE_CROSSCOMPILING@")
set (PACKAGE_VERSION_UNSUITABLE TRUE)
......
......@@ -3,10 +3,8 @@
# Set
# @PROJECT_NAME@_FOUND = @PROJECT_NAME_UPPER@_FOUND = 1
# @PROJECT_NAME@_INCLUDE_DIRS = /usr/local/include
# @PROJECT_NAME@_SHARED_LIBRARIES = GeographicLib (or empty)
# @PROJECT_NAME@_SHARED_LIBRARIES = GeographicLib_SHARED (or empty)
# @PROJECT_NAME@_STATIC_LIBRARIES = GeographicLib_STATIC (or empty)
# @PROJECT_NAME@_SHARED_DEFINITIONS = GEOGRAPHICLIB_SHARED_LIB=1
# @PROJECT_NAME@_STATIC_DEFINITIONS = GEOGRAPHICLIB_SHARED_LIB=0
# @PROJECT_NAME@_LIBRARY_DIRS = /usr/local/lib
# @PROJECT_NAME@_BINARY_DIRS = /usr/local/bin
# @PROJECT_NAME@_VERSION = 1.34 (for example)
......@@ -14,14 +12,12 @@
# Depending on @PROJECT_NAME@_USE_STATIC_LIBS
# @PROJECT_NAME@_LIBRARIES = ${@PROJECT_NAME@_SHARED_LIBRARIES}, if OFF
# @PROJECT_NAME@_LIBRARIES = ${@PROJECT_NAME@_STATIC_LIBRARIES}, if ON
# @PROJECT_NAME@_DEFINITIONS = ${@PROJECT_NAME@_SHARED_DEFINITIONS}, if OFF
# @PROJECT_NAME@_DEFINITIONS = ${@PROJECT_NAME@_STATIC_DEFINITIONS}, if ON
# If only one of the libraries is provided, then
# @PROJECT_NAME@_USE_STATIC_LIBS is ignored.
#
# For cmake 2.8.11 or later, there's no need to include
# Since cmake 2.8.11 or later, there's no need to include
# include_directories (${GeographicLib_INCLUDE_DIRS})
# add_definitions (${GeographicLib_DEFINITIONS})
# The variables are retained for information.
#
# The following variables are only relevant if the library has been
# compiled with a default precision different from double:
......@@ -55,23 +51,29 @@ set (@PROJECT_NAME@_HIGHPREC_LIBRARIES "@HIGHPREC_LIBRARIES@")
set (@PROJECT_NAME@_SHARED_LIBRARIES @PROJECT_SHARED_LIBRARIES@)
set (@PROJECT_NAME@_STATIC_LIBRARIES @PROJECT_STATIC_LIBRARIES@)
set (@PROJECT_NAME@_SHARED_DEFINITIONS @PROJECT_SHARED_DEFINITIONS@)
set (@PROJECT_NAME@_STATIC_DEFINITIONS @PROJECT_STATIC_DEFINITIONS@)
# Read in the exported definition of the library
include ("${_DIR}/@PROJECT_NAME_LOWER@-targets.cmake")
include ("${_DIR}/@PROJECT_NAME_LOWER@-namespace-targets.cmake")
# For interoperability with older installations of GeographicLib and
# with packages which depend on GeographicLib, @PROJECT_NAME@_LIBRARIES
# etc. still point to the non-namespace variables. Tentatively plan to
# transition to namespace variables as follows:
#
# * namespace targets were introduced with version 1.47 (2017-02-15)
# * switch @PROJECT_NAME@_LIBRARIES to point to namespace variable after
# 2020-02
# * remove non-namespace variables after 2023-02
unset (_ROOT)
unset (_DIR)
if ((NOT @PROJECT_NAME@_SHARED_LIBRARIES) OR
(@PROJECT_NAME@_USE_STATIC_LIBS AND @PROJECT_NAME@_STATIC_LIBRARIES))
set (@PROJECT_NAME@_LIBRARIES ${@PROJECT_NAME@_STATIC_LIBRARIES})
set (@PROJECT_NAME@_DEFINITIONS ${@PROJECT_NAME@_STATIC_DEFINITIONS})
message (STATUS " \${@PROJECT_NAME@_LIBRARIES} set to static library")
else ()
set (@PROJECT_NAME@_LIBRARIES ${@PROJECT_NAME@_SHARED_LIBRARIES})
set (@PROJECT_NAME@_DEFINITIONS ${@PROJECT_NAME@_SHARED_DEFINITIONS})
message (STATUS " \${@PROJECT_NAME@_LIBRARIES} set to shared library")
endif ()
......
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
scriptversion=2012-10-14.11; # UTC
scriptversion=2018-03-07.03; # UTC
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
......@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
# 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/>.
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
......@@ -255,7 +255,8 @@ EOF
echo "compile $scriptversion"
exit $?
;;
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
......@@ -339,9 +340,9 @@ exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
This diff is collapsed.
This diff is collapsed.
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for GeographicLib 1.49.
# Generated by GNU Autoconf 2.69 for GeographicLib 1.50.
#
# Report bugs to <charles@karney.com>.
#
......@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='GeographicLib'
PACKAGE_TARNAME='geographiclib'
PACKAGE_VERSION='1.49'
PACKAGE_STRING='GeographicLib 1.49'
PACKAGE_VERSION='1.50'
PACKAGE_STRING='GeographicLib 1.50'
PACKAGE_BUGREPORT='charles@karney.com'
PACKAGE_URL=''
 
......@@ -685,7 +685,6 @@ am__nodep
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
am__quote
am__include
DEPDIR
OBJEXT
......@@ -780,7 +779,8 @@ PACKAGE_VERSION
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL'
SHELL
am__quote'
ac_subst_files=''
ac_user_opts='
enable_option_checking
......@@ -1354,7 +1354,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.49 to adapt to many kinds of systems.
\`configure' configures GeographicLib 1.50 to adapt to many kinds of systems.
 
Usage: $0 [OPTION]... [VAR=VALUE]...
 
......@@ -1425,7 +1425,7 @@ fi
 
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of GeographicLib 1.49:";;
short | recursive ) echo "Configuration of GeographicLib 1.50:";;
esac
cat <<\_ACEOF
 
......@@ -1548,7 +1548,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
GeographicLib configure 1.49
GeographicLib configure 1.50
generated by GNU Autoconf 2.69
 
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -1989,7 +1989,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.49, which was
It was created by GeographicLib $as_me 1.50, which was
generated by GNU Autoconf 2.69. Invocation command line was
 
$ $0 $@
......@@ -2480,7 +2480,7 @@ test -n "$target_alias" &&
 
 
 
am__api_version='1.15'
am__api_version='1.16'
 
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
......@@ -2966,7 +2966,7 @@ fi
 
# Define the identity of the package.
PACKAGE='geographiclib'
VERSION='1.49'
VERSION='1.50'
 
 
cat >>confdefs.h <<_ACEOF
......@@ -2996,8 +2996,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
 
# We need awk for the "check" target (and possibly the TAP driver). The
......@@ -3048,7 +3048,7 @@ END
Aborting the configuration process, to ensure you take notice of the issue.
 
You can download and install GNU coreutils to get an 'rm' implementation
that behaves properly: <http://www.gnu.org/software/coreutils/>.
that behaves properly: <https://www.gnu.org/software/coreutils/>.
 
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
......@@ -3061,7 +3061,7 @@ fi
 
 
GEOGRAPHICLIB_VERSION_MAJOR=1
GEOGRAPHICLIB_VERSION_MINOR=49
GEOGRAPHICLIB_VERSION_MINOR=50
GEOGRAPHICLIB_VERSION_PATCH=0
 
cat >>confdefs.h <<_ACEOF
......@@ -3109,9 +3109,9 @@ fi
ac_config_headers="$ac_config_headers include/GeographicLib/Config-ac.h"
 
 
LT_CURRENT=18
LT_REVISION=2
LT_AGE=1
LT_CURRENT=19
LT_REVISION=0
LT_AGE=0
 
 
 
......@@ -3121,45 +3121,45 @@ DEPDIR="${am__leading_dot}deps"
 
ac_config_commands="$ac_config_commands depfiles"
 
am_make=${MAKE-make}
cat > confinc << 'END'
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
cat > confinc.mk << 'END'
am__doit:
@echo this is the am__doit target
@echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
# Ignore all kinds of additional output from 'make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
am__quote=
_am_result=GNU
;;
esac
# Now try BSD make style include.
if test "$am__include" = "#"; then
echo '.include "confinc"' > confmf
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=.include
am__quote="\""
_am_result=BSD
# BSD make does it like this.
echo '.include "confinc.mk" # ignored' > confmf.BSD
# Other make implementations (GNU, Solaris 10, AIX) do it like this.
echo 'include confinc.mk # ignored' > confmf.GNU
_am_result=no
for s in GNU BSD; do
{ echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
(${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
case $?:`cat confinc.out 2>/dev/null` in #(
'0:this is the am__doit target') :
case $s in #(
BSD) :
am__include='.include' am__quote='"' ;; #(
*) :
am__include='include' am__quote='' ;;
esac ;; #(
*) :
;;
esac
if test "$am__include" != "#"; then
_am_result="yes ($s style)"
break
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
$as_echo "$_am_result" >&6; }
rm -f confinc confmf
done
rm -f confinc.* confmf.*
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
$as_echo "${_am_result}" >&6; }
 
# Check whether --enable-dependency-tracking was given.
if test "${enable_dependency_tracking+set}" = set; then :
......@@ -16239,6 +16239,45 @@ fi
 
fi
 
# Check flag for accurate arithmetic with Intel compiler. This is
# needed to stop the compiler from ignoring parentheses in expressions
# like (a + b) + c and from simplifying 0.0 + x to x (which is wrong if
# x = -0.0).
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -fp-model precise -diag-disable=11074,11076" >&5
$as_echo_n "checking whether C++ compiler accepts -fp-model precise -diag-disable=11074,11076... " >&6; }
if ${ax_cv_check_cxxflags__Werror__fp_model_precise__diag_disable_11074_11076+:} false; then :
$as_echo_n "(cached) " >&6
else
ax_check_save_flags=$CXXFLAGS
CXXFLAGS="$CXXFLAGS -Werror -fp-model precise -diag-disable=11074,11076"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
{
;
return 0;
}
_ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then :
ax_cv_check_cxxflags__Werror__fp_model_precise__diag_disable_11074_11076=yes
else
ax_cv_check_cxxflags__Werror__fp_model_precise__diag_disable_11074_11076=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS=$ax_check_save_flags
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cxxflags__Werror__fp_model_precise__diag_disable_11074_11076" >&5
$as_echo "$ax_cv_check_cxxflags__Werror__fp_model_precise__diag_disable_11074_11076" >&6; }
if test "x$ax_cv_check_cxxflags__Werror__fp_model_precise__diag_disable_11074_11076" = xyes; then :
CXXFLAGS="$CXXFLAGS -fp-model precise -diag-disable=11074,11076"
else
:
fi
# Check for C++11 math functions
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++11 math functions" >&5
$as_echo_n "checking for C++11 math functions... " >&6; }
......@@ -17148,7 +17187,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.49, which was
This file was extended by GeographicLib $as_me 1.50, which was
generated by GNU Autoconf 2.69. Invocation command line was
 
CONFIG_FILES = $CONFIG_FILES
......@@ -17214,7 +17253,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.49
GeographicLib config.status 1.50
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
 
......@@ -17333,7 +17372,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
#
# INIT-COMMANDS
#
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
 
 
# The HP-UX ksh and POSIX shell print the target directory to stdout
......@@ -18338,29 +18377,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
*\'*) eval set x "$CONFIG_FILES" ;;
*) set x $CONFIG_FILES ;;
# TODO: see whether this extra hack can be removed once we start
# requiring Autoconf 2.70 or later.
case $CONFIG_FILES in #(
*\'*) :
eval set x "$CONFIG_FILES" ;; #(
*) :
set x $CONFIG_FILES ;; #(
*) :
;;
esac
shift
for mf
# Used to flag and report bootstrapping failures.
am_rc=0
for am_mf
do
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
# We used to match only the files named 'Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile which includes
# dependency-tracking related rules and includes.
# Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
$as_echo X"$mf" |
sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
|| continue
am_dirpart=`$as_dirname -- "$am_mf" ||
$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$am_mf" : 'X\(//\)[^/]' \| \
X"$am_mf" : 'X\(//\)$' \| \
X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
$as_echo X"$am_mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
......@@ -18378,53 +18423,48 @@ $as_echo X"$mf" |
q
}
s/.*/./; q'`
else
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
# from the Makefile without running 'make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
test -z "$am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`$as_dirname -- "$file" ||
$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
X"$file" : 'X\(/\)' \| . 2>/dev/null ||
$as_echo X"$file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
}
/^X\(\/\/\)[^/].*/{
am_filepart=`$as_basename -- "$am_mf" ||
$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
X"$am_mf" : 'X\(//\)$' \| \
X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
$as_echo X/"$am_mf" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
}
/^X\(\/\/\)$/{
/^X\/\(\/\/\)$/{
s//\1/
q
}
/^X\(\/\).*/{
/^X\/\(\/\).*/{
s//\1/
q
}
s/.*/./; q'`
as_dir=$dirpart/$fdir; as_fn_mkdir_p
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
{ echo "$as_me:$LINENO: cd "$am_dirpart" \
&& sed -e '/# am--include-marker/d' "$am_filepart" \
| $MAKE -f - am--depfiles" >&5
(cd "$am_dirpart" \
&& sed -e '/# am--include-marker/d' "$am_filepart" \
| $MAKE -f - am--depfiles) >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } || am_rc=$?
done
if test $am_rc -ne 0; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "Something went wrong bootstrapping makefile fragments
for automatic dependency tracking. Try re-running configure with the
'--disable-dependency-tracking' option to at least be able to build
the package (albeit without support for automatic dependency tracking).
See \`config.log' for more details" "$LINENO" 5; }
fi
{ am_dirpart=; unset am_dirpart;}
{ am_filepart=; unset am_filepart;}
{ am_mf=; unset am_mf;}
{ am_rc=; unset am_rc;}
rm -f conftest-deps.mk
}
;;
"libtool":C)
......
dnl
dnl Copyright (C) 2009, Francesco P. Lovergine <frankie@debian.org>
AC_INIT([GeographicLib],[1.49],[charles@karney.com])
AC_INIT([GeographicLib],[1.50],[charles@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=49
GEOGRAPHICLIB_VERSION_MINOR=50
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=18
LT_REVISION=2
LT_AGE=1
LT_CURRENT=19
LT_REVISION=0
LT_AGE=0
AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
......@@ -60,6 +60,13 @@ AX_CHECK_COMPILE_FLAG([-std=c++11],
[CXXFLAGS="$CXXFLAGS -std=c++11"],
[AX_CHECK_COMPILE_FLAG([-std=c++0x],
[CXXFLAGS="$CXXFLAGS -std=c++0x"])])
# Check flag for accurate arithmetic with Intel compiler. This is
# needed to stop the compiler from ignoring parentheses in expressions
# like (a + b) + c and from simplifying 0.0 + x to x (which is wrong if
# x = -0.0).
AX_CHECK_COMPILE_FLAG([-fp-model precise -diag-disable=11074,11076],
[CXXFLAGS="$CXXFLAGS -fp-model precise -diag-disable=11074,11076"],,
[-Werror])
# Check for C++11 math functions
AC_MSG_CHECKING([for C++11 math functions])
AC_LINK_IFELSE([AC_LANG_PROGRAM(
......
geographiclib (1.49-6) UNRELEASED; urgency=medium
geographiclib (1.50-1~exp1) experimental; urgency=medium
[ Ross Gammon ]
* Remove myself from uploaders
-- Bas Couwenberg <sebastic@debian.org> Tue, 17 Sep 2019 18:08:04 +0200
[ Bas Couwenberg ]
* New upstream release.
* Update copyright years for Charles Karney.
* Drop doxygen.patch, applied upstream. Refresh remaining patches.
* Rename library package for SONAME bump.
* Install Node.js module in /usr/share/nodejs.
* Update symbols for amd64.
-- Bas Couwenberg <sebastic@debian.org> Fri, 27 Sep 2019 08:13:03 +0200
geographiclib (1.49-5) unstable; urgency=medium
......
......@@ -48,7 +48,7 @@ Description: C++ library to solve some geodesic problems -- documentation
.
This package contains the documentation for the GeographicLib tools.
Package: libgeographic17
Package: libgeographic19
Architecture: any
Multi-Arch: same
Section: libs
......@@ -74,7 +74,7 @@ Architecture: any
Section: libdevel
Conflicts: libgeographiclib-dev
Replaces: libgeographiclib-dev
Depends: libgeographic17 (= ${binary:Version}),
Depends: libgeographic19 (= ${binary:Version}),
${misc:Depends}
Suggests: geographiclib-doc
Description: C++ library to solve some geodesic problems -- development files
......
......@@ -4,7 +4,7 @@ Upstream-Contact: Charles Karney <charles@karney.com>
Source: https://geographiclib.sourceforge.io/
Files: *
Copyright: 2008-2017, Charles Karney <charles@karney.com>
Copyright: 2008-2019, Charles Karney <charles@karney.com>
2014-2016, BMW Car IT GmbH <sebastian.mattheis@bmw-carit.de>
2013-2015, Scott Heiman <mrmtdew2@outlook.com>
2013, Skip Breidbach <skip.breidbach@sri.com>
......@@ -13,10 +13,6 @@ Copyright: 2008-2017, Charles Karney <charles@karney.com>
Mathieu Peyréga <mathieu.peyrega@gmail.com>
License: Expat
Files: ltmain.sh
Copyright: 1996-2015, Free Software Foundation, Inc.
License: GPL-2+ with Libtool exception
Files: debian/*
Copyright: 2010, Francesco Paolo Lovergine <frankie@debian.org>
2014, Ross Gammon <rossgammon@mail.dk>
......@@ -43,32 +39,6 @@ License: Expat
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
License: GPL-2+ with Libtool exception
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.
.
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.
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
License: GPL-3+
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
......@@ -85,4 +55,3 @@ License: GPL-3+
.
On Debian systems, the complete text of the GNU General Public License
version 3 can be found in `/usr/share/common-licenses/GPL-3'.
# SymbolsHelper-Confirmed: 1.49 amd64 hurd-i386 i386 kfreebsd-i386
libGeographic.so.17 #PACKAGE# #MINVER#
# SymbolsHelper-Confirmed: 1.50 amd64
libGeographic.so.19 #PACKAGE# #MINVER#
* Build-Depends-Package: libgeographic-dev
_ZGVZN13GeographicLib4Math4tandIdEET_S2_E8overflow@Base 1.42
_ZGVZN13GeographicLib4Math4tandIeEET_S2_E8overflow@Base 1.50
_ZGVZN13GeographicLib4Math6degreeIdEET_vE6degree@Base 1.40
_ZGVZN13GeographicLib4Math6degreeIeEET_vE6degree@Base 1.50
_ZN13GeographicLib10Geocentric5WGS84Ev@Base 1.40
_ZN13GeographicLib10Geocentric8RotationEddddPd@Base 1.40
_ZN13GeographicLib10GeocentricC1Edd@Base 1.40
_ZN13GeographicLib10GeocentricC2Edd@Base 1.40
(optional=templinst)_ZN13GeographicLib11AccumulatorIdE3AddEd@Base 1.40
(optional=templinst)_ZN13GeographicLib11AccumulatorIdE7fastsumEddRd@Base 1.40
(optional=templinst)_ZN13GeographicLib11AccumulatorIdE9remainderEd@Base 1.50
(optional=templinst)_ZN13GeographicLib11AccumulatorIdEC1Ed@Base 1.40
(optional=templinst)_ZN13GeographicLib11AccumulatorIdEC2Ed@Base 1.40
(optional=templinst)_ZN13GeographicLib11AccumulatorIdEaSEd@Base 1.40
......@@ -27,8 +30,8 @@ libGeographic.so.17 #PACKAGE# #MINVER#
_ZN13GeographicLib12GravityModel12ReadMetadataERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 1.43
_ZN13GeographicLib12GravityModel18DefaultGravityNameB5cxx11Ev@Base 1.43
_ZN13GeographicLib12GravityModel18DefaultGravityPathB5cxx11Ev@Base 1.43
_ZN13GeographicLib12GravityModelC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 1.43
_ZN13GeographicLib12GravityModelC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 1.43
_ZN13GeographicLib12GravityModelC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_ii@Base 1.50
_ZN13GeographicLib12GravityModelC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_ii@Base 1.50
(optional=templinst)_ZN13GeographicLib12PolygonAreaTINS_13GeodesicExactEE13transitdirectEdd@Base 1.40
(optional=templinst)_ZN13GeographicLib12PolygonAreaTINS_13GeodesicExactEE5ClearEv@Base 1.40
(optional=templinst)_ZN13GeographicLib12PolygonAreaTINS_13GeodesicExactEE7AddEdgeEdd@Base 1.40
......@@ -63,8 +66,8 @@ libGeographic.so.17 #PACKAGE# #MINVER#
_ZN13GeographicLib13MagneticModel15FieldComponentsEddddddRdS1_S1_S1_S1_S1_S1_S1_@Base 1.40
_ZN13GeographicLib13MagneticModel19DefaultMagneticNameB5cxx11Ev@Base 1.43
_ZN13GeographicLib13MagneticModel19DefaultMagneticPathB5cxx11Ev@Base 1.43
_ZN13GeographicLib13MagneticModelC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_RKNS_10GeocentricE@Base 1.43
_ZN13GeographicLib13MagneticModelC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_RKNS_10GeocentricE@Base 1.43
_ZN13GeographicLib13MagneticModelC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_RKNS_10GeocentricEii@Base 1.50
_ZN13GeographicLib13MagneticModelC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_RKNS_10GeocentricEii@Base 1.50
_ZN13GeographicLib13NormalGravity10InitializeEddddb@Base 1.47
_ZN13GeographicLib13NormalGravity11atan5seriesEd@Base 1.47
_ZN13GeographicLib13NormalGravity11atan7seriesEd@Base 1.47
......@@ -76,9 +79,7 @@ libGeographic.so.17 #PACKAGE# #MINVER#
_ZN13GeographicLib13NormalGravity5GRS80Ev@Base 1.40
_ZN13GeographicLib13NormalGravity5WGS84Ev@Base 1.40
_ZN13GeographicLib13NormalGravityC1Eddddb@Base 1.47
_ZN13GeographicLib13NormalGravityC1Eddddd@Base 1.40
_ZN13GeographicLib13NormalGravityC2Eddddb@Base 1.47
_ZN13GeographicLib13NormalGravityC2Eddddd@Base 1.40
_ZN13GeographicLib14CassiniSoldner5ResetEdd@Base 1.40
_ZN13GeographicLib14CassiniSoldnerC1ERKNS_8GeodesicE@Base 1.40
_ZN13GeographicLib14CassiniSoldnerC1EddRKNS_8GeodesicE@Base 1.40
......@@ -111,7 +112,7 @@ libGeographic.so.17 #PACKAGE# #MINVER#
(optional=templinst)_ZN13GeographicLib15SphericalEngine5ValueILb1ELNS0_13normalizationE1ELi1EEEdPKNS0_5coeffEPKdddddRdS8_S8_@Base 1.40
(optional=templinst)_ZN13GeographicLib15SphericalEngine5ValueILb1ELNS0_13normalizationE1ELi2EEEdPKNS0_5coeffEPKdddddRdS8_S8_@Base 1.40
(optional=templinst)_ZN13GeographicLib15SphericalEngine5ValueILb1ELNS0_13normalizationE1ELi3EEEdPKNS0_5coeffEPKdddddRdS8_S8_@Base 1.40
_ZN13GeographicLib15SphericalEngine5coeff10readcoeffsERSiRiS3_RSt6vectorIdSaIdEES7_@Base 1.40
_ZN13GeographicLib15SphericalEngine5coeff10readcoeffsERSiRiS3_RSt6vectorIdSaIdEES7_b@Base 1.50
(optional=templinst)_ZN13GeographicLib15SphericalEngine6CircleILb0ELNS0_13normalizationE0ELi1EEENS_14CircularEngineEPKNS0_5coeffEPKdddd@Base 1.40
(optional=templinst)_ZN13GeographicLib15SphericalEngine6CircleILb0ELNS0_13normalizationE0ELi2EEENS_14CircularEngineEPKNS0_5coeffEPKdddd@Base 1.40
(optional=templinst)_ZN13GeographicLib15SphericalEngine6CircleILb0ELNS0_13normalizationE0ELi3EEENS_14CircularEngineEPKNS0_5coeffEPKdddd@Base 1.40
......@@ -196,9 +197,67 @@ libGeographic.so.17 #PACKAGE# #MINVER#
_ZN13GeographicLib4MGRS8upscols_E@Base 1.49
_ZN13GeographicLib4MGRS8upsrows_E@Base 1.49
_ZN13GeographicLib4MGRS8utmcols_E@Base 1.49
_ZN13GeographicLib4Math10set_digitsEi@Base 1.50
_ZN13GeographicLib4Math12extra_digitsEv@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math3NaNIdEET_v@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math3NaNIeEET_v@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math3NaNIiEET_v@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math3fmaIdEET_S2_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math3fmaIeEET_S2_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math3sumIdEET_S2_S2_RS2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math3sumIeEET_S2_S2_RS2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math4cbrtIdEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math4cbrtIeEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math4cosdIdEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math4cosdIeEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math4sindIdEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math4sindIeEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math4tandIdEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math4tandIeEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math4taufIdEET_S2_S2_@Base 1.42
(optional=templinst)_ZN13GeographicLib4Math4taufIeEET_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5asinhIdEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5asinhIeEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5atandIdEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5atandIeEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5atanhIdEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5atanhIeEET_S2_@Base 1.50
_ZN13GeographicLib4Math5dummyEv@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5expm1IdEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5expm1IeEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5hypotIdEET_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5hypotIeEET_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5isnanIdEEbT_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5isnanIeEEbT_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5log1pIdEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5log1pIeEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5roundIdEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5roundIeEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math5taupfIdEET_S2_S2_@Base 1.42
(optional=templinst)_ZN13GeographicLib4Math5taupfIeEET_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math6atan2dIdEET_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math6atan2dIeEET_S2_S2_@Base 1.50
_ZN13GeographicLib4Math6digitsEv@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math6lroundIdEElT_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math6lroundIeEElT_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math6remquoIdEET_S2_S2_Pi@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math6remquoIeEET_S2_S2_Pi@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math7eatanheIdEET_S2_S2_@Base 1.42
(optional=templinst)_ZN13GeographicLib4Math7eatanheIeEET_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math7sincosdIdEEvT_RS2_S3_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math7sincosdIeEEvT_RS2_S3_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math8AngRoundIdEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math8AngRoundIeEET_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math8copysignIdEET_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math8copysignIeEET_S2_S2_@Base 1.50
_ZN13GeographicLib4Math8digits10Ev@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math8infinityIdEET_v@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math8infinityIeEET_v@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math8infinityIiEET_v@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math8isfiniteIdEEbT_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math8isfiniteIeEEbT_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math9remainderIdEET_S2_S2_@Base 1.50
(optional=templinst)_ZN13GeographicLib4Math9remainderIeEET_S2_S2_@Base 1.50
_ZN13GeographicLib4OSGB11CheckCoordsEdd@Base 1.40
_ZN13GeographicLib4OSGB13GridReferenceERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERdS9_Rib@Base 1.43
_ZN13GeographicLib4OSGB13GridReferenceEddiRNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 1.43
......@@ -250,7 +309,10 @@ libGeographic.so.17 #PACKAGE# #MINVER#
_ZN13GeographicLib7Utility3strB5cxx11Edi@Base 1.43
(optional=templinst)_ZN13GeographicLib7Utility3strIcEENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEET_i@Base 1.43
(optional=templinst)_ZN13GeographicLib7Utility3strIiEENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEET_i@Base 1.43
(optional=templinst)_ZN13GeographicLib7Utility3strIsEENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEET_i@Base 1.50
(optional=templinst)_ZN13GeographicLib7Utility3valIdEET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 1.47
(optional=templinst)_ZN13GeographicLib7Utility3valIiEET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 1.50
(optional=templinst)_ZN13GeographicLib7Utility5fractIdEET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 1.50
_ZN13GeographicLib7Utility9ParseLineERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERS6_S9_@Base 1.43
_ZN13GeographicLib8Geodesic12SinCosSeriesEbddPKdi@Base 1.40
_ZN13GeographicLib8Geodesic3C1fEdPd@Base 1.40
......@@ -295,23 +357,35 @@ libGeographic.so.17 #PACKAGE# #MINVER#
_ZNK13GeographicLib12GravityModel6CircleEddj@Base 1.40
_ZNK13GeographicLib12GravityModel7GravityEdddRdS1_S1_@Base 1.40
_ZNK13GeographicLib12GravityModel9InternalTEdddRdS1_S1_bb@Base 1.40
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_13GeodesicExactEE10AreaReduceIdEEvRT_ibb@Base 1.50
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_13GeodesicExactEE10FlatteningEv@Base 1.40
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_13GeodesicExactEE11MajorRadiusEv@Base 1.40
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_13GeodesicExactEE12CurrentPointERdS3_@Base 1.40
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_13GeodesicExactEE16EquatorialRadiusEv@Base 1.50
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_13GeodesicExactEE7ComputeEbbRdS3_@Base 1.40
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_13GeodesicExactEE8TestEdgeEddbbRdS3_@Base 1.40
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_13GeodesicExactEE9RemainderERNS_11AccumulatorIdEE@Base 1.50
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_13GeodesicExactEE9RemainderERd@Base 1.50
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_13GeodesicExactEE9TestPointEddbbRdS3_@Base 1.40
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_5RhumbEE10AreaReduceIdEEvRT_ibb@Base 1.50
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_5RhumbEE10FlatteningEv@Base 1.40
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_5RhumbEE11MajorRadiusEv@Base 1.40
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_5RhumbEE12CurrentPointERdS3_@Base 1.40
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_5RhumbEE16EquatorialRadiusEv@Base 1.50
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_5RhumbEE7ComputeEbbRdS3_@Base 1.40
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_5RhumbEE8TestEdgeEddbbRdS3_@Base 1.40
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_5RhumbEE9RemainderERNS_11AccumulatorIdEE@Base 1.50
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_5RhumbEE9RemainderERd@Base 1.50
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_5RhumbEE9TestPointEddbbRdS3_@Base 1.40
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_8GeodesicEE10AreaReduceIdEEvRT_ibb@Base 1.50
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_8GeodesicEE10FlatteningEv@Base 1.40
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_8GeodesicEE11MajorRadiusEv@Base 1.40
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_8GeodesicEE12CurrentPointERdS3_@Base 1.40
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_8GeodesicEE16EquatorialRadiusEv@Base 1.50
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_8GeodesicEE7ComputeEbbRdS3_@Base 1.40
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_8GeodesicEE8TestEdgeEddbbRdS3_@Base 1.40
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_8GeodesicEE9RemainderERNS_11AccumulatorIdEE@Base 1.50
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_8GeodesicEE9RemainderERd@Base 1.50
(optional=templinst)_ZNK13GeographicLib12PolygonAreaTINS_8GeodesicEE9TestPointEddbbRdS3_@Base 1.40
_ZNK13GeographicLib13GeodesicExact10DirectLineEddddj@Base 1.46
_ZNK13GeographicLib13GeodesicExact10GenInverseEddddjRdS1_S1_S1_S1_S1_S1_@Base 1.40
......@@ -463,7 +537,6 @@ libGeographic.so.17 #PACKAGE# #MINVER#
_ZNSt6vectorIdSaIdEE12emplace_backIJdEEEvDpOT_@Base 1.40
(optional=templinst|subst)_ZNSt6vectorIdSaIdEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPdS1_EE{size_t}RKd@Base 1.40
(optional=templinst|subst)_ZNSt6vectorIdSaIdEE17_M_default_appendE{size_t}@Base 1.43
(optional=templinst)_ZNSt6vectorIdSaIdEE17_M_realloc_insertIJRKdEEEvN9__gnu_cxx17__normal_iteratorIPdS1_EEDpOT_@Base 1.49
(optional=templinst)_ZNSt6vectorIdSaIdEED1Ev@Base 1.40
(optional=templinst)_ZNSt6vectorIdSaIdEED2Ev@Base 1.40
(optional=templinst|arch=amd64)_ZNSt6vectorItSaItEE17_M_default_appendEm@Base 1.49
......@@ -482,4 +555,6 @@ libGeographic.so.17 #PACKAGE# #MINVER#
_ZTSN13GeographicLib13GeographicErrE@Base 1.40
_ZTVN13GeographicLib13GeographicErrE@Base 1.40
(optional=templinst)_ZZN13GeographicLib4Math4tandIdEET_S2_E8overflow@Base 1.42
(optional=templinst)_ZZN13GeographicLib4Math4tandIeEET_S2_E8overflow@Base 1.50
(optional=templinst)_ZZN13GeographicLib4Math6degreeIdEET_vE6degree@Base 1.40
(optional=templinst)_ZZN13GeographicLib4Math6degreeIeEET_vE6degree@Base 1.50