Don't hardcode automake-1.7, Fixes #148377

	* autogen.sh: Don't hardcode automake-1.7, Fixes #148377

	* gtk/__init__.py: Readd _gobject, but warn if it's used

1 files changed, 4 insertions, 4 deletions

diff --git a/autogen.sh b/autogen.sh
index 0cdcde62..61b0a898 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -32,13 +32,13 @@ test -z "$AUTOHEADER" && AUTOHEADER=autoheader
 }
 
 if test -z "$AUTOMAKE"; then
-  if automake-1.7 --version < /dev/null > /dev/null 2>&1; then
-    AUTOMAKE=automake-1.7
-    ACLOCAL=aclocal-1.7
+  if automake --version < /dev/null > /dev/null 2>&1; then
+    AUTOMAKE=automake
+    ACLOCAL=aclocal
   else
     echo
     echo "You must have automake installed to compile $PROJECT."
-    echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.7.6.tar.gz"
+    echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.8.5.tar.gz"
     echo "(or a newer version if it is available)"
     DIE=1
   fi