[gtk-mac-integration] Bug 699987 - gtk-mac-integration build failure: can't find automake

[John Ralls <jralls src gnome org>]

commit fc8defa130aaf4159e5d4612b912859e22de3151
Author: John Ralls <jralls ceridwen us>
Date:   Thu May 9 07:29:48 2013 -0700

    Bug 699987 - gtk-mac-integration build failure: can't find automake
    
    Remove specification of old version of automake & aclocal
    Update configure.ac to replace obsolete macros.

 autogen.sh   |    7 +++----
 configure.ac |    3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index ffd2690..a348f09 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,8 +3,8 @@
 
 : ${AUTOCONF=autoconf}
 : ${AUTOHEADER=autoheader}
-: ${AUTOMAKE=automake-1.10}
-: ${ACLOCAL=aclocal-1.10}
+: ${AUTOMAKE=automake}
+: ${ACLOCAL=aclocal}
 : ${LIBTOOLIZE=libtoolize}
 : ${INTLTOOLIZE=intltoolize}
 : ${LIBTOOL=libtool}
@@ -51,8 +51,7 @@ DIE=0
 ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "You must have automake installed to compile $PROJECT."
-  echo "Get ftp://sourceware.cygnus.com/pub/automake/automake-1.7.tar.gz";
-  echo "(or a newer version if it is available)"
+  echo "Get the latest version from ftp://ftp.gnu.org/gnu/automake/";
   DIE=1
 }
 
diff --git a/configure.ac b/configure.ac
index 03d4725..1a5cfb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ AC_CONFIG_SRCDIR(src/gtk-mac-menu.c)
 AC_CONFIG_MACRO_DIR(m4)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
 
 AM_DISABLE_STATIC
 AM_PROG_LIBTOOL
@@ -32,7 +32,6 @@ AC_PREPROC_IFELSE(
 AM_CONDITIONAL([SIXTY_FOUR_BIT], [test x$sixty_four_bit = xyes])
 AC_ISC_POSIX
 AC_PROG_CC
-AM_PROG_CC_STDC
 AC_HEADER_STDC
 AC_PROG_OBJC
 AM_PROG_CC_C_O