diff options
| author |   Matthias Bolte <matthias.bolte@googlemail.com> | 2011-07-28 14:55:21 +0200 |
|---|---|---|
| committer |   Eric Blake <eblake@redhat.com> | 2011-07-29 07:35:54 -0600 |
| commit | b590866bdb0aea20eda5b96883b8744fedbba88d (patch) | |
| tree | 31dedb4babe8ff798d9a97f1658304d5a6cfd9bb /bootstrap.conf | |
| parent | freebsd: Avoid /bin/true in commandtest (diff) | |
| download | libvirt-b590866bdb0aea20eda5b96883b8744fedbba88d.tar.gz libvirt-b590866bdb0aea20eda5b96883b8744fedbba88d.tar.bz2 libvirt-b590866bdb0aea20eda5b96883b8744fedbba88d.zip | |
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 'bootstrap.conf')
| -rw-r--r-- | bootstrap.conf | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bootstrap.conf b/bootstrap.conf index 3b105b147..7882886b7 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -161,7 +161,6 @@ gnulib_name=libgnu m4_base=gnulib/m4 source_base=gnulib/lib tests_base=gnulib/tests -gnulib_mk=Makefile.am gnulib_tool_option_extras="\ --lgpl=2\ --with-tests\ @@ -203,9 +202,9 @@ gnulib_extra_files=" bootstrap_epilogue() { - # Change paths in gnulib/tests/Makefile.am from "../../.." to "../..", + # Change paths in gnulib/tests/gnulib.mk from "../../.." to "../..", # then ensure that gnulib/tests/Makefile.in is up-to-date. - m=gnulib/tests/Makefile.am + m=gnulib/tests/gnulib.mk sed 's,\.\./\.\./\.\.,../..,g' $m > $m-t mv -f $m-t $m ${AUTOMAKE-automake} gnulib/tests/Makefile |