[geos-commits] [SCM] GEOS branch master updated. 5eca48f4097054d0b2218ab2f6b7d817b6a9b0d6
git at osgeo.org
git at osgeo.org
Thu Jun 14 06:08:31 PDT 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".
The branch, master has been updated
via 5eca48f4097054d0b2218ab2f6b7d817b6a9b0d6 (commit)
from 049a4b476aeedd485e29c1d729f1e8aa92298da8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5eca48f4097054d0b2218ab2f6b7d817b6a9b0d6
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Jun 14 15:07:51 2018 +0200
Strip pre-release suffix from library name
Patch by Bas Couwenberg
Closes #887
diff --git a/configure.ac b/configure.ac
index 64138b4..ca78e31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,7 @@ VERSION_MAJOR=3
VERSION_MINOR=7
VERSION_PATCH=0alpha
VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
+VERSION_RELEASE=`echo "$VERSION" | sed -E 's/(alpha|beta|rc)[[0-9]]*$//'`
dnl CAPI_VERSION_MAJOR=$(($CAPI_INTERFACE_CURRENT-$CAPI_INTERFACE_AGE))
dnl the following should be more portable
@@ -372,6 +373,7 @@ AC_SUBST(VERSION)
AC_SUBST(VERSION_MAJOR)
AC_SUBST(VERSION_MINOR)
AC_SUBST(VERSION_PATCH)
+AC_SUBST(VERSION_RELEASE)
AC_SUBST(INTERFACE_CURRENT)
AC_SUBST(INTERFACE_REVISION)
AC_SUBST(INTERFACE_AGE)
diff --git a/src/Makefile.am b/src/Makefile.am
index e08ed3e..27dce43 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,7 @@ lib_LTLIBRARIES = libgeos.la
# has changed between releases; the project chooses not to expend the
# effort to determine this because GEOS does not promise ABI stability.
libgeos_la_LDFLAGS = \
- -release @VERSION_MAJOR at .@VERSION_MINOR at .@VERSION_PATCH@ \
+ -release @VERSION_RELEASE@ \
-no-undefined
libgeos_la_SOURCES = \
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 2 ++
src/Makefile.am | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list