Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
08c2d148
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,发现更多精彩内容 >>
提交
08c2d148
编写于
11月 14, 2016
作者:
P
Pavel Hrdina
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
configure: use LIBVIRT_ARG_WITH(_ALT) macros
Signed-off-by:
N
Pavel Hrdina
<
phrdina@redhat.com
>
上级
7f1e6e9d
变更
12
展开全部
隐藏空白更改
内联
并排
Showing
12 changed file
with
134 addition
and
333 deletion
+134
-333
configure.ac
configure.ac
+115
-266
m4/virt-apparmor.m4
m4/virt-apparmor.m4
+1
-5
m4/virt-driver-bhyve.m4
m4/virt-driver-bhyve.m4
+1
-4
m4/virt-driver-uml.m4
m4/virt-driver-uml.m4
+1
-4
m4/virt-driver-vz.m4
m4/virt-driver-vz.m4
+1
-4
m4/virt-host-validate.m4
m4/virt-host-validate.m4
+1
-4
m4/virt-init-script.m4
m4/virt-init-script.m4
+3
-5
m4/virt-lib.m4
m4/virt-lib.m4
+3
-24
m4/virt-login-shell.m4
m4/virt-login-shell.m4
+1
-4
m4/virt-nss.m4
m4/virt-nss.m4
+3
-4
m4/virt-selinux.m4
m4/virt-selinux.m4
+1
-5
m4/virt-wireshark.m4
m4/virt-wireshark.m4
+3
-4
未找到文件。
configure.ac
浏览文件 @
08c2d148
此差异已折叠。
点击以展开。
m4/virt-apparmor.m4
浏览文件 @
08c2d148
...
...
@@ -21,11 +21,7 @@ AC_DEFUN([LIBVIRT_CHECK_APPARMOR],[
LIBVIRT_CHECK_LIB([APPARMOR], [apparmor],
[aa_change_profile], [sys/apparmor.h])
AC_ARG_WITH([apparmor_mount],
[AS_HELP_STRING([--with-apparmor-mount],
[set AppArmor mount point @<:@default=check@:>@])],
[],
[with_apparmor_mount=check])
LIBVIRT_ARG_WITH_ALT([APPARMOR_MOUNT], [set AppArmor mount point], [check])
if test "$with_apparmor" = "yes"; then
AC_DEFINE_UNQUOTED([APPARMOR_DIR],
...
...
m4/virt-driver-bhyve.m4
浏览文件 @
08c2d148
...
...
@@ -18,10 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_DRIVER_CHECK_BHYVE],[
AC_ARG_WITH([bhyve],
[AS_HELP_STRING([--with-bhyve],
[add BHyVe support @<:@default=check@:>@])])
m4_divert_text([DEFAULTS], [with_bhyve=check])
LIBVIRT_ARG_WITH([BHYVE], [BHyVe], [check])
if test "$with_bhyve" != "no"; then
AC_PATH_PROG([BHYVE], [bhyve], [], [$PATH:/usr/sbin])
...
...
m4/virt-driver-uml.m4
浏览文件 @
08c2d148
...
...
@@ -18,10 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_DRIVER_CHECK_UML],[
AC_ARG_WITH([uml],
[AS_HELP_STRING([--with-uml],
[add UML support @<:@default=check@:>@])])
m4_divert_text([DEFAULTS], [with_uml=check])
LIBVIRT_ARG_WITH([UML], [UML], [check])
if test "$with_libvirtd" = "no" || test "$with_linux" = "no"; then
if test "$with_uml" = "yes"; then
...
...
m4/virt-driver-vz.m4
浏览文件 @
08c2d148
...
...
@@ -18,10 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_DRIVER_CHECK_VZ],[
AC_ARG_WITH([vz],
[AS_HELP_STRING([--with-vz],
[add Virtuozzo support @<:@default=check@:>@])])
m4_divert_text([DEFAULTS], [with_vz=check])
LIBVIRT_ARG_WITH([VZ], [Virtuozzo], [check])
if test "$with_vz" = "yes" ||
test "$with_vz" = "check"; then
...
...
m4/virt-host-validate.m4
浏览文件 @
08c2d148
...
...
@@ -16,10 +16,7 @@ dnl License along with this library. If not, see
dnl <http://www.gnu.org/licenses/>.
AC_DEFUN([LIBVIRT_CHECK_HOST_VALIDATE], [
AC_ARG_WITH([host_validate],
[AS_HELP_STRING([--with-host-validate],
[build virt-host-validate @<:@default=check@:>@])])
m4_divert_text([DEFAULTS], [with_host_validate=check])
LIBVIRT_ARG_WITH_ALT([HOST_VALIDATE], [build virt-host-validate], [check])
if test "x$with_host_validate" != "xno"; then
if test "x$with_win" = "xyes"; then
...
...
m4/virt-init-script.m4
浏览文件 @
08c2d148
...
...
@@ -18,11 +18,9 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_CHECK_INIT_SCRIPT],[
AC_ARG_WITH([init-script],
[AS_HELP_STRING([--with-init-script@<:@=STYLE@:>@],
[Style of init script to install: redhat, systemd, systemd+redhat,
upstart, check, none @<:@default=check@:>@])],
[],[with_init_script=check])
LIBVIRT_ARG_WITH_ALT([INIT_SCRIPT],
[Style of init script to install: redhat, systemd,
systemd+redhat, upstart, check, none], [check])
AC_MSG_CHECKING([for init script type])
...
...
m4/virt-lib.m4
浏览文件 @
08c2d148
...
...
@@ -54,19 +54,14 @@ AC_DEFUN([LIBVIRT_CHECK_LIB],[
m4_pushdef([header_name], [$4])
m4_pushdef([check_name_lc], m4_tolower(check_name))
m4_pushdef([check_name_dash], m4_translit(check_name_lc, [_], [-]))
m4_pushdef([config_var], [WITH_]check_name)
m4_pushdef([make_var], [WITH_]check_name)
m4_pushdef([cflags_var], check_name[_CFLAGS])
m4_pushdef([libs_var], check_name[_LIBS])
m4_pushdef([arg_var], [with-]check_name_dash)
m4_pushdef([with_var], [with_]check_name_lc)
m4_divert_text([DEFAULTS], [with_var][=check])
AC_ARG_WITH(check_name_dash,
[AS_HELP_STRING([--arg_var],
[with lib]]m4_dquote(library_name)[[ support @<:@default=check@:>@])])
LIBVIRT_ARG_WITH(check_name, library_name, [check])
old_LIBS=$LIBS
old_CFLAGS=$CFLAGS
...
...
@@ -121,13 +116,11 @@ AC_DEFUN([LIBVIRT_CHECK_LIB],[
fi
m4_popdef([with_var])
m4_popdef([arg_var])
m4_popdef([libs_var])
m4_popdef([cflags_var])
m4_popdef([make_var])
m4_popdef([config_var])
m4_popdef([check_name_dash])
m4_popdef([check_name_lc])
m4_popdef([header_name])
...
...
@@ -184,21 +177,16 @@ AC_DEFUN([LIBVIRT_CHECK_LIB_ALT],[
m4_pushdef([header_name_alt], [$8])
m4_pushdef([check_name_lc], m4_tolower(check_name))
m4_pushdef([check_name_dash], m4_translit(check_name_lc, [_], [-]))
m4_pushdef([config_var], [WITH_]check_name)
m4_pushdef([make_var], [WITH_]check_name)
m4_pushdef([cflags_var], check_name[_CFLAGS])
m4_pushdef([libs_var], check_name[_LIBS])
m4_pushdef([arg_var], [with-]check_name_dash)
m4_pushdef([with_var], [with_]check_name_lc)
m4_pushdef([config_var_alt], [WITH_]check_name_alt)
m4_pushdef([make_var_alt], [WITH_]check_name_alt)
m4_divert_text([DEFAULTS], [with_var][=check])
AC_ARG_WITH(check_name_dash,
[AS_HELP_STRING([--arg_var],
[with lib]]m4_dquote(library_name)[[ support @<:@default=check@:>@])])
LIBVIRT_ARG_WITH(check_name, library_name, [check])
old_LIBS=$LIBS
old_CFLAGS=$CFLAGS
...
...
@@ -269,14 +257,12 @@ AC_DEFUN([LIBVIRT_CHECK_LIB_ALT],[
m4_popdef([make_var_alt])
m4_popdef([config_var_alt])
m4_popdef([with_var])
m4_popdef([arg_var])
m4_popdef([libs_var])
m4_popdef([cflags_var])
m4_popdef([make_var])
m4_popdef([config_var])
m4_popdef([check_name_lc])
m4_popdef([check_name_dash])
m4_popdef([header_name_alt])
m4_popdef([function_name_alt])
...
...
@@ -314,19 +300,14 @@ AC_DEFUN([LIBVIRT_CHECK_PKG],[
m4_pushdef([pc_version], [$3])
m4_pushdef([check_name_lc], m4_tolower(check_name))
m4_pushdef([check_name_dash], m4_translit(check_name_lc, [_], [-]))
m4_pushdef([config_var], [WITH_]check_name)
m4_pushdef([make_var], [WITH_]check_name)
m4_pushdef([cflags_var], check_name[_CFLAGS])
m4_pushdef([libs_var], check_name[_LIBS])
m4_pushdef([arg_var], [with-]check_name_dash)
m4_pushdef([with_var], [with_]check_name_lc)
m4_divert_text([DEFAULTS], [with_var][=check])
AC_ARG_WITH(check_name_dash,
[AS_HELP_STRING([--arg_var],
[with ]]m4_dquote(pc_name)[[ (>= ]]m4_dquote(pc_version)[[) support @<:@default=check@:>@])])
LIBVIRT_ARG_WITH(check_name, pc_name, [check], pc_version)
fail=0
if test "x$with_var" != "xno" ; then
...
...
@@ -351,14 +332,12 @@ AC_DEFUN([LIBVIRT_CHECK_PKG],[
AM_CONDITIONAL(make_var, [test "x$with_var" = "xyes"])
m4_popdef([with_var])
m4_popdef([arg_var])
m4_popdef([libs_var])
m4_popdef([cflags_var])
m4_popdef([make_var])
m4_popdef([config_var])
m4_popdef([check_name_lc])
m4_popdef([check_name_dash])
m4_popdef([pc_version])
m4_popdef([pc_name])
...
...
m4/virt-login-shell.m4
浏览文件 @
08c2d148
...
...
@@ -16,10 +16,7 @@ dnl License along with this library. If not, see
dnl <http://www.gnu.org/licenses/>.
AC_DEFUN([LIBVIRT_CHECK_LOGIN_SHELL], [
AC_ARG_WITH([login_shell],
[AS_HELP_STRING([--with-login-shell],
[build virt-login-shell @<:@default=check@:>@])])
m4_divert_text([DEFAULTS], [with_login_shell=check])
LIBVIRT_ARG_WITH_ALT([LOGIN_SHELL], [build virt-login-shell], [check])
if test "x$with_login_shell" != "xno"; then
if test "x$with_linux" != "xyes"; then
...
...
m4/virt-nss.m4
浏览文件 @
08c2d148
...
...
@@ -18,10 +18,9 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_CHECK_NSS],[
AC_ARG_WITH([nss-plugin],
[AS_HELP_STRING([--with-nss-plugin],
[enable Name Service Switch plugin for resolving guest IP addresses])],
[], [with_nss_plugin=check])
LIBVIRT_ARG_WITH_ALT([NSS_PLUGIN],
[enable Name Service Switch plugin for resolving guest
IP addresses], [check])
bsd_nss=no
fail=0
...
...
m4/virt-selinux.m4
浏览文件 @
08c2d148
...
...
@@ -21,11 +21,7 @@ AC_DEFUN([LIBVIRT_CHECK_SELINUX],[
LIBVIRT_CHECK_LIB([SELINUX], [selinux],
[fgetfilecon_raw], [selinux/selinux.h])
AC_ARG_WITH([selinux_mount],
[AS_HELP_STRING([--with-selinux-mount],
[set SELinux mount point @<:@default=check@:>@])],
[],
[with_selinux_mount=check])
LIBVIRT_ARG_WITH_ALT([SELINUX_MOUNT], [set SELinux mount point], [check])
if test "$with_selinux" = "yes"; then
# libselinux changed signatures between 2.2 and 2.3
...
...
m4/virt-wireshark.m4
浏览文件 @
08c2d148
...
...
@@ -20,10 +20,9 @@ dnl
AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[
LIBVIRT_CHECK_PKG([WIRESHARK_DISSECTOR], [wireshark], [1.11.3])
AC_ARG_WITH([ws-plugindir],
[AS_HELP_STRING([--with-ws-plugindir],
[wireshark plugins directory for use when installing wireshark plugin])],
[], [with_ws_plugindir=check])
LIBVIRT_ARG_WITH_ALT([WS_PLUGINDIR],
[wireshark plugins directory for use when installing
wireshark plugin], [check])
dnl Check for system location of wireshark plugins
if test "x$with_wireshark_dissector" != "xno" ; then
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录