Merge remote-tracking branch 'upstream/master'

diff --combined CMakeLists.txt
index fc342e74c94023fe7c6b60a1faa401fee85538eb,6bd99967351b7b0ea270bc204d953bb5d16f9f53..4e29a75e50d2498eebeeb40ec50a68085bad1c76
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -82,13 -82,14 +82,14 @@@ endif(
  
  # Setting PHP binary variable as to command line (prevailing) or auto detect
  
- if (BUILD_API OR BUILD_IMPORTER)
+ if (BUILD_API)
      if (NOT PHP_BIN)
           find_program (PHP_BIN php)
      endif()
      # sanity check if PHP binary exists
      if (NOT EXISTS ${PHP_BIN})
-         message(FATAL_ERROR "PHP binary not found. Install php or provide location with -DPHP_BIN=/path/php ")
+         message(WARNING "PHP binary not found. Only Python frontend can be used.")
+         set(PHP_BIN "")
      else()
          message (STATUS "Using PHP binary " ${PHP_BIN})
      endif()
@@@ -114,27 -115,6 +115,27 @@@ if (BUILD_IMPORTER
                    ${PROJECT_BINARY_DIR}/nominatim)
  endif()
  
 +#-----------------------------------------------------------------------------
 +# Targets for running a development webserver from the build directory.
 +#-----------------------------------------------------------------------------
 +
 +if (BUILD_API)
 +   set(WEBSITEFILES
 +       403.html
 +       509.html
 +       crossdomain.xml
 +       favicon.ico
 +       nominatim.xml
 +       robots.txt
 +       taginfo.json
 +   )
 +
 +   foreach (webfile ${WEBSITEFILES})
 +       configure_file(${PROJECT_SOURCE_DIR}/website/${webfile}
 +                      ${PROJECT_BINARY_DIR}/website/${webfile})
 +   endforeach()
 +endif()
 +
  #-----------------------------------------------------------------------------
  # Tests
  #-----------------------------------------------------------------------------
@@@ -247,7 -227,11 +248,11 @@@ if (BUILD_IMPORTER
              PATTERN "paths.py" EXCLUDE
              PATTERN __pycache__ EXCLUDE)
  
-     configure_file(${PROJECT_SOURCE_DIR}/cmake/paths-py.tmpl paths-py.installed)
+     if (EXISTS ${PHP_BIN})
+         configure_file(${PROJECT_SOURCE_DIR}/cmake/paths-py.tmpl paths-py.installed)
+     else()
+         configure_file(${PROJECT_SOURCE_DIR}/cmake/paths-py-no-php.tmpl paths-py.installed)
+     endif()
      install(FILES ${PROJECT_BINARY_DIR}/paths-py.installed
              DESTINATION ${NOMINATIM_LIBDIR}/lib-python/nominatim
              RENAME paths.py)
@@@ -275,7 -259,7 +280,7 @@@ if (BUILD_MODULE
              DESTINATION ${NOMINATIM_LIBDIR}/module)
  endif()
  
- if (BUILD_API)
+ if (BUILD_API AND EXISTS ${PHP_BIN})
      install(DIRECTORY lib-php DESTINATION ${NOMINATIM_LIBDIR})
  endif()