This patch moves the virtualport result out of *Driver* section because it's not a driver. Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- configure.ac | 40 +++---------------------------- m4/virt-virtualport.m4 | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 37 deletions(-) create mode 100644 m4/virt-virtualport.m4 diff --git a/configure.ac b/configure.ac index 694823b5e2..b870ab68bc 100644 --- a/configure.ac +++ b/configure.ac @@ -1800,42 +1800,8 @@ LIBVIRT_ARG_MACVTAP LIBVIRT_CHECK_MACVTAP -LIBVIRT_ARG_WITH_ALT([VIRTUALPORT], [enable virtual port support], [check]) - -dnl Warn the user and error out if they requested virtualport support with configure -dnl options, but the required macvtap support isn't available - -if test "$with_virtualport" = "yes"; then - if test "$with_macvtap" = "no"; then - AC_MSG_ERROR([--with-virtualport requires --with-macvtap]) - fi -fi - -dnl virtualport checks - -if test "$with_macvtap" != "yes"; then - with_virtualport=no -fi -if test "$with_virtualport" != "no"; then - AC_MSG_CHECKING([whether to compile with virtual port support]) - AC_TRY_COMPILE([ #include <sys/socket.h> - #include <linux/rtnetlink.h> ], - [ int x = IFLA_PORT_MAX; ], - [ with_virtualport=yes ], - [ if test "$with_virtualport" = "yes" ; then - AC_MSG_ERROR([Installed linux headers don't show support for virtual port support.]) - fi - with_virtualport=no ]) - if test "$with_virtualport" = "yes"; then - val=1 - else - val=0 - fi - AC_DEFINE_UNQUOTED([WITH_VIRTUALPORT], $val, - [whether vsi vepa support is enabled]) - AC_MSG_RESULT([$with_virtualport]) -fi -AM_CONDITIONAL([WITH_VIRTUALPORT], [test "$with_virtualport" = "yes"]) +LIBVIRT_ARG_VIRTUALPORT +LIBVIRT_CHECK_VIRTUALPORT dnl GET_VLAN_VID_CMD is required for virNetDevGetVLanID AC_CHECK_DECLS([GET_VLAN_VID_CMD], [], [], [[#include <linux/if_vlan.h>]]) @@ -2060,7 +2026,6 @@ AC_MSG_NOTICE([ Remote: $with_remote]) AC_MSG_NOTICE([ Network: $with_network]) AC_MSG_NOTICE([ Libvirtd: $with_libvirtd]) AC_MSG_NOTICE([Interface: $with_interface]) -AC_MSG_NOTICE([ virtport: $with_virtualport]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([]) @@ -2118,6 +2083,7 @@ LIBVIRT_RESULT_SASL LIBVIRT_RESULT_SELINUX LIBVIRT_RESULT_SSH2 LIBVIRT_RESULT_UDEV +LIBVIRT_RESULT_VIRTUALPORT LIBVIRT_RESULT_XDR LIBVIRT_RESULT_YAJL if test "$with_xen" = "yes" ; then diff --git a/m4/virt-virtualport.m4 b/m4/virt-virtualport.m4 new file mode 100644 index 0000000000..9074fb6388 --- /dev/null +++ b/m4/virt-virtualport.m4 @@ -0,0 +1,65 @@ +dnl The virtualport support check +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_ARG_VIRTUALPORT], [ + LIBVIRT_ARG_WITH_ALT([VIRTUALPORT], [enable virtual port support], [check]) +]) + +AC_DEFUN([LIBVIRT_CHECK_VIRTUALPORT],[ + AC_REQUIRE([LIBVIRT_CHECK_MACVTAP]) + + dnl Warn the user and error out if they requested virtualport support + dnl with configure options, but the required macvtap support isn't available + + if test "$with_virtualport" = "yes"; then + if test "$with_macvtap" = "no"; then + AC_MSG_ERROR([--with-virtualport requires --with-macvtap]) + fi + fi + + dnl virtualport checks + + if test "$with_macvtap" != "yes"; then + with_virtualport=no + fi + if test "$with_virtualport" != "no"; then + AC_MSG_CHECKING([whether to compile with virtual port support]) + AC_TRY_COMPILE([ #include <sys/socket.h> + #include <linux/rtnetlink.h> ], + [ int x = IFLA_PORT_MAX; ], + [ with_virtualport=yes ], + [ if test "$with_virtualport" = "yes" ; then + AC_MSG_ERROR([Installed linux headers don't show support for virtual port support.]) + fi + with_virtualport=no ]) + if test "$with_virtualport" = "yes"; then + val=1 + else + val=0 + fi + AC_DEFINE_UNQUOTED([WITH_VIRTUALPORT], $val, + [whether vsi vepa support is enabled]) + AC_MSG_RESULT([$with_virtualport]) + fi + AM_CONDITIONAL([WITH_VIRTUALPORT], [test "$with_virtualport" = "yes"]) +]) + +AC_DEFUN([LIBVIRT_RESULT_VIRTUALPORT],[ + LIBVIRT_RESULT_LIB([VIRTUALPORT]) +]) -- 2.11.0 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
