prosody
c92102fe409b
configure

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

configure @ 7946:c92102fe409b

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 03 Mar 2017 11:52:22 +0100
parent 7945:1f4a0e0b7167
child 7964:1023f2add7fe
comparison
equal deleted inserted replaced
7944:36a9a4af1873 7946:c92102fe409b
336 then DATADIR=/var/lib/prosody 336 then DATADIR=/var/lib/prosody
337 else DATADIR=$PREFIX/var/lib/prosody 337 else DATADIR=$PREFIX/var/lib/prosody
338 fi 338 fi
339 fi 339 fi
340 340
341 if [ "$PREFIX_SET" = "yes" -a ! "$LIBDIR_SET" = "yes" ]
342 then
343 LIBDIR=$PREFIX/lib
344 fi
345
341 detect_lua_version() { 346 detect_lua_version() {
342 detected_lua=`$1 -e 'print(_VERSION:match(" (5%.[123])$"))' 2> /dev/null` 347 detected_lua=`$1 -e 'print(_VERSION:match(" (5%.[123])$"))' 2> /dev/null`
343 if [ "$detected_lua" != "nil" ] 348 if [ "$detected_lua" != "nil" ]
344 then 349 then
345 if [ "$LUA_VERSION_SET" != "yes" ] 350 if [ "$LUA_VERSION_SET" != "yes" ]