diff options
author | David Kalnischkies <kalnischkies@gmail.com> | 2012-04-05 20:51:36 +0200 |
---|---|---|
committer | David Kalnischkies <kalnischkies@gmail.com> | 2012-04-05 20:51:36 +0200 |
commit | c4997486bffc76e2581e9072bff05eba0feeb29c (patch) | |
tree | 7966bc2e5b737a7dedc6aca8eaff87ab8edaa0f9 /apt-pkg/makefile | |
parent | 8dd623dbd616ee23dc96a2c99a4415b153dd7290 (diff) |
- add libbz2-dev as new build-dependency
- remove the libz-dev alternative from zlib1g-dev build-dependency
- do the same for bz2 builtin if available
* apt-pkg/contrib/fileutl.cc:
- use libz2 library for (de)compression instead of the bzip2 binary as
the first is a dependency of dpkg and the later just priority:optional
so we gain 'easier' access to bz2-compressed Translation files this way
Diffstat (limited to 'apt-pkg/makefile')
-rw-r--r-- | apt-pkg/makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apt-pkg/makefile b/apt-pkg/makefile index e1f69dd65..27d7ead24 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -14,7 +14,13 @@ include ../buildlib/libversion.mak LIBRARY=apt-pkg MAJOR=$(LIBAPTPKG_MAJOR) MINOR=$(LIBAPTPKG_RELEASE) -SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl -lz +SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl +ifeq ($(HAVE_ZLIB),yes) +SLIBS+= -lz +endif +ifeq ($(HAVE_BZ2),yes) +SLIBS+= -lbz2 +endif APT_DOMAIN:=libapt-pkg$(LIBAPTPKG_MAJOR) # Source code for the contributed non-core things |