configure: Add 'linux' ostype and rename lflags to LDFLAGS to match expectations.
authorBrian Cully <bjc@junctionnetworks.com>
Fri, 4 Dec 2009 02:51:03 +0000 (02:51 +0000)
committerBrian Cully <bjc@junctionnetworks.com>
Fri, 4 Dec 2009 02:51:03 +0000 (02:51 +0000)
configure

index bd8eb48c12b24b4268b30a5f867d31b816b7f693..adb8b2dbf426488b7ee8688dceeb4b8251b3e245 100755 (executable)
--- a/configure
+++ b/configure
@@ -16,7 +16,7 @@ CC=gcc
 LD=gcc
 
 CFLAGS="-fPIC -Wall"
-LFLAGS="-shared"
+LDFLAGS="-shared"
 
 # Help
 
@@ -26,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.
@@ -47,8 +47,8 @@ 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
+--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 @@ do
       ;;
    --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 @@ then
        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 @@ REQUIRE_CONFIG=$REQUIRE_CONFIG
 IDN_LIB=$IDN_LIB
 OPENSSL_LIB=$OPENSSL_LIB
 CFLAGS=$CFLAGS
-LFLAGS=$LFLAGS
+LDFLAGS=$LDFLAGS
 CC=$CC
 LD=$LD