--- lzma-4.32.5-orig/configure.ac	2008-01-27 01:55:37.000000000 +0100
+++ lzma-4.32.5/configure.ac	2008-05-08 13:18:04.000000000 +0200
@@ -7,10 +7,8 @@
 # instead of lzma-utils-version.tar.gz.
 AC_INIT([LZMA], [4.32.5], [lasse.collin@tukaani.org])
 
-AC_CONFIG_SRCDIR([src/sdk/7zip/ICoder.h])
 AC_CONFIG_HEADER([config.h])
 
-AC_SUBST(SDK_CXXFLAGS, "-DCOMPRESS_MF_BT -DCOMPRESS_MF_BT4 -DCOMPRESS_MF_HC")
 AC_SUBST(SDK_CFLAGS, "-D_LZMA_IN_CB -D_LZMA_OUT_READ -D_LZMA_SYSTEM_SIZE_T -D_LZMA_PROB32")
 
 # Debug or not:
@@ -21,7 +19,6 @@
 	enable_debug=no)
 if test "x$enable_debug" = xyes; then
 	CFLAGS="-g $CFLAGS"
-	CXXFLAGS="-g $CFLAGS"
 	AC_MSG_RESULT([yes])
 else
 	AC_DEFINE(NDEBUG, 1, [Define to disable debugging code.])
@@ -34,7 +31,6 @@
 AM_INIT_AUTOMAKE
 
 # Checks for programs.
-AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
@@ -81,19 +77,7 @@
                  src/Makefile
                  src/liblzmadec/Makefile
                  src/lzmadec/Makefile
-                 src/lzmainfo/Makefile
-                 src/lzma/Makefile
-                 src/scripts/Makefile
-                 src/sdk/7zip/Common/Makefile
-                 src/sdk/7zip/Compress/LZ/Makefile
-                 src/sdk/7zip/Compress/LZMA/Makefile
-                 src/sdk/7zip/Compress/LZMA_C/Makefile
-                 src/sdk/7zip/Compress/Makefile
-                 src/sdk/7zip/Compress/RangeCoder/Makefile
-                 src/sdk/7zip/Makefile
-                 src/sdk/Common/Makefile
-                 src/sdk/Makefile
-                 tests/Makefile])
+                 src/lzmainfo/Makefile])
 AC_OUTPUT
 
 # This package should be compiled with large file support unless there's
--- lzma-4.32.5-orig/Makefile.am	2007-11-06 20:33:45.000000000 +0100
+++ lzma-4.32.5/Makefile.am	2008-05-08 13:18:12.000000000 +0200
@@ -1,4 +1,4 @@
-SUBDIRS = src tests
+SUBDIRS = src
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = \
--- lzma-4.32.5-orig/src/Makefile.am	2005-12-04 23:19:30.000000000 +0100
+++ lzma-4.32.5/src/Makefile.am	2008-05-08 13:18:29.000000000 +0200
@@ -1,2 +1,2 @@
-SUBDIRS = liblzmadec lzmadec lzmainfo sdk lzma scripts
+SUBDIRS = liblzmadec lzmadec lzmainfo
 EXTRA_DIST = lzma_version.h