--- ../imap-4/src/osdep/unix/Makefile.orig	Mon Mar 30 17:07:21 1998
+++ ../imap-4/src/osdep/unix/Makefile	Sat Jun 26 02:04:49 1999
@@ -39,7 +39,7 @@
 	netmsg.o rfc822.o nntp.o smtp.o imap4.o pop3.o \
 	bezerk.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o
 EXTRACFLAGS=
-CFLAGS=$(EXTRACFLAGS)
+#CFLAGS=$(EXTRACFLAGS)
 EXTRADRIVERS=mbox mbx
 DEFAULTDRIVERS=imap nntp pop3 mh tenex mtx mmdf bezerk news phile dummy
 LN=ln -s
@@ -109,7 +109,8 @@
 bsi:	# BSD/i386
 	$(MAKE) mtest OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \
 		STDPROTO=bezerkproto \
-		RSHPATH=/usr/bin/rsh CFLAGS="-g -O -pipe $(EXTRACFLAGS)"
+		RSHPATH=/usr/bin/rsh CFLAGS="$(CFLAGS) $(EXTRACFLAGS)" \
+		LDFLAGS="-lcrypt"
 
 cvx:	# Convex
 	$(MAKE) mtest OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \