From 939a7095edd8f6da10a501ee92a74ef1c92be84b Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 6 Mar 2012 11:57:59 +0000
Subject: [PATCH] Ignore aclocal.m4.

---
 .gitignore  |  1 +
 MANIFEST    |  1 -
 Makefile.in |  3 ++-
 aclocal.m4  | 14 --------------
 4 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 aclocal.m4

diff --git a/.gitignore b/.gitignore
index 6a7a789..d08e9e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+aclocal.m4
 META
 ocaml-libvirt-*.tar.gz
 ocaml-libvirt-*.exe
diff --git a/MANIFEST b/MANIFEST
index 5074ae0..c5958d7 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,5 +1,4 @@
 .gitignore
-aclocal.m4
 ChangeLog
 config.guess
 config.h.in
diff --git a/Makefile.in b/Makefile.in
index beacf76..32e0b66 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -50,6 +50,7 @@ dist: ChangeLog
 	mkdir $(PACKAGE)-$(VERSION)
 	tar -cf - -T MANIFEST | tar -C $(PACKAGE)-$(VERSION) -xf -
 	$(INSTALL) -m 0755 configure $(PACKAGE)-$(VERSION)/
+	$(INSTALL) -m 0644 aclocal.m4 $(PACKAGE)-$(VERSION)/
 	$(INSTALL) -m 0644 virt-top/virt-top.1 $(PACKAGE)-$(VERSION)/virt-top/
 	$(INSTALL) -m 0644 virt-top/virt-top.txt $(PACKAGE)-$(VERSION)/virt-top/
 	tar zcf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
@@ -67,4 +68,4 @@ ChangeLog: $(shell find -type f)
 	./gitlog-to-changelog > $@.new
 	mv $@.new $@
 
-.PHONY: all opt depend install clean distclean force
\ No newline at end of file
+.PHONY: all opt depend install clean distclean force
diff --git a/aclocal.m4 b/aclocal.m4
deleted file mode 100644
index 1f108e8..0000000
--- a/aclocal.m4
+++ /dev/null
@@ -1,14 +0,0 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_include([m4/ocaml.m4])
-- 
1.8.3.1