Mercurial > lxmppd-hg-xmllex / changeset

--- a/configure	Thu Dec 03 21:57:47 2009 +0100
+++ b/configure	Fri Dec 04 02:51:03 2009 +0000
@@ -16,7 +16,7 @@
 LD=gcc
 
 CFLAGS="-fPIC -Wall"
-LFLAGS="-shared"
+LDFLAGS="-shared"
 
 # Help
 
@@ -26,7 +26,7 @@
 
 --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.
@@ -47,8 +47,8 @@
                             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
+--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.
@@ -107,25 +107,25 @@
       ;;
    --with-lua-lib=*)
       LUA_LIBDIR="$value" LUA_LIBDIR_SET=yes
-      ;;      
+      ;;
    --with-idn=*)
       IDN_LIB="$value"
-      ;;      
+      ;;
    --with-ssl=*)
       OPENSSL_LIB="$value"
-      ;;      
+      ;;
    --cflags=*)
       CFLAGS="$value"
-      ;;      
-   --lflags=*)
-      LFLAGS="$value"
-      ;;      
+      ;;
+   --ldflags=*)
+      LDFLAGS="$value"
+      ;;
    --c-compiler=*)
       CC="$value"
-      ;;      
+      ;;
    --linker=*)
       LD="$value"
-      ;;      
+      ;;
    *)
       echo "Error: Unknown flag: $1"
       exit 1
@@ -144,12 +144,20 @@
 	fi
 	if [ "$OSTYPE" = "macosx" ]
 	then LUA_INCDIR=/usr/local/include;
-	LUA_INCDIR_SET=yes	
+	LUA_INCDIR_SET=yes
 	LUA_LIBDIR=/usr/local/lib
 	LUA_LIBDIR_SET=yes
 	CFLAGS="-Wall"
-	LFLAGS="-bundle -undefined dynamic_lookup"
-	fi	
+	LDFLAGS="-bundle -undefined dynamic_lookup"
+	fi
+        if [ "$OSTYPE" = "linux" ]
+        then LUA_INCDIR=/usr/local/include;
+        LUA_INCDIR_SET=yet
+        LUA_LIBDIR=/usr/local/lib
+        LUA_LIBDIR_SET=yet
+        CFLAGS="-Wall -fPIC"
+        LDFLAGS="-shared"
+        fi
 fi
 
 if [ "$PREFIX_SET" = "yes" -a ! "$SYSCONFDIR_SET" = "yes" ]
@@ -299,7 +307,7 @@
 IDN_LIB=$IDN_LIB
 OPENSSL_LIB=$OPENSSL_LIB
 CFLAGS=$CFLAGS
-LFLAGS=$LFLAGS
+LDFLAGS=$LDFLAGS
 CC=$CC
 LD=$LD