diff options
author | Kim Alvefur <zash@zash.se> | 2019-05-05 08:55:05 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2019-05-05 08:55:05 +0200 |
commit | d8544b7e89309d90bf602e1db4cca2214bce5cdf (patch) | |
tree | 1e6107600559fa3d5260f98464d9b8513ac919c1 | |
parent | 200664ab8a16a7f5a4d4a2de878c9f94cbeb4a8f (diff) | |
parent | 8fd66538f60d02b3778f1037dce9bda864874476 (diff) | |
download | prosody-d8544b7e89309d90bf602e1db4cca2214bce5cdf.tar.gz prosody-d8544b7e89309d90bf602e1db4cca2214bce5cdf.zip |
Merge 0.11->trunk
-rwxr-xr-x | configure | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -426,6 +426,13 @@ else } fi +# See #1353 +if [ "$LUA_DIR_SET" != "yes" ] && [ "$LUA_DIR" = "/" ] +then + LUA_DIR="/usr" +fi + + if [ "$lua_interp_found" != "yes" ] && [ "$RUNWITH_SET" != "yes" ] then if [ "$LUA_VERSION_SET" ]; then |