[libvirt] [PATCH 65/89] configure: move PHYP driver check to its own file

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- configure.ac | 22 +++------------------- m4/virt-driver-phyp.m4 | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 19 deletions(-) create mode 100644 m4/virt-driver-phyp.m4 diff --git a/configure.ac b/configure.ac index 4b041adeac..fac9864217 100644 --- a/configure.ac +++ b/configure.ac @@ -402,7 +402,7 @@ LIBVIRT_DRIVER_ARG_XEN LIBVIRT_DRIVER_ARG_QEMU LIBVIRT_DRIVER_ARG_OPENVZ LIBVIRT_DRIVER_ARG_VMWARE -LIBVIRT_ARG_WITH([PHYP], [PHYP], [check]) +LIBVIRT_DRIVER_ARG_PHYP LIBVIRT_DRIVER_ARG_XENAPI LIBVIRT_DRIVER_ARG_LIBXL LIBVIRT_ARG_WITH([VBOX], [VirtualBox XPCOMC], [yes]) @@ -634,23 +634,7 @@ dnl dnl check for PHYP dnl -if test "$with_phyp" != "no"; then - if test "$with_ssh2" = "no" ; then - if test "$with_phyp" = "check"; then - with_phyp=no - else - AC_MSG_ERROR([libssh2 is required for Phyp driver]) - fi - else - with_phyp=yes - fi -fi - -if test "$with_phyp" = "yes"; then - AC_DEFINE_UNQUOTED([WITH_PHYP], 1, [whether IBM HMC / IVM driver is enabled]) -fi - -AM_CONDITIONAL([WITH_PHYP],[test "$with_phyp" = "yes"]) +LIBVIRT_DRIVER_CHECK_PHYP dnl check if the network driver should be compiled @@ -1384,7 +1368,7 @@ AC_MSG_NOTICE([ VBox: $with_vbox]) LIBVIRT_DRIVER_RESULT_XENAPI LIBVIRT_DRIVER_RESULT_LIBXL LIBVIRT_DRIVER_RESULT_LXC -AC_MSG_NOTICE([ PHYP: $with_phyp]) +LIBVIRT_DRIVER_RESULT_PHYP AC_MSG_NOTICE([ ESX: $with_esx]) AC_MSG_NOTICE([ Hyper-V: $with_hyperv]) LIBVIRT_DRIVER_RESULT_VZ diff --git a/m4/virt-driver-phyp.m4 b/m4/virt-driver-phyp.m4 new file mode 100644 index 0000000000..fb4189e779 --- /dev/null +++ b/m4/virt-driver-phyp.m4 @@ -0,0 +1,48 @@ +dnl The Phyp driver +dnl +dnl Copyright (C) 2016 Red Hat, Inc. +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License, or (at your option) any later version. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library. If not, see +dnl <http://www.gnu.org/licenses/>;. +dnl + +AC_DEFUN([LIBVIRT_DRIVER_ARG_PHYP], [ + LIBVIRT_ARG_WITH([PHYP], [PHYP], [check]) +]) + +AC_DEFUN([LIBVIRT_DRIVER_CHECK_PHYP], [ + AC_REQUIRE([LIBVIRT_CHECK_SSH2]) + + if test "$with_phyp" != "no"; then + if test "$with_ssh2" = "no" ; then + if test "$with_phyp" = "check"; then + with_phyp=no + else + AC_MSG_ERROR([libssh2 is required for Phyp driver]) + fi + else + with_phyp=yes + fi + fi + + if test "$with_phyp" = "yes"; then + AC_DEFINE_UNQUOTED([WITH_PHYP], 1, [whether IBM HMC / IVM driver is enabled]) + fi + + AM_CONDITIONAL([WITH_PHYP],[test "$with_phyp" = "yes"]) +]) + +AC_DEFUN([LIBVIRT_DRIVER_RESULT_PHYP], [ + LIBVIRT_RESULT([PHYP], [$with_phyp]) +]) -- 2.11.0