[gtk-mac-integration: 3/5] Fix autotools warnings and modernize some

[John Ralls <jralls src gnome org>]

commit 6d2b072846f40d7cf23533f38b776c511aa2410c
Author: TingPing <tingping tingping se>
Date:   Sun Jun 29 20:20:02 2014 -0400

    Fix autotools warnings and modernize some

 Makefile.am  |    3 +--
 configure.ac |    5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index baa2845..b1c6318 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,6 @@
 SUBDIRS = src data bindings docs strings
 
-EXTRA_DIST = gtk-doc.make accel_map
+EXTRA_DIST = gtk-doc.make accel_map autogen.sh
 
-AUTOMAKE_OPTIONS = dist-tarZ dist-bzip2
 DISTCHECK_CONFIGURE_FLAGS = --enable-python=all --enable-gtk-doc
 ACLOCAL_AMFLAGS = -I m4
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 68100e4..cc91817 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,12 +13,11 @@ GTK_MAC_INTEGRATION_LT_VERSION=2:5:0
 AC_SUBST(GTK_MAC_INTEGRATION_LT_VERSION)
 AC_CONFIG_SRCDIR(src/gtk-mac-menu.c)
 AC_CONFIG_MACRO_DIR(m4)
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.11 dist-bzip2 subdir-objects no-define foreign])
 
 AC_CONFIG_HEADERS(config.h)
 
 AM_DISABLE_STATIC
-AM_PROG_LIBTOOL
 AC_MSG_CHECKING([Bitness])
 AC_PREPROC_IFELSE(
     [AC_LANG_PROGRAM([[]],[[#ifndef __x86_64__
@@ -35,6 +34,8 @@ AC_PROG_CC
 AC_HEADER_STDC
 AC_PROG_OBJC
 AM_PROG_CC_C_O
+AM_PROG_AR
+AM_PROG_LIBTOOL
 
 AM_PATH_GLIB_2_0([2.14.0])
 AC_MSG_CHECKING([GLib Version])