External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 12:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: fix VPATH builds

Browse Source 
After the recent libvirt-qemu library addition, VPATH builds fail with:

  CC     libvirt_qemu_la-libvirt-qemu.lo
In file included from ../../src/libvirt-qemu.c:29:
../../include/libvirt/libvirt-qemu.h:17:22: error: libvirt.h: No such file or directory
...
  CCLD   libvirt-qmeu.la
/usr/bin/ld: cannot open linker script file libvirt_qemu.syms: No such file or directory

This fixes both issues (there are still some documentation VPATH issues,
but those don't show up with 'make check').

* configure.ac (LIBVIRT_QEMU_SYMBOL_FILE): While libvirt.syms is
generated and lives in $(builddir), libvirt_qemu.syms is static
and lives in $(srcdir).
* include/libvirt/libvirt-qemu.h (includes): Pull in libvirt.h via
the public location, since this is a public header.
This commit is contained in:
Eric Blake 2010-07-26 10:38:30 -06:00
parent 46bcdb960d
commit 4018a026b2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1833,7 +1833,7 @@ CYGWIN_EXTRA_PYTHON_LIBADD=
MINGW_EXTRA_LDFLAGS= MINGW_EXTRA_LDFLAGS=
WIN32_EXTRA_CFLAGS= WIN32_EXTRA_CFLAGS=
LIBVIRT_SYMBOL_FILE=libvirt.syms LIBVIRT_SYMBOL_FILE=libvirt.syms
LIBVIRT_QEMU_SYMBOL_FILE=libvirt_qemu.syms LIBVIRT_QEMU_SYMBOL_FILE='$(srcdir)/libvirt_qemu.syms'
case "$host" in case "$host" in
*-*-cygwin*) *-*-cygwin*)
CYGWIN_EXTRA_LDFLAGS="-no-undefined" CYGWIN_EXTRA_LDFLAGS="-no-undefined"

2
include/libvirt/libvirt-qemu.h
View File

@ -14,7 +14,7 @@
#ifndef __VIR_QEMU_H__ #ifndef __VIR_QEMU_H__
# define __VIR_QEMU_H__ # define __VIR_QEMU_H__
# include "libvirt.h" # include "libvirt/libvirt.h"
# ifdef __cplusplus # ifdef __cplusplus
extern "C" { extern "C" {