[libvirt] Fix compilation failure if yajl is not available

I commited the following as it was a compile breaker for most people I assume and it's trivial commit a4e09c1ed81f7361ff03d95ad42eac49d4d60812 Author: Daniel Veillard <veillard@redhat.com> Date: Tue Dec 8 11:08:17 2009 +0100 Fix a compilation failure if yajl not avail configure: yajl: no CC libvirt_util_la-json.lo util/json.c:32:27: error: yajl/yajl_gen.h: No such file or directory util/json.c:33:29: error: yajl/yajl_parse.h: No such file or directory * src/util/json.c: remove the includes if yajl not configured in diff --git a/src/util/json.c b/src/util/json.c index 93b8186..35f6e52 100644 --- a/src/util/json.c +++ b/src/util/json.c @@ -29,8 +29,10 @@ #include "logging.h" #include "util.h" +#if HAVE_YAJL #include <yajl/yajl_gen.h> #include <yajl/yajl_parse.h> +#endif /* XXX fixme */ #define VIR_FROM_THIS VIR_FROM_NONE -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

On Tue, Dec 08, 2009 at 11:13:15AM +0100, Daniel Veillard wrote:
I commited the following as it was a compile breaker for most people I assume and it's trivial
commit a4e09c1ed81f7361ff03d95ad42eac49d4d60812 Author: Daniel Veillard <veillard@redhat.com> Date: Tue Dec 8 11:08:17 2009 +0100
Fix a compilation failure if yajl not avail
configure: yajl: no CC libvirt_util_la-json.lo util/json.c:32:27: error: yajl/yajl_gen.h: No such file or directory util/json.c:33:29: error: yajl/yajl_parse.h: No such file or directory
* src/util/json.c: remove the includes if yajl not configured in
Thanks, FYI, I have got yajl in Fedora rawhide, and F12 updates-testing now if anyone needs it Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
participants (2)
-
Daniel P. Berrange
-
Daniel Veillard