projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util.sasl_cyrus: Protect the call to cyrussasl.server_new properly.
[prosody.git]
/
configure
diff --git
a/configure
b/configure
index e310b7a763e7da1496129dba343122dc51c83768..207fd0c1a6d2c96ddd0dfddda9425c7bda3ac251 100755
(executable)
--- a/
configure
+++ b/
configure
@@
-16,7
+16,7
@@
CC=gcc
LD=gcc
CFLAGS="-fPIC -Wall"
LD=gcc
CFLAGS="-fPIC -Wall"
-LFLAGS="-shared"
+L
D
FLAGS="-shared"
# Help
# Help
@@
-26,7
+26,7
@@
Configure Prosody prior to building.
--help This help.
--ostype=OS Use one of the OS presets.
--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.
--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
Default is $OPENSSL_LIB
--cflags=FLAGS Flags to pass to the compiler
Default is $CFLAGS
---l
flags=FLAGS
Flags to pass to the linker
- Default is $LFLAGS
+--l
dflags=FLAGS
Flags to pass to the linker
+ Default is $L
D
FLAGS
--c-compiler=CC The C compiler to use when building modules.
Default is $CC
--linker=CC The linker to use when building modules.
--c-compiler=CC The C compiler to use when building modules.
Default is $CC
--linker=CC The linker to use when building modules.
@@
-78,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
;;
@@
-103,22
+107,25
@@
do
;;
--with-lua-lib=*)
LUA_LIBDIR="$value" LUA_LIBDIR_SET=yes
;;
--with-lua-lib=*)
LUA_LIBDIR="$value" LUA_LIBDIR_SET=yes
- ;;
+ ;;
--with-idn=*)
IDN_LIB="$value"
--with-idn=*)
IDN_LIB="$value"
- ;;
+ ;;
--with-ssl=*)
OPENSSL_LIB="$value"
--with-ssl=*)
OPENSSL_LIB="$value"
- ;;
+ ;;
--cflags=*)
CFLAGS="$value"
--cflags=*)
CFLAGS="$value"
- ;;
+ ;;
+ --ldflags=*)
+ LDFLAGS="$value"
+ ;;
--c-compiler=*)
CC="$value"
--c-compiler=*)
CC="$value"
- ;;
+ ;;
--linker=*)
LD="$value"
--linker=*)
LD="$value"
- ;;
+ ;;
*)
echo "Error: Unknown flag: $1"
exit 1
*)
echo "Error: Unknown flag: $1"
exit 1
@@
-137,12
+144,20
@@
then
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_INCDIR_SET=yes
LUA_LIBDIR=/usr/local/lib
LUA_LIBDIR_SET=yes
CFLAGS="-Wall"
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=yes
+ LUA_LIBDIR=/usr/local/lib
+ LUA_LIBDIR_SET=yes
+ CFLAGS="-Wall -fPIC"
+ LDFLAGS="-shared"
+ fi
fi
if [ "$PREFIX_SET" = "yes" -a ! "$SYSCONFDIR_SET" = "yes" ]
fi
if [ "$PREFIX_SET" = "yes" -a ! "$SYSCONFDIR_SET" = "yes" ]
@@
-292,7
+307,7
@@
REQUIRE_CONFIG=$REQUIRE_CONFIG
IDN_LIB=$IDN_LIB
OPENSSL_LIB=$OPENSSL_LIB
CFLAGS=$CFLAGS
IDN_LIB=$IDN_LIB
OPENSSL_LIB=$OPENSSL_LIB
CFLAGS=$CFLAGS
-L
FLAGS=$L
FLAGS
+L
DFLAGS=$LD
FLAGS
CC=$CC
LD=$LD
CC=$CC
LD=$LD