mod_s2s: Make sure host variable is reachable

[prosody.git] / configure

diff --git a/configure b/configure
index adf081a69ae97c2b2016588f786b917d3b832f35..df62cc05b80a094c9281bac2fc40a0111bdf17f9 100755 (executable)
--- a/configure
+++ b/configure
@@ -16,10 +16,12 @@ OPENSSL_LIB=crypto
 CC=gcc
 CXX=g++
 LD=gcc
+RUNWITH=lua
 
 CFLAGS="-fPIC -Wall"
 LDFLAGS="-shared"
 
+IDN_LIBRARY=idn
 # Help
 
 show_help() {
@@ -95,6 +97,7 @@ 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;
@@ -109,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"
@@ -121,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"
@@ -165,6 +172,9 @@ do
    --linker=*)
       LD="$value"
       ;;
+   --runwith=*)
+      RUNWITH="$value"
+      ;;
    *)
       echo "Error: Unknown flag: $1"
       exit 1
@@ -272,16 +282,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"
@@ -340,6 +345,7 @@ LDFLAGS=$LDFLAGS
 CC=$CC
 CXX=$CXX
 LD=$LD
+RUNWITH=$RUNWITH
 
 EOF