projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with 0.6
[prosody.git]
/
configure
diff --git
a/configure
b/configure
index 5de9f67acaf490c30c64c34d0a4e5d6d344876e6..bd8eb48c12b24b4268b30a5f867d31b816b7f693 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
@@
-69,11
+78,15
@@
do
PREFIX="$value"
PREFIX_SET=yes
;;
PREFIX="$value"
PREFIX_SET=yes
;;
+ --sysconfdir=*)
+ SYSCONFDIR="$value"
+ SYSCONFDIR_SET=yes
+ ;;
--ostype=*)
OSTYPE="$value"
OSTYPE_SET=yes
;;
--ostype=*)
OSTYPE="$value"
OSTYPE_SET=yes
;;
- --data
-
dir=*)
+ --datadir=*)
DATADIR="$value"
DATADIR_SET=yes
;;
DATADIR="$value"
DATADIR_SET=yes
;;
@@
-104,6
+117,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
@@
-125,7
+147,7
@@
then
LUA_INCDIR_SET=yes
LUA_LIBDIR=/usr/local/lib
LUA_LIBDIR_SET=yes
LUA_INCDIR_SET=yes
LUA_LIBDIR=/usr/local/lib
LUA_LIBDIR_SET=yes
- CFLAGS=""
+ CFLAGS="
-Wall
"
LFLAGS="-bundle -undefined dynamic_lookup"
fi
fi
LFLAGS="-bundle -undefined dynamic_lookup"
fi
fi
@@
-277,6
+299,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