From c4997486bffc76e2581e9072bff05eba0feeb29c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 5 Apr 2012 20:51:36 +0200 Subject: - 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 --- buildlib/config.h.in | 3 +++ buildlib/environment.mak.in | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'buildlib') diff --git a/buildlib/config.h.in b/buildlib/config.h.in index 43d39d304..b07d4f77f 100644 --- a/buildlib/config.h.in +++ b/buildlib/config.h.in @@ -22,6 +22,9 @@ /* Define if we have the zlib library for gzip */ #undef HAVE_ZLIB +/* Define if we have the bz2 library for bzip2 */ +#undef HAVE_BZ2 + /* These two are used by the statvfs shim for glibc2.0 and bsd */ /* Define if we have sys/vfs.h */ #undef HAVE_VFS_H diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in index b8ddb34a2..0f0fac095 100644 --- a/buildlib/environment.mak.in +++ b/buildlib/environment.mak.in @@ -55,7 +55,8 @@ INTLLIBS = @INTLLIBS@ # Shim Headerfile control HAVE_C9X = @HAVE_C9X@ HAVE_STATVFS = @HAVE_STATVFS@ -HAVE_TIMEGM = @HAVE_TIMEGM@ +HAVE_ZLIB = @HAVE_ZLIB@ +HAVE_BZ2 = @HAVE_BZ2@ NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@ # Shared library things -- cgit v1.2.3