configure: Don't drop so many files in topdir

.gitignore

@@ -17,22 +17,13 @@
 
 Makefile
 Makefile.in*
-/ABOUT-NLS
-/m4/
 /build/
 /build-aux/
 /autom4te.cache/
 /aclocal.m4
-/install-sh
 /configure
 /config.log
-/config.guess
 /config.status
-/config.rpath
-/config.sub
-/missing
-/mkinstalldirs
-/ltmain.sh
 /intltool-merge.in
 /intltool-extract.in
 /intltool-update.in

Makefile.am

@@ -1,5 +1,3 @@
-ACLOCAL_AMFLAGS = -I m4/
-
 SUBDIRS = src icons man po tests
 
 EXTRA_DIST = @PACKAGE@.spec HACKING \

autogen.sh

@@ -3,10 +3,15 @@
 set -e
 set -x
 
+# Remove config.status, so rerunning autogen.sh regenerates everything
 rm -f config.status
 
-# Make makefiles.
+# Touch this to work around gettext issues following intltool I18N-HOWTO:
+# http://lists.gnu.org/archive/html/bug-gettext/2011-10/msg00012.html
+mkdir -p build-aux/m4
+touch build-aux/config.rpath
+
 autoreconf --force --install --verbose
 intltoolize --force --copy --automake
 
-./configure $@
+./configure "$@"

configure.ac

@@ -4,19 +4,19 @@ AC_INIT(virt-manager, 0.9.5)
 VIRTINST_VERSION="0.600.4"
 
 AC_CONFIG_SRCDIR(src/virt-manager.py.in)
-dnl Make automake keep quiet about wildcards & other GNUmake-isms
 AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([build-aux/m4])
 AM_INIT_AUTOMAKE([foreign])
 AM_MAINTAINER_MODE([enable])
 
 ALL_LINGUAS="as bg bn_IN bs ca cs da de es fi fr gu hi hr hu is it ja kn ko ml mr ms nb nl or pa pl pt_BR pt ro ru sr@latin sr sv ta te tr uk zh_CN zh_TW"
 IT_PROG_INTLTOOL([0.35.0], [no-xml])
-AM_GNU_GETTEXT_VERSION([0.14.1])
 AM_GNU_GETTEXT([external])
 
 GETTEXT_PACKAGE=virt-manager
 AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],"$GETTEXT_PACKAGE",
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],
+                   "$GETTEXT_PACKAGE",
                    [GETTEXT package name])
 
 dnl ---------------