Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=a2278422e8b6a85b8487db5128b71650e0784b41
commit a2278422e8b6a85b8487db5128b71650e0784b41
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Sun May 15 14:58:19 2011 +0200
no longer depend on lzmadec, we never created such packages
check for xz instead
diff --git a/configure.ac b/configure.ac
index 30d4942..6319601 100644
--- a/configure.ac
+++ b/configure.ac
@@ -355,7 +355,7 @@ else
CSHARPSTATUS="no, disabled by configure"
fi
-dnl Check for python support
+dnl Check for vala support
AC_MSG_CHECKING(if Vala bindings should be generated)
if test x$wantvala = xyes ; then
AC_CHECK_PROGS([VALAC], [valac])
@@ -384,10 +384,10 @@ else
AC_MSG_ERROR("bzip2 library and its include files are needed to build
pacman-g2!");
fi
-dnl Check for lzmadec
-AC_CHECK_LIB([lzmadec], [lzmadec_init], [AC_CHECK_HEADER([lzmadec.h],
[LIBLZMADEC='-llzmadec'])])
-if test -n "$LIBLZMADEC"; then
- LDFLAGS="$LDFLAGS $LIBLZMADEC"
+dnl Check for xz
+AC_CHECK_LIB([lzma], [lzma_stream_decoder], [AC_CHECK_HEADER([lzma.h],
[LIBLZMA='-llzma'])])
+if test -n "$LIBLZMA"; then
+ LDFLAGS="$LDFLAGS $LIBLZMA"
else
AC_MSG_ERROR("lzma library and its include files are needed to build
pacman-g2!");
fi
diff --git a/lib/libpacman/add.c b/lib/libpacman/add.c
index 29167c1..8b77a73 100644
--- a/lib/libpacman/add.c
+++ b/lib/libpacman/add.c
@@ -416,7 +416,6 @@ int _pacman_add_commit(pmtrans_t *trans, pmdb_t *db)
RET_ERR(PM_ERR_LIBARCHIVE_ERROR, -1);
archive_read_support_compression_all (archive);
- archive_read_support_compression_lzma (archive);
archive_read_support_format_all (archive);
if (archive_read_open_file (archive, info->data,
ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) {
diff --git a/lib/libpacman/package.c b/lib/libpacman/package.c
index 5ab7d76..3fbd34b 100644
--- a/lib/libpacman/package.c
+++ b/lib/libpacman/package.c
@@ -291,7 +291,6 @@ pmpkg_t *_pacman_pkg_load(const char *pkgfile)
RET_ERR(PM_ERR_LIBARCHIVE_ERROR, NULL);
archive_read_support_compression_all (archive);
- archive_read_support_compression_lzma (archive);
archive_read_support_format_all (archive);
if ((ret = archive_read_open_file (archive, pkgfile,
ARCHIVE_DEFAULT_BYTES_PER_BLOCK)) != ARCHIVE_OK)
diff --git a/lib/libpacman/util.c b/lib/libpacman/util.c
index 0928974..0df66e0 100644
--- a/lib/libpacman/util.c
+++ b/lib/libpacman/util.c
@@ -325,7 +325,6 @@ int _pacman_unpack(const char *archive, const char *prefix,
const char *fn)
RET_ERR(PM_ERR_LIBARCHIVE_ERROR, -1);
archive_read_support_compression_all(_archive);
- archive_read_support_compression_lzma(_archive);
archive_read_support_format_all (_archive);
if (archive_read_open_file (_archive, archive, ARCHIVE_DEFAULT_BYTES_PER_BLOCK)
!= ARCHIVE_OK)
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
