svn commit: r213669 - stable/8/usr.bin/tar

[Martin Matuska]

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