From: Martin Kletzander Date: Thu, 16 Nov 2017 13:24:45 +0000 (+0100) Subject: build: Use XDR_CFLAGS in more places X-Git-Tag: v3.10.0-rc1~125 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74a13be4a4562affcf721ba32f42f8a27ec3557d;p=thirdparty%2Flibvirt.git build: Use XDR_CFLAGS in more places Since update to glibc-2.26 removed the /usr/include/rpc/rpc.h we used until now, it showed us a problem with not using XDR_CFLAGS properly. On linux that variable has usually -I/usr/include/tirpc because we already probe for it properly, we just don't use it everywhere we need. It is needed by wireshark dissector as well as testutilsqemu.c (through includes) so the build fails with: wireshark/src/packet-libvirt.c:33:10: fatal error: rpc/xdr.h: No such file or directory #include ^~~~~~~~~~~ and In file included from ../src/logging/log_manager.h:29:0, from ../src/qemu/qemu_domain.h:40, from testutilsqemu.c:11: ../src/logging/log_protocol.h:9:10: fatal error: rpc/rpc.h: No such file or directory #include ^~~~~~~~~~~ Since lot of tests use testutilsqemu.c it is easier to add XDR_CFLAGS to AM_CFLAGS than adding it to all $binary_CFLAGS. It's just for tests and we already have bunch of CFLAGS there anyway. Signed-off-by: Martin Kletzander --- diff --git a/tests/Makefile.am b/tests/Makefile.am index 4627f5d2ba..5686ea5198 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -48,6 +48,7 @@ AM_CFLAGS = \ $(APPARMOR_CFLAGS) \ $(YAJL_CFLAGS) \ $(COVERAGE_CFLAGS) \ + $(XDR_CFLAGS) \ $(WARN_CFLAGS) AM_LDFLAGS = \ diff --git a/tools/Makefile.am b/tools/Makefile.am index 7513a73ac0..2913bba8cc 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -428,7 +428,7 @@ if WITH_WIRESHARK_DISSECTOR ws_plugin_LTLIBRARIES = wireshark/src/libvirt.la wireshark_src_libvirt_la_CPPFLAGS = \ - -I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS) + -I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS) $(XDR_CFLAGS) wireshark_src_libvirt_la_LDFLAGS = -avoid-version -module nodist_wireshark_src_libvirt_la_SOURCES = wireshark/src/plugin.c wireshark_src_libvirt_la_SOURCES = \