aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-09-27 00:28:46 +0200
committerKim Alvefur <zash@zash.se>2015-09-27 00:28:46 +0200
commit01328b14950ee60ea8a3b77f4e7899824da0fbe4 (patch)
tree4bf97a296674cbb6abebeee06d416c7f0f209b06
parent6a7c5315191ae32b162d5090f8b5e8cb3dfa2f6c (diff)
downloadprosody-01328b14950ee60ea8a3b77f4e7899824da0fbe4.tar.gz
prosody-01328b14950ee60ea8a3b77f4e7899824da0fbe4.zip
configure,util-src/Makefile: Make a variable that includes -l for OpenSSL (like with IDNA_LIBS)
-rwxr-xr-xconfigure4
-rw-r--r--util-src/Makefile2
2 files changed, 4 insertions, 2 deletions
diff --git a/configure b/configure
index 6a2b57f5..b64c2654 100755
--- 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_LIBS=$OPENSSL_LIBS
CFLAGS=$CFLAGS
LDFLAGS=$LDFLAGS
CC=$CC
diff --git a/util-src/Makefile b/util-src/Makefile
index 5af97f35..5f35b81b 100644
--- 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)