From 1e09b5c1b8aa79e9a6fea916bb0e6428c494035a Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Fri, 19 Aug 2011 10:12:00 +0000 Subject: [PATCH] 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 --- .gitignore | 1 + configure.ac | 4 ++-- liblwgeom/Makefile.in | 4 ++-- liblwgeom/{liblwgeom.h => liblwgeom.h.in} | 8 ++++++++ 4 files changed, 13 insertions(+), 4 deletions(-) rename liblwgeom/{liblwgeom.h => liblwgeom.h.in} (99%) diff --git a/.gitignore b/.gitignore index 20431e593..4b6b1443e 100644 --- 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 eaa932e02..4da3889f4 100644 --- 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 27a695d6e..919055896 100644 --- 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 3022c9398..727897a3c 100644 --- 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. */ -- 2.50.1