From 6fd0f335d929854d9189d46d8279e5f8534989dd Mon Sep 17 00:00:00 2001
From: stas <stas@FreeBSD.org>
Date: Thu, 12 May 2011 22:21:39 +0000
Subject: - 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      | 8 ++++++--
 lib/libprocstat/libprocstat.c | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile
index dc3dd58..e289ef5 100644
--- a/lib/libprocstat/Makefile
+++ b/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
diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c
index cfe81a2..95b00d3 100644
--- a/lib/libprocstat/libprocstat.c
+++ b/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
 	};
-- 
cgit v1.1