X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=54c112c3e6f8f9c340730927ab4c982a8ae5c331;hb=6871383f306321f5db33fa80feaa048a0ef7ee0e;hp=06199fd013ff483d1b5e0c7af03d3a799c82ed07;hpb=cfafc7da073f5c7ac3074af7b559d86a35203efb;p=vlc 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