From f8688c96fb318e6e6c5cf7156efb4a26bf6ee336 Mon Sep 17 00:00:00 2001
From: Vincent Bernat <vincent@bernat.im>
Date: Sun, 16 Aug 2015 14:07:44 +0200
Subject: [PATCH] build: don't let autoreconf rely on AC_CONFIG_SUBDIRS macro

We don't use it anymore.
---
 autogen.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index bc63a810..95eec1db 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -62,14 +62,19 @@ EOF
 }
 
 
+SUBDIRS=""
+for dir in *; do
+    [ -d "$dir" ] || continue
+    [ -f "$dir"/configure.ac ] || [ -f "$dir"/configure.in ] || continue
+    SUBDIRS="$SUBDIRS $dir"
+done
+
 echo "autogen.sh: start libtoolize to get ltmain.sh"
 ${LIBTOOLIZE} --copy --force
 echo "autogen.sh: reconfigure with autoreconf"
-${AUTORECONF} -vif -I m4 || {
+${AUTORECONF} -vif --no-recursive -I m4 . $SUBDIRS || {
     echo "autogen.sh: autoreconf has failed ($?), let's do it manually"
-    for dir in $PWD *; do
-        [ -d "$dir" ] || continue
-        [ -f "$dir"/configure.ac ] || [ -f "$dir"/configure.in ] || continue
+    for dir in $PWD $SUBDIRS; do
 	echo "autogen.sh: configure `basename $dir`"
 	(cd "$dir" && ${ACLOCAL} -I m4 ${ACLOCAL_FLAGS})
         (cd "$dir" && check_pkg_config)
-- 
2.39.5