X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=configure;h=8eb7b36747b53d67e7352634259b3bef67f13909;hb=0f7102aa6e20173403797437d10dbd9ba2b2e8e6;hp=9d071bc16147520bec79b865c368c5d34c494485;hpb=4c57f0f5238c4918bf208a437858536f6cd63315;p=prosody.git

diff --git a/configure b/configure
index 9d071bc1..8eb7b367 100755
--- a/configure
+++ b/configure
@@ -4,13 +4,17 @@
 
 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
+
+CFLAGS="-fPIC"
+LFLAGS="-shared"
 
 # Help
 
@@ -19,10 +23,14 @@ cat <<EOF
 Configure Prosody prior to building.
 
 --help                      This help.
+--ostype=OS                 Use one of the OS presets.
+                            May be one of: debian, macosx
 --prefix=DIR                Prefix where Prosody should be installed.
                             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.
@@ -35,7 +43,9 @@ Configure Prosody prior to building.
                             Default is $IDN_LIB
 --with-ssl=LIB              The name of the SSL to link with.
                             Default is $OPENSSL_LIB
---require-config              Will cause Prosody to refuse to run when
+--cflags=FLAGS              Flags to pass to the compiler
+                            Default is $CFLAGS
+--require-config            Will cause Prosody to refuse to run when
                             it fails to find a configuration file
 EOF
 }
@@ -60,6 +70,14 @@ do
       PREFIX="$value"
       PREFIX_SET=yes
       ;;
+   --ostype=*)
+      OSTYPE="$value"
+      OSTYPE_SET=yes
+      ;;
+   --data-dir=*)
+   	DATADIR="$value"
+   	DATADIR_SET=yes
+      ;;
    --require-config)
       REQUIRE_CONFIG=yes
       ;;
@@ -84,6 +102,9 @@ do
    --with-ssl=*)
       OPENSSL_LIB="$value"
       ;;      
+   --cflags=*)
+      CFLAGS="$value"
+      ;;      
    *)
       echo "Error: Unknown flag: $1"
       exit 1
@@ -92,6 +113,24 @@ do
    shift
 done
 
+if [ "$OSTYPE_SET" = "yes" ]
+then
+	if [ "$OSTYPE" = "debian" ]
+	then LUA_SUFFIX="5.1";
+	LUA_SUFFIX_SET=yes
+	LUA_INCDIR=/usr/include/lua5.1;
+	LUA_INCDIR_SET=yes
+	fi
+	if [ "$OSTYPE" = "macosx" ]
+	then LUA_INCDIR=/usr/local/include;
+	LUA_INCDIR_SET=yes	
+	LUA_LIBDIR=/usr/local/lib
+	LUA_LIBDIR_SET=yes
+	CFLAGS=""
+	LFLAGS="-bundle -undefined dynamic_lookup"
+	fi	
+fi
+
 if [ "$PREFIX_SET" = "yes" -a ! "$SYSCONFDIR_SET" = "yes" ]
 then
    if [ "$PREFIX" = "/usr" ]
@@ -100,6 +139,14 @@ then
    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 +268,7 @@ cat <<EOF > config.unix
 
 PREFIX=$PREFIX
 SYSCONFDIR=$SYSCONFDIR
+DATADIR=$DATADIR
 LUA_SUFFIX=$LUA_SUFFIX
 LUA_DIR=$LUA_DIR
 LUA_INCDIR=$LUA_INCDIR
@@ -229,6 +277,8 @@ LUA_BINDIR=$LUA_BINDIR
 REQUIRE_CONFIG=$REQUIRE_CONFIG
 IDN_LIB=$IDN_LIB
 OPENSSL_LIB=$OPENSSL_LIB
+CFLAGS=$CFLAGS
+LFLAGS=$LFLAGS
 
 EOF