projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
portmanager: Show a friendly error message when initializing SSL fails (thanks MattJ...
[prosody.git]
/
configure
diff --git
a/configure
b/configure
index adf081a69ae97c2b2016588f786b917d3b832f35..dd6af49c35f70777fab532bbe98ea3148a7bb63b 100755
(executable)
--- a/
configure
+++ b/
configure
@@
-20,6
+20,7
@@
LD=gcc
CFLAGS="-fPIC -Wall"
LDFLAGS="-shared"
CFLAGS="-fPIC -Wall"
LDFLAGS="-shared"
+IDN_LIBRARY=idn
# Help
show_help() {
# Help
show_help() {
@@
-111,7
+112,7
@@
do
CFLAGS="-Wall -fPIC"
LDFLAGS="-shared"
fi
CFLAGS="-Wall -fPIC"
LDFLAGS="-shared"
fi
- if [ "$OSTYPE" = "freebsd" ]
+ if [ "$OSTYPE" = "freebsd"
-o "$OSTYPE" = "openbsd"
]
then LUA_INCDIR="/usr/local/include/lua51"
LUA_INCDIR_SET=yes
CFLAGS="-Wall -fPIC -I/usr/local/include"
then LUA_INCDIR="/usr/local/include/lua51"
LUA_INCDIR_SET=yes
CFLAGS="-Wall -fPIC -I/usr/local/include"
@@
-121,6
+122,9
@@
do
LUA_DIR=/usr/local
LUA_DIR_SET=yes
fi
LUA_DIR=/usr/local
LUA_DIR_SET=yes
fi
+ if [ "$OSTYPE" = "openbsd" ]
+ then LUA_INCDIR="/usr/local/include";
+ fi
;;
--datadir=*)
DATADIR="$value"
;;
--datadir=*)
DATADIR="$value"
@@
-272,16
+276,11
@@
if [ "$IDN_LIBRARY" = "icu" ]
then
IDNA_LIBS="$ICU_FLAGS"
CFLAGS="$CFLAGS -DUSE_STRINGPREP_ICU"
then
IDNA_LIBS="$ICU_FLAGS"
CFLAGS="$CFLAGS -DUSE_STRINGPREP_ICU"
-else
- if [ "$IDN_LIBRARY" = "idn" ]
- then
- IDNA_LIBS="-l$IDN_LIB"
- else
- echo "Must use idn or icu as argument for --idn-library!"
- exit 1
- fi
fi
fi
-LDFLAGS="$LDFLAGS -llua"
+if [ "$IDN_LIBRARY" = "idn" ]
+then
+ IDNA_LIBS="-l$IDN_LIB"
+fi
echo -n "Checking Lua includes... "
lua_h="$LUA_INCDIR/lua.h"
echo -n "Checking Lua includes... "
lua_h="$LUA_INCDIR/lua.h"