Merge branch 'move-datasources-into-separate-repos' of https://github.com/mtmail...

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index db17b8f51290fcc9ad747d7e1b76c3bfc152e7e6..e0f74427cb46b69c8dfe6e08ffe029e62fe76ad6 100644 (file)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -77,15 +77,17 @@ if ($aCMDResult['create-db'] || $aCMDResult['all']) {
     $oSetup->createDB();
 }
 
-$oSetup->connect();
+if (!$aCMDResult['setup-website']) {
+    $oSetup->connect();
+    // Try accessing the C module, so we know early if something is wrong
+    checkModulePresence(); // raises exception on failure
+}
 
 if ($aCMDResult['setup-db'] || $aCMDResult['all']) {
     $bDidSomething = true;
     $oSetup->setupDB();
 }
 
-// Try accessing the C module, so we know early if something is wrong
-checkModulePresence(); // raises exception on failure
 
 if ($aCMDResult['import-data'] || $aCMDResult['all']) {
     $bDidSomething = true;