From: Christophe Mutricy <xtophe@videolan.org>
Date: Sun, 4 Feb 2007 20:20:41 +0000 (+0000)
Subject: support for automake 1.10. Patch courtesy of scop on trac. Fix #1041
X-Git-Tag: 0.9.0-test0~8725
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=6871383f306321f5db33fa80feaa048a0ef7ee0e;p=vlc

support for automake 1.10. Patch courtesy of scop on trac. Fix #1041
---

diff --git a/bootstrap b/bootstrap
index 06199fd013..54c112c3e6 100755
--- a/bootstrap
+++ b/bootstrap
@@ -64,10 +64,10 @@ esac
 
 # Check for automake
 amvers="no"
-for v in "-1.9" "19" "-1.8" "18" "-1.7" "17"; do
+for v in "-1.10" "110" "-1.9" "19" "-1.8" "18" "-1.7" "17"; do
   if automake${v} --version >/dev/null 2>&1; then
     amsuff="${v}"
-    amvers="${v}"
+    amvers="`echo ${v} | sed -e 's/^-//'`"
     break
   fi
 done
@@ -125,8 +125,8 @@ else
   PKGCONFIG=no
 fi
 
-aclocal=aclocal${amvers}
-automake=automake${amvers}
+aclocal=aclocal${amsuff}
+automake=automake${amsuff}
 autoconf=autoconf
 autoheader=autoheader