From d469db9398942723d2e2ae27989de63bce9cff8d Mon Sep 17 00:00:00 2001
From: Hilko Bengen <bengen@hilluzination.de>
Date: Thu, 1 Dec 2011 22:06:30 +0100
Subject: [PATCH] libguestfs: Added gnulib includes from builddir, as suggested
 by the Gnulib documentation

    Since some modules (`getopt', for example) may copy files
    into the build directory, `top_builddir/lib' is needed as well as
    `top_srcdir/lib'. -- GNU Gnulib manual, section 2.2 Initial import
(cherry picked from commit 1a35ca59088e572c11633e85524bb282cb436186)
---
 capitests/Makefile.am | 1 +
 daemon/Makefile.am    | 2 +-
 src/Makefile.am       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/capitests/Makefile.am b/capitests/Makefile.am
index cb9188e..d32b7fc 100644
--- a/capitests/Makefile.am
+++ b/capitests/Makefile.am
@@ -129,6 +129,7 @@ test_debug_to_file_SOURCES = test-debug-to-file.c
 test_debug_to_file_CFLAGS = \
 	-I$(top_srcdir)/src -I$(top_builddir)/src \
 	-I$(top_srcdir)/gnulib/lib \
+	-I$(top_builddir)/gnulib/lib \
 	$(WARN_CFLAGS) $(WERROR_CFLAGS)
 test_debug_to_file_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 7757067..6e38da1 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -175,7 +175,7 @@ guestfsd_LDADD = \
 	$(LIBINTL) \
 	$(SERVENT_LIB)
 
-guestfsd_CPPFLAGS = -I$(top_srcdir)/gnulib/lib
+guestfsd_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib
 guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
 
 .PHONY: force
diff --git a/src/Makefile.am b/src/Makefile.am
index 761fcb6..82a4004 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -165,7 +165,7 @@ libguestfs_la_CFLAGS = \
   $(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \
   $(WARN_CFLAGS) $(WERROR_CFLAGS)
 
-libguestfs_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib
+libguestfs_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib
 
 if HAVE_RPCGEN
 guestfs_protocol.c: guestfs_protocol.x
-- 
1.8.3.1