From b89c9a2401a202f4c3b64ca9bfaf4609e1cbe498 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 12 Jul 2015 01:04:39 +0200
Subject: [PATCH] raspberry pi fixes

---
 cmake        |  2 +-
 s/build      |  4 +++-
 s/cmake-init | 14 +++++++++++++-
 tolua        |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/cmake b/cmake
index b0059eb8b..80fd16533 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit b0059eb8b0e3258c1350ad72a1c25ac95582ea2f
+Subproject commit 80fd16533e8c4b76e1164e5ebf543d832cf3a9f2
diff --git a/s/build b/s/build
index 059ec8860..2434f1065 100755
--- a/s/build
+++ b/s/build
@@ -25,9 +25,11 @@ if [ ! -d $ROOT/$BUILD ]; then
   exit
 fi
 
-git submodule update
+if [ -z `which tolua` ]; then
 echo "build tolua"
 cd $ROOT/tolua ; make
+fi
+
 echo "build eressea"
 cd $ROOT/$BUILD
 make $MAKEOPTS && make test
diff --git a/s/cmake-init b/s/cmake-init
index c9b8dbe26..47a58b2e6 100755
--- a/s/cmake-init
+++ b/s/cmake-init
@@ -34,12 +34,24 @@ if [ -d $HOME/usr ]; then
   PREFIX_PATH=$HOME/usr:$HOME/usr/local:$PREFIX_PATH
 fi
 
-if [ "$HAVE_TOLUA" = "0" ] || [ ! -e "$(which tolua)" ]; then
+path=`which tolua`
+echo "TOLUA $path"
+if [ "$HAVE_TOLUA" = "0" ] || [ ! -e $path ]; then
  echo "tolua is not installed, building from source"
  cd $ROOT/tolua ; make
  ARGS="$ARGS -DPC_TOLUA_DIR=$ROOT/tolua"
 fi
 
+path=`which lua`
+if [ -e $path ]; then
+ path=`dirname $path` # /opt/bin
+ path=`dirname $path` # /opt
+ if [ -e $path/include/lua.h ] && [ -d $path/lib ] ; then
+  echo "lua is installed in $path"
+  ARGS="$ARGS -DPC_LUA_DIR=$LUA"
+ fi
+fi
+
 cd $BIN_DIR
 cmake .. \
  $ARGS \
diff --git a/tolua b/tolua
index b6e830405..e53fe09e5 160000
--- a/tolua
+++ b/tolua
@@ -1 +1 @@
-Subproject commit b6e8304055a28f490aa347dfe51528324bb8575d
+Subproject commit e53fe09e5789083698d2efb1fd36250efa700c34