Comparison

configure @ 6576:b7796a46aec2

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Sat, 21 Feb 2015 10:34:56 +0100
parent 5935:a367bae38385
parent 6574:cd0088c73daf
child 6580:74946f050209
comparison
equal deleted inserted replaced
6570:70e65ac65219 6576:b7796a46aec2
2 2
3 # Defaults 3 # Defaults
4 4
5 PREFIX=/usr/local 5 PREFIX=/usr/local
6 SYSCONFDIR="$PREFIX/etc/prosody" 6 SYSCONFDIR="$PREFIX/etc/prosody"
7 LIBDIR="$PREFIX/lib"
7 DATADIR="$PREFIX/var/lib/prosody" 8 DATADIR="$PREFIX/var/lib/prosody"
8 LUA_SUFFIX="" 9 LUA_SUFFIX=""
9 LUA_DIR="/usr" 10 LUA_DIR="/usr"
10 LUA_BINDIR="/usr/bin" 11 LUA_BINDIR="/usr/bin"
11 LUA_INCDIR="/usr/include" 12 LUA_INCDIR="/usr/include"
34 May be one of: debian, macosx, linux, freebsd 35 May be one of: debian, macosx, linux, freebsd
35 --prefix=DIR Prefix where Prosody should be installed. 36 --prefix=DIR Prefix where Prosody should be installed.
36 Default is $PREFIX 37 Default is $PREFIX
37 --sysconfdir=DIR Location where the config file should be installed. 38 --sysconfdir=DIR Location where the config file should be installed.
38 Default is \$PREFIX/etc/prosody 39 Default is \$PREFIX/etc/prosody
40 --libdir=DIR Location where the server files should be stored.
41 Default is \$PREFIX/lib
39 --datadir=DIR Location where the server data should be stored. 42 --datadir=DIR Location where the server data should be stored.
40 Default is \$PREFIX/var/lib/prosody 43 Default is \$PREFIX/var/lib/prosody
41 --lua-suffix=SUFFIX Versioning suffix to use in Lua filenames. 44 --lua-suffix=SUFFIX Versioning suffix to use in Lua filenames.
42 Default is "$LUA_SUFFIX" (lua$LUA_SUFFIX...) 45 Default is "$LUA_SUFFIX" (lua$LUA_SUFFIX...)
43 --with-lua=PREFIX Use Lua from given prefix. 46 --with-lua=PREFIX Use Lua from given prefix.
131 fi 134 fi
132 if [ "$OSTYPE" = "openbsd" ]; then 135 if [ "$OSTYPE" = "openbsd" ]; then
133 LUA_INCDIR="/usr/local/include"; 136 LUA_INCDIR="/usr/local/include";
134 fi 137 fi
135 ;; 138 ;;
139 --libdir=*)
140 LIBDIR="$value"
141 ;;
136 --datadir=*) 142 --datadir=*)
137 DATADIR="$value" 143 DATADIR="$value"
138 DATADIR_SET=yes 144 DATADIR_SET=yes
139 ;; 145 ;;
140 --require-config) 146 --require-config)
335 # This file was automatically generated by the configure script. 341 # This file was automatically generated by the configure script.
336 # Run "./configure --help" for details. 342 # Run "./configure --help" for details.
337 343
338 PREFIX=$PREFIX 344 PREFIX=$PREFIX
339 SYSCONFDIR=$SYSCONFDIR 345 SYSCONFDIR=$SYSCONFDIR
346 LIBDIR=$LIBDIR
340 DATADIR=$DATADIR 347 DATADIR=$DATADIR
341 LUA_SUFFIX=$LUA_SUFFIX 348 LUA_SUFFIX=$LUA_SUFFIX
342 LUA_DIR=$LUA_DIR 349 LUA_DIR=$LUA_DIR
343 LUA_INCDIR=$LUA_INCDIR 350 LUA_INCDIR=$LUA_INCDIR
344 LUA_LIBDIR=$LUA_LIBDIR 351 LUA_LIBDIR=$LUA_LIBDIR