X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=configure;h=bd8eb48c12b24b4268b30a5f867d31b816b7f693;hb=c05a2a41adbc7e93fed4551cbc71d9cd5cdb234c;hp=3b1898e0e7e54b9664c87bfe4e6da60f8e9a2940;hpb=87986be9478cf97f72b9fd8022324d4a4508a5c3;p=prosody.git

diff --git a/configure b/configure
index 3b1898e0..bd8eb48c 100755
--- a/configure
+++ b/configure
@@ -12,8 +12,11 @@ LUA_INCDIR="/usr/include"
 LUA_LIBDIR="/usr/lib"
 IDN_LIB=idn
 OPENSSL_LIB=crypto
+CC=gcc
+LD=gcc
 
-CFLAGS="-shared -fPIC"
+CFLAGS="-fPIC -Wall"
+LFLAGS="-shared"
 
 # Help
 
@@ -44,6 +47,12 @@ Configure Prosody prior to building.
                             Default is $OPENSSL_LIB
 --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
@@ -69,11 +78,15 @@ do
       PREFIX="$value"
       PREFIX_SET=yes
       ;;
+   --sysconfdir=*)
+      SYSCONFDIR="$value"
+      SYSCONFDIR_SET=yes
+      ;;
    --ostype=*)
       OSTYPE="$value"
       OSTYPE_SET=yes
       ;;
-   --data-dir=*)
+   --datadir=*)
    	DATADIR="$value"
    	DATADIR_SET=yes
       ;;
@@ -104,6 +117,15 @@ do
    --cflags=*)
       CFLAGS="$value"
       ;;      
+   --lflags=*)
+      LFLAGS="$value"
+      ;;      
+   --c-compiler=*)
+      CC="$value"
+      ;;      
+   --linker=*)
+      LD="$value"
+      ;;      
    *)
       echo "Error: Unknown flag: $1"
       exit 1
@@ -116,12 +138,17 @@ 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
-	CFLAGS="-bundle -Wl,-undefined,dynamic_lookup"
+	LUA_LIBDIR_SET=yes
+	CFLAGS="-Wall"
+	LFLAGS="-bundle -undefined dynamic_lookup"
 	fi	
 fi
 
@@ -272,6 +299,9 @@ REQUIRE_CONFIG=$REQUIRE_CONFIG
 IDN_LIB=$IDN_LIB
 OPENSSL_LIB=$OPENSSL_LIB
 CFLAGS=$CFLAGS
+LFLAGS=$LFLAGS
+CC=$CC
+LD=$LD
 
 EOF