Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
bae47e4e
L
libvirt
项目概览
openeuler
/
libvirt
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
libvirt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
bae47e4e
编写于
9月 20, 2012
作者:
D
Daniel P. Berrange
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Convert avahi check to use LIBVIRT_CHECK_PKG
Signed-off-by:
N
Daniel P. Berrange
<
berrange@redhat.com
>
上级
2de152d2
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
28 addition
and
32 deletion
+28
-32
configure.ac
configure.ac
+2
-32
m4/virt-avahi.m4
m4/virt-avahi.m4
+26
-0
未找到文件。
configure.ac
浏览文件 @
bae47e4e
...
@@ -98,7 +98,6 @@ fi
...
@@ -98,7 +98,6 @@ fi
dnl Required minimum versions of all libs we depend on
dnl Required minimum versions of all libs we depend on
LIBXML_REQUIRED="2.6.0"
LIBXML_REQUIRED="2.6.0"
GNUTLS_REQUIRED="1.0.25"
GNUTLS_REQUIRED="1.0.25"
AVAHI_REQUIRED="0.6.0"
POLKIT_REQUIRED="0.6"
POLKIT_REQUIRED="0.6"
PARTED_REQUIRED="1.8.0"
PARTED_REQUIRED="1.8.0"
UDEV_REQUIRED=145
UDEV_REQUIRED=145
...
@@ -155,6 +154,7 @@ LIBVIRT_COMPILE_WARNINGS
...
@@ -155,6 +154,7 @@ LIBVIRT_COMPILE_WARNINGS
LIBVIRT_CHECK_APPARMOR
LIBVIRT_CHECK_APPARMOR
LIBVIRT_CHECK_AUDIT
LIBVIRT_CHECK_AUDIT
LIBVIRT_CHECK_AVAHI
LIBVIRT_CHECK_CAPNG
LIBVIRT_CHECK_CAPNG
LIBVIRT_CHECK_DBUS
LIBVIRT_CHECK_DBUS
LIBVIRT_CHECK_NETCF
LIBVIRT_CHECK_NETCF
...
@@ -1171,32 +1171,6 @@ if test "x$with_firewalld" == "xyes" ; then
...
@@ -1171,32 +1171,6 @@ if test "x$with_firewalld" == "xyes" ; then
fi
fi
AM_CONDITIONAL([HAVE_FIREWALLD], [test "x$with_firewalld" != "xno"])
AM_CONDITIONAL([HAVE_FIREWALLD], [test "x$with_firewalld" != "xno"])
dnl Avahi library
AC_ARG_WITH([avahi],
AC_HELP_STRING([--with-avahi], [use avahi to advertise remote daemon @<:@default=check@:>@]),
[],
[with_avahi=check])
AVAHI_CFLAGS=
AVAHI_LIBS=
if test "x$with_avahi" = "xyes" || test "x$with_avahi" = "xcheck"; then
PKG_CHECK_MODULES(AVAHI, avahi-client >= $AVAHI_REQUIRED,
[with_avahi=yes], [
if test "x$with_avahi" = "xcheck" ; then
with_avahi=no
else
AC_MSG_ERROR(
[You must install Avahi >= $AVAHI_REQUIRED to compile libvirt])
fi
])
if test "x$with_avahi" = "xyes" ; then
AC_DEFINE_UNQUOTED([WITH_AVAHI], 1,
[whether Avahi is used to broadcast server presence])
fi
fi
AC_SUBST([AVAHI_CFLAGS])
AC_SUBST([AVAHI_LIBS])
dnl UUCP style file locks for character devices
dnl UUCP style file locks for character devices
if test "$with_chrdev_lock_files" != "no"; then
if test "$with_chrdev_lock_files" != "no"; then
...
@@ -2687,6 +2661,7 @@ AC_MSG_NOTICE([Libraries])
...
@@ -2687,6 +2661,7 @@ AC_MSG_NOTICE([Libraries])
AC_MSG_NOTICE([])
AC_MSG_NOTICE([])
LIBVIRT_RESULT_APPARMOR
LIBVIRT_RESULT_APPARMOR
LIBVIRT_RESULT_AUDIT
LIBVIRT_RESULT_AUDIT
LIBVIRT_RESULT_AVAHI
LIBVIRT_RESULT_CAPNG
LIBVIRT_RESULT_CAPNG
LIBVIRT_RESULT_DBUS
LIBVIRT_RESULT_DBUS
LIBVIRT_RESULT_NETCF
LIBVIRT_RESULT_NETCF
...
@@ -2718,11 +2693,6 @@ else
...
@@ -2718,11 +2693,6 @@ else
AC_MSG_NOTICE([ gnutls: no])
AC_MSG_NOTICE([ gnutls: no])
fi
fi
AC_MSG_NOTICE([firewalld: $with_firewalld])
AC_MSG_NOTICE([firewalld: $with_firewalld])
if test "$with_avahi" = "yes" ; then
AC_MSG_NOTICE([ avahi: $AVAHI_CFLAGS $AVAHI_LIBS])
else
AC_MSG_NOTICE([ avahi: no])
fi
if test "$with_polkit" = "yes" ; then
if test "$with_polkit" = "yes" ; then
if test "$with_polkit0" = "yes" ; then
if test "$with_polkit0" = "yes" ; then
AC_MSG_NOTICE([ polkit: $POLKIT_CFLAGS $POLKIT_LIBS (version 0)])
AC_MSG_NOTICE([ polkit: $POLKIT_CFLAGS $POLKIT_LIBS (version 0)])
...
...
m4/virt-avahi.m4
0 → 100644
浏览文件 @
bae47e4e
dnl The libavahi.so library
dnl
dnl Copyright (C) 2012-2013 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_CHECK_AVAHI],[
LIBVIRT_CHECK_PKG([AVAHI], [avahi-client], [0.6.0])
])
AC_DEFUN([LIBVIRT_RESULT_AVAHI],[
LIBVIRT_RESULT_LIB([AVAHI])
])
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录