提交 3365cdf8 编写于 作者: P Pavel Hrdina

m4: virt-netcf: bump minimal version to 0.1.8

This version is available on all supported OSes and includes the
transaction APIs.
Signed-off-by: NPavel Hrdina <phrdina@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
上级 c7f8a66b
......@@ -18,25 +18,11 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_NETCF],[
LIBVIRT_ARG_WITH_FEATURE([NETCF], [netcf], [check], [0.1.4])
LIBVIRT_ARG_WITH_FEATURE([NETCF], [netcf], [check], [0.1.8])
])
AC_DEFUN([LIBVIRT_CHECK_NETCF],[
LIBVIRT_CHECK_PKG([NETCF], [netcf], [0.1.4])
if test "$with_netcf" = "yes" ; then
old_CFLAGS="$CFLAGS"
old_LIBS="$LIBS"
CFLAGS="$CFLAGS $NETCF_CFLAGS"
LIBS="$LIBS $NETCF_LIBS"
AC_CHECK_FUNC([ncf_change_begin], [netcf_transactions=1], [netcf_transactions=0])
if test "$netcf_transactions" = "1" ; then
AC_DEFINE_UNQUOTED([HAVE_NETCF_TRANSACTIONS], [1],
[we have sufficiently new version of netcf for transaction network API])
fi
CFLAGS="$old_CFLAGS"
LIBS="$old_LIBS"
fi
LIBVIRT_CHECK_PKG([NETCF], [netcf], [0.1.8])
])
AC_DEFUN([LIBVIRT_RESULT_NETCF],[
......
......@@ -1117,7 +1117,6 @@ static int netcfInterfaceIsActive(virInterfacePtr ifinfo)
return ret;
}
#ifdef HAVE_NETCF_TRANSACTIONS
static int netcfInterfaceChangeBegin(virConnectPtr conn, unsigned int flags)
{
int ret;
......@@ -1192,7 +1191,6 @@ static int netcfInterfaceChangeRollback(virConnectPtr conn, unsigned int flags)
virObjectUnlock(driver);
return ret;
}
#endif /* HAVE_NETCF_TRANSACTIONS */
static virInterfaceDriver interfaceDriver = {
.name = INTERFACE_DRIVER_NAME,
......@@ -1209,11 +1207,9 @@ static virInterfaceDriver interfaceDriver = {
.interfaceCreate = netcfInterfaceCreate, /* 0.7.0 */
.interfaceDestroy = netcfInterfaceDestroy, /* 0.7.0 */
.interfaceIsActive = netcfInterfaceIsActive, /* 0.7.3 */
#ifdef HAVE_NETCF_TRANSACTIONS
.interfaceChangeBegin = netcfInterfaceChangeBegin, /* 0.9.2 */
.interfaceChangeCommit = netcfInterfaceChangeCommit, /* 0.9.2 */
.interfaceChangeRollback = netcfInterfaceChangeRollback, /* 0.9.2 */
#endif /* HAVE_NETCF_TRANSACTIONS */
};
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册