[PATCH] build-sys: make fdisk, sfdisk, cfdisk optional (enabled by default)

[PATCH] build-sys: make fdisk, sfdisk, cfdisk optional (enabled by default)

[Carlos Santos]

Useful for embedded systems, on which only few utilities are required.

Signed-off-by: Carlos Santos <casantos@datacom.com.br>
---
 configure.ac | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index e32cfc7e4..7e9fcc5f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1152,26 +1152,30 @@ AC_SUBST([LIBFDISK_VERSION_INFO])
 AC_DEFINE_UNQUOTED([LIBFDISK_VERSION], ["$LIBFDISK_VERSION"], [libfdisk version string])
 
 
-UL_BUILD_INIT([fdisk], [check])
+AC_ARG_ENABLE([fdisk],
+  AS_HELP_STRING([--disable-fdisk], [do not build fdisk(8), sfdisk(8) and cfdisk(8)]),
+  [], [UL_DEFAULT_ENABLE([fdisk], [check])]
+)
+UL_BUILD_INIT([fdisk])
 UL_REQUIRES_HAVE([fdisk], [openat], [openat functions])
 UL_REQUIRES_BUILD([fdisk], [libfdisk])
 UL_REQUIRES_BUILD([fdisk], [libsmartcols])
 AM_CONDITIONAL([BUILD_FDISK], [test "x$build_fdisk" = xyes])
 
 
-UL_BUILD_INIT([sfdisk], [check])
+UL_BUILD_INIT([sfdisk])
 UL_REQUIRES_HAVE([sfdisk], [openat], [openat functions])
 UL_REQUIRES_BUILD([sfdisk], [libfdisk])
 UL_REQUIRES_BUILD([sfdisk], [libsmartcols])
-AM_CONDITIONAL([BUILD_SFDISK], [test "x$build_sfdisk" = xyes])
+AM_CONDITIONAL([BUILD_SFDISK], [test "x$build_fdisk" = xyes])
 
 
-UL_BUILD_INIT([cfdisk], [check])
+UL_BUILD_INIT([cfdisk])
 UL_REQUIRES_BUILD([cfdisk], [libfdisk])
 UL_REQUIRES_BUILD([cfdisk], [libsmartcols])
 UL_REQUIRES_HAVE([cfdisk], [open_memstream], [open_memstream function])
 UL_REQUIRES_HAVE([cfdisk], [ncursesw,slang,ncurses], [ncursesw, ncurses or slang library])
-AM_CONDITIONAL([BUILD_CFDISK], [test "x$build_cfdisk" = xyes])
+AM_CONDITIONAL([BUILD_CFDISK], [test "x$build_fdisk" = xyes])
 
 
 AC_ARG_ENABLE([mount],
-- 
2.14.5

Re: [PATCH] build-sys: make fdisk, sfdisk, cfdisk optional (enabled by default)

[Karel Zak]

On Thu, Nov 22, 2018 at 01:05:49PM -0200, Carlos Santos wrote:
>  configure.ac | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)

Applied with a small change, thanks.

> +AC_ARG_ENABLE([fdisk],

renamed to --disable-fdisks

> +  AS_HELP_STRING([--disable-fdisk], [do not build fdisk(8), sfdisk(8) and cfdisk(8)]),
> +  [], [UL_DEFAULT_ENABLE([fdisk], [check])]
> +)

It seems better to initialize $enable_fdisk, $enable_sfdisk and
$enable_cfdisk to keep UL_BUILD_INIT() and UL_REQUIRES_* usable.

    Karel

> +UL_BUILD_INIT([fdisk])
>  UL_REQUIRES_HAVE([fdisk], [openat], [openat functions])
>  UL_REQUIRES_BUILD([fdisk], [libfdisk])
>  UL_REQUIRES_BUILD([fdisk], [libsmartcols])
>  AM_CONDITIONAL([BUILD_FDISK], [test "x$build_fdisk" = xyes])
>  
>  
> -UL_BUILD_INIT([sfdisk], [check])
> +UL_BUILD_INIT([sfdisk])
>  UL_REQUIRES_HAVE([sfdisk], [openat], [openat functions])
>  UL_REQUIRES_BUILD([sfdisk], [libfdisk])
>  UL_REQUIRES_BUILD([sfdisk], [libsmartcols])
> -AM_CONDITIONAL([BUILD_SFDISK], [test "x$build_sfdisk" = xyes])
> +AM_CONDITIONAL([BUILD_SFDISK], [test "x$build_fdisk" = xyes])
>  
>  
> -UL_BUILD_INIT([cfdisk], [check])
> +UL_BUILD_INIT([cfdisk])
>  UL_REQUIRES_BUILD([cfdisk], [libfdisk])
>  UL_REQUIRES_BUILD([cfdisk], [libsmartcols])
>  UL_REQUIRES_HAVE([cfdisk], [open_memstream], [open_memstream function])
>  UL_REQUIRES_HAVE([cfdisk], [ncursesw,slang,ncurses], [ncursesw, ncurses or slang library])
> -AM_CONDITIONAL([BUILD_CFDISK], [test "x$build_cfdisk" = xyes])
> +AM_CONDITIONAL([BUILD_CFDISK], [test "x$build_fdisk" = xyes])
>  
>  
>  AC_ARG_ENABLE([mount],
> -- 
> 2.14.5
> 

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com