From 347f8e57c7c62de865b1bb35e72de7e3b2550d48 Mon Sep 17 00:00:00 2001
From: Brian Quinion <brian.quinion@mapquest.com>
Date: Wed, 7 Oct 2015 14:44:59 +0100
Subject: [PATCH] Allow for postgis being in the default template - not an
 error if it already is installed

---
 osm2pgsql       | 2 +-
 utils/setup.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osm2pgsql b/osm2pgsql
index 8179cdb6..55b6b430 160000
--- a/osm2pgsql
+++ b/osm2pgsql
@@ -1 +1 @@
-Subproject commit 8179cdb67e70d7fb5605ab6ddedfd0bd3347db47
+Subproject commit 55b6b4302ca0443ba78d9c47cddfd8fc7731be4d
diff --git a/utils/setup.php b/utils/setup.php
index 90374e74..eff7b71b 100755
--- 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 {
-			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
-- 
2.39.5