Merge remote-tracking branch 'upstream/master'

diff --cc CMakeLists.txt
index 17b5cd7229000864ac9e09003409f4edcc84a428,2596c1041f740a0ebf23c6dbd7c8967a897ca62b..13ee60b363f7d1a023e8e9c84b4c1afc2cace61d
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -84,77 -112,47 +112,62 @@@ if (BUILD_IMPORTER
  endif()
  
  #-----------------------------------------------------------------------------
- #
- # Setup settings and paths
- #
+ # webserver scripts (API only)
  #-----------------------------------------------------------------------------
  
- set(WEBSITESCRIPTS
-     website/deletable.php
-     website/details.php
-     website/hierarchy.php
-     website/lookup.php
-     website/polygons.php
-     website/reverse.php
-     website/search.php
-     website/status.php
- )
- 
- set(WEBSITEFILES
-     403.html
-     509.html
-     crossdomain.xml
-     favicon.ico
-     nominatim.xml
-     robots.txt
-     taginfo.json
- )
- 
- set(CUSTOMSCRIPTS
-     utils/check_import_finished.php
-     utils/country_languages.php
-     utils/export.php
-     utils/query.php
-     utils/setup.php
-     utils/specialphrases.php
-     utils/update.php
-     utils/warm.php
+ if (BUILD_API)
+    set(WEBSITESCRIPTS
+        website/deletable.php
+        website/details.php
+        website/hierarchy.php
+        website/lookup.php
+        website/polygons.php
+        website/reverse.php
+        website/search.php
+        website/status.php
     )
  
- foreach (script_source ${CUSTOMSCRIPTS})
-     configure_file(${PROJECT_SOURCE_DIR}/cmake/script.tmpl
-                    ${PROJECT_BINARY_DIR}/${script_source})
- endforeach()
++   set(WEBSITEFILES
++       403.html
++       509.html
++       crossdomain.xml
++       favicon.ico
++       nominatim.xml
++       robots.txt
++       taginfo.json
++   )
 +
- foreach (script_source ${WEBSITESCRIPTS})
-     configure_file(${PROJECT_SOURCE_DIR}/cmake/website.tmpl
-                    ${PROJECT_BINARY_DIR}/${script_source})
- endforeach()
+    foreach (script_source ${WEBSITESCRIPTS})
+        configure_file(${PROJECT_SOURCE_DIR}/cmake/website.tmpl
+                       ${PROJECT_BINARY_DIR}/${script_source})
+    endforeach()
  
- foreach (webfile ${WEBSITEFILES})
-     configure_file(${PROJECT_SOURCE_DIR}/website/${webfile}
-                    ${PROJECT_BINARY_DIR}/website/${webfile})
- endforeach()
+    set(WEBPATHS css images js)
  
- configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php
-                ${PROJECT_BINARY_DIR}/settings/settings.php)
++   foreach (webfile ${WEBSITEFILES})
++       configure_file(${PROJECT_SOURCE_DIR}/website/${webfile}
++                      ${PROJECT_BINARY_DIR}/website/${webfile})
++   endforeach()
 +
- set(WEBPATHS css images js)
+    foreach (wp ${WEBPATHS})
+        execute_process(
+            COMMAND ln -sf ${PROJECT_SOURCE_DIR}/website/${wp} ${PROJECT_BINARY_DIR}/website/
+        )
+    endforeach()
+ endif()
  
- foreach (wp ${WEBPATHS})
-     execute_process(
-         COMMAND ln -sf ${PROJECT_SOURCE_DIR}/website/${wp} ${PROJECT_BINARY_DIR}/website/
-     )
- endforeach()
+ #-----------------------------------------------------------------------------
+ # default settings
+ #-----------------------------------------------------------------------------
  
+ configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php
+                ${PROJECT_BINARY_DIR}/settings/settings.php)
  
  #-----------------------------------------------------------------------------
- #
  # Tests
- #
  #-----------------------------------------------------------------------------
  
- if (NOT ONLY_DOCS)
+ if (BUILD_TESTS)
      include(CTest)
  
      set(TEST_BDD db osm2pgsql api)