aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHoward Butler <howard@hobu.co>2015-09-10 11:08:50 -0500
committerHoward Butler <howard@hobu.co>2015-09-10 11:08:50 -0500
commitb2d7eebc7abfc74b7d4a050a96118fd45ea5ea87 (patch)
tree3b5169a8796fcaa63eab362162270b496a595761
parent5fc1cf8c73aae71bc563bc69424a4f7cd7a31bb5 (diff)
downloadPROJ-b2d7eebc7abfc74b7d4a050a96118fd45ea5ea87.tar.gz
PROJ-b2d7eebc7abfc74b7d4a050a96118fd45ea5ea87.zip
increment libtool versioning to 10:0:0 to account for PVALUE symbol rename #273
-rw-r--r--CMakeLists.txt2
-rw-r--r--ChangeLog3
-rw-r--r--NEWS2
-rw-r--r--src/Makefile.am2
4 files changed, 7 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab933f04..a6c281a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ colormsg(_HIBLUE_ "Configuring PROJ:")
include(Proj4Version)
proj_version(MAJOR 4 MINOR 9 PATCH 2)
set(PROJ_API_VERSION "10")
-set(PROJ_BUILD_VERSION "10.0.1")
+set(PROJ_BUILD_VERSION "10.0.0")
#################################################################################
# Build features and variants
diff --git a/ChangeLog b/ChangeLog
index a00c974b..dfa67267 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2015-09-10 sisyphus <https://github.com/sisyphus>
+ * : Rename PVALUE in pj_param.cto prevent Windows variable name clash
+
2015-09-10 Bas Couwenberg <https://github.com/sebastic>
* : Don't include files in proj dist, also included in proj-datumgrids
dist #301
diff --git a/NEWS b/NEWS
index 789d80d0..6dedc727 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,8 @@
o Remove setlocale() use in pj_init_ctx()
+ o Renamed PVALUE in pj_param.c to prevent clash with Windows
+
4.9.1 Release Notes
-------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 3344a7e6..6f8bc0a7 100644
--- a/src/Makefile.am
+++ b/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:1
+libproj_la_LDFLAGS = -no-undefined -version-info 10:0:0
libproj_la_SOURCES = \
pj_list.h \