summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Nunberg <mnunberg@haskalah.org>2018-01-08 16:09:53 -0500
committerMark Nunberg <mnunberg@haskalah.org>2019-02-20 09:10:10 -0500
commitbc2a8f372a9f073e2fc00c34ba11cb3cb671f252 (patch)
tree2cb3932f06833f8343efe3e765d57f6f16faf4a4
parent82549a53de4483b368008485d74028f302fd0e60 (diff)
Minor SSL-related fixes
-rw-r--r--Makefile4
-rw-r--r--sslio.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f7ed675..7e3e2bf 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,9 @@ STLIBNAME=$(LIBNAME).$(STLIBSUFFIX)
STLIB_MAKE_CMD=$(AR) rcs $(STLIBNAME)
ifdef USE_SSL
- OPENSSL_PREFIX=/usr/local/opt/openssl
+ # This is the prefix of openssl on my system. This should be the sane default
+ # based on the platform
+ OPENSSL_PREFIX?=/usr/local/opt/openssl
CFLAGS+=-I$(OPENSSL_PREFIX)/include -DHIREDIS_SSL
LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto
endif
diff --git a/sslio.c b/sslio.c
index 721a63a..8933f95 100644
--- a/sslio.c
+++ b/sslio.c
@@ -57,7 +57,7 @@ static void opensslDoLock(int mode, int lkid, const char *f, int line) {
} else {
sslLockRelease(l);
}
-
+
(void)f;
(void)line;
}