Skip to content
Commits on Source (56)
......@@ -13,6 +13,7 @@ Previous maintainers:
Patches contributed by:
Alexey Shabalin <a.shabalin@gmail.com>
Andrea Bolognani <abologna@redhat.com>
Andreas Henriksson <andreas@fatal.se>
Andrew Stormont <andyjstormont@gmail.com>
Arjun Roy <arroy@redhat.com>
......@@ -20,10 +21,14 @@ Charles Arnold <carnold@suse.com>
Christophe Fergeau <cfergeau@redhat.com>
Cole Robinson <crobinso@redhat.com>
Daniel P. Berrange <berrange@redhat.com>
Daniel P. Berrangé <berrange@redhat.com>
David Zeuthen <davidz@redhat.com>
Debarshi Ray <debarshir@gnome.org>
Eric Blake <eblake@redhat.com>
Fabiano Fidêncio <fabiano@fidencio.org>
Fabiano Fidêncio <fidencio@redhat.com>
Felipe Borges <felipe10borges@gmail.com>
Felipe Borges <felipeborges@gnome.org>
Giuseppe Scrivano <gscrivan@redhat.com>
Guido Günther <agx@sigxcpu.org>
Jasper Lievisse Adriaanse <jasper@humppa.nl>
......@@ -36,6 +41,9 @@ Marc-André Lureau <marcandre.lureau@redhat.com>
Marcus Karlsson <mk@acc.umu.se>
Matthew Booth <mbooth@redhat.com>
Michal Privoznik <mprivozn@redhat.com>
Natanael Copa <ncopa@alpinelinux.org>
Pavel Hrdina <phrdina@redhat.com>
Pierre-Alain TORET <pierre-alain.toret@protonmail.com>
Pino Toscano <ptoscano@redhat.com>
Programmingkid <programmingkidx@gmail.com>
Rick Kerkhof <rick.2889@gmail.com>
......@@ -44,10 +52,12 @@ Ryan Lortie <desrt@desrt.ca>
Satoru Satoh <ssato@redhat.com>
T A Mahadevan <ta.mahadevan@gmail.com>
Victor Toso <victortoso@redhat.com>
Vincent <vincent.dao@asianux.com>
Vladimir Beneš <vbenes@redhat.com>
Wanlong Gao <gaowanlong@cn.fujitsu.com>
Yuri Chornoivan <yurchor@ukr.net>
Zeeshan Ali (Khattak) <zeeshanak@gnome.org>
Zeeshan Ali <zeeshan@kinvolk.io>
Zeeshan Ali <zeeshanak@gnome.org>
...send patches to get your name here...
......
2018-06-20 Daniel P. Berrangé <berrange@redhat.com>
Update NEWS for 1.2.0 release
2018-06-12 Fabiano Fidêncio <fabiano@fidencio.org>
silverblue: Move isodata to its own folder
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2018-06-07 Fabiano Fidêncio <fabiano@fidencio.org>
syms: Add missing "global" on 0.2.[7-10] versions
Reported-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
syms: Fix identation of 0.2.13 symbols
When adding the symbols for LIBOSINFO_0.2.13 I mistakenly added the
symbols not respecting default identation used (1 tab) and ended up
using 4 spaces instead.
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2018-05-31 Fabiano Fidêncio <fabiano@fidencio.org>
opensuse: Add Leap 15.0 isodata
Reviewed-by: Christophe Fergeau <cfergeau@redhat.com>
tests: Add test-os-resources
test-os-resources has been written to avoid bug as having minimum
resources greater than the recommended resources in osinfo-db.
This problem was exposed by RHEL/CentOS data files, which caused some
really bad UI effect in clientes using those two attributes (as GNOME
Boxes).
Reviewed-by: Christophe Fergeau <cfergeau@redhat.com>
2018-05-14 Fabiano Fidêncio <fabiano@fidencio.org>
fedora: Add f28 isodata
Reviewed-by: Christophe Fergeau <cfergeau@redhat.com>
2018-05-12 Pierre-Alain TORET <pierre-alain.toret@protonmail.com>
netbsd: Add NetBSD 7.1.2 isodata
Reviewed-by: Fabiano Fidêncio <fabiano@fidencio.org>
2018-05-12 Andrea Bolognani <abologna@redhat.com>
tools: Fix compilation with Clang 6
Clang 6 doesn't like the way the last item in a GOptionEntry
array is initialized:
../../tools/osinfo-install-script.c:87:12: error: missing field
'short_name' initializer [-Werror,-Wmissing-field-initializers]
{ NULL }
^
1 error generated.
gmake[2]: *** [Makefile:540: osinfo-install-script.o] Error 1
gmake[2]: *** Waiting for unfinished jobs....
../../tools/osinfo-detect.c:104:12: error: missing field
'short_name' initializer [-Werror,-Wmissing-field-initializers]
{ NULL }
^
1 error generated.
gmake[2]: *** [Makefile:540: osinfo-detect.o] Error 1
Fix the issue by using the { 0 } initializer instead.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Fabiano Fidêncio <fabiano@fidencio.org>
2018-05-10 Andrea Bolognani <abologna@redhat.com>
autogen: Don't hardcode --enable-gtk-doc
The usual behavior is for configure to detect the availability
of gtk-doc, along with other optional features, and only enable
it if found.
Hardcoding it this way is causing issues for MinGW builds,
where pkg-config is looking in the MinGW-specific paths and
can't locate the native gtk-doc.pc file, thus concluding
gtk-doc must not be present and aborting the build altogether
instead of simply skipping API reference generation.
Both 'make distcheck' (through the DISTCHECK_CONFIGURE_FLAGS
variable) and the prepare-release.sh script are already
enforcing the availability of gtk-doc when preparing releases,
so it's safe to use the default behavior for regular builds.
2018-05-08 Daniel P. Berrangé <berrange@redhat.com>
configure: fix HAVE_CURL conditional on Win32
AM_CONDITIONAL lines must always be executed, but HAVE_CURL was inside
an "if ...", which caused configure to fail when run on Win32.
2018-05-08 Andrea Bolognani <abologna@redhat.com>
spec: Drop %{extra_release}
It was mainly meant to be used for automatic builds through
Test::AutoBuild, so it can be removed now.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
prepare-release: Drop references to Test::AutoBuild
They are misleading, and no longer relevant anyway.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
maint: Rename autobuild.sh to prepare-release.sh
The script was originally used by the Test::AutoBuild
project to perform periodic automatic builds; however, that
effort has been abandoned a long time ago, and these days
libosinfo CI builds are happening on the Jenkins-based
CentOS CI environment under the libvirt umbrella[1], where
build recipes are maintained separately from the projects
themselves.
The script is still used to prepare releases, so it can't
be dropped from the repository: rename it so that its
purpose is more clearly communicated instead.
[1] https://ci.centos.org/view/libvirt/
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2018-05-04 Andrea Bolognani <abologna@redhat.com>
rhel: Fix isodata for RHEL 7.5 on ppc64le
There is a spurious empty line at the end of the file that
causes 'make syntax-check' to fail with:
[...]
tests/isodata/rhel/rhel7.5/RHEL-7.5-20180322.0-Server-ppc64le-dvd1.iso.txt
maint.mk: empty line(s) or no newline at EOF
make: *** [maint.mk:927: sc_prohibit_empty_lines_at_EOF] Error 1
Get rid of it to solve the issue.
See also
https://ci.centos.org/view/libvirt/job/libosinfo-master-syntax-check/123/
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2018-05-02 Felipe Borges <felipe10borges@gmail.com>
rhel: Add RHEL 7.5 isodata
Reviewed-by: Christophe Fergeau <cfergeau@redhat.com>
2018-04-23 Fabiano Fidêncio <fabiano@fidencio.org>
tumbleweed: Add "Kubic DVD/USB Stick" isodata
Reviewed-by: Charles Arnold <carnold@suse.com>
tumbleweed: Add "Network Image" isodata
Reviewed-by: Charles Arnold <carnold@suse.com>
opensuse-42.3: Add "Network Image" isodata
Reviewed-by: Charles Arnold <carnold@suse.com>
2018-04-10 Christophe Fergeau <cfergeau@redhat.com>
loader: Fix leak in osinfo_loader_find_files()
'tmp' is used to iterate over the list of files, so it will be NULL at
the end of the iteration, and g_list_free() will be a no-op.
The initial list is stored in 'children', so free that instead.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2018-04-10 Pierre-Alain TORET <pierre-alain.toret@protonmail.com>
openbsd: add OpenBSD 6.3 isodata
2018-04-10 Natanael Copa <ncopa@alpinelinux.org>
alpinelinux: add Alpine Linux isodata
2018-04-10 Vincent <vincent.dao@asianux.com>
asianux: add Asianux isodata
2018-03-18 Daniel P. Berrangé <berrange@redhat.com>
loader: process files in alphabetical order
Currently when loading DB files we process them in whatever order
readdir() returns them in, which is often inode order. This makes the
order of loading files non-deterministic across installs, and if there
are ambiguities in the data, we can in turn get different results.
eg ISO images match different OS entries depending on load order.
Alphabetically sorting the files doesn't remove any ambiguity that
may exist, but at least gives us consistent results on every host.
Reviewed-by: Fabiano Fidêncio <fabiano@fidencio.org>
2018-03-18 Pierre-Alain TORET <pierre-alain.toret@protonmail.com>
fedora27: Add Atomic Workstation isodata
Reviewed-by: Fabiano Fidêncio <fabiano@fidencio.org>
2018-03-11 Pierre-Alain TORET <pierre-alain.toret@protonmail.com>
fedora: add Fedora 27 isodata
Reviewed-by: Fabiano Fidêncio <fabiano@fidencio.org>
2018-03-11 Charles Arnold <carnold@suse.com>
sles: add SLE12 SP3 ISO Information
Add SLE12 SP3 ISO Information
Reviewed-by: Fabiano Fidêncio <fabiano@fidencio.org>
2018-03-11 Felipe Borges <felipeborges@gnome.org>
windows: add win2k16 test data
Reviewed-by: Fabiano Fidêncio <fabiano@fidencio.org>
pop_os: add Pop!_OS test data
Reviewed-by: Fabiano Fidêncio <fabiano@fidencio.org>
2018-03-11 Christophe Fergeau <cfergeau@redhat.com>
tests: Remove calls to g_log_set_always_fatal()
All tests call that method because they want g_warning() to be fatal.
Since the switch to GTest, this is no longer necessary as this is the
default behaviour.
Reviewed-by: Fabiano Fidêncio <fabiano@fidencio.org>
2018-02-23 Daniel P. Berrangé <berrange@redhat.com>
m4: turn off -Wfunction-cast-type warning flag from gcc8
GCC 8 adds -Wfunction-cast-type to -Wextra, but this breaks when using
G_DEFINE_TYPE which does so called "bad" function casts.
2018-02-19 Christophe Fergeau <cfergeau@redhat.com>
test-isodetect: Iterate over all isodata/ subdirs
When adding support for a new vendor, test-isodetect.c needs to be
updated to list it, which is too easy to forget.
This commit iterates over subdirs in tests/isodata/ and uses these as
the vendors to test for. This means no further modification of
test-isodetect.c is needed when adding a new vendor.
2018-02-16 Christophe Fergeau <cfergeau@redhat.com>
NetBSD: add NetBSD 6.x and 7.x tests isodata
Based on a patch from Vicente Chaves de Melo <vchaves@ymail.com>
2018-02-15 Felipe Borges <felipeborges@gnome.org>
opensuse: add OpenSUSE Leap 42.3 test data
2018-02-14 Felipe Borges <felipeborges@gnome.org>
freedos: add freedos 1.2 test data
2018-01-15 Christophe Fergeau <cfergeau@redhat.com>
test-isodetect: Improve error message on detection failures
Since the switch to the GTest framework, when the test suite fails to
identify an ISO, the error message is:
ERROR:test-isodetect.c:359:test_one: 'matched' should be TRUE
while it used to be the much more explicit:
ERROR **: ISO alpine-extended-3.7.0_rc2-x86_64.iso.txt was not matched by OS alpinelinux3.7
This commit readds the explicit message on this particular failure.
2017-12-04 Daniel P. Berrange <berrange@redhat.com>
Refresh translations from zanata
2017-11-29 Pino Toscano <ptoscano@redhat.com>
ubuntu: add Ubuntu 17.10 test data
2017-11-22 Zeeshan Ali <zeeshan@kinvolk.io>
Drop redundant 'const' keyword from object parameters
Use of 'const' parameter on object parameters is redundant, inconsistent
(both internally and against other GObject libraries) and currently breaks
the low-level Rust binding generator:
https://github.com/gtk-rs/glib/pull/249
2017-11-06 Christophe Fergeau <cfergeau@redhat.com>
tests: Add test case for Windows 10 1709 builds
These are currently missing from osinfo-db
https://bugzilla.redhat.com/show_bug.cgi?id=1509387
2017-11-06 Debarshi Ray <debarshir@gnome.org>
Marginally simplify the code to create and run a GMainLoop
Even though g_main_loop_new accepts a is_running parameter, it isn't
very important since g_main_loop_run will set it to TRUE anyway. There
is no requirement that it should be set before calling g_main_loop_run.
The vast majority of GMainLoop users simply ignore the is_running
parameter unless they are doing something out of the ordinary.
2017-11-01 Pavel Hrdina <phrdina@redhat.com>
tests: get the curl response code every time (more)
This failed on FreeBSD with following error:
../../tests/test-treeuris.c:47:13: error: variable 'response_code' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]
tests: get the curl response code every time
This failed on FreeBSD with following error:
../../tests/test-mediauris.c:47:13: error: variable 'response_code' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
2017-10-20 Roman Bogorodskiy <bogorodskiy@gmail.com>
freebsd: Add FreeBSD 10.4 isodata
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
2017-10-19 Pino Toscano <ptoscano@redhat.com>
tests: convert from check to the GLib testing framework
GLib has shipped a testing framework for many years already, so we can
make use of it, replacing the external "check".
The conversion only switches framework without changing the structure of
the tests, making use of the more appropriate assertion in the various
places.
build: make curl optional, and only for tests
Look for curl only when the tests are enabled, and as optional build
dependency. If curl is missing, then the two network tests are not
built. Also, limit the use of curl CFLAGS/LIBS only for the tests that
really need it.
As side result, it is possible to drop the curl BuildRequires from the
mingw spec, as it builds with --enable-tests=no.
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
build: fix disabling of tests
Actually use the result of the configure switch --enable-tests, enabling
or disabling the tests accordingly.
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
2017-10-18 Pierre-Alain TORET <pierre-alain.toret@protonmail.com>
openbsd: add OpenBSD 5.9 isodata
2017-10-16 Pierre-Alain TORET <pierre-alain.toret@protonmail.com>
openbsd: add OpenBSD 6.2 isodata
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
openbsd: add OpenBSD 6.1 isodata
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
openbsd: add OpenBSD 6.0 isodata
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
2017-10-16 Pino Toscano <ptoscano@redhat.com>
tests: test-mediauris: raise timeout to 5 minutes
With the growing amount of distros in osinfo-db, the test takes more
and more time to complete, hitting the 2 minutes timeout in case of any
network hiccup (or simply when a server takes more time to reply).
Hence, raise the timeout to 5 minutes, which ought to be enough now.
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
Revert "tests: test-mediauris: skip non-http URLs"
Now that test-mediauris uses libcurl, it can handle protocols different
than http(s), like ftp, just fine.
This reverts commit 4c9c7185475a9739af51a9fc680e5b8a97055467.
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
Switch from libsoup to libcurl
libsoup is used to check the validity of URLs in distributions in
osinfo-db; OTOH it supports only HTTP(S), so this limits the checks to
that protocol.
To overcome this limitation, switch to libcurl: while it requires
slightly more code to do the same task, it provides a bit more
flexibility, and support for other protocols. No version check is
performed, since the APIs used are old enough.
Adapt also the README, and the packaging files.
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
2017-08-15 Daniel P. Berrange <berrange@redhat.com>
Post-release version bump
Update NEWS for 1.1.0 release
2017-08-14 Daniel P. Berrange <berrange@redhat.com>
......
SUBDIRS = osinfo tests tools docs po examples
SUBDIRS = osinfo tools docs po examples
if ENABLE_TESTS
SUBDIRS += tests
endif
INTLTOOL_FILES = \
intltool-extract.in \
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -88,8 +88,9 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@LOCAL_USB_IDS_TRUE@am__append_1 = usb.ids
@LOCAL_PCI_IDS_TRUE@am__append_2 = pci.ids
@ENABLE_TESTS_TRUE@am__append_1 = tests
@LOCAL_USB_IDS_TRUE@am__append_2 = usb.ids
@LOCAL_PCI_IDS_TRUE@am__append_3 = pci.ids
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
......@@ -196,7 +197,7 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
DIST_SUBDIRS = osinfo tools docs po examples tests
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/libosinfo.spec.in $(srcdir)/mingw-libosinfo.spec.in \
$(top_srcdir)/build-aux/compile \
......@@ -263,12 +264,12 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHECK_CFLAGS = @CHECK_CFLAGS@
CHECK_LIBS = @CHECK_LIBS@
COVERAGE_CFLAGS = @COVERAGE_CFLAGS@
COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
......@@ -365,8 +366,6 @@ RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
SOUP_LIBS = @SOUP_LIBS@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VAPIGEN = @VAPIGEN@
......@@ -429,7 +428,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = osinfo tests tools docs po examples
SUBDIRS = osinfo tools docs po examples $(am__append_1)
INTLTOOL_FILES = \
intltool-extract.in \
intltool-merge.in \
......@@ -470,7 +469,7 @@ MAINTAINERCLEANFILES = \
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
ACLOCAL_AMFLAGS = -I m4
CLEANFILES = $(am__append_1) $(am__append_2)
CLEANFILES = $(am__append_2) $(am__append_3)
@LOCAL_USB_IDS_TRUE@usb_database_DATA = usb.ids
@LOCAL_USB_IDS_TRUE@usb_databasedir = $(pkgdatadir)/
@LOCAL_PCI_IDS_TRUE@pci_database_DATA = pci.ids
......
libosinfo News
==============
1.2.0 - Jun 20, 2018
====================
- Test suite requires osinfo-db >= 20180612
- Replace use of libsoup with libcurl in test suite
- Replace use of check library with GLib tester in test suite
- Increase timeout for media URIs test
- Drop const parameter annotations which break Rust generator
- Improve error message with ISO test fails
- Turn off -Wfunction-cast-type warning from gcc 8
- Remove calls to g_log_set_always_fatal in tests
- Load database files in alphabetical order for predictable sorting
- Fix leak of list when loading files
- Fix build of tools with clang 6
- Add missing "global" annotation on some symbol versions
1.1.0 - Aug 15, 2017
====================
......
......@@ -21,12 +21,12 @@ Dependencies
- Required:
- gobject-2.0
- gio-2.0
- libsoup-2.4
- libxml-2.0
- libxslt-1.0
- Optional:
- gobject-introspection
- libcurl (for tests only)
- Vala (build-time only)
Patch submissions
......
# generated automatically by aclocal 1.15 -*- Autoconf -*-
# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -527,7 +527,7 @@ AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
[AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
])dnl PKG_HAVE_DEFINE_WITH_MODULES
# Copyright (C) 2002-2014 Free Software Foundation, Inc.
# Copyright (C) 2002-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -542,7 +542,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.15], [],
m4_if([$1], [1.15.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
......@@ -558,14 +558,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.15])dnl
[AM_AUTOMAKE_VERSION([1.15.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -617,7 +617,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -648,7 +648,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -839,7 +839,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -915,7 +915,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1112,7 +1112,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1133,7 +1133,7 @@ if test x"${install_sh+set}" != xset; then
fi
AC_SUBST([install_sh])])
# Copyright (C) 2003-2014 Free Software Foundation, Inc.
# Copyright (C) 2003-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1155,7 +1155,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1190,7 +1190,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1240,7 +1240,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1279,7 +1279,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1308,7 +1308,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1355,7 +1355,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1374,7 +1374,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1455,7 +1455,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
# Copyright (C) 2009-2014 Free Software Foundation, Inc.
# Copyright (C) 2009-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1515,7 +1515,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1543,7 +1543,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
# Copyright (C) 2006-2014 Free Software Foundation, Inc.
# Copyright (C) 2006-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1562,7 +1562,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004-2014 Free Software Foundation, Inc.
# Copyright (C) 2004-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......
#! /bin/sh
#!/bin/sh
# Wrapper for compilers which do not understand '-c -o'.
scriptversion=2012-10-14.11; # UTC
scriptversion=2016-01-11.22; # UTC
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
......@@ -255,7 +255,8 @@ EOF
echo "compile $scriptversion"
exit $?
;;
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
......@@ -342,6 +343,6 @@ exit $ret
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
#! /bin/sh
#!/bin/sh
# Attempt to guess a canonical system name.
# Copyright 1992-2016 Free Software Foundation, Inc.
# Copyright 1992-2017 Free Software Foundation, Inc.
timestamp='2016-10-02'
timestamp='2017-08-08'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright 1992-2016 Free Software Foundation, Inc.
Copyright 1992-2017 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -259,6 +259,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:Sortix:*:*)
echo ${UNAME_MACHINE}-unknown-sortix
exit ;;
*:Redox:*:*)
echo ${UNAME_MACHINE}-unknown-redox
exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
......@@ -837,10 +840,11 @@ EOF
UNAME_PROCESSOR=`/usr/bin/uname -p`
case ${UNAME_PROCESSOR} in
amd64)
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
*)
echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
UNAME_PROCESSOR=x86_64 ;;
i386)
UNAME_PROCESSOR=i586 ;;
esac
echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
......@@ -1303,14 +1307,21 @@ EOF
if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
then
case $UNAME_PROCESSOR in
i386) UNAME_PROCESSOR=x86_64 ;;
powerpc) UNAME_PROCESSOR=powerpc64 ;;
esac
fi
# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_PPC >/dev/null
then
UNAME_PROCESSOR=powerpc
fi
fi
elif test "$UNAME_PROCESSOR" = i386 ; then
# Avoid executing cc on OS X 10.9, as it ships with a stub
......@@ -1334,15 +1345,18 @@ EOF
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
NEO-?:NONSTOP_KERNEL:*:*)
NEO-*:NONSTOP_KERNEL:*:*)
echo neo-tandem-nsk${UNAME_RELEASE}
exit ;;
NSE-*:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
NSR-?:NONSTOP_KERNEL:*:*)
NSR-*:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit ;;
NSX-*:NONSTOP_KERNEL:*:*)
echo nsx-tandem-nsk${UNAME_RELEASE}
exit ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
exit ;;
......@@ -1418,8 +1432,8 @@ cat >&2 <<EOF
$0: unable to guess system type
This script (version $timestamp), has failed to recognize the
operating system you are using. If your script is old, overwrite
config.guess and config.sub with the latest versions from:
operating system you are using. If your script is old, overwrite *all*
copies of config.guess and config.sub with the latest versions from:
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
and
......
#! /bin/sh
#!/bin/sh
# Configuration validation subroutine script.
# Copyright 1992-2016 Free Software Foundation, Inc.
# Copyright 1992-2017 Free Software Foundation, Inc.
timestamp='2016-09-05'
timestamp='2017-04-02'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright 1992-2016 Free Software Foundation, Inc.
Copyright 1992-2017 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -263,7 +263,7 @@ case $basic_machine in
| fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
| i370 | i860 | i960 | ia64 \
| i370 | i860 | i960 | ia16 | ia64 \
| ip2k | iq2000 \
| k1om \
| le32 | le64 \
......@@ -301,6 +301,7 @@ case $basic_machine in
| open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pru \
| pyramid \
| riscv32 | riscv64 \
| rl78 | rx \
......@@ -314,6 +315,7 @@ case $basic_machine in
| ubicom32 \
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| visium \
| wasm32 \
| we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
......@@ -387,7 +389,7 @@ case $basic_machine in
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \
| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
| ip2k-* | iq2000-* \
| k1om-* \
| le32-* | le64-* \
......@@ -428,6 +430,7 @@ case $basic_machine in
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pru-* \
| pyramid-* \
| riscv32-* | riscv64-* \
| rl78-* | romp-* | rs6000-* | rx-* \
......@@ -444,6 +447,7 @@ case $basic_machine in
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
| vax-* \
| visium-* \
| wasm32-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
......@@ -946,6 +950,9 @@ case $basic_machine in
nsr-tandem)
basic_machine=nsr-tandem
;;
nsx-tandem)
basic_machine=nsx-tandem
;;
op50n-* | op60c-*)
basic_machine=hppa1.1-oki
os=-proelf
......@@ -1241,6 +1248,9 @@ case $basic_machine in
basic_machine=a29k-wrs
os=-vxworks
;;
wasm32)
basic_machine=wasm32-unknown
;;
w65*)
basic_machine=w65-wdc
os=-none
......@@ -1395,7 +1405,7 @@ case $os in
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
......@@ -1407,7 +1417,7 @@ case $os in
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
| -onefs* | -tirtos* | -phoenix*)
| -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
......@@ -1636,6 +1646,9 @@ case $basic_machine in
sparc-* | *-sun)
os=-sunos4.1.1
;;
pru-*)
os=-elf
;;
*-be)
os=-beos
;;
......
#! /bin/sh
#!/bin/sh
# depcomp - compile a program generating dependencies as side-effects
scriptversion=2013-05-30.07; # UTC
scriptversion=2016-01-11.22; # UTC
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -786,6 +786,6 @@ exit 0
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
#!/bin/sh
# install - install a program, script, or datafile
scriptversion=2013-12-25.23; # UTC
scriptversion=2016-01-11.22; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
......@@ -496,6 +496,6 @@ done
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
......@@ -7272,10 +7272,12 @@ func_mode_link ()
# -tp=* Portland pgcc target processor selection
# --sysroot=* for sysroot support
# -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
# -specs=* GCC specs files
# -stdlib=* select c++ std lib with clang
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-specs=*)
func_quote_for_eval "$arg"
arg=$func_quote_for_eval_result
func_append compile_command " $arg"
......
#! /bin/sh
#!/bin/sh
# Common wrapper for a few potentially missing GNU programs.
scriptversion=2013-10-28.13; # UTC
scriptversion=2016-01-11.22; # UTC
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
......@@ -210,6 +210,6 @@ exit $st
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
#! /bin/sh
#!/bin/sh
# test-driver - basic testsuite driver script.
scriptversion=2013-07-13.22; # UTC
scriptversion=2016-01-11.22; # UTC
# Copyright (C) 2011-2014 Free Software Foundation, Inc.
# Copyright (C) 2011-2017 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -143,6 +143,6 @@ echo ":copy-in-global-log: $gcopy" >> $trs_file
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for libosinfo 1.1.0.
# Generated by GNU Autoconf 2.69 for libosinfo 1.2.0.
#
# Report bugs to <libosinfo@redhat.com>.
#
......@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libosinfo'
PACKAGE_TARNAME='libosinfo'
PACKAGE_VERSION='1.1.0'
PACKAGE_STRING='libosinfo 1.1.0'
PACKAGE_VERSION='1.2.0'
PACKAGE_STRING='libosinfo 1.2.0'
PACKAGE_BUGREPORT='libosinfo@redhat.com'
PACKAGE_URL=''
 
