[mousetweaks] Various build system updates

[Gerd Kohlberger <gerdk src gnome org>]

commit a21ad62d471c2b989edaf2b7343d2af172d80e17
Author: Gerd Kohlberger <gerdk src gnome org>
Date:   Sun Feb 19 09:25:43 2012 +0100

    Various build system updates
    
    Prep for:
    https://live.gnome.org/GnomeGoals/ModernAutotools

 Makefile.am  |    2 ++
 autogen.sh   |    5 +++--
 configure.ac |   11 ++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a1ffe53..61c3cf2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 SUBDIRS = src data pixmaps po help man
 
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 DISTCHECK_CONFIGURE_FLAGS =         \
     --disable-schemas-compile       \
     --disable-scrollkeeper
diff --git a/autogen.sh b/autogen.sh
index 83ab642..c9890e5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,7 +7,7 @@ PKG_NAME="mousetweaks"
 
 (test -f $srcdir/src/mt-main.c) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
+    echo " top-level $PKG_NAME directory."
     exit 1
 }
 
@@ -17,7 +17,8 @@ if test ! -d $srcdir/m4; then
 fi
 
 which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME SVN"
+    echo "You need to install gnome-common from the GNOME Git (or from"
+    echo " your OS vendor's package manager)."
     exit 1
 }
 
diff --git a/configure.ac b/configure.ac
index d992300..bdf6a39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,14 +1,16 @@
-AC_PREREQ(2.63)
+AC_PREREQ([2.64])
 AC_INIT([mousetweaks],
-	[3.3.1],
-	[http://bugzilla.gnome.org/enter_bug.cgi?product=mousetweaks])
+        [3.3.1],
+        [https://bugzilla.gnome.org/enter_bug.cgi?product=mousetweaks],
+        [mousetweaks],
+        [https://live.gnome.org/Mousetweaks/Home])
 
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PREFIX_DEFAULT([/usr])
 
-AM_INIT_AUTOMAKE([1.11 -Wno-portability])
+AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-bzip2 -Wno-portability])
 AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE([enable])
 
@@ -20,7 +22,6 @@ AM_PROG_CC_C_O
 
 dnl *** GNOME macros ***
 
-GNOME_COMMON_INIT
 GNOME_COMPILE_WARNINGS([maximum])
 GNOME_MAINTAINER_MODE_DEFINES