net.server: Fix when no network_settings set and using libevent

[prosody.git] / configure

diff --git a/configure b/configure
index f13695382369f8ef7222c72b2b5d4edc69bfe888..df62cc05b80a094c9281bac2fc40a0111bdf17f9 100755 (executable)
--- a/configure
+++ b/configure
@@ -11,13 +11,17 @@ LUA_BINDIR="/usr/bin"
 LUA_INCDIR="/usr/include"
 LUA_LIBDIR="/usr/lib"
 IDN_LIB=idn
+ICU_FLAGS="-licui18n -licudata -licuuc"
 OPENSSL_LIB=crypto
 CC=gcc
+CXX=g++
 LD=gcc
+RUNWITH=lua
 
 CFLAGS="-fPIC -Wall"
 LDFLAGS="-shared"
 
+IDN_LIBRARY=idn
 # Help
 
 show_help() {
@@ -43,6 +47,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
+--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
@@ -90,13 +97,13 @@ do
        LUA_SUFFIX_SET=yes
        LUA_INCDIR=/usr/include/lua5.1;
        LUA_INCDIR_SET=yes
+       CFLAGS="$CFLAGS -D_GNU_SOURCE"
        fi
        if [ "$OSTYPE" = "macosx" ]
        then LUA_INCDIR=/usr/local/include;
        LUA_INCDIR_SET=yes
        LUA_LIBDIR=/usr/local/lib
        LUA_LIBDIR_SET=yes
-       CFLAGS="-Wall"
        LDFLAGS="-bundle -undefined dynamic_lookup"
        fi
         if [ "$OSTYPE" = "linux" ]
@@ -105,9 +112,10 @@ do
         LUA_LIBDIR=/usr/local/lib
         LUA_LIBDIR_SET=yes
         CFLAGS="-Wall -fPIC"
+        CFLAGS="$CFLAGS -D_GNU_SOURCE"
         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"
@@ -117,6 +125,9 @@ do
         LUA_DIR=/usr/local
         LUA_DIR_SET=yes
         fi
+        if [ "$OSTYPE" = "openbsd" ]
+        then LUA_INCDIR="/usr/local/include";
+        fi
       ;;
    --datadir=*)
        DATADIR="$value"
@@ -143,6 +154,9 @@ do
    --with-idn=*)
       IDN_LIB="$value"
       ;;
+       --idn-library=*)
+               IDN_LIBRARY="$value"
+               ;;
    --with-ssl=*)
       OPENSSL_LIB="$value"
       ;;
@@ -158,6 +172,9 @@ do
    --linker=*)
       LD="$value"
       ;;
+   --runwith=*)
+      RUNWITH="$value"
+      ;;
    *)
       echo "Error: Unknown flag: $1"
       exit 1
@@ -261,6 +278,16 @@ then
    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" ]
@@ -311,11 +338,14 @@ LUA_LIBDIR=$LUA_LIBDIR
 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
+CXX=$CXX
 LD=$LD
+RUNWITH=$RUNWITH
 
 EOF