......@@ -670,8 +670,12 @@ LIBOSINFO_SONUM
LIBOSINFO_MICRO_VERSION
LIBOSINFO_MINOR_VERSION
LIBOSINFO_MAJOR_VERSION
CHECK_LIBS
CHECK_CFLAGS
ENABLE_TESTS_FALSE
ENABLE_TESTS_TRUE
HAVE_CURL_FALSE
HAVE_CURL_TRUE
CURL_LIBS
CURL_CFLAGS
GTK_DOC_USE_REBASE_FALSE
GTK_DOC_USE_REBASE_TRUE
GTK_DOC_USE_LIBTOOL_FALSE
......@@ -691,8 +695,6 @@ GTKDOC_MKPDF
GTKDOC_REBASE
GTKDOC_CHECK_PATH
GTKDOC_CHECK
SOUP_LIBS
SOUP_CFLAGS
GLIB_LIBS
GLIB_CFLAGS
LIBXSLT_LIBS
......@@ -904,12 +906,10 @@ LIBXSLT_CFLAGS
LIBXSLT_LIBS
GLIB_CFLAGS
GLIB_LIBS
SOUP_CFLAGS
SOUP_LIBS
GTKDOC_DEPS_CFLAGS
GTKDOC_DEPS_LIBS
CHECK_CFLAGS
CHECK_LIBS'
CURL_CFLAGS
CURL_LIBS'
 
 
# Initialize some variables set by options.
......@@ -1450,7 +1450,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures libosinfo 1.1.0 to adapt to many kinds of systems.
\`configure' configures libosinfo 1.2.0 to adapt to many kinds of systems.
 
Usage: $0 [OPTION]... [VAR=VALUE]...
 
......@@ -1520,7 +1520,7 @@ fi
 
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libosinfo 1.1.0:";;
short | recursive ) echo "Configuration of libosinfo 1.2.0:";;
esac
cat <<\_ACEOF
 
......@@ -1593,15 +1593,12 @@ Some influential environment variables:
linker flags for LIBXSLT, overriding pkg-config
GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
GLIB_LIBS linker flags for GLIB, overriding pkg-config
SOUP_CFLAGS C compiler flags for SOUP, overriding pkg-config
SOUP_LIBS linker flags for SOUP, overriding pkg-config
GTKDOC_DEPS_CFLAGS
C compiler flags for GTKDOC_DEPS, overriding pkg-config
GTKDOC_DEPS_LIBS
linker flags for GTKDOC_DEPS, overriding pkg-config
CHECK_CFLAGS
C compiler flags for CHECK, overriding pkg-config
CHECK_LIBS linker flags for CHECK, overriding pkg-config
CURL_CFLAGS C compiler flags for CURL, overriding pkg-config
CURL_LIBS linker flags for CURL, overriding pkg-config
 
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
......@@ -1669,7 +1666,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libosinfo configure 1.1.0
libosinfo configure 1.2.0
generated by GNU Autoconf 2.69
 
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -1947,7 +1944,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
 
It was created by libosinfo $as_me 1.1.0, which was
It was created by libosinfo $as_me 1.2.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
 
$ $0 $@
......@@ -2811,7 +2808,7 @@ fi
 
# Define the identity of the package.
PACKAGE='libosinfo'
VERSION='1.1.0'
VERSION='1.2.0'
 
 
cat >>confdefs.h <<_ACEOF
......@@ -12795,6 +12792,9 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; }
wantwarn=$gl_warn_set
 
 
# We do "bad" function casts due to G_DEFINE_TYPE and more
wantwarn="$wantwarn -Wno-cast-function-type"
# Check for $CC support of each warning
for w in $wantwarn; do
 
......@@ -14179,10 +14179,6 @@ AM_BACKSLASH='\'
GLIB_MINIMUM_VERSION="2.36"
GLIB_ENCODED_VERSION="GLIB_VERSION_2_36"
 
# Keep these two definitions in agreement.
SOUP_MINIMUM_VERSION="2.42"
SOUP_ENCODED_VERSION="SOUP_VERSION_2_42"
 
 
 
......@@ -14583,102 +14579,6 @@ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MAX_ALLOWED=$GLIB_ENCODED_VERSION"
 
 
 
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOUP" >&5
$as_echo_n "checking for SOUP... " >&6; }
if test -n "$SOUP_CFLAGS"; then
pkg_cv_SOUP_CFLAGS="$SOUP_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= \$SOUP_MINIMUM_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= $SOUP_MINIMUM_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_SOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4 >= $SOUP_MINIMUM_VERSION" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test -n "$SOUP_LIBS"; then
pkg_cv_SOUP_LIBS="$SOUP_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= \$SOUP_MINIMUM_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= $SOUP_MINIMUM_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_SOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4 >= $SOUP_MINIMUM_VERSION" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
SOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsoup-2.4 >= $SOUP_MINIMUM_VERSION" 2>&1`
else
SOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsoup-2.4 >= $SOUP_MINIMUM_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$SOUP_PKG_ERRORS" >&5
as_fn_error $? "Package requirements (libsoup-2.4 >= $SOUP_MINIMUM_VERSION) were not met:
$SOUP_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
Alternatively, you may set the environment variables SOUP_CFLAGS
and SOUP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
Alternatively, you may set the environment variables SOUP_CFLAGS
and SOUP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
SOUP_CFLAGS=$pkg_cv_SOUP_CFLAGS
SOUP_LIBS=$pkg_cv_SOUP_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
SOUP_CFLAGS="$SOUP_CFLAGS -DSOUP_VERSION_MIN_REQUIRED=$SOUP_ENCODED_VERSION"
SOUP_CFLAGS="$SOUP_CFLAGS -DSOUP_VERSION_MAX_ALLOWED=$SOUP_ENCODED_VERSION"
 
 
gtk_doc_requires="gtk-doc >= 1.10"
......@@ -15058,21 +14958,22 @@ fi
 
 
if test "x$enable_tests" != "xno" ; then
have_curl=no
 
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5
$as_echo_n "checking for CHECK... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CURL" >&5
$as_echo_n "checking for CURL... " >&6; }
 
