Mercurial > lxmppd-hg-xmllex / file diff

--- a/configure	Sun Nov 30 01:16:55 2008 +0000
+++ b/configure	Sun Nov 30 04:22:43 2008 +0000
@@ -4,13 +4,14 @@
 
 PREFIX=/usr/local
 SYSCONFDIR="$PREFIX/etc/prosody"
+DATADIR="$PREFIX/var/lib/prosody"
 LUA_SUFFIX=""
 LUA_DIR="/usr"
 LUA_BINDIR="/usr/bin"
 LUA_INCDIR="/usr/include"
 LUA_LIBDIR="/usr/lib"
 IDN_LIB=idn
-OPENSSL_LIB=ssl
+OPENSSL_LIB=crypto
 
 # Help
 
@@ -23,6 +24,8 @@
                             Default is $PREFIX
 --sysconfdir=DIR            Location where the config file should be installed.
                             Default is \$PREFIX/etc/prosody
+--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.
@@ -60,6 +63,10 @@
       PREFIX="$value"
       PREFIX_SET=yes
       ;;
+   --data-dir=*)
+   	DATADIR="$value"
+   	DATADIR_SET=yes
+      ;;
    --require-config)
       REQUIRE_CONFIG=yes
       ;;
@@ -100,6 +107,14 @@
    fi
 fi
 
+if [ "$PREFIX_SET" = "yes" -a ! "$DATADIR_SET" = "yes" ]
+then
+   if [ "$PREFIX" = "/usr" ]
+   then DATADIR=/var/lib/prosody
+   else DATADIR=$PREFIX/var/lib/prosody
+   fi
+fi
+
 find_program() {
    path="$PATH"
    item="`echo "$path" | sed 's/\([^:]*\):.*/\1/'`"
@@ -221,6 +236,7 @@
 
 PREFIX=$PREFIX
 SYSCONFDIR=$SYSCONFDIR
+DATADIR=$DATADIR
 LUA_SUFFIX=$LUA_SUFFIX
 LUA_DIR=$LUA_DIR
 LUA_INCDIR=$LUA_INCDIR