svn commit: r221824 - head/lib/libprocstat
Stanislav Sedov
stas at FreeBSD.org
Thu May 12 22:21:40 UTC 2011
Author: stas
Date: Thu May 12 22:21:39 2011
New Revision: 221824
URL: http://svn.freebsd.org/changeset/base/221824
Log:
- 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
Modified:
head/lib/libprocstat/Makefile
head/lib/libprocstat/libprocstat.c
Modified: head/lib/libprocstat/Makefile
==============================================================================
--- head/lib/libprocstat/Makefile Thu May 12 21:30:46 2011 (r221823)
+++ head/lib/libprocstat/Makefile Thu May 12 22:21:39 2011 (r221824)
@@ -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
Modified: head/lib/libprocstat/libprocstat.c
==============================================================================
--- head/lib/libprocstat/libprocstat.c Thu May 12 21:30:46 2011 (r221823)
+++ head/lib/libprocstat/libprocstat.c Thu May 12 22:21:39 2011 (r221824)
@@ -873,11 +873,13 @@ procstat_get_vnode_info_kvm(kvm_t *kd, s
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
};
More information about the svn-src-head
mailing list