diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2002-11-27 19:13:53 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2002-11-27 19:13:53 +0000 |
| commit | 8486a530a2284d2f19ac8bf8b75544256bea10cc (patch) | |
| tree | 3088f42e9662c20b61bbb395292185f16232e99b | |
| parent | 5f24279c5d33ed847d0b0c1828c54f1b7b1e0f9a (diff) | |
| download | src-8486a530a2284d2f19ac8bf8b75544256bea10cc.tar.gz src-8486a530a2284d2f19ac8bf8b75544256bea10cc.zip | |
- Assume __FreeBSD__ is greater than 3.
- Only include compat4x distribution if this is either i386 or alpha.
Notes
Notes:
svn path=/head/; revision=107332
| -rw-r--r-- | usr.sbin/sade/menus.c | 9 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/menus.c | 9 |
2 files changed, 2 insertions, 16 deletions
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index 3a226f38edfa..c73556acff72 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -954,26 +954,19 @@ DMenu MenuSubDistributions = { dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT21 }, { " compat22", "FreeBSD 2.2.x and 3.0 a.out binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT22 }, -#if __FreeBSD__ > 3 { " compat3x", "FreeBSD 3.x binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT3X }, #endif -#if __FreeBSD__ >= 4 +#if __FreeBSD__ >= 4 && (defined(__i386__) || defined(__alpha__)) { " compat4x", "FreeBSD 4.x binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT4X }, #endif -#endif { " crypto", "Basic encryption services", dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_CRYPTO, }, -#if __FreeBSD__ <= 3 - { " krb", "KerberosIV authentication services", - dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_KERBEROS }, -#else { " krb4", "KerberosIV authentication services", dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_KERBEROS4 }, { " krb5", "Kerberos5 authentication services", dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_KERBEROS5 }, -#endif { " dict", "Spelling checker dictionary files", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT }, { " doc", "Miscellaneous FreeBSD online docs", diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index 3a226f38edfa..c73556acff72 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -954,26 +954,19 @@ DMenu MenuSubDistributions = { dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT21 }, { " compat22", "FreeBSD 2.2.x and 3.0 a.out binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT22 }, -#if __FreeBSD__ > 3 { " compat3x", "FreeBSD 3.x binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT3X }, #endif -#if __FreeBSD__ >= 4 +#if __FreeBSD__ >= 4 && (defined(__i386__) || defined(__alpha__)) { " compat4x", "FreeBSD 4.x binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT4X }, #endif -#endif { " crypto", "Basic encryption services", dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_CRYPTO, }, -#if __FreeBSD__ <= 3 - { " krb", "KerberosIV authentication services", - dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_KERBEROS }, -#else { " krb4", "KerberosIV authentication services", dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_KERBEROS4 }, { " krb5", "Kerberos5 authentication services", dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_KERBEROS5 }, -#endif { " dict", "Spelling checker dictionary files", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT }, { " doc", "Miscellaneous FreeBSD online docs", |