openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rework configure logic for virtualport support 

In this patch I am reworking the logic around detecting virtual port support and requiring the libnl dependency.

- It requires --with-macvtap and displays an error in case of --without-macvtap --with-virtualport.
- It tests for availability of certain data in include files and displays an error in case the include file is not at the correct level and --with-virtualport was chosen
- displays 'checking' messages for macvtap and virtualport support and results
- libnl support is required when macvtap is found or requested; if libnl is not there, please supply without-macvtap
This commit is contained in:
Stefan Berger 2010-09-29 07:56:26 -04:00
parent 81e329eb1b
commit b502a6ebac
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
configure.ac
View File

@ -2058,6 +2058,7 @@ AC_ARG_WITH([macvtap],
[with_macvtap=${withval}], [with_macvtap=${withval}],
[with_macvtap=check]) [with_macvtap=check])
AC_MSG_CHECKING([whether to compile with macvtap support])
if test "$with_macvtap" != "no" ; then if test "$with_macvtap" != "no" ; then
AC_TRY_COMPILE([ #include <sys/socket.h> AC_TRY_COMPILE([ #include <sys/socket.h>
#include <linux/rtnetlink.h> ], #include <linux/rtnetlink.h> ],
@ -2075,19 +2076,35 @@ if test "$with_macvtap" != "no" ; then
AC_DEFINE_UNQUOTED([WITH_MACVTAP], $val, [whether macvtap support is enabled]) AC_DEFINE_UNQUOTED([WITH_MACVTAP], $val, [whether macvtap support is enabled])
fi fi
AM_CONDITIONAL([WITH_MACVTAP], [test "$with_macvtap" = "yes"]) AM_CONDITIONAL([WITH_MACVTAP], [test "$with_macvtap" = "yes"])
AC_MSG_RESULT([$with_macvtap])
AC_TRY_COMPILE([ #include <sys/socket.h> AC_ARG_WITH([virtualport],
#include <linux/rtnetlink.h> ], AC_HELP_STRING([--with-virtualport],[enable virtual port support @<:@default=check@:>@]),
[ int x = IFLA_PORT_MAX; ], [with_virtualport=${withval}],
[ with_virtualport=yes ], [with_virtualport=check])
[ with_virtualport=no ])
if test "$with_virtualport" = "yes"; then if test "$with_virtualport" != "no"; then
val=1 if test "$with_macvtap" = "no"; then
else AC_MSG_ERROR([--with-virtualport requires --with-macvtap])
val=0 fi
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 fi
AC_DEFINE_UNQUOTED([WITH_VIRTUALPORT], $val,
[whether vsi vepa support is enabled])
AM_CONDITIONAL([WITH_VIRTUALPORT], [test "$with_virtualport" = "yes"]) AM_CONDITIONAL([WITH_VIRTUALPORT], [test "$with_virtualport" = "yes"])
@ -2096,7 +2113,7 @@ dnl netlink library
LIBNL_CFLAGS="" LIBNL_CFLAGS=""
LIBNL_LIBS="" LIBNL_LIBS=""
if test "$with_macvtap" = "yes" || test "$with_virtualport" = "yes"; then if test "$with_macvtap" = "yes"; then
PKG_CHECK_MODULES([LIBNL], [libnl-1 >= $LIBNL_REQUIRED], [ PKG_CHECK_MODULES([LIBNL], [libnl-1 >= $LIBNL_REQUIRED], [
], [ ], [
AC_MSG_ERROR([libnl >= $LIBNL_REQUIRED is required for macvtap support]) AC_MSG_ERROR([libnl >= $LIBNL_REQUIRED is required for macvtap support])