From 8b629f992dc690457cb97eb9dd492e8b1d37636c Mon Sep 17 00:00:00 2001
From: Nikolaus Krismer <nikolaus.krismer@uibk.ac.at>
Date: Sat, 24 Oct 2015 14:14:54 +0200
Subject: [PATCH] always installing phpliteadmin when using spatialite now

---
 CHANGELOG.md                    | 1 +
 bootstrap/prepareEnvironment.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68ef466..07fc773 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 Upcoming version:
 -----------------
+  - always installing phpliteadmin when using spatialite now (Nikolaus Krismer)
   - fixed problems with filenames in config (Nikolaus Krismer)
   - merged (Nikolaus Krismer)
   - re-activated Neo4J-spatial (with help from Robert Bierbauer's and his master thesis) (Nikolaus Krismer)
diff --git a/bootstrap/prepareEnvironment.sh b/bootstrap/prepareEnvironment.sh
index c125d40..d914250 100755
--- a/bootstrap/prepareEnvironment.sh
+++ b/bootstrap/prepareEnvironment.sh
@@ -230,6 +230,7 @@ if $IMPORT_DATA_POSTGIS; then
 fi
 if $IMPORT_DATA_SPATIALITE || $INSTALL_GDAL || $INSTALL_SPATIALITE_ADMIN; then
 	INSTALL_SPATIALITE=true
+	INSTALL_SPATIALITE_ADMIN=true
 fi
 if $INSTALL_POSTGRES_ADMIN || $INSTALL_SPATIALITE_ADMIN; then
 	INSTALL_HTTPD=true
-- 
GitLab