Comparison

configure @ 6636:441f8cb0deec

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 27 Apr 2015 00:03:14 +0200
parent 6635:ef88a6072228
child 6810:533fd843d91f
comparison
equal deleted inserted replaced
6633:832987170da8 6636:441f8cb0deec
30 cat <<EOF 30 cat <<EOF
31 Configure Prosody prior to building. 31 Configure Prosody prior to building.
32 32
33 --help This help. 33 --help This help.
34 --ostype=OS Use one of the OS presets. 34 --ostype=OS Use one of the OS presets.
35 May be one of: debian, macosx, linux, freebsd 35 May be one of: debian, macosx, linux, freebsd, openbsd
36 --prefix=DIR Prefix where Prosody should be installed. 36 --prefix=DIR Prefix where Prosody should be installed.
37 Default is $PREFIX 37 Default is $PREFIX
38 --sysconfdir=DIR Location where the config file should be installed. 38 --sysconfdir=DIR Location where the config file should be installed.
39 Default is \$PREFIX/etc/prosody 39 Default is \$PREFIX/etc/prosody
40 --libdir=DIR Location where the server files should be stored. 40 --libdir=DIR Location where the server files should be stored.
129 LDFLAGS="-I/usr/local/include -L/usr/local/lib -shared" 129 LDFLAGS="-I/usr/local/include -L/usr/local/lib -shared"
130 LUA_SUFFIX="-5.1" 130 LUA_SUFFIX="-5.1"
131 LUA_SUFFIX_SET=yes 131 LUA_SUFFIX_SET=yes
132 LUA_DIR=/usr/local 132 LUA_DIR=/usr/local
133 LUA_DIR_SET=yes 133 LUA_DIR_SET=yes
134 CC=cc
135 LD=ld
134 fi 136 fi
135 if [ "$OSTYPE" = "openbsd" ]; then 137 if [ "$OSTYPE" = "openbsd" ]; then
136 LUA_INCDIR="/usr/local/include"; 138 LUA_INCDIR="/usr/local/include";
137 fi 139 fi
138 ;; 140 ;;