[Freeciv-Dev] Re: (PR#12560) autogen.sh is inflexible when selecting installed version of automake

["Marko Lindqvist" <cazfi74@xxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=12560 >

Tommi Björkbacka wrote:
> +
> +  real_package_name=
> +  # check if given package is suitable
> +  if version_check 2 $RPACKAGE $RURL $RMAJOR $RMINOR $RMICRO; then
> +    version_check 1 $RPACKAGE $RURL $RMAJOR $RMINOR $RMICRO

  This doesn't set $new_pkg...

> +  else
> +    # given package was too old or not available
> +    # search for the newest one
> +    if version_search $RPACKAGE; then
> +      version_check 1 $new_pkg $RURL $RMAJOR $RMINOR $RMICRO
> +    else 
> +      version_check 1 $RPACKAGE $RURL $RMAJOR $RMINOR $RMICRO
> +      return 1
> +    fi
> +  fi
> +
> +  REALPKGNAME=$new_pkg

  ...but it's used here?

> -version_check 1 "autoconf" "ftp://ftp.gnu.org/pub/gnu/autoconf/"; 2 55 || 
> DIE=1
> -version_check 1 "automake" "ftp://ftp.gnu.org/pub/gnu/automake/"; 1 6 || DIE=1
> +real_package_name "autoconf" "ftp://ftp.gnu.org/pub/gnu/autoconf/"; 2 55 || 
> DIE=1
> +AUTOCONF=$REALPKGNAME
> +real_package_name "autoheader" "ftp://ftp.gnu.org/pub/gnu/autoconf/"; 2 55 || 
> DIE=1
> +AUTOHEADER=$REALPKGNAME
> +
> +real_package_name "automake" "ftp://ftp.gnu.org/pub/gnu/automake/"; 1 6 || 
> DIE=1
> +AUTOMAKE=$REALPKGNAME
> +real_package_name "aclocal" "ftp://ftp.gnu.org/pub/gnu/automake/"; 1 6 || 
> DIE=1
> +ACLOCAL=$REALPKGNAME

  I don't like how this duplicates autoconf and automake version numbers 
to two places. Don't see a way around it, though. At least add a comment 
stating that autoconf & autoheader and automake & aclocal version 
numbers must be kept in sync.

>  echo "+ running aclocal ..."
> -aclocal $ACLOCAL_FLAGS || {
> +$ACLOCAL $ACLOCAL_FLAGS || {
>    echo
>    echo "aclocal failed - check that all needed development files are present 
> on system"
>    exit 1
>  }

  Maybe you should use $ACLOCAL in messages too: "+ running $ACLOCAL 
..."  and "$ACLOCAL failed - ..."
  Same for other tools.



  - ML