X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=configure;h=dd6af49c35f70777fab532bbe98ea3148a7bb63b;hb=de253ecbd45a583021d25fb87fb88a96ba1d04c1;hp=adf081a69ae97c2b2016588f786b917d3b832f35;hpb=7ecaafdcced6de79169dd656b24c656beb873c58;p=prosody.git diff --git a/configure b/configure index adf081a6..dd6af49c 100755 --- a/configure +++ b/configure @@ -20,6 +20,7 @@ LD=gcc CFLAGS="-fPIC -Wall" LDFLAGS="-shared" +IDN_LIBRARY=idn # Help show_help() { @@ -111,7 +112,7 @@ do 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" @@ -121,6 +122,9 @@ do LUA_DIR=/usr/local LUA_DIR_SET=yes fi + if [ "$OSTYPE" = "openbsd" ] + then LUA_INCDIR="/usr/local/include"; + fi ;; --datadir=*) DATADIR="$value" @@ -272,16 +276,11 @@ if [ "$IDN_LIBRARY" = "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 -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"