diff options
| author | Guido Günther <agx@sigxcpu.org> | 2013-09-26 12:17:15 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2013-09-26 12:17:15 +0200 |
| commit | 20cacffd38862928f8fb3e53b99369d67bcda7df (patch) | |
| tree | 7d9a0b0c18474f859afdd79302a48b7ff95e554d /m4 | |
| parent | 7b8d517a7feb2a54cbf5ba2a5f1aa4e3a4a6ffcd (diff) | |
New upstream version 1.1.3~rc1
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/virt-apparmor.m4 | 4 | ||||
| -rw-r--r-- | m4/virt-compile-warnings.m4 | 2 | ||||
| -rw-r--r-- | m4/virt-lib.m4 | 12 | ||||
| -rw-r--r-- | m4/virt-selinux.m4 | 3 |
4 files changed, 10 insertions, 11 deletions
diff --git a/m4/virt-apparmor.m4 b/m4/virt-apparmor.m4 index b358b129c..3b7fc37aa 100644 --- a/m4/virt-apparmor.m4 +++ b/m4/virt-apparmor.m4 @@ -22,8 +22,8 @@ AC_DEFUN([LIBVIRT_CHECK_APPARMOR],[ [aa_change_profile], [sys/apparmor.h]) AC_ARG_WITH([apparmor_mount], - AC_HELP_STRING([--with-apparmor-mount], - [set AppArmor mount point @<:@default=check@:>@]), + [AS_HELP_STRING([--with-apparmor-mount], + [set AppArmor mount point @<:@default=check@:>@])], [], [with_apparmor_mount=check]) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 938c8bbf9..8f905cc93 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -187,8 +187,6 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ esac wantwarn="$wantwarn -fexceptions" wantwarn="$wantwarn -fasynchronous-unwind-tables" - wantwarn="$wantwarn -fdiagnostics-show-option" - wantwarn="$wantwarn -funit-at-a-time" # Need -fipa-pure-const in order to make -Wsuggest-attribute=pure # fire even without -O. diff --git a/m4/virt-lib.m4 b/m4/virt-lib.m4 index 70400a12d..cff4fbb8d 100644 --- a/m4/virt-lib.m4 +++ b/m4/virt-lib.m4 @@ -62,10 +62,10 @@ AC_DEFUN([LIBVIRT_CHECK_LIB],[ m4_pushdef([arg_var], [with-]check_name_lc) m4_pushdef([with_var], [with_]check_name_lc) + m4_divert_text([DEFAULTS], [with_var][=check]) AC_ARG_WITH(check_name_lc, [AS_HELP_STRING([--arg_var], - [with lib]]m4_dquote(library_name)[[ support @<:@default=check@:>@])], - [],[with_var][=check]) + [with lib]]m4_dquote(library_name)[[ support @<:@default=check@:>@])]) old_LIBS=$LIBS old_CFLAGS=$CFLAGS @@ -192,10 +192,10 @@ AC_DEFUN([LIBVIRT_CHECK_LIB_ALT],[ 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_lc, [AS_HELP_STRING([--arg_var], - [with lib]]m4_dquote(library_name)[[ support @<:@default=check@:>@])], - [],[with_var][=check]) + [with lib]]m4_dquote(library_name)[[ support @<:@default=check@:>@])]) old_LIBS=$LIBS old_CFLAGS=$CFLAGS @@ -318,10 +318,10 @@ AC_DEFUN([LIBVIRT_CHECK_PKG],[ m4_pushdef([arg_var], [with-]check_name_lc) m4_pushdef([with_var], [with_]check_name_lc) + m4_divert_text([DEFAULTS], [with_var][=check]) AC_ARG_WITH(check_name_lc, [AS_HELP_STRING([--arg_var], - [with ]]m4_dquote(pc_name)[[ (>= ]]m4_dquote(pc_version)[[) support @<:@default=check@:>@])], - [],[with_var][=check]) + [with ]]m4_dquote(pc_name)[[ (>= ]]m4_dquote(pc_version)[[) support @<:@default=check@:>@])]) fail=0 if test "x$with_var" != "xno" ; then diff --git a/m4/virt-selinux.m4 b/m4/virt-selinux.m4 index abb0d1284..003c2a868 100644 --- a/m4/virt-selinux.m4 +++ b/m4/virt-selinux.m4 @@ -22,7 +22,8 @@ AC_DEFUN([LIBVIRT_CHECK_SELINUX],[ [fgetfilecon_raw], [selinux/selinux.h]) AC_ARG_WITH([selinux_mount], - AC_HELP_STRING([--with-selinux-mount], [set SELinux mount point @<:@default=check@:>@]), + [AS_HELP_STRING([--with-selinux-mount], + [set SELinux mount point @<:@default=check@:>@])], [], [with_selinux_mount=check]) |