From owner-svn-src-stable@FreeBSD.ORG  Sun Oct 10 12:18:53 2010
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 7F4461065674;
	Sun, 10 Oct 2010 12:18:53 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6DE928FC1A;
	Sun, 10 Oct 2010 12:18:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9ACIrNZ082301;
	Sun, 10 Oct 2010 12:18:53 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9ACIrl7082298;
	Sun, 10 Oct 2010 12:18:53 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201010101218.o9ACIrl7082298@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Sun, 10 Oct 2010 12:18:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213669 - stable/8/usr.bin/tar
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: Sun, 10 Oct 2010 12:18:53 -0000

Author: mm
Date: Sun Oct 10 12:18:53 2010
New Revision: 213669
URL: http://svn.freebsd.org/changeset/base/213669

Log:
  Move HAVE_LIBLZMA from Makefile to config_freebsd.h
  
  Approved by:	delphij (mentor)

Modified:
  stable/8/usr.bin/tar/Makefile
  stable/8/usr.bin/tar/config_freebsd.h

Modified: stable/8/usr.bin/tar/Makefile
==============================================================================
--- stable/8/usr.bin/tar/Makefile	Sun Oct 10 09:24:19 2010	(r213668)
+++ stable/8/usr.bin/tar/Makefile	Sun Oct 10 12:18:53 2010	(r213669)
@@ -12,7 +12,6 @@ LDADD+= -lcrypto
 .endif
 CFLAGS+=	-DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\"
 CFLAGS+=	-DPLATFORM_CONFIG_H=\"config_freebsd.h\"
-CFLAGS+=	-DHAVE_LIBLZMA
 CFLAGS+=	-I${.CURDIR}
 SYMLINKS=	bsdtar ${BINDIR}/tar
 MLINKS=	bsdtar.1 tar.1

Modified: stable/8/usr.bin/tar/config_freebsd.h
==============================================================================
--- stable/8/usr.bin/tar/config_freebsd.h	Sun Oct 10 09:24:19 2010	(r213668)
+++ stable/8/usr.bin/tar/config_freebsd.h	Sun Oct 10 12:18:53 2010	(r213669)
@@ -61,6 +61,9 @@
 #define	HAVE_LIBARCHIVE 1
 #define	HAVE_LIBBZ2 1
 #define	HAVE_LIBZ 1
+#if __FreeBSD_version >= 800505 /* liblzma introduced */
+#define	HAVE_LIBLZMA 1
+#endif
 #define	HAVE_LIMITS_H 1
 #undef	HAVE_LINUX_EXT2_FS_H
 #undef	HAVE_LINUX_FS_H