diff options
| -rw-r--r-- | etc/defaults/make.conf | 6 | ||||
| -rw-r--r-- | secure/lib/Makefile | 2 | ||||
| -rw-r--r-- | share/examples/etc/make.conf | 6 |
3 files changed, 3 insertions, 11 deletions
diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf index ee0eb973a7d7..207e3d6857fd 100644 --- a/etc/defaults/make.conf +++ b/etc/defaults/make.conf @@ -62,6 +62,7 @@ BDECFLAGS= -W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \ #NO_OBJC= true # do not build Objective C support #NO_OPENSSH= true # do not build OpenSSH #NO_OPENSSL= true # do not build OpenSSL (implies NO_OPENSSH) +#NO_RSAINTL= YES # do not build OpenSSL native RSA libraries #NO_SENDMAIL= true # do not build sendmail and related programs #NO_SHAREDOCS= true # do not build the 4.4BSD legacy docs #NO_TCSH= true # do not build and install /bin/csh (which is tcsh) @@ -92,11 +93,6 @@ BDECFLAGS= -W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \ # use for any non-commercial use. This is optional. #MAKE_IDEA= YES # IDEA (128 bit symmetric encryption) # -# Patented in the USA only (due to expire in September 2000). RSA is -# required for OpenSSH. Either use this or ports/security/rsaref. -#MAKE_RSAINTL= YES # RSA (public key exchange) -# -# # To avoid running MAKEDEV all on /dev during install: #NO_MAKEDEV= true # diff --git a/secure/lib/Makefile b/secure/lib/Makefile index 84bba0fc4973..d061f66bcdeb 100644 --- a/secure/lib/Makefile +++ b/secure/lib/Makefile @@ -10,7 +10,7 @@ SUBDIR+=libcrypto librsaglue libssl SUBDIR+=librsausa .endif .if exists(${.CURDIR}/../../crypto/openssl/crypto/rsa/rsa_eay.c) && \ - (${USA_RESIDENT} != YES || defined(MAKE_RSAINTL)) + !defined(NO_RSAINTL) SUBDIR+=librsaintl .endif .endif diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index ee0eb973a7d7..207e3d6857fd 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -62,6 +62,7 @@ BDECFLAGS= -W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \ #NO_OBJC= true # do not build Objective C support #NO_OPENSSH= true # do not build OpenSSH #NO_OPENSSL= true # do not build OpenSSL (implies NO_OPENSSH) +#NO_RSAINTL= YES # do not build OpenSSL native RSA libraries #NO_SENDMAIL= true # do not build sendmail and related programs #NO_SHAREDOCS= true # do not build the 4.4BSD legacy docs #NO_TCSH= true # do not build and install /bin/csh (which is tcsh) @@ -92,11 +93,6 @@ BDECFLAGS= -W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \ # use for any non-commercial use. This is optional. #MAKE_IDEA= YES # IDEA (128 bit symmetric encryption) # -# Patented in the USA only (due to expire in September 2000). RSA is -# required for OpenSSH. Either use this or ports/security/rsaref. -#MAKE_RSAINTL= YES # RSA (public key exchange) -# -# # To avoid running MAKEDEV all on /dev during install: #NO_MAKEDEV= true # |