Allow building with an "RC" version number

git-svn-id: http://svn.osgeo.org/postgis/trunk@14103 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/configure.ac b/configure.ac
index 0f0c89fc5f27a590773fe4e05bab61632cccef5d..15a5cd1758d9ac4a0156fd22cfdff5b3505115e8 100644 (file)
--- 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 84247b2723e41256e4b355dcdc9e7a88adc2144b..e8f639ab8005b74df1f48bc75f6994d296b0680b 100644 (file)
--- 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)