X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=configure;h=207fd0c1a6d2c96ddd0dfddda9425c7bda3ac251;hb=49d9be9b7a64eda7bb8b4a4f9684901de4620a0e;hp=4993526d91adf6bcfb8931623dc18b1de079467c;hpb=009b01ccf436a72f9a14a08c384a0eb980eef38e;p=prosody.git

diff --git a/configure b/configure
index 4993526d..207fd0c1 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"
+LDFLAGS="-shared"
 
 # Help
 
@@ -23,7 +26,7 @@ Configure Prosody prior to building.
 
 --help                      This help.
 --ostype=OS                 Use one of the OS presets.
-                            May be one of: debian, macosx
+                            May be one of: debian, macosx, linux
 --prefix=DIR                Prefix where Prosody should be installed.
                             Default is $PREFIX
 --sysconfdir=DIR            Location where the config file should be installed.
@@ -44,6 +47,12 @@ Configure Prosody prior to building.
                             Default is $OPENSSL_LIB
 --cflags=FLAGS              Flags to pass to the compiler
                             Default is $CFLAGS
+--ldflags=FLAGS             Flags to pass to the linker
+                            Default is $LDFLAGS
+--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
       ;;
@@ -94,16 +107,25 @@ do
       ;;
    --with-lua-lib=*)
       LUA_LIBDIR="$value" LUA_LIBDIR_SET=yes
-      ;;      
+      ;;
    --with-idn=*)
       IDN_LIB="$value"
-      ;;      
+      ;;
    --with-ssl=*)
       OPENSSL_LIB="$value"
-      ;;      
+      ;;
    --cflags=*)
       CFLAGS="$value"
-      ;;      
+      ;;
+   --ldflags=*)
+      LDFLAGS="$value"
+      ;;
+   --c-compiler=*)
+      CC="$value"
+      ;;
+   --linker=*)
+      LD="$value"
+      ;;
    *)
       echo "Error: Unknown flag: $1"
       exit 1
@@ -122,9 +144,20 @@ then
 	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"
-	fi	
+	LUA_LIBDIR_SET=yes
+	CFLAGS="-Wall"
+	LDFLAGS="-bundle -undefined dynamic_lookup"
+	fi
+        if [ "$OSTYPE" = "linux" ]
+        then LUA_INCDIR=/usr/local/include;
+        LUA_INCDIR_SET=yes
+        LUA_LIBDIR=/usr/local/lib
+        LUA_LIBDIR_SET=yes
+        CFLAGS="-Wall -fPIC"
+        LDFLAGS="-shared"
+        fi
 fi
 
 if [ "$PREFIX_SET" = "yes" -a ! "$SYSCONFDIR_SET" = "yes" ]
@@ -274,6 +307,9 @@ REQUIRE_CONFIG=$REQUIRE_CONFIG
 IDN_LIB=$IDN_LIB
 OPENSSL_LIB=$OPENSSL_LIB
 CFLAGS=$CFLAGS
+LDFLAGS=$LDFLAGS
+CC=$CC
+LD=$LD
 
 EOF