projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mod_muc: The default component name is now 'Chatrooms'
[prosody.git]
/
configure
diff --git
a/configure
b/configure
index 3b1898e0e7e54b9664c87bfe4e6da60f8e9a2940..1fe3b85dc557b4d35fe3ede38731ca144024ec4f 100755
(executable)
--- a/
configure
+++ b/
configure
@@
-12,8
+12,11
@@
LUA_INCDIR="/usr/include"
LUA_LIBDIR="/usr/lib"
IDN_LIB=idn
OPENSSL_LIB=crypto
LUA_LIBDIR="/usr/lib"
IDN_LIB=idn
OPENSSL_LIB=crypto
+CC=gcc
+LD=gcc
-CFLAGS="-shared -fPIC"
+CFLAGS="-fPIC -Wall"
+LFLAGS="-shared"
# Help
# 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
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
--require-config Will cause Prosody to refuse to run when
it fails to find a configuration file
EOF
@@
-104,6
+113,15
@@
do
--cflags=*)
CFLAGS="$value"
;;
--cflags=*)
CFLAGS="$value"
;;
+ --lflags=*)
+ LFLAGS="$value"
+ ;;
+ --c-compiler=*)
+ CC="$value"
+ ;;
+ --linker=*)
+ LD="$value"
+ ;;
*)
echo "Error: Unknown flag: $1"
exit 1
*)
echo "Error: Unknown flag: $1"
exit 1
@@
-116,12
+134,17
@@
if [ "$OSTYPE_SET" = "yes" ]
then
if [ "$OSTYPE" = "debian" ]
then LUA_SUFFIX="5.1";
then
if [ "$OSTYPE" = "debian" ]
then LUA_SUFFIX="5.1";
+ LUA_SUFFIX_SET=yes
LUA_INCDIR=/usr/include/lua5.1;
LUA_INCDIR=/usr/include/lua5.1;
+ LUA_INCDIR_SET=yes
fi
if [ "$OSTYPE" = "macosx" ]
then LUA_INCDIR=/usr/local/include;
fi
if [ "$OSTYPE" = "macosx" ]
then LUA_INCDIR=/usr/local/include;
+ LUA_INCDIR_SET=yes
LUA_LIBDIR=/usr/local/lib
LUA_LIBDIR=/usr/local/lib
- CFLAGS="-bundle -Wl,-undefined,dynamic_lookup"
+ LUA_LIBDIR_SET=yes
+ CFLAGS="-Wall"
+ LFLAGS="-bundle -undefined dynamic_lookup"
fi
fi
fi
fi
@@
-272,6
+295,9
@@
REQUIRE_CONFIG=$REQUIRE_CONFIG
IDN_LIB=$IDN_LIB
OPENSSL_LIB=$OPENSSL_LIB
CFLAGS=$CFLAGS
IDN_LIB=$IDN_LIB
OPENSSL_LIB=$OPENSSL_LIB
CFLAGS=$CFLAGS
+LFLAGS=$LFLAGS
+CC=$CC
+LD=$LD
EOF
EOF