aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2010-10-11 21:16:50 +0000
committerMartin Matuska <mm@FreeBSD.org>2010-10-11 21:16:50 +0000
commite0f0e66dfeda9df4f104f48bd42d5a28d8ae631e (patch)
tree8f869a49bacb830d6587caf887d983e247b5f65e /lib
parenteaeeb89e754fb0dfef7d116c2d8f64aec9cc900b (diff)
parent140cf3d5f23f94d96c987db2d4b8a60926009aa5 (diff)
Notes
Diffstat (limited to 'lib')
-rw-r--r--lib/liblzma/Makefile2
-rw-r--r--lib/liblzma/config.h6
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/liblzma/Makefile b/lib/liblzma/Makefile
index f84ac9376a30..927fe8c4935b 100644
--- a/lib/liblzma/Makefile
+++ b/lib/liblzma/Makefile
@@ -23,7 +23,6 @@ LZMAINCS+= base.h \
index_hash.h \
lzma.h \
stream_flags.h \
- subblock.h \
version.h \
vli.h
@@ -129,7 +128,6 @@ CFLAGS+= -DHAVE_CONFIG_H \
-I${LZMADIR}/lz \
-I${LZMADIR}/rangecoder \
-I${LZMADIR}/lzma \
- -I${LZMADIR}/subblock \
-I${LZMADIR}/delta \
-I${LZMADIR}/simple \
-I${LZMADIR}/../common
diff --git a/lib/liblzma/config.h b/lib/liblzma/config.h
index 61542b931842..6702e0d6e007 100644
--- a/lib/liblzma/config.h
+++ b/lib/liblzma/config.h
@@ -4,7 +4,6 @@
#define HAVE_CHECK_CRC64 1
#define HAVE_CHECK_SHA256 1
#define HAVE_DECL_PROGRAM_INVOCATION_NAME 0
-#define HAVE_DECODER 1
#define HAVE_DECODER_ARM 1
#define HAVE_DECODER_ARMTHUMB 1
#define HAVE_DECODER_DELTA 1
@@ -15,7 +14,6 @@
#define HAVE_DECODER_SPARC 1
#define HAVE_DECODER_X86 1
#define HAVE_DLFCN_H 1
-#define HAVE_ENCODER 1
#define HAVE_ENCODER_ARM 1
#define HAVE_ENCODER_ARMTHUMB 1
#define HAVE_ENCODER_DELTA 1
@@ -31,6 +29,7 @@
#define HAVE_GETOPT_LONG 1
#define HAVE_INTTYPES_H 1
#define HAVE_LIMITS_H 1
+#define HAVE_MBRTOWC 1
#define HAVE_MEMORY_H 1
#define HAVE_MF_BT2 1
#define HAVE_MF_BT3 1
@@ -53,6 +52,7 @@
#define HAVE_UINTPTR_T 1
#define HAVE_UNISTD_H 1
#define HAVE_VISIBILITY 1
+#define HAVE_WCWIDTH 1
#define HAVE__BOOL 1
#define LT_OBJDIR ".libs/"
#define NDEBUG 1
@@ -65,7 +65,7 @@
#define PACKAGE_VERSION "4.999.9beta"
#define SIZEOF_SIZE_T 8
#define STDC_HEADERS 1
-#define TUKLIB_CPUCORES_SYSCONF 1
+#define TUKLIB_CPUCORES_SYSCTL 1
#define TUKLIB_PHYSMEM_SYSCONF 1
#ifndef _ALL_SOURCE
# define _ALL_SOURCE 1