aboutsummaryrefslogtreecommitdiffstats
path: root/configure
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
commit2ca03f1a40ea0854e0dda798b82e31c558eed578 (patch)
tree85f43927206b44fd97ccc98872d483a4269c2f0f /configure
parent8407f360939fe103a991641b0bf3b85e87d660b9 (diff)
parentc284110cb40cb2347f82e974f76eb6bc6927e946 (diff)
downloadprosody-2ca03f1a40ea0854e0dda798b82e31c558eed578.tar.gz
prosody-2ca03f1a40ea0854e0dda798b82e31c558eed578.zip
Merge 0.10->trunk
Diffstat (limited to 'configure')
-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" ]