diff options
| author | Karel Zak | 2011-03-16 17:39:54 +0100 |
|---|---|---|
| committer | Karel Zak | 2011-03-16 17:39:54 +0100 |
| commit | b98ae9c2e85e67b8efa588d4e7c61ccfafba66dd (patch) | |
| tree | e8d8d0e07eaf756ab7a71e09e3a9903e5a94bc8c /configure.ac | |
| parent | build-sys: don't support external (e2fsprogs) libblkid (diff) | |
| download | kernel-qcow2-util-linux-b98ae9c2e85e67b8efa588d4e7c61ccfafba66dd.tar.gz kernel-qcow2-util-linux-b98ae9c2e85e67b8efa588d4e7c61ccfafba66dd.tar.xz kernel-qcow2-util-linux-b98ae9c2e85e67b8efa588d4e7c61ccfafba66dd.zip | |
build-sys: clean up partx Makefile
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 83cbc7084..d66638d9f 100644 --- a/configure.ac +++ b/configure.ac @@ -367,6 +367,22 @@ AC_ARG_ENABLE([fsck], AM_CONDITIONAL(BUILD_FSCK, test "x$enable_fsck" = xyes) +AC_ARG_ENABLE([partx], + AS_HELP_STRING([--enable-partx], [build addpart, delpart, partx]), + [], enable_partx=check +) +build_partx=yes +if test "x$enable_partx" = xcheck; then + if test "x$linux_os" = xno; then + AC_MSG_WARN([non-linux system; do not build partx utilities]) + build_partx=no + fi +elif test "x$enable_partx" = xno; then + build_partx=no +fi +AM_CONDITIONAL(BUILD_PARTX, test "x$build_partx" = xyes) + + AC_ARG_ENABLE([libuuid], AS_HELP_STRING([--disable-libuuid], [do not build libuuid and uuid utilities]), [], enable_libuuid=yes @@ -419,6 +435,9 @@ else if test "x$enable_fsck" = xyes; then AC_MSG_ERROR([libblkid is needed to build util-linux fsck]) fi + if test "x$build_partx" = xyes; then + AC_MSG_ERROR([libblkid is needed to build util-linux partx]) + fi fi @@ -976,13 +995,6 @@ AC_ARG_ENABLE([mesg], AM_CONDITIONAL(BUILD_MESG, test "x$enable_mesg" = xyes) -AC_ARG_ENABLE([partx], - AS_HELP_STRING([--enable-partx], [build addpart, delpart, partx]), - [], enable_partx=no -) -AM_CONDITIONAL(BUILD_PARTX, test "x$enable_partx" = xyes) - - AC_ARG_ENABLE([raw], AS_HELP_STRING([--enable-raw], [build raw]), [], enable_raw=no |