diff options
| author | Karel Zak | 2013-03-21 13:22:10 +0100 |
|---|---|---|
| committer | Karel Zak | 2013-03-21 15:34:24 +0100 |
| commit | eb6a03f3bffeac397358026851da20206869cd01 (patch) | |
| tree | 2e6e89945fc077ebfe43d98b0d4dbab3e5e79257 | |
| parent | build-sys: lslocks depends on libmount (diff) | |
| download | kernel-qcow2-util-linux-eb6a03f3bffeac397358026851da20206869cd01.tar.gz kernel-qcow2-util-linux-eb6a03f3bffeac397358026851da20206869cd01.tar.xz kernel-qcow2-util-linux-eb6a03f3bffeac397358026851da20206869cd01.zip | |
build-sys: set dependence fdisk -> libfdisk -> libuuid
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | fdisks/Makemodule.am | 3 | ||||
| -rw-r--r-- | libfdisk/Makemodule.am | 3 |
3 files changed, 18 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 6c1a85ec6..1d9fed08c 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 b17267ff4..ebda3361d 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 eb0881920..323a57f6f 100644 --- a/libfdisk/Makemodule.am +++ b/libfdisk/Makemodule.am @@ -1,2 +1,5 @@ +if BUILD_LIBFDISK include libfdisk/src/Makemodule.am + +endif # BUILD_LIBFDISK |