X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=configure;h=822b046e154a46d8fdee2c2b1dc7e502af21fe0a;hb=a68136f591f00c08234bda7a9c53a369863ea8f3;hp=f13695382369f8ef7222c72b2b5d4edc69bfe888;hpb=7beeddf1624373bfb3d43beffc262c62d52a6474;p=prosody.git

diff --git a/configure b/configure
index f1369538..822b046e 100755
--- a/configure
+++ b/configure
@@ -11,13 +11,18 @@ 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
+EXCERTS=yes
 
 CFLAGS="-fPIC -Wall"
 LDFLAGS="-shared"
 
+IDN_LIBRARY=idn
 # Help
 
 show_help() {
@@ -37,12 +42,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
 --with-ssl=LIB              The name of the SSL to link with.
                             Default is $OPENSSL_LIB
 --cflags=FLAGS              Flags to pass to the compiler
@@ -55,6 +65,7 @@ Configure Prosody prior to building.
                             Default is $LD
 --require-config            Will cause Prosody to refuse to run when
                             it fails to find a configuration file
+--no-example-certs          Disables generation of example certificates.
 EOF
 }
 
@@ -88,15 +99,16 @@ 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;
 	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 +117,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 +130,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 +159,9 @@ do
    --with-idn=*)
       IDN_LIB="$value"
       ;;
+	--idn-library=*)
+		IDN_LIBRARY="$value"
+		;;
    --with-ssl=*)
       OPENSSL_LIB="$value"
       ;;
@@ -158,6 +177,12 @@ do
    --linker=*)
       LD="$value"
       ;;
+   --runwith=*)
+      RUNWITH="$value"
+      ;;
+    --no-example-certs)
+      EXCERTS=
+      ;;
    *)
       echo "Error: Unknown flag: $1"
       exit 1
@@ -261,6 +286,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 +346,15 @@ 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
+EXCERTS=$EXCERTS
 
 EOF