diff options
| author | Kim Alvefur <zash@zash.se> | 2017-03-03 11:52:22 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-03-03 11:52:22 +0100 |
| commit | 2ca03f1a40ea0854e0dda798b82e31c558eed578 (patch) | |
| tree | 85f43927206b44fd97ccc98872d483a4269c2f0f | |
| parent | 8407f360939fe103a991641b0bf3b85e87d660b9 (diff) | |
| parent | c284110cb40cb2347f82e974f76eb6bc6927e946 (diff) | |
| download | prosody-2ca03f1a40ea0854e0dda798b82e31c558eed578.tar.gz prosody-2ca03f1a40ea0854e0dda798b82e31c558eed578.zip | |
Merge 0.10->trunk
| -rwxr-xr-x | configure | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -338,6 +338,11 @@ then fi fi +if [ "$PREFIX_SET" = "yes" -a ! "$LIBDIR_SET" = "yes" ] +then + LIBDIR=$PREFIX/lib +fi + detect_lua_version() { detected_lua=`$1 -e 'print(_VERSION:match(" (5%.[123])$"))' 2> /dev/null` if [ "$detected_lua" != "nil" ] |