X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=configure;h=ecf77a866b5af14f52f6b7e93868c02a68447eb9;hb=ea9c53231bbd3b3b280389b63380944f5b0fadb8;hp=00ed2658b2f7cffd7db370d34f79da55ef610728;hpb=f85561158be7ab0e5a05aab1160be16056a71d50;p=prosody.git

diff --git a/configure b/configure
index 00ed2658..ecf77a86 100755
--- a/configure
+++ b/configure
@@ -16,6 +16,7 @@ OPENSSL_LIB=crypto
 CC=gcc
 CXX=g++
 LD=gcc
+RUNWITH=lua
 
 CFLAGS="-fPIC -Wall"
 LDFLAGS="-shared"
@@ -40,15 +41,17 @@ Configure Prosody prior to building.
                             Default is "$LUA_SUFFIX" (lua$LUA_SUFFIX...)
 --with-lua=PREFIX           Use Lua from given prefix.
                             Default is $LUA_DIR
+--runwith=BINARY            What Lua binary to set as runtime environment.
+                            Default is $RUNWITH
 --with-lua-include=DIR      You can also specify Lua's includes dir.
                             Default is \$LUA_DIR/include
 --with-lua-lib=DIR          You can also specify Lua's libraries dir.
                             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
+--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
@@ -59,6 +62,8 @@ Configure Prosody prior to building.
                             Default is $CC
 --linker=CC                 The linker to use when building modules.
                             Default is $LD
+--require-config            Will cause Prosody to refuse to run when
+                            it fails to find a configuration file
 EOF
 }
 
@@ -92,8 +97,10 @@ do
       if [ "$OSTYPE" = "debian" ]
       then LUA_SUFFIX="5.1";
 	LUA_SUFFIX_SET=yes
+	RUNWITH="lua5.1"
 	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;
@@ -108,9 +115,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"
@@ -120,11 +128,17 @@ do
         LUA_DIR=/usr/local
         LUA_DIR_SET=yes
         fi
+        if [ "$OSTYPE" = "openbsd" ]
+        then LUA_INCDIR="/usr/local/include";
+        fi
       ;;
    --datadir=*)
    	DATADIR="$value"
    	DATADIR_SET=yes
       ;;
+   --require-config)
+      REQUIRE_CONFIG=yes
+      ;;
    --lua-suffix=*)
       LUA_SUFFIX="$value"
       LUA_SUFFIX_SET=yes
@@ -161,6 +175,9 @@ do
    --linker=*)
       LD="$value"
       ;;
+   --runwith=*)
+      RUNWITH="$value"
+      ;;
    *)
       echo "Error: Unknown flag: $1"
       exit 1
@@ -322,6 +339,7 @@ LUA_DIR=$LUA_DIR
 LUA_INCDIR=$LUA_INCDIR
 LUA_LIBDIR=$LUA_LIBDIR
 LUA_BINDIR=$LUA_BINDIR
+REQUIRE_CONFIG=$REQUIRE_CONFIG
 IDN_LIB=$IDN_LIB
 IDNA_LIBS=$IDNA_LIBS
 OPENSSL_LIB=$OPENSSL_LIB
@@ -330,6 +348,7 @@ LDFLAGS=$LDFLAGS
 CC=$CC
 CXX=$CXX
 LD=$LD
+RUNWITH=$RUNWITH
 
 EOF