build-sys: cleanup BUILD_UUIDD

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

diff --git a/configure.ac b/configure.ac
index 0ba8e7964fa8658a0a041869e39064e1bc68aa83..984ad597dc29b96ceed76435f9d6d26c8dc2145d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -415,7 +415,6 @@ AC_SUBST([LIBMOUNT_VERSION_INFO])
 AC_DEFINE_UNQUOTED(LIBMOUNT_VERSION, "$LIBMOUNT_VERSION", [libmount version string])
 
 
-
 AC_ARG_ENABLE([mount],
   AS_HELP_STRING([--disable-mount], [do not build mount utilities]),
   [], enable_mount=check
@@ -460,20 +459,14 @@ AM_CONDITIONAL(BUILD_PARTX, test "x$build_partx" = xyes)
 
 AC_ARG_ENABLE([uuidd],
   AS_HELP_STRING([--disable-uuidd], [do not build the uuid daemon]),
-  [], enable_uuidd=auto
+  [], enable_uuidd=check
 )
-
-case "$enable_uuidd:$enable_libuuid" in
-yes:no)
-  AC_MSG_ERROR([cannot enable uuidd when libuuid is disabled]) ;;
-auto:*)
-  enable_uuidd=$enable_libuuid ;;
-esac
-if test "x$enable_uuidd" = xyes; then
+build_uuidd=yes
+UL_REQUIRES_BUILD([uuidd], [libuuid])
+if test "x$build_uuidd" = xyes; then
   AC_DEFINE(HAVE_UUIDD, 1, [Define to 1 if you want to use uuid daemon.])
 fi
-AM_CONDITIONAL(BUILD_UUIDD, test "x$enable_uuidd" = xyes)
-
+AM_CONDITIONAL(BUILD_UUIDD, test "x$build_uuidd" = xyes)
 
 
 AC_ARG_ENABLE([mountpoint],

diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am
index 9b941f518115c7ccc5761aed54560c23a15621fd..194e9cbc963a3049f63165da0fa9a9144c832dbf 100644 (file)
--- a/misc-utils/Makefile.am
+++ b/misc-utils/Makefile.am
@@ -30,13 +30,14 @@ usrbin_exec_PROGRAMS += uuidgen
 dist_man_MANS += uuidgen.1
 uuidgen_LDADD = $(ul_libuuid_la)
 uuidgen_CFLAGS = $(AM_CFLAGS) -I$(ul_libuuid_srcdir)
+endif
+
 if BUILD_UUIDD
 usrsbin_exec_PROGRAMS += uuidd
 dist_man_MANS += uuidd.8
 uuidd_LDADD = $(ul_libuuid_la)
 uuidd_CFLAGS = $(AM_CFLAGS) -I$(ul_libuuid_srcdir)
 endif
-endif
 
 if BUILD_LIBBLKID
 sbin_PROGRAMS += blkid findfs wipefs