On Mon, Apr 04, 2011 at 02:37:00PM -0600, Eric Blake wrote:
On 04/04/2011 10:20 AM, Daniel P. Berrange wrote:
Split the bit acinclude.m4 file into smaller pieces named as m4/virt-XXXXX.m4
* .gitignore: Ignore gettext related files * acinclude.m4: Delete * m4/virt-compile-warnings.m4: Checks for GCC compiler flags * m4/virt-pkgconfig-back-compat.m4: Backcompat check for pkgconfig program --- .gitignore | 36 +++++++++- acinclude.m4 | 137 -------------------------------------- m4/virt-compile-warnings.m4 | 112 +++++++++++++++++++++++++++++++ m4/virt-pkgconfig-back-compat.m4 | 23 ++++++ 4 files changed, 169 insertions(+), 139 deletions(-) delete mode 100644 acinclude.m4 create mode 100644 m4/virt-compile-warnings.m4 create mode 100644 m4/virt-pkgconfig-back-compat.m4
diff --git a/.gitignore b/.gitignore index ba4d351..278bc4f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -!/m4/compiler-flags.m4 !/po/*.po !/po/POTFILES.in !/po/libvirt.pot @@ -46,7 +45,6 @@ /libvirt.spec
Yuck - gnulib's bootstrap script sorts .gitignore, but this is broken (lines starting with ! should come last, not first, according to 'man gitignore'; it's a shame I'm just noticing it now, since it's been broken since November 2010).
@@ -67,3 +65,37 @@ results.log stamp-h stamp-h.in stamp-h1 +m4/codeset.m4 +m4/gettext.m4
Rerunning bootstrap will re-sort this list, leading to spurious diffs unless we get it sorted first. But why should we blacklist all of the m4 files individually, when it is much easier to whitelist just the files we want?
/m4/ !/m4/virt-*.m4
Ok, I've pushed with that, but with the bogus sort order, since it is no worse than what we already have. We can fix sort order once gnulib is fixed. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|