Enable LZMA supprt with tar(1)

diff --git a/commands/tar/Makefile b/commands/tar/Makefile
index 8f5735212328e9ad52c5646c66fdc7f0b65813ee..dfd48ed14ffb2bfa64d028d04166461296b9eed3 100644 (file)
--- a/commands/tar/Makefile
+++ b/commands/tar/Makefile
@@ -11,8 +11,8 @@ SRCS= bsdtar.c \
                write.c
 .include "${.CURDIR}/libarchive_fe/Makefile.inc"
 
-DPADD+= ${LIBARCHIVE} ${LIBZ} ${LIBBZ2}
-LDADD+=        -larchive -lbz2 -lz
+DPADD+= ${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBLZMA}
+LDADD+=        -larchive -lbz2 -lz -llzma
 CPPFLAGS+= -DHAVE_CONFIG_H
 CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/libarchive_fe
 

diff --git a/commands/tar/config.h b/commands/tar/config.h
index db48c55d6d948fcb5b3bc107690bcd613b2f3e4f..00cd7c64e31c5c93a97bacdb56280bb06aef442b 100644 (file)
--- a/commands/tar/config.h
+++ b/commands/tar/config.h
@@ -232,7 +232,7 @@
 /* #undef HAVE_LIBEXPAT */
 
 /* Define to 1 if you have the `lzma' library (-llzma). */
-/* #undef HAVE_LIBLZMA */
+#define HAVE_LIBLZMA 1
 
 /* Define to 1 if you have the `lzmadec' library (-llzmadec). */
 /* #undef HAVE_LIBLZMADEC */
@@ -284,7 +284,7 @@
 /* #undef HAVE_LZMADEC_H */
 
 /* Define to 1 if you have the <lzma.h> header file. */
-/* #undef HAVE_LZMA_H */
+#define HAVE_LZMA_H 1
 
 /* Define to 1 if you have the `MD5Init' function. */
 /* #undef HAVE_MD5INIT */

diff --git a/lib/libarchive/config.h b/lib/libarchive/config.h
index 8de8d312ef260dc3339a4b9e30471a600d3482f6..5770c1ea24da3d4c1fb94d3aaa324189083f0d92 100644 (file)
--- a/lib/libarchive/config.h
+++ b/lib/libarchive/config.h
@@ -232,7 +232,7 @@
 /* #undef HAVE_LIBEXPAT */
 
 /* Define to 1 if you have the `lzma' library (-llzma). */
-/* #undef HAVE_LIBLZMA */
+#define HAVE_LIBLZMA 1
 
 /* Define to 1 if you have the `lzmadec' library (-llzmadec). */
 /* #undef HAVE_LIBLZMADEC */
@@ -284,7 +284,7 @@
 /* #undef HAVE_LZMADEC_H */
 
 /* Define to 1 if you have the <lzma.h> header file. */
-/* #undef HAVE_LZMA_H */
+#define HAVE_LZMA_H 1
 
 /* Define to 1 if you have the `MD5Init' function. */
 /* #undef HAVE_MD5INIT */