Commit 4b737e7d authored by Bernhard Link's avatar Bernhard Link

fix compiling without lzma and make that the default even if liblzma is available

parent 5b0f216d
2014-06-28 Bernhard R. Link <brlink@debian.org>
* fix compiling without liblzma.
* disable liblzma usage unless explicitely requested
(to avoid the double-dependency to liblzma un lzma-utils).
2014-06-14 Bernhard R. Link <brlink@debian.org>
* add xz.example to script to generate Packages.gz
* improve multiple_distributions description in manpage
......
......@@ -100,8 +100,10 @@ AC_ARG_WITH(liblzma,
],[AC_MSG_ERROR(["no liblzma found, despite being told to use it"])],[-L$withval/lib])
;;
esac
],[dnl without --with-liblzma we look for it but not finding it is no error:
AC_CHECK_LIB(lzma,lzma_easy_encoder,,[AC_MSG_WARN(["no liblzma found, compiling without"])],)
],[
:
dnl until xz uncompression is implemented using lzma, disable it by default.
dnl AC_CHECK_LIB(lzma,lzma_easy_encoder,,[AC_MSG_WARN(["no liblzma found, compiling without"])],)
])
ARCHIVELIBS=""
......
......@@ -32,7 +32,7 @@
#ifdef HAVE_LIBBZ2
#include <bzlib.h>
#endif
#ifdef HAVE_LIBBZ2
#ifdef HAVE_LIBLZMA
#include <lzma.h>
#endif
#define CHECKSUMS_CONTEXT visible
......@@ -1351,7 +1351,9 @@ retvalue release_finishfile(struct release *release, struct filetorelease *file)
#ifdef HAVE_LIBBZ2
free(file->bzoutputbuffer);
#endif
#ifdef HAVE_LIBLZMA
assert(file->xzoutputbuffer == NULL);
#endif
free(file);
return result;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment