[gimp] Issue #3746: Problem with automake creating directories $(top_srcdir).

[Jehan <jehanp src gnome org>]

commit c90287ecf54c70a3240534c8dc1abddbcc6ed9db
Author: Jehan <jehan girinstud io>
Date:   Mon Aug 5 17:03:57 2019 +0200

    Issue #3746: Problem with automake creating directories $(top_srcdir).
    
    See upstream report: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=13928
    We are not making automake 1.16 a requirement as it is just too recent
    and we don't want to break build on old machines. I will want to make a
    better fix later.
    For the time being though, at least let's test first the higher automake
    version, then down to minimum requirement, rather than test first
    required version.

 autogen.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 445aab039b..a1c9d325cb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,11 +9,7 @@
 # tools and you shouldn't use this script.  Just call ./configure
 # directly.
 
-ACLOCAL=${ACLOCAL-aclocal-1.13}
-AUTOCONF=${AUTOCONF-autoconf}
-AUTOHEADER=${AUTOHEADER-autoheader}
-AUTOMAKE=${AUTOMAKE-automake-1.13}
-LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
+AUTOMAKE_RECOMMENDED_VERSION=1.16
 
 AUTOCONF_REQUIRED_VERSION=2.54
 AUTOMAKE_REQUIRED_VERSION=1.13.0
@@ -21,6 +17,11 @@ INTLTOOL_REQUIRED_VERSION=0.40.1
 LIBTOOL_REQUIRED_VERSION=1.5
 LIBTOOL_WIN32_REQUIRED_VERSION=2.2
 
+ACLOCAL=${ACLOCAL-aclocal-${AUTOMAKE_RECOMMENDED_VERSION}}
+AUTOCONF=${AUTOCONF-autoconf}
+AUTOHEADER=${AUTOHEADER-autoheader}
+AUTOMAKE=${AUTOMAKE-automake-${AUTOMAKE_RECOMMENDED_VERSION}}
+LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
 
 PROJECT="GNU Image Manipulation Program"
 TEST_TYPE=-d