all: drop YAML dependency

This commit is contained in:
Lubomir Rintel 2016-11-21 18:06:14 +01:00
parent 3b64dc9cbd
commit d3f7f7abca
4 changed files with 1 additions and 17 deletions

View file

@ -1109,20 +1109,8 @@ if test -n "$INTROSPECTION_MAKEFILE" -a "$enable_gtk_doc" = "yes"; then
# gtk-doc depends on perl, but we can check for it anyway
AC_PATH_PROG(PERL, perl, no)
# check for needed perl modules (use YAML; YAML::XS is better, but may not be so widespread)
required_perl_modules="YAML"
for module in $required_perl_modules; do
AC_MSG_CHECKING([checking for perl module '$module'])
if ${PERL} -e 'use '$module 2>/dev/null ; then
AC_MSG_RESULT([Ok])
have_perl_modules=yes
else
AC_MSG_RESULT([Failed])
AC_MSG_ERROR([You must have Perl modules to build settings plugin docs: $required_perl_modules.])
fi
done
if test "$have_pyobject" = "yes" -a "$have_perl_modules" = "yes"; then
if test "$have_pyobject" = "yes"; then
AC_DEFINE(BUILD_SETTING_DOCS, [1], [Define if you we can build nm-setting-docs.xml, nm-keyfile-docs.xml and nm-ifcfg-rh-docs.xml])
build_setting_docs=yes
fi

View file

@ -39,8 +39,6 @@ yum install \
readline-devel \
teamd-devel \
rpm-build \
perl-YAML-LibYAML \
perl-YAML \
audit-libs-devel \
bluez-libs-devel \
dbus-python \

View file

@ -41,7 +41,6 @@ PACKAGES="kernel passwd git autoconf automake libtool intltool gtk-doc libnl3-de
bash-completion man-db man-pages vim-minimal
firewalld
vim
perl-YAML
wget
gdb valgrind lsof strace nmap-ncat tcpdump
net-tools bridge-utils vconfig

View file

@ -139,7 +139,6 @@ BuildRequires: gettext-devel
BuildRequires: pkgconfig
BuildRequires: libnl3-devel >= %{libnl3_version}
BuildRequires: perl(XML::Parser)
BuildRequires: perl(YAML)
BuildRequires: automake autoconf intltool libtool
BuildRequires: ppp-devel >= 2.4.5
BuildRequires: nss-devel >= 3.11.7