projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util.cache: Add head() and tail() methods (and tests)
[prosody.git]
/
configure
diff --git
a/configure
b/configure
index 040ff648a54a2e01190f042ad0c85e349e5d31e8..77aa132920646ff73328f30222c08dad19b7d50b 100755
(executable)
--- a/
configure
+++ b/
configure
@@
-4,6
+4,7
@@
PREFIX=/usr/local
SYSCONFDIR="$PREFIX/etc/prosody"
PREFIX=/usr/local
SYSCONFDIR="$PREFIX/etc/prosody"
+LIBDIR="$PREFIX/lib"
DATADIR="$PREFIX/var/lib/prosody"
LUA_SUFFIX=""
LUA_DIR="/usr"
DATADIR="$PREFIX/var/lib/prosody"
LUA_SUFFIX=""
LUA_DIR="/usr"
@@
-18,6
+19,8
@@
CXX=g++
LD=gcc
RUNWITH=lua
EXCERTS=yes
LD=gcc
RUNWITH=lua
EXCERTS=yes
+PRNG=
+PRNGLIBS=
CFLAGS="-fPIC -Wall"
LDFLAGS="-shared"
CFLAGS="-fPIC -Wall"
LDFLAGS="-shared"
@@
-31,11
+34,13
@@
Configure Prosody prior to building.
--help This help.
--ostype=OS Use one of the OS presets.
--help This help.
--ostype=OS Use one of the OS presets.
- May be one of: debian, macosx, linux, freebsd
+ May be one of: debian, macosx, linux, freebsd
, openbsd
--prefix=DIR Prefix where Prosody should be installed.
Default is $PREFIX
--sysconfdir=DIR Location where the config file should be installed.
Default is \$PREFIX/etc/prosody
--prefix=DIR Prefix where Prosody should be installed.
Default is $PREFIX
--sysconfdir=DIR Location where the config file should be installed.
Default is \$PREFIX/etc/prosody
+--libdir=DIR Location where the server files should be stored.
+ Default is \$PREFIX/lib
--datadir=DIR Location where the server data should be stored.
Default is \$PREFIX/var/lib/prosody
--lua-suffix=SUFFIX Versioning suffix to use in Lua filenames.
--datadir=DIR Location where the server data should be stored.
Default is \$PREFIX/var/lib/prosody
--lua-suffix=SUFFIX Versioning suffix to use in Lua filenames.
@@
-55,6
+60,11
@@
Configure Prosody prior to building.
icu: use ICU from IBM
--with-ssl=LIB The name of the SSL to link with.
Default is $OPENSSL_LIB
icu: use ICU from IBM
--with-ssl=LIB The name of the SSL to link with.
Default is $OPENSSL_LIB
+--with-random=METHOD CSPRNG backend to use. One of
+ getrandom: Linux kernel
+ arc4random: OpenBSD kernel
+ openssl: OpenSSL RAND method
+ Default is to use /dev/urandom
--cflags=FLAGS Flags to pass to the compiler
Default is $CFLAGS
--ldflags=FLAGS Flags to pass to the linker
--cflags=FLAGS Flags to pass to the compiler
Default is $CFLAGS
--ldflags=FLAGS Flags to pass to the linker
@@
-109,6
+119,7
@@
do
LUA_INCDIR_SET=yes
LUA_LIBDIR=/usr/local/lib
LUA_LIBDIR_SET=yes
LUA_INCDIR_SET=yes
LUA_LIBDIR=/usr/local/lib
LUA_LIBDIR_SET=yes
+ CFLAGS="$CFLAGS -mmacosx-version-min=10.3"
LDFLAGS="-bundle -undefined dynamic_lookup"
fi
if [ "$OSTYPE" = "linux" ]; then
LDFLAGS="-bundle -undefined dynamic_lookup"
fi
if [ "$OSTYPE" = "linux" ]; then
@@
-128,11
+139,17
@@
do
LUA_SUFFIX_SET=yes
LUA_DIR=/usr/local
LUA_DIR_SET=yes
LUA_SUFFIX_SET=yes
LUA_DIR=/usr/local
LUA_DIR_SET=yes
+ CC=cc
+ LD=ld
fi
if [ "$OSTYPE" = "openbsd" ]; then
LUA_INCDIR="/usr/local/include";
fi
;;
fi
if [ "$OSTYPE" = "openbsd" ]; then
LUA_INCDIR="/usr/local/include";
fi
;;
+ --libdir=*)
+ LIBDIR="$value"
+ LIBDIR_SET=yes
+ ;;
--datadir=*)
DATADIR="$value"
DATADIR_SET=yes
--datadir=*)
DATADIR="$value"
DATADIR_SET=yes
@@
-164,6
+181,16
@@
do
--with-ssl=*)
OPENSSL_LIB="$value"
;;
--with-ssl=*)
OPENSSL_LIB="$value"
;;
+ --with-random=getrandom)
+ PRNG=GETRANDOM
+ ;;
+ --with-random=openssl)
+ PRNG=OPENSSL
+ PRNGLIBS=-lcrypto
+ ;;
+ --with-random=arc4random)
+ PRNG=ARC4RANDOM
+ ;;
--cflags=*)
CFLAGS="$value"
;;
--cflags=*)
CFLAGS="$value"
;;
@@
-206,6
+233,11
@@
then
fi
fi
fi
fi
+if [ "$PREFIX_SET" = "yes" -a ! "$LIBDIR_SET" = "yes" ]
+then
+ LIBDIR=$PREFIX/lib
+fi
+
find_program() {
path="$PATH"
item="`echo "$path" | sed 's/\([^:]*\):.*/\1/'`"
find_program() {
path="$PATH"
item="`echo "$path" | sed 's/\([^:]*\):.*/\1/'`"
@@
-213,7
+245,7
@@
find_program() {
found="no"
while [ "$item" ]
do
found="no"
while [ "$item" ]
do
- if [ -
e
"$item/$1" ]
+ if [ -
f
"$item/$1" ]
then
found="yes"
break
then
found="yes"
break
@@
-236,7
+268,7
@@
then
LUA_SUFFIX="$suffix"
if [ "$LUA_DIR_SET" = "yes" ]
then
LUA_SUFFIX="$suffix"
if [ "$LUA_DIR_SET" = "yes" ]
then
- if [ -
e
"$LUA_DIR/bin/lua$suffix" ]
+ if [ -
f
"$LUA_DIR/bin/lua$suffix" ]
then
find_lua="$LUA_DIR"
fi
then
find_lua="$LUA_DIR"
fi
@@
-251,7
+283,7
@@
then
done
fi
done
fi
-if
! [ "$LUA_DIR_SET"
= "yes" ]
+if
[ "$LUA_DIR_SET" !
= "yes" ]
then
echo -n "Looking for Lua... "
if [ ! "$find_lua" ]
then
echo -n "Looking for Lua... "
if [ ! "$find_lua" ]
@@
-270,12
+302,12
@@
then
fi
fi
fi
fi
-if
! [ "$LUA_INCDIR_SET"
= "yes" ]
+if
[ "$LUA_INCDIR_SET" !
= "yes" ]
then
LUA_INCDIR="$LUA_DIR/include"
fi
then
LUA_INCDIR="$LUA_DIR/include"
fi
-if
! [ "$LUA_LIBDIR_SET"
= "yes" ]
+if
[ "$LUA_LIBDIR_SET" !
= "yes" ]
then
LUA_LIBDIR="$LUA_DIR/lib"
fi
then
LUA_LIBDIR="$LUA_DIR/lib"
fi
@@
-295,9
+327,11
@@
then
IDNA_LIBS="-l$IDN_LIB"
fi
IDNA_LIBS="-l$IDN_LIB"
fi
+OPENSSL_LIBS="-l$OPENSSL_LIB"
+
echo -n "Checking Lua includes... "
lua_h="$LUA_INCDIR/lua.h"
echo -n "Checking Lua includes... "
lua_h="$LUA_INCDIR/lua.h"
-if [ -
e
"$lua_h" ]
+if [ -
f
"$lua_h" ]
then
echo "lua.h found in $lua_h"
else
then
echo "lua.h found in $lua_h"
else
@@
-337,6
+371,7
@@
cat <<EOF > config.unix
PREFIX=$PREFIX
SYSCONFDIR=$SYSCONFDIR
PREFIX=$PREFIX
SYSCONFDIR=$SYSCONFDIR
+LIBDIR=$LIBDIR
DATADIR=$DATADIR
LUA_SUFFIX=$LUA_SUFFIX
LUA_DIR=$LUA_DIR
DATADIR=$DATADIR
LUA_SUFFIX=$LUA_SUFFIX
LUA_DIR=$LUA_DIR
@@
-346,7
+381,7
@@
LUA_BINDIR=$LUA_BINDIR
REQUIRE_CONFIG=$REQUIRE_CONFIG
IDN_LIB=$IDN_LIB
IDNA_LIBS=$IDNA_LIBS
REQUIRE_CONFIG=$REQUIRE_CONFIG
IDN_LIB=$IDN_LIB
IDNA_LIBS=$IDNA_LIBS
-OPENSSL_LIB
=$OPENSSL_LIB
+OPENSSL_LIB
S=$OPENSSL_LIBS
CFLAGS=$CFLAGS
LDFLAGS=$LDFLAGS
CC=$CC
CFLAGS=$CFLAGS
LDFLAGS=$LDFLAGS
CC=$CC
@@
-354,6
+389,9
@@
CXX=$CXX
LD=$LD
RUNWITH=$RUNWITH
EXCERTS=$EXCERTS
LD=$LD
RUNWITH=$RUNWITH
EXCERTS=$EXCERTS
+RANDOM=$PRNG
+RANDOM_LIBS=$PRNGLIBS
+
EOF
EOF