diff options
| author | Brian Cully <bjc@junctionnetworks.com> | 2009-12-04 02:51:03 +0000 |
|---|---|---|
| committer | Brian Cully <bjc@junctionnetworks.com> | 2009-12-04 02:51:03 +0000 |
| commit | 5a986a442627cc9b9e1c7d08edd7681eabbc0f97 (patch) | |
| tree | b768bcb4dc6b057c93524298570b3cd680c2a3bf | |
| parent | fe477e0e110a90fdb69bf32fe840422359b8c44e (diff) | |
| download | prosody-5a986a442627cc9b9e1c7d08edd7681eabbc0f97.tar.gz prosody-5a986a442627cc9b9e1c7d08edd7681eabbc0f97.zip | |
configure: Add 'linux' ostype and rename lflags to LDFLAGS to match expectations.
| -rwxr-xr-x | configure | 42 |
1 files changed, 25 insertions, 17 deletions
@@ -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 |