[libvirt] [PATCH 0/3] configure: fix building with mpath
Recently we've started adding --with-storage-mpath unconditionally in the specfile. This exposed a bug in our configure script where we would define the WITH_STORAGE_MPATH pre-processor macro only if we checked for mpath, not if it was requested. Ján Tomko (3): configure: define preprocessor macros for SCSI and MPATH configure: error out when asked for mpath on non-Linux configure: remove definition of HAVE_GLIBC_RPCGEN configure.ac | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) -- 2.7.3
This fixes building these backends when explicitly enabled on the command line. Exposed by commit a659559 which started adding --with-storage-mpath in the spec file. https://bugzilla.redhat.com/show_bug.cgi?id=1346724 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 7d16e5a..848ecd6 100644 --- a/configure.ac +++ b/configure.ac @@ -1851,7 +1851,7 @@ else fi AM_CONDITIONAL([WITH_STORAGE_ISCSI], [test "$with_storage_iscsi" = "yes"]) -if test "$with_storage_scsi" = "check"; then +if test "$with_storage_scsi" = "check" || test "$with_storage_scsi" = "yes"; then with_storage_scsi=yes AC_DEFINE_UNQUOTED([WITH_STORAGE_SCSI], 1, @@ -1859,7 +1859,7 @@ if test "$with_storage_scsi" = "check"; then fi AM_CONDITIONAL([WITH_STORAGE_SCSI], [test "$with_storage_scsi" = "yes"]) -if test "$with_storage_mpath" = "check"; then +if test "$with_storage_mpath" = "check" || test "$with_storage_mpath" = "yes"; then if test "$with_linux" = "yes"; then with_storage_mpath=yes -- 2.7.3
On Fri, Jun 17, 2016 at 12:21:34 +0200, Ján Tomko wrote:
This fixes building these backends when explicitly enabled on the command line.
Exposed by commit a659559 which started adding --with-storage-mpath in the spec file.
ACK
--- configure.ac | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index 848ecd6..ab5110b 100644 --- a/configure.ac +++ b/configure.ac @@ -1866,6 +1866,9 @@ if test "$with_storage_mpath" = "check" || test "$with_storage_mpath" = "yes"; t AC_DEFINE_UNQUOTED([WITH_STORAGE_MPATH], 1, [whether mpath backend for storage driver is enabled]) else + if test "$with_storage_mpath" = "yes"; then + AC_MSG_ERROR([mpath storage is only supported on Linux]) + fi with_storage_mpath=no fi fi -- 2.7.3
Unused since commit fb1e8d9 in May 2011. --- configure.ac | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configure.ac b/configure.ac index ab5110b..5c48a02 100644 --- a/configure.ac +++ b/configure.ac @@ -417,10 +417,6 @@ AC_CHECK_LIB([intl],[gettext],[]) dnl Do we have rpcgen? AC_PATH_PROGS([RPCGEN], [rpcgen portable-rpcgen], [no]) AM_CONDITIONAL([HAVE_RPCGEN], [test "x$ac_cv_path_RPCGEN" != "xno"]) -dnl Is this GLIBC's buggy rpcgen? -AM_CONDITIONAL([HAVE_GLIBC_RPCGEN], - [test "x$ac_cv_path_RPCGEN" != "xno" && - $ac_cv_path_RPCGEN -t </dev/null >/dev/null 2>&1]) dnl Miscellaneous external programs. AC_PATH_PROG([XMLLINT], [xmllint], [/usr/bin/xmllint]) -- 2.7.3
participants (3)
-
Ján Tomko -
Pavel Hrdina -
Peter Krempa