autotools.eclass: reorder sysroot M4 include dir option

The old autoconf-2.13 version requires options to be specified
before the file name argument, so packages with WANT_AUTOCONF="2.1"
would fail to build in a sysroot with the -l option at the end.

Closes: https://bugs.gentoo.org/710792
Signed-off-by: David Michael <fedora.dm0@gmail.com>
Signed-off-by: Mike Gilbert <floppym@gentoo.org>

diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 9df0e1b93663503085dbc76e1d6ff89266459eb9..625abd0e9d12e1bcd85464f3d35dbe7e92cecb2b 100644 (file)
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: autotools.eclass
@@ -512,7 +512,7 @@ autotools_run_tool() {
        fi
 
        if ${m4flags} ; then
-               set -- "${1}" $(autotools_m4dir_include) "${@:2}" $(autotools_m4sysdir_include)
+               set -- "${1}" $(autotools_m4dir_include) $(autotools_m4sysdir_include) "${@:2}"
        fi
 
        # If the caller wants to probe something, then let them do it directly.