NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

configure: move xml catalog file check to its own file

Browse Source 
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2016-12-11 19:59:03 +01:00
parent 634cf2bb1e
commit 7d55c6003c
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -386,11 +386,8 @@ else
fi fi
AC_SUBST([HTML_DIR]) AC_SUBST([HTML_DIR])
dnl Specific XML catalog file for validation of generated html LIBVIRT_ARG_XML_CATALOG
LIBVIRT_ARG_WITH_ALT([XML_CATALOG_FILE], LIBVIRT_CHECK_XML_CATALOG
[path to XML catalog file for validating generated html],
['/etc/xml/catalog'])
AC_SUBST([XML_CATALOG_FILE], [$with_xml_catalog_file])
dnl if --prefix is /usr, don't use /usr/var for localstatedir dnl if --prefix is /usr, don't use /usr/var for localstatedir
dnl or /usr/etc for sysconfdir dnl or /usr/etc for sysconfdir
@ -1835,7 +1832,7 @@ AC_MSG_NOTICE([ Use -Werror: $enable_werror])
AC_MSG_NOTICE([ Warning Flags: $WARN_CFLAGS]) AC_MSG_NOTICE([ Warning Flags: $WARN_CFLAGS])
LIBVIRT_RESULT_DTRACE LIBVIRT_RESULT_DTRACE
LIBVIRT_RESULT_NUMAD LIBVIRT_RESULT_NUMAD
AC_MSG_NOTICE([ XML Catalog: $with_xml_catalog_file]) LIBVIRT_RESULT_XML_CATALOG
LIBVIRT_RESULT_INIT_SCRIPT LIBVIRT_RESULT_INIT_SCRIPT
LIBVIRT_RESULT_CHRDEV_LOCK_FILES LIBVIRT_RESULT_CHRDEV_LOCK_FILES
LIBVIRT_RESULT_DEFAULT_EDITOR LIBVIRT_RESULT_DEFAULT_EDITOR

33
m4/virt-xml-catalog.m4 Normal file
View File

@ -0,0 +1,33 @@
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_ALT([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])
])