After validation against XHTML 1.0 was dropped in f802c9de0, the XML_CATALOG_FILE is not in use anymore. Therefore the checks in configure can be removed. --- configure.ac | 3 --- m4/virt-xml-catalog.m4 | 33 --------------------------------- 2 files changed, 36 deletions(-) delete mode 100644 m4/virt-xml-catalog.m4 diff --git a/configure.ac b/configure.ac index 56a7ad780..115eb6088 100644 --- a/configure.ac +++ b/configure.ac @@ -459,7 +459,6 @@ dnl LIBVIRT_ARG_DEBUG LIBVIRT_ARG_DTRACE LIBVIRT_ARG_NUMAD -LIBVIRT_ARG_XML_CATALOG LIBVIRT_ARG_INIT_SCRIPT LIBVIRT_ARG_CHRDEV_LOCK_FILES LIBVIRT_ARG_DEFAULT_EDITOR @@ -473,7 +472,6 @@ LIBVIRT_ARG_SYSCTL_CONFIG LIBVIRT_CHECK_DEBUG LIBVIRT_CHECK_DTRACE LIBVIRT_CHECK_NUMAD -LIBVIRT_CHECK_XML_CATALOG LIBVIRT_CHECK_INIT_SCRIPT LIBVIRT_CHECK_CHRDEV_LOCK_FILES LIBVIRT_CHECK_DEFAULT_EDITOR @@ -1032,7 +1030,6 @@ AC_MSG_NOTICE([ Use -Werror: $enable_werror]) AC_MSG_NOTICE([ Warning Flags: $WARN_CFLAGS]) LIBVIRT_RESULT_DTRACE LIBVIRT_RESULT_NUMAD -LIBVIRT_RESULT_XML_CATALOG LIBVIRT_RESULT_INIT_SCRIPT LIBVIRT_RESULT_CHRDEV_LOCK_FILES LIBVIRT_RESULT_DEFAULT_EDITOR diff --git a/m4/virt-xml-catalog.m4 b/m4/virt-xml-catalog.m4 deleted file mode 100644 index a25ae89f6..000000000 --- a/m4/virt-xml-catalog.m4 +++ /dev/null @@ -1,33 +0,0 @@ -dnl The XML catalog file 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_XML_CATALOG], [ - LIBVIRT_ARG_WITH([XML_CATALOG_FILE], - [path to XML catalog file for validating generated html], - ['/etc/xml/catalog']) -]) - -AC_DEFUN([LIBVIRT_CHECK_XML_CATALOG], [ - dnl Specific XML catalog file for validation of generated html - AC_SUBST([XML_CATALOG_FILE], [$with_xml_catalog_file]) -]) - -AC_DEFUN([LIBVIRT_RESULT_XML_CATALOG], [ - AC_MSG_NOTICE([ XML Catalog: $with_xml_catalog_file]) -]) -- 2.16.2