From 0787b95634222e3b0e29951d33e81446df80c654 Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sun, 22 Feb 2009 13:58:55 +0100
Subject: [PATCH] - lzma disabled by default. (cherry picked from commit
 56b7d38a2879ce847dba7e08dc03186a231e20c0)

---
 NEWS         | 1 +
 configure.in | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 144c51ccf..7785010af 100644
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,7 @@ Other changes:
 * minor bug 761: When reading bookmarks from an XBEL file, distinguish
   attribute names from attribute values.
 * enhancement: Updated ISO 8859-7, ISO 8859-16, KOI8-R, and MacRoman.
+* lzma disabled by default. It's rarely used and doesn't build with new xz.
 
 Bugs that should be removed from NEWS before the 0.12.0 release:
 
diff --git a/configure.in b/configure.in
index d32e691d0..4f7a38dd3 100644
--- a/configure.in
+++ b/configure.in
@@ -462,8 +462,12 @@ if test "x{with_gc}" != xno; then
 		[  --with-gc               enable Boehm's garbage collector])
 fi
 
-EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_LZMA, lzma, lzma.h, lzma, lzma_code,
-	[  --without-lzma          disable lzma encoding support])
+# LZMA disabled by default, because of little usability and compilation problems
+# with new xz
+AC_ARG_WITH(lzma, [  --with-lzma           enable lzma encoding support],
+            [ if test "x$withval" != xno; then
+            EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_LZMA, lzma, lzma.h, lzma, lzma_code, [])
+            fi ])
 
 # ===================================================================
 # Check for GSSAPI, optional even if installed.