Merge 16df659 into a12bfb7

CMakeLists.txt

@@ -31,9 +31,9 @@ colormsg(_HIBLUE_ "Configuring PROJ:")
 #PROJ version information
 #################################################################################
 include(Proj4Version)
-proj_version(MAJOR 4 MINOR 9 PATCH 2)
-set(PROJ_API_VERSION "10")
-set(PROJ_BUILD_VERSION "10.0.0")
+proj_version(MAJOR 4 MINOR 9 PATCH 3)
+set(PROJ_API_VERSION "11")
+set(PROJ_BUILD_VERSION "11.0.0")
 
 #################################################################################
 # Build features and variants

configure.ac

@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([PROJ.4 Projections], 4.9.2, [warmerdam@pobox.com], proj)
+AC_INIT([PROJ.4 Projections], 4.9.3, [warmerdam@pobox.com], proj)
 AC_CONFIG_MACRO_DIR([m4])
 AC_LANG(C)
 

man/man3/geodesic.3

@@ -38,7 +38,7 @@ measure angles (latitudes, longitudes, and azimuths) in degrees, unlike
 the rest of the \fBproj\fR library, which uses radians.  The
 documentation for this library is included in geodesic.h.  A formatted
 version of the documentation is available at
-http://geographiclib.sf.net/1.44/C
+http://geographiclib.sf.net/1.46/C
 .SH EXAMPLE
 The following program reads in lines with the coordinates for two points
 in decimal degrees (\fIlat1\fR, \fIlon1\fR, \fIlat2\fR, \fIlon2\fR) and
@@ -57,7 +57,7 @@ int main() {
   struct geod_geodesic g;
 
   geod_init(&g, a, f);
-  while (scanf("%lf %lf %lf %lf\en",
+  while (scanf("%lf %lf %lf %lf",
                &lat1, &lon1, &lat2, &lon2) == 4) {
     geod_inverse(&g, lat1, lon1, lat2, lon2,
                  &s12, &azi1, &azi2);
@@ -72,7 +72,7 @@ libproj.a \- library of projections and support procedures
 .SH SEE ALSO
 Full online documentation for \fBgeodesic(3)\fR,
 .br
-http://geographiclib.sf.net/1.44/C
+http://geographiclib.sf.net/1.46/C
 .PP
 .B geod(1)
 .PP
@@ -90,8 +90,12 @@ DOI: http://dx.doi.org/10.1007/s00190-012-0578-z
 .br
 http://geographiclib.sf.net/geod-addenda.html
 .PP
-The \fIonline geodesic bibliography\fR,
+\fIA geodesic bibliography\fR,
 .br
 http://geographiclib.sf.net/geodesic-papers/biblio.html
+.PP
+The Wikipedia page, \fIGeodesics on an ellipsoid\fR,
+.br
+https://en.wikipedia.org/wiki/Geodesics_on_an_ellipsoid
 .SH HOME PAGE
 https://github.com/OSGeo/proj.4/wiki

src/CMakeLists.txt

@@ -32,6 +32,7 @@ endif(BUILD_PROJ)
 
 if(BUILD_GEOD)
   include(bin_geod.cmake)
+  include(bin_geodtest.cmake)
 endif(BUILD_GEOD)
 
 if(BUILD_NAD2BIN)

src/Makefile.am

@@ -29,7 +29,7 @@ test228_LDADD = libproj.la @THREAD_LIB@
 
 lib_LTLIBRARIES = libproj.la
 
-libproj_la_LDFLAGS = -no-undefined -version-info 10:0:0
+libproj_la_LDFLAGS = -no-undefined -version-info 11:0:0
 
 libproj_la_SOURCES = \
 	pj_list.h \

src/bin_geodtest.cmake

@@ -0,0 +1,12 @@
+set(GEODTEST_SRC geodtest.c )
+set(GEODTEST_INCLUDE geod_interface.h)
+
+source_group("Source Files\\Bin" FILES ${GEODTEST_SRC} ${GEODTEST_INCLUDE})
+
+#Executable
+add_executable(geodtest ${GEODTEST_SRC} ${GEODTEST_INCLUDE})
+target_link_libraries(geodtest ${PROJ_LIBRARIES})
+# Do not install
+
+# Instead run as a test
+add_test (NAME geodesic-test COMMAND geodtest)