build-sys: set dependence fdisk -> libfdisk -> libuuid

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

diff --git a/configure.ac b/configure.ac
index 6c1a85ec68b9848083a0efe6d331f8f6269c349f..1d9fed08c2d9d5e1a6944c9d7536c75f0ab1b758 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -759,6 +759,18 @@ AC_SUBST([LIBMOUNT_VERSION_INFO])
 AC_DEFINE_UNQUOTED(LIBMOUNT_VERSION, "$LIBMOUNT_VERSION", [libmount version string])
 
 
+dnl
+dnl libfdisk is enabled all time if possible
+dnl
+UL_BUILD_INIT([libfdisk], [check])
+UL_REQUIRES_BUILD([libfdisk], [libuuid])
+AM_CONDITIONAL(BUILD_LIBFDISK, test "x$build_libfdisk" = xyes)
+
+UL_BUILD_INIT([fdisk], [check])
+UL_REQUIRES_BUILD([fdisk], [libfdisk])
+AM_CONDITIONAL(BUILD_FDISK, test "x$build_fdisk" = xyes)
+
+
 AC_ARG_ENABLE([deprecated-mount],
   AS_HELP_STRING([--enable-deprecated-mount], [build old mount utilities]),
   [], enable_deprecated_mount=no

diff --git a/fdisks/Makemodule.am b/fdisks/Makemodule.am
index b17267ff4f7e09be80c44c165cc2d3a5ab22c8f2..ebda3361d11e4909467e03a730647d150e69ce23 100644 (file)
--- a/fdisks/Makemodule.am
+++ b/fdisks/Makemodule.am
@@ -1,6 +1,7 @@
 
 if !ARCH_M68K
 
+if BUILD_FDISK
 sbin_PROGRAMS += fdisk
 dist_man_MANS += fdisks/fdisk.8
 fdisk_SOURCES = \
@@ -42,6 +43,8 @@ fdisk_static_CFLAGS = $(fdisk_CFLAGS)
 fdisk_static_LDADD = $(fdisk_LDADD)
 endif
 
+endif # BUILD_FDISK
+
 
 if !ARCH_SPARC
 

diff --git a/libfdisk/Makemodule.am b/libfdisk/Makemodule.am
index eb0881920cc427384772ab0f681f55002aafc9a0..323a57f6fe293f114e077868b4c338fa979ec112 100644 (file)
--- a/libfdisk/Makemodule.am
+++ b/libfdisk/Makemodule.am
@@ -1,2 +1,5 @@
+if BUILD_LIBFDISK
 
 include libfdisk/src/Makemodule.am
+
+endif # BUILD_LIBFDISK