build-sys: cleanup BUILD_CRAMFS

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/configure.ac b/configure.ac
index 205b76c552c34cf0d67a3c17fbc9ee2c18fa3c97..0afa7b1acfe20e742bb60cee4066e8c8807080fd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -788,17 +788,9 @@ AC_ARG_ENABLE([cramfs],
   AS_HELP_STRING([--disable-cramfs], [do not build fsck.cramfs, mkfs.cramfs]),
   [], enable_cramfs=check
 )
-
-if test "x$enable_cramfs" = xno; then
-  build_cramfs=no
-else
-  build_cramfs=yes
-  dnl Trick: leave the third parameter empty to get the default action.
-  AC_CHECK_LIB(z, crc32, [], build_cramfs=no)
-  case $enable_cramfs:$build_cramfs in
-  yes:no) AC_MSG_ERROR([cramfs selected but libz not found]);;
-  esac
-fi
+build_cramfs=yes
+AC_CHECK_LIB(z, crc32, [have_z=yes], [have_z=no])
+UL_REQUIRES_HAVE([cramfs], [z], [z library])
 AM_CONDITIONAL(BUILD_CRAMFS, test "x$build_cramfs" = xyes)
 
 

diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am
index 56f4e571ddc26fe90788e786b5a8221165c632e6..3b83c681c4e9b911c4363f0ef2d87de2eaf9d821 100644 (file)
--- a/disk-utils/Makefile.am
+++ b/disk-utils/Makefile.am
@@ -63,7 +63,8 @@ if BUILD_CRAMFS
 cramfs_common = $(utils_common) cramfs.h cramfs_common.c
 sbin_PROGRAMS += fsck.cramfs mkfs.cramfs
 fsck_cramfs_SOURCES = fsck.cramfs.c $(cramfs_common)
-mkfs_cramfs_SOURCES = mkfs.cramfs.c $(cramfs_common) $(top_srcdir)/lib/md5.c $(top_srcdir)/lib/strutils.c
+mkfs_cramfs_SOURCES = mkfs.cramfs.c $(cramfs_common) $(top_srcdir)/lib/md5.c \
+                     $(top_srcdir)/lib/strutils.c
 fsck_cramfs_LDADD = -lz
 mkfs_cramfs_LDADD = -lz
 endif