aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-03 11:52:22 +0100
committerKim Alvefur <zash@zash.se>2017-03-03 11:52:22 +0100
commitb133b78d47ff180110b0b29612d3cd257a9972c1 (patch)
tree85f43927206b44fd97ccc98872d483a4269c2f0f
parent8b9646fee679b47520503b7eaafff9539a3ea3f2 (diff)
parent140c6de0260c404abebb860705a81ed7398c7c52 (diff)
downloadprosody-b133b78d47ff180110b0b29612d3cd257a9972c1.tar.gz
prosody-b133b78d47ff180110b0b29612d3cd257a9972c1.zip
Merge 0.10->trunk
-rwxr-xr-xconfigure5
1 files changed, 5 insertions, 0 deletions
diff --git a/configure b/configure
index c416709d..1abd0a8d 100755
--- a/configure
+++ b/configure
@@ -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" ]