Ticket #1041: vlc-bootstrap-automake110.patch

File vlc-bootstrap-automake110.patch, 0.6 kB (added by scop, 2 years ago)

Better fix against current svn: also fixes setting of $amvers so that version check works as intended

  • bootstrap

    old new  
    6464 
    6565# Check for automake 
    6666amvers="no" 
    67 for v in "-1.9" "19" "-1.8" "18" "-1.7" "17"; do 
     67for v in "-1.10" "110" "-1.9" "19" "-1.8" "18" "-1.7" "17"; do 
    6868  if automake${v} --version >/dev/null 2>&1; then 
    6969    amsuff="${v}" 
    70     amvers="${v}" 
     70    amvers="`echo ${v} | sed -e 's/^-//'`" 
    7171    break 
    7272  fi 
    7373done 
    …… 
    125125  PKGCONFIG=no 
    126126fi 
    127127 
    128 aclocal=aclocal${amvers} 
    129 automake=automake${amvers} 
     128aclocal=aclocal${amsuff} 
     129automake=automake${amsuff} 
    130130autoconf=autoconf 
    131131autoheader=autoheader 
    132132