projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hostmanager: Don't set host.disallow_s2s when anonymous_login=true (mod_auth_anonymou...
[prosody.git]
/
configure
diff --git
a/configure
b/configure
index f13695382369f8ef7222c72b2b5d4edc69bfe888..af046223933d8f18b477bc9b5b5d3b8b8befedc2 100755
(executable)
--- a/
configure
+++ b/
configure
@@
-11,13
+11,16
@@
LUA_BINDIR="/usr/bin"
LUA_INCDIR="/usr/include"
LUA_LIBDIR="/usr/lib"
IDN_LIB=idn
LUA_INCDIR="/usr/include"
LUA_LIBDIR="/usr/lib"
IDN_LIB=idn
+ICU_FLAGS="-licui18n -licudata -licuuc"
OPENSSL_LIB=crypto
CC=gcc
OPENSSL_LIB=crypto
CC=gcc
+CXX=g++
LD=gcc
CFLAGS="-fPIC -Wall"
LDFLAGS="-shared"
LD=gcc
CFLAGS="-fPIC -Wall"
LDFLAGS="-shared"
+IDN_LIBRARY=idn
# Help
show_help() {
# Help
show_help() {
@@
-43,6
+46,9
@@
Configure Prosody prior to building.
Default is \$LUA_DIR/lib
--with-idn=LIB The name of the IDN library to link with.
Default is $IDN_LIB
Default is \$LUA_DIR/lib
--with-idn=LIB The name of the IDN library to link with.
Default is $IDN_LIB
+--idn-library=(idn|icu) Select library to use for IDNA functionality.
+ idn: use GNU libidn (default)
+ icu: use ICU from IBM
--with-ssl=LIB The name of the SSL to link with.
Default is $OPENSSL_LIB
--cflags=FLAGS Flags to pass to the compiler
--with-ssl=LIB The name of the SSL to link with.
Default is $OPENSSL_LIB
--cflags=FLAGS Flags to pass to the compiler
@@
-96,7
+102,6
@@
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="-Wall"
LDFLAGS="-bundle -undefined dynamic_lookup"
fi
if [ "$OSTYPE" = "linux" ]
LDFLAGS="-bundle -undefined dynamic_lookup"
fi
if [ "$OSTYPE" = "linux" ]
@@
-143,6
+148,9
@@
do
--with-idn=*)
IDN_LIB="$value"
;;
--with-idn=*)
IDN_LIB="$value"
;;
+ --idn-library=*)
+ IDN_LIBRARY="$value"
+ ;;
--with-ssl=*)
OPENSSL_LIB="$value"
;;
--with-ssl=*)
OPENSSL_LIB="$value"
;;
@@
-261,6
+269,16
@@
then
LUA_BINDIR="$LUA_DIR/bin"
fi
LUA_BINDIR="$LUA_DIR/bin"
fi
+if [ "$IDN_LIBRARY" = "icu" ]
+then
+ IDNA_LIBS="$ICU_FLAGS"
+ CFLAGS="$CFLAGS -DUSE_STRINGPREP_ICU"
+fi
+if [ "$IDN_LIBRARY" = "idn" ]
+then
+ IDNA_LIBS="-l$IDN_LIB"
+fi
+
echo -n "Checking Lua includes... "
lua_h="$LUA_INCDIR/lua.h"
if [ -e "$lua_h" ]
echo -n "Checking Lua includes... "
lua_h="$LUA_INCDIR/lua.h"
if [ -e "$lua_h" ]
@@
-311,10
+329,12
@@
LUA_LIBDIR=$LUA_LIBDIR
LUA_BINDIR=$LUA_BINDIR
REQUIRE_CONFIG=$REQUIRE_CONFIG
IDN_LIB=$IDN_LIB
LUA_BINDIR=$LUA_BINDIR
REQUIRE_CONFIG=$REQUIRE_CONFIG
IDN_LIB=$IDN_LIB
+IDNA_LIBS=$IDNA_LIBS
OPENSSL_LIB=$OPENSSL_LIB
CFLAGS=$CFLAGS
LDFLAGS=$LDFLAGS
CC=$CC
OPENSSL_LIB=$OPENSSL_LIB
CFLAGS=$CFLAGS
LDFLAGS=$LDFLAGS
CC=$CC
+CXX=$CXX
LD=$LD
EOF
LD=$LD
EOF