enable PKCS#11 code; ok djm

3 files changed, 6 insertions, 8 deletions

diff --git a/usr.bin/ssh/Makefile b/usr.bin/ssh/Makefile
index c90ca1386d2..cef9c962dc2 100644
--- a/usr.bin/ssh/Makefile
+++ b/usr.bin/ssh/Makefile
@@ -1,10 +1,9 @@
-#	$OpenBSD: Makefile,v 1.14 2010/02/08 12:48:38 markus Exp $
+#	$OpenBSD: Makefile,v 1.15 2010/02/09 08:55:31 markus Exp $
 
 .include <bsd.own.mk>
 
 SUBDIR=	lib ssh sshd ssh-add ssh-keygen ssh-agent scp sftp-server \
-	ssh-keysign ssh-keyscan sftp
-#SUBDIR+=ssh-pkcs11-helper
+	ssh-keysign ssh-keyscan sftp ssh-pkcs11-helper
 
 distribution:
 	${INSTALL} -C -o root -g wheel -m 0644 ${.CURDIR}/ssh_config \
diff --git a/usr.bin/ssh/Makefile.inc b/usr.bin/ssh/Makefile.inc
index 9c8d9251eba..172440d287f 100644
--- a/usr.bin/ssh/Makefile.inc
+++ b/usr.bin/ssh/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.34 2010/02/08 10:50:20 markus Exp $
+#	$OpenBSD: Makefile.inc,v 1.35 2010/02/09 08:55:31 markus Exp $
 
 CFLAGS+=	-I${.CURDIR}/..
 
@@ -17,7 +17,7 @@ CDIAGFLAGS+=	-Wshadow
 
 #CFLAGS+=	-DJPAKE
 
-#CFLAGS+=	-DENABLE_PKCS11
+CFLAGS+=	-DENABLE_PKCS11
 
 .include <bsd.obj.mk>
 
diff --git a/usr.bin/ssh/ssh-agent/Makefile b/usr.bin/ssh/ssh-agent/Makefile
index e02f440e465..98cf59e0da0 100644
--- a/usr.bin/ssh/ssh-agent/Makefile
+++ b/usr.bin/ssh/ssh-agent/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.23 2010/02/08 10:50:20 markus Exp $
+#	$OpenBSD: Makefile,v 1.24 2010/02/09 08:55:31 markus Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -11,8 +11,7 @@ BINMODE?=2555
 BINDIR=	/usr/bin
 MAN=	ssh-agent.1
 
-SRCS=	ssh-agent.c
-#SRCS+=	ssh-pkcs11-client.c
+SRCS=	ssh-agent.c ssh-pkcs11-client.c
 
 .include <bsd.prog.mk>