projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Automated merge with http://waqas.ath.cx:8000/
[prosody.git]
/
configure
diff --git
a/configure
b/configure
index 3b1898e0e7e54b9664c87bfe4e6da60f8e9a2940..8eb7b36747b53d67e7352634259b3bef67f13909 100755
(executable)
--- a/
configure
+++ b/
configure
@@
-13,7
+13,8
@@
LUA_LIBDIR="/usr/lib"
IDN_LIB=idn
OPENSSL_LIB=crypto
IDN_LIB=idn
OPENSSL_LIB=crypto
-CFLAGS="-shared -fPIC"
+CFLAGS="-fPIC"
+LFLAGS="-shared"
# Help
# Help
@@
-116,12
+117,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=""
+ LFLAGS="-bundle -undefined dynamic_lookup"
fi
fi
fi
fi
@@
-272,6
+278,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
+LFLAGS=$LFLAGS
EOF
EOF