On Wed, Jul 22, 2020 at 12:29:12PM +0200, Peter Krempa wrote: > On Thu, Jul 16, 2020 at 11:55:15 +0200, Pavel Hrdina wrote: > > Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> > > --- > > configure.ac | 3 --- > > m4/virt-yajl.m4 | 42 ------------------------------------------ > > meson.build | 25 +++++++++++++++++++++++++ > > meson_options.txt | 1 + > > 4 files changed, 26 insertions(+), 45 deletions(-) > > delete mode 100644 m4/virt-yajl.m4 > > > > diff --git a/configure.ac b/configure.ac > > index 1a1a855cba6..7c872bbfe6c 100644 > > --- a/configure.ac > > +++ b/configure.ac > > @@ -109,11 +109,9 @@ fi > > > > LIBVIRT_ARG_NSS > > LIBVIRT_ARG_PM_UTILS > > -LIBVIRT_ARG_YAJL > > > > LIBVIRT_CHECK_NWFILTER > > LIBVIRT_CHECK_PM_UTILS > > -LIBVIRT_CHECK_YAJL > > > > > > > > @@ -392,7 +390,6 @@ LIBVIRT_RESULT_LIBXL > > LIBVIRT_RESULT_NSS > > LIBVIRT_RESULT_PM_UTILS > > LIBVIRT_RESULT_RBD > > -LIBVIRT_RESULT_YAJL > > AC_MSG_NOTICE([]) > > AC_MSG_NOTICE([Windows]) > > AC_MSG_NOTICE([]) > > diff --git a/m4/virt-yajl.m4 b/m4/virt-yajl.m4 > > deleted file mode 100644 > > index b602abd0a7c..00000000000 > > --- a/m4/virt-yajl.m4 > > +++ /dev/null > > @@ -1,42 +0,0 @@ > > -dnl The libyajl.so library > > -dnl > > -dnl Copyright (C) 2012-2013 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_YAJL],[ > > - LIBVIRT_ARG_WITH_FEATURE([YAJL], [yajl], [check]) > > -]) > > - > > -AC_DEFUN([LIBVIRT_CHECK_YAJL],[ > > - dnl YAJL JSON library http://lloyd.github.com/yajl/ > > - > > - PKG_CHECK_EXISTS([yajl], [use_pkgconfig=1], [use_pkgconfig=0]) > > - > > - if test $use_pkgconfig = 1; then > > - dnl 2.0.3 was the version where the pkg-config file was first added > > - LIBVIRT_CHECK_PKG([YAJL], [yajl], [2.0.3]) > > - else > > - dnl SLES 12 and openSUSE Leap 42.3 still use 2.0.1 > > - dnl TODO: delete this in July 2020 > > - LIBVIRT_CHECK_LIB([YAJL], [yajl], > > - [yajl_tree_parse], [yajl/yajl_common.h]) > > - fi > > -]) > > - > > -AC_DEFUN([LIBVIRT_RESULT_YAJL],[ > > - LIBVIRT_RESULT_LIB([YAJL]) > > -]) > > diff --git a/meson.build b/meson.build > > index 948ca4d93ab..13062279c0a 100644 > > --- a/meson.build > > +++ b/meson.build > > @@ -1454,6 +1454,30 @@ else > > xdr_dep = declare_dependency() > > endif > > > > +yajl_version = '2.0.3' > > +if not get_option('yajl').disabled() > > + yajl_dep = dependency('yajl', version: '>=' + yajl_version, required: false) > > + # 2.0.3 was the version where the pkg-config file was first added > > + # SLES 12 and openSUSE Leap 42.3 still use 2.0.1 > > + # TODO: delete this in July 2020 > > Is it already time to clean this up and switch to a proper version? Possibly but I would rather do it as followup to not introduce conflicts within this series. Pavel
Attachment:
signature.asc
Description: PGP signature
