- Don't try to build NWFS support module if NCP/IPX is disabled in the build.

- Rename ZFS definition to LIBPROCSTAT_ZFS to be consistent with NWFS and to
  prevent possible collisions.

Reported by:	many

lib/libprocstat/Makefile

@@ -9,7 +9,6 @@ SRCS=	cd9660.c	\
 	libprocstat.c	\
         msdosfs.c	\
 	ntfs.c		\
-	nwfs.c		\
 	smbfs.c		\
 	udf.c
 
@@ -18,9 +17,14 @@ CFLAGS+=	-I. -I${.CURDIR} -D_KVM_VNODE
 SHLIB_MAJOR=	1
 WITHOUT_MAN=	yes
 
+.if ${MK_NCP} != "no"
+CFLAGS+=	-DLIBPROCSTAT_NWFS
+SRCS+=	nwfs.c
+.endif
+
 # XXX This is a hack.
 .if ${MK_CDDL} != "no"
-CFLAGS+=	-DZFS
+CFLAGS+=	-DLIBPROCSTAT_ZFS
 OBJS+=	zfs/zfs.o
 SOBJS+=	zfs/zfs.So
 POBJS+=	zfs/zfs.po

lib/libprocstat/libprocstat.c

@@ -873,11 +873,13 @@ procstat_get_vnode_info_kvm(kvm_t *kd, struct filestat *fst,
 		FSTYPE(msdosfs),
 		FSTYPE(nfs),
 		FSTYPE(ntfs),
+#ifdef LIBPROCSTAT_NWFS
 		FSTYPE(nwfs), 
+#endif
 		FSTYPE(smbfs),
 		FSTYPE(udf), 
 		FSTYPE(ufs),
-#ifdef ZFS
+#ifdef LIBPROCSTAT_ZFS
 		FSTYPE(zfs),
 #endif
 	};