RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 11-Dec-2009 04:03:34
Branch: HEAD Handle: 2009121103033400
Modified files:
rpm configure.ac
Log:
- simplify the AutoFu sanity for rpm built with _SOME_ compression.
Summary:
Revision Changes Path
2.414 +6 -10 rpm/configure.ac
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.413 -r2.414 configure.ac
--- rpm/configure.ac 2 Dec 2009 18:21:23 -0000 2.413
+++ rpm/configure.ac 11 Dec 2009 03:03:34 -0000 2.414
@@ -1177,20 +1177,17 @@
if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
AC_DEFINE(HAVE_ZLIB_H, 1, [Define to 1 if you have <zlib.h>])
fi
+ HAVE_RPM_COMPRESSION=yes
], [])
- if test ".$WITH_ZLIB" = .yes; then
- HAVE_RPM_COMPRESSION=yes
- fi
dnl # GNU BZip2
RPM_CHECK_LIB(
[GNU BZip2], [bzip2],
[bz2], [BZ2_bzread], [bzlib.h],
[no,external:none], [],
- [], [])
- if test ".$WITH_BZIP2" = .yes; then
- HAVE_RPM_COMPRESSION=yes
- fi
+ [
+ HAVE_RPM_COMPRESSION=yes
+ ], [])
dnl # libLZMA
WITH_XZ_INTERNAL=false
@@ -1202,14 +1199,13 @@
WITH_XZ_INTERNAL=true
AC_DEFINE(HAVE_LZMA_H, 1, [Define to 1 if you have <lzma.h>])
fi
+ HAVE_RPM_COMPRESSION=yes
], [])
- if test ".$WITH_XZ" = .yes; then
- HAVE_RPM_COMPRESSION=yes
- fi
if test ".$HAVE_RPM_COMPRESSION" = .no; then
AC_MSG_ERROR([you have passed --without-{xz,bzip2,zlib} together but
it isn't possible to build rpm without any form of compression library. At a
minimum, i suggest adding --with-zlib if you want to actually build and install
a *.rpm package])
fi
+
dnl # BeeCrypt
RPM_CHECK_LIB(
[BeeCrypt], [beecrypt],
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
