svn commit: r284728 - head/usr.sbin/fstyp

[Allan Jude]

Author: allanjude (doc committer)
Date: Tue Jun 23 16:34:43 2015
New Revision: 284728
URL: https://svnweb.freebsd.org/changeset/base/284728

Log:
  Switch fstyp build to toggle ZFS support on WITHOUT_ZFS rather than WITHOUT_CDDL
  
  PR:		200976
  Approved by:	imp
  MFC after:	1 week
  Sponsored by:	ScaleEngine Inc.
  Differential Revision:	https://reviews.freebsd.org/D2045

Modified:
  head/usr.sbin/fstyp/Makefile
  head/usr.sbin/fstyp/fstyp.c
  head/usr.sbin/fstyp/fstyp.h

Modified: head/usr.sbin/fstyp/Makefile
==============================================================================
--- head/usr.sbin/fstyp/Makefile	Tue Jun 23 16:13:20 2015	(r284727)
+++ head/usr.sbin/fstyp/Makefile	Tue Jun 23 16:34:43 2015	(r284728)
@@ -5,7 +5,7 @@
 PROG=	fstyp
 SRCS=	cd9660.c ext2fs.c fstyp.c geli.c msdosfs.c ntfs.c ufs.c
 
-.if ${MK_CDDL} != "no"
+.if ${MK_ZFS} != "no"
 SRCS +=	zfs.c
 .endif
 
@@ -13,10 +13,10 @@ MAN=	fstyp.8
 
 WARNS?=	0
 
-.if ${MK_CDDL} != "no"
+.if ${MK_ZFS} != "no"
 IGNORE_PRAGMA=  YES
 
-CFLAGS+= -DNEED_SOLARIS_BOOLEAN -DHAVE_CDDL
+CFLAGS+= -DNEED_SOLARIS_BOOLEAN -DHAVE_ZFS
 CFLAGS+= -I${.CURDIR}/../../sys/cddl/compat/opensolaris
 CFLAGS+= -I${.CURDIR}/../../cddl/compat/opensolaris/include
 CFLAGS+= -I${.CURDIR}/../../cddl/compat/opensolaris/lib/libumem
@@ -33,7 +33,7 @@ CFLAGS+=-I${.CURDIR}/../../sys
 DPADD=   ${LIBGEOM} ${LIBMD}
 LDADD=   -lgeom -lmd
 
-.if ${MK_CDDL} != "no"
+.if ${MK_ZFS} != "no"
 DPADD += ${LIBNVPAIR} ${LIBZFS}
 LDADD += -lnvpair -lzfs
 .endif

Modified: head/usr.sbin/fstyp/fstyp.c
==============================================================================
--- head/usr.sbin/fstyp/fstyp.c	Tue Jun 23 16:13:20 2015	(r284727)
+++ head/usr.sbin/fstyp/fstyp.c	Tue Jun 23 16:34:43 2015	(r284728)
@@ -63,7 +63,7 @@ static struct {
 	{ "msdosfs", &fstyp_msdosfs, false },
 	{ "ntfs", &fstyp_ntfs, false },
 	{ "ufs", &fstyp_ufs, false },
-#ifdef HAVE_CDDL
+#ifdef HAVE_ZFS
 	{ "zfs", &fstyp_zfs, true },
 #endif
 	{ NULL, NULL, NULL }

Modified: head/usr.sbin/fstyp/fstyp.h
==============================================================================
--- head/usr.sbin/fstyp/fstyp.h	Tue Jun 23 16:13:20 2015	(r284727)
+++ head/usr.sbin/fstyp/fstyp.h	Tue Jun 23 16:34:43 2015	(r284728)
@@ -44,7 +44,7 @@ int	fstyp_geli(FILE *fp, char *label, si
 int	fstyp_msdosfs(FILE *fp, char *label, size_t size);
 int	fstyp_ntfs(FILE *fp, char *label, size_t size);
 int	fstyp_ufs(FILE *fp, char *label, size_t size);
-#ifdef HAVE_CDDL
+#ifdef HAVE_ZFS
 int	fstyp_zfs(FILE *fp, char *label, size_t size);
 #endif