]> git.ipfire.org Git - thirdparty/libvirt.git/commit
freebsd: Fix build problem due to picking up the wrong libvirt.h
authorMatthias Bolte <matthias.bolte@googlemail.com>
Thu, 28 Jul 2011 12:55:21 +0000 (14:55 +0200)
committerEric Blake <eblake@redhat.com>
Fri, 29 Jul 2011 13:35:54 +0000 (07:35 -0600)
commitb590866bdb0aea20eda5b96883b8744fedbba88d
tree31dedb4babe8ff798d9a97f1658304d5a6cfd9bb
parentc0e5994aef6b9d17532dadec4ca07088f937f475
freebsd: Fix build problem due to picking up the wrong libvirt.h

Gettext annoyingly modifies CPPFLAGS in-place, putting
-I/usr/local/include into the search patch if libintl headers
must be used from that location.  But since we must support
automake 1.9.6 which lacks AM_CPPFLAGS, and since CPPFLAGS is used
prior to INCLUDES, this means that the build picks up the _old_
installed libvirt.h in priority to the in-tree version, leading
to all sorts of weird build failures on FreeBSD.

Fix this by teaching configure to undo gettext's actions, but
to keep any changes required by gettext at the end of INCLUDES
after all in-tree locations are used first.  Also requires
adding a wrapper Makefile.am and making gnulib-tool create
just gnulib.mk files during the bootstrap process.

Signed-off-by: Eric Blake <eblake@redhat.com>
.gitignore
bootstrap.conf
configure.ac
daemon/Makefile.am
gnulib/lib/Makefile.am [new file with mode: 0644]
gnulib/tests/Makefile.am [new file with mode: 0644]
python/Makefile.am
src/Makefile.am
tests/Makefile.am
tools/Makefile.am