From 186a7dde78ff37c9e824b151afde8f6e4c1eb6cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Wed, 6 Dec 2017 11:01:04 +0000
Subject: [PATCH] allow subdirs with qt; test for glibtoolize on Mac OSX

---
 scripts/ax_check_qt.m4 |  2 +-
 scripts/bootstrap.sh   | 28 ++++++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/scripts/ax_check_qt.m4 b/scripts/ax_check_qt.m4
index f17af0e..e0eecf2 100644
--- a/scripts/ax_check_qt.m4
+++ b/scripts/ax_check_qt.m4
@@ -275,7 +275,7 @@ AC_DEFUN([AX_QT_NO_KEYWORDS], [
 
 AC_DEFUN([AX_INIT_QT], [
   if test -n "${AX_ADDITIONAL_QT_RULES_HACK}"; then
-    for f in $(find test src -name makefile.in); do
+    for f in $(find test examples src -name makefile.in); do
       test -f "$f" && cat >> "$f" <<EOF
 ${AX_ADDITIONAL_QT_RULES_HACK}    
 EOF
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 58408c1..5f3450e 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -353,6 +353,11 @@ notice() {
     echo -e "\e[1;33m$*\e[0m"
 }
 
+error() {
+    echo -e " \e[31merror\e[0m $*"
+    exit 1
+}
+
 run() {
     check=1
     while test $# -gt 0; do
@@ -1794,7 +1799,18 @@ $(case "$VCS" in
 esac)
 fi
 aclocal
-$(if testtag AX_USE_LIBTOOL; then echo libtoolize --force; fi)
+$(if testtag AX_USE_LIBTOOL; then
+cat <<EOF1
+if which -s libtoolize; then
+  run libtoolize --force;
+elif which -s glibtoolize; then
+  run glibtoolize --force;
+else
+  echo "error: libtoolize not found" 1>&2
+  exit 1
+fi
+EOF1
+fi)
 automake -a
 autoconf
 EOF
@@ -1862,7 +1878,15 @@ else
     #### Bootstrap Before Configure ####
     run --no-check vcs2cl
     run aclocal
-    if testtag AX_USE_LIBTOOL; then run libtoolize --force; fi
+    if testtag AX_USE_LIBTOOL; then
+        if which -s libtoolize; then
+            run libtoolize --force;
+        elif which -s glibtoolize; then
+            run glibtoolize --force;
+        else
+            error libtoolize not found
+        fi
+    fi
     run automake -a
     run autoconf