From: Karel Zak <kzak@redhat.com>
Date: Thu, 21 Mar 2013 12:22:10 +0000 (+0100)
Subject: build-sys: set dependence fdisk -> libfdisk -> libuuid
X-Git-Tag: v2.23-rc1~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb6a03f3bffeac397358026851da20206869cd01;p=thirdparty%2Futil-linux.git

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

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

diff --git a/configure.ac b/configure.ac
index 6c1a85ec68..1d9fed08c2 100644
--- 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 b17267ff4f..ebda3361d1 100644
--- 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 eb0881920c..323a57f6fe 100644
--- a/libfdisk/Makemodule.am
+++ b/libfdisk/Makemodule.am
@@ -1,2 +1,5 @@
+if BUILD_LIBFDISK
 
 include libfdisk/src/Makemodule.am
+
+endif # BUILD_LIBFDISK