Moved postgis_gdal_version() from rtpostgis.sql.in.c to postgis.sql.in.c. Added...

Associated ticket is #1266.

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

diff --git a/postgis/Makefile.in b/postgis/Makefile.in
index a433b4b3f73e4b7404650893a88b7193bce0cd1b..f0104474aa944a5893eb0343894f4ce01e5118c1 100644 (file)
--- a/postgis/Makefile.in
+++ b/postgis/Makefile.in
@@ -107,7 +107,8 @@ $(PG_OBJS): ../liblwgeom/.libs/liblwgeom.a ../libpgcommon/libpgcommon.a
 
 # Borrow the $libdir substitution from PGXS but customise by adding the version number
 %.sql: %.sql.in
-       sed 's,MODULE_PATHNAME,$$libdir/postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@,g' $< >$@
+       sed -e 's,RASTER_MODULE_PATHNAME,$$libdir/rtpostgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@,g' \
+               -e 's,MODULE_PATHNAME,$$libdir/postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@,g' $< >$@
 
 postgis_upgrade_20_minor.sql.in: postgis_drop_before.sql.in.c postgis.sql
        cat $^ > $@

diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index 53c5f8fc7c2d39bd52e6bb5b8619f4312e7b24d1..03f0e8712d28e858619275e021f898ac015025fe 100644 (file)
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -2210,6 +2210,13 @@ CREATE OR REPLACE FUNCTION postgis_lib_build_date() RETURNS text
        AS 'MODULE_PATHNAME'\r
        LANGUAGE 'C' IMMUTABLE;\r
 \r
+#ifdef POSTGIS_GDAL_VERSION\r
+CREATE OR REPLACE FUNCTION postgis_gdal_version()\r
+       RETURNS text\r
+       AS 'RASTER_MODULE_PATHNAME', 'RASTER_gdal_version'\r
+       LANGUAGE 'C' IMMUTABLE;\r
+#endif\r
+\r
 CREATE OR REPLACE FUNCTION postgis_full_version() RETURNS text\r
 AS $$\r
 DECLARE\r

diff --git a/raster/rt_pg/rtpostgis.sql.in.c b/raster/rt_pg/rtpostgis.sql.in.c
index e2f722dfdbb2d30f56f839bfd7798e71b3acf053..5e4aff19d98ee3287d100dad900234d5a95e4524 100644 (file)
--- a/raster/rt_pg/rtpostgis.sql.in.c
+++ b/raster/rt_pg/rtpostgis.sql.in.c
@@ -64,11 +64,6 @@ CREATE OR REPLACE FUNCTION postgis_raster_lib_build_date()
     AS 'MODULE_PATHNAME', 'RASTER_lib_build_date'
     LANGUAGE 'C' IMMUTABLE; -- a new lib will require a new session
 
-CREATE OR REPLACE FUNCTION postgis_gdal_version()
-    RETURNS text
-    AS 'MODULE_PATHNAME', 'RASTER_gdal_version'
-    LANGUAGE 'C' IMMUTABLE;
-
 -----------------------------------------------------------------------
 -- Raster Accessors
 -----------------------------------------------------------------------