d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make NO_OPENSSL actually imply NO_OPENSSH, as documented in make.conf(5).

Browse Source
This commit is contained in:
Ruslan Ermilov 2002-06-21 08:54:03 +00:00
parent 382ac430cd
commit 072f6798f8
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.inc1
View File

@ -717,11 +717,11 @@ _generic_libs+= lib
.if !defined(NOCRYPT) && !defined(NOSECURE) .if !defined(NOCRYPT) && !defined(NOSECURE)
.if !defined(NO_OPENSSL) .if !defined(NO_OPENSSL)
_prebuild_libs+= secure/lib/libcrypto secure/lib/libssl _prebuild_libs+= secure/lib/libcrypto secure/lib/libssl
.endif .if !defined(NO_OPENSSH)
.if !defined(NO_OPENSSH) && !defined(NO_OPENSSL)
_prebuild_libs+= secure/lib/libssh _prebuild_libs+= secure/lib/libssh
secure/lib/libssh__L: secure/lib/libcrypto__L lib/libz__L secure/lib/libssh__L: secure/lib/libcrypto__L lib/libz__L
.endif .endif
.endif
_generic_libs+= secure/lib _generic_libs+= secure/lib
.endif .endif

9
etc/Makefile
View File

@ -27,13 +27,12 @@ BIN1= amd.map apmd.conf auth.conf \
BIN1+= rc.isdn BIN1+= rc.isdn
.endif .endif
.if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSH) .if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSL)
.if !defined(NO_OPENSSH)
SSH= ${.CURDIR}/../crypto/openssh/ssh_config \ SSH= ${.CURDIR}/../crypto/openssh/ssh_config \
${.CURDIR}/../crypto/openssh/sshd_config \ ${.CURDIR}/../crypto/openssh/sshd_config \
moduli moduli
.endif .endif
.if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSL)
SSL= ${.CURDIR}/../crypto/openssl/apps/openssl.cnf SSL= ${.CURDIR}/../crypto/openssl/apps/openssl.cnf
.endif .endif
@ -92,11 +91,11 @@ distribution:
.if !defined(NO_SENDMAIL) .if !defined(NO_SENDMAIL)
( cd ${.CURDIR}/sendmail; ${MAKE} distribution ); ( cd ${.CURDIR}/sendmail; ${MAKE} distribution );
.endif .endif
.if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSH) .if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSL)
.if !defined(NO_OPENSSH)
(cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${SSH} \ (cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${SSH} \
${DESTDIR}/etc/ssh ) ${DESTDIR}/etc/ssh )
.endif .endif
.if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSL)
(cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${SSL} \ (cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${SSL} \
${DESTDIR}/etc/ssl ) ${DESTDIR}/etc/ssl )
.endif .endif

2
secure/lib/Makefile
View File

@ -6,9 +6,9 @@ SUBDIR+=libtelnet
.endif .endif
.if !defined(NO_OPENSSL) .if !defined(NO_OPENSSL)
SUBDIR+=libcrypto libssl SUBDIR+=libcrypto libssl
.endif
.if !defined(NO_OPENSSH) .if !defined(NO_OPENSSH)
SUBDIR+=libssh SUBDIR+=libssh
.endif .endif
.endif
.include <bsd.subdir.mk> .include <bsd.subdir.mk>