X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=configure;h=199f5fcf8c0a9b45b24de6b6c264b73f2ba509e6;hb=3ad22ad73473556522703e3e9ad1dea7b938e7f1;hp=adf081a69ae97c2b2016588f786b917d3b832f35;hpb=7ecaafdcced6de79169dd656b24c656beb873c58;p=prosody.git

diff --git a/configure b/configure
index adf081a6..199f5fcf 100755
--- a/configure
+++ b/configure
@@ -4,6 +4,7 @@
 
 PREFIX=/usr/local
 SYSCONFDIR="$PREFIX/etc/prosody"
+LIBDIR="$PREFIX/lib"
 DATADIR="$PREFIX/var/lib/prosody"
 LUA_SUFFIX=""
 LUA_DIR="/usr"
@@ -16,10 +17,13 @@ OPENSSL_LIB=crypto
 CC=gcc
 CXX=g++
 LD=gcc
+RUNWITH=lua
+EXCERTS=yes
 
 CFLAGS="-fPIC -Wall"
 LDFLAGS="-shared"
 
+IDN_LIBRARY=idn
 # Help
 
 show_help() {
@@ -33,21 +37,25 @@ Configure Prosody prior to building.
                             Default is $PREFIX
 --sysconfdir=DIR            Location where the config file should be installed.
                             Default is \$PREFIX/etc/prosody
+--libdir=DIR                Location where the server files should be stored.
+                            Default is \$PREFIX/lib
 --datadir=DIR               Location where the server data should be stored.
                             Default is \$PREFIX/var/lib/prosody
 --lua-suffix=SUFFIX         Versioning suffix to use in Lua filenames.
                             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
@@ -60,6 +68,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
 }
 
@@ -93,8 +102,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;
@@ -109,9 +120,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 +133,13 @@ do
         LUA_DIR=/usr/local
         LUA_DIR_SET=yes
         fi
+        if [ "$OSTYPE" = "openbsd" ]
+        then LUA_INCDIR="/usr/local/include";
+        fi
+      ;;
+   --libdir=*)
+      LIBDIR="$value"
+      LIBDIR_SET=yes
       ;;
    --datadir=*)
    	DATADIR="$value"
@@ -165,6 +184,12 @@ do
    --linker=*)
       LD="$value"
       ;;
+   --runwith=*)
+      RUNWITH="$value"
+      ;;
+    --no-example-certs)
+      EXCERTS=
+      ;;
    *)
       echo "Error: Unknown flag: $1"
       exit 1
@@ -189,6 +214,11 @@ then
    fi
 fi
 
+if [ "$PREFIX_SET" = "yes" -a ! "$LIBDIR_SET" = "yes" ]
+then
+   LIBDIR=$PREFIX/lib
+fi
+
 find_program() {
    path="$PATH"
    item="`echo "$path" | sed 's/\([^:]*\):.*/\1/'`"
@@ -272,16 +302,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"
@@ -325,6 +350,7 @@ cat <<EOF > config.unix
 
 PREFIX=$PREFIX
 SYSCONFDIR=$SYSCONFDIR
+LIBDIR=$LIBDIR
 DATADIR=$DATADIR
 LUA_SUFFIX=$LUA_SUFFIX
 LUA_DIR=$LUA_DIR
@@ -340,6 +366,8 @@ LDFLAGS=$LDFLAGS
 CC=$CC
 CXX=$CXX
 LD=$LD
+RUNWITH=$RUNWITH
+EXCERTS=$EXCERTS
 
 EOF