Merge 0.9->0.10

[prosody.git] / configure

diff --git a/configure b/configure
index 040ff648a54a2e01190f042ad0c85e349e5d31e8..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"
@@ -36,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.
@@ -133,6 +136,9 @@ do
         LUA_INCDIR="/usr/local/include";
       fi
       ;;
+   --libdir=*)
+      LIBDIR="$value"
+      ;;
    --datadir=*)
        DATADIR="$value"
        DATADIR_SET=yes
@@ -337,6 +343,7 @@ cat <<EOF > config.unix
 
 PREFIX=$PREFIX
 SYSCONFDIR=$SYSCONFDIR
+LIBDIR=$LIBDIR
 DATADIR=$DATADIR
 LUA_SUFFIX=$LUA_SUFFIX
 LUA_DIR=$LUA_DIR