summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorMatthias Bolte <matthias.bolte@googlemail.com>2011-07-28 14:55:21 +0200
committerEric Blake <eblake@redhat.com>2011-07-29 07:35:54 -0600
commit088ec98fdcc3073ce678e70949b21f0f626b27f4 (patch)
treefa93246025a9c55de0d18567ff5edda8bf591852 /Makefile.am
parent2cafb481550caabfd3a13f22add3b43e73c48658 (diff)
downloadlibvirt-python-split-088ec98fdcc3073ce678e70949b21f0f626b27f4.zip
libvirt-python-split-088ec98fdcc3073ce678e70949b21f0f626b27f4.tar.gz
libvirt-python-split-088ec98fdcc3073ce678e70949b21f0f626b27f4.tar.xz
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>
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 0e14d23..5943fe8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,8 @@ INCLUDES = \
$(PYTHON_INCLUDES) \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
- -I$(top_builddir)/$(subdir)
+ -I$(top_builddir)/$(subdir) \
+ $(GETTEXT_CPPFLAGS)
AM_CFLAGS = $(WARN_CFLAGS)