[libvirt] [PATCH 47/89] configure: move default editor check to its own file

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- configure.ac | 6 +++--- m4/virt-default-editor.m4 | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 m4/virt-default-editor.m4 diff --git a/configure.ac b/configure.ac index d6df45e0a9..71f9d7c831 100644 --- a/configure.ac +++ b/configure.ac @@ -1680,8 +1680,8 @@ test "x$lv_cv_static_analysis" = xyes && t=1 AC_DEFINE_UNQUOTED([STATIC_ANALYSIS], [$t], [Define to 1 when performing static analysis.]) -LIBVIRT_ARG_WITH_ALT([DEFAULT_EDITOR], [Editor to use for interactive commands], [vi]) -AC_DEFINE_UNQUOTED([DEFAULT_EDITOR], ["$with_default_editor"], [Default editor to use]) +LIBVIRT_ARG_DEFAULT_EDITOR +LIBVIRT_CHECK_DEFAULT_EDITOR LIBVIRT_ARG_LOADER_NVRAM LIBVIRT_CHECK_LOADER_NVRAM @@ -1842,7 +1842,7 @@ LIBVIRT_RESULT_NUMAD AC_MSG_NOTICE([ XML Catalog: $with_xml_catalog_file]) LIBVIRT_RESULT_INIT_SCRIPT LIBVIRT_RESULT_CHRDEV_LOCK_FILES -AC_MSG_NOTICE([ Default Editor: $with_default_editor]) +LIBVIRT_RESULT_DEFAULT_EDITOR LIBVIRT_RESULT_LOADER_NVRAM LIBVIRT_RESULT_LOGIN_SHELL LIBVIRT_RESULT_HOST_VALIDATE diff --git a/m4/virt-default-editor.m4 b/m4/virt-default-editor.m4 new file mode 100644 index 0000000000..0d50c35612 --- /dev/null +++ b/m4/virt-default-editor.m4 @@ -0,0 +1,32 @@ +dnl The default editor check +dnl +dnl Copyright (C) 2016 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_ARG_DEFAULT_EDITOR], [ + LIBVIRT_ARG_WITH_ALT([DEFAULT_EDITOR], + [Editor to use for interactive commands], [vi]) +]) + +AC_DEFUN([LIBVIRT_CHECK_DEFAULT_EDITOR], [ + AC_DEFINE_UNQUOTED([DEFAULT_EDITOR], ["$with_default_editor"], + [Default editor to use]) +]) + +AC_DEFUN([LIBVIRT_RESULT_DEFAULT_EDITOR], [ + AC_MSG_NOTICE([ Default Editor: $with_default_editor]) +]) -- 2.11.0