Allow for postgis being in the default template - not an error if it already is installed

diff --git a/osm2pgsql b/osm2pgsql
index 8179cdb67e70d7fb5605ab6ddedfd0bd3347db47..55b6b4302ca0443ba78d9c47cddfd8fc7731be4d 160000 (submodule)
--- a/osm2pgsql
+++ b/osm2pgsql
@@ -1 +1 @@
-Subproject commit 8179cdb67e70d7fb5605ab6ddedfd0bd3347db47
+Subproject commit 55b6b4302ca0443ba78d9c47cddfd8fc7731be4d

diff --git a/utils/setup.php b/utils/setup.php
index 90374e74785175a146a9f567537c23aca5dfdb64..eff7b71b447fef7fd36bab87e3db8569fef84231 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -134,7 +134,7 @@
                        pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql');
                        pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql');
                } else {
                        pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql');
                        pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql');
                } else {

-                       pgsqlRunScript('CREATE EXTENSION postgis');
+                       pgsqlRunScript('CREATE EXTENSION IF NOT EXISTS postgis');

                }
                if ($fPostgisVersion < 2.1) {
                        // Function was renamed in 2.1 and throws an annoying deprecation warning
                }
                if ($fPostgisVersion < 2.1) {
                        // Function was renamed in 2.1 and throws an annoying deprecation warning