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 | b133b78d47ff180110b0b29612d3cd257a9972c1 (patch) | |
| tree | 85f43927206b44fd97ccc98872d483a4269c2f0f | |
| parent | 8b9646fee679b47520503b7eaafff9539a3ea3f2 (diff) | |
| parent | 140c6de0260c404abebb860705a81ed7398c7c52 (diff) | |
| download | prosody-b133b78d47ff180110b0b29612d3cd257a9972c1.tar.gz prosody-b133b78d47ff180110b0b29612d3cd257a9972c1.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" ] |