configure: use LIBVIRT_ARG_WITH(_ALT) macros

Signed-off-by: NPavel Hrdina <phrdina@redhat.com>

m4/virt-apparmor.m4

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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