projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mod_storage_sql2: Remove from trunk (all trunk-only changes backported)
[prosody.git]
/
configure
diff --git
a/configure
b/configure
index 84f4b9ef251f343cf0c89cdffe8f0120ab006a3b..b64c265410cd555c7273a87abfdfc9ef5c286678 100755
(executable)
--- a/
configure
+++ b/
configure
@@
-32,7
+32,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, linux, freebsd
+ May be one of: debian, macosx, linux, freebsd
, openbsd
--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.
@@
-112,6
+112,7
@@
do
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 -mmacosx-version-min=10.3"
LDFLAGS="-bundle -undefined dynamic_lookup"
fi
if [ "$OSTYPE" = "linux" ]; then
LDFLAGS="-bundle -undefined dynamic_lookup"
fi
if [ "$OSTYPE" = "linux" ]; then
@@
-131,6
+132,8
@@
do
LUA_SUFFIX_SET=yes
LUA_DIR=/usr/local
LUA_DIR_SET=yes
LUA_SUFFIX_SET=yes
LUA_DIR=/usr/local
LUA_DIR_SET=yes
+ CC=cc
+ LD=ld
fi
if [ "$OSTYPE" = "openbsd" ]; then
LUA_INCDIR="/usr/local/include";
fi
if [ "$OSTYPE" = "openbsd" ]; then
LUA_INCDIR="/usr/local/include";
@@
-225,7
+228,7
@@
find_program() {
found="no"
while [ "$item" ]
do
found="no"
while [ "$item" ]
do
- if [ -
e
"$item/$1" ]
+ if [ -
f
"$item/$1" ]
then
found="yes"
break
then
found="yes"
break
@@
-248,7
+251,7
@@
then
LUA_SUFFIX="$suffix"
if [ "$LUA_DIR_SET" = "yes" ]
then
LUA_SUFFIX="$suffix"
if [ "$LUA_DIR_SET" = "yes" ]
then
- if [ -
e
"$LUA_DIR/bin/lua$suffix" ]
+ if [ -
f
"$LUA_DIR/bin/lua$suffix" ]
then
find_lua="$LUA_DIR"
fi
then
find_lua="$LUA_DIR"
fi
@@
-263,7
+266,7
@@
then
done
fi
done
fi
-if
! [ "$LUA_DIR_SET"
= "yes" ]
+if
[ "$LUA_DIR_SET" !
= "yes" ]
then
echo -n "Looking for Lua... "
if [ ! "$find_lua" ]
then
echo -n "Looking for Lua... "
if [ ! "$find_lua" ]
@@
-282,12
+285,12
@@
then
fi
fi
fi
fi
-if
! [ "$LUA_INCDIR_SET"
= "yes" ]
+if
[ "$LUA_INCDIR_SET" !
= "yes" ]
then
LUA_INCDIR="$LUA_DIR/include"
fi
then
LUA_INCDIR="$LUA_DIR/include"
fi
-if
! [ "$LUA_LIBDIR_SET"
= "yes" ]
+if
[ "$LUA_LIBDIR_SET" !
= "yes" ]
then
LUA_LIBDIR="$LUA_DIR/lib"
fi
then
LUA_LIBDIR="$LUA_DIR/lib"
fi
@@
-307,9
+310,11
@@
then
IDNA_LIBS="-l$IDN_LIB"
fi
IDNA_LIBS="-l$IDN_LIB"
fi
+OPENSSL_LIBS="-l$OPENSSL_LIB"
+
echo -n "Checking Lua includes... "
lua_h="$LUA_INCDIR/lua.h"
echo -n "Checking Lua includes... "
lua_h="$LUA_INCDIR/lua.h"
-if [ -
e
"$lua_h" ]
+if [ -
f
"$lua_h" ]
then
echo "lua.h found in $lua_h"
else
then
echo "lua.h found in $lua_h"
else
@@
-359,7
+364,7
@@
LUA_BINDIR=$LUA_BINDIR
REQUIRE_CONFIG=$REQUIRE_CONFIG
IDN_LIB=$IDN_LIB
IDNA_LIBS=$IDNA_LIBS
REQUIRE_CONFIG=$REQUIRE_CONFIG
IDN_LIB=$IDN_LIB
IDNA_LIBS=$IDNA_LIBS
-OPENSSL_LIB
=$OPENSSL_LIB
+OPENSSL_LIB
S=$OPENSSL_LIBS
CFLAGS=$CFLAGS
LDFLAGS=$LDFLAGS
CC=$CC
CFLAGS=$CFLAGS
LDFLAGS=$LDFLAGS
CC=$CC