Merge pull request #629 from melvyn-sopacua/release-2.6.0a1

Build fixes for BSD-like systems

diff --git a/module/CMakeLists.txt b/module/CMakeLists.txt
index 4dfc477cd8684a30a81791f99f8541c9ed0863b3..f4fabe42922ff8e376fdaeaa88ce9815e876dc64 100644 (file)
--- a/module/CMakeLists.txt
+++ b/module/CMakeLists.txt
@@ -1,6 +1,6 @@
 # just use the pgxs makefile
 ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/dummy
-        COMMAND PGXS=${PGXS} PG_CONFIG=${PG_CONFIG} MODSRCDIR=${CMAKE_CURRENT_SOURCE_DIR} make -f ${CMAKE_CURRENT_SOURCE_DIR}/Makefile
+        COMMAND PGXS=${PGXS} PG_CONFIG=${PG_CONFIG} MODSRCDIR=${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MAKE_PROGRAM} -f ${CMAKE_CURRENT_SOURCE_DIR}/Makefile
         COMMENT "Running external makefile ${PGXS}"
         )
 

diff --git a/nominatim/CMakeLists.txt b/nominatim/CMakeLists.txt
index 53b5073bb7dadc414a80796197552b3760f679f1..726ec4cc3007a1d8918bf2994b505e285eb9bcae 100644 (file)
--- a/nominatim/CMakeLists.txt
+++ b/nominatim/CMakeLists.txt
@@ -1,4 +1,12 @@
 add_executable(nominatim export.c geometry.cpp import.c index.c input.c nominatim.c postgresql.c sprompt.c)
-
+include(CheckIncludeFile)
+CHECK_INCLUDE_FILE(byteswap.h HAVE_BYTESWAP_H)
+CHECK_INCLUDE_FILE(sys/endian.h HAVE_SYS_ENDIAN_H)
+if(HAVE_BYTESWAP_H)
+  target_compile_definitions(nominatim PRIVATE HAVE_BYTESWAP_H)
+endif(HAVE_BYTESWAP_H)
+if(HAVE_SYS_ENDIAN_H)
+  target_compile_definitions(nominatim PRIVATE HAVE_SYS_ENDIAN_H)
+endif(HAVE_SYS_ENDIAN_H)
 target_link_libraries(nominatim ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PostgreSQL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 

diff --git a/nominatim/postgresql.h b/nominatim/postgresql.h
index 6a14e94e6ea56d33e2fd038979b677b0be601e04..7050fca4ed7302399097b4bbf262b32b38a2e5ec 100644 (file)
--- a/nominatim/postgresql.h
+++ b/nominatim/postgresql.h
@@ -7,7 +7,11 @@
 #define PG_OID_INT8                    20
 #define PG_OID_INT4                    23
 
+#if defined(HAVE_BYTESWAP_H)
 #include <byteswap.h>
+#elif defined(HAVE_SYS_ENDIAN_H)
+#include <sys/endian.h>
+#endif
 
 #if __BYTE_ORDER == __BIG_ENDIAN
 #define PGint16(x)     (x)