X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=configure;h=bd8eb48c12b24b4268b30a5f867d31b816b7f693;hb=faabef234e99d90b0197c50aa2fa5b9c812779cb;hp=dda98cd7b399ba04be5cf33a349009bb2d2abcdf;hpb=a5ca3fd7067edda6dde3835e8e289a0c6e926107;p=prosody.git

diff --git a/configure b/configure
index dda98cd7..bd8eb48c 100755
--- a/configure
+++ b/configure
@@ -12,6 +12,11 @@ LUA_INCDIR="/usr/include"
 LUA_LIBDIR="/usr/lib"
 IDN_LIB=idn
 OPENSSL_LIB=crypto
+CC=gcc
+LD=gcc
+
+CFLAGS="-fPIC -Wall"
+LFLAGS="-shared"
 
 # Help
 
@@ -20,6 +25,8 @@ 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.
@@ -38,7 +45,15 @@ 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
+--lflags=FLAGS              Flags to pass to the linker
+                            Default is $LFLAGS
+--c-compiler=CC             The C compiler to use when building modules.
+                            Default is $CC
+--linker=CC                 The linker to use when building modules.
+                            Default is $LD
+--require-config            Will cause Prosody to refuse to run when
                             it fails to find a configuration file
 EOF
 }
@@ -63,7 +78,15 @@ do
       PREFIX="$value"
       PREFIX_SET=yes
       ;;
-   --data-dir=*)
+   --sysconfdir=*)
+      SYSCONFDIR="$value"
+      SYSCONFDIR_SET=yes
+      ;;
+   --ostype=*)
+      OSTYPE="$value"
+      OSTYPE_SET=yes
+      ;;
+   --datadir=*)
    	DATADIR="$value"
    	DATADIR_SET=yes
       ;;
@@ -91,6 +114,18 @@ do
    --with-ssl=*)
       OPENSSL_LIB="$value"
       ;;      
+   --cflags=*)
+      CFLAGS="$value"
+      ;;      
+   --lflags=*)
+      LFLAGS="$value"
+      ;;      
+   --c-compiler=*)
+      CC="$value"
+      ;;      
+   --linker=*)
+      LD="$value"
+      ;;      
    *)
       echo "Error: Unknown flag: $1"
       exit 1
@@ -99,6 +134,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="-Wall"
+	LFLAGS="-bundle -undefined dynamic_lookup"
+	fi	
+fi
+
 if [ "$PREFIX_SET" = "yes" -a ! "$SYSCONFDIR_SET" = "yes" ]
 then
    if [ "$PREFIX" = "/usr" ]
@@ -245,6 +298,10 @@ LUA_BINDIR=$LUA_BINDIR
 REQUIRE_CONFIG=$REQUIRE_CONFIG
 IDN_LIB=$IDN_LIB
 OPENSSL_LIB=$OPENSSL_LIB
+CFLAGS=$CFLAGS
+LFLAGS=$LFLAGS
+CC=$CC
+LD=$LD
 
 EOF