if test -n "$CHECK_CFLAGS"; then
pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS"
if test -n "$CURL_CFLAGS"; then
pkg_cv_CURL_CFLAGS="$CURL_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check\""; } >&5
($PKG_CONFIG --exists --print-errors "check") 2>&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5
($PKG_CONFIG --exists --print-errors "libcurl") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_CHECK_CFLAGS=`$PKG_CONFIG --cflags "check" 2>/dev/null`
pkg_cv_CURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
......@@ -15080,16 +14981,16 @@ fi
else
pkg_failed=untried
fi
if test -n "$CHECK_LIBS"; then
pkg_cv_CHECK_LIBS="$CHECK_LIBS"
if test -n "$CURL_LIBS"; then
pkg_cv_CURL_LIBS="$CURL_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check\""; } >&5
($PKG_CONFIG --exists --print-errors "check") 2>&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5
($PKG_CONFIG --exists --print-errors "libcurl") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_CHECK_LIBS=`$PKG_CONFIG --libs "check" 2>/dev/null`
pkg_cv_CURL_LIBS=`$PKG_CONFIG --libs "libcurl" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
......@@ -15110,47 +15011,46 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "check" 2>&1`
CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcurl" 2>&1`
else
CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "check" 2>&1`
CURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcurl" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$CHECK_PKG_ERRORS" >&5
as_fn_error $? "Package requirements (check) were not met:
$CHECK_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
echo "$CURL_PKG_ERRORS" >&5
 
Alternatively, you may set the environment variables CHECK_CFLAGS
and CHECK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
:
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
Alternatively, you may set the environment variables CHECK_CFLAGS
and CHECK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
:
else
CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS
CHECK_LIBS=$pkg_cv_CHECK_LIBS
CURL_CFLAGS=$pkg_cv_CURL_CFLAGS
CURL_LIBS=$pkg_cv_CURL_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
have_curl=yes
fi
 
fi
if test "x$have_curl" = "xyes"; then
HAVE_CURL_TRUE=
HAVE_CURL_FALSE='#'
else
HAVE_CURL_TRUE='#'
HAVE_CURL_FALSE=
fi
 
if test "x$enable_tests" = "xyes"; then
ENABLE_TESTS_TRUE=
ENABLE_TESTS_FALSE='#'
else
ENABLE_TESTS_TRUE='#'
ENABLE_TESTS_FALSE=
fi
LIBOSINFO_MAJOR_VERSION=`echo $VERSION | awk -F. '{print $1}'`
LIBOSINFO_MINOR_VERSION=`echo $VERSION | awk -F. '{print $2}'`
LIBOSINFO_MICRO_VERSION=`echo $VERSION | awk -F. '{print $3}'`
......@@ -15770,6 +15670,14 @@ if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"
as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_CURL_TRUE}" && test -z "${HAVE_CURL_FALSE}"; then
as_fn_error $? "conditional \"HAVE_CURL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_TESTS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${USE_VERSION_DEFS_TRUE}" && test -z "${USE_VERSION_DEFS_FALSE}"; then
as_fn_error $? "conditional \"USE_VERSION_DEFS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
......@@ -16191,7 +16099,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by libosinfo $as_me 1.1.0, which was
This file was extended by libosinfo $as_me 1.2.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
 
CONFIG_FILES = $CONFIG_FILES
......@@ -16261,7 +16169,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
libosinfo config.status 1.1.0
libosinfo config.status 1.2.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
 
......
AC_INIT([libosinfo], [1.1.0], [libosinfo@redhat.com])
AC_INIT([libosinfo], [1.2.0], [libosinfo@redhat.com])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.11.1 foreign color-tests tar-ustar])
......@@ -40,10 +40,6 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
GLIB_MINIMUM_VERSION="2.36"
GLIB_ENCODED_VERSION="GLIB_VERSION_2_36"
# Keep these two definitions in agreement.
SOUP_MINIMUM_VERSION="2.42"
SOUP_ENCODED_VERSION="SOUP_VERSION_2_42"
PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= 2.6.0])
PKG_CHECK_MODULES([LIBXSLT], [libxslt >= 1.0.0])
......@@ -53,12 +49,6 @@ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MAX_ALLOWED=$GLIB_ENCODED_VERSION"
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
PKG_CHECK_MODULES([SOUP], [libsoup-2.4 >= $SOUP_MINIMUM_VERSION])
SOUP_CFLAGS="$SOUP_CFLAGS -DSOUP_VERSION_MIN_REQUIRED=$SOUP_ENCODED_VERSION"
SOUP_CFLAGS="$SOUP_CFLAGS -DSOUP_VERSION_MAX_ALLOWED=$SOUP_ENCODED_VERSION"
AC_SUBST(SOUP_CFLAGS)
AC_SUBST(SOUP_LIBS)
GTK_DOC_CHECK([1.10],[--flavour no-tmpl])
AC_ARG_ENABLE([tests],
......@@ -66,8 +56,14 @@ AC_ARG_ENABLE([tests],
[], [enable_tests=yes])
if test "x$enable_tests" != "xno" ; then
PKG_CHECK_MODULES([CHECK], [check])
have_curl=no
PKG_CHECK_MODULES([CURL], [libcurl], [have_curl=yes], [:])
AC_SUBST(CURL_CFLAGS)
AC_SUBST(CURL_LIBS)
fi
AM_CONDITIONAL([HAVE_CURL],[test "x$have_curl" = "xyes"])
AM_CONDITIONAL([ENABLE_TESTS],[test "x$enable_tests" = "xyes"])
LIBOSINFO_MAJOR_VERSION=`echo $VERSION | awk -F. '{print $1}'`
LIBOSINFO_MINOR_VERSION=`echo $VERSION | awk -F. '{print $2}'`
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -199,12 +199,12 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHECK_CFLAGS = @CHECK_CFLAGS@
CHECK_LIBS = @CHECK_LIBS@
COVERAGE_CFLAGS = @COVERAGE_CFLAGS@
COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
......@@ -301,8 +301,6 @@ RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
SOUP_LIBS = @SOUP_LIBS@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VAPIGEN = @VAPIGEN@
......
......@@ -3,6 +3,11 @@
ignore_value
</SECTION>
<SECTION>
<FILE>osinfo</FILE>
</SECTION>
<SECTION>
<FILE>osinfo_avatar_format</FILE>
<TITLE>OsinfoAvatarFormat</TITLE>
......@@ -20,7 +25,6 @@ OSINFO_AVATAR_FORMAT
OSINFO_AVATAR_FORMAT_CLASS
OSINFO_AVATAR_FORMAT_GET_CLASS
OSINFO_IS_AVATAR_FORMAT
OSINFO_IS_AVATAR_FORMAT_CLASS
OSINFO_TYPE_AVATAR_FORMAT
OsinfoAvatarFormat
OsinfoAvatarFormatClass
......@@ -39,7 +43,6 @@ OSINFO_DATAMAP
OSINFO_DATAMAP_CLASS
OSINFO_DATAMAP_GET_CLASS
OSINFO_IS_DATAMAP
OSINFO_IS_DATAMAP_CLASS
OSINFO_TYPE_DATAMAP
OsinfoDatamap
OsinfoDatamapClass
......@@ -56,7 +59,6 @@ OSINFO_DATAMAPLIST
OSINFO_DATAMAPLIST_CLASS
OSINFO_DATAMAPLIST_GET_CLASS
OSINFO_IS_DATAMAPLIST
OSINFO_IS_DATAMAPLIST_CLASS
OSINFO_TYPE_DATAMAPLIST
OsinfoDatamapList
OsinfoDatamapListClass
......@@ -101,7 +103,6 @@ OSINFO_DB
OSINFO_DB_CLASS
OSINFO_DB_GET_CLASS
OSINFO_IS_DB
OSINFO_IS_DB_CLASS
OSINFO_TYPE_DB
OsinfoDb
OsinfoDbClass
......@@ -125,7 +126,6 @@ OSINFO_DEPLOYMENT
OSINFO_DEPLOYMENT_CLASS
OSINFO_DEPLOYMENT_GET_CLASS
OSINFO_IS_DEPLOYMENT
OSINFO_IS_DEPLOYMENT_CLASS
OSINFO_TYPE_DEPLOYMENT
OsinfoDeployment
OsinfoDeploymentClass
......@@ -146,7 +146,6 @@ OSINFO_DEPLOYMENTLIST
OSINFO_DEPLOYMENTLIST_CLASS
OSINFO_DEPLOYMENTLIST_GET_CLASS
OSINFO_IS_DEPLOYMENTLIST
OSINFO_IS_DEPLOYMENTLIST_CLASS
OSINFO_TYPE_DEPLOYMENTLIST
OsinfoDeploymentList
OsinfoDeploymentListClass
......@@ -179,7 +178,6 @@ OSINFO_DEVICE
OSINFO_DEVICE_CLASS
OSINFO_DEVICE_GET_CLASS
OSINFO_IS_DEVICE
OSINFO_IS_DEVICE_CLASS
OSINFO_TYPE_DEVICE
OsinfoDevice
OsinfoDeviceClass
......@@ -207,7 +205,6 @@ OSINFO_DEVICE_DRIVER
OSINFO_DEVICE_DRIVER_CLASS
OSINFO_DEVICE_DRIVER_GET_CLASS
OSINFO_IS_DEVICE_DRIVER
OSINFO_IS_DEVICE_DRIVER_CLASS
OSINFO_TYPE_DEVICE_DRIVER
OsinfoDeviceDriver
OsinfoDeviceDriverClass
......@@ -230,7 +227,6 @@ OSINFO_DEVICE_DRIVERLIST
OSINFO_DEVICE_DRIVERLIST_CLASS
OSINFO_DEVICE_DRIVERLIST_GET_CLASS
OSINFO_IS_DEVICE_DRIVERLIST
OSINFO_IS_DEVICE_DRIVERLIST_CLASS
OSINFO_TYPE_DEVICE_DRIVERLIST
OsinfoDeviceDriverList
OsinfoDeviceDriverListClass
......@@ -250,7 +246,6 @@ OSINFO_DEVICELINK
OSINFO_DEVICELINK_CLASS
OSINFO_DEVICELINK_GET_CLASS
OSINFO_IS_DEVICELINK
OSINFO_IS_DEVICELINK_CLASS
OSINFO_TYPE_DEVICELINK
OsinfoDeviceLink
OsinfoDeviceLinkClass
......@@ -268,7 +263,6 @@ OSINFO_DEVICELINKFILTER
OSINFO_DEVICELINKFILTER_CLASS
OSINFO_DEVICELINKFILTER_GET_CLASS
OSINFO_IS_DEVICELINKFILTER
OSINFO_IS_DEVICELINKFILTER_CLASS
OSINFO_TYPE_DEVICELINKFILTER
OsinfoDeviceLinkFilter
OsinfoDeviceLinkFilterClass
......@@ -290,7 +284,6 @@ OSINFO_DEVICELINKLIST
OSINFO_DEVICELINKLIST_CLASS
OSINFO_DEVICELINKLIST_GET_CLASS
OSINFO_IS_DEVICELINKLIST
OSINFO_IS_DEVICELINKLIST_CLASS
OSINFO_TYPE_DEVICELINKLIST
OsinfoDeviceLinkList
OsinfoDeviceLinkListClass
......@@ -311,7 +304,6 @@ OSINFO_DEVICELIST
OSINFO_DEVICELIST_CLASS
OSINFO_DEVICELIST_GET_CLASS
OSINFO_IS_DEVICELIST
OSINFO_IS_DEVICELIST_CLASS
OSINFO_TYPE_DEVICELIST
OsinfoDeviceList
OsinfoDeviceListClass
......@@ -343,7 +335,6 @@ OSINFO_ENTITY
OSINFO_ENTITY_CLASS
OSINFO_ENTITY_GET_CLASS
OSINFO_IS_ENTITY
OSINFO_IS_ENTITY_CLASS
OSINFO_TYPE_ENTITY
OsinfoEntity
OsinfoEntityClass
......@@ -385,7 +376,6 @@ OSINFO_FILTER
OSINFO_FILTER_CLASS
OSINFO_FILTER_GET_CLASS
OSINFO_IS_FILTER
OSINFO_IS_FILTER_CLASS
OSINFO_TYPE_FILTER
OsinfoFilter
OsinfoFilterClass
......@@ -471,7 +461,6 @@ OSINFO_INSTALL_CONFIG
OSINFO_INSTALL_CONFIG_CLASS
OSINFO_INSTALL_CONFIG_GET_CLASS
OSINFO_IS_INSTALL_CONFIG
OSINFO_IS_INSTALL_CONFIG_CLASS
OSINFO_TYPE_INSTALL_CONFIG
OsinfoInstallConfig
OsinfoInstallConfigClass
......@@ -498,7 +487,6 @@ OSINFO_INSTALL_CONFIG_PARAM
OSINFO_INSTALL_CONFIG_PARAM_CLASS
OSINFO_INSTALL_CONFIG_PARAM_GET_CLASS
OSINFO_IS_INSTALL_CONFIG_PARAM
OSINFO_IS_INSTALL_CONFIG_PARAM_CLASS
OSINFO_TYPE_INSTALL_CONFIG_PARAM
OsinfoInstallConfigParam
OsinfoInstallConfigParamClass
......@@ -515,7 +503,6 @@ OSINFO_INSTALL_CONFIG_PARAMLIST
OSINFO_INSTALL_CONFIG_PARAMLIST_CLASS
OSINFO_INSTALL_CONFIG_PARAMLIST_GET_CLASS
OSINFO_IS_INSTALL_CONFIG_PARAMLIST
OSINFO_IS_INSTALL_CONFIG_PARAMLIST_CLASS
OSINFO_TYPE_INSTALL_CONFIG_PARAMLIST
OsinfoInstallConfigParamList
OsinfoInstallConfigParamListClass
......@@ -588,7 +575,6 @@ OSINFO_INSTALL_SCRIPT
OSINFO_INSTALL_SCRIPT_CLASS
OSINFO_INSTALL_SCRIPT_GET_CLASS
OSINFO_IS_INSTALL_SCRIPT
OSINFO_IS_INSTALL_SCRIPT_CLASS
OSINFO_TYPE_INSTALL_SCRIPT
OsinfoInstallScript
OsinfoInstallScriptClass
......@@ -615,7 +601,6 @@ OSINFO_INSTALL_SCRIPTLIST
OSINFO_INSTALL_SCRIPTLIST_CLASS
OSINFO_INSTALL_SCRIPTLIST_GET_CLASS
OSINFO_IS_INSTALL_SCRIPTLIST
OSINFO_IS_INSTALL_SCRIPTLIST_CLASS
OSINFO_TYPE_INSTALL_SCRIPTLIST
OsinfoInstallScriptList
OsinfoInstallScriptListClass
......@@ -642,7 +627,6 @@ osinfo_list_new_intersection
osinfo_list_new_union
<SUBSECTION Standard>
OSINFO_IS_LIST
OSINFO_IS_LIST_CLASS
OSINFO_LIST
OSINFO_LIST_CLASS
OSINFO_LIST_GET_CLASS
......@@ -666,7 +650,6 @@ osinfo_loader_process_local_path
osinfo_loader_process_user_path
<SUBSECTION Standard>
OSINFO_IS_LOADER
OSINFO_IS_LOADER_CLASS
OSINFO_LOADER
OSINFO_LOADER_CLASS
OSINFO_LOADER_GET_CLASS
......@@ -722,7 +705,6 @@ osinfo_media_get_volume_size
osinfo_media_get_eject_after_install
<SUBSECTION Standard>
OSINFO_IS_MEDIA
OSINFO_IS_MEDIA_CLASS
OSINFO_MEDIA
OSINFO_MEDIA_CLASS
OSINFO_MEDIA_GET_CLASS
......@@ -749,7 +731,6 @@ osinfo_medialist_new_intersection
osinfo_medialist_new_union
<SUBSECTION Standard>
OSINFO_IS_MEDIALIST
OSINFO_IS_MEDIALIST_CLASS
OSINFO_MEDIALIST
OSINFO_MEDIALIST_CLASS
OSINFO_MEDIALIST_GET_CLASS
......@@ -793,7 +774,6 @@ osinfo_os_get_device_drivers
osinfo_os_add_device_driver
<SUBSECTION Standard>
OSINFO_IS_OS
OSINFO_IS_OS_CLASS
OSINFO_OS
OSINFO_OS_CLASS
OSINFO_OS_GET_CLASS
......@@ -812,7 +792,6 @@ osinfo_os_variant_new
osinfo_os_variant_get_name
<SUBSECTION Standard>
OSINFO_IS_OS_VARIANT
OSINFO_IS_OS_VARIANT_CLASS
OSINFO_OS_VARIANT
OSINFO_OS_VARIANT_CLASS
OSINFO_OS_VARIANT_GET_CLASS
......@@ -829,7 +808,6 @@ osinfo_os_variant_get_type
osinfo_os_variantlist_new
<SUBSECTION Standard>
OSINFO_IS_OS_VARIANTLIST
OSINFO_IS_OS_VARIANTLIST_CLASS
OSINFO_OS_VARIANTLIST
OSINFO_OS_VARIANTLIST_CLASS
OSINFO_OS_VARIANTLIST_GET_CLASS
......@@ -850,7 +828,6 @@ osinfo_oslist_new_intersection
osinfo_oslist_new_union
<SUBSECTION Standard>
OSINFO_IS_OSLIST
OSINFO_IS_OSLIST_CLASS
OSINFO_OSLIST
OSINFO_OSLIST_CLASS
OSINFO_OSLIST_GET_CLASS
......@@ -871,7 +848,6 @@ osinfo_platform_get_device_links
osinfo_platform_add_device
<SUBSECTION Standard>
OSINFO_IS_PLATFORM
OSINFO_IS_PLATFORM_CLASS
OSINFO_PLATFORM
OSINFO_PLATFORM_CLASS
OSINFO_PLATFORM_GET_CLASS
......@@ -892,7 +868,6 @@ osinfo_platformlist_new_intersection
osinfo_platformlist_new_union
<SUBSECTION Standard>
OSINFO_IS_PLATFORMLIST
OSINFO_IS_PLATFORMLIST_CLASS
OSINFO_PLATFORMLIST
OSINFO_PLATFORMLIST_CLASS
OSINFO_PLATFORMLIST_GET_CLASS
......@@ -929,7 +904,6 @@ osinfo_product_get_eol_date
osinfo_product_get_logo
<SUBSECTION Standard>
OSINFO_IS_PRODUCT
OSINFO_IS_PRODUCT_CLASS
OSINFO_PRODUCT
OSINFO_PRODUCT_CLASS
OSINFO_PRODUCT_GET_CLASS
......@@ -958,7 +932,6 @@ osinfo_productfilter_get_product_constraint_values
osinfo_productfilter_add_support_date_constraint
<SUBSECTION Standard>
OSINFO_IS_PRODUCTFILTER
OSINFO_IS_PRODUCTFILTER_CLASS
OSINFO_PRODUCTFILTER
OSINFO_PRODUCTFILTER_CLASS
OSINFO_PRODUCTFILTER_GET_CLASS
......@@ -979,7 +952,6 @@ osinfo_productlist_new_intersection
osinfo_productlist_new_union
<SUBSECTION Standard>
OSINFO_IS_PRODUCTLIST
OSINFO_IS_PRODUCTLIST_CLASS
OSINFO_PRODUCTLIST
OSINFO_PRODUCTLIST_CLASS
OSINFO_PRODUCTLIST_GET_CLASS
......@@ -1015,7 +987,6 @@ osinfo_resources_set_ram
osinfo_resources_set_storage
<SUBSECTION Standard>
OSINFO_IS_RESOURCES
OSINFO_IS_RESOURCES_CLASS
OSINFO_RESOURCES
OSINFO_RESOURCES_CLASS
OSINFO_RESOURCES_GET_CLASS
......@@ -1036,7 +1007,6 @@ osinfo_resourceslist_new_intersection
osinfo_resourceslist_new_union
<SUBSECTION Standard>
OSINFO_IS_RESOURCESLIST
OSINFO_IS_RESOURCESLIST_CLASS
OSINFO_RESOURCESLIST
OSINFO_RESOURCESLIST_CLASS
OSINFO_RESOURCESLIST_GET_CLASS
......@@ -1076,7 +1046,6 @@ osinfo_tree_get_kernel_path
osinfo_tree_get_initrd_path
<SUBSECTION Standard>
OSINFO_IS_TREE
OSINFO_IS_TREE_CLASS
OSINFO_TREE
OSINFO_TREE_CLASS
OSINFO_TREE_GET_CLASS
......@@ -1097,7 +1066,6 @@ osinfo_treelist_new_intersection
osinfo_treelist_new_union
<SUBSECTION Standard>
OSINFO_IS_TREELIST
OSINFO_IS_TREELIST_CLASS
OSINFO_TREELIST
OSINFO_TREELIST_CLASS
OSINFO_TREELIST_GET_CLASS
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -15,6 +15,24 @@
@SET_MAKE@
# -*- mode: makefile -*-
#
# gtk-doc.make - make rules for gtk-doc
# Copyright (C) 2003 James Henstridge
# 2004-2007 Damon Chaplin
# 2007-2017 Stefan Sauer
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
####################################
# Everything below here is generic #
......@@ -145,12 +163,12 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHECK_CFLAGS = @CHECK_CFLAGS@
CHECK_LIBS = @CHECK_LIBS@
COVERAGE_CFLAGS = @COVERAGE_CFLAGS@
COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
......@@ -247,8 +265,6 @@ RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
SOUP_LIBS = @SOUP_LIBS@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VAPIGEN = @VAPIGEN@
......@@ -385,34 +401,34 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test
@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp
#### setup ####
GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V))
GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_@AM_V@)
GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_@AM_DEFAULT_V@)
GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build";
#### scan ####
GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V))
GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_@AM_V@)
GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_@AM_DEFAULT_V@)
GTK_DOC_V_SCAN_0 = @echo " DOC Scanning header files";
GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V))
GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_@AM_V@)
GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_@AM_DEFAULT_V@)
GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects";
#### xml ####
GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V))
GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
GTK_DOC_V_XML = $(GTK_DOC_V_XML_@AM_V@)
GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_@AM_DEFAULT_V@)
GTK_DOC_V_XML_0 = @echo " DOC Building XML";
#### html ####
GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V))
GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_@AM_V@)
GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_@AM_DEFAULT_V@)
GTK_DOC_V_HTML_0 = @echo " DOC Building HTML";
GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V))
GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_@AM_V@)
GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_@AM_DEFAULT_V@)
GTK_DOC_V_XREF_0 = @echo " DOC Fixing cross-references";
#### pdf ####
GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V))
GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_@AM_V@)
GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_@AM_DEFAULT_V@)
GTK_DOC_V_PDF_0 = @echo " DOC Building PDF";
all: all-am
......@@ -631,38 +647,38 @@ $(REPORT_FILES): sgml-build.stamp
setup-build.stamp:
-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
if test "x$$files" != "x" ; then \
for file in $$files ; do \
destdir=`dirname $(abs_builddir)/$$file`; \
test -d "$$destdir" || mkdir -p "$$destdir"; \
test -f $(abs_srcdir)/$$file && \
cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
done; \
fi; \
files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
if test "x$$files" != "x" ; then \
for file in $$files ; do \
destdir=`dirname $(abs_builddir)/$$file`; \
test -d "$$destdir" || mkdir -p "$$destdir"; \
test -f $(abs_srcdir)/$$file && \
cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
done; \
fi; \
fi
$(AM_V_at)touch setup-build.stamp
scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
$(GTK_DOC_V_SCAN)_source_dir='' ; \
for i in $(DOC_SOURCE_DIR) ; do \
_source_dir="$${_source_dir} --source-dir=$$i" ; \
_source_dir="$${_source_dir} --source-dir=$$i" ; \
done ; \
gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
scanobj_options=""; \
gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \
if test "$$?" = "0"; then \
if test "x$(V)" = "x1"; then \
scanobj_options="--verbose"; \
fi; \
scanobj_options=""; \
gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \
if test "$$?" = "0"; then \
if test "x$(V)" = "x1"; then \
scanobj_options="--verbose"; \
fi; \
CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
fi; \
CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
else \
for i in $(SCANOBJ_FILES) ; do \
test -f $$i || touch $$i ; \
done \
for i in $(SCANOBJ_FILES) ; do \
test -f $$i || touch $$i ; \
done \
fi
$(AM_V_at)touch scan-build.stamp
......@@ -672,7 +688,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)
sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent
$(GTK_DOC_V_XML)_source_dir='' ; \
for i in $(DOC_SOURCE_DIR) ; do \
_source_dir="$${_source_dir} --source-dir=$$i" ; \
_source_dir="$${_source_dir} --source-dir=$$i" ; \
done ; \
gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
$(AM_V_at)touch sgml-build.stamp
......@@ -680,6 +696,9 @@ sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HF
sgml.stamp: sgml-build.stamp
@true
$(DOC_MAIN_SGML_FILE): sgml-build.stamp
@true
xml/gtkdocentities.ent: Makefile
$(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \
echo "<!ENTITY package \"$(PACKAGE)\">"; \
......@@ -707,12 +726,8 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_con
cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-@test "x$(HTML_IMAGES)" = "x" || \
for file in $(HTML_IMAGES) ; do \
if test -f $(abs_srcdir)/$$file ; then \
cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
fi; \
if test -f $(abs_builddir)/$$file ; then \
cp $(abs_builddir)/$$file $(abs_builddir)/html; \
fi; \
test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \
done;
$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
$(AM_V_at)touch html-build.stamp
......