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

[John Ralls <jralls src gnome org>]

commit 7fe4f1120c57fdf950849bba698758bed3e974bd
Author: John Ralls <jralls ceridwen us>
Date:   Fri May 10 17:28:02 2013 -0700

    Bug 699987 - gtk-mac-integration build failure: can't find automake
    
    Updated autogen.sh to not specify an automake version, and replaced
    obsolete macros in configure.ac and Makefile.am

 autogen.sh                                     |    2 +-
 bindings/python/gtkmacintegration/Makefile.am  |    2 +-
 bindings/python/gtkosx_application/Makefile.am |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index a348f09..0430da0 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -134,7 +134,7 @@ if grep "^GTK_DOC_CHECK" $CONFIGURE > /dev/null; then
     $GTKDOCIZE
 fi
 
-if grep "^AM_CONFIG_HEADER" $CONFIGURE >/dev/null; then
+if grep "^AC_CONFIG_HEADERS" $CONFIGURE >/dev/null; then
     echo "Running $AUTOHEADER..."
     $AUTOHEADER || exit $?
 fi
diff --git a/bindings/python/gtkmacintegration/Makefile.am b/bindings/python/gtkmacintegration/Makefile.am
index a95e8e7..32e9491 100644
--- a/bindings/python/gtkmacintegration/Makefile.am
+++ b/bindings/python/gtkmacintegration/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src $(PYTHON_INCLUDES)
+AM_CPPFLAGS = -I$(top_srcdir)/src $(PYTHON_INCLUDES)
 
 gtkmacintegrationdir = $(libdir)/python$(PYTHON_VERSION)/site-packages/gtkmacintegration
 
diff --git a/bindings/python/gtkosx_application/Makefile.am b/bindings/python/gtkosx_application/Makefile.am
index 52d5e45..a41ff08 100644
--- a/bindings/python/gtkosx_application/Makefile.am
+++ b/bindings/python/gtkosx_application/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src $(PYTHON_INCLUDES)
+AM_CPPFLAGS = -I$(top_srcdir)/src $(PYTHON_INCLUDES)
 
 gtkosx_applicationdir = $(libdir)/python$(PYTHON_VERSION)/site-packages/gtkosx_application