From d7f976593de36e89ea43ec509794b75536c1db4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net>
Date: Mon, 29 Mar 2021 20:49:35 -0400
Subject: [PATCH] Fix WITHOUT_CRYPTLIB option.
---
src/syncterm/GNUmakefile | 2 ++
src/syncterm/conn.c | 2 ++
src/syncterm/extdeps.mk | 3 ++-
src/syncterm/objects.mk | 2 --
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/syncterm/GNUmakefile b/src/syncterm/GNUmakefile
index 07a4816f7f..d3fd71445a 100644
--- a/src/syncterm/GNUmakefile
+++ b/src/syncterm/GNUmakefile
@@ -22,7 +22,9 @@ ifdef WITHOUT_CRYPTLIB
CRYPT_LDFLAGS :=
CRYPT_DEPS :=
else
+ OBJS += $(MTOBJODIR)$(DIRSEP)st_crypt$(OFILE)
OBJS += $(MTOBJODIR)$(DIRSEP)ssh$(OFILE)
+ OBJS += $(MTOBJODIR)$(DIRSEP)telnets$(OFILE)
CFLAGS += $(CRYPT_CFLAGS)
EXTRA_LIBS += $(CRYPT_LIBS)
STATIC_CRYPTLIB := true
diff --git a/src/syncterm/conn.c b/src/syncterm/conn.c
index 9acf25030c..13598edf20 100644
--- a/src/syncterm/conn.c
+++ b/src/syncterm/conn.c
@@ -34,8 +34,10 @@
#include "conn.h"
#include "rlogin.h"
#include "raw.h"
+#ifndef WITHOUT_CRYPTLIB
#include "ssh.h"
#include "telnets.h"
+#endif
#ifndef __HAIKU__
#include "modem.h"
#endif
diff --git a/src/syncterm/extdeps.mk b/src/syncterm/extdeps.mk
index 459e24bd61..646a34a9c8 100644
--- a/src/syncterm/extdeps.mk
+++ b/src/syncterm/extdeps.mk
@@ -1,3 +1,4 @@
-$(MTOBJODIR)$(DIRSEP)syncterm$(OFILE): $(CRYPT_LIB)
+$(MTOBJODIR)$(DIRSEP)st_crypt.h: $(CRYPT_LIB)
$(MTOBJODIR)$(DIRSEP)st_crypt$(OFILE): $(CRYPT_LIB)
$(MTOBJODIR)$(DIRSEP)ssh$(OFILE): $(CRYPT_LIB)
+$(MTOBJODIR)$(DIRSEP)telnets$(OFILE): $(CRYPT_LIB)
diff --git a/src/syncterm/objects.mk b/src/syncterm/objects.mk
index bcf2514f60..76a464b5fe 100644
--- a/src/syncterm/objects.mk
+++ b/src/syncterm/objects.mk
@@ -6,7 +6,6 @@ OBJS = \
$(MTOBJODIR)$(DIRSEP)ripper$(OFILE) \
$(MTOBJODIR)$(DIRSEP)rlogin$(OFILE) \
$(MTOBJODIR)$(DIRSEP)telnet_io$(OFILE) \
- $(MTOBJODIR)$(DIRSEP)telnets$(OFILE) \
$(MTOBJODIR)$(DIRSEP)conn_telnet$(OFILE) \
$(MTOBJODIR)$(DIRSEP)conn$(OFILE) \
$(MTOBJODIR)$(DIRSEP)telnet$(OFILE) \
@@ -15,6 +14,5 @@ OBJS = \
$(MTOBJODIR)$(DIRSEP)menu$(OFILE) \
$(MTOBJODIR)$(DIRSEP)zmodem$(OFILE) \
$(MTOBJODIR)$(DIRSEP)xmodem$(OFILE) \
- $(MTOBJODIR)$(DIRSEP)st_crypt$(OFILE) \
$(MTOBJODIR)$(DIRSEP)syncterm$(OFILE)
--
GitLab