Merge pull request #389 from mtmail/reverse-geocode-include-geometry2

[nominatim.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c003a2c71e1116ec5a26213c3c149dc1ea7891a7..53a8e8714281cafa64b4d17cbffbbfee85535424 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,7 @@
-AC_INIT(Nominatim,1.9.9)
+AC_INIT(Nominatim,2.5)
+if git rev-parse HEAD 2>/dev/null >/dev/null; then
+    AC_SUBST([PACKAGE_VERSION], [$PACKAGE_VERSION-git-`git rev-parse --short HEAD`])
+fi
 
 dnl Required autoconf version
 AC_PREREQ(2.61)
@@ -6,6 +9,7 @@ AC_PREREQ(2.61)
 AM_INIT_AUTOMAKE([1.9.6 dist-bzip2 std-options check-news])
 
 dnl Additional macro definitions are in here
+m4_include([m4/ax_lib_postgresql_svr.m4])
 AC_CONFIG_MACRO_DIR([osm2pgsql/m4])
 
 dnl Generate configuration header file
@@ -21,9 +25,6 @@ AC_PROG_CXX
 dnl pthread
 AX_PTHREAD([], [AC_MSG_ERROR([pthread library required])])
 
-dnl check for zlib library
-AX_CHECK_ZLIB
-
 dnl Check for Geos library
 AX_LIB_GEOS
 if test "x$GEOS_VERSION" = "x" 
@@ -40,11 +41,12 @@ fi
 
 
 dnl Check for PostgresSQL client library
-AX_LIB_POSTGRESQL(8.4)
+AX_LIB_POSTGRESQL(9.0)
 if test "x$POSTGRESQL_VERSION" = "x"
 then
     AC_MSG_ERROR([postgresql client library not found])
 fi
+AX_LIB_POSTGRESQL_SVR(9.0)
 if test ! -f "$POSTGRESQL_PGXS"
 then
     AC_MSG_ERROR([postgresql server development library not found])