Include version in liblwgeom.h [RT-SIGTA]

Closes ticket #1164

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

diff --git a/.gitignore b/.gitignore
index 20431e59341f2435a0c2469e6c8bd3eef6eec0f9..4b6b1443eed27042777ec2d982e6d231eea655cf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ GNUmakefile
 liblwgeom/cunit/cu_tester
 liblwgeom/cunit/Makefile
 liblwgeom/liblwgeom.a
+liblwgeom/liblwgeom.h
 liblwgeom/Makefile
 libtool
 loader/cunit/cu_tester

diff --git a/configure.ac b/configure.ac
index eaa932e028ecc43cc8699e8b86577e48292c302c..4da3889f468b84d82ec776f15d424ddfb76042ea 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -928,8 +928,8 @@ fi dnl # }
 
 dnl Output the relevant files
 AC_OUTPUT([GNUmakefile 
-        liblwgeom/Makefile liblwgeom/cunit/Makefile postgis/Makefile
-        libpgcommon/Makefile libpgcommon/cunit/Makefile
+        liblwgeom/Makefile liblwgeom/cunit/Makefile liblwgeom/liblwgeom.h
+        libpgcommon/Makefile libpgcommon/cunit/Makefile postgis/Makefile
         postgis/sqldefines.h loader/Makefile loader/cunit/Makefile
         topology/Makefile regress/Makefile doc/Makefile doc/Makefile.comments
         doc/html/image_src/Makefile $RT_MAKEFILE_LIST])

diff --git a/liblwgeom/Makefile.in b/liblwgeom/Makefile.in
index 27a695d6efb826666fd81b7b0661dcfa91291494..91905589625c2cd14299def79b61d1ccd89d799c 100644 (file)
--- a/liblwgeom/Makefile.in
+++ b/liblwgeom/Makefile.in
@@ -124,8 +124,8 @@ clean:
        rm -f liblwgeom.la
        rm -rf .libs
 
-# Nothing specific in distclean (will be done by clean)
-distclean:
+distclean: clean
+       rm -f liblwgeom.h
 
 check: liblwgeom.la
        make -C cunit check

diff --git a/liblwgeom/liblwgeom.h b/liblwgeom/liblwgeom.h.in
similarity index 99%
rename from liblwgeom/liblwgeom.h
rename to liblwgeom/liblwgeom.h.in
index 3022c939853cc926549c00ea98bb65b73f9df67e..727897a3c8cc428a6dbf5b7b4b5e7f2cff12312a 100644 (file)
--- a/liblwgeom/liblwgeom.h
+++ b/liblwgeom/liblwgeom.h.in
@@ -39,6 +39,14 @@
 * no special handling for memory management and error reporting.
 */
 
+/**
+ * liblwgeom versions
+ */
+#define LIBLWGEOM_VERSION "@POSTGIS_LIB_VERSION@"
+#define LIBLWGEOM_VERSION_MAJOR "@POSTGIS_MAJOR_VERSION@"
+#define LIBLWGEOM_VERSION_MINOR "@POSTGIS_MINOR_VERSION@"
+#define LIBLWGEOM_GEOS_VERSION "@POSTGIS_GEOS_VERSION@"
+
 /**
 * Return types for functions with status returns.
 */