[gentoo-commits] proj/portage-utils:master commit in: /

[Fabian Groffen]

commit:     f245321bdbc9e068ed24d5693db7de33586cab9b
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  8 18:07:52 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jun  8 18:07:52 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=f245321b

autogen: hard require dev-libs/gnulib and sys-devel/autoconf-archive

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 autogen.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 8a59e9d..1cfb68b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,9 +4,19 @@ v() { echo "$@"; "$@"; }
 
 m4dir="autotools/m4"
 
+# check for dependencies
+if ! qlist -qI dev-libs/gnulib > /dev/null ; then
+       echo "please install dev-libs/gnulib"
+       exit 1
+fi
+if ! qlist -qI sys-devel/autoconf-archive > /dev/null ; then
+       echo "please install sys-devel/autoconf-archive"
+       exit 1
+fi
+
 v rm -rf autotools
 
-# reload the gnulib code if possible
+# reload the gnulib code
 PATH=/usr/local/src/gnu/gnulib:${PATH}
 mods="
        dirent
@@ -37,12 +47,5 @@ v gnulib-tool \
        --no-vc-files \
        ${mods}
 
-# not everyone has sys-devel/autoconf-archive installed
-for macro in $(grep -o '\<AX[A-Z_]*\>' configure.ac | sort -u) ; do
-       if m4=$(grep -rl "\[${macro}\]" /usr/share/aclocal/) ; then
-               v cp $m4 ${m4dir}/
-       fi
-done
-
 export AUTOMAKE="automake --foreign"
 v autoreconf -i -f