Extend coverage of the MK_IPX build option to the following:

- <netipx> headers [1]
- IPX library (libipx)
- IPX support in ifconfig(8)
- IPXrouted(8)
- new MK_NCP option

New MK_NCP build option controls:

- <netncp> and <fs/nwfs> headers
- NCP library (libncp)
- ncplist(1) and ncplogin(1)
- mount_nwfs(8)
- ncp and nwfs kernel modules

User knobs: WITHOUT_IPX, WITHOUT_IPX_SUPPORT, WITHOUT_NCP.

[1] <netsmb/netbios.h> unconditionally uses <netipx> headers
so they are still installed.  This needs to be dealt with.

1 files changed, 13 insertions, 2 deletions

diff --git a/include/Makefile b/include/Makefile
index f33b2357fd32..0a4c558f612e 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -34,7 +34,8 @@ LHDRS=	aio.h errno.h fcntl.h linker_set.h poll.h stdint.h syslog.h \
 	termios.h ucontext.h
 
 LDIRS=	bsm cam geom net net80211 netatalk netatm netgraph netinet netinet6 \
-	netipsec netipx netkey netnatm netncp netsmb nfs nfsclient nfsserver \
+	netipsec ${_netipx} netkey netnatm ${_netncp} netsmb \
+	nfs nfsclient nfsserver \
 	pccard posix4 sys vm
 
 LSUBDIRS=	cam/scsi \
@@ -42,7 +43,7 @@ LSUBDIRS=	cam/scsi \
 	dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \
 	dev/pbio dev/ppbus dev/smbus dev/speaker dev/usb dev/wi dev/utopia \
 	fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \
-	fs/nwfs fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \
+	${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \
 	fs/unionfs \
 	geom/concat geom/eli geom/gate geom/label geom/mirror geom/nop \
 	geom/raid3 geom/shsec geom/stripe \
@@ -66,6 +67,16 @@ INCS+=	hesiod.h
 LSUBSUBDIRS=	netgraph/bluetooth/include
 .endif
 
+# XXX unconditionally needed by <netsmb/netbios.h>
+#.if ${MK_IPX} != "no"
+_netipx=	netipx
+#.endif
+
+.if ${MK_NCP} != "no"
+_netncp=	netncp
+_fs_nwfs=	fs/nwfs
+.endif
+
 # Define SHARED to indicate whether you want symbolic links to the system
 # source (``symlinks''), or a separate copy (``copies'').  ``symlinks'' is
 # probably only useful for developers and should be avoided if you do not