projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fb1609e
)
configure,util-src/Makefile: Make a variable that includes -l for OpenSSL (like with...
author
Kim Alvefur
<zash@zash.se>
Sat, 26 Sep 2015 22:28:46 +0000
(
00:28
+0200)
committer
Kim Alvefur
<zash@zash.se>
Sat, 26 Sep 2015 22:28:46 +0000
(
00:28
+0200)
configure
patch
|
blob
|
history
util-src/Makefile
patch
|
blob
|
history
diff --git
a/configure
b/configure
index 6a2b57f531e6567fdae6647a2b9bb8c21f8f4d1e..b64c265410cd555c7273a87abfdfc9ef5c286678 100755
(executable)
--- a/
configure
+++ b/
configure
@@
-310,6
+310,8
@@
then
IDNA_LIBS="-l$IDN_LIB"
fi
+OPENSSL_LIBS="-l$OPENSSL_LIB"
+
echo -n "Checking Lua includes... "
lua_h="$LUA_INCDIR/lua.h"
if [ -f "$lua_h" ]
@@
-362,7
+364,7
@@
LUA_BINDIR=$LUA_BINDIR
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
diff --git
a/util-src/Makefile
b/util-src/Makefile
index 5af97f358f7e25db32ebe61075d15ab92c8020a9..5f35b81b72f139da6d5d2d985f22e782bdb0a6d0 100644
(file)
--- a/
util-src/Makefile
+++ b/
util-src/Makefile
@@
-21,7
+21,7
@@
clean:
encodings.so: LDLIBS+=$(IDNA_LIBS)
-hashes.so: LDLIBS+=
-l$(OPENSSL_LIB
)
+hashes.so: LDLIBS+=
$(OPENSSL_LIBS
)
%.so: %.o
$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)