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

diff --git a/bootstrap b/bootstrap
index 06199fd013ff483d1b5e0c7af03d3a799c82ed07..54c112c3e6f8f9c340730927ab4c982a8ae5c331 100755 (executable)
--- 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