From owner-svn-src-stable-7@FreeBSD.ORG  Wed Jun 10 01:18:08 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 83D70106564A;
	Wed, 10 Jun 2009 01:18:08 +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 717DF8FC16;
	Wed, 10 Jun 2009 01:18:08 +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 n5A1I8T2089583;
	Wed, 10 Jun 2009 01:18:08 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5A1I8A5089581;
	Wed, 10 Jun 2009 01:18:08 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906100118.n5A1I8A5089581@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 10 Jun 2009 01:18:08 +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: r193876 - in stable/7/sys/boot/i386: . loader
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2009 01:18:09 -0000

Author: kmacy
Date: Wed Jun 10 01:18:07 2009
New Revision: 193876
URL: http://svn.freebsd.org/changeset/base/193876

Log:
  - enable building of loader by default
  - fix MK_ZFS == "no" and MK_CDDL == "no" handling

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

Modified: stable/7/sys/boot/i386/Makefile
==============================================================================
--- stable/7/sys/boot/i386/Makefile	Wed Jun 10 01:15:30 2009	(r193875)
+++ stable/7/sys/boot/i386/Makefile	Wed Jun 10 01:18:07 2009	(r193876)
@@ -1,9 +1,10 @@
 # $FreeBSD$
+.include <bsd.own.mk>
 
 SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \
 		kgzldr libi386 libfirewire loader
 
-.if defined(LOADER_ZFS_SUPPORT)
+.if ${MK_ZFS}
 SUBDIR+=		zfsboot gptzfsboot
 .endif
 

Modified: stable/7/sys/boot/i386/loader/Makefile
==============================================================================
--- stable/7/sys/boot/i386/loader/Makefile	Wed Jun 10 01:15:30 2009	(r193875)
+++ stable/7/sys/boot/i386/loader/Makefile	Wed Jun 10 01:18:07 2009	(r193876)
@@ -16,9 +16,11 @@ LIBFIREWIRE=	${.OBJDIR}/../libfirewire/l
 .endif
 
 # Put LOADER_ZFS_SUPPORT=yes in /etc/make.conf for ZFS support
-.if defined(LOADER_ZFS_SUPPORT)
+.if ${MK_ZFS} != "no"
 CFLAGS+=	-DLOADER_ZFS_SUPPORT
 LIBZFS=		${.OBJDIR}/../../zfs/libzfsboot.a
+.else
+LIBZFS=
 .endif
 
 # Enable PXE TFTP or NFS support, not both.