Merge 0.9->0.10

[prosody.git] / configure

diff --git a/configure b/configure
index 87fd870bf90e91fc1c3e5f0ac8e9806df56b461c..d669d3a8ebccc686a42376de76abcf785065cfab 100755 (executable)
--- 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"
@@ -17,6 +18,7 @@ CC=gcc
 CXX=g++
 LD=gcc
 RUNWITH=lua
+EXCERTS=yes
 
 CFLAGS="-fPIC -Wall"
 LDFLAGS="-shared"
@@ -35,6 +37,8 @@ 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.
@@ -64,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
 }
 
@@ -131,6 +136,9 @@ do
         LUA_INCDIR="/usr/local/include";
       fi
       ;;
+   --libdir=*)
+      LIBDIR="$value"
+      ;;
    --datadir=*)
        DATADIR="$value"
        DATADIR_SET=yes
@@ -177,6 +185,9 @@ do
    --runwith=*)
       RUNWITH="$value"
       ;;
+    --no-example-certs)
+      EXCERTS=
+      ;;
    *)
       echo "Error: Unknown flag: $1"
       exit 1
@@ -332,6 +343,7 @@ cat <<EOF > config.unix
 
 PREFIX=$PREFIX
 SYSCONFDIR=$SYSCONFDIR
+LIBDIR=$LIBDIR
 DATADIR=$DATADIR
 LUA_SUFFIX=$LUA_SUFFIX
 LUA_DIR=$LUA_DIR
@@ -348,6 +360,7 @@ CC=$CC
 CXX=$CXX
 LD=$LD
 RUNWITH=$RUNWITH
+EXCERTS=$EXCERTS
 
 EOF