[libvirt] [PATCH] build: fix parted detection at configure time

* configure.ac (PARTED_FOUND): Issue configure error if --with-storage-disk=yes but no parted is found. --- As pointed out while reviewing Osier's patch, we were unconditionally nuking with_storage_disk=no if parted was not found, then trying to issue AC_MSG_ERROR if the user had passed in yes. Also break some long lines. configure.ac | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index f310a5e..2873fff 100644 --- a/configure.ac +++ b/configure.ac @@ -1703,17 +1703,18 @@ AC_SUBST([DEVMAPPER_LIBS]) LIBPARTED_CFLAGS= LIBPARTED_LIBS= -if test "$with_storage_disk" = "yes" || test "$with_storage_disk" = "check"; then +if test "$with_storage_disk" = "yes" || + test "$with_storage_disk" = "check"; then AC_PATH_PROG([PARTED], [parted], [], [$PATH:/sbin:/usr/sbin]) if test -z "$PARTED" ; then - with_storage_disk=no PARTED_FOUND=no else PARTED_FOUND=yes fi - if test "$with_storage_disk" != "no" && test "x$PKG_CONFIG" != "x" ; then - PKG_CHECK_MODULES(LIBPARTED, libparted >= $PARTED_REQUIRED, [], [PARTED_FOUND=no]) + if test "$PARTED_FOUND" = yes && test "x$PKG_CONFIG" != "x" ; then + PKG_CHECK_MODULES(LIBPARTED, libparted >= $PARTED_REQUIRED, [], + [PARTED_FOUND=no]) fi if test "$PARTED_FOUND" = "no"; then # RHEL-5 vintage parted is missing pkg-config files @@ -1739,8 +1740,10 @@ if test "$with_storage_disk" = "yes" || test "$with_storage_disk" = "check"; the fi if test "$with_storage_disk" = "yes"; then - AC_DEFINE_UNQUOTED([WITH_STORAGE_DISK], 1, [whether Disk backend for storage driver is enabled]) - AC_DEFINE_UNQUOTED([PARTED],["$PARTED"], [Location or name of the parted program]) + AC_DEFINE_UNQUOTED([WITH_STORAGE_DISK], 1, + [whether Disk backend for storage driver is enabled]) + AC_DEFINE_UNQUOTED([PARTED],["$PARTED"], + [Location or name of the parted program]) fi fi AM_CONDITIONAL([WITH_STORAGE_DISK], [test "$with_storage_disk" = "yes"]) -- 1.7.3.5