Pulling this

1 files changed, 20 insertions, 2 deletions

diff --git a/xdelta3/configure.ac b/xdelta3/configure.ac
index ffec737..b6f5f1b 100644
--- a/xdelta3/configure.ac
+++ b/xdelta3/configure.ac
@@ -8,8 +8,26 @@ AM_INIT_AUTOMAKE([1.9 no-define foreign tar-ustar subdir-objects])
 AX_CHECK_ALIGNED_ACCESS_REQUIRED
 AC_PROG_CC
 AC_PROG_CXX
-AC_CHECK_HEADERS([lzma.h])
-AC_CHECK_LIB(lzma, lzma_easy_buffer_encode)
+
+AC_ARG_WITH(
+    [liblzma],
+    [AC_HELP_STRING(
+        [--with-liblzma],
+        [build with liblzma support @<:@default=autodetect@:>@])],
+    [USE_LIBLZMA=$withval],
+    [USE_LIBLZMA=auto])
+
+if test "x$USE_LIBLZMA" != xno ; then
+    AC_CHECK_HEADERS([lzma.h],,[
+        if test "x$with_liblzma" = xyes ; then
+            AC_MSG_FAILURE([liblzma includes were not found])
+        fi])
+    AC_CHECK_LIB([lzma], [lzma_easy_buffer_encode],,[
+        if test "x$with_liblzma" = xyes ; then
+            AC_MSG_FAILURE([liblzma library were not found])
+        fi])
+fi
+
 AC_CHECK_SIZEOF(size_t)
 AC_CHECK_SIZEOF(unsigned int)
 AC_CHECK_SIZEOF(unsigned long)