Pass USE_* information to version string, add some 7.4 version passing

flags to the compile.

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

diff --git a/Makefile b/Makefile
index 5ef8279e2947130aeb7df2e65a3ce3464af48667..84cc8ba3e6742e6dd7c84effb10e863fd51f75df 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,11 @@ else
        ifneq ($(findstring 7.2,$(VERSION)),)
                USE_VERSION=72
        else
-               USE_VERSION=73
+               ifneq ($(findstring 7.3,$(VERSION)),)
+                       USE_VERSION=73
+               else
+                       USE_VERSION=74
+               endif
        endif
 endif
 
@@ -137,7 +141,7 @@ loaderdumper:
 # Shared library stuff
 
 postgis.sql: postgis_sql_common.sql.in postgis_sql_$(USE_VERSION)_end.sql.in postgis_sql_$(USE_VERSION)_start.sql.in 
-       cat postgis_sql_$(USE_VERSION)_start.sql.in postgis_sql_common.sql.in postgis_sql_$(USE_VERSION)_end.sql.in | sed -e 's:@MODULE_FILENAME@:$(LPATH)/$(shlib):g;s:@POSTGIS_VERSION@:$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION):g'  > $@ 
+       cat postgis_sql_$(USE_VERSION)_start.sql.in postgis_sql_common.sql.in postgis_sql_$(USE_VERSION)_end.sql.in | sed -e 's:@MODULE_FILENAME@:$(LPATH)/$(shlib):g;s:@POSTGIS_VERSION@:$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) USE_GEOS=$(USE_GEOS) USE_PROJ=$(USE_PROJ) USE_STATS=$(USE_STATS):g'  > $@ 
 
 postgis_undef.sql: postgis.sql create_undef.pl
        perl create_undef.pl $< $(USE_VERSION) > $@