From dac6a3b8b04ac91fa6b97a079176d4e343653cb0 Mon Sep 17 00:00:00 2001 From: Paul Ramsey Date: Thu, 24 Sep 2015 19:12:15 +0000 Subject: [PATCH] Allow building with an "RC" version number git-svn-id: http://svn.osgeo.org/postgis/tags/2.2.0rc1@14102 b70326c6-7e19-0410-871a-916f4a2858ee --- configure.ac | 11 +++++++++++ liblwgeom/Makefile.in | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 0f0c89fc5..15a5cd175 100644 --- a/configure.ac +++ b/configure.ac @@ -97,6 +97,17 @@ AC_SUBST([POSTGIS_MAJOR_VERSION]) AC_SUBST([POSTGIS_MINOR_VERSION]) AC_SUBST([POSTGIS_MICRO_VERSION]) +dnl +dnl Convert PostGIS version info into liblwgeom libtool-happy numbers +dnl +LIBLWGEOM_CURRENT=`expr $POSTGIS_MAJOR_VERSION + $POSTGIS_MINOR_VERSION` +LIBLWGEOM_AGE=$POSTGIS_MINOR_VERSION +LIBLWGEOM_REV=`echo $POSTGIS_MICRO_VERSION | perl -p -e 's/(\d+)\w*\d*/$1/g'` +AC_SUBST([LIBLWGEOM_CURRENT]) +AC_SUBST([LIBLWGEOM_AGE]) +AC_SUBST([LIBLWGEOM_REV]) + + dnl dnl Search for flex/bison to build the parser dnl diff --git a/liblwgeom/Makefile.in b/liblwgeom/Makefile.in index 84247b272..e8f639ab8 100644 --- a/liblwgeom/Makefile.in +++ b/liblwgeom/Makefile.in @@ -22,9 +22,9 @@ SHELL = @SHELL@ INSTALL = $(SHELL) ../install-sh LIBTOOL = @LIBTOOL@ -IFACE_CURRENT = $(shell expr @POSTGIS_MAJOR_VERSION@ + @POSTGIS_MINOR_VERSION@ ) -IFACE_AGE = @POSTGIS_MINOR_VERSION@ -IFACE_REV = $(subst dev,,@POSTGIS_MICRO_VERSION@) +IFACE_CURRENT = @LIBLWGEOM_CURRENT@ +IFACE_AGE = @LIBLWGEOM_AGE@ +IFACE_REV = @LIBLWGEOM_REV@ VERSION_INFO = $(IFACE_CURRENT):$(IFACE_REV):$(IFACE_AGE) -- 2.49.0