Comparison

configure @ 6581:f2a7ad099e01

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 24 Feb 2015 15:22:34 +0000
parent 6580:74946f050209
child 6634:3e226e387a67
comparison
equal deleted inserted replaced
6573:afd638e9c6d0 6581:f2a7ad099e01
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 LIBDIR_SET=yes
142 ;;
136 --datadir=*) 143 --datadir=*)
137 DATADIR="$value" 144 DATADIR="$value"
138 DATADIR_SET=yes 145 DATADIR_SET=yes
139 ;; 146 ;;
140 --require-config) 147 --require-config)
202 then 209 then
203 if [ "$PREFIX" = "/usr" ] 210 if [ "$PREFIX" = "/usr" ]
204 then DATADIR=/var/lib/prosody 211 then DATADIR=/var/lib/prosody
205 else DATADIR=$PREFIX/var/lib/prosody 212 else DATADIR=$PREFIX/var/lib/prosody
206 fi 213 fi
214 fi
215
216 if [ "$PREFIX_SET" = "yes" -a ! "$LIBDIR_SET" = "yes" ]
217 then
218 LIBDIR=$PREFIX/lib
207 fi 219 fi
208 220
209 find_program() { 221 find_program() {
210 path="$PATH" 222 path="$PATH"
211 item="`echo "$path" | sed 's/\([^:]*\):.*/\1/'`" 223 item="`echo "$path" | sed 's/\([^:]*\):.*/\1/'`"
335 # This file was automatically generated by the configure script. 347 # This file was automatically generated by the configure script.
336 # Run "./configure --help" for details. 348 # Run "./configure --help" for details.
337 349
338 PREFIX=$PREFIX 350 PREFIX=$PREFIX
339 SYSCONFDIR=$SYSCONFDIR 351 SYSCONFDIR=$SYSCONFDIR
352 LIBDIR=$LIBDIR
340 DATADIR=$DATADIR 353 DATADIR=$DATADIR
341 LUA_SUFFIX=$LUA_SUFFIX 354 LUA_SUFFIX=$LUA_SUFFIX
342 LUA_DIR=$LUA_DIR 355 LUA_DIR=$LUA_DIR
343 LUA_INCDIR=$LUA_INCDIR 356 LUA_INCDIR=$LUA_INCDIR
344 LUA_LIBDIR=$LUA_LIBDIR 357 LUA_LIBDIR=$LUA_LIBDIR