Merge branch 'develop' of https://github.com/ennorehling/eressea.git

process/CMakeLists.txt

@@ -1,6 +1,6 @@
 install(PROGRAMS create-orders backup-eressea run-turn send-zip-report
 send-bz2-report compress.py compress.sh epasswd.py orders-process
-checkpasswd.py sendreport.sh orders-accept DESTINATION bin)
+checkpasswd.py sendreport.sh sendreports.sh orders-accept DESTINATION bin)
 
 install(DIRECTORY cron/ DESTINATION bin USE_SOURCE_PERMISSIONS
 FILES_MATCHING PATTERN "*.cron")

s/build

@@ -37,10 +37,10 @@ BRANCH=$(git status -s -b | head -1 | cut -d\  -f 2 | sed 's/\..*//')
 if [ "$BRANCH" = "master" ] ; then
 VERSION=$(git describe --match 'v*.*.*' --tags | sed 's/^v//')
 echo "$BRANCH $VERSION"
-CMAKE_ARGS="-DERESSEA_VERSION=$VERSION ${CMAKE_ARGS}"
+CMAKE_ARGS="-DERESSEA_VERSION:STRING=$VERSION ${CMAKE_ARGS}"
 else
 REV=$(git rev-parse --short HEAD)
-CMAKE_ARGS="-DERESSEA_BUILDNO=$REV $CMAKE_ARGS"
+CMAKE_ARGS="-DERESSEA_BUILDNO:STRING=$REV $CMAKE_ARGS"
 fi
 
 cmake ${CMAKE_ARGS}

s/cmake-init

@@ -1,8 +1,8 @@
 #!/bin/sh
 
-ERESSEA_DB=sqlite
-if [ -e /usr/include/db.h ] ; then
 ERESSEA_DB=db
+if [ -e /usr/include/sqlite3.h ] ; then
+ERESSEA_DB=sqlite
 fi
 
 # Parse command line arguments