From: Daniel P. Berrange <berrange@redhat.com>
Date: Thu, 9 Jul 2009 11:18:14 +0000 (+0100)
Subject: Fix wierd build problems due to autopoint overwriting gnulib m4
X-Git-Tag: v0.7.0~216
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75618aaf88c2584e5ae41105a6b38c12409883fa;p=thirdparty%2Flibvirt.git

Fix wierd build problems due to autopoint overwriting gnulib m4

* Makefile.am: List -I m4 first, in ACLOCAL_AMFLAGS
* .gitignore: ignore gnulib/, ChangeLog, *rej, *orig, *#*# (emacs
  temporary files)
---

diff --git a/.gitignore b/.gitignore
index c95174a2a8..54c3ba46b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,9 @@ update.log
 tests/*.log
 /GNUmakefile
 /maint.mk
+gnulib/
+*.orig
+*.rej
+*#*#
+*.#*#
+ChangeLog
diff --git a/Makefile.am b/Makefile.am
index 30c67f6981..f9efff580b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ GENHTML = genhtml
 SUBDIRS = gnulib/lib include src qemud tools proxy docs gnulib/tests \
   python tests po examples/domain-events/events-c examples/hellolibvirt
 
-ACLOCAL_AMFLAGS = -I gnulib/m4 -I m4
+ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4
 
 EXTRA_DIST = \
   ChangeLog-old \