From owner-svn-src-stable@FreeBSD.ORG  Fri Jun  5 12:14:44 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 025151065674;
	Fri,  5 Jun 2009 12:14:44 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E3B968FC13;
	Fri,  5 Jun 2009 12:14:43 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n55CEhaD025121;
	Fri, 5 Jun 2009 12:14:43 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n55CEhgJ025118;
	Fri, 5 Jun 2009 12:14:43 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906051214.n55CEhgJ025118@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Fri, 5 Jun 2009 12:14:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193495 - in stable/7/sys/boot: . i386 i386/loader
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jun 2009 12:14:44 -0000

Author: kmacy
Date: Fri Jun  5 12:14:43 2009
New Revision: 193495
URL: http://svn.freebsd.org/changeset/base/193495

Log:
  reverse previous commit ...

Modified:
  stable/7/sys/boot/Makefile
  stable/7/sys/boot/i386/Makefile
  stable/7/sys/boot/i386/loader/Makefile

Modified: stable/7/sys/boot/Makefile
==============================================================================
--- stable/7/sys/boot/Makefile	Fri Jun  5 12:00:55 2009	(r193494)
+++ stable/7/sys/boot/Makefile	Fri Jun  5 12:14:43 2009	(r193495)
@@ -17,7 +17,7 @@ SUBDIR+=		efi
 SUBDIR+=		ofw
 .endif
 
-.if ${MK_ZFS} != "no"
+.if defined(LOADER_ZFS_SUPPORT)
 SUBDIR+=		zfs
 .endif
 

Modified: stable/7/sys/boot/i386/Makefile
==============================================================================
--- stable/7/sys/boot/i386/Makefile	Fri Jun  5 12:00:55 2009	(r193494)
+++ stable/7/sys/boot/i386/Makefile	Fri Jun  5 12:14:43 2009	(r193495)
@@ -3,7 +3,7 @@
 SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \
 		kgzldr libi386 libfirewire loader
 
-.if ${MK_ZFS} != "no"
+.if defined(LOADER_ZFS_SUPPORT)
 SUBDIR+=		zfsboot gptzfsboot
 .endif
 

Modified: stable/7/sys/boot/i386/loader/Makefile
==============================================================================
--- stable/7/sys/boot/i386/loader/Makefile	Fri Jun  5 12:00:55 2009	(r193494)
+++ stable/7/sys/boot/i386/loader/Makefile	Fri Jun  5 12:14:43 2009	(r193495)
@@ -15,7 +15,8 @@ CFLAGS+=	-DLOADER_FIREWIRE_SUPPORT
 LIBFIREWIRE=	${.OBJDIR}/../libfirewire/libfirewire.a
 .endif
 
-.if ${MK_ZFS} != "no"
+# Put LOADER_ZFS_SUPPORT=yes in /etc/make.conf for ZFS support
+.if defined(LOADER_ZFS_SUPPORT)
 CFLAGS+=	-DLOADER_ZFS_SUPPORT
 LIBZFS=		${.OBJDIR}/../../zfs/libzfsboot.a
 .endif