From 7a999260fe5dd9c02764814db9b9fa0a8a59f154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= <scerveau@collabora.com>
Date: Thu, 28 Nov 2019 11:47:03 +0100
Subject: [PATCH] build: add conditional autoreconf

---
 Project/GNU/CLI/AddThisToRoot_CLI_compile.sh |  8 ++---
 Project/GNU/CLI/autogen.sh                   | 33 +++++---------------
 2 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/Project/GNU/CLI/AddThisToRoot_CLI_compile.sh b/Project/GNU/CLI/AddThisToRoot_CLI_compile.sh
index 9c3015305..cbd085b37 100755
--- a/Project/GNU/CLI/AddThisToRoot_CLI_compile.sh
+++ b/Project/GNU/CLI/AddThisToRoot_CLI_compile.sh
@@ -115,13 +115,11 @@ cd $Home
 if test -e MediaInfo/Project/GNU/CLI/configure; then
     cd MediaInfo/Project/GNU/CLI/
     test -e Makefile && rm Makefile
-    chmod +x configure
-    ./configure --enable-staticlibs $*
-
+    chmod +x autogen.sh
     if [ "$OS" = "mac" ]; then
-        ./configure $MacOptions --enable-staticlibs $*
+        ./autogen.sh $MacOptions --enable-staticlibs $*
     else
-        ./configure --enable-staticlibs $*
+        ./autogen.sh --enable-staticlibs $*
     fi
 
     if test -e Makefile; then
diff --git a/Project/GNU/CLI/autogen.sh b/Project/GNU/CLI/autogen.sh
index 42cd43daf..a547f4225 100755
--- a/Project/GNU/CLI/autogen.sh
+++ b/Project/GNU/CLI/autogen.sh
@@ -1,29 +1,10 @@
-#libtoolize 
-if test "$(uname)" = "Darwin" ; then
-  #Darwin based Systems like Mac OS X: libtoolize is called glibtoolize.
-  glibtoolize --automake
-else
-  libtoolize --automake
+if which autoreconf > /dev/null; then
+  rm -rf autom4te.cache
+  rm -f aclocal.m4 ltmain.sh
+  autoreconf -f -i -v --warnings=all || exit 1
 fi
-
-#aclocal
-if test -e /usr/bin/aclocal-1.11 ; then
-  #OpenSolaris: no aclocal
-  aclocal-1.11
-elif test -e /usr/bin/aclocal-1.10 ; then
-  aclocal-1.10
-else
-  aclocal
-fi
-
-#automake
-if test -e /usr/bin/automake-1.11 ; then
-  #OpenSolaris: no automake
-  automake-1.11 -a
-elif test -e /usr/bin/automake-1.10 ; then
-  automake-1.10 -a
-else
-  automake -a
+chmod a+x configure
+if [ -z "$NOCONFIGURE" ]; then
+  ./configure "$@"
 fi
 
-autoreconf -fi
\ No newline at end of file