diff --git a/launch.sh b/launch.sh index 3a921a85..b6c18f84 100755 --- a/launch.sh +++ b/launch.sh @@ -67,7 +67,7 @@ install_rocks() { RET=$?; if [ $RET -ne 0 ]; then echo "Error. Exiting."; exit $RET; fi - + ./.luarocks/bin/luarocks install serpent RET=$?; if [ $RET -ne 0 ]; then echo "Error. Exiting."; exit $RET; @@ -77,15 +77,16 @@ install_rocks() { install() { git pull git submodule update --init --recursive - cd tg && ./configure && make - - RET=$?; if [ $RET -ne 0 ]; then - echo "Trying without Python..."; - ./configure --disable-python && make - RET=$? - fi - + patch -i "patches/disable-python-and-libjansson.patch" -p 0 --batch --forward + RET=$?; + + cd tg if [ $RET -ne 0 ]; then + autoconf -i + fi + ./configure && make + + RET=$?; if [ $RET -ne 0 ]; then echo "Error. Exiting."; exit $RET; fi cd .. diff --git a/disable-python-and-libjansson.patch b/patches/disable-python-and-libjansson.patch similarity index 97% rename from disable-python-and-libjansson.patch rename to patches/disable-python-and-libjansson.patch index 1b267d39..10931641 100644 --- a/disable-python-and-libjansson.patch +++ b/patches/disable-python-and-libjansson.patch @@ -1,5 +1,5 @@ ---- configure.ac.back 2015-10-24 13:39:25.273440670 +0200 -+++ configure.ac 2015-10-24 13:44:41.635374294 +0200 +--- tg/configure.ac 2015-10-24 14:23:51.964259062 +0200 ++++ tg/configure.ac 2015-10-24 14:05:10.111062758 +0200 @@ -61,93 +61,43 @@ ],[ ])