From: Karel Zak <kzak@redhat.com>
Date: Wed, 21 May 2014 10:13:12 +0000 (+0200)
Subject: build-sys: add --disable-minix
X-Git-Tag: v2.25-rc1~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d9fdac5eaafaf2358877d5d922f67ed36cb522a;p=thirdparty%2Futil-linux.git

build-sys: add --disable-minix

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

diff --git a/configure.ac b/configure.ac
index b83df0d069..b0a16d9f80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1001,6 +1001,14 @@ UL_BUILD_INIT([bfs])
 AM_CONDITIONAL([BUILD_BFS], [test "x$build_bfs" = xyes])
 
 
+AC_ARG_ENABLE([minix],
+  AS_HELP_STRING([--disable-minix], [do not build fsck.minix, mkfs.minix]),
+  [], [enable_minix=yes]
+)
+UL_BUILD_INIT([minix])
+AM_CONDITIONAL([BUILD_MINIX], [test "x$build_minix" = xyes])
+
+
 AC_ARG_ENABLE([fdformat],
   AS_HELP_STRING([--disable-fdformat], [do not build fdformat]),
   [], [enable_fdformat=check]
@@ -1021,6 +1029,7 @@ UL_REQUIRES_HAVE([hwclock], [io, linuxdummy], [ioperm iopl function or Linux])
 AM_CONDITIONAL([BUILD_HWCLOCK], [test "x$build_hwclock" = xyes])
 
 
+
 UL_BUILD_INIT([fstrim], [check])
 UL_REQUIRES_LINUX([fstrim])
 UL_REQUIRES_BUILD([fstrim], [libmount])
diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am
index 2ef3edc4fb..170061a454 100644
--- a/disk-utils/Makemodule.am
+++ b/disk-utils/Makemodule.am
@@ -1,4 +1,5 @@
 
+if BUILD_MINIX
 sbin_PROGRAMS += fsck.minix
 dist_man_MANS += disk-utils/fsck.minix.8
 fsck_minix_SOURCES = \
@@ -12,6 +13,7 @@ mkfs_minix_SOURCES = \
 	disk-utils/minix_programs.h \
 	disk-utils/mkfs.minix.c
 mkfs_minix_LDADD = $(LDADD) libcommon.la
+endif
 
 sbin_PROGRAMS += mkfs
 dist_man_MANS += disk-utils/mkfs.8
diff --git a/m4/ul.m4 b/m4/ul.m4
index c3c8059c3b..d18f45914c 100644
--- a/m4/ul.m4
+++ b/m4/ul.m4
@@ -296,7 +296,7 @@ AC_DEFUN([UL_REQUIRES_SYSCALL_CHECK], [
   fi
 ])
 
-dnl UL_INIT_BUILD(NAME, [ENABLE_STATE], [VARSUFFIX = $1])
+dnl UL_BUILD_INIT(NAME, [ENABLE_STATE], [VARSUFFIX = $1])
 dnl
 dnl Initializes $build_<name>  variable according to $enable_<name>. If
 dnl $enable_<name> is undefined then ENABLE_STATE is used and $enable_<name> is