[jhbuild] build: Do not use GNOME_COMMON_INIT

[Frederic Peters <fpeters src gnome org>]

commit 3e7be6fbcf48ff49c169c7a76b94bec458a83e99
Author: Javier JardÃn <jjardon gnome org>
Date:   Wed Oct 5 00:07:54 2011 +0100

    build: Do not use GNOME_COMMON_INIT
    
    Its deprecated and doesnt work with autoreconf
    
    https://bugzilla.gnome.org/show_bug.cgi?id=660939

 Makefile.am  |    2 +-
 configure.ac |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a9d90a8..d525c67 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS = po scripts triggers jhbuild buildbot
 
diff --git a/configure.ac b/configure.ac
index eaa6b21..78f5c72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,10 @@
 AC_INIT([jhbuild], [3.2.0],
 		[http://bugzilla.gnome.org/enter_bug.cgi?product=jhbuild])
+
 AC_CONFIG_SRCDIR(jhbuild/main.py)
+AC_CONFIG_MACRO_DIR([m4])
+
 AM_INIT_AUTOMAKE([1.11 -Wno-portability foreign no-define tar-ustar no-dist-gzip dist-xz])
-GNOME_COMMON_INIT
 AM_MAINTAINER_MODE([enable])
 AC_PREFIX_DEFAULT(~/.local/)